feat: add angular & nx 16 + update all libs

viacheslav.sotsenko · viacheslav.sotsenko · commit 0091a5a39e06 · 2023-05-06T13:24:19.000+03:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,15 +9,13 @@
         "ecmaVersion": 12,
         "sourceType": "module"
     },
-    "plugins": ["@typescript-eslint", "max-params-no-constructor", "@nrwl/nx"],
+    "plugins": ["@typescript-eslint", "max-params-no-constructor", "@nx"],
     "overrides": [
         {
             "files": ["*.ts"],
             "extends": [
                 "eslint:recommended",
-                "plugin:@angular-eslint/recommended",
-                "plugin:@typescript-eslint/recommended",
-                "plugin:@angular-eslint/recommended--extra"
+                "plugin:@typescript-eslint/recommended"
             ],
             "rules": {
                 "max-len": [
@@ -80,10 +78,7 @@
                 "spaced-comment": ["error", "always"],
                 "space-before-blocks": "error",
                 "keyword-spacing": "error",
-                "max-params-no-constructor/max-params-no-constructor": [
-                    "error",
-                    3
-                ],
+                "max-params-no-constructor/max-params-no-constructor": ["error", 3],
                 "no-eq-null": "error",
                 "no-unreachable": "error",
                 "quotes": [
diff --git a/apps/code-review-e2e/cypress.config.ts b/apps/code-review-e2e/cypress.config.ts
@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 
 export default defineConfig({
     e2e: nxE2EPreset(__dirname)
diff --git a/apps/code-review-e2e/project.json b/apps/code-review-e2e/project.json
@@ -5,7 +5,7 @@
     "projectType": "application",
     "targets": {
         "e2e": {
-            "executor": "@nrwl/cypress:cypress",
+            "executor": "@nx/cypress:cypress",
             "options": {
                 "cypressConfig": "apps/code-review-e2e/cypress.config.ts",
                 "devServerTarget": "code-review:serve:development",
@@ -18,7 +18,7 @@
             }
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": ["apps/code-review-e2e/**/*.{js,ts}"]
diff --git a/apps/code-review/project.json b/apps/code-review/project.json
@@ -6,7 +6,7 @@
     "prefix": "acua",
     "targets": {
         "build": {
-            "executor": "@nrwl/angular:webpack-browser",
+            "executor": "@nx/angular:webpack-browser",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "outputPath": "dist/apps/code-review",
@@ -32,9 +32,7 @@
                     "path": "apps/code-review/webpack.config.js"
                 },
                 "stylePreprocessorOptions": {
-                    "includePaths": [
-                        "libs/assets/src/lib/styles"
-                    ]
+                    "includePaths": ["libs/assets/src/lib/styles"]
                 }
             },
             "configurations": {
@@ -55,7 +53,7 @@
                 },
                 "development": {
                     "buildOptimizer": false,
-                    "optimization": false,
+                    "optimization": true,
                     "vendorChunk": true,
                     "extractLicenses": false,
                     "sourceMap": true,
@@ -69,7 +67,7 @@
                 },
                 "local": {
                     "buildOptimizer": false,
-                    "optimization": false,
+                    "optimization": true,
                     "vendorChunk": true,
                     "extractLicenses": false,
                     "sourceMap": true,
@@ -85,7 +83,7 @@
             "defaultConfiguration": "production"
         },
         "serve": {
-            "executor": "@nrwl/angular:webpack-dev-server",
+            "executor": "@nx/angular:webpack-dev-server",
             "options": {
                 "port": 4201,
                 "publicHost": "http://localhost:4201",
@@ -111,14 +109,14 @@
             }
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": ["apps/code-review/**/*.ts"]
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "apps/code-review/jest.config.ts",
diff --git a/apps/code-review/webpack.config.js b/apps/code-review/webpack.config.js
@@ -1,4 +1,4 @@
-const { withModuleFederation } = require('@nrwl/angular/module-federation');
+const { withModuleFederation } = require('@nx/angular/module-federation');
 const moduleFederationConfig = require('./module-federation.config');
 
-module.exports = withModuleFederation(moduleFederationConfig)
+module.exports = withModuleFederation(moduleFederationConfig);
diff --git a/apps/host-e2e/cypress.config.ts b/apps/host-e2e/cypress.config.ts
@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 
 export default defineConfig({
     e2e: nxE2EPreset(__dirname)
diff --git a/apps/host-e2e/project.json b/apps/host-e2e/project.json
@@ -5,7 +5,7 @@
     "projectType": "application",
     "targets": {
         "e2e": {
-            "executor": "@nrwl/cypress:cypress",
+            "executor": "@nx/cypress:cypress",
             "options": {
                 "cypressConfig": "apps/host-e2e/cypress.config.ts",
                 "devServerTarget": "host:serve:development",
@@ -18,7 +18,7 @@
             }
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": ["apps/host-e2e/**/*.{js,ts}"]
diff --git a/apps/host/project.json b/apps/host/project.json
@@ -6,7 +6,7 @@
     "prefix": "acua",
     "targets": {
         "build": {
-            "executor": "@nrwl/angular:webpack-browser",
+            "executor": "@nx/angular:webpack-browser",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "outputPath": "dist/apps/host",
@@ -57,7 +57,7 @@
                 },
                 "development": {
                     "buildOptimizer": false,
-                    "optimization": false,
+                    "optimization": true,
                     "vendorChunk": true,
                     "extractLicenses": false,
                     "sourceMap": true,
@@ -74,7 +74,7 @@
                 },
                 "local": {
                     "buildOptimizer": false,
-                    "optimization": false,
+                    "optimization": true,
                     "vendorChunk": true,
                     "extractLicenses": false,
                     "sourceMap": true,
@@ -93,7 +93,7 @@
             "defaultConfiguration": "production"
         },
         "serve": {
-            "executor": "@nrwl/angular:webpack-dev-server",
+            "executor": "@nx/angular:webpack-dev-server",
             "options": {
                 "port": 80,
                 "host": "127.0.0.1",
@@ -119,14 +119,14 @@
             }
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": ["apps/host/**/*.ts"]
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "apps/host/jest.config.ts",
diff --git a/apps/host/webpack.config.js b/apps/host/webpack.config.js
@@ -1,4 +1,4 @@
-const { withModuleFederation } = require('@nrwl/angular/module-federation');
+const { withModuleFederation } = require('@nx/angular/module-federation');
 const config = require('./module-federation.config');
 
 module.exports = withModuleFederation({
diff --git a/apps/host/webpack.dev.config.js b/apps/host/webpack.dev.config.js
@@ -1,9 +1,7 @@
-const { withModuleFederation } = require('@nrwl/angular/module-federation');
+const { withModuleFederation } = require('@nx/angular/module-federation');
 const config = require('./module-federation.config');
 
 module.exports = withModuleFederation({
-  ...config,
-  remotes: [
-    ['code-review', 'https://dev-acua-code-review.web.app']
-  ]
+    ...config,
+    remotes: [['code-review', 'https://dev-acua-code-review.web.app']]
 });
diff --git a/apps/host/webpack.prod.config.js b/apps/host/webpack.prod.config.js
@@ -1,9 +1,7 @@
-const { withModuleFederation } = require('@nrwl/angular/module-federation');
+const { withModuleFederation } = require('@nx/angular/module-federation');
 const config = require('./module-federation.config');
 
 module.exports = withModuleFederation({
-  ...config,
-  remotes: [
-    ['code-review', 'https://acua-code-review.web.app']
-  ]
+    ...config,
+    remotes: [['code-review', 'https://acua-code-review.web.app']]
 });
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/assets/project.json b/libs/assets/project.json
@@ -5,14 +5,14 @@
     "projectType": "library",
     "targets": {
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": ["libs/assets/**/*.ts"]
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "libs/assets/jest.config.ts",
diff --git a/libs/shared/project.json b/libs/shared/project.json
@@ -6,7 +6,7 @@
     "prefix": "acua",
     "targets": {
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
             "options": {
                 "jestConfig": "libs/shared/jest.config.ts",
@@ -20,12 +20,10 @@
             }
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
-                "lintFilePatterns": [
-                    "libs/shared/**/*.ts"
-                ]
+                "lintFilePatterns": ["libs/shared/**/*.ts"]
             }
         }
     },
diff --git a/nx.json b/nx.json
@@ -6,7 +6,7 @@
     },
     "tasksRunnerOptions": {
         "default": {
-            "runner": "@nrwl/nx-cloud",
+            "runner": "nx-cloud",
             "options": {
                 "cacheableOperations": ["build", "lint", "test", "e2e"],
                 "accessToken": "ZmY0M2Y4MzEtYTZlNS00ZWY0LWE1OTUtMWQxZWNlNjg4OWY2fHJlYWQtd3JpdGU="
@@ -25,22 +25,22 @@
         }
     },
     "generators": {
-        "@nrwl/angular:application": {
+        "@nx/angular:application": {
             "style": "scss",
             "linter": "eslint",
             "unitTestRunner": "jest",
             "e2eTestRunner": "cypress"
         },
-        "@nrwl/angular:library": {
+        "@nx/angular:library": {
             "linter": "eslint",
             "unitTestRunner": "jest"
         },
-        "@nrwl/angular:component": {
+        "@nx/angular:component": {
             "style": "scss",
             "changeDetection": "OnPush",
             "skipTests": true
         },
-        "@nrwl/angular:scam-pipe": {
+        "@nx/angular:scam-pipe": {
             "skipTests": true
         }
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/tools/generators/.gitkeep b/tools/generators/.gitkeep
diff --git a/tsconfig.base.json b/tsconfig.base.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const { withModuleFederation } = require('@nrwl/angular/module-federation');`
	`1`	`+const { withModuleFederation } = require('@nx/angular/module-federation');`
`2`	`2`	`const config = require('./module-federation.config');`
`3`	`3`
`4`	`4`	`module.exports = withModuleFederation({`
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,`