@nrwl/next 15.3.0-beta.2 → 15.3.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [15.3.0-beta.
|
|
6
|
+
# [15.3.0-beta.4](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.4) (2022-11-28)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/next
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "15.3.0-beta.
|
|
3
|
+
"version": "15.3.0-beta.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
|
|
6
6
|
"repository": {
|
|
@@ -35,13 +35,13 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
38
|
-
"@nrwl/cypress": "15.3.0-beta.
|
|
39
|
-
"@nrwl/devkit": "15.3.0-beta.
|
|
40
|
-
"@nrwl/jest": "15.3.0-beta.
|
|
41
|
-
"@nrwl/linter": "15.3.0-beta.
|
|
42
|
-
"@nrwl/react": "15.3.0-beta.
|
|
43
|
-
"@nrwl/webpack": "15.3.0-beta.
|
|
44
|
-
"@nrwl/workspace": "15.3.0-beta.
|
|
38
|
+
"@nrwl/cypress": "15.3.0-beta.4",
|
|
39
|
+
"@nrwl/devkit": "15.3.0-beta.4",
|
|
40
|
+
"@nrwl/jest": "15.3.0-beta.4",
|
|
41
|
+
"@nrwl/linter": "15.3.0-beta.4",
|
|
42
|
+
"@nrwl/react": "15.3.0-beta.4",
|
|
43
|
+
"@nrwl/webpack": "15.3.0-beta.4",
|
|
44
|
+
"@nrwl/workspace": "15.3.0-beta.4",
|
|
45
45
|
"@svgr/webpack": "^6.1.2",
|
|
46
46
|
"chalk": "4.1.0",
|
|
47
47
|
"dotenv": "~10.0.0",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"access": "public"
|
|
58
58
|
},
|
|
59
59
|
"types": "./index.d.ts",
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "1c70ac9571f64ecfd74d80546ad2b3e17c15866b"
|
|
61
61
|
}
|
|
@@ -19,18 +19,15 @@ function addLinting(host, options) {
|
|
|
19
19
|
skipFormat: true,
|
|
20
20
|
});
|
|
21
21
|
if (options.linter === linter_1.Linter.EsLint) {
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
(0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), (json) => {
|
|
23
|
+
var _a, _b, _c;
|
|
24
|
+
json = (0, react_1.extendReactEslintJson)(json);
|
|
24
25
|
// Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
|
|
25
26
|
// TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
...reactEslintJson.ignorePatterns,
|
|
29
|
-
'.next/**/*',
|
|
30
|
-
];
|
|
31
|
-
reactEslintJson.rules = Object.assign({ '@next/next/no-html-link-for-pages': 'off' }, reactEslintJson.rules);
|
|
27
|
+
json.ignorePatterns = [...json.ignorePatterns, '.next/**/*'];
|
|
28
|
+
json.rules = Object.assign({ '@next/next/no-html-link-for-pages': 'off' }, json.rules);
|
|
32
29
|
// Find the override that handles both TS and JS files.
|
|
33
|
-
const commonOverride = (_a =
|
|
30
|
+
const commonOverride = (_a = json.overrides) === null || _a === void 0 ? void 0 : _a.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
|
|
34
31
|
if (commonOverride) {
|
|
35
32
|
// Only set parserOptions.project if it already exists (defined by options.setParserOptionsProject)
|
|
36
33
|
if ((_b = commonOverride.parserOptions) === null || _b === void 0 ? void 0 : _b.project) {
|
|
@@ -46,20 +43,20 @@ function addLinting(host, options) {
|
|
|
46
43
|
] });
|
|
47
44
|
}
|
|
48
45
|
}
|
|
49
|
-
(_c =
|
|
50
|
-
if (typeof
|
|
51
|
-
|
|
46
|
+
(_c = json.extends) !== null && _c !== void 0 ? _c : (json.extends = []);
|
|
47
|
+
if (typeof json.extends === 'string') {
|
|
48
|
+
json.extends = [json.extends];
|
|
52
49
|
}
|
|
53
50
|
// add next.js configuration
|
|
54
|
-
|
|
51
|
+
json.extends.unshift(...['next', 'next/core-web-vitals']);
|
|
55
52
|
// remove nx/react plugin, as it conflicts with the next.js one
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
if (!
|
|
59
|
-
|
|
53
|
+
json.extends = json.extends.filter((name) => name !== 'plugin:@nrwl/nx/react');
|
|
54
|
+
json.extends.unshift('plugin:@nrwl/nx/react-typescript');
|
|
55
|
+
if (!json.env) {
|
|
56
|
+
json.env = {};
|
|
60
57
|
}
|
|
61
|
-
|
|
62
|
-
return
|
|
58
|
+
json.env.jest = true;
|
|
59
|
+
return json;
|
|
63
60
|
});
|
|
64
61
|
}
|
|
65
62
|
const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, react_1.extraEslintDependencies.dependencies, react_1.extraEslintDependencies.devDependencies);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":";;;;AAAA,yCAA4D;AAC5D,yCAMsB;AACtB,uCAA6E;AAE7E,2FAAqF;AAErF,SAAsB,UAAU,CAC9B,IAAU,EACV,OAAyB;;QAEzB,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;aAC/D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,uBAAuB,CAAC;YACtE,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"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"}
|