feat: upgrade nx

Chau Tran · Chau Tran · commit 019f94d5d702 · 2023-05-09T10:21:04.000-05:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,12 +1,12 @@
 {
     "root": true,
     "ignorePatterns": ["**/*"],
-    "plugins": ["@nrwl/nx"],
+    "plugins": ["@nx"],
     "overrides": [
         {
             "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
             "rules": {
-                "@nrwl/nx/enforce-module-boundaries": [
+                "@nx/enforce-module-boundaries": [
                     "error",
                     {
                         "enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
         },
         {
             "files": ["*.ts", "*.tsx"],
-            "extends": ["plugin:@nrwl/nx/typescript"],
+            "extends": ["plugin:@nx/typescript"],
             "rules": {}
         },
         {
             "files": ["*.js", "*.jsx"],
-            "extends": ["plugin:@nrwl/nx/javascript"],
+            "extends": ["plugin:@nx/javascript"],
             "rules": {}
         },
         {
diff --git a/apps/example/src/app/app.config.ts b/apps/example/src/app/app.config.ts
@@ -0,0 +1,4 @@
+import { ApplicationConfig } from '@angular/core';
+export const appConfig: ApplicationConfig = {
+    providers: [],
+};
diff --git a/apps/example/src/main.ts b/apps/example/src/main.ts
@@ -2,9 +2,8 @@ import { bootstrapApplication } from '@angular/platform-browser';
 import { extend } from 'angular-three';
 import * as THREE from 'three';
 import { AppComponent } from './app/app.component';
+import { appConfig } from './app/app.config';
 
 extend(THREE);
 
-bootstrapApplication(AppComponent, {
-    providers: [],
-}).catch((err) => console.error(err));
+bootstrapApplication(AppComponent, appConfig).catch((err) => console.error(err));
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,4 +1,4 @@
-import { getJestProjects } from '@nrwl/jest';
+import { getJestProjects } from '@nx/jest';
 
 export default {
     projects: getJestProjects(),
diff --git a/jest.preset.js b/jest.preset.js
@@ -1,4 +1,4 @@
-const nxPreset = require('@nrwl/jest/preset').default;
+const nxPreset = require('@nx/jest/preset').default;
 
 module.exports = {
     ...nxPreset,
diff --git a/libs/angular-three-postprocessing/.eslintrc.json b/libs/angular-three-postprocessing/.eslintrc.json
@@ -19,11 +19,11 @@
                 "@typescript-eslint/member-ordering": "off",
                 "@typescript-eslint/no-non-null-assertion": "off"
             },
-            "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]
+            "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]
         },
         {
             "files": ["*.html"],
-            "extends": ["plugin:@nrwl/nx/angular-template"],
+            "extends": ["plugin:@nx/angular-template"],
             "rules": {}
         }
     ]
diff --git a/libs/angular-three-postprocessing/ng-package.json b/libs/angular-three-postprocessing/ng-package.json
@@ -4,5 +4,5 @@
     "lib": {
         "entryFile": "src/index.ts"
     },
-    "allowedNonPeerDependencies": ["@nrwl/devkit"]
+    "allowedNonPeerDependencies": ["@nx/devkit"]
 }
diff --git a/libs/angular-three-postprocessing/package.json b/libs/angular-three-postprocessing/package.json
@@ -29,8 +29,8 @@
         "three": "^0.148.0 || ^0.149.0 || ^0.150.0 || ^0.151.0"
     },
     "dependencies": {
-        "@nrwl/devkit": "^15.0.0",
-        "tslib": "^2.3.0"
+        "tslib": "^2.3.0",
+        "@nx/devkit": "^15.0.0"
     },
     "sideEffects": false,
     "generators": "./plugin/generators.json",
diff --git a/libs/angular-three-postprocessing/project.json b/libs/angular-three-postprocessing/project.json
@@ -6,7 +6,7 @@
     "prefix": "ngtp",
     "targets": {
         "build": {
-            "executor": "@nrwl/angular:package",
+            "executor": "@nx/angular:package",
             "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
             "options": {
                 "project": "libs/angular-three-postprocessing/ng-package.json"
@@ -32,7 +32,7 @@
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "libs/angular-three-postprocessing/jest.config.ts",
@@ -46,7 +46,7 @@
             }
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": [
diff --git a/libs/plugin/.eslintrc.json b/libs/plugin/.eslintrc.json
@@ -18,7 +18,7 @@
             "files": ["./package.json", "./generators.json", "./executors.json"],
             "parser": "jsonc-eslint-parser",
             "rules": {
-                "@nrwl/nx/nx-plugin-checks": "error"
+                "@nx/nx-plugin-checks": "error"
             }
         }
     ]
diff --git a/libs/plugin/project.json b/libs/plugin/project.json
@@ -5,7 +5,7 @@
     "projectType": "library",
     "targets": {
         "build": {
-            "executor": "@nrwl/js:tsc",
+            "executor": "@nx/js:tsc",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "outputPath": "dist/libs/angular-three-postprocessing/plugin",
@@ -32,7 +32,7 @@
             }
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": [
@@ -44,7 +44,7 @@
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "libs/plugin/jest.config.ts",
diff --git a/libs/plugin/src/generators/init/compat.ts b/libs/plugin/src/generators/init/compat.ts
@@ -1,4 +1,4 @@
-import { convertNxGenerator } from '@nrwl/devkit';
+import { convertNxGenerator } from '@nx/devkit';
 import init from './init';
 
 export default convertNxGenerator(init);
diff --git a/libs/plugin/src/generators/init/init.spec.ts b/libs/plugin/src/generators/init/init.spec.ts
@@ -1,5 +1,5 @@
-import { readJson, Tree } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { readJson, Tree } from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import init, { ANGULAR_THREE_POSTPROCESSING_VERSION, POSTPROCESSING_VERSION } from './init';
 
 describe('init generator', () => {
diff --git a/libs/plugin/src/generators/init/init.ts b/libs/plugin/src/generators/init/init.ts
@@ -1,4 +1,4 @@
-import { addDependenciesToPackageJson, installPackagesTask, logger, readJson, Tree } from '@nrwl/devkit';
+import { addDependenciesToPackageJson, installPackagesTask, logger, readJson, Tree } from '@nx/devkit';
 
 export const ANGULAR_THREE_POSTPROCESSING_VERSION = '^1.0.0';
 export const POSTPROCESSING_VERSION = '^6.0.0';
diff --git a/migrations.json b/migrations.json
diff --git a/nx.json b/nx.json
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"root": true,`
`3`	`3`	`"ignorePatterns": ["*/"],`
`4`		`- "plugins": ["@nrwl/nx"],`
	`4`	`+ "plugins": ["@nx"],`
`5`	`5`	`"overrides": [`
`6`	`6`	`{`
`7`	`7`	`"files": [".ts", ".tsx", ".js", ".jsx"],`
`8`	`8`	`"rules": {`
`9`		`- "@nrwl/nx/enforce-module-boundaries": [`
	`9`	`+ "@nx/enforce-module-boundaries": [`
`10`	`10`	`"error",`
`11`	`11`	`{`
`12`	`12`	`"enforceBuildableLibDependency": true,`
`@@ -23,12 +23,12 @@`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"files": [".ts", ".tsx"],`
`26`		`- "extends": ["plugin:@nrwl/nx/typescript"],`
	`26`	`+ "extends": ["plugin:@nx/typescript"],`
`27`	`27`	`"rules": {}`
`28`	`28`	`},`
`29`	`29`	`{`
`30`	`30`	`"files": [".js", ".jsx"],`
`31`		`- "extends": ["plugin:@nrwl/nx/javascript"],`
	`31`	`+ "extends": ["plugin:@nx/javascript"],`
`32`	`32`	`"rules": {}`
`33`	`33`	`},`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { getJestProjects } from '@nrwl/jest';`
	`1`	`+import { getJestProjects } from '@nx/jest';`
`2`	`2`
`3`	`3`	`export default {`
`4`	`4`	`projects: getJestProjects(),`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const nxPreset = require('@nrwl/jest/preset').default;`
	`1`	`+const nxPreset = require('@nx/jest/preset').default;`
`2`	`2`
`3`	`3`	`module.exports = {`
`4`	`4`	`...nxPreset,`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@`
`19`	`19`	`"@typescript-eslint/member-ordering": "off",`
`20`	`20`	`"@typescript-eslint/no-non-null-assertion": "off"`
`21`	`21`	`},`
`22`		`- "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]`
	`22`	`+ "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"files": ["*.html"],`
`26`		`- "extends": ["plugin:@nrwl/nx/angular-template"],`
	`26`	`+ "extends": ["plugin:@nx/angular-template"],`
`27`	`27`	`"rules": {}`
`28`	`28`	`}`
`29`	`29`	`]`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`"lib": {`
`5`	`5`	`"entryFile": "src/index.ts"`
`6`	`6`	`},`
`7`		`- "allowedNonPeerDependencies": ["@nrwl/devkit"]`
	`7`	`+ "allowedNonPeerDependencies": ["@nx/devkit"]`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"files": ["./package.json", "./generators.json", "./executors.json"],`
`19`	`19`	`"parser": "jsonc-eslint-parser",`
`20`	`20`	`"rules": {`
`21`		`- "@nrwl/nx/nx-plugin-checks": "error"`
	`21`	`+ "@nx/nx-plugin-checks": "error"`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`]`