feat: upgrade nx

Chau Tran · Chau Tran · commit 318567781d30 · 2023-05-09T09:30:21.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": {}
         },
         {
@@ -43,5 +43,6 @@
             "parser": "jsonc-eslint-parser",
             "rules": {}
         }
-    ]
+    ],
+    "extends": [null, "plugin:storybook/recommended"]
 }
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-soba/.eslintrc.json b/libs/angular-three-soba/.eslintrc.json
@@ -17,11 +17,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-soba/.storybook/main.js b/libs/angular-three-soba/.storybook/main.js
@@ -1,21 +1,29 @@
-const { resolve } = require('path');
-
+const {
+  resolve
+} = require('path');
 module.exports = {
-    core: { builder: 'webpack5' },
-    stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
-    addons: ['@storybook/addon-essentials'],
-    webpackFinal: async (config, { configType }) => {
-        // apply any global webpack configs that might have been specified in .storybook/main.js
-
-        // add your own webpack tweaks if needed
-        config.module.rules.push({
-            test: /\.(glsl|vs|fs|vert|frag)$/,
-            exclude: /node_modules/,
-            use: ['raw-loader', 'glslify-loader'],
-            include: resolve(__dirname, '../'),
-        });
+  stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
+  addons: ['@storybook/addon-essentials'],
+  webpackFinal: async (config, {
+    configType
+  }) => {
+    // apply any global webpack configs that might have been specified in .storybook/main.js
 
-        return config;
-    },
-    staticDirs: ['./public'],
-};
+    // add your own webpack tweaks if needed
+    config.module.rules.push({
+      test: /\.(glsl|vs|fs|vert|frag)$/,
+      exclude: /node_modules/,
+      use: ['raw-loader', 'glslify-loader'],
+      include: resolve(__dirname, '../')
+    });
+    return config;
+  },
+  staticDirs: ['./public'],
+  framework: {
+    name: '@storybook/angular',
+    options: {}
+  },
+  docs: {
+    autodocs: true
+  }
+};
diff --git a/libs/angular-three-soba/.storybook/preview-body.html b/libs/angular-three-soba/.storybook/preview-body.html
@@ -1,12 +1,7 @@
 <style>
     html,
-    body {
-        width: 100%;
-        height: 100%;
-        background-color: #121212;
-    }
-
-    #root {
+    body,
+    #storybook-root {
         width: 100%;
         height: 100%;
         background-color: #121212;
diff --git a/libs/angular-three-soba/.storybook/public/soba/draco/draco_decoder.wasm b/libs/angular-three-soba/.storybook/public/soba/draco/draco_decoder.wasm
diff --git a/libs/angular-three-soba/ng-package.json b/libs/angular-three-soba/ng-package.json
@@ -11,5 +11,5 @@
             "output": "assets"
         }
     ],
-    "allowedNonPeerDependencies": ["@nrwl/devkit"]
+    "allowedNonPeerDependencies": ["@nx/devkit"]
 }
diff --git a/libs/angular-three-soba/package.json b/libs/angular-three-soba/package.json
@@ -34,8 +34,8 @@
         "troika-three-text": "^0.47.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-soba/project.json b/libs/angular-three-soba/project.json
@@ -6,7 +6,7 @@
     "prefix": "ngts",
     "targets": {
         "build": {
-            "executor": "@nrwl/angular:package",
+            "executor": "@nx/angular:package",
             "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
             "options": {
                 "project": "libs/angular-three-soba/ng-package.json"
@@ -29,7 +29,7 @@
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "libs/angular-three-soba/jest.config.ts",
@@ -43,7 +43,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-soba/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_SOBA_VERSION, THREE_STDLIB_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_SOBA_VERSION = '^1.0.0';
 export const THREE_STDLIB_VERSION = '^2.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
diff --git a/storybook-migration-summary.md b/storybook-migration-summary.md

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`	`{`
`@@ -43,5 +43,6 @@`
`43`	`43`	`"parser": "jsonc-eslint-parser",`
`44`	`44`	`"rules": {}`
`45`	`45`	`}`
`46`		`- ]`
	`46`	`+ ],`
	`47`	`+ "extends": [null, "plugin:storybook/recommended"]`
`47`	`48`	`}`
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
`@@ -17,11 +17,11 @@`
`17`	`17`	`"@typescript-eslint/member-ordering": "off",`
`18`	`18`	`"@typescript-eslint/no-non-null-assertion": "off"`
`19`	`19`	`},`
`20`		`- "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]`
	`20`	`+ "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"]`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"files": ["*.html"],`
`24`		`- "extends": ["plugin:@nrwl/nx/angular-template"],`
	`24`	`+ "extends": ["plugin:@nx/angular-template"],`
`25`	`25`	`"rules": {}`
`26`	`26`	`}`
`27`	`27`	`]`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`"output": "assets"`
`12`	`12`	`}`
`13`	`13`	`],`
`14`		`- "allowedNonPeerDependencies": ["@nrwl/devkit"]`
	`14`	`+ "allowedNonPeerDependencies": ["@nx/devkit"]`
`15`	`15`	`}`