@nrwl/next 14.5.10 → 14.6.0
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 +9 -1
- package/migrations.json +17 -0
- package/package.json +10 -9
- package/src/executors/build/build.impl.js +11 -2
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/build/schema.json +10 -4
- package/src/executors/server/schema.json +2 -1
- package/src/executors/server/server.impl.js +1 -1
- package/src/executors/server/server.impl.js.map +1 -1
- package/src/generators/application/lib/add-linting.js +5 -0
- package/src/generators/application/lib/add-linting.js.map +1 -1
- package/src/migrations/update-14-5-7/update-next-eslint.d.ts +3 -0
- package/src/migrations/update-14-5-7/update-next-eslint.js +32 -0
- package/src/migrations/update-14-5-7/update-next-eslint.js.map +1 -0
- package/src/utils/versions.d.ts +3 -3
- package/src/utils/versions.js +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
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
|
-
|
|
6
|
+
# [14.6.0](https://github.com/nrwl/nx/compare/14.5.7...14.6.0) (2022-08-31)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @nrwl/next
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [14.6.0-rc.2](https://github.com/nrwl/nx/compare/14.5.7...14.6.0-rc.2) (2022-08-30)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @nrwl/next
|
package/migrations.json
CHANGED
|
@@ -342,6 +342,23 @@
|
|
|
342
342
|
"alwaysAddToPackageJson": false
|
|
343
343
|
}
|
|
344
344
|
}
|
|
345
|
+
},
|
|
346
|
+
"14.6.0": {
|
|
347
|
+
"version": "14.6.0-beta.1",
|
|
348
|
+
"packages": {
|
|
349
|
+
"next": {
|
|
350
|
+
"version": "12.2.5",
|
|
351
|
+
"alwaysAddToPackageJson": false
|
|
352
|
+
},
|
|
353
|
+
"eslint-config-next": {
|
|
354
|
+
"version": "12.2.5",
|
|
355
|
+
"alwaysAddToPackageJson": false
|
|
356
|
+
},
|
|
357
|
+
"sass": {
|
|
358
|
+
"version": "1.54.5",
|
|
359
|
+
"alwaysAddToPackageJson": false
|
|
360
|
+
}
|
|
361
|
+
}
|
|
345
362
|
}
|
|
346
363
|
}
|
|
347
364
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.6.0",
|
|
4
4
|
"description": "When 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.\n\nThe Next.js plugin 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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,23 +34,24 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
37
|
-
"@nrwl/cypress": "14.
|
|
38
|
-
"@nrwl/devkit": "14.
|
|
39
|
-
"@nrwl/jest": "14.
|
|
40
|
-
"@nrwl/linter": "14.
|
|
41
|
-
"@nrwl/react": "14.
|
|
42
|
-
"@nrwl/web": "14.
|
|
43
|
-
"@nrwl/workspace": "14.
|
|
37
|
+
"@nrwl/cypress": "14.6.0",
|
|
38
|
+
"@nrwl/devkit": "14.6.0",
|
|
39
|
+
"@nrwl/jest": "14.6.0",
|
|
40
|
+
"@nrwl/linter": "14.6.0",
|
|
41
|
+
"@nrwl/react": "14.6.0",
|
|
42
|
+
"@nrwl/web": "14.6.0",
|
|
43
|
+
"@nrwl/workspace": "14.6.0",
|
|
44
44
|
"@svgr/webpack": "^6.1.2",
|
|
45
45
|
"chalk": "4.1.0",
|
|
46
46
|
"dotenv": "~10.0.0",
|
|
47
47
|
"eslint-config-next": "^12.1.0",
|
|
48
48
|
"fs-extra": "^10.1.0",
|
|
49
49
|
"ignore": "^5.0.4",
|
|
50
|
+
"semver": "7.3.4",
|
|
50
51
|
"ts-node": "10.9.1",
|
|
51
52
|
"tsconfig-paths": "^3.9.0",
|
|
52
53
|
"url-loader": "^4.1.1",
|
|
53
54
|
"webpack-merge": "^5.8.0"
|
|
54
55
|
},
|
|
55
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "5e39b1ed8321aa732f9f7e18c924e11dcb63156c"
|
|
56
57
|
}
|
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
require("dotenv/config");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
6
|
const build_1 = require("next/dist/build");
|
|
6
7
|
const path_1 = require("path");
|
|
7
8
|
const fs_extra_1 = require("fs-extra");
|
|
9
|
+
const semver_1 = require("semver");
|
|
8
10
|
const fileutils_1 = require("@nrwl/workspace/src/utilities/fileutils");
|
|
9
11
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
10
|
-
const
|
|
12
|
+
const version_utils_1 = require("@nrwl/workspace/src/utilities/version-utils");
|
|
11
13
|
const config_1 = require("../../utils/config");
|
|
12
14
|
const create_package_json_1 = require("./lib/create-package-json");
|
|
13
15
|
const create_next_config_file_1 = require("./lib/create-next-config-file");
|
|
@@ -18,7 +20,14 @@ function buildExecutor(options, context) {
|
|
|
18
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
21
|
// Cast to any to overwrite NODE_ENV
|
|
20
22
|
(_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
|
|
21
|
-
|
|
23
|
+
// Set `__NEXT_REACT_ROOT` based on installed ReactDOM version
|
|
24
|
+
const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.root, 'package.json'));
|
|
25
|
+
const reactDomVersion = packageJson.dependencies['react-dom'];
|
|
26
|
+
const hasReact18 = reactDomVersion &&
|
|
27
|
+
(0, semver_1.gte)((0, version_utils_1.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
|
|
28
|
+
if (hasReact18) {
|
|
29
|
+
(_b = process.env).__NEXT_REACT_ROOT || (_b.__NEXT_REACT_ROOT = 'true');
|
|
30
|
+
}
|
|
22
31
|
let dependencies = [];
|
|
23
32
|
const root = (0, path_1.resolve)(context.root, options.root);
|
|
24
33
|
const libsDir = (0, path_1.join)(context.root, (0, devkit_1.workspaceLayout)().libsDir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAA8E;AAC9E,2CAAoC;AACpC,+BAAqC;AACrC,uCAA2C;AAC3C,mCAA6B;AAC7B,uEAA0E;AAC1E,6FAG4D;AAC5D,+EAAsF;AAEtF,+CAAmD;AACnD,mEAA8D;AAC9D,2EAAqE;AACrE,uDAA2D;AAE3D,qDAA+D;AAE/D,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;QAExB,oCAAoC;QACpC,MAAC,OAAO,CAAC,GAAW,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;QAE/C,8DAA8D;QAC9D,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,UAAU,GACd,eAAe;YACf,IAAA,YAAG,EAAC,IAAA,uCAAuB,EAAC,WAAW,EAAE,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,UAAU,EAAE;YACd,MAAC,OAAO,CAAC,GAAW,EAAC,iBAAiB,QAAjB,iBAAiB,GAAK,MAAM,EAAC;SACnD;QAED,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAA,oCAAoB,EAAC,IAAI,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,UAAU,EAAE;YACtD,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAChC,kCAAsB,EACtB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,eAAK,EAAC,IAAI,EAAE,MAAa,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAA,2BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxC,IAAA,gBAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QAED,MAAM,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1C,IAAA,8CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvC,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEnE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AAtDD,gCAsDC"}
|
|
@@ -11,7 +11,8 @@
|
|
|
11
11
|
},
|
|
12
12
|
"outputPath": {
|
|
13
13
|
"type": "string",
|
|
14
|
-
"description": "The output path of the generated files."
|
|
14
|
+
"description": "The output path of the generated files.",
|
|
15
|
+
"x-completion-type": "directory"
|
|
15
16
|
},
|
|
16
17
|
"fileReplacements": {
|
|
17
18
|
"description": "Replace files with other files in the build.",
|
|
@@ -21,11 +22,14 @@
|
|
|
21
22
|
"properties": {
|
|
22
23
|
"replace": {
|
|
23
24
|
"type": "string",
|
|
24
|
-
"description": "The file to be replaced."
|
|
25
|
+
"description": "The file to be replaced.",
|
|
26
|
+
|
|
27
|
+
"x-completion-type": "file"
|
|
25
28
|
},
|
|
26
29
|
"with": {
|
|
27
30
|
"type": "string",
|
|
28
|
-
"description": "The file to replace with."
|
|
31
|
+
"description": "The file to replace with.",
|
|
32
|
+
"x-completion-type": "file"
|
|
29
33
|
}
|
|
30
34
|
},
|
|
31
35
|
"additionalProperties": false,
|
|
@@ -35,7 +39,9 @@
|
|
|
35
39
|
},
|
|
36
40
|
"nextConfig": {
|
|
37
41
|
"description": "Path (relative to workspace root) to a function which takes phase, config, and builder options, and returns the resulting config. This is an advanced option and should not be used with a normal Next.js config file (i.e. `next.config.js`).",
|
|
38
|
-
"type": "string"
|
|
42
|
+
"type": "string",
|
|
43
|
+
"x-completion-type": "file",
|
|
44
|
+
"x-completion-glob": "next?(*).js"
|
|
39
45
|
},
|
|
40
46
|
"buildLibsFromSource": {
|
|
41
47
|
"type": "boolean",
|
|
@@ -55,7 +55,7 @@ function runNextDevServer(root, config, options, buildOptions, context) {
|
|
|
55
55
|
conf: config,
|
|
56
56
|
port: options.port,
|
|
57
57
|
customServer: !!options.customServerTarget,
|
|
58
|
-
hostname: options.hostname,
|
|
58
|
+
hostname: options.hostname || 'localhost',
|
|
59
59
|
// TOOD(jack): Remove in Nx 15
|
|
60
60
|
path: options.customServerPath,
|
|
61
61
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAOsB;AACtB,+BAA+B;AAC/B,2BAAgC;AAChC,+BAAqC;AACrC,6FAAkG;AAElG,+CAAmD;AAQnD,uDAAmD;AACnD,yDAAqD;AACrD,qDAG+B;AAE/B,MAAM,UAAU,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;AAE3D,SAA+B,aAAa,CAC1C,OAAgC,EAChC,OAAwB;;QAExB,oCAAoC;QACnC,OAAO,CAAC,GAAW,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ;YAClD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;YACtB,CAAC,CAAC,OAAO,CAAC,GAAG;gBACb,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,YAAY,CAAC;QAEjB,kDAAkD;QACjD,OAAO,CAAC,GAAW,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAEzC,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,CAAC,EACtC,OAAO,CACR,CAAC;QACF,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,sBAAM,IAAA,sBAAa,EAChC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,oCAAwB,CAAC,CAAC,CAAC,mCAAuB,EAChE,YAAY,EACZ,OAAO,EACP,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,EACjC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC,CAC9C,CAAA,CAAC;QAEF,IAAI,OAAO,CAAC,kBAAkB,EAAE;YAC9B,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,CAAC;SACtE;aAAM;YACL,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,CAAC;SACvE;IACH,CAAC;CAAA;AAhCD,gCAgCC;AAED,SAAS,eAAe,CACtB,OAAgC,EAChC,OAAwB;IAExB,IAAI,OAAO,CAAC,mBAAmB,EAAE;QAC/B,OAAO,EAAE,CAAC;KACX;SAAM;QACL,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,EAAE,wBAAwB;QACjC,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QACF,OAAO,MAAM,CAAC,YAAY,CAAC;KAC5B;AACH,CAAC;AAED,SAAgB,gBAAgB,CAC9B,IAAY,EACZ,MAAwC,EACxC,OAAgC,EAChC,YAAqC,EACrC,OAAwB;;QAExB,MAAM,OAAO,GAAG,UAAU,OAAO,CAAC,QAAQ,IAAI,WAAW,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5E,MAAM,QAAQ,GAAsB;YAClC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,GAAG,EAAE,IAAI;YACT,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,kBAAkB;YAC1C,QAAQ,EAAE,OAAO,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ function addLinting(host, options) {
|
|
|
14
14
|
tsConfigPaths: [
|
|
15
15
|
(0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
|
|
16
16
|
],
|
|
17
|
+
unitTestRunner: options.unitTestRunner,
|
|
17
18
|
eslintFilePatterns: [`${options.appProjectRoot}/**/*.{ts,tsx,js,jsx}`],
|
|
18
19
|
skipFormat: true,
|
|
19
20
|
});
|
|
@@ -23,6 +24,10 @@ function addLinting(host, options) {
|
|
|
23
24
|
// Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
|
|
24
25
|
// TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
|
|
25
26
|
var _a, _b, _c;
|
|
27
|
+
reactEslintJson.ignorePatterns = [
|
|
28
|
+
...reactEslintJson.ignorePatterns,
|
|
29
|
+
'.next/**/*',
|
|
30
|
+
];
|
|
26
31
|
reactEslintJson.rules = Object.assign({ '@next/next/no-html-link-for-pages': 'off' }, reactEslintJson.rules);
|
|
27
32
|
// Find the override that handles both TS and JS files.
|
|
28
33
|
const commonOverride = (_a = reactEslintJson.overrides) === null || _a === void 0 ? void 0 : _a.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateNextEslint = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
function updateNextEslint(host) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
const projects = (0, devkit_1.getProjects)(host);
|
|
9
|
+
projects.forEach((project) => {
|
|
10
|
+
var _a, _b;
|
|
11
|
+
if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/next:build')
|
|
12
|
+
return;
|
|
13
|
+
const eslintPath = `${project.root}/.eslintrc.json`;
|
|
14
|
+
if (!host.exists(eslintPath))
|
|
15
|
+
return;
|
|
16
|
+
(0, devkit_1.updateJson)(host, eslintPath, (eslintConfig) => {
|
|
17
|
+
const nextIgnorePattern = '.next/**/*';
|
|
18
|
+
if (eslintConfig.ignorePatterns.indexOf(nextIgnorePattern) < 0) {
|
|
19
|
+
eslintConfig.ignorePatterns = [
|
|
20
|
+
...eslintConfig.ignorePatterns,
|
|
21
|
+
nextIgnorePattern,
|
|
22
|
+
];
|
|
23
|
+
}
|
|
24
|
+
return eslintConfig;
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
exports.updateNextEslint = updateNextEslint;
|
|
31
|
+
exports.default = updateNextEslint;
|
|
32
|
+
//# sourceMappingURL=update-next-eslint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-next-eslint.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-14-5-7/update-next-eslint.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAE1E,SAAsB,gBAAgB,CAAC,IAAU;;QAC/C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;YAC3B,IAAI,CAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,kBAAkB;gBAAE,OAAO;YAEpE,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,IAAI,iBAAiB,CAAC;YAEpD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;gBAAE,OAAO;YAErC,IAAA,mBAAU,EAAC,IAAI,EAAE,UAAU,EAAE,CAAC,YAAY,EAAE,EAAE;gBAC5C,MAAM,iBAAiB,GAAG,YAAY,CAAC;gBAEvC,IAAI,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE;oBAC9D,YAAY,CAAC,cAAc,GAAG;wBAC5B,GAAG,YAAY,CAAC,cAAc;wBAC9B,iBAAiB;qBAClB,CAAC;iBACH;gBACD,OAAO,YAAY,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,4CAuBC;AAED,kBAAe,gBAAgB,CAAC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const nxVersion: any;
|
|
2
|
-
export declare const nextVersion = "12.2.
|
|
3
|
-
export declare const eslintConfigNextVersion = "12.2.
|
|
4
|
-
export declare const sassVersion = "1.54.
|
|
2
|
+
export declare const nextVersion = "12.2.5";
|
|
3
|
+
export declare const eslintConfigNextVersion = "12.2.5";
|
|
4
|
+
export declare const sassVersion = "1.54.5";
|
|
5
5
|
export declare const lessLoader = "11.0.0";
|
|
6
6
|
export declare const stylusLoader = "7.0.0";
|
|
7
7
|
export declare const emotionServerVersion = "11.10.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.stylusLoader = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
|
|
4
4
|
exports.nxVersion = require('../../package.json').version;
|
|
5
|
-
exports.nextVersion = '12.2.
|
|
6
|
-
exports.eslintConfigNextVersion = '12.2.
|
|
7
|
-
exports.sassVersion = '1.54.
|
|
5
|
+
exports.nextVersion = '12.2.5';
|
|
6
|
+
exports.eslintConfigNextVersion = '12.2.5';
|
|
7
|
+
exports.sassVersion = '1.54.5';
|
|
8
8
|
exports.lessLoader = '11.0.0';
|
|
9
9
|
exports.stylusLoader = '7.0.0';
|
|
10
10
|
exports.emotionServerVersion = '11.10.0';
|