fix: rescope nwrl packages (#175)

honzikec · web-flow · commit b2d71faf79e9 · 2023-08-29T17:08:44.000+02:00
* fix: rescope nwrl packages

* fix: use node 16 and 18
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx/eslint-plugin"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -39,12 +39,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/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v3
@@ -51,7 +51,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/apps/showcase-e2e/.eslintrc.json b/apps/showcase-e2e/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [0]
+        "@nx/enforce-module-boundaries": [0]
       }
     },
     {
diff --git a/apps/showcase-e2e/cypress.config.ts b/apps/showcase-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';
 
 const cypressJsonConfig = {
   fileServerFolder: '.',
diff --git a/apps/showcase-e2e/project.json b/apps/showcase-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/showcase-e2e/cypress.config.ts",
         "tsConfig": "apps/showcase-e2e/tsconfig.json",
@@ -19,7 +19,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/showcase-e2e/**/*.{js,ts}"]
       },
diff --git a/apps/showcase/.eslintrc.json b/apps/showcase/.eslintrc.json
@@ -4,12 +4,9 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [0],
+        "@nx/enforce-module-boundaries": [0],
         "@angular-eslint/directive-selector": [
           "error",
           {
@@ -30,7 +27,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/apps/showcase/project.json b/apps/showcase/project.json
@@ -71,14 +71,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/showcase/src/**/*.ts", "apps/showcase/src/**/*.html"]
       },
       "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/showcase"],
       "options": {
         "jestConfig": "apps/showcase/jest.config.ts",
diff --git a/apps/vue-showcase/cypress.config.ts b/apps/vue-showcase/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';
 
 const cypressJsonConfig = {
   fileServerFolder: '.',
diff --git a/apps/vue-showcase/project.json b/apps/vue-showcase/project.json
@@ -28,13 +28,13 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/vue-showcase/**/*.{js,jsx,ts,tsx,vue}"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/vue-showcase"],
       "options": {
         "jestConfig": "apps/vue-showcase/jest.config.ts",
diff --git a/decorate-angular-cli.js b/decorate-angular-cli.js
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,3 +1,3 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@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/cypress-indexeddb/.babelrc b/libs/cypress-indexeddb/.babelrc
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/js/babel",
+      "@nx/js/babel",
       {
         "useBuiltIns": "usage"
       }
diff --git a/libs/cypress-indexeddb/project.json b/libs/cypress-indexeddb/project.json
@@ -5,22 +5,22 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/cypress-indexeddb/**/*.ts"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/cypress-indexeddb"],
       "options": {
         "jestConfig": "libs/cypress-indexeddb/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "build": {
-      "executor": "@nrwl/js:tsc",
+      "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/libs/cypress-indexeddb",
diff --git a/libs/ng-utils/.eslintrc.json b/libs/ng-utils/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/libs/ng-utils/project.json b/libs/ng-utils/project.json
@@ -6,7 +6,7 @@
   "prefix": "this-dot",
   "targets": {
     "build": {
-      "executor": "@nrwl/angular:package",
+      "executor": "@nx/angular:package",
       "outputs": ["{workspaceRoot}/dist/libs/ng-utils"],
       "options": {
         "project": "libs/ng-utils/ng-package.json",
@@ -29,15 +29,15 @@
       "defaultConfiguration": "production"
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/ng-utils"],
       "options": {
         "jestConfig": "libs/ng-utils/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["libs/ng-utils/src/**/*.ts", "libs/ng-utils/src/**/*.html"]
       },
diff --git a/libs/route-config/.eslintrc.json b/libs/route-config/.eslintrc.json
@@ -4,10 +4,7 @@
   "overrides": [
     {
       "files": ["*.ts"],
-      "extends": [
-        "plugin:@nrwl/nx/angular",
-        "plugin:@angular-eslint/template/process-inline-templates"
-      ],
+      "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",
@@ -29,7 +26,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]
diff --git a/libs/route-config/project.json b/libs/route-config/project.json
@@ -6,7 +6,7 @@
   "prefix": "td",
   "targets": {
     "build": {
-      "executor": "@nrwl/angular:package",
+      "executor": "@nx/angular:package",
       "options": {
         "project": "libs/route-config/ng-package.json",
         "buildableProjectDepsInPackageJsonType": "dependencies"
@@ -28,14 +28,14 @@
       "defaultConfiguration": "production"
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["libs/route-config/src/**/*.ts", "libs/route-config/src/**/*.html"]
       },
       "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/route-config"],
       "options": {
         "jestConfig": "libs/route-config/jest.config.ts",
diff --git a/libs/rxidb/.babelrc b/libs/rxidb/.babelrc
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/js/babel",
+      "@nx/js/babel",
       {
         "useBuiltIns": "usage"
       }
diff --git a/libs/rxidb/project.json b/libs/rxidb/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/rxidb",
@@ -35,14 +35,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/rxidb/**/*.ts"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/rxidb"],
       "options": {
         "jestConfig": "libs/rxidb/jest.config.ts",
diff --git a/libs/utils/.eslintrc.json b/libs/utils/.eslintrc.json
diff --git a/libs/utils/project.json b/libs/utils/project.json
diff --git a/libs/vue-route-guard/project.json b/libs/vue-route-guard/project.json
diff --git a/nx.json b/nx.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

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/eslint-plugin"],`
`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,`
`@@ -39,12 +39,12 @@`
`39`	`39`	`},`
`40`	`40`	`{`
`41`	`41`	`"files": [".ts", ".tsx"],`
`42`		`- "extends": ["plugin:@nrwl/nx/typescript"],`
	`42`	`+ "extends": ["plugin:@nx/typescript"],`
`43`	`43`	`"rules": {}`
`44`	`44`	`},`
`45`	`45`	`{`
`46`	`46`	`"files": [".js", ".jsx"],`
`47`		`- "extends": ["plugin:@nrwl/nx/javascript"],`
	`47`	`+ "extends": ["plugin:@nx/javascript"],`
`48`	`48`	`"rules": {}`
`49`	`49`	`}`
`50`	`50`	`]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`{`
`6`	`6`	`"files": [".ts", ".tsx", ".js", ".jsx"],`
`7`	`7`	`"rules": {`
`8`		`- "@nrwl/nx/enforce-module-boundaries": [0]`
	`8`	`+ "@nx/enforce-module-boundaries": [0]`
`9`	`9`	`}`
`10`	`10`	`},`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,9 @@`
`4`	`4`	`"overrides": [`
`5`	`5`	`{`
`6`	`6`	`"files": ["*.ts"],`
`7`		`- "extends": [`
`8`		`- "plugin:@nrwl/nx/angular",`
`9`		`- "plugin:@angular-eslint/template/process-inline-templates"`
`10`		`- ],`
	`7`	`+ "extends": ["plugin:@nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],`
`11`	`8`	`"rules": {`
`12`		`- "@nrwl/nx/enforce-module-boundaries": [0],`
	`9`	`+ "@nx/enforce-module-boundaries": [0],`
`13`	`10`	`"@angular-eslint/directive-selector": [`
`14`	`11`	`"error",`
`15`	`12`	`{`
`@@ -30,7 +27,7 @@`
`30`	`27`	`},`
`31`	`28`	`{`
`32`	`29`	`"files": ["*.html"],`
`33`		`- "extends": ["plugin:@nrwl/nx/angular-template"],`
	`30`	`+ "extends": ["plugin:@nx/angular-template"],`
`34`	`31`	`"rules": {}`
`35`	`32`	`}`
`36`	`33`	`]`