@nrwl/next 13.0.0-rc.2 → 13.1.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/migrations.json +10 -12
- package/package.json +9 -9
- package/plugins/with-less.d.ts +1 -0
- package/plugins/with-less.js +74 -0
- package/plugins/with-less.js.map +1 -0
- package/plugins/with-stylus.js +1 -4
- package/plugins/with-stylus.js.map +1 -1
- package/src/executors/build/build.impl.js +3 -1
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/export/export.impl.js +8 -2
- package/src/executors/export/export.impl.js.map +1 -1
- package/src/executors/server/server.impl.js +3 -1
- package/src/executors/server/server.impl.js.map +1 -1
- package/src/generators/application/files/next.config.js__tmpl__ +1 -1
- package/src/generators/application/lib/create-application-files.js +4 -0
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +2 -2
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/update-jest-config.js +3 -1
- package/src/generators/application/lib/update-jest-config.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -0
- package/src/generators/application/schema.json +5 -0
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/migrations/update-13-0-3/fix-less.d.ts +3 -0
- package/src/migrations/update-13-0-3/fix-less.js +27 -0
- package/src/migrations/update-13-0-3/fix-less.js.map +1 -0
- package/src/migrations/update-9-2-0/create-next-config.js +6 -2
- package/src/migrations/update-9-2-0/create-next-config.js.map +1 -1
- package/src/utils/config.d.ts +2 -2
- package/src/utils/config.js +4 -3
- package/src/utils/config.js.map +1 -1
- package/src/utils/styles.d.ts +3 -3
- package/src/utils/styles.js +3 -3
- package/src/utils/styles.js.map +1 -1
- package/src/utils/versions.d.ts +3 -3
- package/src/utils/versions.js +5 -5
- package/src/utils/versions.js.map +1 -1
package/migrations.json
CHANGED
|
@@ -72,6 +72,12 @@
|
|
|
72
72
|
"version": "13.0.0-beta.1",
|
|
73
73
|
"description": "Set `webpack5: true` for all next.js projects.",
|
|
74
74
|
"factory": "./src/migrations/update-13-0-0/update-to-webpack-5"
|
|
75
|
+
},
|
|
76
|
+
"fix-less": {
|
|
77
|
+
"cli": "nx",
|
|
78
|
+
"version": "13.0.3-beta.1",
|
|
79
|
+
"description": "Fix setup for less stylesheets",
|
|
80
|
+
"factory": "./src/migrations/update-13-0-3/fix-less"
|
|
75
81
|
}
|
|
76
82
|
},
|
|
77
83
|
"packageJsonUpdates": {
|
|
@@ -176,23 +182,15 @@
|
|
|
176
182
|
}
|
|
177
183
|
}
|
|
178
184
|
},
|
|
179
|
-
"update-13.0.
|
|
180
|
-
"version": "13.0.
|
|
185
|
+
"update-13.0.3": {
|
|
186
|
+
"version": "13.0.3-beta.0",
|
|
181
187
|
"packages": {
|
|
182
188
|
"next": {
|
|
183
|
-
"version": "
|
|
184
|
-
"alwaysAddToPackageJson": false
|
|
185
|
-
},
|
|
186
|
-
"sass": {
|
|
187
|
-
"version": "1.43.2",
|
|
188
|
-
"alwaysAddToPackageJson": false
|
|
189
|
-
},
|
|
190
|
-
"@emotion/server": {
|
|
191
|
-
"version": "11.4.0",
|
|
189
|
+
"version": "12.0.0",
|
|
192
190
|
"alwaysAddToPackageJson": false
|
|
193
191
|
},
|
|
194
192
|
"eslint-config-next": {
|
|
195
|
-
"version": "
|
|
193
|
+
"version": "12.0.0",
|
|
196
194
|
"alwaysAddToPackageJson": false
|
|
197
195
|
}
|
|
198
196
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.1.0",
|
|
4
4
|
"description": "Next.js Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,16 +34,16 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
37
|
-
"@nrwl/react": "13.
|
|
38
|
-
"@nrwl/cypress": "13.
|
|
39
|
-
"@nrwl/devkit": "13.
|
|
40
|
-
"@nrwl/jest": "13.
|
|
41
|
-
"@nrwl/linter": "13.
|
|
42
|
-
"@nrwl/web": "13.
|
|
43
|
-
"@nrwl/workspace": "13.
|
|
37
|
+
"@nrwl/react": "13.1.0",
|
|
38
|
+
"@nrwl/cypress": "13.1.0",
|
|
39
|
+
"@nrwl/devkit": "13.1.0",
|
|
40
|
+
"@nrwl/jest": "13.1.0",
|
|
41
|
+
"@nrwl/linter": "13.1.0",
|
|
42
|
+
"@nrwl/web": "13.1.0",
|
|
43
|
+
"@nrwl/workspace": "13.1.0",
|
|
44
44
|
"@svgr/webpack": "^5.5.0",
|
|
45
45
|
"chalk": "4.1.0",
|
|
46
|
-
"eslint-config-next": "^
|
|
46
|
+
"eslint-config-next": "^12.0.0",
|
|
47
47
|
"fs-extra": "^9.1.0",
|
|
48
48
|
"url-loader": "^4.1.1",
|
|
49
49
|
"tsconfig-paths": "^3.9.0",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
// Adapted from https://raw.githubusercontent.com/elado/next-with-less/main/src/index.js
|
|
5
|
+
const webpack_merge_1 = require("webpack-merge");
|
|
6
|
+
const addLessToRegExp = (rx) => new RegExp(rx.source.replace('|sass', '|sass|less'), rx.flags);
|
|
7
|
+
function patchNextCSSWithLess(nextCSSModule = require('next/dist/build/webpack/config/blocks/css')) {
|
|
8
|
+
nextCSSModule.regexLikeCss = addLessToRegExp(nextCSSModule.regexLikeCss);
|
|
9
|
+
}
|
|
10
|
+
patchNextCSSWithLess();
|
|
11
|
+
function withLess(_a) {
|
|
12
|
+
var { lessLoaderOptions = {} } = _a, nextConfig = tslib_1.__rest(_a, ["lessLoaderOptions"]);
|
|
13
|
+
return Object.assign({}, nextConfig, {
|
|
14
|
+
webpack(config, opts) {
|
|
15
|
+
// there are 2 relevant sass rules in next.js - css modules and global css
|
|
16
|
+
let sassModuleRule;
|
|
17
|
+
// global sass rule (does not exist in server builds)
|
|
18
|
+
let sassGlobalRule;
|
|
19
|
+
const cssRule = config.module.rules.find((rule) => { var _a; return (_a = rule.oneOf) === null || _a === void 0 ? void 0 : _a.find((r) => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.options) === null || _a === void 0 ? void 0 : _a.__next_css_remove; }); });
|
|
20
|
+
const addLessToRuleTest = (test) => {
|
|
21
|
+
if (Array.isArray(test)) {
|
|
22
|
+
return test.map((rx) => addLessToRegExp(rx));
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
return addLessToRegExp(test);
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
cssRule.oneOf.forEach((rule) => {
|
|
29
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
30
|
+
if ((_a = rule.options) === null || _a === void 0 ? void 0 : _a.__next_css_remove)
|
|
31
|
+
return;
|
|
32
|
+
if (((_b = rule.use) === null || _b === void 0 ? void 0 : _b.loader) === 'error-loader') {
|
|
33
|
+
rule.test = addLessToRuleTest(rule.test);
|
|
34
|
+
}
|
|
35
|
+
else if ((_d = (_c = rule.use) === null || _c === void 0 ? void 0 : _c.loader) === null || _d === void 0 ? void 0 : _d.includes('file-loader')) {
|
|
36
|
+
rule.issuer = addLessToRuleTest(rule.issuer);
|
|
37
|
+
}
|
|
38
|
+
else if ((_f = (_e = rule.use) === null || _e === void 0 ? void 0 : _e.includes) === null || _f === void 0 ? void 0 : _f.call(_e, 'ignore-loader')) {
|
|
39
|
+
rule.test = addLessToRuleTest(rule.test);
|
|
40
|
+
}
|
|
41
|
+
else if (((_g = rule.test) === null || _g === void 0 ? void 0 : _g.source) === '\\.module\\.(scss|sass)$') {
|
|
42
|
+
sassModuleRule = rule;
|
|
43
|
+
}
|
|
44
|
+
else if (((_h = rule.test) === null || _h === void 0 ? void 0 : _h.source) === '(?<!\\.module)\\.(scss|sass)$') {
|
|
45
|
+
sassGlobalRule = rule;
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
const lessLoader = {
|
|
49
|
+
loader: 'less-loader',
|
|
50
|
+
options: Object.assign(Object.assign({}, lessLoaderOptions), { lessOptions: Object.assign({ javascriptEnabled: true }, lessLoaderOptions.lessOptions) }),
|
|
51
|
+
};
|
|
52
|
+
let lessModuleRule = webpack_merge_1.merge(sassModuleRule);
|
|
53
|
+
const configureLessRule = (rule) => {
|
|
54
|
+
rule.test = new RegExp(rule.test.source.replace('(scss|sass)', 'less'));
|
|
55
|
+
// replace sass-loader (last entry) with less-loader
|
|
56
|
+
rule.use.splice(-1, 1, lessLoader);
|
|
57
|
+
};
|
|
58
|
+
configureLessRule(lessModuleRule);
|
|
59
|
+
cssRule.oneOf.splice(cssRule.oneOf.indexOf(sassModuleRule) + 1, 0, lessModuleRule);
|
|
60
|
+
if (sassGlobalRule) {
|
|
61
|
+
let lessGlobalRule = webpack_merge_1.merge(sassGlobalRule);
|
|
62
|
+
configureLessRule(lessGlobalRule);
|
|
63
|
+
cssRule.oneOf.splice(cssRule.oneOf.indexOf(sassGlobalRule) + 1, 0, lessGlobalRule);
|
|
64
|
+
}
|
|
65
|
+
if (typeof nextConfig.webpack === 'function') {
|
|
66
|
+
return nextConfig.webpack(config, opts);
|
|
67
|
+
}
|
|
68
|
+
return config;
|
|
69
|
+
},
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
module.exports = withLess;
|
|
73
|
+
module.exports.patchNext = patchNextCSSWithLess;
|
|
74
|
+
//# sourceMappingURL=with-less.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"with-less.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-less.ts"],"names":[],"mappings":"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"}
|
package/plugins/with-stylus.js
CHANGED
|
@@ -8,9 +8,6 @@ function patchNextCSSWithStylus(nextCSSModule = require('next/dist/build/webpack
|
|
|
8
8
|
nextCSSModule.regexLikeCss = addStylusToRegExp(nextCSSModule.regexLikeCss);
|
|
9
9
|
}
|
|
10
10
|
patchNextCSSWithStylus();
|
|
11
|
-
/*
|
|
12
|
-
* @deprecated Use CSS or SASS instead.
|
|
13
|
-
*/
|
|
14
11
|
function withStylus(_a) {
|
|
15
12
|
var { stylusLoaderOptions = {} } = _a, nextConfig = tslib_1.__rest(_a, ["stylusLoaderOptions"]);
|
|
16
13
|
return Object.assign({}, nextConfig, {
|
|
@@ -19,7 +16,7 @@ function withStylus(_a) {
|
|
|
19
16
|
let sassModuleRule;
|
|
20
17
|
// global sass rule (does not exist in server builds)
|
|
21
18
|
let sassGlobalRule;
|
|
22
|
-
const cssRule = config.module.rules.find((rule) => { var _a
|
|
19
|
+
const cssRule = config.module.rules.find((rule) => { var _a; return (_a = rule.oneOf) === null || _a === void 0 ? void 0 : _a.find((r) => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.options) === null || _a === void 0 ? void 0 : _a.__next_css_remove; }); });
|
|
23
20
|
const addStylusRuleToTest = (test) => {
|
|
24
21
|
if (Array.isArray(test)) {
|
|
25
22
|
return test.map((rx) => addStylusToRegExp(rx));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-stylus.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-stylus.ts"],"names":[],"mappings":";;;AAAA,wFAAwF;AACxF,iDAAsC;AAEtC,MAAM,iBAAiB,GAAG,CAAC,EAAE,EAAE,EAAE,CAC/B,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;AAEjE,SAAS,sBAAsB,CAC7B,gBAAgB,OAAO,CAAC,2CAA2C,CAAQ;IAE3E,aAAa,CAAC,YAAY,GAAG,iBAAiB,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;AAC7E,CAAC;AAED,sBAAsB,EAAE,CAAC;AAEzB
|
|
1
|
+
{"version":3,"file":"with-stylus.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-stylus.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-
|
|
|
14
14
|
const buildable_libs_1 = require("../../utils/buildable-libs");
|
|
15
15
|
const check_project_1 = require("./lib/check-project");
|
|
16
16
|
const require_shim_1 = require("../../utils/require-shim");
|
|
17
|
+
const file_utils_1 = require("@nrwl/workspace/src/core/file-utils");
|
|
17
18
|
const { PHASE_PRODUCTION_BUILD } = require_shim_1.importConstants();
|
|
18
19
|
function buildExecutor(options, context) {
|
|
19
20
|
var _a;
|
|
@@ -21,13 +22,14 @@ function buildExecutor(options, context) {
|
|
|
21
22
|
let dependencies = [];
|
|
22
23
|
(_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
|
|
23
24
|
const root = path_1.resolve(context.root, options.root);
|
|
25
|
+
const libsDir = path_1.join(context.root, file_utils_1.workspaceLayout().libsDir);
|
|
24
26
|
check_project_1.checkPublicDirectory(root);
|
|
25
27
|
if (!options.buildLibsFromSource && context.targetName) {
|
|
26
28
|
const result = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(), context.root, context.projectName, context.targetName, context.configurationName);
|
|
27
29
|
dependencies = result.dependencies;
|
|
28
30
|
buildable_libs_1.assertDependentProjectsHaveBeenBuilt(dependencies, context);
|
|
29
31
|
}
|
|
30
|
-
const config = yield config_1.prepareConfig(PHASE_PRODUCTION_BUILD, options, context, dependencies);
|
|
32
|
+
const config = yield config_1.prepareConfig(PHASE_PRODUCTION_BUILD, options, context, dependencies, libsDir);
|
|
31
33
|
yield build_1.default(root, config);
|
|
32
34
|
if (!fileutils_1.directoryExists(options.outputPath)) {
|
|
33
35
|
fs_extra_1.mkdir(options.outputPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AAGvB,2CAAoC;AAEpC,+BAAqC;AACrC,uCAA2C;AAE3C,+CAAmD;AAEnD,mEAA8D;AAC9D,2EAAqE;AACrE,uEAA0E;AAC1E,0EAAgF;AAChF,6FAG4D;AAC5D,+DAAkF;AAClF,uDAA2D;AAC3D,2DAA2D;
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AAGvB,2CAAoC;AAEpC,+BAAqC;AACrC,uCAA2C;AAE3C,+CAAmD;AAEnD,mEAA8D;AAC9D,2EAAqE;AACrE,uEAA0E;AAC1E,0EAAgF;AAChF,6FAG4D;AAC5D,+DAAkF;AAClF,uDAA2D;AAC3D,2DAA2D;AAC3D,oEAAsE;AAEtE,MAAM,EAAE,sBAAsB,EAAE,GAAG,8BAAe,EAAE,CAAC;AAErD,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;QAExB,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,MAAA,OAAO,CAAC,GAAG,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;QAEtC,MAAM,IAAI,GAAG,cAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,WAAI,CAAC,OAAO,CAAC,IAAI,EAAE,4BAAe,EAAE,CAAC,OAAO,CAAC,CAAC;QAE9D,oCAAoB,CAAC,IAAI,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,UAAU,EAAE;YACtD,MAAM,MAAM,GAAG,mDAA4B,CACzC,sCAAsB,EAAE,EACxB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;YAEnC,qDAAoC,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SAC7D;QAED,MAAM,MAAM,GAAG,MAAM,sBAAa,CAChC,sBAAsB,EACtB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,MAAM,eAAK,CAAC,IAAI,EAAE,MAAa,CAAC,CAAC;QAEjC,IAAI,CAAC,2BAAe,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxC,gBAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QAED,MAAM,uCAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1C,8CAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvC,mBAAQ,CAAC,WAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,WAAI,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEnE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AA7CD,gCA6CC"}
|
|
@@ -10,6 +10,8 @@ const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
|
10
10
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
11
11
|
const buildable_libs_1 = require("../../utils/buildable-libs");
|
|
12
12
|
const require_shim_1 = require("../../utils/require-shim");
|
|
13
|
+
const file_utils_1 = require("@nrwl/workspace/src/core/file-utils");
|
|
14
|
+
const nextTrace = require("next/dist/trace");
|
|
13
15
|
const { PHASE_EXPORT } = require_shim_1.importConstants();
|
|
14
16
|
function exportExecutor(options, context) {
|
|
15
17
|
var e_1, _a;
|
|
@@ -21,6 +23,7 @@ function exportExecutor(options, context) {
|
|
|
21
23
|
dependencies = result.dependencies;
|
|
22
24
|
buildable_libs_1.assertDependentProjectsHaveBeenBuilt(dependencies, context);
|
|
23
25
|
}
|
|
26
|
+
const libsDir = path_1.join(context.root, file_utils_1.workspaceLayout().libsDir);
|
|
24
27
|
const buildTarget = devkit_1.parseTargetString(options.buildTarget);
|
|
25
28
|
const build = yield devkit_1.runExecutor(buildTarget, {}, context);
|
|
26
29
|
try {
|
|
@@ -40,13 +43,16 @@ function exportExecutor(options, context) {
|
|
|
40
43
|
}
|
|
41
44
|
const buildOptions = devkit_1.readTargetOptions(buildTarget, context);
|
|
42
45
|
const root = path_1.resolve(context.root, buildOptions.root);
|
|
43
|
-
const config = yield config_1.prepareConfig(PHASE_EXPORT, buildOptions, context, dependencies);
|
|
46
|
+
const config = yield config_1.prepareConfig(PHASE_EXPORT, buildOptions, context, dependencies, libsDir);
|
|
47
|
+
// Taken from:
|
|
48
|
+
// https://github.com/vercel/next.js/blob/ead56eaab68409e96c19f7d9139747bac1197aa9/packages/next/cli/next-export.ts#L13
|
|
49
|
+
const nextExportCliSpan = nextTrace.trace('next-export-cli');
|
|
44
50
|
yield export_1.default(root, {
|
|
45
51
|
statusMessage: 'Exporting',
|
|
46
52
|
silent: options.silent,
|
|
47
53
|
threads: options.threads,
|
|
48
54
|
outdir: `${buildOptions.outputPath}/exported`,
|
|
49
|
-
}, config);
|
|
55
|
+
}, nextExportCliSpan, config);
|
|
50
56
|
return { success: true };
|
|
51
57
|
});
|
|
52
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/export/export.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAKsB;AACtB,6CAAyC;AACzC,+
|
|
1
|
+
{"version":3,"file":"export.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/export/export.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAKsB;AACtB,6CAAyC;AACzC,+BAAqC;AAErC,+CAAmD;AAKnD,0EAAgF;AAChF,6FAG4D;AAC5D,+DAAkF;AAClF,2DAA2D;AAC3D,oEAAsE;AACtE,6CAA8C;AAE9C,MAAM,EAAE,YAAY,EAAE,GAAG,8BAAe,EAAE,CAAC;AAE3C,SAA8B,cAAc,CAC1C,OAAiC,EACjC,OAAwB;;;QAExB,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAChC,MAAM,MAAM,GAAG,mDAA4B,CACzC,sCAAsB,EAAE,EACxB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,EAAE,6BAA6B;YACtC,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;YAEnC,qDAAoC,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SAC7D;QAED,MAAM,OAAO,GAAG,WAAI,CAAC,OAAO,CAAC,IAAI,EAAE,4BAAe,EAAE,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,0BAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,oBAAW,CAAC,WAAW,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;;YAE1D,KAA2B,IAAA,UAAA,sBAAA,KAAK,CAAA,WAAA;gBAArB,MAAM,MAAM,kBAAA,CAAA;gBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oBACnB,OAAO,MAAM,CAAC;iBACf;aACF;;;;;;;;;QAED,MAAM,YAAY,GAAG,0BAAiB,CACpC,WAAW,EACX,OAAO,CACR,CAAC;QACF,MAAM,IAAI,GAAG,cAAO,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,sBAAa,CAChC,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,cAAc;QACd,uHAAuH;QACvH,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAE7D,MAAM,gBAAS,CACb,IAAI,EACJ;YACE,aAAa,EAAE,WAAW;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,GAAG,YAAY,CAAC,UAAU,WAAW;SACvC,EACR,iBAAiB,EACjB,MAAM,CACP,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AA1DD,iCA0DC"}
|
|
@@ -13,6 +13,7 @@ const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
|
13
13
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
14
14
|
const buildable_libs_1 = require("../../utils/buildable-libs");
|
|
15
15
|
const require_shim_1 = require("../../utils/require-shim");
|
|
16
|
+
const file_utils_1 = require("@nrwl/workspace/src/core/file-utils");
|
|
16
17
|
const { PHASE_DEVELOPMENT_SERVER, PHASE_PRODUCTION_SERVER } = require_shim_1.importConstants();
|
|
17
18
|
const infoPrefix = `[ ${chalk.dim(chalk.cyan('info'))} ] `;
|
|
18
19
|
const readyPrefix = `[ ${chalk.green('ready')} ]`;
|
|
@@ -28,13 +29,14 @@ function serveExecutor(options, context) {
|
|
|
28
29
|
const baseUrl = `http://${options.hostname || 'localhost'}:${options.port}`;
|
|
29
30
|
const buildOptions = devkit_1.readTargetOptions(buildTarget, context);
|
|
30
31
|
const root = path_1.resolve(context.root, buildOptions.root);
|
|
32
|
+
const libsDir = path_1.join(context.root, file_utils_1.workspaceLayout().libsDir);
|
|
31
33
|
if (!options.buildLibsFromSource) {
|
|
32
34
|
const result = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(), context.root, context.projectName, 'build', // should be generalized
|
|
33
35
|
context.configurationName);
|
|
34
36
|
dependencies = result.dependencies;
|
|
35
37
|
buildable_libs_1.assertDependentProjectsHaveBeenBuilt(dependencies, context);
|
|
36
38
|
}
|
|
37
|
-
const config = yield tslib_1.__await(config_1.prepareConfig(options.dev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_SERVER, buildOptions, context, dependencies));
|
|
39
|
+
const config = yield tslib_1.__await(config_1.prepareConfig(options.dev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_SERVER, buildOptions, context, dependencies, libsDir));
|
|
38
40
|
const settings = {
|
|
39
41
|
dev: options.dev,
|
|
40
42
|
dir: root,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,yCAKsB;AAEtB,+BAA+B;AAC/B,2BAAgC;AAChC,+BAAqC;AAErC,+CAAmD;AAQnD,uDAAmD;AACnD,yDAAqD;AACrD,0EAAgF;AAChF,6FAG4D;AAC5D,+DAAkF;AAClF,2DAA2D;
|
|
1
|
+
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ const withNx = require('@nrwl/next/plugins/with-nx');
|
|
|
4
4
|
<% if (style === 'less') { %>
|
|
5
5
|
// This plugin is needed until this PR is merged.
|
|
6
6
|
// https://github.com/vercel/next.js/pull/23185
|
|
7
|
-
const withLess = require('next
|
|
7
|
+
const withLess = require('@nrwl/next/plugins/with-less');
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
10
|
* @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
|
|
@@ -12,6 +12,10 @@ function createApplicationFiles(host, options) {
|
|
|
12
12
|
if (options.unitTestRunner === 'none') {
|
|
13
13
|
host.delete(`${options.appProjectRoot}/specs/${options.fileName}.spec.tsx`);
|
|
14
14
|
}
|
|
15
|
+
// SWC will be disabled if custom babelrc is provided.
|
|
16
|
+
if (options.swc) {
|
|
17
|
+
host.delete(`${options.appProjectRoot}/.babelrc`);
|
|
18
|
+
}
|
|
15
19
|
if (options.styledModule) {
|
|
16
20
|
host.delete(`${options.appProjectRoot}/pages/${options.fileName}.module.${options.style}`);
|
|
17
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B,yFAG4C;AAC5C,yCAOsB;AAEtB,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,iBAAiB,iDAClB,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,EACtD,UAAU,EAAE,+CAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EACtC,YAAY,EAAE,mDAAgB,EAAE,EAChC,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EACP,OAAO,CAAC,KAAK,KAAK,MAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM;YAClD,CAAC,CAAC,OAAO,CAAC,KAAK;YACf,CAAC,CAAC,KAAK,GACZ,CAAC;IAEF,sBAAa,CACX,IAAI,EACJ,WAAI,CAAC,SAAS,EAAE,UAAU,CAAC,EAC3B,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,CAAC,CAAC;KAC7E;IAED,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,OAAO,CAAC,KAAK,EAAE,CAC9E,CAAC;KACH;IAED,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE;QACzC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC,CAAC;KAC9D;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,aAAa,CAAC,CAAC;QACpD,aAAI,CAAC,IAAI,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;KACxD;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAE5B,yFAG4C;AAC5C,yCAOsB;AAEtB,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,iBAAiB,iDAClB,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,EACtD,UAAU,EAAE,+CAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EACtC,YAAY,EAAE,mDAAgB,EAAE,EAChC,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EACP,OAAO,CAAC,KAAK,KAAK,MAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM;YAClD,CAAC,CAAC,OAAO,CAAC,KAAK;YACf,CAAC,CAAC,KAAK,GACZ,CAAC;IAEF,sBAAa,CACX,IAAI,EACJ,WAAI,CAAC,SAAS,EAAE,UAAU,CAAC,EAC3B,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,CAAC,CAAC;KAC7E;IAED,sDAAsD;IACtD,IAAI,OAAO,CAAC,GAAG,EAAE;QACf,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,WAAW,CAAC,CAAC;KACnD;IAED,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,OAAO,CAAC,KAAK,EAAE,CAC9E,CAAC;KACH;IAED,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE;QACzC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC,CAAC;KAC9D;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,aAAa,CAAC,CAAC;QACpD,aAAI,CAAC,IAAI,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;KACxD;AACH,CAAC;AA9CD,wDA8CC"}
|
|
@@ -11,8 +11,8 @@ function normalizeOptions(host, options) {
|
|
|
11
11
|
const { appsDir } = devkit_1.getWorkspaceLayout(host);
|
|
12
12
|
const appProjectName = appDirectory.replace(new RegExp('/', 'g'), '-');
|
|
13
13
|
const e2eProjectName = `${appProjectName}-e2e`;
|
|
14
|
-
const appProjectRoot =
|
|
15
|
-
const e2eProjectRoot = `${
|
|
14
|
+
const appProjectRoot = devkit_1.joinPathFragments(appsDir, appDirectory);
|
|
15
|
+
const e2eProjectRoot = devkit_1.joinPathFragments(appsDir, `${appDirectory}-e2e`);
|
|
16
16
|
const parsedTags = options.tags
|
|
17
17
|
? options.tags.split(',').map((s) => s.trim())
|
|
18
18
|
: [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAC/C,yCAKsB;AACtB,yCAAsC;AAetC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;IAEf,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,MAAM,EAAE,OAAO,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,MAAM,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;IAE/C,MAAM,cAAc,GAAG,0BAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,0BAAiB,CAAC,OAAO,EAAE,GAAG,YAAY,MAAM,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,QAAQ,GAAG,OAAO,CAAC;IAEzB,MAAM,YAAY,GAAG,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/D,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAElB,wBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhC,uCACK,OAAO,KACV,IAAI,EAAE,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAClC,WAAW,EAAE,cAAc,EAC3B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,MAAM,EAChD,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,SAAS,EACjD,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK,EAC7B,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU;QACV,QAAQ;QACR,YAAY,IACZ;AACJ,CAAC;AA3CD,4CA2CC"}
|
|
@@ -7,7 +7,9 @@ function updateJestConfig(host, options) {
|
|
|
7
7
|
}
|
|
8
8
|
const configPath = `${options.appProjectRoot}/jest.config.js`;
|
|
9
9
|
const originalContent = host.read(configPath, 'utf-8');
|
|
10
|
-
const content = originalContent
|
|
10
|
+
const content = originalContent
|
|
11
|
+
.replace('transform: {', "transform: {\n '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',")
|
|
12
|
+
.replace(`'babel-jest'`, `['babel-jest', { presets: ['next/babel'] }]`);
|
|
11
13
|
host.write(configPath, content);
|
|
12
14
|
}
|
|
13
15
|
exports.updateJestConfig = updateJestConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAGA,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,iBAAiB,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAGA,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,iBAAiB,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,eAAe;SAC5B,OAAO,CACN,cAAc,EACd,wFAAwF,CACzF;SACA,OAAO,CAAC,cAAc,EAAE,6CAA6C,CAAC,CAAC;IAC1E,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAdD,4CAcC"}
|
|
@@ -113,6 +113,11 @@
|
|
|
113
113
|
"standaloneConfig": {
|
|
114
114
|
"description": "Split the project configuration into <projectRoot>/project.json rather than including it inside workspace.json",
|
|
115
115
|
"type": "boolean"
|
|
116
|
+
},
|
|
117
|
+
"swc": {
|
|
118
|
+
"description": "Enable the Rust-based compiler SWC to compile JS/TS files.",
|
|
119
|
+
"type": "boolean",
|
|
120
|
+
"default": true
|
|
116
121
|
}
|
|
117
122
|
},
|
|
118
123
|
"required": []
|
|
@@ -11,7 +11,7 @@ function libraryGenerator(host, options) {
|
|
|
11
11
|
? `${devkit_1.names(options.directory).fileName}/${name}`
|
|
12
12
|
: name;
|
|
13
13
|
const { libsDir } = devkit_1.getWorkspaceLayout(host);
|
|
14
|
-
const projectRoot = devkit_1.joinPathFragments(
|
|
14
|
+
const projectRoot = devkit_1.joinPathFragments(libsDir, projectDirectory);
|
|
15
15
|
const task = yield react_1.libraryGenerator(host, options);
|
|
16
16
|
devkit_1.updateJson(host, devkit_1.joinPathFragments(projectRoot, '.babelrc'), (json) => {
|
|
17
17
|
if (options.style === '@emotion/styled') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,uCAAwE;AACxE,yCAOsB;AAGtB,SAAsB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;QAChE,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;YACxC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;YAChD,CAAC,CAAC,IAAI,CAAC;QAET,MAAM,EAAE,OAAO,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,0BAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,uCAAwE;AACxE,yCAOsB;AAGtB,SAAsB,gBAAgB,CAAC,IAAU,EAAE,OAAe;;QAChE,MAAM,IAAI,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;YACxC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;YAChD,CAAC,CAAC,IAAI,CAAC;QAET,MAAM,EAAE,OAAO,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,0BAAiB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAEjE,MAAM,IAAI,GAAG,MAAM,wBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAExD,mBAAU,CAAC,IAAI,EAAE,0BAAiB,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;YACpE,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,EAAE;gBACvC,IAAI,CAAC,OAAO,GAAG;oBACb;wBACE,YAAY;wBACZ;4BACE,cAAc,EAAE;gCACd,YAAY,EAAE,gBAAgB;6BAC/B;yBACF;qBACF;iBACF,CAAC;aACH;iBAAM,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;gBACzC,yEAAyE;gBACzE,qCAAqC;gBACrC,IAAI,CAAC,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC9B,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,kBAAkB,CAChC,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,CAAC,YAAY,CAAC,CAAC;aAC/B;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,mBAAU,CAAC,IAAI,EAAE,0BAAiB,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;YACzE,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,EAAE;gBACvC,IAAI,CAAC,eAAe,CAAC,eAAe,GAAG,gBAAgB,CAAC;aACzD;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,mBAAU,CACR,IAAI,EACJ,0BAAiB,CAAC,WAAW,EAAE,mBAAmB,CAAC,EACnD,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACf,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;aACjB;YACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE;gBAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE;oBAC7C,OAAO,IAAI,CAAC,OAAO,CACjB,gCAAgC,EAChC,+BAA+B,CAChC,CAAC;iBACH;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAhED,4CAgEC;AAED,kBAAe,gBAAgB,CAAC;AACnB,QAAA,gBAAgB,GAAG,2BAAkB,CAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.update = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
function update(host) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
const projects = devkit_1.getProjects(host);
|
|
9
|
+
let task = undefined;
|
|
10
|
+
projects.forEach((project) => {
|
|
11
|
+
const configPath = devkit_1.joinPathFragments(project.root, 'next.config.js');
|
|
12
|
+
if (!host.exists(configPath))
|
|
13
|
+
return;
|
|
14
|
+
const content = host.read(configPath).toString();
|
|
15
|
+
if (content.match(/next-with-less/)) {
|
|
16
|
+
const updated = content.replace('next-with-less', '@nrwl/next/plugins/with-less');
|
|
17
|
+
task = devkit_1.addDependenciesToPackageJson(host, { 'less-loader': '10.2.0' }, {});
|
|
18
|
+
host.write(configPath, updated);
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
yield devkit_1.formatFiles(host);
|
|
22
|
+
return task;
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
exports.update = update;
|
|
26
|
+
exports.default = update;
|
|
27
|
+
//# sourceMappingURL=fix-less.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fix-less.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-13-0-3/fix-less.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,SAAsB,MAAM,CAAC,IAAU;;QACrC,MAAM,QAAQ,GAAG,oBAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,IAAI,GAAkC,SAAS,CAAC;QAEpD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,UAAU,GAAG,0BAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAErE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;gBAAE,OAAO;YAErC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEjD,IAAI,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE;gBACnC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAC7B,gBAAgB,EAChB,8BAA8B,CAC/B,CAAC;gBACF,IAAI,GAAG,qCAA4B,CACjC,IAAI,EACJ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAC3B,EAAE,CACH,CAAC;gBACF,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;aACjC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AA5BD,wBA4BC;AAED,kBAAe,MAAM,CAAC"}
|
|
@@ -4,7 +4,7 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
4
4
|
const workspace_1 = require("@nrwl/workspace");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const require_shim_1 = require("../../utils/require-shim");
|
|
7
|
-
const { CONFIG_FILE } = require_shim_1.importConstants();
|
|
7
|
+
const { CONFIG_FILE, CONFIG_FILES } = require_shim_1.importConstants();
|
|
8
8
|
const defaultConfig = `const withSass = require('@zeit/next-sass');
|
|
9
9
|
const withLess = require('@zeit/next-less');
|
|
10
10
|
const withStylus = require('@zeit/next-stylus');
|
|
@@ -35,7 +35,11 @@ function update() {
|
|
|
35
35
|
})
|
|
36
36
|
.filter(Boolean);
|
|
37
37
|
nextProjects.forEach((p) => {
|
|
38
|
-
|
|
38
|
+
// Next.js 12 specifies two config files.
|
|
39
|
+
const configFile = Array.isArray(CONFIG_FILES)
|
|
40
|
+
? CONFIG_FILES[0]
|
|
41
|
+
: CONFIG_FILE;
|
|
42
|
+
const configPath = path_1.join(p.root, configFile);
|
|
39
43
|
if (!host.exists(configPath)) {
|
|
40
44
|
host.create(configPath, defaultConfig);
|
|
41
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-next-config.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-9-2-0/create-next-config.ts"],"names":[],"mappings":";;AAAA,2DAA+D;AAC/D,+CAA6D;AAC7D,+BAA4B;AAC5B,2DAA2D;
|
|
1
|
+
{"version":3,"file":"create-next-config.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-9-2-0/create-next-config.ts"],"names":[],"mappings":";;AAAA,2DAA+D;AAC/D,+CAA6D;AAC7D,+BAA4B;AAC5B,2DAA2D;AAE3D,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,8BAAe,EAAE,CAAC;AAExD,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;CAiBrB,CAAC;AAEF,SAAwB,MAAM;IAC5B,OAAO,kBAAK,CAAC;QACX,CAAC,IAAU,EAAE,EAAE;YACb,MAAM,aAAa,GAAG,yBAAa,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;iBACrD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACZ,MAAM,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACvC,MAAM,YAAY,GAChB,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC;gBAChE,OAAO,YAAY,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACxD,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC,CAAC;YAEnB,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzB,yCAAyC;gBACzC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;oBAC5C,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;oBACjB,CAAC,CAAC,WAAW,CAAC;gBAChB,MAAM,UAAU,GAAG,WAAI,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;oBAC5B,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;iBACxC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QACD,uBAAW,EAAE;KACd,CAAC,CAAC;AACL,CAAC;AA1BD,yBA0BC"}
|
package/src/utils/config.d.ts
CHANGED
|
@@ -3,5 +3,5 @@ import type { PHASE_DEVELOPMENT_SERVER, PHASE_EXPORT, PHASE_PRODUCTION_BUILD, PH
|
|
|
3
3
|
import { Configuration } from 'webpack';
|
|
4
4
|
import { FileReplacement, NextBuildBuilderOptions, WebpackConfigOptions } from './types';
|
|
5
5
|
import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
|
|
6
|
-
export declare function createWebpackConfig(workspaceRoot: string, projectRoot: string, fileReplacements?: FileReplacement[], assets?: any, nxConfigOptions?: WebpackConfigOptions, dependencies?: DependentBuildableProjectNode[]): (a: any, b: any) => Configuration;
|
|
7
|
-
export declare function prepareConfig(phase: typeof PHASE_PRODUCTION_BUILD | typeof PHASE_EXPORT | typeof PHASE_DEVELOPMENT_SERVER | typeof PHASE_PRODUCTION_SERVER, options: NextBuildBuilderOptions, context: ExecutorContext, dependencies: DependentBuildableProjectNode[]): Promise<any>;
|
|
6
|
+
export declare function createWebpackConfig(workspaceRoot: string, projectRoot: string, fileReplacements?: FileReplacement[], assets?: any, nxConfigOptions?: WebpackConfigOptions, dependencies?: DependentBuildableProjectNode[], libsDir?: string): (a: any, b: any) => Configuration;
|
|
7
|
+
export declare function prepareConfig(phase: typeof PHASE_PRODUCTION_BUILD | typeof PHASE_EXPORT | typeof PHASE_DEVELOPMENT_SERVER | typeof PHASE_PRODUCTION_SERVER, options: NextBuildBuilderOptions, context: ExecutorContext, dependencies: DependentBuildableProjectNode[], libsDir: string): Promise<any>;
|
package/src/utils/config.js
CHANGED
|
@@ -10,7 +10,7 @@ const config_1 = require("@nrwl/web/src/utils/config");
|
|
|
10
10
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
11
11
|
const require_shim_1 = require("./require-shim");
|
|
12
12
|
const loadConfig = require_shim_1.importConfig();
|
|
13
|
-
function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [], assets = null, nxConfigOptions = {}, dependencies = []) {
|
|
13
|
+
function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [], assets = null, nxConfigOptions = {}, dependencies = [], libsDir = '') {
|
|
14
14
|
return function webpackConfig(config, { isServer, defaultLoaders, }) {
|
|
15
15
|
// default `svgr` to `true`, as it used to be supported by default,
|
|
16
16
|
// before this option was introduced
|
|
@@ -41,6 +41,7 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
|
|
|
41
41
|
}, config.resolve.alias);
|
|
42
42
|
config.module.rules.push({
|
|
43
43
|
test: /\.([jt])sx?$/,
|
|
44
|
+
include: [libsDir],
|
|
44
45
|
exclude: /node_modules/,
|
|
45
46
|
use: [defaultLoaders.babel],
|
|
46
47
|
});
|
|
@@ -88,7 +89,7 @@ function createWebpackConfig(workspaceRoot, projectRoot, fileReplacements = [],
|
|
|
88
89
|
};
|
|
89
90
|
}
|
|
90
91
|
exports.createWebpackConfig = createWebpackConfig;
|
|
91
|
-
function prepareConfig(phase, options, context, dependencies) {
|
|
92
|
+
function prepareConfig(phase, options, context, dependencies, libsDir) {
|
|
92
93
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
93
94
|
const config = (yield loadConfig(phase, options.root, null));
|
|
94
95
|
const userWebpack = config.webpack;
|
|
@@ -99,7 +100,7 @@ function prepareConfig(phase, options, context, dependencies) {
|
|
|
99
100
|
config.distDir && config.distDir !== '.next'
|
|
100
101
|
? config.distDir
|
|
101
102
|
: path_1.join(config.outdir, '.next');
|
|
102
|
-
config.webpack = (a, b) => createWebpackConfig(context.root, options.root, options.fileReplacements, options.assets, config.nx, dependencies)(userWebpack ? userWebpack(a, b) : a, b);
|
|
103
|
+
config.webpack = (a, b) => createWebpackConfig(context.root, options.root, options.fileReplacements, options.assets, config.nx, dependencies, libsDir)(userWebpack ? userWebpack(a, b) : a, b);
|
|
103
104
|
if (typeof userNextConfig !== 'function') {
|
|
104
105
|
throw new Error(`Module specified by 'nextConfig' option does not export a function. It should be of form 'module.exports = (phase, config, options) => config;'`);
|
|
105
106
|
}
|
package/src/utils/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/config.ts"],"names":[],"mappings":";;;;AAAA,yCAA+D;AAW/D,+BAAqC;AACrC,oHAA+G;AAO/G,6DAAgE;AAChE,uDAA8D;AAE9D,6FAG4D;AAC5D,iDAA8C;AAC9C,MAAM,UAAU,GAAG,2BAAY,EAAE,CAAC;AAElC,SAAgB,mBAAmB,CACjC,aAAqB,EACrB,WAAmB,EACnB,mBAAsC,EAAE,EACxC,SAAc,IAAI,EAClB,kBAAwC,EAAE,EAC1C,eAAgD,EAAE;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/config.ts"],"names":[],"mappings":"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"}
|
package/src/utils/styles.d.ts
CHANGED
|
@@ -23,10 +23,10 @@ export declare const NEXT_SPECIFIC_STYLE_DEPENDENCIES: {
|
|
|
23
23
|
};
|
|
24
24
|
};
|
|
25
25
|
less: {
|
|
26
|
-
dependencies: {
|
|
27
|
-
|
|
26
|
+
dependencies: {};
|
|
27
|
+
devDependencies: {
|
|
28
|
+
'less-loader': string;
|
|
28
29
|
};
|
|
29
|
-
devDependencies: {};
|
|
30
30
|
};
|
|
31
31
|
styl: {
|
|
32
32
|
dependencies: {
|
package/src/utils/styles.js
CHANGED
|
@@ -22,10 +22,10 @@ exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES = {
|
|
|
22
22
|
devDependencies: { sass: versions_1.sassVersion },
|
|
23
23
|
},
|
|
24
24
|
less: {
|
|
25
|
-
dependencies: {
|
|
26
|
-
|
|
25
|
+
dependencies: {},
|
|
26
|
+
devDependencies: {
|
|
27
|
+
'less-loader': versions_1.lessLoader,
|
|
27
28
|
},
|
|
28
|
-
devDependencies: {},
|
|
29
29
|
},
|
|
30
30
|
styl: {
|
|
31
31
|
dependencies: {
|
package/src/utils/styles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/styles.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,uCAAqD;AACrD,yCAMoB;AAEP,QAAA,gCAAgC,GAAG;IAC9C,mBAAmB,EAAE;QACnB,YAAY,EAAE,8BAAsB,CAAC,mBAAmB,CAAC,CAAC,YAAY;QACtE,eAAe,kCACV,8BAAsB,CAAC,mBAAmB,CAAC,CAAC,eAAe,KAC9D,gCAAgC,EAAE,6CAAkC,GACrE;KACF;IACD,iBAAiB,EAAE;QACjB,YAAY,kCACP,8BAAsB,CAAC,iBAAiB,CAAC,CAAC,YAAY,KACzD,iBAAiB,EAAE,+BAAoB,GACxC;QACD,eAAe,EAAE,8BAAsB,CAAC,iBAAiB,CAAC,CAAC,eAAe;KAC3E;IACD,GAAG,EAAE;QACH,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE,IAAI,EAAE,sBAAW,EAAE;KACvC;IACD,IAAI,EAAE;QACJ,YAAY,EAAE;
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/styles.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,uCAAqD;AACrD,yCAMoB;AAEP,QAAA,gCAAgC,GAAG;IAC9C,mBAAmB,EAAE;QACnB,YAAY,EAAE,8BAAsB,CAAC,mBAAmB,CAAC,CAAC,YAAY;QACtE,eAAe,kCACV,8BAAsB,CAAC,mBAAmB,CAAC,CAAC,eAAe,KAC9D,gCAAgC,EAAE,6CAAkC,GACrE;KACF;IACD,iBAAiB,EAAE;QACjB,YAAY,kCACP,8BAAsB,CAAC,iBAAiB,CAAC,CAAC,YAAY,KACzD,iBAAiB,EAAE,+BAAoB,GACxC;QACD,eAAe,EAAE,8BAAsB,CAAC,iBAAiB,CAAC,CAAC,eAAe;KAC3E;IACD,GAAG,EAAE;QACH,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE,IAAI,EAAE,sBAAW,EAAE;KACvC;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE;YACf,aAAa,EAAE,qBAAU;SAC1B;KACF;IACD,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,eAAe,EAAE,uBAAY;SAC9B;QACD,eAAe,EAAE,EAAE;KACpB;CACF,CAAC;AAEF,SAAgB,oBAAoB,CAClC,IAAU,EACV,KAAa;IAEb,MAAM,iBAAiB,GAAG,wCAAgC,CAAC,KAAK,CAAC,CAAC;IAElE,IAAI,CAAC,iBAAiB;QAAE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAExC,MAAM,WAAW,GAAG,qCAA4B,CAC9C,IAAI,EACJ,iBAAiB,CAAC,YAAY,EAC9B,iBAAiB,CAAC,eAAe,CAClC,CAAC;IAEF,6EAA6E;IAC7E,oEAAoE;IACpE,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,MAAM,CAAC,EAAE;QAC3E,mBAAU,CAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,WAAW,mCAAQ,IAAI,CAAC,WAAW,KAAE,YAAY,EAAE,OAAO,GAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAxBD,oDAwBC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare const nxVersion = "*";
|
|
2
|
-
export declare const nextVersion = "
|
|
3
|
-
export declare const eslintConfigNextVersion = "
|
|
2
|
+
export declare const nextVersion = "12.0.0";
|
|
3
|
+
export declare const eslintConfigNextVersion = "12.0.0";
|
|
4
4
|
export declare const sassVersion = "1.43.2";
|
|
5
|
-
export declare const
|
|
5
|
+
export declare const lessLoader = "10.2.0";
|
|
6
6
|
export declare const stylusLoader = "6.2.0";
|
|
7
7
|
export declare const emotionServerVersion = "11.4.0";
|
|
8
8
|
export declare const babelPluginStyledComponentsVersion = "1.10.7";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.stylusLoader = exports.
|
|
4
|
-
exports.nxVersion = '13.
|
|
5
|
-
exports.nextVersion = '
|
|
6
|
-
exports.eslintConfigNextVersion = '
|
|
3
|
+
exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.stylusLoader = exports.lessLoader = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
|
|
4
|
+
exports.nxVersion = '13.1.0';
|
|
5
|
+
exports.nextVersion = '12.0.0';
|
|
6
|
+
exports.eslintConfigNextVersion = '12.0.0';
|
|
7
7
|
exports.sassVersion = '1.43.2';
|
|
8
|
-
exports.
|
|
8
|
+
exports.lessLoader = '10.2.0';
|
|
9
9
|
exports.stylusLoader = '6.2.0';
|
|
10
10
|
exports.emotionServerVersion = '11.4.0';
|
|
11
11
|
exports.babelPluginStyledComponentsVersion = '1.10.7';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,kCAAkC,GAAG,QAAQ,CAAC"}
|