feat: nx 15 support (#314)

nstudio · Oct 26, 2022 · b32435b · b32435b
1 parent 016ad1c
commit b32435b
Show file tree

Hide file tree

Showing 18 changed files with 4,734 additions and 7,032 deletions.
diff --git a/package.json b/package.json
@@ -34,98 +34,154 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1400.2",
-    "@angular-devkit/build-angular": "~14.0.0",
-    "@angular-devkit/core": "~14.0.0",
-    "@angular-devkit/schematics": "~14.0.0",
-    "@angular-eslint/eslint-plugin": "~13.5.0",
-    "@angular-eslint/eslint-plugin-template": "~13.5.0",
-    "@angular-eslint/template-parser": "~13.5.0",
-    "@angular/cli": "~14.0.0",
-    "@angular/common": "~14.0.0",
-    "@angular/compiler": "~14.0.0",
-    "@angular/compiler-cli": "~14.0.0",
-    "@angular/core": "~14.0.0",
-    "@angular/forms": "~14.0.0",
-    "@angular/platform-browser": "~14.0.0",
-    "@angular/platform-browser-dynamic": "~14.0.0",
-    "@angular/router": "~14.0.0",
-    "@angular/service-worker": "~14.0.0",
-    "@angular/upgrade": "~14.0.0",
-    "@cypress/webpack-preprocessor": "^5.9.1",
-    "@nrwl/angular": "~14.3.0",
-    "@nrwl/cli": "~14.3.0",
-    "@nrwl/devkit": "~14.3.0",
-    "@nrwl/express": "~14.3.0",
-    "@nrwl/jest": "~14.3.0",
-    "@nrwl/linter": "~14.3.0",
-    "@nrwl/nest": "~14.3.0",
-    "@nrwl/node": "~14.3.0",
-    "@nrwl/react": "~14.3.0",
-    "@nrwl/tao": "~14.3.0",
-    "@nrwl/web": "~14.3.0",
-    "@nrwl/workspace": "~14.3.0",
-    "@schematics/angular": "~14.0.0",
+    "@angular-devkit/architect": "~0.1402.0",
+    "@angular-devkit/build-angular": "~14.2.0",
+    "@angular-devkit/core": "~14.2.0",
+    "@angular-devkit/schematics": "~14.2.0",
+    "@angular-eslint/eslint-plugin": "~14.0.4",
+    "@angular-eslint/eslint-plugin-template": "~14.0.4",
+    "@angular-eslint/template-parser": "~14.0.4",
+    "@angular/cli": "~14.2.0",
+    "@angular/common": "~14.2.0",
+    "@angular/compiler": "~14.2.0",
+    "@angular/compiler-cli": "~14.2.0",
+    "@angular/core": "~14.2.0",
+    "@angular/router": "~14.2.0",
+    "@ngrx/effects": "~14.0.0",
+    "@ngrx/router-store": "~14.0.0",
+    "@ngrx/store": "~14.0.0",
+    "@nrwl/angular": "~15.0.0",
+    "@nrwl/devkit": "~15.0.0",
+    "@nrwl/eslint-plugin-nx": "~15.0.0",
+    "@nrwl/express": "~15.0.0",
+    "@nrwl/jest": "~15.0.0",
+    "@nrwl/js": "~15.0.0",
+    "@nrwl/linter": "~15.0.0",
+    "@nrwl/nx-cloud": "~15.0.0",
+    "@nrwl/web": "~15.0.0",
+    "@schematics/angular": "~14.2.0",
+    "@types/eslint": "~8.4.1",
     "@types/express": "4.17.13",
+    "@types/flat": "^5.0.1",
+    "@types/fs-extra": "^9.0.13",
+    "@types/is-ci": "^3.0.0",
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
-    "@types/jest": "27.4.1",
-    "@types/node": "^17.0.0",
+    "@types/jest": "28.1.7",
+    "@types/marked": "^2.0.0",
+    "@types/node": "18.7.18",
     "@types/prettier": "^2.6.2",
-    "@types/xml2js": "^0.4.5",
+    "@types/semver": "^7.3.8",
+    "@types/tar-stream": "^2.2.2",
+    "@types/tmp": "^0.2.0",
     "@types/yargs": "^17.0.10",
-    "app-root-path": "~3.0.0",
-    "circular-dependency-plugin": "~5.2.0",
-    "commitizen": "~4.2.0",
-    "conventional-changelog-cli": "~2.2.0",
-    "cz-conventional-changelog": "~3.3.0",
-    "document-register-element": "~1.14.3",
+    "@types/yarnpkg__lockfile": "^1.1.5",
+    "@typescript-eslint/eslint-plugin": "5.38.1",
+    "@typescript-eslint/parser": "5.38.1",
+    "@typescript-eslint/type-utils": "^5.36.1",
+    "@typescript-eslint/utils": "5.38.1",
+    "ajv": "^8.11.0",
+    "autoprefixer": "10.4.12",
+    "babel-jest": "28.1.3",
+    "babel-loader": "^8.2.2",
+    "chalk": "4.1.0",
+    "chokidar": "^3.5.1",
+    "commitizen": "^4.0.3",
+    "conventional-changelog-cli": "^2.0.23",
+    "core-js": "^3.6.5",
+    "cz-conventional-changelog": "^3.0.2",
+    "cz-customizable": "^6.2.0",
+    "depcheck": "^1.3.1",
     "dotenv": "~10.0.0",
-    "express": "4.17.2",
-    "fork-ts-checker-webpack-plugin": "6.2.10",
+    "ejs": "^3.1.7",
+    "enhanced-resolve": "^5.8.3",
+    "eslint": "8.15.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-import": "2.26.0",
+    "express": "^4.18.1",
+    "fast-xml-parser": "^4.0.9",
+    "file-loader": "^6.2.0",
+    "file-type": "^16.2.0",
+    "flat": "^5.0.2",
+    "fork-ts-checker-webpack-plugin": "7.2.13",
     "fs-extra": "^10.1.0",
     "github-contributors-list": "~1.2.3",
-    "husky": "^8.0.0",
-    "identity-obj-proxy": "~3.0.0",
-    "ignore": "~5.1.8",
+    "http-server": "14.1.0",
+    "husky": "^8.0.1",
+    "identity-obj-proxy": "3.0.0",
+    "ignore": "^5.0.4",
+    "immer": "^9.0.6",
+    "import-fresh": "^3.1.0",
+    "injection-js": "^2.4.0",
+    "is-ci": "^3.0.0",
+    "is-windows": "^1.0.2",
     "jasmine-core": "~2.99.1",
     "jasmine-marbles": "~0.8.4",
     "jasmine-spec-reporter": "~4.2.1",
-    "jest": "27.5.1",
-    "jest-circus": "27.2.3",
-    "jest-preset-angular": "11.1.1",
-    "karma": "~4.0.0",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.1",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "karma-webpack": "4.0.2",
-    "lint-staged": "^11.2.0",
-    "jsonc-parser": "3.0.0",
-    "ng-packagr": "~14.0.0",
-    "npm-run-all": "~4.1.5",
-    "open": "~8.4.0",
-    "precise-commits": "~1.0.2",
+    "jest": "28.1.3",
+    "jest-environment-jsdom": "28.1.1",
+    "js-yaml": "4.1.0",
+    "jsonc-eslint-parser": "^2.1.0",
+    "jsonc-parser": "3.2.0",
+    "kill-port": "^1.6.1",
+    "lint-staged": "^13.0.0",
+    "loader-utils": "1.2.3",
+    "lockfile-lint": "^4.7.6",
+    "magic-string": "~0.26.2",
+    "memfs": "^3.0.1",
+    "mini-css-extract-plugin": "~2.4.7",
+    "minimatch": "3.0.5",
+    "ng-packagr": "~14.2.0",
+    "node-fetch": "^2.6.7",
+    "nx": "~15.0.0",
+    "open": "^8.4.0",
+    "parse-markdown-links": "^1.0.4",
+    "parse5": "4.0.0",
+    "postcss": "8.4.16",
+    "postcss-import": "~14.1.0",
+    "postcss-preset-env": "~7.5.0",
+    "postcss-url": "~10.1.3",
     "prettier": "^2.6.2",
+    "prettier-plugin-tailwindcss": "^0.1.5",
     "pretty-quick": "^3.1.0",
-    "release-it": "~15.0.0",
-    "rxjs": "~6.6.0",
-    "semver": "~7.3.0",
-    "shelljs": "~0.8.4",
-    "source-map-support": "~0.5.19",
+    "raw-loader": "^4.0.2",
+    "regenerator-runtime": "0.13.7",
+    "rxjs": "6.6.7",
+    "rxjs-for-await": "0.0.2",
+    "sass": "1.55.0",
+    "sass-loader": "^12.2.0",
+    "semver": "7.3.4",
+    "source-map": "0.7.3",
+    "source-map-loader": "^3.0.0",
+    "source-map-support": "0.5.19",
+    "style-loader": "^3.3.0",
+    "styled-components": "5.0.0",
+    "stylus": "^0.55.0",
+    "stylus-loader": "^6.2.0",
+    "tar-fs": "^2.1.1",
+    "tar-stream": "~2.2.0",
+    "tcp-port-used": "^1.0.2",
     "tmp": "~0.2.1",
-    "tree-kill": "~1.2.2",
-    "ts-loader": "^9.2.6",
-    "ts-node": "~10.8.1",
-    "tsconfig-paths-webpack-plugin": "~3.5.0",
-    "tslib": "^2.3.0",
-    "tslint": "~6.1.2",
-    "typescript": "~4.7.2",
-    "verdaccio": "^5.10.2",
-    "xml2js": "~0.4.23",
+    "tree-kill": "1.2.2",
+    "ts-jest": "28.0.8",
+    "ts-loader": "^9.3.1",
+    "ts-node": "10.9.1",
+    "tsconfig-paths": "^3.9.0",
+    "tsconfig-paths-webpack-plugin": "3.5.2",
+    "tslint-to-eslint-config": "^2.13.0",
+    "typedoc": "0.22.9",
+    "typedoc-plugin-markdown": "3.11.6",
+    "typescript": "~4.7.3",
+    "url-loader": "^4.1.1",
+    "verdaccio": "^5.0.4",
+    "webpack": "^5.58.1",
+    "webpack-dev-server": "^4.9.3",
+    "webpack-merge": "^5.8.0",
+    "webpack-node-externals": "^3.0.0",
+    "webpack-sources": "^3.2.3",
+    "xml2js": "^0.4.23",
     "yargs": "^17.4.0",
-    "yargs-parser": "21.0.1",
-    "zone.js": "~0.11.4"
+    "yargs-parser": "21.0.1"
   },
   "config": {
     "commitizen": {

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

diff --git a/packages/angular/src/schematics/elements/index.ts b/packages/angular/src/schematics/elements/index.ts
@@ -253,7 +253,7 @@ function updateWorkspaceSupport(
     json.devDependencies = {
       ...json.devDependencies,
       'http-server': '^14.1.1',
-      'ngx-build-plus': '^14.0.0',
+      'ngx-build-plus': '^15.0.0',
     };
 
     return json;

diff --git a/packages/angular/src/utils/versions.ts b/packages/angular/src/utils/versions.ts
@@ -1,5 +1,5 @@
 export const xplatVersion = '*';
-export const nxVersion = '^14.0.0';
+export const nxVersion = '^15.0.0';
 export const angularVersion = '^14.0.0';
 export const angularDevkitVersion = '^14.0.0';
 export const ngxTranslateVersion = '~14.0.0';

diff --git a/packages/electron-angular/src/schematics/application/index.ts b/packages/electron-angular/src/schematics/application/index.ts
@@ -141,11 +141,6 @@ export default function (options: XplatElectrontHelpers.SchemaApp) {
       });
     },
     options.useXplat ? (tree: Tree) => adjustAppFiles(options, tree) : noop(),
-    (tree: Tree) => {
-      return externalSchematic('@nrwl/workspace', 'convert-to-nx-project', {
-        project: options.name
-      });
-    },
 
     formatFiles({ skipFormat: options.skipFormat }),
     XplatElectrontHelpers.noteAppCommands(options),

diff --git a/packages/electron-angular/src/utils/versions.ts b/packages/electron-angular/src/utils/versions.ts
@@ -1,2 +1,2 @@
 export const xplatVersion = '*';
-export const nxVersion = '^14.0.0';
+export const nxVersion = '^15.0.0';
diff --git a/packages/electron/src/schematics/application/index.ts b/packages/electron/src/schematics/application/index.ts
@@ -112,11 +112,6 @@ export default function (options: XplatElectrontHelpers.SchemaApp) {
         });
       });
     },
-    (tree: Tree) => {
-      return externalSchematic('@nrwl/workspace', 'convert-to-nx-project', {
-        project: options.name
-      });
-    },
 
     formatFiles({ skipFormat: options.skipFormat }),
   ]);

diff --git a/packages/ionic-angular/src/schematics/application/index.ts b/packages/ionic-angular/src/schematics/application/index.ts
@@ -288,11 +288,6 @@ export default function (options: ApplicationOptions) {
         });
       });
     },
-    (tree: Tree) => {
-      return externalSchematic('@nrwl/workspace', 'convert-to-nx-project', {
-        project: options.name
-      });
-    },
     <any>formatFiles({ skipFormat: options.skipFormat }),
   ]);
 }

diff --git a/packages/ionic/src/schematics/application/index.ts b/packages/ionic/src/schematics/application/index.ts
@@ -91,11 +91,6 @@ export default function (options: Schema) {
         });
       });
     },
-    (tree: Tree) => {
-      return externalSchematic('@nrwl/workspace', 'convert-to-nx-project', {
-        project: options.name
-      });
-    },
     <any>formatFiles({ skipFormat: options.skipFormat }),
   ]);
 }

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.2.0",
-    "@nativescript/ios": "~8.2.0"
+    "@nativescript/android": "~8.3.0",
+    "@nativescript/ios": "~8.3.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.2.0",
-    "@nativescript/ios": "~8.2.0"
+    "@nativescript/android": "~8.3.0",
+    "@nativescript/ios": "~8.3.0"
   }
 }
diff --git a/packages/nativescript-angular/src/schematics/application/index.ts b/packages/nativescript-angular/src/schematics/application/index.ts
@@ -192,11 +192,6 @@ export default function (options: Schema) {
         });
       });
     },
-    (tree: Tree) => {
-      return externalSchematic('@nrwl/workspace', 'convert-to-nx-project', {
-        project: options.name
-      });
-    },
     (tree: Tree) => {
       output.log({
         title: 'You will be able to run your app with:',

diff --git a/packages/nativescript-angular/src/utils/versions.ts b/packages/nativescript-angular/src/utils/versions.ts
@@ -1,5 +1,5 @@
 export const xplatVersion = '*';
-export const nsCoreVersion = '~8.2.0';
+export const nsCoreVersion = '~8.3.0';
 export const nsNgScopedVersion = '^14.0.0';
 export const nsNgFonticonVersion = '~7.0.0';
 export const nsWebpackVersion = '~5.0.0';
@@ -14,6 +14,6 @@ export const ngToolsWebpack = '^14.0.0';
 export const ngxTranslateVersion = '~14.0.0';
 export const rxjsVersion = '^7.4.0';
 export const zonejsVersion = '~0.11.4';
-export const angularEsLintVersion = '~13.5.0';
+export const angularEsLintVersion = '^14.0.0';
 export const nsEsLintVersion = '~0.0.4';
 export const esLintVersion = '8.15.0';
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.2.0",
-    "@nativescript/ios": "~8.2.0"
+    "@nativescript/android": "~8.3.0",
+    "@nativescript/ios": "~8.3.0"
   }
 }
diff --git a/packages/nativescript/src/schematics/application/index.ts b/packages/nativescript/src/schematics/application/index.ts
@@ -132,11 +132,6 @@ export default function (options: Schema) {
         });
       });
     },
-    (tree: Tree) => {
-      return externalSchematic('@nrwl/workspace', 'convert-to-nx-project', {
-        project: options.name
-      });
-    },
     (tree: Tree) => {
       output.log({
         title: 'You will be able to run your app with:',

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.2.0';
+export const nsCoreVersion = '~8.3.0';
 export const nsThemeCoreVersion = '^1.0.4';
 export const sassVersion = '^1.30.0';
diff --git a/packages/xplat/src/utils/versions.ts b/packages/xplat/src/utils/versions.ts
@@ -1,2 +1,2 @@
 export const xplatVersion = '*';
-export const nxVersion = '^14.0.0';
+export const nxVersion = '^15.0.0';