Skip to content

Commit 07a4530

Browse files
NathanWalkerNathanWalker
committed
chore: 12.0.4
1 parent 4e15564 commit 07a4530

14 files changed

+211
-132
lines changed

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## [12.0.4](https://github.com/NativeScript/angular/compare/12.0.2...12.0.4) (2021-06-28)
2+
3+
4+
### Bug Fixes
5+
6+
* **list-view:** ensure templates are in a consistent state on itemLoa… ([#10](https://github.com/NativeScript/angular/issues/10)) ([1c842f8](https://github.com/NativeScript/angular/commit/1c842f880beaa21eaf6bfd77b0d5246a83cfc136))
7+
8+
9+
110
## [12.0.2](https://github.com/NativeScript/angular/compare/12.0.1...12.0.2) (2021-06-17)
211

312

‎apps/nativescript-demo-ng/.eslintrc.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"extends": "../../.eslintrc.json",
3+
"ignorePatterns": ["!**/*"],
4+
"overrides": [
5+
{
6+
"files": ["*.ts"],
7+
"extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
8+
"parserOptions": {
9+
"project": ["/apps/nativescript-demo-ng/tsconfig.*?.json"]
10+
},
11+
"rules": {
12+
"@angular-eslint/directive-selector": [
13+
"error",
14+
{
15+
"type": "attribute",
16+
"prefix": "nativescript",
17+
"style": "camelCase"
18+
}
19+
],
20+
"@angular-eslint/component-selector": [
21+
"error",
22+
{
23+
"type": "element",
24+
"prefix": "nativescript",
25+
"style": "kebab-case"
26+
}
27+
]
28+
}
29+
},
30+
{
31+
"files": ["*.html"],
32+
"extends": ["plugin:@nrwl/nx/angular-template"],
33+
"rules": {}
34+
}
35+
]
36+
}

‎apps/nativescript-demo-ng/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"name": "demong",
3-
"main": "src/main.ts",
3+
"main": "./src/main.ts",
44
"description": "NativeScript Application",
55
"scripts": {
6-
"postinstall": "node ./tools/xplat-postinstall.js && npm run ngcc",
7-
"ngcc": "ngcc --tsconfig tsconfig.json --properties es2015 module main --first-only"
6+
"postinstall": "node ./tools/xplat-postinstall.js"
87
},
98
"dependencies": {
109
"@nativescript/angular": "file:../../packages/angular",

‎apps/nativescript-demo-ng/src/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular/setup-jest';
1+
import 'jest-preset-angular';

‎apps/nativescript-demo-ng/tools/xplat-postinstall.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,23 @@
22

33
const fs = require('fs-extra');
44
const path = require('path');
5+
const childProcess = require('child_process');
56

67
// Copy potential hooks from root dependencies to app
7-
const hooksSrc = '../../../hooks';
8+
const hooksSrc = '../../hooks';
89
const hooksDest = 'hooks';
9-
console.info(`Copying ${hooksSrc} -> ${hooksDest}`);
1010
try {
1111
fs.copySync(hooksSrc, hooksDest);
1212
} catch (err) {
1313
// ignore
1414
}
15+
16+
// Helpful to trigger ngcc after an install to ensure all has processed properly
17+
const child = childProcess.spawn(/^win/.test(process.platform) ? '..\\..\\node_modules\\.bin\\ngcc' : '../../node_modules/.bin/ngcc', ['--tsconfig', 'tsconfig.app.json', '--properties', 'es2015', 'module', 'main', '--first-only'], {
18+
cwd: process.cwd(),
19+
stdio: 'inherit',
20+
});
21+
child.on('close', (code) => {
22+
23+
});
24+

‎apps/nativescript-demo-ng/tsconfig.app.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"baseUrl": ".",
5+
"outDir": "../../dist/out-tsc",
6+
"paths": {
7+
"~/*": ["src/*"],
8+
"@nativescript/angular": ["../../packages/angular/src/index.ts"],
9+
"@nativescript/angular/*": ["../../packages/angular/src/*"],
10+
"@nativescript/angular/testing": ["../../packages/angular/testing/src/index.ts"],
11+
"@nativescript/angular/polyfills": ["../../packages/angular/polyfills/src/index.ts"],
12+
"@nativescript/zone-js": ["../../packages/zone-js/dist/index.ts"],
13+
"@nativescript/zone-js/*": ["../../packages/zone-js/*"]
14+
},
15+
"types": ["jasmine", "sinon"]
16+
},
17+
"exclude": ["node_modules", "platforms", "./src/**/*.spec.ts"],
18+
"include": ["./src/tests/*.ts"],
19+
"files": ["./references.d.ts", "../../packages/angular/references.d.ts", "./src/main.ts", "./src/polyfills.ts"]
20+
}

‎apps/nativescript-demo-ng/tsconfig.editor.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"include": ["**/*.ts"],
4+
"compilerOptions": {
5+
"types": ["jest", "node"]
6+
}
7+
}

‎apps/nativescript-demo-ng/tsconfig.json

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
{
22
"extends": "../../tsconfig.base.json",
3-
"compilerOptions": {
4-
"baseUrl": ".",
5-
"paths": {
6-
"~/*": ["src/*"],
7-
"@nativescript/core": ["./node_modules/@nativescript/core/index.ts"],
8-
"@nativescript/angular": ["../../packages/angular/src/index.ts"],
9-
"@nativescript/angular/*": ["../../packages/angular/src/*"],
10-
"@nativescript/angular/testing": ["../../packages/angular/testing/src/index.ts"],
11-
"@nativescript/angular/polyfills": ["../../packages/angular/polyfills/src/index.ts"],
12-
"@nativescript/zone-js": ["../../packages/zone-js/dist/index.ts"],
13-
"@nativescript/zone-js/*": ["../../packages/zone-js/*"]
3+
"files": [],
4+
"include": [],
5+
"references": [
6+
{
7+
"path": "./tsconfig.app.json"
148
},
15-
"types": ["jasmine", "sinon"]
16-
},
17-
"exclude": ["node_modules", "platforms", "./src/**/*.spec.ts"],
18-
"include": ["./src/tests/*.ts"],
19-
"files": ["./references.d.ts", "../../packages/angular/references.d.ts", "./src/main.ts", "./src/polyfills.ts"]
9+
{
10+
"path": "./tsconfig.spec.json"
11+
},
12+
{
13+
"path": "./tsconfig.editor.json"
14+
}
15+
]
2016
}

‎apps/nativescript-demo-ng/webpack.config.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
const webpack = require('@nativescript/webpack');
2-
const { join } = require('path');
32

43
module.exports = (env) => {
54
webpack.init(env);
6-
7-
// Learn how to customize:
8-
// https://docs.nativescript.org/webpack
5+
webpack.useConfig('angular');
96

107
return webpack.resolveConfig();
118
};

‎package.json

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "nativescript-angular",
3-
"version": "12.0.3",
3+
"version": "12.0.4",
44
"license": "MIT",
55
"private": true,
66
"scripts": {
7-
"clean": "npx rimraf hooks node_modules package-lock.json yarn.lock && yarn",
7+
"clean": "npx rimraf hooks node_modules package-lock.json yarn.lock && yarn config set ignore-engines true && ns package-manager set npm && yarn",
88
"clean.all": "npm run clean && nx run nativescript-demo-ng:clean",
99
"postinstall": "husky install",
1010
"nx": "nx",
@@ -42,17 +42,18 @@
4242
"@nativescript/core": "next",
4343
"@nativescript/theme": "~3.0.0",
4444
"nativescript-ngx-fonticon": "~7.0.0",
45-
"rxjs": "^7.1.0",
45+
"rxjs": "^6.6.0",
4646
"zone.js": "~0.11.4"
4747
},
4848
"devDependencies": {
4949
"@angular-eslint/eslint-plugin": "~12.0.0",
5050
"@angular-eslint/eslint-plugin-template": "~12.0.0",
5151
"@angular-eslint/template-parser": "~12.0.0",
5252
"@angular/compiler-cli": "^12.0.0",
53+
"@nativescript/ios": "8.0.0",
5354
"@nativescript/types": "^8.0.0",
54-
"@nativescript/webpack": "beta",
5555
"@nativescript/unit-test-runner": "^2.0.5",
56+
"@nativescript/webpack": "beta",
5657
"@ngtools/webpack": "^12.0.0",
5758
"@nrwl/angular": "12.4.0",
5859
"@nrwl/cli": "12.4.0",
@@ -61,10 +62,10 @@
6162
"@nrwl/node": "12.4.0",
6263
"@nrwl/tao": "12.4.0",
6364
"@nrwl/workspace": "12.4.0",
64-
"@nstudio/angular": "~12.0.0",
65-
"@nstudio/nativescript": "~12.0.0",
66-
"@nstudio/nativescript-angular": "~12.0.0",
67-
"@nstudio/xplat": "~12.0.0",
65+
"@nstudio/angular": "12.4.3",
66+
"@nstudio/nativescript": "12.4.3",
67+
"@nstudio/nativescript-angular": "12.4.3",
68+
"@nstudio/xplat": "12.4.3",
6869
"@types/jasmine": "^3.7.2",
6970
"@types/jest": "~26.0.8",
7071
"@types/node": "14.14.33",
@@ -91,8 +92,9 @@
9192
"sinon": "^11.1.1",
9293
"ts-jest": "27.0.3",
9394
"ts-node": "9.1.1",
95+
"tslib": "^2.1.0",
9496
"tslint": "6.1.3",
95-
"typescript": "4.2.4"
97+
"typescript": "~4.2.4"
9698
},
9799
"xplat": {
98100
"prefix": "nativescript",

‎packages/angular/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/angular",
3-
"version": "12.0.3",
3+
"version": "12.0.4",
44
"homepage": "https://nativescript.org/",
55
"repository": {
66
"type": "git",

‎packages/angular/src/lib/element-registry/common-views.ts

-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,5 @@ export function registerNativeScriptViewComponents() {
4444
registerElement('WrapLayout', () => WrapLayout);
4545
registerElement('FormattedString', () => FormattedString);
4646
registerElement('Span', () => Span);
47-
registerElement('TabView', () => TabView);
4847
}
4948
}

‎workspace.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
"prod": {
5656
"fileReplacements": [
5757
{
58-
"replace": "apps/nativescript-demo-ng/src/environments/environment.ts",
59-
"with": "apps/nativescript-demo-ng/src/environments/environment.prod.ts"
58+
"replace": "./src/environments/environment.ts",
59+
"with": "./src/environments/environment.prod.ts"
6060
}
6161
]
6262
}
@@ -68,6 +68,9 @@
6868
"platform": "ios"
6969
},
7070
"configurations": {
71+
"build": {
72+
"copyTo": "./dist/build.ipa"
73+
},
7174
"prod": {
7275
"combineWithConfig": "build:prod"
7376
}
@@ -79,6 +82,9 @@
7982
"platform": "android"
8083
},
8184
"configurations": {
85+
"build": {
86+
"copyTo": "./dist/build.apk"
87+
},
8288
"prod": {
8389
"combineWithConfig": "build:prod"
8490
}

0 commit comments

Comments
 (0)