chore: update to latest everything

ngneat · Oct 17, 2023 · e84ef48 · e84ef48
1 parent 0e9d440
commit e84ef48
Show file tree

Hide file tree

Showing 20 changed files with 11,981 additions and 16,179 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -10,12 +10,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/ngneat-dag-demo-e2e/project.json b/apps/ngneat-dag-demo-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/ngneat-dag-demo-e2e/cypress.config.js",
         "tsConfig": "apps/ngneat-dag-demo-e2e/tsconfig.e2e.json",

diff --git a/apps/ngneat-dag-demo/.eslintrc.json b/apps/ngneat-dag-demo/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -32,7 +32,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/apps/ngneat-dag-demo/project.json b/apps/ngneat-dag-demo/project.json
@@ -88,15 +88,15 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "apps/ngneat-dag-demo/jest.config.ts",
         "passWithNoTests": true
       },
-      "outputs": ["coverage/apps/ngneat-dag-demo"]
+      "outputs": ["{workspaceRoot}/coverage/apps/ngneat-dag-demo"]
     },
     "deploy": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "@nx/workspace:run-commands",
       "options": {
         "commands": [
           {

diff --git a/decorate-angular-cli.js b/decorate-angular-cli.js
@@ -27,10 +27,10 @@ const cp = require('child_process');
 const isWindows = os.platform() === 'win32';
 let output;
 try {
-  output = require('@nrwl/workspace').output;
+  output = require('@nx/workspace').output;
 } catch (e) {
   console.warn(
-    'Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.'
+    'Angular CLI could not be decorated to enable computation caching. Please ensure @nx/workspace is installed.'
   );
   process.exit(0);
 }

diff --git a/jest.config.ts b/jest.config.ts
@@ -1,6 +1,6 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
 module.exports = {
   projects: getJestProjects(),
-  testEnvironment: 'jest-environment-jsdom'
+  testEnvironment: 'jest-environment-jsdom',
 };
diff --git a/jest.preset.ts b/jest.preset.ts
@@ -1,3 +1,3 @@
-const nxPreset = require('@nrwl/jest/preset');
+const nxPreset = require('@nx/jest/preset');
 
 module.exports = { ...nxPreset };
diff --git a/libs/dag-manager-service/.eslintrc.json b/libs/dag-manager-service/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -32,7 +32,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/libs/dag-manager-service/project.json b/libs/dag-manager-service/project.json
@@ -6,10 +6,11 @@
   "prefix": "ngneat-dag",
   "targets": {
     "build": {
-      "executor": "@nrwl/angular:package",
+      "executor": "@nx/angular:package",
       "options": {
         "tsConfig": "libs/dag-manager-service/tsconfig.lib.json",
-        "project": "libs/dag-manager-service/ng-package.json"
+        "project": "libs/dag-manager-service/ng-package.json",
+        "updateBuildableProjectDepsInPackageJson": true
       },
       "configurations": {
         "production": {
@@ -24,12 +25,12 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "libs/dag-manager-service/jest.config.ts",
         "passWithNoTests": true
       },
-      "outputs": ["coverage/libs/dag-manager-service"]
+      "outputs": ["{workspaceRoot}/coverage/libs/dag-manager-service"]
     }
   },
   "generators": {

diff --git a/libs/demo/feature/builder-demo/.eslintrc.json b/libs/demo/feature/builder-demo/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -32,7 +32,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/libs/demo/feature/builder-demo/project.json b/libs/demo/feature/builder-demo/project.json
@@ -12,12 +12,12 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "libs/demo/feature/builder-demo/jest.config.ts",
         "passWithNoTests": true
       },
-      "outputs": ["coverage/libs/demo/feature/builder-demo"]
+      "outputs": ["{workspaceRoot}/coverage/libs/demo/feature/builder-demo"]
     }
   },
   "generators": {

diff --git a/libs/demo/feature/home/.eslintrc.json b/libs/demo/feature/home/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -32,7 +32,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/libs/demo/feature/home/project.json b/libs/demo/feature/home/project.json
@@ -12,12 +12,12 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "libs/demo/feature/home/jest.config.ts",
         "passWithNoTests": true
       },
-      "outputs": ["coverage/libs/demo/feature/home"]
+      "outputs": ["{workspaceRoot}/coverage/libs/demo/feature/home"]
     }
   },
   "generators": {

diff --git a/libs/shared/ui/components/.eslintrc.json b/libs/shared/ui/components/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "parserOptions": {
@@ -32,7 +32,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/libs/shared/ui/components/project.json b/libs/shared/ui/components/project.json
@@ -12,12 +12,12 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "libs/shared/ui/components/jest.config.ts",
         "passWithNoTests": true
       },
-      "outputs": ["coverage/libs/shared/ui/components"]
+      "outputs": ["{workspaceRoot}/coverage/libs/shared/ui/components"]
     }
   },
   "generators": {