@nrwl/react 12.10.0 → 13.0.0-beta.12
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/package.json +12 -12
- package/plugins/storybook/index.js +3 -3
- package/plugins/storybook/index.js.map +1 -1
- package/plugins/storybook/merge-plugins.d.ts +3 -3
- package/plugins/storybook/merge-plugins.js.map +1 -1
- package/plugins/webpack.js +6 -5
- package/plugins/webpack.js.map +1 -1
- package/src/generators/application/lib/add-project.js +2 -19
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/schema.json +6 -4
- package/src/generators/library/schema.json +1 -2
- package/src/generators/storybook-configuration/schema.json +1 -2
- package/src/migrations/update-9-4-0/babelrc-9-4-0.js +2 -2
- package/src/migrations/update-9-4-0/babelrc-9-4-0.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/plugins/bundle-babel.d.ts +0 -1
- package/plugins/bundle-babel.js +0 -37
- package/plugins/bundle-babel.js.map +0 -1
- package/src/webpack/bundle4.d.ts +0 -0
- package/src/webpack/bundle4.js +0 -9
- package/src/webpack/bundle4.js.map +0 -1
- package/src/webpack/bundle5.d.ts +0 -1
- package/src/webpack/bundle5.js +0 -32
- package/src/webpack/bundle5.js.map +0 -1
- package/src/webpack/entry.d.ts +0 -1
- package/src/webpack/entry.js +0 -17
- package/src/webpack/entry.js.map +0 -1
- package/src/webpack/require-shim.d.ts +0 -1
- package/src/webpack/require-shim.js +0 -15
- package/src/webpack/require-shim.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "13.0.0-beta.12",
|
|
4
4
|
"description": "React Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@babel/core": "^7.15.0",
|
|
33
33
|
"@babel/preset-react": "^7.14.5",
|
|
34
|
-
"@nrwl/cypress": "
|
|
35
|
-
"@nrwl/devkit": "
|
|
36
|
-
"@nrwl/jest": "
|
|
37
|
-
"@nrwl/linter": "
|
|
38
|
-
"@nrwl/storybook": "
|
|
39
|
-
"@nrwl/web": "
|
|
40
|
-
"@nrwl/workspace": "
|
|
34
|
+
"@nrwl/cypress": "13.0.0-beta.12",
|
|
35
|
+
"@nrwl/devkit": "13.0.0-beta.12",
|
|
36
|
+
"@nrwl/jest": "13.0.0-beta.12",
|
|
37
|
+
"@nrwl/linter": "13.0.0-beta.12",
|
|
38
|
+
"@nrwl/storybook": "13.0.0-beta.12",
|
|
39
|
+
"@nrwl/web": "13.0.0-beta.12",
|
|
40
|
+
"@nrwl/workspace": "13.0.0-beta.12",
|
|
41
41
|
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
|
|
42
42
|
"@svgr/webpack": "^5.5.0",
|
|
43
43
|
"chalk": "4.1.0",
|
|
@@ -45,10 +45,10 @@
|
|
|
45
45
|
"eslint-plugin-jsx-a11y": "^6.4.1",
|
|
46
46
|
"eslint-plugin-react": "^7.23.1",
|
|
47
47
|
"eslint-plugin-react-hooks": "^4.2.0",
|
|
48
|
-
"react-refresh": "^0.
|
|
49
|
-
"url-loader": "^
|
|
50
|
-
"webpack": "
|
|
51
|
-
"webpack-merge": "
|
|
48
|
+
"react-refresh": "^0.10.0",
|
|
49
|
+
"url-loader": "^4.1.1",
|
|
50
|
+
"webpack": "^5.58.1",
|
|
51
|
+
"webpack-merge": "^5.8.0",
|
|
52
52
|
"@storybook/node-logger": "6.1.20",
|
|
53
53
|
"semver": "7.3.4"
|
|
54
54
|
}
|
|
@@ -47,9 +47,9 @@ const webpack = (storybookWebpackConfig = {}, options) => tslib_1.__awaiter(void
|
|
|
47
47
|
const isScriptOptimizeOn = storybookWebpackConfig.mode !== 'development';
|
|
48
48
|
const extractCss = storybookWebpackConfig.mode === 'production';
|
|
49
49
|
// ESM build for modern browsers.
|
|
50
|
-
const baseWebpackConfig = mergeWebpack([
|
|
50
|
+
const baseWebpackConfig = mergeWebpack.merge([
|
|
51
51
|
config_1.getBaseWebpackPartial(builderOptions, esm, isScriptOptimizeOn),
|
|
52
|
-
web_config_1.getStylesPartial(options.configDir, builderOptions, extractCss),
|
|
52
|
+
web_config_1.getStylesPartial(options.workspaceRoot, options.configDir, builderOptions, extractCss),
|
|
53
53
|
]);
|
|
54
54
|
// run it through the React customizations
|
|
55
55
|
const finalConfig = reactWebpackConfig(baseWebpackConfig);
|
|
@@ -76,7 +76,7 @@ const webpack = (storybookWebpackConfig = {}, options) => tslib_1.__awaiter(void
|
|
|
76
76
|
};
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
return mergeWebpack(Object.assign(Object.assign({}, storybookWebpackConfig), { module: Object.assign(Object.assign({}, storybookWebpackConfig.module), { rules: [
|
|
79
|
+
return mergeWebpack.merge(Object.assign(Object.assign({}, storybookWebpackConfig), { module: Object.assign(Object.assign({}, storybookWebpackConfig.module), { rules: [
|
|
80
80
|
...storybookWebpackConfig.module.rules,
|
|
81
81
|
...finalConfig.module.rules,
|
|
82
82
|
] }), resolve: Object.assign(Object.assign({}, storybookWebpackConfig.resolve), { plugins: merge_plugins_1.mergePlugins(...((_a = storybookWebpackConfig.resolve.plugins) !== null && _a !== void 0 ? _a : []), ...((_b = finalConfig.resolve.plugins) !== null && _b !== void 0 ? _b : [])) }), plugins: merge_plugins_1.mergePlugins(...((_c = storybookWebpackConfig.plugins) !== null && _c !== void 0 ? _c : []), ...((_d = finalConfig.plugins) !== null && _d !== void 0 ? _d : [])) }), resolvedEmotionAliases);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AACjD,2DAA2D;AAC3D,uDAAmE;AACnE,+DAAkE;AAClE,uEAAuE;AACvE,+EAAsF;AACtF,wDAAgD;AAChD,+BAA4B;AAC5B,mCAA6B;AAE7B,8CAA8C;AAC9C,mDAA+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const mergeRules: (...args: RuleSetRule[]) => (RuleSetRule |
|
|
3
|
-
export declare const mergePlugins: (...args:
|
|
1
|
+
import { RuleSetRule, WebpackPluginInstance } from 'webpack';
|
|
2
|
+
export declare const mergeRules: (...args: RuleSetRule[]) => (RuleSetRule | WebpackPluginInstance)[];
|
|
3
|
+
export declare const mergePlugins: (...args: WebpackPluginInstance[]) => WebpackPluginInstance[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-plugins.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/merge-plugins.ts"],"names":[],"mappings":";;;AAEO,MAAM,UAAU,GAAG,CAAC,GAAG,IAAmB,EAAE,EAAE,CACnD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IAC1B,IACE,KAAK,CAAC,IAAI,CACR,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAC5D,EACD;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC;AAC1B,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"merge-plugins.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/merge-plugins.ts"],"names":[],"mappings":";;;AAEO,MAAM,UAAU,GAAG,CAAC,GAAG,IAAmB,EAAE,EAAE,CACnD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IAC1B,IACE,KAAK,CAAC,IAAI,CACR,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,CAAC,IAAI,CAC5D,EACD;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,CAAC,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC;AAC1B,CAAC,EAAE,EAA6B,CAAC,CAAC;AAXvB,QAAA,UAAU,cAWa;AAE7B,MAAM,YAAY,GAAG,CAC1B,GAAG,IAA6B,EACP,EAAE,CAC3B,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,IACE,OAAO,CAAC,IAAI,CACV,CAAC,cAAc,EAAE,EAAE,CACjB,cAAc,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM,CAAC,WAAW,CAAC,IAAI,CAC9D,EACD;QACA,OAAO,OAAO,CAAC;KAChB;IACD,OAAO,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC;AAC9B,CAAC,EAAE,EAA6B,CAAC,CAAC;AAbvB,QAAA,YAAY,gBAaW"}
|
package/plugins/webpack.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const ReactRefreshPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
|
|
3
4
|
// Add React-specific configuration
|
|
4
5
|
function getWebpackConfig(config) {
|
|
5
6
|
var _a;
|
|
6
|
-
// TODO(jack): Remove in Nx 13
|
|
7
|
-
const { ReactRefreshPlugin, isWebpack5 } = require('../src/webpack/entry');
|
|
8
7
|
config.module.rules.push({
|
|
9
8
|
test: /\.(png|jpe?g|gif|webp)$/,
|
|
10
9
|
loader: require.resolve('url-loader'),
|
|
@@ -17,7 +16,7 @@ function getWebpackConfig(config) {
|
|
|
17
16
|
oneOf: [
|
|
18
17
|
// If coming from JS/TS file, then transform into React component using SVGR.
|
|
19
18
|
{
|
|
20
|
-
issuer:
|
|
19
|
+
issuer: /\.[jt]sx?$/,
|
|
21
20
|
use: [
|
|
22
21
|
{
|
|
23
22
|
loader: require.resolve('@svgr/webpack'),
|
|
@@ -53,8 +52,10 @@ function getWebpackConfig(config) {
|
|
|
53
52
|
});
|
|
54
53
|
if (config.mode === 'development' && ((_a = config['devServer']) === null || _a === void 0 ? void 0 : _a.hot)) {
|
|
55
54
|
// add `react-refresh/babel` to babel loader plugin
|
|
56
|
-
const babelLoader = config.module.rules.find((rule) => rule
|
|
57
|
-
|
|
55
|
+
const babelLoader = config.module.rules.find((rule) => typeof rule !== 'string' &&
|
|
56
|
+
rule.loader &&
|
|
57
|
+
rule.loader.toString().includes('babel-loader'));
|
|
58
|
+
if (babelLoader && typeof babelLoader !== 'string') {
|
|
58
59
|
babelLoader.options['plugins'] = [
|
|
59
60
|
...(babelLoader.options['plugins'] || []),
|
|
60
61
|
[
|
package/plugins/webpack.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../packages/react/plugins/webpack.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../packages/react/plugins/webpack.ts"],"names":[],"mappings":";;AACA,2EAA4E;AAE5E,mCAAmC;AACnC,SAAS,gBAAgB,CAAC,MAAqB;;IAC7C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CACtB;QACE,IAAI,EAAE,yBAAyB;QAC/B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;QACrC,OAAO,EAAE;YACP,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,uBAAuB;SAC9B;KACF,EACD;QACE,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE;YACL,6EAA6E;YAC7E;gBACE,MAAM,EAAE,YAAY;gBACpB,GAAG,EAAE;oBACH;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;wBACxC,OAAO,EAAE;4BACP,IAAI,EAAE,KAAK;4BACX,SAAS,EAAE,IAAI;4BACf,GAAG,EAAE,IAAI;yBACV;qBACF;oBACD;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;wBACrC,OAAO,EAAE;4BACP,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,uBAAuB;4BAC7B,QAAQ,EAAE,KAAK;yBAChB;qBACF;iBACF;aACF;YACD,gCAAgC;YAChC;gBACE,GAAG,EAAE;oBACH;wBACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;wBACrC,OAAO,EAAE;4BACP,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,uBAAuB;yBAC9B;qBACF;iBACF;aACF;SACF;KACF,CACF,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,KAAI,MAAA,MAAM,CAAC,WAAW,CAAC,0CAAE,GAAG,CAAA,EAAE;QAC7D,mDAAmD;QACnD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAC1C,CAAC,IAAI,EAAE,EAAE,CACP,OAAO,IAAI,KAAK,QAAQ;YACxB,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,CAClD,CAAC;QACF,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YAClD,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG;gBAC/B,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACzC;oBACE,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;oBACtC;wBACE,YAAY,EAAE,IAAI;qBACnB;iBACF;aACF,CAAC;SACH;QACD,+EAA+E;QAC/E,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;KAC/C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,gBAAgB,CAAC"}
|
|
@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function addProject(host, options) {
|
|
6
|
-
const nxConfig = {
|
|
7
|
-
tags: options.parsedTags,
|
|
8
|
-
};
|
|
9
6
|
const project = {
|
|
10
7
|
root: options.appProjectRoot,
|
|
11
8
|
sourceRoot: `${options.appProjectRoot}/src`,
|
|
@@ -14,8 +11,9 @@ function addProject(host, options) {
|
|
|
14
11
|
build: createBuildTarget(options),
|
|
15
12
|
serve: createServeTarget(options),
|
|
16
13
|
},
|
|
14
|
+
tags: options.parsedTags,
|
|
17
15
|
};
|
|
18
|
-
devkit_1.addProjectConfiguration(host, options.projectName, Object.assign(
|
|
16
|
+
devkit_1.addProjectConfiguration(host, options.projectName, Object.assign({}, project), options.standaloneConfig);
|
|
19
17
|
}
|
|
20
18
|
exports.addProject = addProject;
|
|
21
19
|
function maybeJs(options, path) {
|
|
@@ -61,21 +59,6 @@ function createBuildTarget(options) {
|
|
|
61
59
|
namedChunks: false,
|
|
62
60
|
extractLicenses: true,
|
|
63
61
|
vendorChunk: false,
|
|
64
|
-
budgets: options.strict
|
|
65
|
-
? [
|
|
66
|
-
{
|
|
67
|
-
type: 'initial',
|
|
68
|
-
maximumWarning: '500kb',
|
|
69
|
-
maximumError: '1mb',
|
|
70
|
-
},
|
|
71
|
-
]
|
|
72
|
-
: [
|
|
73
|
-
{
|
|
74
|
-
type: 'initial',
|
|
75
|
-
maximumWarning: '2mb',
|
|
76
|
-
maximumError: '5mb',
|
|
77
|
-
},
|
|
78
|
-
],
|
|
79
62
|
},
|
|
80
63
|
},
|
|
81
64
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAEtB,SAAgB,UAAU,CAAC,IAAI,EAAE,OAAyB;IACxD,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,MAAM;QAC3C,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC;YACjC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC;SAClC;QACD,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,gCAAuB,CACrB,IAAI,EACJ,OAAO,CAAC,WAAW,oBAEd,OAAO,GAEZ,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AApBD,gCAoBC;AAED,SAAS,OAAO,CAAC,OAAyB,EAAE,IAAY;IACtD,OAAO,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAyB;IAClD,OAAO;QACL,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,0BAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;YAC7D,KAAK,EAAE,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC;YAClE,QAAQ,EAAE,GAAG;YACb,IAAI,EAAE,0BAAiB,CACrB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CACjC;YACD,SAAS,EAAE,0BAAiB,CAC1B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC,CACrC;YACD,QAAQ,EAAE,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;YACxE,MAAM,EAAE;gBACN,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,iBAAiB,CAAC;gBAC5D,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC;aACxD;YACD,MAAM,EACJ,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,SAAS;gBACxC,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,0BAAiB,CACf,OAAO,CAAC,cAAc,EACtB,cAAc,OAAO,CAAC,KAAK,EAAE,CAC9B;iBACF;YACP,OAAO,EAAE,EAAE;YACX,aAAa,EAAE,6BAA6B;SAC7C;QACD,cAAc,EAAE;YACd,UAAU,EAAE;gBACV,gBAAgB,EAAE;oBAChB;wBACE,OAAO,EAAE,0BAAiB,CACxB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,iCAAiC,CAAC,CACpD;wBACD,IAAI,EAAE,0BAAiB,CACrB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,sCAAsC,CAAC,CACzD;qBACF;iBACF;gBACD,YAAY,EAAE,IAAI;gBAClB,aAAa,EAAE,KAAK;gBACpB,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,KAAK;gBAClB,eAAe,EAAE,IAAI;gBACrB,WAAW,EAAE,KAAK;aACnB;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAyB;IAClD,OAAO;QACL,QAAQ,EAAE,sBAAsB;QAChC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,GAAG,EAAE,IAAI;SACV;QACD,cAAc,EAAE;YACd,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;gBACtD,GAAG,EAAE,KAAK;aACX;SACF;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -43,7 +43,10 @@
|
|
|
43
43
|
"message": "Which stylesheet format would you like to use?",
|
|
44
44
|
"type": "list",
|
|
45
45
|
"items": [
|
|
46
|
-
{
|
|
46
|
+
{
|
|
47
|
+
"value": "css",
|
|
48
|
+
"label": "CSS"
|
|
49
|
+
},
|
|
47
50
|
{
|
|
48
51
|
"value": "scss",
|
|
49
52
|
"label": "SASS(.scss) [ http://sass-lang.com ]"
|
|
@@ -138,7 +141,7 @@
|
|
|
138
141
|
},
|
|
139
142
|
"strict": {
|
|
140
143
|
"type": "boolean",
|
|
141
|
-
"description": "Creates an application with
|
|
144
|
+
"description": "Creates an application with strict mode and strict type checking",
|
|
142
145
|
"default": true
|
|
143
146
|
},
|
|
144
147
|
"setParserOptionsProject": {
|
|
@@ -148,8 +151,7 @@
|
|
|
148
151
|
},
|
|
149
152
|
"standaloneConfig": {
|
|
150
153
|
"description": "Split the project configuration into <projectRoot>/project.json rather than including it inside workspace.json",
|
|
151
|
-
"type": "boolean"
|
|
152
|
-
"default": false
|
|
154
|
+
"type": "boolean"
|
|
153
155
|
}
|
|
154
156
|
},
|
|
155
157
|
"required": []
|
|
@@ -153,8 +153,7 @@
|
|
|
153
153
|
},
|
|
154
154
|
"standaloneConfig": {
|
|
155
155
|
"description": "Split the project configuration into <projectRoot>/project.json rather than including it inside workspace.json",
|
|
156
|
-
"type": "boolean"
|
|
157
|
-
"default": false
|
|
156
|
+
"type": "boolean"
|
|
158
157
|
}
|
|
159
158
|
},
|
|
160
159
|
"required": ["name"]
|
|
@@ -47,8 +47,7 @@
|
|
|
47
47
|
},
|
|
48
48
|
"standaloneConfig": {
|
|
49
49
|
"description": "Split the project configuration into <projectRoot>/project.json rather than including it inside workspace.json",
|
|
50
|
-
"type": "boolean"
|
|
51
|
-
"default": false
|
|
50
|
+
"type": "boolean"
|
|
52
51
|
}
|
|
53
52
|
},
|
|
54
53
|
"required": ["name"]
|
|
@@ -18,7 +18,7 @@ function update() {
|
|
|
18
18
|
return (host, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
19
19
|
const updates = [];
|
|
20
20
|
const conflicts = [];
|
|
21
|
-
const projectGraph = yield project_graph_1.createProjectGraphAsync(
|
|
21
|
+
const projectGraph = yield project_graph_1.createProjectGraphAsync();
|
|
22
22
|
if (host.exists('/babel.config.json')) {
|
|
23
23
|
context.logger.info(`
|
|
24
24
|
Found an existing babel.config.json file so we skipped creating it.
|
|
@@ -39,7 +39,7 @@ function update() {
|
|
|
39
39
|
Object.keys(projectGraph.nodes).forEach((name) => {
|
|
40
40
|
const p = projectGraph.nodes[name];
|
|
41
41
|
const deps = projectGraph.dependencies[name];
|
|
42
|
-
const isReact = deps.some((d) =>
|
|
42
|
+
const isReact = deps.some((d) => projectGraph.externalNodes[d.target] &&
|
|
43
43
|
d.target.indexOf('react') !== -1);
|
|
44
44
|
if (isReact) {
|
|
45
45
|
updates.push((host) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"babelrc-9-4-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-9-4-0/babelrc-9-4-0.ts"],"names":[],"mappings":";;;AAAA,2DAKoC;AACpC,sEAGiD;AACjD,0CAAqD;AACrD,+CAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"babelrc-9-4-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-9-4-0/babelrc-9-4-0.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactHooksVersion = exports.testingLibraryReactVersion = exports.typesReactRouterDomVersion = exports.reactRouterDomVersion = exports.typesStyledJsxVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '
|
|
4
|
+
exports.nxVersion = '13.0.0-beta.12';
|
|
5
5
|
exports.reactVersion = '17.0.2';
|
|
6
6
|
exports.reactDomVersion = '17.0.2';
|
|
7
7
|
exports.reactIsVersion = '17.0.2';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/plugins/bundle-babel.js
DELETED
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const path_1 = require("path");
|
|
4
|
-
const fileutils_1 = require("@nrwl/workspace/src/utilities/fileutils");
|
|
5
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
6
|
-
// TODO(jack): Remove this in Nx 13 since it is no longer needed with `.babelrc` changes
|
|
7
|
-
function getRollupBabelOptions(babelOptions) {
|
|
8
|
-
// Add react babel preset
|
|
9
|
-
const idx = babelOptions.presets.findIndex((p) => Array.isArray(p) && p[0].indexOf('@babel/preset-env') !== -1);
|
|
10
|
-
babelOptions.presets.splice(idx + 1, 0, [
|
|
11
|
-
require.resolve('@babel/preset-react'),
|
|
12
|
-
{
|
|
13
|
-
useBuiltIns: true,
|
|
14
|
-
},
|
|
15
|
-
]);
|
|
16
|
-
// Add babel plugin for styled-components or emotion.
|
|
17
|
-
// We don't have a good way to know when a project uses one or the other, so
|
|
18
|
-
// add the plugin only if the other style package isn't used.
|
|
19
|
-
const packageJson = fileutils_1.readJsonFile(path_1.join(app_root_1.appRootPath, 'package.json'));
|
|
20
|
-
const deps = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
|
|
21
|
-
const hasStyledComponents = !!deps['styled-components'];
|
|
22
|
-
const hasEmotion = !!deps['@emotion/react'];
|
|
23
|
-
if (hasStyledComponents && !hasEmotion) {
|
|
24
|
-
babelOptions.plugins.splice(0, 0, [
|
|
25
|
-
require.resolve('babel-plugin-styled-components'),
|
|
26
|
-
{
|
|
27
|
-
pure: true,
|
|
28
|
-
},
|
|
29
|
-
]);
|
|
30
|
-
}
|
|
31
|
-
if (hasEmotion && !hasStyledComponents) {
|
|
32
|
-
babelOptions.plugins.splice(0, 0, require.resolve('babel-plugin-emotion'));
|
|
33
|
-
}
|
|
34
|
-
return babelOptions;
|
|
35
|
-
}
|
|
36
|
-
module.exports = getRollupBabelOptions;
|
|
37
|
-
//# sourceMappingURL=bundle-babel.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-babel.js","sourceRoot":"","sources":["../../../../packages/react/plugins/bundle-babel.ts"],"names":[],"mappings":";;AAAA,+BAA4B;AAC5B,uEAAuE;AACvE,2DAA2D;AAE3D,wFAAwF;AACxF,SAAS,qBAAqB,CAAC,YAAiB;IAC9C,yBAAyB;IACzB,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CACpE,CAAC;IACF,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,EAAE;QACtC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;QACtC;YACE,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,qDAAqD;IACrD,4EAA4E;IAC5E,6DAA6D;IAC7D,MAAM,WAAW,GAAG,wBAAY,CAAC,WAAI,CAAC,sBAAW,EAAE,cAAc,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,mCAAQ,WAAW,CAAC,YAAY,GAAK,WAAW,CAAC,eAAe,CAAE,CAAC;IAC7E,MAAM,mBAAmB,GAAG,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC5C,IAAI,mBAAmB,IAAI,CAAC,UAAU,EAAE;QACtC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE;YAChC,OAAO,CAAC,OAAO,CAAC,gCAAgC,CAAC;YACjD;gBACE,IAAI,EAAE,IAAI;aACX;SACF,CAAC,CAAC;KACJ;IACD,IAAI,UAAU,IAAI,CAAC,mBAAmB,EAAE;QACtC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;KAC5E;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,qBAAqB,CAAC"}
|
package/src/webpack/bundle4.d.ts
DELETED
|
File without changes
|
package/src/webpack/bundle4.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bundle4.js","sourceRoot":"","sources":["../../../../../packages/react/src/webpack/bundle4.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG,UAAU,OAAO,GAAG,IAAI;IACvC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;IAE1B,OAAO;QACL,kBAAkB,EAAE,OAAO,CAAC,sCAAsC,CAAC;QACnE,OAAO;KACR,CAAC;AACJ,CAAC,CAAC"}
|
package/src/webpack/bundle5.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/src/webpack/bundle5.js
DELETED
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
4
|
-
const chalk = require("chalk");
|
|
5
|
-
const require_shim_1 = require("./require-shim");
|
|
6
|
-
const packageJson = require("../../package.json");
|
|
7
|
-
function validateVersion(path) {
|
|
8
|
-
if (packageJson.dependencies[path] ===
|
|
9
|
-
require_shim_1.requireShim(`${path}/package.json`).version) {
|
|
10
|
-
devkit_1.logger.warn(`Found an outdated version of ${chalk.bold(path)}\n`);
|
|
11
|
-
devkit_1.logger.info(devkit_1.stripIndents `
|
|
12
|
-
If you want to use webpack 5, try installing compatible versions of the plugins.
|
|
13
|
-
See: https://nx.dev/guides/webpack-5
|
|
14
|
-
`);
|
|
15
|
-
throw new Error('Incompatible version');
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
module.exports = function (onFallback) {
|
|
19
|
-
try {
|
|
20
|
-
validateVersion('@pmmmwh/react-refresh-webpack-plugin');
|
|
21
|
-
}
|
|
22
|
-
catch (_a) {
|
|
23
|
-
devkit_1.logger.info(`NX Falling back to webpack 4 due to incompatible plugin versions`);
|
|
24
|
-
onFallback();
|
|
25
|
-
return require('./bundle4')();
|
|
26
|
-
}
|
|
27
|
-
return {
|
|
28
|
-
ReactRefreshPlugin: require_shim_1.requireShim('@pmmmwh/react-refresh-webpack-plugin'),
|
|
29
|
-
webpack: require_shim_1.requireShim('webpack'),
|
|
30
|
-
};
|
|
31
|
-
};
|
|
32
|
-
//# sourceMappingURL=bundle5.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"bundle5.js","sourceRoot":"","sources":["../../../../../packages/react/src/webpack/bundle5.ts"],"names":[],"mappings":";;AAAA,yCAAoD;AACpD,+BAAgC;AAEhC,iDAA6C;AAC7C,kDAAmD;AAEnD,SAAS,eAAe,CAAC,IAAI;IAC3B,IACE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC;QAC9B,0BAAW,CAAC,GAAG,IAAI,eAAe,CAAC,CAAC,OAAO,EAC3C;QACA,eAAM,CAAC,IAAI,CAAC,gCAAgC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElE,eAAM,CAAC,IAAI,CAAC,qBAAY,CAAA;;;KAGvB,CAAC,CAAC;QAEH,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,UAAU,UAAU;IACnC,IAAI;QACF,eAAe,CAAC,sCAAsC,CAAC,CAAC;KACzD;IAAC,WAAM;QACN,eAAM,CAAC,IAAI,CACT,kEAAkE,CACnE,CAAC;QACF,UAAU,EAAE,CAAC;QACb,OAAO,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;KAC/B;IAED,OAAO;QACL,kBAAkB,EAAE,0BAAW,CAAC,sCAAsC,CAAC;QACvE,OAAO,EAAE,0BAAW,CAAC,SAAS,CAAC;KAChC,CAAC;AACJ,CAAC,CAAC"}
|
package/src/webpack/entry.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/src/webpack/entry.js
DELETED
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const require_shim_1 = require("./require-shim");
|
|
4
|
-
const result = require_shim_1.requireShim('webpack/package.json');
|
|
5
|
-
const version = result === null || result === void 0 ? void 0 : result.version;
|
|
6
|
-
exports.default = undefined;
|
|
7
|
-
const forceWebpack4 = process.env.NX_FORCE_WEBPACK_4;
|
|
8
|
-
exports.isWebpack5 = !forceWebpack4 && /^5\./.test(version);
|
|
9
|
-
if (exports.isWebpack5) {
|
|
10
|
-
Object.assign(exports, require('./bundle5')(() => {
|
|
11
|
-
exports.isWebpack5 = false;
|
|
12
|
-
}));
|
|
13
|
-
}
|
|
14
|
-
else {
|
|
15
|
-
Object.assign(exports, require('./bundle4')());
|
|
16
|
-
}
|
|
17
|
-
//# sourceMappingURL=entry.js.map
|
package/src/webpack/entry.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../../../../packages/react/src/webpack/entry.ts"],"names":[],"mappings":";;AAAA,iDAA6C;AAE7C,MAAM,MAAM,GAAG,0BAAW,CAAC,sBAAsB,CAAC,CAAC;AACnD,MAAM,OAAO,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC;AAEhC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;AAE5B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AAErD,OAAO,CAAC,UAAU,GAAG,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAE5D,IAAI,OAAO,CAAC,UAAU,EAAE;IACtB,MAAM,CAAC,MAAM,CACX,OAAO,EACP,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE;QACxB,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC;IAC7B,CAAC,CAAC,CACH,CAAC;CACH;KAAM;IACL,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;CAChD"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function requireShim(path: string): any;
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.requireShim = void 0;
|
|
4
|
-
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
5
|
-
const path_1 = require("path");
|
|
6
|
-
function requireShim(path) {
|
|
7
|
-
try {
|
|
8
|
-
return require(path_1.join(app_root_1.appRootPath, 'node_modules', path));
|
|
9
|
-
}
|
|
10
|
-
catch (_a) {
|
|
11
|
-
return require(path);
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
exports.requireShim = requireShim;
|
|
15
|
-
//# sourceMappingURL=require-shim.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"require-shim.js","sourceRoot":"","sources":["../../../../../packages/react/src/webpack/require-shim.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,+BAA4B;AAE5B,SAAgB,WAAW,CAAC,IAAY;IACtC,IAAI;QACF,OAAO,OAAO,CAAC,WAAI,CAAC,sBAAW,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;KACzD;IAAC,WAAM;QACN,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;KACtB;AACH,CAAC;AAND,kCAMC"}
|