@nrwl/react 13.1.0 → 13.2.0-beta.1
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 +8 -8
- package/plugins/jest.js +1 -1
- package/plugins/jest.js.map +1 -1
- package/plugins/storybook/index.d.ts +4 -1
- package/plugins/storybook/index.js +12 -12
- package/plugins/storybook/index.js.map +1 -1
- package/src/generators/application/application.js +21 -21
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/common/tsconfig.app.json__tmpl__ +1 -1
- package/src/generators/application/lib/add-cypress.js +2 -2
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/add-jest.js +2 -2
- package/src/generators/application/lib/add-jest.js.map +1 -1
- package/src/generators/application/lib/add-project.js +11 -11
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/add-routing.js +3 -3
- package/src/generators/application/lib/add-routing.js.map +1 -1
- package/src/generators/application/lib/create-application-files.js +5 -5
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +6 -6
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/set-defaults.js +2 -2
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/application/lib/update-jest-config.js +3 -3
- package/src/generators/application/lib/update-jest-config.js.map +1 -1
- package/src/generators/component/component.js +20 -20
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component-cypress-spec/component-cypress-spec.js +6 -6
- package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
- package/src/generators/component-story/component-story.js +8 -8
- package/src/generators/component-story/component-story.js.map +1 -1
- package/src/generators/hook/hook.js +16 -16
- package/src/generators/hook/hook.js.map +1 -1
- package/src/generators/init/init.js +11 -11
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/files/lib/tsconfig.lib.json__tmpl__ +1 -1
- package/src/generators/library/library.js +40 -40
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/redux/redux.js +14 -14
- package/src/generators/redux/redux.js.map +1 -1
- package/src/generators/stories/stories.js +11 -11
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.js +7 -7
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6.js +2 -2
- package/src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6.js.map +1 -1
- package/src/migrations/update-10-4-0/update-10-4-0.js +3 -3
- package/src/migrations/update-10-4-0/update-10-4-0.js.map +1 -1
- package/src/migrations/update-11-0-0/rename-emotion-packages-11-0-0.js +3 -3
- package/src/migrations/update-11-0-0/rename-emotion-packages-11-0-0.js.map +1 -1
- package/src/migrations/update-11-0-0/update-11-0-0.js +3 -3
- package/src/migrations/update-11-0-0/update-11-0-0.js.map +1 -1
- package/src/migrations/update-11-2-0/move-react-redux-types-package-11-2-0.js +3 -3
- package/src/migrations/update-11-2-0/move-react-redux-types-package-11-2-0.js.map +1 -1
- package/src/migrations/update-12-0-0/remove-react-redux-types-package.js +2 -2
- package/src/migrations/update-12-0-0/remove-react-redux-types-package.js.map +1 -1
- package/src/migrations/update-12-0-0/update-emotion-setup.js +5 -5
- package/src/migrations/update-12-0-0/update-emotion-setup.js.map +1 -1
- package/src/migrations/update-12-0-0/use-react-jsx-in-tsconfig.js +4 -4
- package/src/migrations/update-12-0-0/use-react-jsx-in-tsconfig.js.map +1 -1
- package/src/migrations/update-12-8-0/update-12-8-0.js +2 -2
- package/src/migrations/update-12-8-0/update-12-8-0.js.map +1 -1
- package/src/migrations/update-13-0-0/migrate-storybook-to-webpack-5.js +7 -7
- package/src/migrations/update-13-0-0/migrate-storybook-to-webpack-5.js.map +1 -1
- package/src/migrations/update-13-0-0/update-emotion-setup.js +5 -5
- package/src/migrations/update-13-0-0/update-emotion-setup.js.map +1 -1
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js +19 -10
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map +1 -1
- package/src/migrations/update-8-10-0/update-8-10-0.js +11 -11
- package/src/migrations/update-8-10-0/update-8-10-0.js.map +1 -1
- package/src/migrations/update-8-10-1/fix-react-tsconfig-8-10-1.js +6 -6
- package/src/migrations/update-8-10-1/fix-react-tsconfig-8-10-1.js.map +1 -1
- package/src/migrations/update-8-12-0/fix-react-files-8-12-0.js +4 -4
- package/src/migrations/update-8-12-0/fix-react-files-8-12-0.js.map +1 -1
- package/src/migrations/update-8-12-0/update-8-12-0.js +3 -3
- package/src/migrations/update-8-12-0/update-8-12-0.js.map +1 -1
- package/src/migrations/update-8-3-0/update-8-3-0.js +12 -12
- package/src/migrations/update-8-3-0/update-8-3-0.js.map +1 -1
- package/src/migrations/update-8-5-0/update-workspace-8-5-0.js +3 -3
- package/src/migrations/update-8-5-0/update-workspace-8-5-0.js.map +1 -1
- package/src/migrations/update-8-7-0/update-8-7-0.js +5 -5
- package/src/migrations/update-8-7-0/update-8-7-0.js.map +1 -1
- package/src/migrations/update-8-9-0/update-8-9-0.js +12 -12
- package/src/migrations/update-8-9-0/update-8-9-0.js.map +1 -1
- package/src/migrations/update-9-4-0/babelrc-9-4-0.js +8 -8
- package/src/migrations/update-9-4-0/babelrc-9-4-0.js.map +1 -1
- package/src/migrations/update-9-4-0/update-9-4-0.js +3 -3
- package/src/migrations/update-9-4-0/update-9-4-0.js.map +1 -1
- package/src/migrations/update-9-5-0/update-9-5-0.js +3 -3
- package/src/migrations/update-9-5-0/update-9-5-0.js.map +1 -1
- package/src/migrations/utils/testing.js +11 -11
- package/src/migrations/utils/testing.js.map +1 -1
- package/src/rules/add-styled-dependencies.js +1 -1
- package/src/rules/add-styled-dependencies.js.map +1 -1
- package/src/utils/ast-utils.js +16 -16
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/format-file.js +1 -1
- package/src/utils/format-file.js.map +1 -1
- package/src/utils/lint.js +1 -1
- package/src/utils/lint.js.map +1 -1
- package/src/utils/testing-generators.js +9 -9
- package/src/utils/testing-generators.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/tailwind.js +1 -1
- package/tailwind.js.map +1 -1
|
@@ -4,9 +4,9 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
4
4
|
const workspace_1 = require("@nrwl/workspace");
|
|
5
5
|
const move_npm_packages_1 = require("@nrwl/workspace/src/utils/rules/move-npm-packages");
|
|
6
6
|
function update() {
|
|
7
|
-
return schematics_1.chain([
|
|
8
|
-
move_npm_packages_1.moveNpmPackages({ toDevDeps: '@types/react-redux' }),
|
|
9
|
-
workspace_1.formatFiles(),
|
|
7
|
+
return (0, schematics_1.chain)([
|
|
8
|
+
(0, move_npm_packages_1.moveNpmPackages)({ toDevDeps: '@types/react-redux' }),
|
|
9
|
+
(0, workspace_1.formatFiles)(),
|
|
10
10
|
]);
|
|
11
11
|
}
|
|
12
12
|
exports.default = update;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-react-redux-types-package-11-2-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-11-2-0/move-react-redux-types-package-11-2-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,+CAA8C;AAC9C,yFAAoF;AAEpF,SAAwB,MAAM;IAC5B,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"move-react-redux-types-package-11-2-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-11-2-0/move-react-redux-types-package-11-2-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,+CAA8C;AAC9C,yFAAoF;AAEpF,SAAwB,MAAM;IAC5B,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,mCAAe,EAAC,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC;QACpD,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC;AALD,yBAKC"}
|
|
@@ -4,8 +4,8 @@ exports.removeReactReduxTypesFromPackageJson = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function removeReactReduxTypesFromPackageJson(host) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
return devkit_1.removeDependenciesFromPackageJson(host, ['@types/react-redux'], ['@types/react-redux']);
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
|
+
return (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@types/react-redux'], ['@types/react-redux']);
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
exports.removeReactReduxTypesFromPackageJson = removeReactReduxTypesFromPackageJson;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-react-redux-types-package.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-0-0/remove-react-redux-types-package.ts"],"names":[],"mappings":";;;;AAAA,yCAAuE;AAEvE,SAAsB,oCAAoC,CAAC,IAAU;;QACnE,OAAO,0CAAiC,
|
|
1
|
+
{"version":3,"file":"remove-react-redux-types-package.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-0-0/remove-react-redux-types-package.ts"],"names":[],"mappings":";;;;AAAA,yCAAuE;AAEvE,SAAsB,oCAAoC,CAAC,IAAU;;QACnE,OAAO,IAAA,0CAAiC,EACtC,IAAI,EACJ,CAAC,oBAAoB,CAAC,EACtB,CAAC,oBAAoB,CAAC,CACvB,CAAC;IACJ,CAAC;CAAA;AAND,oFAMC;AAED,kBAAe,oCAAoC,CAAC"}
|
|
@@ -4,14 +4,14 @@ exports.updateEmotionSetup = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function updateEmotionSetup(host) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const projects = devkit_1.getProjects(host);
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
|
+
const projects = (0, devkit_1.getProjects)(host);
|
|
9
9
|
projects.forEach((p) => {
|
|
10
10
|
const babelrcPath = `${p.root}/.babelrc`;
|
|
11
11
|
const oldPreset = '@emotion/babel-preset-css-prop';
|
|
12
12
|
const newPlugin = '@emotion/babel-plugin';
|
|
13
13
|
if (host.exists(babelrcPath)) {
|
|
14
|
-
devkit_1.updateJson(host, babelrcPath, (json) => {
|
|
14
|
+
(0, devkit_1.updateJson)(host, babelrcPath, (json) => {
|
|
15
15
|
var _a;
|
|
16
16
|
if (!json.presets)
|
|
17
17
|
return json;
|
|
@@ -46,7 +46,7 @@ function updateEmotionSetup(host) {
|
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
|
-
devkit_1.updateJson(host, 'package.json', (json) => {
|
|
49
|
+
(0, devkit_1.updateJson)(host, 'package.json', (json) => {
|
|
50
50
|
var _a, _b;
|
|
51
51
|
if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@emotion/babel-preset-css-prop']) {
|
|
52
52
|
delete json.devDependencies['@emotion/babel-preset-css-prop'];
|
|
@@ -59,7 +59,7 @@ function updateEmotionSetup(host) {
|
|
|
59
59
|
}
|
|
60
60
|
return json;
|
|
61
61
|
});
|
|
62
|
-
yield devkit_1.formatFiles(host);
|
|
62
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
63
63
|
});
|
|
64
64
|
}
|
|
65
65
|
exports.updateEmotionSetup = updateEmotionSetup;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-emotion-setup.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-0-0/update-emotion-setup.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAE1E,SAAsB,kBAAkB,CAAC,IAAU;;QACjD,MAAM,QAAQ,GAAG,oBAAW,
|
|
1
|
+
{"version":3,"file":"update-emotion-setup.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-0-0/update-emotion-setup.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAE1E,SAAsB,kBAAkB,CAAC,IAAU;;QACjD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACrB,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,IAAI,WAAW,CAAC;YACzC,MAAM,SAAS,GAAG,gCAAgC,CAAC;YACnD,MAAM,SAAS,GAAG,uBAAuB,CAAC;YAE1C,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBAC5B,IAAA,mBAAU,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;;oBACrC,IAAI,CAAC,IAAI,CAAC,OAAO;wBAAE,OAAO,IAAI,CAAC;oBAE/B,IAAI,gBAAgB,GAAG,CAAC,CAAC,CAAC;oBAC1B,IAAI,cAAc,GAAc,IAAI,CAAC;oBAErC,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;wBAClD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;4BACzB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;gCAAE,SAAS;4BAC7C,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;4BAC3B,gBAAgB,GAAG,GAAG,CAAC;4BACvB,MAAM;yBACP;6BAAM;4BACL,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC;gCAAE,SAAS;4BAC1C,gBAAgB,GAAG,GAAG,CAAC;4BACvB,MAAM;yBACP;qBACF;oBAED,IAAI,gBAAgB,KAAK,CAAC,CAAC,EAAE;wBAC3B,gBAAgB;wBAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;wBAEzC,iBAAiB;wBACjB,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;wBACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CACf,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CACzD,CAAC;wBAEF,OAAO,IAAI,CAAC;qBACb;yBAAM;wBACL,OAAO,IAAI,CAAC;qBACb;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,gCAAgC,CAAC,EAAE;gBAC5D,OAAO,IAAI,CAAC,eAAe,CAAC,gCAAgC,CAAC,CAAC;gBAC9D,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,GAAG,QAAQ,CAAC;aAC1D;YACD,kDAAkD;iBAC7C,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,gCAAgC,CAAC,EAAE;gBAC9D,OAAO,IAAI,CAAC,YAAY,CAAC,gCAAgC,CAAC,CAAC;gBAC3D,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,GAAG,QAAQ,CAAC;aACvD;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA5DD,gDA4DC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -4,12 +4,12 @@ exports.useReactJsxInTsconfig = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function useReactJsxInTsconfig(host) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const projects = devkit_1.getProjects(host);
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
|
+
const projects = (0, devkit_1.getProjects)(host);
|
|
9
9
|
projects.forEach((p) => {
|
|
10
10
|
const tsConfigPath = `${p.root}/tsconfig.json`;
|
|
11
11
|
if (host.exists(tsConfigPath)) {
|
|
12
|
-
devkit_1.updateJson(host, tsConfigPath, (json) => {
|
|
12
|
+
(0, devkit_1.updateJson)(host, tsConfigPath, (json) => {
|
|
13
13
|
var _a;
|
|
14
14
|
if (((_a = json.compilerOptions) === null || _a === void 0 ? void 0 : _a.jsx) === 'react') {
|
|
15
15
|
// JSX is handled by babel
|
|
@@ -19,7 +19,7 @@ function useReactJsxInTsconfig(host) {
|
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
});
|
|
22
|
-
yield devkit_1.formatFiles(host);
|
|
22
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
exports.useReactJsxInTsconfig = useReactJsxInTsconfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-react-jsx-in-tsconfig.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-0-0/use-react-jsx-in-tsconfig.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAE1E,SAAsB,qBAAqB,CAAC,IAAU;;QACpD,MAAM,QAAQ,GAAG,oBAAW,
|
|
1
|
+
{"version":3,"file":"use-react-jsx-in-tsconfig.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-0-0/use-react-jsx-in-tsconfig.ts"],"names":[],"mappings":";;;;AAAA,yCAA0E;AAE1E,SAAsB,qBAAqB,CAAC,IAAU;;QACpD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACrB,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,IAAI,gBAAgB,CAAC;YAE/C,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;gBAC7B,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;oBACtC,IAAI,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,GAAG,MAAK,OAAO,EAAE;wBACzC,0BAA0B;wBAC1B,IAAI,CAAC,eAAe,CAAC,GAAG,GAAG,WAAW,CAAC;qBACxC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAlBD,sDAkBC;AAED,kBAAe,qBAAqB,CAAC"}
|
|
@@ -4,8 +4,8 @@ exports.removeReactReduxTypesFromPackageJson = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function removeReactReduxTypesFromPackageJson(host) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
return devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
9
9
|
'@testing-library/react-hooks': '^7.0.1',
|
|
10
10
|
});
|
|
11
11
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-12-8-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-8-0/update-12-8-0.ts"],"names":[],"mappings":";;;;AAAA,yCAAkE;AAElE,SAAsB,oCAAoC,CAAC,IAAU;;QACnE,OAAO,qCAA4B,
|
|
1
|
+
{"version":3,"file":"update-12-8-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-12-8-0/update-12-8-0.ts"],"names":[],"mappings":";;;;AAAA,yCAAkE;AAElE,SAAsB,oCAAoC,CAAC,IAAU;;QACnE,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;YACE,8BAA8B,EAAE,QAAQ;SACzC,CACF,CAAC;IACJ,CAAC;CAAA;AARD,oFAQC;AAED,kBAAe,oCAAoC,CAAC"}
|
|
@@ -6,27 +6,27 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const webpack5_changes_utils_1 = require("./webpack5-changes-utils");
|
|
7
7
|
let needsInstall = false;
|
|
8
8
|
function migrateStorybookToWebPack5(tree) {
|
|
9
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
-
const packageJson = devkit_1.readJson(tree, 'package.json');
|
|
11
|
-
if (webpack5_changes_utils_1.workspaceHasStorybookForReact(packageJson)) {
|
|
12
|
-
devkit_1.updateJson(tree, 'package.json', (json) => {
|
|
9
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
|
+
const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
11
|
+
if ((0, webpack5_changes_utils_1.workspaceHasStorybookForReact)(packageJson)) {
|
|
12
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
13
13
|
json.dependencies = json.dependencies || {};
|
|
14
14
|
json.devDependencies = json.devDependencies || {};
|
|
15
15
|
if (!json.dependencies['@storybook/builder-webpack5'] &&
|
|
16
16
|
!json.devDependencies['@storybook/builder-webpack5']) {
|
|
17
17
|
needsInstall = true;
|
|
18
18
|
json.devDependencies['@storybook/builder-webpack5'] =
|
|
19
|
-
webpack5_changes_utils_1.workspaceHasStorybookForReact(packageJson);
|
|
19
|
+
(0, webpack5_changes_utils_1.workspaceHasStorybookForReact)(packageJson);
|
|
20
20
|
}
|
|
21
21
|
if (!json.dependencies['@storybook/manager-webpack5'] &&
|
|
22
22
|
!json.devDependencies['@storybook/manager-webpack5']) {
|
|
23
23
|
needsInstall = true;
|
|
24
24
|
json.devDependencies['@storybook/manager-webpack5'] =
|
|
25
|
-
webpack5_changes_utils_1.workspaceHasStorybookForReact(packageJson);
|
|
25
|
+
(0, webpack5_changes_utils_1.workspaceHasStorybookForReact)(packageJson);
|
|
26
26
|
}
|
|
27
27
|
return json;
|
|
28
28
|
});
|
|
29
|
-
yield webpack5_changes_utils_1.migrateToWebPack5(tree);
|
|
29
|
+
yield (0, webpack5_changes_utils_1.migrateToWebPack5)(tree);
|
|
30
30
|
if (needsInstall) {
|
|
31
31
|
devkit_1.logger.info('Please make sure to run npm install or yarn install to get the latest packages added by this migration');
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-storybook-to-webpack-5.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/migrate-storybook-to-webpack-5.ts"],"names":[],"mappings":";;;;AAAA,yCAAkE;AAClE,qEAGkC;AAElC,IAAI,YAAY,GAAG,KAAK,CAAC;AAEzB,SAAsB,0BAA0B,CAAC,IAAU;;QACzD,MAAM,WAAW,GAAG,iBAAQ,
|
|
1
|
+
{"version":3,"file":"migrate-storybook-to-webpack-5.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/migrate-storybook-to-webpack-5.ts"],"names":[],"mappings":";;;;AAAA,yCAAkE;AAClE,qEAGkC;AAElC,IAAI,YAAY,GAAG,KAAK,CAAC;AAEzB,SAAsB,0BAA0B,CAAC,IAAU;;QACzD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,IAAI,IAAA,sDAA6B,EAAC,WAAW,CAAC,EAAE;YAC9C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;gBAC5C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;gBAElD,IACE,CAAC,IAAI,CAAC,YAAY,CAAC,6BAA6B,CAAC;oBACjD,CAAC,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC,EACpD;oBACA,YAAY,GAAG,IAAI,CAAC;oBACpB,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC;wBACjD,IAAA,sDAA6B,EAAC,WAAW,CAAC,CAAC;iBAC9C;gBAED,IACE,CAAC,IAAI,CAAC,YAAY,CAAC,6BAA6B,CAAC;oBACjD,CAAC,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC,EACpD;oBACA,YAAY,GAAG,IAAI,CAAC;oBACpB,IAAI,CAAC,eAAe,CAAC,6BAA6B,CAAC;wBACjD,IAAA,sDAA6B,EAAC,WAAW,CAAC,CAAC;iBAC9C;gBAED,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,MAAM,IAAA,0CAAiB,EAAC,IAAI,CAAC,CAAC;YAE9B,IAAI,YAAY,EAAE;gBAChB,eAAM,CAAC,IAAI,CACT,wGAAwG,CACzG,CAAC;aACH;SACF;IACH,CAAC;CAAA;AAnCD,gEAmCC;AAED,kBAAe,0BAA0B,CAAC"}
|
|
@@ -4,14 +4,14 @@ exports.updateEmotionSetup = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function updateEmotionSetup(host) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const projects = devkit_1.getProjects(host);
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
|
+
const projects = (0, devkit_1.getProjects)(host);
|
|
9
9
|
projects.forEach((p) => {
|
|
10
10
|
let hasEmotion = false;
|
|
11
11
|
const babelrcPath = `${p.root}/.babelrc`;
|
|
12
12
|
const tsConfigPath = `${p.root}/tsconfig.json`;
|
|
13
13
|
if (host.exists(babelrcPath)) {
|
|
14
|
-
const babelrc = devkit_1.readJson(host, babelrcPath);
|
|
14
|
+
const babelrc = (0, devkit_1.readJson)(host, babelrcPath);
|
|
15
15
|
if (babelrc.presets) {
|
|
16
16
|
for (const [idx, preset] of babelrc.presets.entries()) {
|
|
17
17
|
if (Array.isArray(preset)) {
|
|
@@ -25,13 +25,13 @@ function updateEmotionSetup(host) {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
if (hasEmotion && host.exists(tsConfigPath)) {
|
|
28
|
-
devkit_1.updateJson(host, tsConfigPath, (json) => {
|
|
28
|
+
(0, devkit_1.updateJson)(host, tsConfigPath, (json) => {
|
|
29
29
|
json.compilerOptions.jsxImportSource = '@emotion/react';
|
|
30
30
|
return json;
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
|
-
yield devkit_1.formatFiles(host);
|
|
34
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
exports.updateEmotionSetup = updateEmotionSetup;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-emotion-setup.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/update-emotion-setup.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,SAAsB,kBAAkB,CAAC,IAAU;;QACjD,MAAM,QAAQ,GAAG,oBAAW,
|
|
1
|
+
{"version":3,"file":"update-emotion-setup.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/update-emotion-setup.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,SAAsB,kBAAkB,CAAC,IAAU;;QACjD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACrB,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,IAAI,WAAW,CAAC;YACzC,MAAM,YAAY,GAAG,GAAG,CAAC,CAAC,IAAI,gBAAgB,CAAC;YAE/C,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBAC5B,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC5C,IAAI,OAAO,CAAC,OAAO,EAAE;oBACnB,KAAK,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;wBACrD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;4BACzB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC;gCAAE,SAAS;4BACvD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;4BACjC,UAAU,GAAG,cAAc,CAAC,YAAY,KAAK,gBAAgB,CAAC;4BAC9D,MAAM;yBACP;qBACF;iBACF;aACF;YAED,IAAI,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;gBAC3C,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;oBACtC,IAAI,CAAC,eAAe,CAAC,eAAe,GAAG,gBAAgB,CAAC;oBACxD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA/BD,gDA+BC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -7,11 +7,20 @@ const devkit_2 = require("@nrwl/devkit");
|
|
|
7
7
|
const ts = require("typescript");
|
|
8
8
|
const find_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/find-nodes");
|
|
9
9
|
function migrateToWebPack5(tree) {
|
|
10
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
11
|
allReactProjectsWithStorybookConfiguration(tree).forEach((project) => {
|
|
12
|
-
|
|
12
|
+
let storybookConfigFile = `${project.storybookConfigPath}/main.js`;
|
|
13
|
+
if (!tree.exists(storybookConfigFile)) {
|
|
14
|
+
// try to see whether there's a main.ts file
|
|
15
|
+
storybookConfigFile = `${project.storybookConfigPath}/main.ts`;
|
|
16
|
+
}
|
|
17
|
+
if (!tree.exists(storybookConfigFile)) {
|
|
18
|
+
// ok...give up
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
editProjectMainJs(tree, storybookConfigFile, project.projectName);
|
|
13
22
|
});
|
|
14
|
-
yield devkit_2.formatFiles(tree);
|
|
23
|
+
yield (0, devkit_2.formatFiles)(tree);
|
|
15
24
|
});
|
|
16
25
|
}
|
|
17
26
|
exports.migrateToWebPack5 = migrateToWebPack5;
|
|
@@ -22,7 +31,7 @@ function workspaceHasStorybookForReact(packageJson) {
|
|
|
22
31
|
exports.workspaceHasStorybookForReact = workspaceHasStorybookForReact;
|
|
23
32
|
function allReactProjectsWithStorybookConfiguration(tree) {
|
|
24
33
|
var _a, _b, _c;
|
|
25
|
-
const projects = devkit_1.getProjects(tree);
|
|
34
|
+
const projects = (0, devkit_1.getProjects)(tree);
|
|
26
35
|
const reactProjectsThatHaveStorybookConfiguration = (_c = (_b = (_a = [...projects.entries()]) === null || _a === void 0 ? void 0 : _a.filter(([_, projectConfig]) => projectConfig.targets &&
|
|
27
36
|
projectConfig.targets.storybook &&
|
|
28
37
|
projectConfig.targets.storybook.options)) === null || _b === void 0 ? void 0 : _b.map(([projectName, projectConfig]) => {
|
|
@@ -52,10 +61,10 @@ function editProjectMainJs(tree, projectMainJsFile, projectName) {
|
|
|
52
61
|
const file = getTsSourceFile(tree, projectMainJsFile);
|
|
53
62
|
const appFileContent = tree.read(projectMainJsFile, 'utf-8');
|
|
54
63
|
newContents = appFileContent;
|
|
55
|
-
moduleExportsFull = find_nodes_1.findNodes(file, [ts.SyntaxKind.ExpressionStatement]);
|
|
64
|
+
moduleExportsFull = (0, find_nodes_1.findNodes)(file, [ts.SyntaxKind.ExpressionStatement]);
|
|
56
65
|
if (moduleExportsFull && moduleExportsFull[0]) {
|
|
57
66
|
const moduleExports = moduleExportsFull[0];
|
|
58
|
-
const listOfStatements = find_nodes_1.findNodes(moduleExports, [
|
|
67
|
+
const listOfStatements = (0, find_nodes_1.findNodes)(moduleExports, [
|
|
59
68
|
ts.SyntaxKind.SyntaxList,
|
|
60
69
|
]);
|
|
61
70
|
/**
|
|
@@ -85,7 +94,7 @@ function editProjectMainJs(tree, projectMainJsFile, projectName) {
|
|
|
85
94
|
.getChildren()
|
|
86
95
|
.find((node) => node.getText() === "builder: 'webpack5'");
|
|
87
96
|
if (!alreadyHasBuilder) {
|
|
88
|
-
newContents = devkit_2.applyChangesToString(newContents, [
|
|
97
|
+
newContents = (0, devkit_2.applyChangesToString)(newContents, [
|
|
89
98
|
{
|
|
90
99
|
type: devkit_2.ChangeType.Insert,
|
|
91
100
|
index: contentsOfCoreNode.getEnd() - 1,
|
|
@@ -99,7 +108,7 @@ function editProjectMainJs(tree, projectMainJsFile, projectName) {
|
|
|
99
108
|
* Does not have core object,
|
|
100
109
|
* so just write one, at the start.
|
|
101
110
|
*/
|
|
102
|
-
newContents = devkit_2.applyChangesToString(newContents, [
|
|
111
|
+
newContents = (0, devkit_2.applyChangesToString)(newContents, [
|
|
103
112
|
{
|
|
104
113
|
type: devkit_2.ChangeType.Insert,
|
|
105
114
|
index: indexOfStoriesNode - 1,
|
|
@@ -224,7 +233,7 @@ function checkMainJsForOldSyntax(nodeList, fileContent) {
|
|
|
224
233
|
else {
|
|
225
234
|
// Add builder
|
|
226
235
|
const indexOfCoreNodeEnd = coreNode.getEnd();
|
|
227
|
-
fileContent = devkit_2.applyChangesToString(fileContent, [
|
|
236
|
+
fileContent = (0, devkit_2.applyChangesToString)(fileContent, [
|
|
228
237
|
{
|
|
229
238
|
type: devkit_2.ChangeType.Insert,
|
|
230
239
|
index: indexOfCoreNodeEnd - 1,
|
|
@@ -236,7 +245,7 @@ function checkMainJsForOldSyntax(nodeList, fileContent) {
|
|
|
236
245
|
}
|
|
237
246
|
}
|
|
238
247
|
if (!hasCoreNode) {
|
|
239
|
-
fileContent = devkit_2.applyChangesToString(fileContent, [
|
|
248
|
+
fileContent = (0, devkit_2.applyChangesToString)(fileContent, [
|
|
240
249
|
{
|
|
241
250
|
type: devkit_2.ChangeType.Insert,
|
|
242
251
|
index: lastIndexOfFirstNode + 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AACjD,yCAKsB;AAEtB,iCAAkC;AAClC,oFAAgF;AAEhF,SAAsB,iBAAiB,CAAC,IAAU;;QAChD,0CAA0C,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACnE,
|
|
1
|
+
{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,16 +7,16 @@ const literals_1 = require("@angular-devkit/core/src/utils/literals");
|
|
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
8
|
const ignore = require('ignore');
|
|
9
9
|
function update() {
|
|
10
|
-
return schematics_1.chain([
|
|
10
|
+
return (0, schematics_1.chain)([
|
|
11
11
|
displayInformation,
|
|
12
12
|
addCustomTypings,
|
|
13
|
-
workspace_1.updateWorkspaceInTree(updateBuilderWebpackOption),
|
|
14
|
-
workspace_1.updatePackagesInPackageJson(path.join(__dirname, '../../../', 'migrations.json'), '8.10.0'),
|
|
13
|
+
(0, workspace_1.updateWorkspaceInTree)(updateBuilderWebpackOption),
|
|
14
|
+
(0, workspace_1.updatePackagesInPackageJson)(path.join(__dirname, '../../../', 'migrations.json'), '8.10.0'),
|
|
15
15
|
]);
|
|
16
16
|
}
|
|
17
17
|
exports.default = update;
|
|
18
18
|
function displayInformation(host, context) {
|
|
19
|
-
context.logger.info(literals_1.stripIndents `
|
|
19
|
+
context.logger.info((0, literals_1.stripIndents) `
|
|
20
20
|
We've added SVG and SVGR support for React applications. If you are using this
|
|
21
21
|
feature, please update your jest.config.js file(s) with the new transform.
|
|
22
22
|
|
|
@@ -29,26 +29,26 @@ function displayInformation(host, context) {
|
|
|
29
29
|
`);
|
|
30
30
|
}
|
|
31
31
|
function addCustomTypings(host) {
|
|
32
|
-
const workspace = workspace_1.readWorkspace(host);
|
|
33
|
-
return schematics_1.chain([
|
|
32
|
+
const workspace = (0, workspace_1.readWorkspace)(host);
|
|
33
|
+
return (0, schematics_1.chain)([
|
|
34
34
|
...Object.keys(workspace.projects).map((k) => {
|
|
35
35
|
const p = workspace.projects[k];
|
|
36
36
|
if (p.projectType !== 'application') {
|
|
37
|
-
return schematics_1.noop();
|
|
37
|
+
return (0, schematics_1.noop)();
|
|
38
38
|
}
|
|
39
39
|
if (isReactProject(p)) {
|
|
40
|
-
return workspace_1.updateJsonInTree(path.join(p.root, 'tsconfig.json'), (json) => {
|
|
40
|
+
return (0, workspace_1.updateJsonInTree)(path.join(p.root, 'tsconfig.json'), (json) => {
|
|
41
41
|
const files = json.files || [];
|
|
42
|
-
files.push(`${devkit_1.offsetFromRoot(p.root)}node_modules/@nrwl/react/typings/cssmodule.d.ts`, `${devkit_1.offsetFromRoot(p.root)}node_modules/@nrwl/react/typings/image.d.ts`);
|
|
42
|
+
files.push(`${(0, devkit_1.offsetFromRoot)(p.root)}node_modules/@nrwl/react/typings/cssmodule.d.ts`, `${(0, devkit_1.offsetFromRoot)(p.root)}node_modules/@nrwl/react/typings/image.d.ts`);
|
|
43
43
|
json.files = files;
|
|
44
44
|
return json;
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
|
-
return schematics_1.noop();
|
|
48
|
+
return (0, schematics_1.noop)();
|
|
49
49
|
}
|
|
50
50
|
}),
|
|
51
|
-
workspace_1.formatFiles(),
|
|
51
|
+
(0, workspace_1.formatFiles)(),
|
|
52
52
|
]);
|
|
53
53
|
}
|
|
54
54
|
function updateBuilderWebpackOption(json) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-8-10-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-10-0/update-8-10-0.ts"],"names":[],"mappings":";;AAAA,2DAMoC;AACpC,+CAMyB;AACzB,6BAA6B;AAC7B,sEAAuE;AACvE,yCAA8C;AAE9C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,SAAwB,MAAM;IAC5B,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"update-8-10-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-10-0/update-8-10-0.ts"],"names":[],"mappings":";;AAAA,2DAMoC;AACpC,+CAMyB;AACzB,6BAA6B;AAC7B,sEAAuE;AACvE,yCAA8C;AAE9C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,SAAwB,MAAM;IAC5B,OAAO,IAAA,kBAAK,EAAC;QACX,kBAAkB;QAClB,gBAAgB;QAChB,IAAA,iCAAqB,EAAC,0BAA0B,CAAC;QACjD,IAAA,uCAA2B,EACzB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,EACpD,QAAQ,CACT;KACF,CAAC,CAAC;AACL,CAAC;AAVD,yBAUC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAY,EAAA;;;;;;;;;;GAU/B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU;IAClC,MAAM,SAAS,GAAG,IAAA,yBAAa,EAAC,IAAI,CAAC,CAAC;IACtC,OAAO,IAAA,kBAAK,EAAC;QACX,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC3C,MAAM,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,CAAC,WAAW,KAAK,aAAa,EAAE;gBACnC,OAAO,IAAA,iBAAI,GAAE,CAAC;aACf;YACD,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE;gBACrB,OAAO,IAAA,4BAAgB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;oBACnE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC/B,KAAK,CAAC,IAAI,CACR,GAAG,IAAA,uBAAc,EACf,CAAC,CAAC,IAAI,CACP,iDAAiD,EAClD,GAAG,IAAA,uBAAc,EACf,CAAC,CAAC,IAAI,CACP,6CAA6C,CAC/C,CAAC;oBACF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;oBACnB,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO,IAAA,iBAAI,GAAE,CAAC;aACf;QACH,CAAC,CAAC;QACF,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAI;IACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACnC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE;YACrB,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,GAAG,6BAA6B,CAAC;SACzE;IACH,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAC,CAAC;IACvB,MAAM,cAAc,GAClB,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,OAAO,CACL,cAAc;QACd,cAAc,CAAC,OAAO,KAAK,iBAAiB;QAC5C,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,KAAK,2BAA2B;YACnE,cAAc,CAAC,OAAO,CAAC,aAAa,KAAK,6BAA6B,CAAC,CAC1E,CAAC;AACJ,CAAC"}
|
|
@@ -6,24 +6,24 @@ const path = require("path");
|
|
|
6
6
|
const ignore = require('ignore');
|
|
7
7
|
function update() {
|
|
8
8
|
return (host) => {
|
|
9
|
-
const workspace = workspace_1.readWorkspace(host);
|
|
10
|
-
return schematics_1.chain([
|
|
9
|
+
const workspace = (0, workspace_1.readWorkspace)(host);
|
|
10
|
+
return (0, schematics_1.chain)([
|
|
11
11
|
...Object.keys(workspace.projects).map((k) => {
|
|
12
12
|
const p = workspace.projects[k];
|
|
13
13
|
if (p.projectType !== 'application') {
|
|
14
|
-
return schematics_1.noop();
|
|
14
|
+
return (0, schematics_1.noop)();
|
|
15
15
|
}
|
|
16
16
|
if (isReactProject(p)) {
|
|
17
|
-
return workspace_1.updateJsonInTree(path.join(p.root, 'tsconfig.json'), (json) => {
|
|
17
|
+
return (0, workspace_1.updateJsonInTree)(path.join(p.root, 'tsconfig.json'), (json) => {
|
|
18
18
|
json.files = json.files.filter((f) => f.indexOf('@nrwl/react/typings/svg.d.ts') === -1);
|
|
19
19
|
return json;
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
|
-
return schematics_1.noop();
|
|
23
|
+
return (0, schematics_1.noop)();
|
|
24
24
|
}
|
|
25
25
|
}),
|
|
26
|
-
workspace_1.formatFiles(),
|
|
26
|
+
(0, workspace_1.formatFiles)(),
|
|
27
27
|
]);
|
|
28
28
|
};
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-react-tsconfig-8-10-1.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-10-1/fix-react-tsconfig-8-10-1.ts"],"names":[],"mappings":";;AAAA,2DAAqE;AACrE,+CAA+E;AAC/E,6BAA6B;AAE7B,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,SAAwB,MAAM;IAC5B,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,yBAAa,
|
|
1
|
+
{"version":3,"file":"fix-react-tsconfig-8-10-1.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-10-1/fix-react-tsconfig-8-10-1.ts"],"names":[],"mappings":";;AAAA,2DAAqE;AACrE,+CAA+E;AAC/E,6BAA6B;AAE7B,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,SAAwB,MAAM;IAC5B,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,IAAA,yBAAa,EAAC,IAAI,CAAC,CAAC;QACtC,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC3C,MAAM,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAI,CAAC,CAAC,WAAW,KAAK,aAAa,EAAE;oBACnC,OAAO,IAAA,iBAAI,GAAE,CAAC;iBACf;gBACD,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE;oBACrB,OAAO,IAAA,4BAAgB,EACrB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,eAAe,CAAC,EAClC,CAAC,IAAI,EAAE,EAAE;wBACP,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC,CACxD,CAAC;wBACF,OAAO,IAAI,CAAC;oBACd,CAAC,CACF,CAAC;iBACH;qBAAM;oBACL,OAAO,IAAA,iBAAI,GAAE,CAAC;iBACf;YACH,CAAC,CAAC;YACF,IAAA,uBAAW,GAAE;SACd,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AA1BD,yBA0BC;AAED,SAAS,cAAc,CAAC,CAAC;IACvB,MAAM,cAAc,GAClB,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,OAAO,CACL,cAAc;QACd,cAAc,CAAC,OAAO,KAAK,iBAAiB;QAC5C,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,KAAK,2BAA2B;YACnE,cAAc,CAAC,OAAO,CAAC,aAAa,KAAK,6BAA6B,CAAC,CAC1E,CAAC;AACJ,CAAC"}
|
|
@@ -4,10 +4,10 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
4
4
|
const workspace_1 = require("@nrwl/workspace");
|
|
5
5
|
const ignore = require('ignore');
|
|
6
6
|
function update() {
|
|
7
|
-
return schematics_1.chain([
|
|
8
|
-
workspace_1.updateWorkspaceInTree(updateBuilderWebpackOption),
|
|
9
|
-
workspace_1.addDepsToPackageJson({}, { '@babel/preset-react': '7.8.3' }),
|
|
10
|
-
workspace_1.formatFiles(),
|
|
7
|
+
return (0, schematics_1.chain)([
|
|
8
|
+
(0, workspace_1.updateWorkspaceInTree)(updateBuilderWebpackOption),
|
|
9
|
+
(0, workspace_1.addDepsToPackageJson)({}, { '@babel/preset-react': '7.8.3' }),
|
|
10
|
+
(0, workspace_1.formatFiles)(),
|
|
11
11
|
]);
|
|
12
12
|
}
|
|
13
13
|
exports.default = update;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix-react-files-8-12-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-12-0/fix-react-files-8-12-0.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,+CAIyB;AAEzB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,SAAwB,MAAM;IAC5B,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"fix-react-files-8-12-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-12-0/fix-react-files-8-12-0.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,+CAIyB;AAEzB,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,SAAwB,MAAM;IAC5B,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,iCAAqB,EAAC,0BAA0B,CAAC;QACjD,IAAA,gCAAoB,EAAC,EAAE,EAAE,EAAE,qBAAqB,EAAE,OAAO,EAAE,CAAC;QAC5D,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC;AAND,yBAMC;AAED,SAAS,0BAA0B,CAAC,IAAI;IACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACnC,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE;YACjE,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,GAAG,6BAA6B,CAAC;SACzE;IACH,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAC,CAAC;IACvB,MAAM,cAAc,GAClB,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,OAAO,CACL,cAAc;QACd,cAAc,CAAC,OAAO,KAAK,iBAAiB;QAC5C,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC7C,CAAC;AACJ,CAAC"}
|
|
@@ -4,9 +4,9 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
4
4
|
const workspace_1 = require("@nrwl/workspace");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
function update() {
|
|
7
|
-
return schematics_1.chain([
|
|
8
|
-
workspace_1.updatePackagesInPackageJson(path.join(__dirname, '../../../', 'migrations.json'), '8.12.0'),
|
|
9
|
-
workspace_1.formatFiles(),
|
|
7
|
+
return (0, schematics_1.chain)([
|
|
8
|
+
(0, workspace_1.updatePackagesInPackageJson)(path.join(__dirname, '../../../', 'migrations.json'), '8.12.0'),
|
|
9
|
+
(0, workspace_1.formatFiles)(),
|
|
10
10
|
]);
|
|
11
11
|
}
|
|
12
12
|
exports.default = update;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-8-12-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-12-0/update-8-12-0.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,+CAA2E;AAC3E,6BAA6B;AAE7B,SAAwB,MAAM;IAC5B,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"update-8-12-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-12-0/update-8-12-0.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,+CAA2E;AAC3E,6BAA6B;AAE7B,SAAwB,MAAM;IAC5B,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,uCAA2B,EACzB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,EACpD,QAAQ,CACT;QACD,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC;AARD,yBAQC"}
|
|
@@ -9,16 +9,16 @@ const path_1 = require("path");
|
|
|
9
9
|
const versions_1 = require("../../utils/versions");
|
|
10
10
|
const ignore = require('ignore');
|
|
11
11
|
function update() {
|
|
12
|
-
return schematics_1.chain([
|
|
12
|
+
return (0, schematics_1.chain)([
|
|
13
13
|
displayInformation,
|
|
14
14
|
updateDependencies,
|
|
15
15
|
updateImports,
|
|
16
|
-
workspace_1.formatFiles(),
|
|
16
|
+
(0, workspace_1.formatFiles)(),
|
|
17
17
|
]);
|
|
18
18
|
}
|
|
19
19
|
exports.default = update;
|
|
20
20
|
function displayInformation(host, context) {
|
|
21
|
-
context.logger.info(literals_1.stripIndents `
|
|
21
|
+
context.logger.info((0, literals_1.stripIndents) `
|
|
22
22
|
React Testing Library has been repackaged as \`@testing-library/react\` as of version 8.
|
|
23
23
|
|
|
24
24
|
We are replacing your \`react-testing-library\` imports with \`@testing-library/react\`.
|
|
@@ -27,7 +27,7 @@ function displayInformation(host, context) {
|
|
|
27
27
|
`);
|
|
28
28
|
}
|
|
29
29
|
function updateDependencies(tree) {
|
|
30
|
-
const removeOld = workspace_1.updateJsonInTree('package.json', (json, context) => {
|
|
30
|
+
const removeOld = (0, workspace_1.updateJsonInTree)('package.json', (json, context) => {
|
|
31
31
|
json.dependencies = json.dependencies || {};
|
|
32
32
|
json.devDependencies = json.devDependencies || {};
|
|
33
33
|
// Just in case user installed it to dependencies instead of devDependencies.
|
|
@@ -36,7 +36,7 @@ function updateDependencies(tree) {
|
|
|
36
36
|
context.logger.info(`Removing \`react-testing-library\` as a dependency`);
|
|
37
37
|
return json;
|
|
38
38
|
});
|
|
39
|
-
const packageJson = workspace_1.readJsonInTree(tree, '/package.json');
|
|
39
|
+
const packageJson = (0, workspace_1.readJsonInTree)(tree, '/package.json');
|
|
40
40
|
const candidates = {
|
|
41
41
|
react: '16.8.6',
|
|
42
42
|
'react-dom': '16.8.6',
|
|
@@ -61,8 +61,8 @@ function updateDependencies(tree) {
|
|
|
61
61
|
'@testing-library/react': versions_1.testingLibraryReactVersion,
|
|
62
62
|
},
|
|
63
63
|
});
|
|
64
|
-
const addNew = workspace_1.updatePackageJsonDependencies(updated.dependencies, updated.devDependencies);
|
|
65
|
-
return schematics_1.chain([removeOld, addNew]);
|
|
64
|
+
const addNew = (0, workspace_1.updatePackageJsonDependencies)(updated.dependencies, updated.devDependencies);
|
|
65
|
+
return (0, schematics_1.chain)([removeOld, addNew]);
|
|
66
66
|
}
|
|
67
67
|
function updateImports(host) {
|
|
68
68
|
let ig = ignore();
|
|
@@ -70,14 +70,14 @@ function updateImports(host) {
|
|
|
70
70
|
ig = ig.add(host.read('.gitignore').toString());
|
|
71
71
|
}
|
|
72
72
|
host.visit((path) => {
|
|
73
|
-
if (ig.ignores(path_1.relative('/', path)) || !/\.tsx?$/.test(path)) {
|
|
73
|
+
if (ig.ignores((0, path_1.relative)('/', path)) || !/\.tsx?$/.test(path)) {
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
|
-
const sourceFile = typescript_1.createSourceFile(path, host.read(path).toString(), typescript_1.ScriptTarget.Latest, true);
|
|
76
|
+
const sourceFile = (0, typescript_1.createSourceFile)(path, host.read(path).toString(), typescript_1.ScriptTarget.Latest, true);
|
|
77
77
|
const changes = [];
|
|
78
78
|
sourceFile.statements.forEach((statement) => {
|
|
79
|
-
if (typescript_1.isImportDeclaration(statement) &&
|
|
80
|
-
typescript_1.isStringLiteral(statement.moduleSpecifier)) {
|
|
79
|
+
if ((0, typescript_1.isImportDeclaration)(statement) &&
|
|
80
|
+
(0, typescript_1.isStringLiteral)(statement.moduleSpecifier)) {
|
|
81
81
|
const nodeText = statement.moduleSpecifier.getText(sourceFile);
|
|
82
82
|
const modulePath = statement.moduleSpecifier
|
|
83
83
|
.getText(sourceFile)
|
|
@@ -87,7 +87,7 @@ function updateImports(host) {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
});
|
|
90
|
-
workspace_1.insert(host, path, changes);
|
|
90
|
+
(0, workspace_1.insert)(host, path, changes);
|
|
91
91
|
});
|
|
92
92
|
}
|
|
93
93
|
//# sourceMappingURL=update-8-3-0.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-8-3-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-3-0/update-8-3-0.ts"],"names":[],"mappings":";;AAAA,2DAKoC;AACpC,sEAAuE;AACvE,+CAMyB;AACzB,2CAKoB;AACpB,mEAAoE;AACpE,+BAAgC;AAChC,mDAAkE;AAElE,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,SAAwB,MAAM;IAC5B,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"update-8-3-0.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-8-3-0/update-8-3-0.ts"],"names":[],"mappings":"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"}
|