@nrwl/next 13.0.0-beta.2 → 13.0.0-beta.6
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 +6 -0
- package/package.json +10 -9
- package/plugins/with-stylus.d.ts +1 -0
- package/plugins/with-stylus.js +77 -0
- package/plugins/with-stylus.js.map +1 -0
- package/src/executors/server/lib/default-server.js +1 -1
- package/src/executors/server/lib/default-server.js.map +1 -1
- package/src/generators/application/files/next.config.js__tmpl__ +4 -6
- package/src/migrations/update-13-0-0/update-to-webpack-5.d.ts +3 -0
- package/src/migrations/update-13-0-0/update-to-webpack-5.js +32 -0
- package/src/migrations/update-13-0-0/update-to-webpack-5.js.map +1 -0
- package/src/utils/styles.d.ts +2 -2
- package/src/utils/styles.js +2 -2
- package/src/utils/styles.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +4 -4
- package/src/utils/versions.js.map +1 -1
package/migrations.json
CHANGED
|
@@ -60,6 +60,12 @@
|
|
|
60
60
|
"version": "12.10.0-beta.1",
|
|
61
61
|
"description": "Updates .eslintrc.json file to use the correct pages directory for '@next/next/no-html-link-for-pages'.",
|
|
62
62
|
"factory": "./src/migrations/update-12-10-0/fix-page-dir-for-eslint"
|
|
63
|
+
},
|
|
64
|
+
"update-to-webpack-5": {
|
|
65
|
+
"cli": "nx",
|
|
66
|
+
"version": "13.0.0-beta.1",
|
|
67
|
+
"description": "Set `webpack5: true` for all next.js projects.",
|
|
68
|
+
"factory": "./src/migrations/update-13-0-0/update-to-webpack-5"
|
|
63
69
|
}
|
|
64
70
|
},
|
|
65
71
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "13.0.0-beta.
|
|
3
|
+
"version": "13.0.0-beta.6",
|
|
4
4
|
"description": "Next.js Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,19 +34,20 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
37
|
-
"@nrwl/react": "13.0.0-beta.
|
|
38
|
-
"@nrwl/cypress": "13.0.0-beta.
|
|
39
|
-
"@nrwl/devkit": "13.0.0-beta.
|
|
40
|
-
"@nrwl/jest": "13.0.0-beta.
|
|
41
|
-
"@nrwl/linter": "13.0.0-beta.
|
|
42
|
-
"@nrwl/web": "13.0.0-beta.
|
|
43
|
-
"@nrwl/workspace": "13.0.0-beta.
|
|
37
|
+
"@nrwl/react": "13.0.0-beta.6",
|
|
38
|
+
"@nrwl/cypress": "13.0.0-beta.6",
|
|
39
|
+
"@nrwl/devkit": "13.0.0-beta.6",
|
|
40
|
+
"@nrwl/jest": "13.0.0-beta.6",
|
|
41
|
+
"@nrwl/linter": "13.0.0-beta.6",
|
|
42
|
+
"@nrwl/web": "13.0.0-beta.6",
|
|
43
|
+
"@nrwl/workspace": "13.0.0-beta.6",
|
|
44
44
|
"@svgr/webpack": "^5.5.0",
|
|
45
45
|
"chalk": "4.1.0",
|
|
46
46
|
"eslint-config-next": "^11.1.2",
|
|
47
47
|
"fs-extra": "^9.1.0",
|
|
48
48
|
"url-loader": "^3.0.0",
|
|
49
49
|
"tsconfig-paths": "^3.9.0",
|
|
50
|
-
"ts-node": "~9.1.1"
|
|
50
|
+
"ts-node": "~9.1.1",
|
|
51
|
+
"webpack-merge": "^5.8.0"
|
|
51
52
|
}
|
|
52
53
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,77 @@
|
|
|
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 addStylusToRegExp = (rx) => new RegExp(rx.source.replace('|sass', '|sass|styl'), rx.flags);
|
|
7
|
+
function patchNextCSSWithStylus(nextCSSModule = require('next/dist/build/webpack/config/blocks/css')) {
|
|
8
|
+
nextCSSModule.regexLikeCss = addStylusToRegExp(nextCSSModule.regexLikeCss);
|
|
9
|
+
}
|
|
10
|
+
patchNextCSSWithStylus();
|
|
11
|
+
/*
|
|
12
|
+
* @deprecated Use CSS or SASS instead.
|
|
13
|
+
*/
|
|
14
|
+
function withStylus(_a) {
|
|
15
|
+
var { stylusLoaderOptions = {} } = _a, nextConfig = tslib_1.__rest(_a, ["stylusLoaderOptions"]);
|
|
16
|
+
return Object.assign({}, nextConfig, {
|
|
17
|
+
webpack(config, opts) {
|
|
18
|
+
// there are 2 relevant sass rules in next.js - css modules and global css
|
|
19
|
+
let sassModuleRule;
|
|
20
|
+
// global sass rule (does not exist in server builds)
|
|
21
|
+
let sassGlobalRule;
|
|
22
|
+
const cssRule = config.module.rules.find((rule) => { var _a, _b, _c; return (_c = (_b = (_a = rule.oneOf) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.__next_css_remove; });
|
|
23
|
+
const addStylusRuleToTest = (test) => {
|
|
24
|
+
if (Array.isArray(test)) {
|
|
25
|
+
return test.map((rx) => addStylusToRegExp(rx));
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
return addStylusToRegExp(test);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
cssRule.oneOf.forEach((rule) => {
|
|
32
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
33
|
+
if ((_a = rule.options) === null || _a === void 0 ? void 0 : _a.__next_css_remove)
|
|
34
|
+
return;
|
|
35
|
+
if (((_b = rule.use) === null || _b === void 0 ? void 0 : _b.loader) === 'error-loader') {
|
|
36
|
+
rule.test = addStylusRuleToTest(rule.test);
|
|
37
|
+
}
|
|
38
|
+
else if ((_d = (_c = rule.use) === null || _c === void 0 ? void 0 : _c.loader) === null || _d === void 0 ? void 0 : _d.includes('file-loader')) {
|
|
39
|
+
rule.issuer = addStylusRuleToTest(rule.issuer);
|
|
40
|
+
}
|
|
41
|
+
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')) {
|
|
42
|
+
rule.test = addStylusRuleToTest(rule.test);
|
|
43
|
+
}
|
|
44
|
+
else if (((_g = rule.test) === null || _g === void 0 ? void 0 : _g.source) === '\\.module\\.(scss|sass)$') {
|
|
45
|
+
sassModuleRule = rule;
|
|
46
|
+
}
|
|
47
|
+
else if (((_h = rule.test) === null || _h === void 0 ? void 0 : _h.source) === '(?<!\\.module)\\.(scss|sass)$') {
|
|
48
|
+
sassGlobalRule = rule;
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
const stylusLoader = {
|
|
52
|
+
loader: 'stylus-loader',
|
|
53
|
+
options: Object.assign(Object.assign({}, stylusLoaderOptions), { stylusOptions: Object.assign({ javascriptEnabled: true }, stylusLoaderOptions.stylusOptions) }),
|
|
54
|
+
};
|
|
55
|
+
let stylusModuleRule = webpack_merge_1.merge({}, sassModuleRule);
|
|
56
|
+
const configureStylusRule = (rule) => {
|
|
57
|
+
rule.test = new RegExp(rule.test.source.replace('(scss|sass)', 'styl'));
|
|
58
|
+
// replace sass-loader (last entry) with stylus-loader
|
|
59
|
+
rule.use.splice(-1, 1, stylusLoader);
|
|
60
|
+
};
|
|
61
|
+
configureStylusRule(stylusModuleRule);
|
|
62
|
+
cssRule.oneOf.splice(cssRule.oneOf.indexOf(sassModuleRule) + 1, 0, stylusModuleRule);
|
|
63
|
+
if (sassGlobalRule) {
|
|
64
|
+
let stylusGlobalRule = webpack_merge_1.merge({}, sassGlobalRule);
|
|
65
|
+
configureStylusRule(stylusGlobalRule);
|
|
66
|
+
cssRule.oneOf.splice(cssRule.oneOf.indexOf(sassGlobalRule) + 1, 0, stylusGlobalRule);
|
|
67
|
+
}
|
|
68
|
+
if (typeof nextConfig.webpack === 'function') {
|
|
69
|
+
return nextConfig.webpack(config, opts);
|
|
70
|
+
}
|
|
71
|
+
return config;
|
|
72
|
+
},
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
module.exports = withStylus;
|
|
76
|
+
module.exports.patchNext = patchNextCSSWithStylus;
|
|
77
|
+
//# sourceMappingURL=with-stylus.js.map
|
|
@@ -0,0 +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;;GAEG;AACH,SAAS,UAAU,CAAC,EAAgD;QAAhD,EAAE,mBAAmB,GAAG,EAAE,OAAsB,EAAjB,UAAU,sBAAzC,uBAA2C,CAAF;IAC3D,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,EAAE;QACnC,OAAO,CAAC,MAAM,EAAE,IAAI;YAClB,0EAA0E;YAC1E,IAAI,cAAc,CAAC;YACnB,qDAAqD;YACrD,IAAI,cAAc,CAAC;YAEnB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CACtC,CAAC,IAAI,EAAE,EAAE,mBAAC,OAAA,MAAA,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAG,CAAC,CAAC,0CAAE,OAAO,0CAAE,iBAAiB,CAAA,EAAA,CACtD,CAAC;YAEF,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE,EAAE;gBACnC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBACvB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;iBAChD;qBAAM;oBACL,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;iBAChC;YACH,CAAC,CAAC;YAEF,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;;gBAC7B,IAAI,MAAA,IAAI,CAAC,OAAO,0CAAE,iBAAiB;oBAAE,OAAO;gBAE5C,IAAI,CAAA,MAAA,IAAI,CAAC,GAAG,0CAAE,MAAM,MAAK,cAAc,EAAE;oBACvC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC5C;qBAAM,IAAI,MAAA,MAAA,IAAI,CAAC,GAAG,0CAAE,MAAM,0CAAE,QAAQ,CAAC,aAAa,CAAC,EAAE;oBACpD,IAAI,CAAC,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAChD;qBAAM,IAAI,MAAA,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,mDAAG,eAAe,CAAC,EAAE;oBAChD,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC5C;qBAAM,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,MAAK,0BAA0B,EAAE;oBAC3D,cAAc,GAAG,IAAI,CAAC;iBACvB;qBAAM,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,MAAK,+BAA+B,EAAE;oBAChE,cAAc,GAAG,IAAI,CAAC;iBACvB;YACH,CAAC,CAAC,CAAC;YAEH,MAAM,YAAY,GAAG;gBACnB,MAAM,EAAE,eAAe;gBACvB,OAAO,kCACF,mBAAmB,KACtB,aAAa,kBACX,iBAAiB,EAAE,IAAI,IACpB,mBAAmB,CAAC,aAAa,IAEvC;aACF,CAAC;YAEF,IAAI,gBAAgB,GAAG,qBAAK,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;YAEjD,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE,EAAE;gBACnC,IAAI,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;gBACxE,sDAAsD;gBACtD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;YACvC,CAAC,CAAC;YAEF,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;YACtC,OAAO,CAAC,KAAK,CAAC,MAAM,CAClB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EACzC,CAAC,EACD,gBAAgB,CACjB,CAAC;YAEF,IAAI,cAAc,EAAE;gBAClB,IAAI,gBAAgB,GAAG,qBAAK,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;gBACjD,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;gBACtC,OAAO,CAAC,KAAK,CAAC,MAAM,CAClB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EACzC,CAAC,EACD,gBAAgB,CACjB,CAAC;aACH;YAED,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,UAAU,EAAE;gBAC5C,OAAO,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aACzC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC;AAC5B,MAAM,CAAC,OAAO,CAAC,SAAS,GAAG,sBAAsB,CAAC"}
|
|
@@ -20,7 +20,7 @@ function defaultServer(settings, proxyConfig) {
|
|
|
20
20
|
server.use(express.static(path.resolve(settings.dir, settings.conf.outdir, 'public')));
|
|
21
21
|
// Set up the proxy.
|
|
22
22
|
if (proxyConfig) {
|
|
23
|
-
const proxyMiddleware = require('http-proxy-middleware');
|
|
23
|
+
const proxyMiddleware = require('http-proxy-middleware').createProxyMiddleware;
|
|
24
24
|
Object.keys(proxyConfig).forEach((context) => {
|
|
25
25
|
server.use(proxyMiddleware(context, proxyConfig[context]));
|
|
26
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-server.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/server/lib/default-server.ts"],"names":[],"mappings":";;;;AAAA,mCAAmC;AACnC,6BAA6B;AAC7B,+BAAwB;AAGxB;;;GAGG;AACH,SAAsB,aAAa,CACjC,QAA2B,EAC3B,WAAyB;;QAEzB,MAAM,GAAG,GAAG,cAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAEvC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QAEpB,MAAM,MAAM,GAAoB,OAAO,EAAE,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE/B,gDAAgD;QAChD,MAAM,CAAC,GAAG,CACR,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAC3E,CAAC;QAEF,oBAAoB;QACpB,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"default-server.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/server/lib/default-server.ts"],"names":[],"mappings":";;;;AAAA,mCAAmC;AACnC,6BAA6B;AAC7B,+BAAwB;AAGxB;;;GAGG;AACH,SAAsB,aAAa,CACjC,QAA2B,EAC3B,WAAyB;;QAEzB,MAAM,GAAG,GAAG,cAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAEvC,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QAEpB,MAAM,MAAM,GAAoB,OAAO,EAAE,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE/B,gDAAgD;QAChD,MAAM,CAAC,GAAG,CACR,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAC3E,CAAC;QAEF,oBAAoB;QACpB,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GACnB,OAAO,CAAC,uBAAuB,CAAC,CAAC,qBAAqB,CAAC;YACzD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3C,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;SACJ;QAED,wEAAwE;QACxE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAEhD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;CAAA;AA9BD,sCA8BC"}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
const withNx = require('@nrwl/next/plugins/with-nx');
|
|
3
3
|
|
|
4
4
|
<% if (style === 'less') { %>
|
|
5
|
-
|
|
5
|
+
// This plugin is needed until this PR is merged.
|
|
6
|
+
// https://github.com/vercel/next.js/pull/23185
|
|
7
|
+
const withLess = require('next-with-less');
|
|
6
8
|
|
|
7
9
|
/**
|
|
8
10
|
* @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
|
|
@@ -16,13 +18,11 @@ const nextConfig = {
|
|
|
16
18
|
// Set this to true if you use CSS modules.
|
|
17
19
|
// See: https://github.com/css-modules/css-modules
|
|
18
20
|
cssModules: false,
|
|
19
|
-
// @zeit/next-less does not support webpack 5
|
|
20
|
-
webpack5: false,
|
|
21
21
|
};
|
|
22
22
|
|
|
23
23
|
module.exports = withLess(withNx(nextConfig));
|
|
24
24
|
<% } else if (style === 'styl') { %>
|
|
25
|
-
const withStylus = require('@
|
|
25
|
+
const withStylus = require('@nrwl/next/plugins/with-stylus');
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
28
|
* @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
|
|
@@ -36,8 +36,6 @@ const nextConfig = {
|
|
|
36
36
|
// Set this to true if you use CSS modules.
|
|
37
37
|
// See: https://github.com/css-modules/css-modules
|
|
38
38
|
cssModules: false,
|
|
39
|
-
// @zeit/next-stylus does not support webpack 5
|
|
40
|
-
webpack5: false,
|
|
41
39
|
};
|
|
42
40
|
|
|
43
41
|
module.exports = withStylus(withNx(nextConfig));
|
|
@@ -0,0 +1,32 @@
|
|
|
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
|
+
let updated = content.replace(/webpack5: false/, 'webpack5: true');
|
|
16
|
+
if (content.match(/@zeit\/next-less/)) {
|
|
17
|
+
updated = updated.replace('@zeit/next-less', 'next-with-less');
|
|
18
|
+
task = devkit_1.addDependenciesToPackageJson(host, { 'next-with-less': '1.0.1' }, {});
|
|
19
|
+
}
|
|
20
|
+
if (content.match(/@zeit\/next-stylus/)) {
|
|
21
|
+
updated = updated.replace('@zeit/next-stylus', '@nrwl/next/plugins/with-stylus');
|
|
22
|
+
task = devkit_1.addDependenciesToPackageJson(host, { 'stylus-loader': '6.2.0' }, {});
|
|
23
|
+
}
|
|
24
|
+
host.write(configPath, updated);
|
|
25
|
+
});
|
|
26
|
+
yield devkit_1.formatFiles(host);
|
|
27
|
+
return task;
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
exports.update = update;
|
|
31
|
+
exports.default = update;
|
|
32
|
+
//# sourceMappingURL=update-to-webpack-5.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-to-webpack-5.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-13-0-0/update-to-webpack-5.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;YACjD,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;YAEnE,IAAI,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;gBACrC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;gBAC/D,IAAI,GAAG,qCAA4B,CACjC,IAAI,EACJ,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAC7B,EAAE,CACH,CAAC;aACH;YAED,IAAI,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;gBACvC,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,mBAAmB,EACnB,gCAAgC,CACjC,CAAC;gBACF,IAAI,GAAG,qCAA4B,CACjC,IAAI,EACJ,EAAE,eAAe,EAAE,OAAO,EAAE,EAC5B,EAAE,CACH,CAAC;aACH;YAED,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,MAAM,oBAAW,CAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAvCD,wBAuCC;AAED,kBAAe,MAAM,CAAC"}
|
package/src/utils/styles.d.ts
CHANGED
|
@@ -24,13 +24,13 @@ export declare const NEXT_SPECIFIC_STYLE_DEPENDENCIES: {
|
|
|
24
24
|
};
|
|
25
25
|
less: {
|
|
26
26
|
dependencies: {
|
|
27
|
-
'
|
|
27
|
+
'next-with-less': string;
|
|
28
28
|
};
|
|
29
29
|
devDependencies: {};
|
|
30
30
|
};
|
|
31
31
|
styl: {
|
|
32
32
|
dependencies: {
|
|
33
|
-
'
|
|
33
|
+
'stylus-loader': string;
|
|
34
34
|
};
|
|
35
35
|
devDependencies: {};
|
|
36
36
|
};
|
package/src/utils/styles.js
CHANGED
|
@@ -23,13 +23,13 @@ exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES = {
|
|
|
23
23
|
},
|
|
24
24
|
less: {
|
|
25
25
|
dependencies: {
|
|
26
|
-
'
|
|
26
|
+
'next-with-less': versions_1.nextWithLess,
|
|
27
27
|
},
|
|
28
28
|
devDependencies: {},
|
|
29
29
|
},
|
|
30
30
|
styl: {
|
|
31
31
|
dependencies: {
|
|
32
|
-
'
|
|
32
|
+
'stylus-loader': versions_1.stylusLoader,
|
|
33
33
|
},
|
|
34
34
|
devDependencies: {},
|
|
35
35
|
},
|
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;YACZ,
|
|
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;YACZ,gBAAgB,EAAE,uBAAY;SAC/B;QACD,eAAe,EAAE,EAAE;KACpB;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
|
@@ -2,7 +2,7 @@ export declare const nxVersion = "*";
|
|
|
2
2
|
export declare const nextVersion = "11.1.2";
|
|
3
3
|
export declare const eslintConfigNextVersion = "11.1.2";
|
|
4
4
|
export declare const sassVersion = "1.42.1";
|
|
5
|
-
export declare const
|
|
6
|
-
export declare const
|
|
5
|
+
export declare const nextWithLess = "1.0.1";
|
|
6
|
+
export declare const stylusLoader = "6.2.0";
|
|
7
7
|
export declare const emotionServerVersion = "11.0.0";
|
|
8
8
|
export declare const babelPluginStyledComponentsVersion = "1.10.7";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.
|
|
4
|
-
exports.nxVersion = '13.0.0-beta.
|
|
3
|
+
exports.babelPluginStyledComponentsVersion = exports.emotionServerVersion = exports.stylusLoader = exports.nextWithLess = exports.sassVersion = exports.eslintConfigNextVersion = exports.nextVersion = exports.nxVersion = void 0;
|
|
4
|
+
exports.nxVersion = '13.0.0-beta.6';
|
|
5
5
|
exports.nextVersion = '11.1.2';
|
|
6
6
|
exports.eslintConfigNextVersion = '11.1.2';
|
|
7
7
|
exports.sassVersion = '1.42.1';
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
8
|
+
exports.nextWithLess = '1.0.1';
|
|
9
|
+
exports.stylusLoader = '6.2.0';
|
|
10
10
|
exports.emotionServerVersion = '11.0.0';
|
|
11
11
|
exports.babelPluginStyledComponentsVersion = '1.10.7';
|
|
12
12
|
//# sourceMappingURL=versions.js.map
|
|
@@ -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,YAAY,GAAG,OAAO,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,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,kCAAkC,GAAG,QAAQ,CAAC"}
|