[WIP]e2e migration changes for next.js v14 & refactor nrwl packages to nx packages

michael-valdron · michael-valdron · commit f3d10918f70e · 2025-08-20T04:47:19.000-04:00
Signed-off-by: Michael Valdron &lt;mvaldron@redhat.com&gt;
diff --git a/apps/landing-page-e2e/cypress.config.ts b/apps/landing-page-e2e/cypress.config.ts
@@ -15,7 +15,7 @@
  */
 
 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/landing-page-e2e/project.json b/apps/landing-page-e2e/project.json
@@ -7,7 +7,7 @@
   "implicitDependencies": ["landing-page"],
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "dependsOn": ["^build"],
       "options": {
         "cypressConfig": "apps/landing-page-e2e/cypress.config.ts",
@@ -21,7 +21,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/landing-page-e2e/**/*.{js,ts}"]
diff --git a/apps/landing-page-e2e/tsconfig.json b/apps/landing-page-e2e/tsconfig.json
@@ -6,5 +6,5 @@
     "allowJs": true,
     "types": ["cypress", "node"]
   },
-  "include": ["src/**/*.ts", "src/**/*.js"]
+  "include": ["src/**/*.ts", "src/**/*.js", "cypress.config.ts"]
 }
diff --git a/apps/landing-page/jest.config.ts b/apps/landing-page/jest.config.ts
@@ -23,8 +23,8 @@ export default {
   testEnvironment: 'jsdom',
 
   transform: {
-    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
-    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
   },
 
   moduleNameMapper: {
diff --git a/apps/landing-page/next.config.js b/apps/landing-page/next.config.js
@@ -15,7 +15,7 @@
  */
 
 const path = require('node:path');
-const withNx = require('@nrwl/next/plugins/with-nx');
+const withNx = require('@nx/next/plugins/with-nx');
 const withMarkdoc = require('@markdoc/next.js');
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
   enabled: process.env.ANALYZE === 'true',
@@ -26,7 +26,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
 const basePath = process.env.NEXT_PUBLIC_BASE_PATH;
 
 /**
- * @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
+ * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
  * */
 const nextConfig = {
   basePath,
diff --git a/apps/landing-page/project.json b/apps/landing-page/project.json
@@ -14,7 +14,7 @@
       }
     },
     "build": {
-      "executor": "@nrwl/next:build",
+      "executor": "@nx/next:build",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "dependsOn": ["prebuild"],
@@ -30,7 +30,7 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/next:server",
+      "executor": "@nx/next:server",
       "defaultConfiguration": "development",
       "dependsOn": ["prebuild"],
       "options": {
@@ -49,7 +49,7 @@
       }
     },
     "export": {
-      "executor": "@nrwl/next:export",
+      "executor": "@nx/next:export",
       "dependsOn": ["build"],
       "options": {
         "buildTarget": "landing-page:build:production"
@@ -77,15 +77,15 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/landing-page"],
       "options": {
         "jestConfig": "apps/landing-page/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/landing-page/**/*.{ts,tsx,js,jsx}"]
diff --git a/apps/landing-page/tailwind.config.js b/apps/landing-page/tailwind.config.js
@@ -16,7 +16,7 @@
 
 /* eslint-disable global-require */
 const defaultTheme = require('tailwindcss/defaultTheme');
-const { createGlobPatternsForDependencies } = require('@nrwl/react/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
 const { join } = require('node:path');
 
 /** @type {import('tailwindcss').Config} */
diff --git a/apps/registry-viewer-e2e/cypress.config.ts b/apps/registry-viewer-e2e/cypress.config.ts
@@ -15,7 +15,7 @@
  */
 
 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/registry-viewer-e2e/project.json b/apps/registry-viewer-e2e/project.json
@@ -7,7 +7,7 @@
   "implicitDependencies": ["registry-viewer"],
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "dependsOn": ["^build"],
       "options": {
         "cypressConfig": "apps/registry-viewer-e2e/cypress.config.ts",
@@ -21,7 +21,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/registry-viewer-e2e/**/*.{js,ts}"]
diff --git a/apps/registry-viewer/jest.config.ts b/apps/registry-viewer/jest.config.ts
@@ -19,8 +19,8 @@ export default {
   displayName: 'registry-viewer',
   preset: '../../jest.preset.js',
   transform: {
-    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
-    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/apps/registry-viewer',
diff --git a/apps/registry-viewer/next.config.js b/apps/registry-viewer/next.config.js
@@ -15,7 +15,7 @@
  */
 
 const path = require('node:path');
-const withNx = require('@nrwl/next/plugins/with-nx');
+const withNx = require('@nx/next/plugins/with-nx');
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
   enabled: process.env.ANALYZE === 'true',
 });
@@ -25,7 +25,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
 const basePath = process.env.NEXT_PUBLIC_BASE_PATH;
 
 /**
- * @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
+ * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
  * */
 const nextConfig = {
   basePath,
diff --git a/apps/registry-viewer/project.json b/apps/registry-viewer/project.json
@@ -12,7 +12,7 @@
       }
     },
     "build": {
-      "executor": "@nrwl/next:build",
+      "executor": "@nx/next:build",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "dependsOn": ["prebuild"],
@@ -28,7 +28,7 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/next:server",
+      "executor": "@nx/next:server",
       "defaultConfiguration": "development",
       "dependsOn": ["prebuild"],
       "options": {
@@ -47,7 +47,7 @@
       }
     },
     "export": {
-      "executor": "@nrwl/next:export",
+      "executor": "@nx/next:export",
       "dependsOn": ["build"],
       "options": {
         "buildTarget": "registry-viewer:build:production"
@@ -75,15 +75,15 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/registry-viewer"],
       "options": {
         "jestConfig": "apps/registry-viewer/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/registry-viewer/**/*.{ts,tsx,js,jsx}"]
diff --git a/apps/registry-viewer/tailwind.config.js b/apps/registry-viewer/tailwind.config.js
@@ -16,7 +16,7 @@
 
 /* eslint-disable global-require */
 const defaultTheme = require('tailwindcss/defaultTheme');
-const { createGlobPatternsForDependencies } = require('@nrwl/react/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
 const { join } = require('node:path');
 
 /** @type {import('tailwindcss').Config} */
diff --git a/jest.config.js b/jest.config.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@nx/jest');
 
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
 module.exports = {
   projects: getJestProjects(),
   preset: 'ts-jest',
diff --git a/jest.preset.js b/jest.preset.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const nxPreset = require('@nrwl/jest/preset');
+const nxPreset = require('@nx/jest/preset');
 
 module.exports = {
   ...nxPreset,
diff --git a/libs/core/.babelrc b/libs/core/.babelrc
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/react/babel",
+      "@nx/react/babel",
       {
         "runtime": "automatic",
         "useBuiltIns": "usage"
diff --git a/libs/core/project.json b/libs/core/project.json
@@ -6,14 +6,14 @@
   "tags": [],
   "targets": {
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/core/**/*.{ts,tsx,js,jsx}"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/core"],
       "options": {
         "jestConfig": "libs/core/jest.config.ts",
diff --git a/libs/core/tsconfig.lib.json b/libs/core/tsconfig.lib.json
@@ -5,8 +5,8 @@
     "types": ["node"]
   },
   "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
+    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nx/react/typings/image.d.ts"
   ],
   "exclude": [
     "jest.config.ts",
diff --git a/libs/docs/.babelrc b/libs/docs/.babelrc
@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/react/babel",
+      "@nx/react/babel",
       {
         "runtime": "automatic",
         "useBuiltIns": "usage"
diff --git a/libs/docs/project.json b/libs/docs/project.json
@@ -6,7 +6,7 @@
   "tags": [],
   "targets": {
     "build": {
-      "executor": "@nrwl/js:swc",
+      "executor": "@nx/js:swc",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/libs/docs",
@@ -17,14 +17,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/docs/**/*.ts"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/docs"],
       "options": {
         "jestConfig": "libs/docs/jest.config.ts",
diff --git a/libs/docs/tsconfig.lib.json b/libs/docs/tsconfig.lib.json
@@ -5,8 +5,8 @@
     "types": ["node"]
   },
   "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
+    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nx/react/typings/image.d.ts"
   ],
   "exclude": [
     "jest.config.ts",
diff --git a/nx.json b/nx.json
@@ -8,12 +8,12 @@
     ]
   },
   "generators": {
-    "@nrwl/react": {
+    "@nx/react": {
       "application": {
         "babel": true
       }
     },
-    "@nrwl/next": {
+    "@nx/next": {
       "application": {
         "style": "css",
         "linter": "eslint"
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "@markdoc/markdoc": "^0.2.1",
     "@markdoc/next.js": "^0.2.1",
     "@next/bundle-analyzer": "^13.2.0",
-    "@nrwl/next": "18.3.5",
+    "@nx/next": "18.3.5",
     "@schultzp2020/prism-react-renderer": "^1.3.7",
     "@segment/analytics-next": "^1.38.0",
     "@sindresorhus/slugify": "^2.1.0",
@@ -57,12 +57,12 @@
     "@babel/preset-typescript": "^7.23.2",
     "@headlessui/tailwindcss": "^0.1.1",
     "@next/env": "^13.0.5",
-    "@nrwl/cypress": "18.3.5",
-    "@nrwl/jest": "18.3.5",
-    "@nrwl/linter": "18.3.5",
-    "@nrwl/react": "18.3.5",
+    "@nx/cypress": "18.3.5",
     "@nx/devkit": "18.3.5",
     "@nx/eslint-plugin": "18.3.5",
+    "@nx/jest": "18.3.5",
+    "@nx/linter": "18.3.5",
+    "@nx/react": "18.3.5",
     "@nx/web": "18.3.5",
     "@nx/workspace": "18.3.5",
     "@svgr/webpack": "^6.5.1",
@@ -118,6 +118,7 @@
     "react-test-renderer": "18.2.0",
     "tailwindcss": "3.2.7",
     "ts-jest": "29.1.5",
+    "ts-node": "^10.9.2",
     "typescript": "5.4.5",
     "url-loader": "^4.1.1",
     "webpack": "^5.94.0"
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`"allowJs": true,`
`7`	`7`	`"types": ["cypress", "node"]`
`8`	`8`	`},`
`9`		`- "include": ["src/*/.ts", "src/*/.js"]`
	`9`	`+ "include": ["src/*/.ts", "src/*/.js", "cypress.config.ts"]`
`10`	`10`	`}`