feat: support nx >= 16.0.0. Issue #26 (#27)

currents-dev · Oct 29, 2023 · 453c355 · 453c355
1 parent f37a65c
commit 453c355
Show file tree

Hide file tree

Showing 17 changed files with 19,133 additions and 24,458 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 Integrate Cypress with alternative cloud services like Currents or Sorry Cypress.
 
-The plugin is designed for CI environments and runs Cypress in headless mode. Please use `@nrwl/cypress` for running cypress in interactive mode.
+The plugin is designed for CI environments and runs Cypress in headless mode. Please use `@nx/cypress` for running cypress in interactive mode.
 
 ## Example
 
@@ -64,7 +64,7 @@ module.exports = {
 Add `cypress-cloud/plugin` to `cypress.config.{js|ts|mjs}`
 
 ```ts
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 import { defineConfig } from 'cypress';
 import cloudPlugin from 'cypress-cloud/plugin';
 
@@ -120,7 +120,7 @@ You can set the project Id as follows:
 
 ### Version `1.0.0`
 
-- `@nrwl/cypress` no longer required - the plugin is a standalone implementation that is not dependent on `@nrwl/cypress`. Use the available configuration options to configure the execution of cypress runs.
+- `@nx/cypress` no longer required - the plugin is a standalone implementation that is not dependent on `@nx/cypress`. Use the available configuration options to configure the execution of cypress runs.
 
 ## Release
 

diff --git a/apps/web-e2e/cypress.config.ts b/apps/web-e2e/cypress.config.ts
@@ -1,4 +1,4 @@
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 import { defineConfig } from 'cypress';
 import cloudPlugin from 'cypress-cloud/plugin';
 

diff --git a/apps/web-e2e/project.json b/apps/web-e2e/project.json
@@ -8,6 +8,7 @@
       "executor": "@currents/nx:currents",
       "options": {
         "projectRoot": "apps/web-e2e",
+        "cypressConfig": "apps/web-e2e/cypress.config.ts",
         "parallel": true,
         "record": true,
         "tag": "nx",
@@ -23,7 +24,7 @@
       "executor": "@nrwl/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["apps/web-e2e/**/*.{js,ts}"]
+        "lintFilePatterns": ["apps/web-e2e/**/*.ts"]
       }
     }
   },

diff --git a/apps/web/.babelrc b/apps/web/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["@nrwl/js/babel"]
+  "presets": ["@nx/js/babel"]
 }
diff --git a/apps/web/project.json b/apps/web/project.json
@@ -6,7 +6,7 @@
   "tags": [],
   "targets": {
     "build": {
-      "executor": "@nrwl/vite:build",
+      "executor": "@nx/vite:build",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
@@ -22,7 +22,7 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/vite:dev-server",
+      "executor": "@nx/vite:dev-server",
       "defaultConfiguration": "development",
       "options": {
         "buildTarget": "web:build"
@@ -39,7 +39,7 @@
       }
     },
     "preview": {
-      "executor": "@nrwl/vite:preview-server",
+      "executor": "@nx/vite:preview-server",
       "defaultConfiguration": "development",
       "options": {
         "buildTarget": "web:build"
@@ -61,7 +61,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/web/jest.config.ts",

diff --git a/apps/web/src/app/app.element.ts b/apps/web/src/app/app.element.ts
@@ -297,10 +297,10 @@ export class AppElement extends HTMLElement {
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nrwl/angular:lib ui
+nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nrwl/angular:component button --project ui</pre>
+nx g @nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>

diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
@@ -1,7 +1,7 @@
 /// <reference types="vitest" />
 import { defineConfig } from 'vite';
 
-import viteTsConfigPaths from 'vite-tsconfig-paths';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 
 export default defineConfig({
   cacheDir: '../../node_modules/.vite/web',
@@ -17,9 +17,7 @@ export default defineConfig({
   },
 
   plugins: [
-    viteTsConfigPaths({
-      root: '../../',
-    }),
+    nxViteTsPaths(),
   ],
 
   // Uncomment this if you are using workers.

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/nx.json b/nx.json
@@ -4,7 +4,7 @@
     "defaultBase": "main"
   },
   "cli": {
-    "defaultCollection": "@nrwl/web"
+    "defaultCollection": "@nx/web"
   },
   "implicitDependencies": {
     "package.json": {
@@ -15,7 +15,7 @@
   },
   "tasksRunnerOptions": {
     "default": {
-      "runner": "@nrwl/workspace/tasks-runners/default",
+      "runner": "@nx/workspace/tasks-runners/default",
       "options": {
         "cacheableOperations": ["build", "lint", "test", "e2e"]
       }
@@ -31,13 +31,13 @@
   },
   "defaultProject": "web",
   "generators": {
-    "@nrwl/web:application": {
+    "@nx/web:application": {
       "style": "css",
       "linter": "eslint",
       "unitTestRunner": "jest",
       "e2eTestRunner": "cypress"
     },
-    "@nrwl/web:library": {
+    "@nx/web:library": {
       "style": "css",
       "linter": "eslint",
       "unitTestRunner": "jest"