@nrwl/react 15.8.0-beta.2 → 15.8.0-beta.3
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 +6 -6
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +4 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/generators/application/application.js +3 -6
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/add-cypress.d.ts +1 -1
- package/src/generators/application/lib/add-cypress.js +1 -2
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/add-jest.js +1 -2
- package/src/generators/application/lib/add-jest.js.map +1 -1
- package/src/generators/application/lib/add-routing.js +2 -1
- package/src/generators/application/lib/add-routing.js.map +1 -1
- package/src/generators/component/component.js +2 -1
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component-cypress-spec/component-cypress-spec.js +3 -2
- package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
- package/src/generators/component-story/component-story.js +2 -1
- package/src/generators/component-story/component-story.js.map +1 -1
- package/src/generators/component-test/component-test.js +3 -2
- package/src/generators/component-test/component-test.js.map +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +1 -2
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js +3 -2
- package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
- package/src/generators/hook/hook.js +2 -1
- package/src/generators/hook/hook.js.map +1 -1
- package/src/generators/init/init.js +4 -3
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/lib/add-rollup-build-target.d.ts +1 -1
- package/src/generators/library/lib/add-rollup-build-target.js +1 -2
- package/src/generators/library/lib/add-rollup-build-target.js.map +1 -1
- package/src/generators/library/lib/update-app-routes.js +2 -1
- package/src/generators/library/lib/update-app-routes.js.map +1 -1
- package/src/generators/library/library.js +3 -6
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/redux/redux.js +3 -2
- package/src/generators/redux/redux.js.map +1 -1
- package/src/generators/remote/lib/update-host-with-remote.js +2 -1
- package/src/generators/remote/lib/update-host-with-remote.js.map +1 -1
- package/src/generators/setup-ssr/setup-ssr.js +2 -1
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/generators/stories/stories.js +2 -1
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.d.ts +1 -1
- package/src/generators/storybook-configuration/configuration.js +2 -3
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/module-federation/ast-utils.js +2 -1
- package/src/module-federation/ast-utils.js.map +1 -1
- package/src/utils/ast-utils.js +15 -14
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/component-props.js +3 -2
- package/src/utils/component-props.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react",
|
|
3
|
-
"version": "15.8.0-beta.
|
|
3
|
+
"version": "15.8.0-beta.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
35
|
-
"@nrwl/js": "15.8.0-beta.
|
|
36
|
-
"@nrwl/linter": "15.8.0-beta.
|
|
37
|
-
"@nrwl/workspace": "15.8.0-beta.
|
|
34
|
+
"@nrwl/devkit": "15.8.0-beta.3",
|
|
35
|
+
"@nrwl/js": "15.8.0-beta.3",
|
|
36
|
+
"@nrwl/linter": "15.8.0-beta.3",
|
|
37
|
+
"@nrwl/workspace": "15.8.0-beta.3",
|
|
38
38
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
39
39
|
"chalk": "^4.1.0",
|
|
40
40
|
"minimatch": "3.0.5"
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"access": "public"
|
|
44
44
|
},
|
|
45
45
|
"types": "./index.d.ts",
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "cbf33c478661e0c4f4795f9986a2357b641cc497"
|
|
47
47
|
}
|
|
@@ -21,7 +21,10 @@ function moduleFederationDevServer(options, context) {
|
|
|
21
21
|
throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nrwl/react:host"?`);
|
|
22
22
|
}
|
|
23
23
|
const remotesToSkip = new Set((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : []);
|
|
24
|
-
const knownRemotes = ((_b = moduleFederationConfig.remotes) !== null && _b !== void 0 ? _b : []).filter((r) =>
|
|
24
|
+
const knownRemotes = ((_b = moduleFederationConfig.remotes) !== null && _b !== void 0 ? _b : []).filter((r) => {
|
|
25
|
+
const validRemote = Array.isArray(r) ? r[0] : r;
|
|
26
|
+
return !remotesToSkip.has(validRemote);
|
|
27
|
+
});
|
|
25
28
|
const devServeApps = !options.devRemotes
|
|
26
29
|
? []
|
|
27
30
|
: Array.isArray(options.devRemotes)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,4FAAuF;AAEvF,+BAA4B;AAC5B,+BAA+B;AAC/B,0EAG+C;AAO/C,SAA+B,yBAAyB,CACtD,OAAyC,EACzC,OAAwB;;;QAExB,IAAI,IAAI,GAAG,IAAA,yBAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEvE,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;QAEF,IAAI,sBAA2B,CAAC;QAChC,IAAI;YACF,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QAAC,WAAM;YACN,kCAAkC;YAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,uDAAuD,CACpG,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,CAAC,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,4FAAuF;AAEvF,+BAA4B;AAC5B,+BAA+B;AAC/B,0EAG+C;AAO/C,SAA+B,yBAAyB,CACtD,OAAyC,EACzC,OAAwB;;;QAExB,IAAI,IAAI,GAAG,IAAA,yBAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEvE,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;QAEF,IAAI,sBAA2B,CAAC;QAChC,IAAI;YACF,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QAAC,WAAM;YACN,kCAAkC;YAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,uDAAuD,CACpG,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,CAAC,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACvE,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,UAAU;YACtC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACnC,CAAC,CAAC,OAAO,CAAC,UAAU;gBACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,GAAG,IAAA,sCAAqB,EAC1B,IAAI,EACJ,sBAAM,IAAA,oBAAW,EACf;gBACE,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;gBACxC,aAAa,EAAE,OAAO,CAAC,iBAAiB;aACzC,EACD;gBACE,KAAK,EAAE,KAAK;aACb,EACD,OAAO,CACR,CAAA,CACF,CAAC;SACH;QAED,IAAI,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,iBAAiB;QAC5D,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,iCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;;YACzC,WAAW,EAAE,CAAC;YACd,IAAI,WAAW,KAAK,CAAC,EAAE;gBACrB,eAAM,CAAC,IAAI,CACT,KAAK,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,IAC/D,MAAA,OAAO,CAAC,IAAI,mCAAI,IAClB,EAAE,CACH,CAAC;aACH;QACH,CAAC,CAAC,CAAA,CAAA,CAAA,EAAC;;CACJ;AAjED,4CAiEC"}
|
|
@@ -62,8 +62,7 @@ function applicationGenerator(host, schema) {
|
|
|
62
62
|
(0, create_application_files_1.createApplicationFiles)(host, options);
|
|
63
63
|
(0, add_project_1.addProject)(host, options);
|
|
64
64
|
if (options.bundler === 'vite') {
|
|
65
|
-
(0, devkit_1.ensurePackage)(
|
|
66
|
-
const { viteConfigurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
65
|
+
const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nrwl/vite', versions_1.nxVersion);
|
|
67
66
|
// We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
|
|
68
67
|
// See: https://vitejs.dev/guide/env-and-mode.html
|
|
69
68
|
if (host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'))) {
|
|
@@ -79,16 +78,14 @@ function applicationGenerator(host, schema) {
|
|
|
79
78
|
tasks.push(viteTask);
|
|
80
79
|
}
|
|
81
80
|
else if (options.bundler === 'webpack') {
|
|
82
|
-
(0, devkit_1.ensurePackage)(
|
|
83
|
-
const { webpackInitGenerator } = yield Promise.resolve().then(() => require('@nrwl/webpack'));
|
|
81
|
+
const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nrwl/webpack', versions_1.nxVersion);
|
|
84
82
|
const webpackInitTask = yield webpackInitGenerator(host, {
|
|
85
83
|
uiFramework: 'react',
|
|
86
84
|
});
|
|
87
85
|
tasks.push(webpackInitTask);
|
|
88
86
|
}
|
|
89
87
|
if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
|
|
90
|
-
(0, devkit_1.ensurePackage)(
|
|
91
|
-
const { vitestGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
88
|
+
const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nrwl/vite', versions_1.nxVersion);
|
|
92
89
|
const vitestTask = yield vitestGenerator(host, {
|
|
93
90
|
uiFramework: 'react',
|
|
94
91
|
coverageProvider: 'c8',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,2CAG0B;AAE1B,6EAAwE;AACxE,iEAA4D;AAC5D,+DAA2D;AAC3D,mDAA+C;AAC/C,mDAA+C;AAC/C,6CAAyC;AACzC,mDAA+C;AAC/C,qDAAiD;AACjD,iFAAkF;AAClF,yCASsB;AACtB,2FAAqF;AACrF,uCAA8C;AAC9C,yCAA4D;AAC5D,wFAAuF;AACvF,mDAI8B;AAC9B,mFAA8E;AAC9E,mEAAmE;AAEnE,SAAe,UAAU,CAAC,IAAU,EAAE,OAAyB;;QAC7D,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;gBAChD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,WAAW;gBAC5B,aAAa,EAAE;oBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;iBAC/D;gBACD,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,kBAAkB,EAAE;oBAClB,IAAA,6BAAc,EACZ,OAAO,CAAC,cAAc,EACtB,iBAAiB,EACjB,OAAO,CAAC,WAAW,CACpB;iBACF;gBACD,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAErB,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAC3D,4BAAqB,CACtB,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;gBAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA4B,EACpD,IAAI,EACJ,8BAAuB,CAAC,YAAY,kCAE/B,8BAAuB,CAAC,eAAe,GACvC,CAAC,OAAO,CAAC,QAAQ,KAAK,KAAK;oBAC5B,CAAC,CAAC,EAAE,WAAW,EAAE,yBAAc,EAAE,YAAY,EAAE,2BAAgB,EAAE;oBACjE,CAAC,CAAC,EAAE,CAAC,EAEV,CAAC;gBACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACzB;SACF;QACD,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAED,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAc;;QAEd,MAAM,KAAK,GAAG,EAAE,CAAC;QAEjB,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAkB,EAAC,IAAI,kCACzC,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,EAC3C,cAAc,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,IAC1C,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,IAAA,sCAAmB,EAAC,IAAI,CAAC,CAAC;SAC3B;QAED,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;YAC9B,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,7 @@ function addCypress(host, options) {
|
|
|
9
9
|
if (options.e2eTestRunner !== 'cypress') {
|
|
10
10
|
return () => { };
|
|
11
11
|
}
|
|
12
|
-
(0, devkit_1.ensurePackage)(
|
|
13
|
-
const { cypressProjectGenerator } = yield Promise.resolve().then(() => require('@nrwl/cypress'));
|
|
12
|
+
const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
|
|
14
13
|
return yield cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { name: options.e2eProjectName, directory: options.directory, project: options.projectName, rootProject: options.rootProject, bundler: options.bundler }));
|
|
15
14
|
});
|
|
16
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,sDAAoD;AAGpD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,
|
|
1
|
+
{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,sDAAoD;AAGpD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAE9E,OAAO,MAAM,uBAAuB,CAAC,IAAI,kCACpC,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,cAAc,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,WAAW,EAAE,OAAO,CAAC,WAAW,EAChC,OAAO,EAAE,OAAO,CAAC,OAAO,IACxB,CAAC;IACL,CAAC;CAAA;AAfD,gCAeC"}
|
|
@@ -6,8 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const versions_1 = require("../../../utils/versions");
|
|
7
7
|
function addJest(host, options) {
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
(0, devkit_1.ensurePackage)(
|
|
10
|
-
const { jestProjectGenerator } = yield Promise.resolve().then(() => require('@nrwl/jest'));
|
|
9
|
+
const { jestProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_1.nxVersion);
|
|
11
10
|
if (options.unitTestRunner !== 'jest') {
|
|
12
11
|
return () => { };
|
|
13
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,OAAO,CAC3B,IAAU,EACV,OAAyB;;QAEzB,
|
|
1
|
+
{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,OAAO,CAC3B,IAAU,EACV,OAAyB;;QAEzB,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,oBAAS,CAAC,CAAC;QAExE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,MAAM,oBAAoB,CAAC,IAAI,kCACjC,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,WAAW,EAAE,OAAO,CAAC,WAAW,IAChC,CAAC;IACL,CAAC;CAAA;AAnBD,0BAmBC"}
|
|
@@ -4,13 +4,14 @@ exports.addRouting = void 0;
|
|
|
4
4
|
const ast_utils_1 = require("../../../utils/ast-utils");
|
|
5
5
|
const versions_1 = require("../../../utils/versions");
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
8
|
let tsModule;
|
|
8
9
|
function addRouting(host, options) {
|
|
9
10
|
if (!options.routing) {
|
|
10
11
|
return () => { };
|
|
11
12
|
}
|
|
12
13
|
if (!tsModule) {
|
|
13
|
-
tsModule =
|
|
14
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
14
15
|
}
|
|
15
16
|
const appPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, maybeJs(options, `src/app/${options.fileName}.tsx`));
|
|
16
17
|
const appFileContent = host.read(appPath, 'utf-8');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-routing.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-routing.ts"],"names":[],"mappings":";;;AAAA,wDAA4D;AAE5D,sDAGiC;AACjC,yCAKsB;
|
|
1
|
+
{"version":3,"file":"add-routing.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-routing.ts"],"names":[],"mappings":";;;AAAA,wDAA4D;AAE5D,sDAGiC;AACjC,yCAKsB;AACtB,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAC/B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,WAAW,OAAO,CAAC,QAAQ,MAAM,CAAC,CACpD,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,QAAQ,CAAC,gBAAgB,CACzC,OAAO,EACP,cAAc,EACd,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,cAAc,EACd,IAAA,4BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC,CACrC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QAC5B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,kBAAkB,EAAE,gCAAqB,EAAE,EAC7C,EAAE,yBAAyB,EAAE,qCAA0B,EAAE,CAC1D,CAAC;KACH;IAED,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC;AAnCD,gCAmCC;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"}
|
|
@@ -10,6 +10,7 @@ const ast_utils_1 = require("../../utils/ast-utils");
|
|
|
10
10
|
const get_in_source_vitest_tests_template_1 = require("../../utils/get-in-source-vitest-tests-template");
|
|
11
11
|
const versions_1 = require("../../utils/versions");
|
|
12
12
|
const get_component_tests_1 = require("./get-component-tests");
|
|
13
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
13
14
|
function componentGenerator(host, schema) {
|
|
14
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
16
|
const options = yield normalizeOptions(host, schema);
|
|
@@ -59,7 +60,7 @@ function createComponentFiles(host, options) {
|
|
|
59
60
|
let tsModule;
|
|
60
61
|
function addExportsToBarrel(host, options) {
|
|
61
62
|
if (!tsModule) {
|
|
62
|
-
tsModule =
|
|
63
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
63
64
|
}
|
|
64
65
|
const workspace = (0, devkit_1.getProjects)(host);
|
|
65
66
|
const isApp = workspace.get(options.project).projectType === 'application';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,2FAAqF;AACrF,iFAAkF;AAClF,qDAAyD;AACzD,qDAAkD;AAClD,yGAAiG;AACjG,mDAG8B;AAC9B,+DAA0D;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.componentCypressSchematic = exports.createComponentSpecFile = exports.ge
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
8
|
let tsModule;
|
|
8
9
|
function componentCypressGenerator(host, schema) {
|
|
9
10
|
createComponentSpecFile(host, schema);
|
|
@@ -12,7 +13,7 @@ exports.componentCypressGenerator = componentCypressGenerator;
|
|
|
12
13
|
// TODO: candidate to refactor with the angular component story
|
|
13
14
|
function getArgsDefaultValue(property) {
|
|
14
15
|
if (!tsModule) {
|
|
15
|
-
tsModule =
|
|
16
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
16
17
|
}
|
|
17
18
|
const typeNameToDefault = {
|
|
18
19
|
[tsModule.SyntaxKind.StringKeyword]: '',
|
|
@@ -33,7 +34,7 @@ function getArgsDefaultValue(property) {
|
|
|
33
34
|
exports.getArgsDefaultValue = getArgsDefaultValue;
|
|
34
35
|
function createComponentSpecFile(tree, { project, componentPath, js, cypressProject }) {
|
|
35
36
|
if (!tsModule) {
|
|
36
|
-
tsModule =
|
|
37
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
37
38
|
}
|
|
38
39
|
const e2eProjectName = cypressProject || `${project}-e2e`;
|
|
39
40
|
const projects = (0, devkit_1.getProjects)(tree);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAAsC;AAEtC,qDAI+B;
|
|
1
|
+
{"version":3,"file":"component-cypress-spec.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-cypress-spec/component-cypress-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,11 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
7
7
|
const component_props_1 = require("../../utils/component-props");
|
|
8
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
9
|
let tsModule;
|
|
9
10
|
function createComponentStoriesFile(host, { project, componentPath }) {
|
|
10
11
|
if (!tsModule) {
|
|
11
|
-
tsModule =
|
|
12
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
13
|
}
|
|
13
14
|
const proj = (0, devkit_1.getProjects)(host).get(project);
|
|
14
15
|
const sourceRoot = proj.sourceRoot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AAEtB,qDAG+B;AAC/B,iEAAsE;
|
|
1
|
+
{"version":3,"file":"component-story.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,11 @@ const path_1 = require("path");
|
|
|
7
7
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
8
8
|
const component_props_1 = require("../../utils/component-props");
|
|
9
9
|
const versions_1 = require("../../utils/versions");
|
|
10
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
10
11
|
let tsModule;
|
|
11
12
|
function componentTestGenerator(tree, options) {
|
|
12
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
-
(0, devkit_1.ensurePackage)(
|
|
14
|
+
(0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
|
|
14
15
|
const { assertMinimumCypressVersion } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/cypress-version'));
|
|
15
16
|
assertMinimumCypressVersion(10);
|
|
16
17
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
@@ -26,7 +27,7 @@ function componentTestGenerator(tree, options) {
|
|
|
26
27
|
exports.componentTestGenerator = componentTestGenerator;
|
|
27
28
|
function generateSpecsForComponents(tree, filePath) {
|
|
28
29
|
if (!tsModule) {
|
|
29
|
-
tsModule =
|
|
30
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
30
31
|
}
|
|
31
32
|
const sourceFile = tsModule.createSourceFile(filePath, tree.read(filePath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
|
|
32
33
|
const cmpNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-test.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,+BAA4D;AAC5D,qDAG+B;AAC/B,iEAAsE;AACtE,mDAAiD;
|
|
1
|
+
{"version":3,"file":"component-test.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,7 @@ const update_configs_1 = require("./lib/update-configs");
|
|
|
13
13
|
*/
|
|
14
14
|
function cypressComponentConfigGenerator(tree, options) {
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
(0, devkit_1.ensurePackage)(
|
|
17
|
-
const { cypressComponentProject } = yield Promise.resolve().then(() => require('@nrwl/cypress'));
|
|
16
|
+
const { cypressComponentProject } = (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
|
|
18
17
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
19
18
|
const installTask = yield cypressComponentProject(tree, {
|
|
20
19
|
project: options.project,
|
package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAiD;AACjD,+CAA2C;AAC3C,yDAAwE;AAGxE;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,
|
|
1
|
+
{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAiD;AACjD,+CAA2C;AAC3C,yDAAwE;AAGxE;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC9E,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAgB,MAAM,IAAA,oCAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpE,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AApBD,0EAoBC;AAED,kBAAe,+BAA+B,CAAC"}
|
|
@@ -6,6 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const versions_1 = require("nx/src/utils/versions");
|
|
7
7
|
const ast_utils_1 = require("../../../utils/ast-utils");
|
|
8
8
|
const component_test_1 = require("../../component-test/component-test");
|
|
9
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
9
10
|
let tsModule;
|
|
10
11
|
const allowedFileExt = new RegExp(/\.[jt]sx?/g);
|
|
11
12
|
const isSpecFile = new RegExp(/(spec|test)\./g);
|
|
@@ -27,7 +28,7 @@ function addFiles(tree, projectConfig, options, found) {
|
|
|
27
28
|
});
|
|
28
29
|
if (options.bundler === 'webpack' ||
|
|
29
30
|
(!options.bundler && actualBundler === 'webpack')) {
|
|
30
|
-
(0, devkit_1.
|
|
31
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/webpack': versions_1.nxVersion });
|
|
31
32
|
}
|
|
32
33
|
if (options.generateTests) {
|
|
33
34
|
const filePaths = [];
|
|
@@ -61,7 +62,7 @@ function getBundler(found, tree) {
|
|
|
61
62
|
}
|
|
62
63
|
function isComponent(tree, filePath) {
|
|
63
64
|
if (!tsModule) {
|
|
64
|
-
tsModule =
|
|
65
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
65
66
|
}
|
|
66
67
|
if (isSpecFile.test(filePath) || !allowedFileExt.test(filePath)) {
|
|
67
68
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
// TODO(jack): Remove inline renderHook function when RTL releases with its own version
|
|
6
6
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
7
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
8
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
9
|
function hookGenerator(host, schema) {
|
|
9
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
11
|
const options = yield normalizeOptions(host, schema);
|
|
@@ -33,7 +34,7 @@ function createFiles(host, options) {
|
|
|
33
34
|
let tsModule;
|
|
34
35
|
function addExportsToBarrel(host, options) {
|
|
35
36
|
if (!tsModule) {
|
|
36
|
-
tsModule =
|
|
37
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
37
38
|
}
|
|
38
39
|
const workspace = (0, devkit_1.getProjects)(host);
|
|
39
40
|
const isApp = workspace.get(options.project).projectType === 'application';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/hook/hook.ts"],"names":[],"mappings":";;;;AAAA,uFAAuF;AACvF,yCAWsB;AAGtB,qDAAkD;
|
|
1
|
+
{"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/hook/hook.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,13 +49,14 @@ function initRootBabelConfig(tree, schema) {
|
|
|
49
49
|
}
|
|
50
50
|
function reactInitGenerator(host, schema) {
|
|
51
51
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
52
|
-
yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, schema), { tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: schema.js, skipFormat: true }));
|
|
53
52
|
const tasks = [];
|
|
53
|
+
const jsInitTask = yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, schema), { tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', skipFormat: true }));
|
|
54
|
+
tasks.push(jsInitTask);
|
|
54
55
|
setDefault(host);
|
|
55
56
|
if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
|
|
56
|
-
(0, devkit_1.ensurePackage)(
|
|
57
|
+
(0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
|
|
57
58
|
const { cypressInitGenerator } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/generators/init/init'));
|
|
58
|
-
const cypressTask = cypressInitGenerator(host, {});
|
|
59
|
+
const cypressTask = yield cypressInitGenerator(host, {});
|
|
59
60
|
tasks.push(cypressTask);
|
|
60
61
|
}
|
|
61
62
|
if (!schema.skipPackageJson && !schema.skipBabelConfig) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,2FAAqF;AACrF,iCAA4D;AAC5D,mDAW8B;AAG9B,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,SAAS,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEnC,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,MAAM,eAAe,GAAG,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,UAAU,mCACX,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,eAAe,KAClB,WAAW,kCACN,eAAe,CAAC,WAAW,KAC9B,KAAK,EAAE,IAAI,SAGhB,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,kCAAO,SAAS,KAAE,UAAU,IAAG,CAAC;AACnD,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,MAAkB;IACxD,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;KAC7B,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;QAC1B,YAAY,CAAC,OAAO,CAAC,GAAG,uBAAY,CAAC;KACtC;IAED,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE;QACtD,aAAa,EAAE,oBAAS;QACxB,aAAa,EAAE,2BAAgB;QAC/B,cAAc,EAAE,4BAAiB;QACjC,kBAAkB,EAAE,+BAAoB;QACxC,wBAAwB,EAAE,qCAA0B;QACpD,qBAAqB,EAAE,mCAAwB;KAChD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,MAAkB;;IACzD,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;QACxE,OAAO;KACR;IAED,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;QAC3B,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE;YACpC,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,uEAAuE;SAC7F,CAAC,CAAC;KACJ;IAED,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,MAAA,MAAM,CAAC,WAAW,0CAAE,aAAa,EAAE;QACrC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;KAC5E;IACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAkB;;QACrE,MAAM,IAAA,kBAAe,EAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,2FAAqF;AACrF,iCAA4D;AAC5D,mDAW8B;AAG9B,SAAS,UAAU,CAAC,IAAU;IAC5B,MAAM,SAAS,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEnC,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,MAAM,eAAe,GAAG,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAClE,MAAM,UAAU,mCACX,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,eAAe,KAClB,WAAW,kCACN,eAAe,CAAC,WAAW,KAC9B,KAAK,EAAE,IAAI,SAGhB,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,kCAAO,SAAS,KAAE,UAAU,IAAG,CAAC;AACnD,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,MAAkB;IACxD,IAAA,0CAAiC,EAAC,IAAI,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;KAC7B,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;QAC1B,YAAY,CAAC,OAAO,CAAC,GAAG,uBAAY,CAAC;KACtC;IAED,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE;QACtD,aAAa,EAAE,oBAAS;QACxB,aAAa,EAAE,2BAAgB;QAC/B,cAAc,EAAE,4BAAiB;QACjC,kBAAkB,EAAE,+BAAoB;QACxC,wBAAwB,EAAE,qCAA0B;QACpD,qBAAqB,EAAE,mCAAwB;KAChD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,MAAkB;;IACzD,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;QACxE,OAAO;KACR;IAED,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;QAC3B,IAAA,kBAAS,EAAC,IAAI,EAAE,oBAAoB,EAAE;YACpC,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,uEAAuE;SAC7F,CAAC,CAAC;KACJ;IAED,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,MAAA,MAAM,CAAC,WAAW,0CAAE,aAAa,EAAE;QACrC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;KAC5E;IACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAsB,kBAAkB,CAAC,IAAU,EAAE,MAAkB;;QACrE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACxC,MAAM,KACT,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,EACzE,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,UAAU,CAAC,IAAI,CAAC,CAAC;QAEjB,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;YAC1C,MAAM,EAAE,oBAAoB,EAAE,GAAG,2CAC/B,wCAAwC,EACzC,CAAC;YACF,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YACtD,MAAM,gBAAgB,GAAG,IAAA,qCAA4B,EACnD,IAAI,EACJ,EAAE,EACF;gBACE,qBAAqB,EAAE,kCAAuB;aAC/C,CACF,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC9B;QAED,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACrD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA3CD,gDA2CC;AAED,kBAAe,kBAAkB,CAAC;AAErB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Tree } from 'nx/src/generators/tree';
|
|
2
2
|
import { NormalizedSchema } from '../schema';
|
|
3
|
-
export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema): Promise<
|
|
3
|
+
export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema): Promise<any>;
|
|
@@ -8,8 +8,7 @@ const versions_1 = require("../../../utils/versions");
|
|
|
8
8
|
function addRollupBuildTarget(host, options) {
|
|
9
9
|
var _a;
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
-
(0, devkit_1.ensurePackage)(
|
|
12
|
-
const { rollupInitGenerator } = yield Promise.resolve().then(() => require('@nrwl/rollup'));
|
|
11
|
+
const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nrwl/rollup', versions_1.nxVersion);
|
|
13
12
|
// These are used in `@nrwl/react/plugins/bundle-rollup`
|
|
14
13
|
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
15
14
|
'@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-rollup-build-target.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/add-rollup-build-target.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AAEtB,yCAAqC;AAErC,sDAIiC;AAEjC,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAyB;;;QAEzB,
|
|
1
|
+
{"version":3,"file":"add-rollup-build-target.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/add-rollup-build-target.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AAEtB,yCAAqC;AAErC,sDAIiC;AAEjC,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAyB;;;QAEzB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,sBAAa,EAAC,cAAc,EAAE,oBAAS,CAAC,CAAC;QAEzE,wDAAwD;QACxD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,oBAAoB,EAAE,iCAAsB;YAC5C,cAAc,EAAE,4BAAiB;SAClC,CACF,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEjE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,EAAE;YACvC,QAAQ,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;SAC7C;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SACpC;QAED,OAAO,CAAC,KAAK,GAAG;YACd,QAAQ,EAAE,qBAAqB;YAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EACR,OAAO,KAAK,GAAG;oBACb,CAAC,CAAC,QAAQ,OAAO,IAAI,OAAO,CAAC,gBAAgB,EAAE;oBAC/C,CAAC,CAAC,QAAQ,OAAO,CAAC,gBAAgB,EAAE;gBACxC,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACpD,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;gBAC9C,SAAS,EAAE,IAAA,kBAAO,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC;gBAClE,QAAQ;gBACR,YAAY,EAAE,mCAAmC;gBACjD,QAAQ,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO;gBACrC,MAAM,EAAE;oBACN;wBACE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,YAAY;wBACxC,KAAK,EAAE,GAAG;wBACV,MAAM,EAAE,GAAG;qBACZ;iBACF;aACF;SACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC7C,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;YACzD,WAAW,EAAE,SAAS;YACtB,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;;CAC3C;AA5DD,oDA4DC"}
|
|
@@ -7,6 +7,7 @@ const ast_utils_1 = require("../../../utils/ast-utils");
|
|
|
7
7
|
const ast_utils_2 = require("../../../utils/ast-utils");
|
|
8
8
|
const maybe_js_1 = require("./maybe-js");
|
|
9
9
|
const versions_1 = require("../../../utils/versions");
|
|
10
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
10
11
|
let tsModule;
|
|
11
12
|
function updateAppRoutes(host, options) {
|
|
12
13
|
if (!options.appMain || !options.appSourceRoot) {
|
|
@@ -53,7 +54,7 @@ function readComponent(host, path) {
|
|
|
53
54
|
throw new Error(`Cannot find ${path}`);
|
|
54
55
|
}
|
|
55
56
|
if (!tsModule) {
|
|
56
|
-
tsModule =
|
|
57
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
57
58
|
}
|
|
58
59
|
const content = host.read(path, 'utf-8');
|
|
59
60
|
const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/update-app-routes.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,4CAAqE;AAIrE,wDAIkC;AAClC,wDAA4D;AAC5D,yCAAqC;AACrC,sDAGiC;
|
|
1
|
+
{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/update-app-routes.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,4CAAqE;AAIrE,wDAIkC;AAClC,wDAA4D;AAC5D,yCAAqC;AACrC,sDAGiC;AACjC,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAyB;IACnE,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC9C,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,IAAA,mCAAuB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEnE,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,OAAO,6DAA6D,CAChH,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,IAAA,wBAAiB,EACxC,OAAO,CAAC,aAAa,EACrB,IAAA,kBAAO,EAAC,OAAO,EAAE,GAAG,mBAAmB,MAAM,CAAC,CAC/C,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,qCAA4B,EAC7C,IAAI,EACJ,EAAE,kBAAkB,EAAE,gCAAqB,EAAE,EAC7C,EAAE,yBAAyB,EAAE,qCAA0B,EAAE,CAC1D,CAAC;IAEF,yBAAyB;IACzB,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC1D,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,OAAO,EACP,IAAA,4BAAgB,EAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAC1C,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACtC;IAED,sBAAsB;IACtB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC5E,IAAI,CAAC,wBAAwB,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,4BAAgB,EAAC,gBAAgB,EAAE,eAAe,CAAC,CACpD,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;SACvC;KACF;IAED,iBAAiB;IACjB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,oBAAQ,EAAC,gBAAgB,EAAE,eAAe,EAAE;YAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,aAAa,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS;YAC5C,UAAU,EAAE,IAAA,oBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC;SAC9D,CAAC,CACH,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;KACvC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAnED,0CAmEC;AAED,SAAS,aAAa,CACpB,IAAU,EACV,IAAY;IAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;KACxC;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzC,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,IAAI,EACJ,OAAO,EACP,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC"}
|
|
@@ -41,8 +41,7 @@ function libraryGenerator(host, schema) {
|
|
|
41
41
|
(0, create_files_1.createFiles)(host, options);
|
|
42
42
|
// Set up build target
|
|
43
43
|
if (options.buildable && options.bundler === 'vite') {
|
|
44
|
-
(0, devkit_1.ensurePackage)(
|
|
45
|
-
const { viteConfigurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
44
|
+
const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nrwl/vite', versions_1.nxVersion);
|
|
46
45
|
const viteTask = yield viteConfigurationGenerator(host, {
|
|
47
46
|
uiFramework: 'react',
|
|
48
47
|
project: options.name,
|
|
@@ -59,8 +58,7 @@ function libraryGenerator(host, schema) {
|
|
|
59
58
|
}
|
|
60
59
|
// Set up test target
|
|
61
60
|
if (options.unitTestRunner === 'jest') {
|
|
62
|
-
(0, devkit_1.ensurePackage)(
|
|
63
|
-
const { jestProjectGenerator } = yield Promise.resolve().then(() => require('@nrwl/jest'));
|
|
61
|
+
const { jestProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_1.nxVersion);
|
|
64
62
|
const jestTask = yield jestProjectGenerator(host, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, skipSerializers: true, compiler: options.compiler }));
|
|
65
63
|
tasks.push(jestTask);
|
|
66
64
|
const jestConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? 'jest.config.js' : 'jest.config.ts');
|
|
@@ -72,8 +70,7 @@ function libraryGenerator(host, schema) {
|
|
|
72
70
|
else if (options.unitTestRunner === 'vitest' &&
|
|
73
71
|
options.bundler !== 'vite' // tests are already configured if bundler is vite
|
|
74
72
|
) {
|
|
75
|
-
(0, devkit_1.ensurePackage)(
|
|
76
|
-
const { vitestGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
73
|
+
const { vitestGenerator } = (0, devkit_1.ensurePackage)('@nrwl/vite', versions_1.nxVersion);
|
|
77
74
|
const vitestTask = yield vitestGenerator(host, {
|
|
78
75
|
uiFramework: 'react',
|
|
79
76
|
project: options.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,2FAAqF;AACrF,iCAA8C;AAE9C,mDAAiD;AACjD,sDAAwD;AACxD,uCAAyC;AAEzC,uDAAiE;AACjE,+DAA2D;AAC3D,2EAAqE;AACrE,mDAA+C;AAC/C,+DAA0D;AAC1D,qDAAiD;AACjD,mEAAmE;AACnE,mFAA8E;AAC9E,qDAAiD;AAEjD,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAc;;QAC/D,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACtB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;SACxB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAa,EAAC,IAAI,kCACpC,OAAO,KACV,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,EAC3C,cAAc,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,IAC1C,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1C,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;YACzD,WAAW,EAAE,SAAS;YACtB,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,sBAAsB;QACtB,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;YACnD,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const ast_utils_1 = require("../../utils/ast-utils");
|
|
|
7
7
|
const versions_1 = require("../../utils/versions");
|
|
8
8
|
const devkit_1 = require("@nrwl/devkit");
|
|
9
9
|
const js_1 = require("@nrwl/js");
|
|
10
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
10
11
|
let tsModule;
|
|
11
12
|
function reduxGenerator(host, schema) {
|
|
12
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -35,7 +36,7 @@ function addReduxPackageDependencies(host) {
|
|
|
35
36
|
}
|
|
36
37
|
function addExportsToBarrel(host, options) {
|
|
37
38
|
if (!tsModule) {
|
|
38
|
-
tsModule =
|
|
39
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
39
40
|
}
|
|
40
41
|
const indexFilePath = path.join(options.projectSourcePath, options.js ? 'index.js' : 'index.ts');
|
|
41
42
|
const indexSource = host.read(indexFilePath, 'utf-8');
|
|
@@ -61,7 +62,7 @@ function addStoreConfiguration(host, options) {
|
|
|
61
62
|
}
|
|
62
63
|
function updateReducerConfiguration(host, options) {
|
|
63
64
|
if (!tsModule) {
|
|
64
|
-
tsModule =
|
|
65
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
65
66
|
}
|
|
66
67
|
if (!options.appProjectSourcePath) {
|
|
67
68
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redux.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAC7B,qDAI+B;AAC/B,mDAAgF;AAEhF,yCAYsB;AACtB,iCAAqD;
|
|
1
|
+
{"version":3,"file":"redux.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAC7B,qDAI+B;AAC/B,mDAAgF;AAEhF,yCAYsB;AACtB,iCAAqD;AACrD,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAsB,cAAc,CAAC,IAAU,EAAE,MAAc;;QAC7D,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,WAAW,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACtD,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAXD,wCAWC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EACvC,OAAO,CAAC,SAAS,kCAEZ,OAAO,KACV,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAU;IAC7C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,kBAAkB,EAAE,gCAAqB;QACzC,aAAa,EAAE,4BAAiB;KACjC,EACD,EAAE,CACH,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAC7B,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CACrC,CAAC;IAEF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACtD,IAAI,WAAW,KAAK,IAAI,EAAE;QACxB,MAAM,eAAe,GAAG,QAAQ,CAAC,gBAAgB,CAC/C,aAAa,EACb,WAAW,EACX,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS;YACjC,CAAC,CAAC,SAAS,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,QAAQ,EAAE;YAClD,CAAC,CAAC,SAAS,OAAO,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,WAAW,EACX,IAAA,qBAAS,EAAC,eAAe,EAAE,kBAAkB,SAAS,UAAU,CAAC,CAClE,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;KACpC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAU,EAAE,OAAyB;IAClE,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;QACjC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAC9C,OAAO,CAAC,eAAe,EACvB,UAAU,EACV,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,UAAU,EACV,IAAA,+BAAmB,EAAC,OAAO,CAAC,eAAe,EAAE,cAAc,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;KAC9C;AACH,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAU,EAAE,OAAyB;IACvE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE;QACjC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAC9C,OAAO,CAAC,eAAe,EACvB,UAAU,EACV,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IACF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,UAAU,EACV,IAAA,4BAAgB,EAAC,OAAO,CAAC,eAAe,EAAE,cAAc,EAAE;QACxD,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,cAAc;QAC9C,WAAW,EAAE,GAAG,OAAO,CAAC,YAAY,SAAS;QAC7C,UAAU,EAAE,GAAG,OAAO,CAAC,iBAAiB,EAAE;KAC3C,CAAC,CACH,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;;IACnD,IAAI,oBAA4B,CAAC;IACjC,IAAI,eAAuB,CAAC;IAC5B,MAAM,UAAU,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAE5C,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,IAAA,8BAAyB,EAAC,IAAI,CAAC,CAAC,CAAC;IACrE,MAAM,OAAO,GAAmC,YAAY,CAAC,eAAe;QAC1E,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE;QAC1C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GACd,WAAW,KAAK,aAAa;QAC3B,CAAC,CAAC,OAAO,CAAC,SAAS;YACjB,CAAC,CAAC,SAAS,OAAO,CAAC,SAAS,IAAI,UAAU,CAAC,QAAQ,QAAQ;YAC3D,CAAC,CAAC,SAAS,UAAU,CAAC,QAAQ,QAAQ;QACxC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9B,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAC/C,CAAC;IAER,+DAA+D;IAC/D,kDAAkD;IAClD,OAAO,CAAC,UAAU;QAChB,OAAO,CAAC,UAAU;YAClB,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAChE,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,WAAW,KAAK,aAAa,EAAE;YAC3C,MAAM,IAAI,KAAK,CACb,YAAY,OAAO,CAAC,UAAU,iCAAiC,SAAS,CAAC,WAAW,EAAE,CACvF,CAAC;SACH;QACD,oBAAoB,GAAG,SAAS,CAAC,UAAU,CAAC;QAC5C,eAAe,GAAG,IAAI,CAAC,IAAI,CACzB,oBAAoB,EACpB,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CACpC,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CACb,kBAAkB,eAAe,6BAA6B,CAC/D,CAAC;SACH;KACF;IACD,qDACK,OAAO,GACP,UAAU,KACb,YAAY,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,WAAW,EAAE,EAC5D,SAAS,EAAE,IAAA,cAAK,EAAC,MAAA,OAAO,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,QAAQ,EAClD,WAAW,EACX,iBAAiB,EAAE,UAAU,EAC7B,iBAAiB,EAAE,UAAU,EAC7B,oBAAoB;QACpB,eAAe,EACf,SAAS,EAAE,IAAA,0BAAiB,EAC1B,UAAU,EACV,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,IACD;AACJ,CAAC;AAED,kBAAe,cAAc,CAAC;AACjB,QAAA,cAAc,GAAG,IAAA,2BAAkB,EAAC,cAAc,CAAC,CAAC"}
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateHostWithRemote = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ast_utils_1 = require("../../../module-federation/ast-utils");
|
|
6
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
7
|
let tsModule;
|
|
7
8
|
function updateHostWithRemote(host, hostName, remoteName) {
|
|
8
9
|
if (!tsModule) {
|
|
9
|
-
tsModule =
|
|
10
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
10
11
|
}
|
|
11
12
|
const hostConfig = (0, devkit_1.readProjectConfiguration)(host, hostName);
|
|
12
13
|
const moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(hostConfig.root, 'module-federation.config.js');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-host-with-remote.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/remote/lib/update-host-with-remote.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,oEAI8C;
|
|
1
|
+
{"version":3,"file":"update-host-with-remote.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/remote/lib/update-host-with-remote.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,11 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const init_1 = require("../init/init");
|
|
7
7
|
const versions_1 = require("../../utils/versions");
|
|
8
8
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
9
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
9
10
|
let tsModule;
|
|
10
11
|
function readEntryFile(host, path) {
|
|
11
12
|
if (!tsModule) {
|
|
12
|
-
tsModule =
|
|
13
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
13
14
|
}
|
|
14
15
|
const content = host.read(path, 'utf-8');
|
|
15
16
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAYsB;AACtB,uCAAyC;AAGzC,mDAM8B;AAC9B,qDAAwD;
|
|
1
|
+
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const ast_utils_1 = require("../../utils/ast-utils");
|
|
|
8
8
|
const devkit_1 = require("@nrwl/devkit");
|
|
9
9
|
const path_1 = require("path");
|
|
10
10
|
const minimatch = require("minimatch");
|
|
11
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
11
12
|
let tsModule;
|
|
12
13
|
function projectRootPath(tree, config) {
|
|
13
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -35,7 +36,7 @@ exports.projectRootPath = projectRootPath;
|
|
|
35
36
|
function containsComponentDeclaration(tree, componentPath) {
|
|
36
37
|
var _a;
|
|
37
38
|
if (!tsModule) {
|
|
38
|
-
tsModule =
|
|
39
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
39
40
|
}
|
|
40
41
|
const contents = tree.read(componentPath, 'utf-8');
|
|
41
42
|
if (contents === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":";;;;AAAA,wEAAyE;AACzE,6FAA6F;AAC7F,qDAG+B;AAC/B,yCAQsB;AACtB,+BAAsC;AACtC,uCAAwC;
|
|
1
|
+
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { StorybookConfigureSchema } from './schema';
|
|
2
2
|
import { Tree } from '@nrwl/devkit';
|
|
3
|
-
export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<
|
|
3
|
+
export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<any>;
|
|
4
4
|
export default storybookConfigurationGenerator;
|
|
5
5
|
export declare const storybookConfigurationSchematic: (generatorOptions: StorybookConfigureSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -7,7 +7,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
const versions_1 = require("../../utils/versions");
|
|
8
8
|
function generateStories(host, schema) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
-
(0, devkit_1.ensurePackage)(
|
|
10
|
+
(0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
|
|
11
11
|
const { getE2eProjectName } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/project-name'));
|
|
12
12
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
13
13
|
const cypressProject = getE2eProjectName(schema.name, projectConfig.root, schema.cypressDirectory);
|
|
@@ -23,8 +23,7 @@ function generateStories(host, schema) {
|
|
|
23
23
|
function storybookConfigurationGenerator(host, schema) {
|
|
24
24
|
var _a, _b;
|
|
25
25
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
(0, devkit_1.ensurePackage)(
|
|
27
|
-
const { configurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/storybook'));
|
|
26
|
+
const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nrwl/storybook', versions_1.nxVersion);
|
|
28
27
|
let bundler = (_a = schema.bundler) !== null && _a !== void 0 ? _a : 'webpack';
|
|
29
28
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
30
29
|
if (projectConfig.projectType === 'application' &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAMsB;AACtB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAMsB;AACtB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC1C,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,sCAAsC,EACvC,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,iBAAiB,CACtC,MAAM,CAAC,IAAI,EACX,aAAa,CAAC,IAAI,EAClB,MAAM,CAAC,gBAAgB,CACxB,CAAC;QACF,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,oBAAoB,EAClB,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,oBAAoB;YACxD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc;YACd,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QAEF,IAAI,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAElE,IACE,aAAa,CAAC,WAAW,KAAK,aAAa;YAC3C,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,kBAAkB,EAC/D;YACA,OAAO,GAAG,MAAM,CAAC;YACjB,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,EAAE;gBAC7B,eAAM,CAAC,IAAI,CACT,eAAe,MAAM,CAAC,IAAI;wDACsB,CACjD,CAAC;aACH;SACF;QAED,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,kBAAkB;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,OAAO;YACP,2BAA2B,EAAE,MAAM,CAAC,2BAA2B;YAC/D,qBAAqB,EACnB,OAAO,KAAK,MAAM;gBAChB,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,2BAA2B;SAClC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;;CACpB;AAhDD,0EAgDC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
|
|
@@ -4,10 +4,11 @@ exports.addRemoteRoute = exports.addRemoteDefinition = exports.addRemoteToConfig
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
6
6
|
const ast_utils_1 = require("../utils/ast-utils");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
8
|
let tsModule;
|
|
8
9
|
function addRemoteToConfig(source, app) {
|
|
9
10
|
if (!tsModule) {
|
|
10
|
-
tsModule =
|
|
11
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
11
12
|
}
|
|
12
13
|
const assignments = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.PropertyAssignment);
|
|
13
14
|
const remotesAssignment = assignments.find((s) => s.name.getText() === 'remotes');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,wDAAoD;AACpD,kDAI4B;
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/ast-utils.js
CHANGED
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getComponentPropsInterface = exports.getComponentNode = exports.updateReduxStore = exports.addReduxStoreToMain = exports.addStaticRouter = exports.addBrowserRouter = exports.addRoute = exports.addInitialRoutes = exports.isTag = exports.findClosestOpening = exports.findElements = exports.findComponentImportPath = exports.findDefaultClassOrFunction = exports.findDefaultExportIdentifier = exports.findExportDeclarationsForJsx = exports.findDefaultExportDeclaration = exports.findDefaultExport = exports.findMainRenderStatement = exports.addImport = void 0;
|
|
4
4
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
7
|
let tsModule;
|
|
7
8
|
function addImport(source, statement) {
|
|
8
9
|
if (!tsModule) {
|
|
9
|
-
tsModule =
|
|
10
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
10
11
|
}
|
|
11
12
|
const allImports = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration);
|
|
12
13
|
if (allImports.length > 0) {
|
|
@@ -32,7 +33,7 @@ function addImport(source, statement) {
|
|
|
32
33
|
exports.addImport = addImport;
|
|
33
34
|
function findMainRenderStatement(source) {
|
|
34
35
|
if (!tsModule) {
|
|
35
|
-
tsModule =
|
|
36
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
36
37
|
}
|
|
37
38
|
// 1. Try to find ReactDOM.render.
|
|
38
39
|
const calls = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression);
|
|
@@ -72,7 +73,7 @@ function findDefaultExport(source) {
|
|
|
72
73
|
exports.findDefaultExport = findDefaultExport;
|
|
73
74
|
function findDefaultExportDeclaration(source) {
|
|
74
75
|
if (!tsModule) {
|
|
75
|
-
tsModule =
|
|
76
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
76
77
|
}
|
|
77
78
|
const identifier = findDefaultExportIdentifier(source);
|
|
78
79
|
if (identifier) {
|
|
@@ -92,7 +93,7 @@ function findDefaultExportDeclaration(source) {
|
|
|
92
93
|
exports.findDefaultExportDeclaration = findDefaultExportDeclaration;
|
|
93
94
|
function findExportDeclarationsForJsx(source) {
|
|
94
95
|
if (!tsModule) {
|
|
95
|
-
tsModule =
|
|
96
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
96
97
|
}
|
|
97
98
|
const variables = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
|
|
98
99
|
const variableStatements = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.VariableStatement);
|
|
@@ -145,7 +146,7 @@ function findExportDeclarationsForJsx(source) {
|
|
|
145
146
|
exports.findExportDeclarationsForJsx = findExportDeclarationsForJsx;
|
|
146
147
|
function findDefaultExportIdentifier(source) {
|
|
147
148
|
if (!tsModule) {
|
|
148
|
-
tsModule =
|
|
149
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
149
150
|
}
|
|
150
151
|
const exports = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ExportAssignment);
|
|
151
152
|
const identifier = exports
|
|
@@ -156,7 +157,7 @@ function findDefaultExportIdentifier(source) {
|
|
|
156
157
|
exports.findDefaultExportIdentifier = findDefaultExportIdentifier;
|
|
157
158
|
function findDefaultClassOrFunction(source) {
|
|
158
159
|
if (!tsModule) {
|
|
159
|
-
tsModule =
|
|
160
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
160
161
|
}
|
|
161
162
|
const fns = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.FunctionDeclaration);
|
|
162
163
|
const cls = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ClassDeclaration);
|
|
@@ -167,7 +168,7 @@ function findDefaultClassOrFunction(source) {
|
|
|
167
168
|
exports.findDefaultClassOrFunction = findDefaultClassOrFunction;
|
|
168
169
|
function hasDefaultExportModifier(x) {
|
|
169
170
|
if (!tsModule) {
|
|
170
|
-
tsModule =
|
|
171
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
171
172
|
}
|
|
172
173
|
return (x.modifiers &&
|
|
173
174
|
x.modifiers.some((m) => m.kind === tsModule.SyntaxKind.ExportKeyword) &&
|
|
@@ -175,7 +176,7 @@ function hasDefaultExportModifier(x) {
|
|
|
175
176
|
}
|
|
176
177
|
function findComponentImportPath(componentName, source) {
|
|
177
178
|
if (!tsModule) {
|
|
178
|
-
tsModule =
|
|
179
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
179
180
|
}
|
|
180
181
|
const allImports = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration);
|
|
181
182
|
const matching = allImports.filter((i) => {
|
|
@@ -192,7 +193,7 @@ function findComponentImportPath(componentName, source) {
|
|
|
192
193
|
exports.findComponentImportPath = findComponentImportPath;
|
|
193
194
|
function findElements(source, tagName) {
|
|
194
195
|
if (!tsModule) {
|
|
195
|
-
tsModule =
|
|
196
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
196
197
|
}
|
|
197
198
|
const nodes = (0, typescript_1.findNodes)(source, [
|
|
198
199
|
tsModule.SyntaxKind.JsxSelfClosingElement,
|
|
@@ -215,7 +216,7 @@ function findClosestOpening(tagName, node) {
|
|
|
215
216
|
exports.findClosestOpening = findClosestOpening;
|
|
216
217
|
function isTag(tagName, node) {
|
|
217
218
|
if (!tsModule) {
|
|
218
|
-
tsModule =
|
|
219
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
219
220
|
}
|
|
220
221
|
if (tsModule.isJsxOpeningLikeElement(node)) {
|
|
221
222
|
return (node.tagName.kind === tsModule.SyntaxKind.Identifier &&
|
|
@@ -230,7 +231,7 @@ function isTag(tagName, node) {
|
|
|
230
231
|
exports.isTag = isTag;
|
|
231
232
|
function addInitialRoutes(sourcePath, source) {
|
|
232
233
|
if (!tsModule) {
|
|
233
|
-
tsModule =
|
|
234
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
234
235
|
}
|
|
235
236
|
const jsxClosingElements = (0, typescript_1.findNodes)(source, [
|
|
236
237
|
tsModule.SyntaxKind.JsxClosingElement,
|
|
@@ -404,7 +405,7 @@ const store = configureStore({
|
|
|
404
405
|
exports.addReduxStoreToMain = addReduxStoreToMain;
|
|
405
406
|
function updateReduxStore(sourcePath, source, feature) {
|
|
406
407
|
if (!tsModule) {
|
|
407
|
-
tsModule =
|
|
408
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
408
409
|
}
|
|
409
410
|
const calls = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression);
|
|
410
411
|
let reducerDescriptor;
|
|
@@ -459,7 +460,7 @@ function updateReduxStore(sourcePath, source, feature) {
|
|
|
459
460
|
exports.updateReduxStore = updateReduxStore;
|
|
460
461
|
function getComponentNode(sourceFile) {
|
|
461
462
|
if (!tsModule) {
|
|
462
|
-
tsModule =
|
|
463
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
463
464
|
}
|
|
464
465
|
const defaultExport = findDefaultExport(sourceFile);
|
|
465
466
|
if (!(defaultExport &&
|
|
@@ -474,7 +475,7 @@ exports.getComponentNode = getComponentNode;
|
|
|
474
475
|
function getComponentPropsInterface(sourceFile, cmpDeclaration) {
|
|
475
476
|
var _a, _b, _c, _d;
|
|
476
477
|
if (!tsModule) {
|
|
477
|
-
tsModule =
|
|
478
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
478
479
|
}
|
|
479
480
|
let propsTypeName = null;
|
|
480
481
|
if (tsModule.isFunctionDeclaration(cmpDeclaration)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getImportForType = exports.getDefaultsForComponent = exports.getArgsDefaultValue = void 0;
|
|
4
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
4
5
|
const ast_utils_1 = require("./ast-utils");
|
|
5
6
|
let tsModule;
|
|
6
7
|
// TODO: candidate to refactor with the angular component story
|
|
7
8
|
function getArgsDefaultValue(property) {
|
|
8
9
|
if (!tsModule) {
|
|
9
|
-
tsModule =
|
|
10
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
10
11
|
}
|
|
11
12
|
const typeNameToDefault = {
|
|
12
13
|
[tsModule.SyntaxKind.StringKeyword]: "''",
|
|
@@ -24,7 +25,7 @@ function getArgsDefaultValue(property) {
|
|
|
24
25
|
exports.getArgsDefaultValue = getArgsDefaultValue;
|
|
25
26
|
function getDefaultsForComponent(sourceFile, cmpDeclaration) {
|
|
26
27
|
if (!tsModule) {
|
|
27
|
-
tsModule =
|
|
28
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
28
29
|
}
|
|
29
30
|
const propsInterface = (0, ast_utils_1.getComponentPropsInterface)(sourceFile, cmpDeclaration);
|
|
30
31
|
let propsTypeName = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-props.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/component-props.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"component-props.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/component-props.ts"],"names":[],"mappings":";;;AAAA,uFAAmF;AAEnF,2CAAyD;AAEzD,IAAI,QAAqC,CAAC;AAE1C,+DAA+D;AAC/D,SAAgB,mBAAmB,CAAC,QAAuB;IACzD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,iBAAiB,GAAwB;QAC7C,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,IAAI;QACzC,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QACtC,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK;KAC5C,CAAC;IAEF,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAClD,IAAI,OAAO,aAAa,KAAK,SAAS,EAAE;QACtC,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,aAAa,CAAC;KACtB;AACH,CAAC;AAhBD,kDAgBC;AAED,SAAgB,uBAAuB,CACrC,UAAyB,EACzB,cAAuB;IAEvB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,cAAc,GAAG,IAAA,sCAA0B,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAE9E,IAAI,aAAa,GAAW,IAAI,CAAC;IACjC,IAAI,KAAK,GAGH,EAAE,CAAC;IACT,IAAI,QAAQ,GAIN,EAAE,CAAC;IAET,IAAI,cAAc,EAAE;QAClB,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;QACzC,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAA4B,EAAE,EAAE;YAClE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE;gBACzD,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAG,MAAM,CAAC,IAAsB,CAAC,IAAI;oBACzC,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,GAAI,MAAM,CAAC,IAAsB,CAAC,IAAI,YAAY;iBAC/D,CAAC,CAAC;aACJ;iBAAM;gBACL,OAAO;oBACL,IAAI,EAAG,MAAM,CAAC,IAAsB,CAAC,IAAI;oBACzC,YAAY,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iBACpD,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC;KAChE;IACD,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AAC5C,CAAC;AAvCD,0DAuCC;AAED,SAAgB,gBAAgB,CAAC,UAAyB,EAAE,QAAgB;IAC1E,OAAO,UAAU,CAAC,UAAU,CAAC,IAAI,CAC/B,CAAC,SAAkB,EAAE,EAAE,CACrB,QAAQ,CAAC,mBAAmB,CAAC,SAAS,CAAC;QACvC,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACzC,CAAC;AACJ,CAAC;AAND,4CAMC"}
|