Skip to content

Commit 7ff3232

Browse files
NathanWalkerNathanWalker
authored
feat: Angular 16 (#113)
1 parent bb05c5c commit 7ff3232

24 files changed

+2065
-699
lines changed

‎.eslintrc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -10,12 +10,12 @@
1010
},
1111
{
1212
"files": ["*.ts", "*.tsx"],
13-
"extends": ["plugin:@nrwl/nx/typescript"],
13+
"extends": ["plugin:@nx/typescript"],
1414
"rules": {}
1515
},
1616
{
1717
"files": ["*.js", "*.jsx"],
18-
"extends": ["plugin:@nrwl/nx/javascript"],
18+
"extends": ["plugin:@nx/javascript"],
1919
"rules": {}
2020
}
2121
]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"overrides": [
55
{
66
"files": ["*.ts"],
7-
"extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
7+
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
88
"parserOptions": {
99
"project": ["/apps/nativescript-demo-ng/tsconfig.*?.json"]
1010
},
@@ -29,7 +29,7 @@
2929
},
3030
{
3131
"files": ["*.html"],
32-
"extends": ["plugin:@nrwl/nx/angular-template"],
32+
"extends": ["plugin:@nx/angular-template"],
3333
"rules": {}
3434
}
3535
]

‎apps/nativescript-demo-ng/App_Resources/iOS/Podfile

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
platform :ios, '13.0'
2+
3+
post_install do |installer|
4+
installer.pods_project.targets.each do |target|
5+
target.build_configurations.each do |config|
6+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
7+
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
8+
end
9+
end
10+
end

‎apps/nativescript-demo-ng/App_Resources/iOS/build.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
// To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
55
// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
66
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
7+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
},
88
"dependencies": {
99
"@nativescript/core": "file:../../node_modules/@nativescript/core",
10-
"@nativescript-community/ui-material-bottom-navigation": "^7.0.0"
10+
"@nativescript-community/ui-material-bottom-navigation": "^7.1.3"
1111
},
1212
"devDependencies": {
13-
"@nativescript/android": "~8.4.0",
14-
"@nativescript/ios": "~8.4.0",
13+
"@nativescript/android": "~8.5.0",
14+
"@nativescript/ios": "~8.5.0",
1515
"@nativescript/unit-test-runner": "^3.0.1"
1616
}
1717
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666
},
6767
"lint": {
68-
"executor": "@nrwl/linter:eslint",
68+
"executor": "@nx/linter:eslint",
6969
"options": {
7070
"lintFilePatterns": ["apps/nativescript-demo-ng/**/*.ts", "apps/nativescript-demo-ng/src/**/*.html"]
7171
}

‎apps/nativescript-demo-ng/src/app/item/items.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { ModalDialogService, NativeDialogService } from '@nativescript/angular';
1212
templateUrl: './items.component.html',
1313
})
1414
export class ItemsComponent implements OnInit {
15-
message = 'Hello Angular 15!';
15+
message = 'Hello Angular 16!';
1616
items: Array<Item>;
1717

1818
constructor(private itemService: ItemService, private nativeDialog: NativeDialogService, private modalDialog: ModalDialogService, private http: HttpClient) {}

‎apps/nativescript-demo-ng/src/app/item2/item-detail2.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<Label class="h2" [text]="item.id + '. '"></Label>
55
<Label class="h2" [text]="item.name"></Label>
66
</FlexboxLayout>
7-
<Label class="h4" [text]="item.role"></Label>
7+
<Label class="h4 m-l-15" [text]="item.role"></Label>
88
<Button text="GO BACK!" (tap)="goBack()"></Button>
99
</FlexboxLayout>

‎apps/nativescript-demo-ng/src/app/item3/items.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { ModalDialogService, NativeDialogService } from '@nativescript/angular';
1212
templateUrl: './items.component.html',
1313
})
1414
export class ItemsComponent implements OnInit {
15-
message = 'Hello Angular 15!';
15+
message = 'Hello Angular 16!';
1616
items: Array<Item>;
1717

1818
constructor(private itemService: ItemService, private nativeDialog: NativeDialogService, private modalDialog: ModalDialogService, private http: HttpClient) {}

‎apps/nativescript-demo-ng/src/app/modal/modal.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<GridLayout backgroundColor="blue" columns="*,*" padding="20" width="100%" height="100%">
22
<Button col="0" [nativeDialogClose]="'thanks for clicking modal ' + id" text="Close modal" fontSize="20"></Button>
3-
<Button col="1" (tap)="openNewModal()" text="Open new modal" fontSize="20"></Button>
3+
<Button col="1" (tap)="openNewModal()" text="Open Another" fontSize="20"></Button>
44
</GridLayout>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ global.queueMicrotask ??= (fn: () => unknown) => Promise.resolve().then(fn);
1212
runTestApp({
1313
runTests: () => {
1414
// demo app level if needed
15-
const tests = require.context('./', true, /\.spec\.ts$/);
15+
const tests = (<any>require).context('./', true, /\.spec\.ts$/);
1616
// ensure we load main.spec.ts first to initialize angular testbed
1717
tests('./main.spec.ts');
1818
tests.keys().map(tests);

‎apps/nativescript-demo-ng/src/tests/modal-dialog.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class SuccessComponent {
5151
@NgModule({
5252
declarations: [FailComponent, SuccessComponent, ModalComponent],
5353
exports: [FailComponent, SuccessComponent, ModalComponent],
54-
entryComponents: [ModalComponent],
54+
// entryComponents: [ModalComponent],
5555
schemas: [NO_ERRORS_SCHEMA],
5656
})
5757
export class EntryComponentsTestModule {}

‎apps/nativescript-demo-ng/src/tests/property-sets.spec.ts

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class TestView extends View implements NgView {
77
public meta: ViewClassMeta = { skipAddToDom: false };
88
public nodeType = 1;
99
public nodeName = 'TestView';
10+
// @ts-ignore
1011
public parentNode: NgView = null;
1112
public previousSibling: NgView;
1213
public nextSibling: NgView;

‎jest.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
const { getJestProjects } = require('@nrwl/jest');
1+
const { getJestProjects } = require('@nx/jest');
22

33
export default { projects: getJestProjects() };

‎jest.preset.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const nxPreset = require('@nrwl/jest/preset').default;
1+
const nxPreset = require('@nx/jest/preset').default;
22

33
module.exports = {
44
...nxPreset,

‎nx.json

+40-9
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@
55
},
66
"tasksRunnerOptions": {
77
"default": {
8-
"runner": "@nrwl/nx-cloud",
8+
"runner": "nx-cloud",
99
"options": {
1010
"useDaemonProcess": false,
11-
"cacheableOperations": ["build", "lint", "test", "e2e"],
11+
"cacheableOperations": [
12+
"build",
13+
"lint",
14+
"test",
15+
"e2e"
16+
],
1217
"canTrackAnalytics": false,
1318
"showUsageWarnings": true,
1419
"parallel": 2,
@@ -23,19 +28,45 @@
2328
"$schema": "./node_modules/nx/schemas/nx-schema.json",
2429
"targetDefaults": {
2530
"build": {
26-
"dependsOn": ["^build"],
27-
"inputs": ["production", "^production"]
31+
"dependsOn": [
32+
"^build"
33+
],
34+
"inputs": [
35+
"production",
36+
"^production"
37+
]
2838
},
2939
"test": {
30-
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
40+
"inputs": [
41+
"default",
42+
"^production",
43+
"{workspaceRoot}/jest.preset.js"
44+
]
3145
},
3246
"lint": {
33-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
47+
"inputs": [
48+
"default",
49+
"{workspaceRoot}/.eslintrc.json"
50+
]
3451
}
3552
},
3653
"namedInputs": {
37-
"default": ["{projectRoot}/**/*", "sharedGlobals"],
38-
"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
39-
"production": ["default", "!{projectRoot}/.eslintrc.json", "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)", "!{projectRoot}/tsconfig.spec.json", "!{projectRoot}/jest.config.[jt]s"]
54+
"default": [
55+
"{projectRoot}/**/*",
56+
"sharedGlobals"
57+
],
58+
"sharedGlobals": [
59+
"{workspaceRoot}/workspace.json",
60+
"{workspaceRoot}/tsconfig.base.json",
61+
"{workspaceRoot}/tslint.json",
62+
"{workspaceRoot}/nx.json"
63+
],
64+
"production": [
65+
"default",
66+
"!{projectRoot}/.eslintrc.json",
67+
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
68+
"!{projectRoot}/tsconfig.spec.json",
69+
"!{projectRoot}/jest.config.[jt]s"
70+
]
4071
}
4172
}

‎package.json

+36-37
Original file line numberDiff line numberDiff line change
@@ -35,53 +35,46 @@
3535
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
3636
},
3737
"dependencies": {
38-
"@angular/animations": "15.2.2",
39-
"@angular/common": "15.2.2",
40-
"@angular/compiler": "15.2.2",
41-
"@angular/core": "15.2.2",
42-
"@angular/forms": "15.2.2",
43-
"@angular/platform-browser": "15.2.2",
44-
"@angular/platform-browser-dynamic": "15.2.2",
45-
"@angular/router": "15.2.2",
46-
"@nativescript/core": "~8.4.0",
38+
"@angular/animations": "16.0.1",
39+
"@angular/common": "16.0.1",
40+
"@angular/compiler": "16.0.1",
41+
"@angular/core": "16.0.1",
42+
"@angular/forms": "16.0.1",
43+
"@angular/platform-browser": "16.0.1",
44+
"@angular/platform-browser-dynamic": "16.0.1",
45+
"@angular/router": "16.0.1",
46+
"@nativescript/core": "~8.5.0",
4747
"@nativescript/theme": "~3.0.2",
4848
"@ngx-translate/core": "~14.0.0",
49-
"@nrwl/nx-cloud": "15.2.1",
50-
"nativescript-ngx-fonticon": "~7.0.0",
51-
"rxjs": "^7.5.6",
52-
"zone.js": "0.12.0"
49+
"nativescript-fonticon": "~8.0.0",
50+
"rxjs": "^7.8.0",
51+
"zone.js": "0.13.0",
52+
"nx-cloud": "16.0.5"
5353
},
5454
"devDependencies": {
55-
"@angular-devkit/build-angular": "15.2.2",
56-
"@angular-devkit/core": "15.2.2",
57-
"@angular-devkit/schematics": "15.2.2",
58-
"@angular-eslint/eslint-plugin": "15.2.1",
59-
"@angular-eslint/eslint-plugin-template": "15.2.1",
60-
"@angular-eslint/template-parser": "15.2.1",
61-
"@angular/compiler-cli": "15.2.2",
55+
"@angular-devkit/build-angular": "16.0.1",
56+
"@angular-devkit/core": "16.0.1",
57+
"@angular-devkit/schematics": "16.0.1",
58+
"@angular-eslint/eslint-plugin": "16.0.1",
59+
"@angular-eslint/eslint-plugin-template": "16.0.1",
60+
"@angular-eslint/template-parser": "16.0.1",
61+
"@angular/compiler-cli": "16.0.1",
6262
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
63-
"@nativescript/types": "~8.4.0",
63+
"@nativescript/types": "~8.5.0",
6464
"@nativescript/unit-test-runner": "^3.0.4",
6565
"@nativescript/webpack": "~5.0.12",
66-
"@nrwl/angular": "15.8.6",
67-
"@nrwl/cli": "15.8.6",
68-
"@nrwl/eslint-plugin-nx": "15.8.6",
69-
"@nrwl/jest": "15.8.6",
70-
"@nrwl/js": "15.8.6",
71-
"@nrwl/linter": "15.8.6",
72-
"@nrwl/node": "15.8.6",
73-
"@nrwl/workspace": "15.8.6",
66+
"@ngtools/webpack": "16.0.1",
7467
"@nstudio/angular": "15.0.3",
7568
"@nstudio/nativescript": "15.0.3",
7669
"@nstudio/nativescript-angular": "15.0.3",
7770
"@nstudio/xplat": "15.0.3",
78-
"@schematics/angular": "15.2.2",
71+
"@schematics/angular": "16.0.1",
7972
"@types/jasmine": "4.3.0",
8073
"@types/jest": "29.4.0",
8174
"@types/node": "^18.7.13",
8275
"@types/sinon": "^10.0.13",
83-
"@typescript-eslint/eslint-plugin": "5.52.0",
84-
"@typescript-eslint/parser": "5.52.0",
76+
"@typescript-eslint/eslint-plugin": "5.59.6",
77+
"@typescript-eslint/parser": "5.59.6",
8578
"conventional-changelog-cli": "^2.2.2",
8679
"dotenv": "16.0.1",
8780
"eslint": "8.22.0",
@@ -97,8 +90,8 @@
9790
"karma-nativescript-launcher": "0.4.0",
9891
"karma-sinon": "^1.0.5",
9992
"lint-staged": "^13.0.3",
100-
"ng-packagr": "15.2.2",
101-
"nx": "15.8.6",
93+
"ng-packagr": "16.0.1",
94+
"nx": "16.1.4",
10295
"nyc": "15.1.0",
10396
"postcss": "^8.4.16",
10497
"postcss-import": "14.1.0",
@@ -107,10 +100,17 @@
107100
"prettier": "2.7.1",
108101
"sass": "^1.54.5",
109102
"sinon": "^14.0.0",
110-
"ts-jest": "29.0.5",
103+
"ts-jest": "29.1.0",
111104
"ts-node": "10.9.1",
112105
"tslib": "^2.4.0",
113-
"typescript": "~4.9.0"
106+
"typescript": "5.0.4",
107+
"@nx/js": "16.1.4",
108+
"@nx/workspace": "16.1.4",
109+
"@nx/linter": "16.1.4",
110+
"@nx/jest": "16.1.4",
111+
"@nx/node": "16.1.4",
112+
"@nx/eslint-plugin": "16.1.4",
113+
"@nx/angular": "16.1.4"
114114
},
115115
"xplat": {
116116
"prefix": "nativescript",
@@ -123,4 +123,3 @@
123123
]
124124
}
125125
}
126-

‎packages/angular/.eslintrc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"overrides": [
55
{
66
"files": ["*.ts"],
7-
"extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
7+
"extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
88
"rules": {
99
"@angular-eslint/directive-selector": [
1010
"error",
@@ -27,7 +27,7 @@
2727
},
2828
{
2929
"files": ["*.html"],
30-
"extends": ["plugin:@nrwl/nx/angular-template"],
30+
"extends": ["plugin:@nx/angular-template"],
3131
"rules": {}
3232
}
3333
]

‎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": "15.2.0",
3+
"version": "16.0.0",
44
"homepage": "https://nativescript.org/",
55
"repository": {
66
"type": "git",

‎packages/angular/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
}
1414
},
1515
"lint": {
16-
"executor": "@nrwl/linter:eslint",
16+
"executor": "@nx/linter:eslint",
1717
"options": {
1818
"lintFilePatterns": ["packages/angular/**/*.ts", "packages/angular/src/**/*.html"]
1919
}
2020
},
2121
"test": {
22-
"executor": "@nrwl/jest:jest",
22+
"executor": "@nx/jest:jest",
2323
"options": {
2424
"jestConfig": "packages/angular/jest.config.ts",
2525
"passWithNoTests": true

‎packages/angular/src/lib/views/invisible-nodes.ts

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export abstract class InvisibleNode extends View implements NgView {
77
meta: { skipAddToDom: boolean };
88
nodeType: number;
99
nodeName: string;
10+
// @ts-ignore
1011
parentNode: NgView;
1112
nextSibling: NgView;
1213
previousSibling: NgView;

0 commit comments

Comments
 (0)