feat: Nx 19 and Angular 18 support (#328)

nstudio · May 27, 2024 · 3ce3191 · 3ce3191
1 parent 5f37e79
commit 3ce3191
Show file tree

Hide file tree

Showing 30 changed files with 5,117 additions and 4,805 deletions.
diff --git a/package.json b/package.json
@@ -34,32 +34,32 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1602.0",
-    "@angular-devkit/build-angular": "~16.2.0",
-    "@angular-devkit/core": "~16.2.0",
-    "@angular-devkit/schematics": "~16.2.0",
-    "@angular-eslint/eslint-plugin": "~16.2.0",
-    "@angular-eslint/eslint-plugin-template": "~16.2.0",
-    "@angular-eslint/template-parser": "~16.2.0",
-    "@angular/cli": "~16.2.0",
-    "@angular/common": "~16.2.0",
-    "@angular/compiler": "~16.2.0",
-    "@angular/compiler-cli": "~16.2.0",
-    "@angular/core": "~16.2.0",
-    "@angular/router": "~16.2.0",
-    "@ngrx/effects": "~16.2.0",
-    "@ngrx/router-store": "~16.2.0",
-    "@ngrx/store": "~16.2.0",
-    "@nx/angular": "17.0.1",
-    "@nx/devkit": "17.0.1",
-    "@nx/eslint": "17.0.1",
-    "@nx/eslint-plugin": "17.0.1",
-    "@nx/express": "17.0.1",
-    "@nx/jest": "17.0.1",
-    "@nx/js": "17.0.1",
+    "@angular-devkit/architect": "~0.1800.0",
+    "@angular-devkit/build-angular": "~18.0.0",
+    "@angular-devkit/core": "~18.0.0",
+    "@angular-devkit/schematics": "~18.0.0",
+    "@angular-eslint/eslint-plugin": "~17.5.1",
+    "@angular-eslint/eslint-plugin-template": "~17.5.1",
+    "@angular-eslint/template-parser": "~17.5.1",
+    "@angular/cli": "~18.0.0",
+    "@angular/common": "~18.0.0",
+    "@angular/compiler": "~18.0.0",
+    "@angular/compiler-cli": "~18.0.0",
+    "@angular/core": "~18.0.0",
+    "@angular/router": "~18.0.0",
+    "@ngrx/effects": "~17.2.0",
+    "@ngrx/router-store": "~17.2.0",
+    "@ngrx/store": "~17.2.0",
+    "@nx/angular": "19.1.0",
+    "@nx/devkit": "19.1.0",
+    "@nx/eslint": "19.1.0",
+    "@nx/eslint-plugin": "19.1.0",
+    "@nx/express": "19.1.0",
+    "@nx/jest": "19.1.0",
+    "@nx/js": "19.1.0",
     "@nrwl/nx-cloud": "16.5.2",
-    "@nx/web": "17.0.1",
-    "@schematics/angular": "~16.2.0",
+    "@nx/web": "19.1.0",
+    "@schematics/angular": "~18.0.0",
     "@types/eslint": "~8.44.0",
     "@types/flat": "^5.0.1",
     "@types/fs-extra": "^11.0.1",
@@ -71,27 +71,27 @@
     "@types/semver": "^7.3.8",
     "@types/tmp": "^0.2.0",
     "@types/yargs": "^17.0.10",
-    "@typescript-eslint/eslint-plugin": "~6.8.0",
-    "@typescript-eslint/parser": "~6.8.0",
-    "@typescript-eslint/type-utils": "~6.8.0",
-    "@typescript-eslint/utils": "~6.8.0",
+    "@typescript-eslint/eslint-plugin": "~7.10.0",
+    "@typescript-eslint/parser": "~7.10.0",
+    "@typescript-eslint/type-utils": "~7.10.0",
+    "@typescript-eslint/utils": "~7.10.0",
     "babel-jest": "~29.7.0",
     "babel-loader": "^9.1.3",
     "chalk": "~5.3.0",
     "commitizen": "^4.3.0",
     "conventional-changelog-cli": "^4.0.0",
     "cz-conventional-changelog": "^3.3.0",
     "cz-customizable": "^7.0.0",
-    "dotenv": "~16.3.0",
+    "dotenv": "~16.4.0",
     "ejs": "^3.1.7",
     "eslint": "8.48.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "2.28.1",
+    "eslint-plugin-import": "2.29.1",
     "flat": "^6.0.0",
     "fs-extra": "^11.1.0",
     "github-contributors-list": "~1.2.3",
     "http-server": "~14.1.0",
-    "husky": "^8.0.1",
+    "husky": "^9.0.1",
     "ignore": "^5.2.0",
     "jasmine": "~5.1.0",
     "jasmine-core": "~5.1.1",
@@ -101,14 +101,14 @@
     "jsonc-eslint-parser": "^2.1.0",
     "jsonc-parser": "3.2.0",
     "lint-staged": "^15.0.0",
-    "ng-packagr": "~16.2.0",
-    "nx": "17.0.1",
-    "open": "^9.1.0",
+    "ng-packagr": "~18.0.0",
+    "nx": "19.1.0",
+    "open": "^10.1.0",
     "parse-markdown-links": "^1.0.4",
     "parse5": "~7.1.2",
     "postcss": "~8.4.29",
-    "postcss-import": "~15.1.0",
-    "postcss-preset-env": "~9.1.3",
+    "postcss-import": "~16.1.0",
+    "postcss-preset-env": "~9.5.0",
     "postcss-url": "~10.1.3",
     "prettier": "^2.6.2",
     "prettier-plugin-tailwindcss": "^0.5.4",
@@ -117,12 +117,12 @@
     "semver": "~7.5.4",
     "tmp": "~0.2.1",
     "tree-kill": "1.2.2",
-    "ts-jest": "29.1.1",
+    "ts-jest": "29.1.3",
     "ts-loader": "^9.5.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "typedoc": "~0.25.0",
-    "typedoc-plugin-markdown": "~3.16.0",
-    "typescript": "~5.1.6",
+    "typedoc-plugin-markdown": "~4.0.0",
+    "typescript": "~5.4.0",
     "verdaccio": "^5.0.4",
     "xml2js": "^0.6.2",
     "yargs": "^17.4.0",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -29,7 +29,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/angular": "^17.0.0"
+    "@nx/angular": "^19.0.0"
   },
   "peerDependencies": {
     "@nstudio/xplat": "*"

diff --git a/packages/angular/src/schematics/application/index.ts b/packages/angular/src/schematics/application/index.ts
@@ -65,7 +65,6 @@ export default function (options: Schema) {
         ...options,
         standalone: false,
         skipInstall: true,
-        projectNameAndRootFormat: 'derived',
       };
       // remove non schema validated properties
       delete nrwlWebOptions.groupByName;

diff --git a/packages/angular/src/utils/ast.ts b/packages/angular/src/utils/ast.ts
@@ -1,5 +1,5 @@
 import { ensureTypescript } from '@nx/js/src/utils/typescript/ensure-typescript';
-import { findNodes } from 'nx/src/utils/typescript';
+import { findNodes } from '@nx/js';
 import * as ts from 'typescript';
 import {
   getImport,

diff --git a/packages/angular/src/utils/testing.ts b/packages/angular/src/utils/testing.ts
@@ -10,7 +10,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree)
 }
 
 // export function runSchematicSync(

diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts
@@ -1,9 +1,9 @@
 export const xplatVersion = '*';
-export const nxVersion = '^17.0.0';
-export const angularVersion = '^16.0.0';
-export const angularDevkitVersion = '^16.0.0';
-export const ngxTranslateVersion = '~14.0.0';
-export const ngxTranslateHttpVersion = '~7.0.0';
+export const nxVersion = '^19.0.0';
+export const angularVersion = '^18.0.0';
+export const angularDevkitVersion = '^18.0.0';
+export const ngxTranslateVersion = '~15.0.0';
+export const ngxTranslateHttpVersion = '~8.0.0';
 export const rxjsVersion = '^7.8.0';
-export const zonejsVersion = '~0.13.0';
+export const zonejsVersion = '~0.14.0';
 export const typesJest = '29.5.6';
diff --git a/packages/electron-angular/src/utils/testing.ts b/packages/electron-angular/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 // export function runSchematicSync(

diff --git a/packages/electron/src/utils/testing.ts b/packages/electron/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 export function callRule(rule: Rule, tree: Tree) {

diff --git a/packages/ionic-angular/src/utils/testing.ts b/packages/ionic-angular/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 // export function runSchematicSync(

diff --git a/packages/ionic-angular/src/utils/versions.ts b/packages/ionic-angular/src/utils/versions.ts
@@ -2,10 +2,10 @@ export const xplatVersion = '*';
 export const ionicAngularVersion = '^6.0.0';
 export const capacitorVersion = '^5.5.0';
 export const capacitorPluginsVersion = '~1.0.2';
-export const ngDevKitArchitect = '^0.1500.0';
-export const ngDevKitBuild = '^16.0.0';
-export const ngDevKitCore = '^16.0.0';
-export const ngDevKitSchematics = '^16.0.0';
+export const ngDevKitArchitect = '^0.1800.0';
+export const ngDevKitBuild = '^18.0.0';
+export const ngDevKitCore = '^18.0.0';
+export const ngDevKitSchematics = '^18.0.0';
 export const tsLibVersion = '^2.0.0';
 
 export const ionicAngularToolkitVersion = '^6.0.0';
@@ -17,11 +17,11 @@ export const karmaCoverageVersion = '~2.0.3';
 export const karmaCoverageInstanbulVersion = '~3.0.2';
 export const karmaJasmineVersion = '~4.0.0';
 export const karmaJasmineHtmlVersion = '^1.5.0';
-export const typescriptVersion = '~5.1.6';
+export const typescriptVersion = '~5.4.0';
 
-export const angularVersion = '^16.0.0';
-export const angularDevkitVersion = '^16.0.0';
-export const ngxTranslateVersion = '~14.0.0';
-export const ngxTranslateHttpVersion = '~7.0.0';
+export const angularVersion = '^18.0.0';
+export const angularDevkitVersion = '^18.0.0';
+export const ngxTranslateVersion = '~15.0.0';
+export const ngxTranslateHttpVersion = '~8.0.0';
 export const rxjsVersion = '^7.8.0';
 export const zonejsVersion = '~0.13.0';
diff --git a/packages/ionic/src/utils/testing.ts b/packages/ionic/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 export function callRule(rule: Rule, tree: Tree) {

diff --git a/packages/nativescript-angular/src/schematics/application/_files/package.json b/packages/nativescript-angular/src/schematics/application/_files/package.json
@@ -10,7 +10,7 @@
     "@nativescript/core": "*"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
+    "@nativescript/android": "~8.7.0",
+    "@nativescript/ios": "~8.7.0"
   }
 }
diff --git a/packages/nativescript-angular/src/schematics/application/_skipxplat_files/package.json b/packages/nativescript-angular/src/schematics/application/_skipxplat_files/package.json
@@ -9,7 +9,7 @@
     "@nativescript/core": "*"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
+    "@nativescript/android": "~8.7.0",
+    "@nativescript/ios": "~8.7.0"
   }
 }
diff --git a/packages/nativescript-angular/src/utils/testing.ts b/packages/nativescript-angular/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 // export function runSchematicSync(

diff --git a/packages/nativescript-angular/src/utils/versions.ts b/packages/nativescript-angular/src/utils/versions.ts
@@ -1,19 +1,18 @@
 export const xplatVersion = '*';
-export const nsCoreVersion = '~8.6.0';
-export const nsNgScopedVersion = '^16.0.0';
+export const nsCoreVersion = '~8.7.0';
+export const nsNgScopedVersion = '^18.0.0';
 export const nsNgFonticonVersion = '~8.0.2';
 export const nsWebpackVersion = '~5.0.0';
 export const sassVersion = '^1.30.0';
 export const nsThemeCoreVersion = '^1.0.4';
-export const typescriptVersion = '~5.1.6';
+export const typescriptVersion = '~5.4.0';
 
 // in case workspace had not added angular yet
 // TODO: move deps to nstudio/xplat to ref from everywhere for all supported framework versions
-export const angularVersion = '^16.0.0';
-export const ngToolsWebpack = '^16.0.0';
-export const ngxTranslateVersion = '~14.0.0';
+export const angularVersion = '^18.0.0';
+export const ngToolsWebpack = '^18.0.0';
+export const ngxTranslateVersion = '~15.0.0';
 export const rxjsVersion = '^7.8.0';
-export const zonejsVersion = '~0.13.0';
-export const angularEsLintVersion = '^16.0.0';
-export const nsEsLintVersion = '~0.0.4';
-export const esLintVersion = '8.15.0';
+export const zonejsVersion = '~0.14.0';
+export const angularEsLintVersion = '17.5.1';
+export const esLintVersion = '8.57.0';
diff --git a/packages/nativescript-angular/src/utils/xplat.ts b/packages/nativescript-angular/src/utils/xplat.ts
@@ -16,7 +16,6 @@ import {
   rxjsVersion,
   zonejsVersion,
   angularEsLintVersion,
-  nsEsLintVersion,
   esLintVersion,
   nsWebpackVersion,
 } from './versions';
@@ -78,7 +77,6 @@ export namespace XplatNativeScriptAngularHelpers {
         },
         devDependencies: {
           ...angularDevDeps,
-          '@nativescript/eslint-plugin': nsEsLintVersion,
           '@nativescript/webpack': nsWebpackVersion,
           '@ngtools/webpack': ngToolsWebpack,
           eslint: esLintVersion,

diff --git a/packages/nativescript/package.json b/packages/nativescript/package.json
@@ -29,7 +29,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nativescript/nx": "^17.0.0"
+    "@nativescript/nx": "^19.0.0"
   },
   "peerDependencies": {
     "@nstudio/xplat": "*"

diff --git a/packages/nativescript/src/schematics/application/_files/package.json b/packages/nativescript/src/schematics/application/_files/package.json
@@ -10,7 +10,7 @@
     "@nativescript/core": "*"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.6.0",
-    "@nativescript/ios": "~8.6.0"
+    "@nativescript/android": "~8.7.0",
+    "@nativescript/ios": "~8.7.0"
   }
 }
diff --git a/packages/nativescript/src/utils/testing.ts b/packages/nativescript/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 export function callRule(rule: Rule, tree: Tree) {

diff --git a/packages/nativescript/src/utils/versions.ts b/packages/nativescript/src/utils/versions.ts
@@ -1,4 +1,4 @@
 export const xplatVersion = '*';
-export const nsCoreVersion = '~8.6.0';
+export const nsCoreVersion = '~8.7.0';
 export const nsThemeCoreVersion = '^1.0.4';
 export const sassVersion = '^1.30.0';
diff --git a/packages/schematics/package.json b/packages/schematics/package.json
@@ -70,7 +70,7 @@
     "migrations": "./migrations/migrations.json"
   },
   "dependencies": {
-    "@nx/angular": "^17.0.0",
+    "@nx/angular": "^19.0.0",
     "@nstudio/xplat-utils": "*"
   }
 }
diff --git a/packages/web-angular/src/utils/testing.ts b/packages/web-angular/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 export function callRule(rule: Rule, tree: Tree) {

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -30,7 +30,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/web": "^17.0.0"
+    "@nx/web": "^19.0.0"
   },
   "peerDependencies": {
     "@nstudio/xplat": "*"

diff --git a/packages/web/src/utils/testing.ts b/packages/web/src/utils/testing.ts
@@ -8,7 +8,7 @@ const testRunner = new SchematicTestRunner(
 );
 
 export function runSchematic(schematicName: string, options: any, tree: Tree) {
-  return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
+  return testRunner.runSchematic(schematicName, options, tree);
 }
 
 export function callRule(rule: Rule, tree: Tree) {