Skip to content

Commit 045925f

Browse files
nextjs v14 migration changes
Signed-off-by: Michael Valdron <[email protected]>
1 parent c9b9771 commit 045925f

37 files changed

+6214
-6618
lines changed

.eslintrc.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx", "eslint-comments", "promise", "unicorn", "license-header"],
4+
"plugins": ["@nx", "eslint-comments", "promise", "unicorn", "license-header"],
55
"extends": [
66
"plugin:@next/next/recommended",
77
"airbnb",
@@ -22,7 +22,7 @@
2222
{
2323
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
2424
"rules": {
25-
"@nrwl/nx/enforce-module-boundaries": [
25+
"@nx/enforce-module-boundaries": [
2626
"error",
2727
{
2828
"enforceBuildableLibDependency": true,
@@ -99,15 +99,15 @@
9999
"eslint-comments/no-unlimited-disable": "off",
100100
"unicorn/no-null": "off",
101101
"unicorn/prefer-module": "off",
102-
"license-header/header": [ "error", "./license-header.js" ],
102+
"license-header/header": ["error", "./license-header.js"],
103103
"unicorn/prefer-top-level-await": "off"
104104
}
105105
},
106106
{
107107
"files": ["*.ts", "*.tsx"],
108108
"plugins": ["@typescript-eslint", "typescript-enum"],
109109
"extends": [
110-
"plugin:@nrwl/nx/typescript",
110+
"plugin:@nx/typescript",
111111
"airbnb-typescript",
112112
"plugin:@typescript-eslint/recommended",
113113
"plugin:@typescript-eslint/recommended-requiring-type-checking",
@@ -162,7 +162,7 @@
162162
},
163163
{
164164
"files": ["*.js", "*.jsx", "*.mjs"],
165-
"extends": ["plugin:@nrwl/nx/javascript"],
165+
"extends": ["plugin:@nx/javascript"],
166166
"rules": {
167167
// Allow CJS until ESM support improves
168168
"unicorn/prefer-module": "off",

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ Thumbs.db
4848

4949
.odo/env
5050
.odo/odo-file-index.json
51-
.odo
51+
.odo
52+
.nx/cache

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
**/*/__ENV.js
1212
libs/core/src/types/devfile-spec.ts
1313
.yarn/
14+
15+
/.nx/cache

apps/landing-page-e2e/project.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
2+
"name": "landing-page-e2e",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"sourceRoot": "apps/landing-page-e2e/src",
45
"projectType": "application",
6+
"tags": [],
7+
"implicitDependencies": ["landing-page"],
58
"targets": {
69
"e2e": {
710
"executor": "@nrwl/cypress:cypress",
@@ -24,7 +27,5 @@
2427
"lintFilePatterns": ["apps/landing-page-e2e/**/*.{js,ts}"]
2528
}
2629
}
27-
},
28-
"tags": [],
29-
"implicitDependencies": ["landing-page"]
30+
}
3031
}

apps/landing-page-e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": [ "../../tsconfig.base.json" ],
33
"compilerOptions": {
44
"sourceMap": false,
55
"outDir": "../../dist/out-tsc",

apps/landing-page/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": [
3-
"plugin:@nrwl/nx/react-typescript",
3+
"plugin:@nx/react-typescript",
44
"../../.eslintrc.json",
55
"next",
66
"next/core-web-vitals"

apps/landing-page/next.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ const nextConfig = {
4141
experimental: {
4242
outputFileTracingRoot: path.join(__dirname, '../../'),
4343
},
44+
transpilePackages: ['@devfile-web/core', '@devfile-web/docs'],
4445
nx: {
4546
svgr: false,
4647
},
4748
};
4849

49-
const plugins = [withBundleAnalyzer, withMarkdoc(), withNx];
50+
const plugins = [withBundleAnalyzer, withMarkdoc(), withNx.withNx];
5051

5152
module.exports = plugins.reduce((config, plugin) => plugin(config), nextConfig);

apps/landing-page/project.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
2+
"name": "landing-page",
23
"$schema": "..\\..\\node_modules\\nx\\schemas\\project-schema.json",
34
"sourceRoot": "apps/landing-page",
45
"projectType": "application",
6+
"tags": [],
7+
"implicitDependencies": ["docs"],
58
"targets": {
69
"prebuild": {
710
"executor": "nx:run-commands",
@@ -75,7 +78,7 @@
7578
},
7679
"test": {
7780
"executor": "@nrwl/jest:jest",
78-
"outputs": ["coverage/apps/landing-page"],
81+
"outputs": ["{workspaceRoot}/coverage/apps/landing-page"],
7982
"options": {
8083
"jestConfig": "apps/landing-page/jest.config.ts",
8184
"passWithNoTests": true
@@ -88,7 +91,5 @@
8891
"lintFilePatterns": ["apps/landing-page/**/*.{ts,tsx,js,jsx}"]
8992
}
9093
}
91-
},
92-
"tags": [],
93-
"implicitDependencies": ["docs"]
94+
}
9495
}

apps/landing-page/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.base.json",
2+
"extends": [ "../../tsconfig.base.json" ],
33
"compilerOptions": {
44
"jsx": "preserve",
55
"allowJs": true,

apps/landing-page/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./tsconfig.json",
2+
"extends": [ "./tsconfig.json" ],
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
55
"module": "commonjs",

0 commit comments

Comments
 (0)