Skip to content

Commit 9960eec

Browse files
[WIP]e2e migration changes for next.js v14 & refactor nrwl packages to nx packages
Signed-off-by: Michael Valdron <[email protected]>
1 parent 3aee4cb commit 9960eec

24 files changed

+68
-55
lines changed

apps/landing-page-e2e/cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { defineConfig } from 'cypress';
18-
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
18+
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
1919

2020
export default defineConfig({
2121
e2e: nxE2EPreset(__dirname),

apps/landing-page-e2e/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"implicitDependencies": ["landing-page"],
88
"targets": {
99
"e2e": {
10-
"executor": "@nrwl/cypress:cypress",
10+
"executor": "@nx/cypress:cypress",
1111
"dependsOn": ["^build"],
1212
"options": {
1313
"cypressConfig": "apps/landing-page-e2e/cypress.config.ts",
@@ -21,7 +21,7 @@
2121
}
2222
},
2323
"lint": {
24-
"executor": "@nrwl/linter:eslint",
24+
"executor": "@nx/linter:eslint",
2525
"outputs": ["{options.outputFile}"],
2626
"options": {
2727
"lintFilePatterns": ["apps/landing-page-e2e/**/*.{js,ts}"]

apps/landing-page-e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"allowJs": true,
77
"types": ["cypress", "node"]
88
},
9-
"include": ["src/**/*.ts", "src/**/*.js"]
9+
"include": ["src/**/*.ts", "src/**/*.js", "cypress.config.ts"]
1010
}

apps/landing-page/jest.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ export default {
2323
testEnvironment: 'jsdom',
2424

2525
transform: {
26-
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
27-
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
26+
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
27+
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
2828
},
2929

3030
moduleNameMapper: {

apps/landing-page/next.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
const path = require('node:path');
18-
const withNx = require('@nrwl/next/plugins/with-nx');
18+
const withNx = require('@nx/next/plugins/with-nx');
1919
const withMarkdoc = require('@markdoc/next.js');
2020
const withBundleAnalyzer = require('@next/bundle-analyzer')({
2121
enabled: process.env.ANALYZE === 'true',
@@ -26,7 +26,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
2626
const basePath = process.env.NEXT_PUBLIC_BASE_PATH;
2727

2828
/**
29-
* @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
29+
* @type {import('@nx/next/plugins/with-nx').WithNxOptions}
3030
* */
3131
const nextConfig = {
3232
basePath,

apps/landing-page/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"build": {
17-
"executor": "@nrwl/next:build",
17+
"executor": "@nx/next:build",
1818
"outputs": ["{options.outputPath}"],
1919
"defaultConfiguration": "production",
2020
"dependsOn": ["prebuild"],
@@ -30,7 +30,7 @@
3030
}
3131
},
3232
"serve": {
33-
"executor": "@nrwl/next:server",
33+
"executor": "@nx/next:server",
3434
"defaultConfiguration": "development",
3535
"dependsOn": ["prebuild"],
3636
"options": {
@@ -49,7 +49,7 @@
4949
}
5050
},
5151
"export": {
52-
"executor": "@nrwl/next:export",
52+
"executor": "@nx/next:export",
5353
"dependsOn": ["build"],
5454
"options": {
5555
"buildTarget": "landing-page:build:production"
@@ -77,15 +77,15 @@
7777
}
7878
},
7979
"test": {
80-
"executor": "@nrwl/jest:jest",
80+
"executor": "@nx/jest:jest",
8181
"outputs": ["{workspaceRoot}/coverage/apps/landing-page"],
8282
"options": {
8383
"jestConfig": "apps/landing-page/jest.config.ts",
8484
"passWithNoTests": true
8585
}
8686
},
8787
"lint": {
88-
"executor": "@nrwl/linter:eslint",
88+
"executor": "@nx/linter:eslint",
8989
"outputs": ["{options.outputFile}"],
9090
"options": {
9191
"lintFilePatterns": ["apps/landing-page/**/*.{ts,tsx,js,jsx}"]

apps/landing-page/tailwind.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/* eslint-disable global-require */
1818
const defaultTheme = require('tailwindcss/defaultTheme');
19-
const { createGlobPatternsForDependencies } = require('@nrwl/react/tailwind');
19+
const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
2020
const { join } = require('node:path');
2121

2222
/** @type {import('tailwindcss').Config} */

apps/registry-viewer-e2e/cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import { defineConfig } from 'cypress';
18-
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
18+
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
1919

2020
export default defineConfig({
2121
e2e: nxE2EPreset(__dirname),

apps/registry-viewer-e2e/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"implicitDependencies": ["registry-viewer"],
88
"targets": {
99
"e2e": {
10-
"executor": "@nrwl/cypress:cypress",
10+
"executor": "@nx/cypress:cypress",
1111
"dependsOn": ["^build"],
1212
"options": {
1313
"cypressConfig": "apps/registry-viewer-e2e/cypress.config.ts",
@@ -21,7 +21,7 @@
2121
}
2222
},
2323
"lint": {
24-
"executor": "@nrwl/linter:eslint",
24+
"executor": "@nx/linter:eslint",
2525
"outputs": ["{options.outputFile}"],
2626
"options": {
2727
"lintFilePatterns": ["apps/registry-viewer-e2e/**/*.{js,ts}"]

apps/registry-viewer/jest.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export default {
1919
displayName: 'registry-viewer',
2020
preset: '../../jest.preset.js',
2121
transform: {
22-
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
23-
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
22+
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
23+
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/next/babel'] }],
2424
},
2525
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
2626
coverageDirectory: '../../coverage/apps/registry-viewer',

0 commit comments

Comments
 (0)