@nrwl/react 15.7.1 → 15.8.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 +6 -5
- package/src/generators/application/application.js +3 -3
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/add-cypress.js +1 -1
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/add-jest.d.ts +2 -2
- package/src/generators/application/lib/add-jest.js +1 -1
- package/src/generators/application/lib/add-jest.js.map +1 -1
- package/src/generators/application/lib/add-routing.js +5 -2
- package/src/generators/application/lib/add-routing.js.map +1 -1
- package/src/generators/application/lib/create-application-files.d.ts +1 -1
- package/src/generators/application/lib/create-application-files.js +2 -2
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/component/component.js +5 -2
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/files/__fileName__.tsx__tmpl__ +1 -1
- package/src/generators/component-cypress-spec/component-cypress-spec.d.ts +1 -1
- package/src/generators/component-cypress-spec/component-cypress-spec.js +11 -5
- package/src/generators/component-cypress-spec/component-cypress-spec.js.map +1 -1
- package/src/generators/component-story/component-story.d.ts +1 -1
- package/src/generators/component-story/component-story.js +5 -2
- package/src/generators/component-story/component-story.js.map +1 -1
- package/src/generators/component-test/component-test.js +6 -3
- package/src/generators/component-test/component-test.js.map +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js +6 -3
- package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
- package/src/generators/hook/hook.js +5 -2
- package/src/generators/hook/hook.js.map +1 -1
- package/src/generators/init/init.js +7 -2
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/lib/add-rollup-build-target.js +1 -1
- package/src/generators/library/lib/add-rollup-build-target.js.map +1 -1
- package/src/generators/library/lib/create-files.d.ts +1 -1
- package/src/generators/library/lib/create-files.js +2 -2
- package/src/generators/library/lib/create-files.js.map +1 -1
- package/src/generators/library/lib/update-app-routes.js +7 -3
- package/src/generators/library/lib/update-app-routes.js.map +1 -1
- package/src/generators/library/library.js +8 -8
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/redux/redux.js +12 -6
- package/src/generators/redux/redux.js.map +1 -1
- package/src/generators/remote/lib/update-host-with-remote.js +7 -4
- package/src/generators/remote/lib/update-host-with-remote.js.map +1 -1
- package/src/generators/setup-ssr/setup-ssr.js +5 -2
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/generators/setup-tailwind/setup-tailwind.js.map +1 -1
- package/src/generators/stories/stories.js +5 -2
- package/src/generators/stories/stories.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.js +2 -2
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/module-federation/ast-utils.d.ts +1 -1
- package/src/module-federation/ast-utils.js +8 -5
- package/src/module-federation/ast-utils.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -1
- package/src/utils/ast-utils.js +98 -55
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/component-props.d.ts +1 -1
- package/src/utils/component-props.js +12 -6
- package/src/utils/component-props.js.map +1 -1
- package/src/utils/create-ts-config.js +1 -1
- package/src/utils/create-ts-config.js.map +1 -1
- package/src/generators/library/lib/update-base-tsconfig.d.ts +0 -3
- package/src/generators/library/lib/update-base-tsconfig.js +0 -24
- package/src/generators/library/lib/update-base-tsconfig.js.map +0 -1
|
@@ -8,7 +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
|
-
|
|
11
|
+
(0, devkit_1.ensurePackage)(host, '@nrwl/rollup', versions_1.nxVersion);
|
|
12
12
|
const { rollupInitGenerator } = yield Promise.resolve().then(() => require('@nrwl/rollup'));
|
|
13
13
|
// These are used in `@nrwl/react/plugins/bundle-rollup`
|
|
14
14
|
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
@@ -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,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAc,EAAE,oBAAS,CAAC,CAAC;QAC/C,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,cAAc,EAAC,CAAC;QAE7D,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;AA7DD,oDA6DC"}
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createFiles = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nrwl/js");
|
|
6
6
|
const create_ts_config_1 = require("../../../utils/create-ts-config");
|
|
7
7
|
function createFiles(host, options) {
|
|
8
|
-
const relativePathToRootTsConfig = (0,
|
|
8
|
+
const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot);
|
|
9
9
|
const substitutions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot) });
|
|
10
10
|
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/common'), options.projectRoot, substitutions);
|
|
11
11
|
if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/create-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,
|
|
1
|
+
{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/create-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,iCAAyD;AAGzD,sEAAiE;AAEjE,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,MAAM,0BAA0B,GAAG,IAAA,kCAA6B,EAC9D,IAAI,EACJ,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,aAAa,iDACd,OAAO,GACP,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KACtB,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,GACpD,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAC/C,OAAO,CAAC,WAAW,EACnB,aAAa,CACd,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACrE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,EAC7C,OAAO,CAAC,WAAW,EACnB,aAAa,CACd,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,EAAE;YACnE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;SACjE;KACF;IAED,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;KACpD;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,OAAO,EACP,0BAA0B,CAC3B,CAAC;AACJ,CAAC;AA/CD,kCA+CC"}
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateAppRoutes = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("nx/src/utils/path");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_1 = require("../../../utils/ast-utils");
|
|
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
|
+
let tsModule;
|
|
10
11
|
function updateAppRoutes(host, options) {
|
|
11
12
|
if (!options.appMain || !options.appSourceRoot) {
|
|
12
13
|
return () => { };
|
|
@@ -29,7 +30,7 @@ function updateAppRoutes(host, options) {
|
|
|
29
30
|
const { content: componentContent, source: componentSource } = readComponent(host, appComponentPath);
|
|
30
31
|
const isComponentRouterPresent = componentContent.match(/react-router-dom/);
|
|
31
32
|
if (!isComponentRouterPresent) {
|
|
32
|
-
const changes = (0, devkit_1.applyChangesToString)(componentContent, (0,
|
|
33
|
+
const changes = (0, devkit_1.applyChangesToString)(componentContent, (0, ast_utils_2.addInitialRoutes)(appComponentPath, componentSource));
|
|
33
34
|
host.write(appComponentPath, changes);
|
|
34
35
|
}
|
|
35
36
|
}
|
|
@@ -51,8 +52,11 @@ function readComponent(host, path) {
|
|
|
51
52
|
if (!host.exists(path)) {
|
|
52
53
|
throw new Error(`Cannot find ${path}`);
|
|
53
54
|
}
|
|
55
|
+
if (!tsModule) {
|
|
56
|
+
tsModule = require('typescript');
|
|
57
|
+
}
|
|
54
58
|
const content = host.read(path, 'utf-8');
|
|
55
|
-
const source =
|
|
59
|
+
const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);
|
|
56
60
|
return { content, source };
|
|
57
61
|
}
|
|
58
62
|
//# sourceMappingURL=update-app-routes.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"update-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/update-app-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.librarySchematic = exports.libraryGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
7
|
+
const js_1 = require("@nrwl/js");
|
|
7
8
|
const versions_1 = require("../../utils/versions");
|
|
8
9
|
const component_1 = require("../component/component");
|
|
9
10
|
const init_1 = require("../init/init");
|
|
@@ -13,7 +14,6 @@ const add_rollup_build_target_1 = require("./lib/add-rollup-build-target");
|
|
|
13
14
|
const add_linting_1 = require("./lib/add-linting");
|
|
14
15
|
const update_app_routes_1 = require("./lib/update-app-routes");
|
|
15
16
|
const create_files_1 = require("./lib/create-files");
|
|
16
|
-
const update_base_tsconfig_1 = require("./lib/update-base-tsconfig");
|
|
17
17
|
const create_ts_config_1 = require("../../utils/create-ts-config");
|
|
18
18
|
const install_common_dependencies_1 = require("./lib/install-common-dependencies");
|
|
19
19
|
const set_defaults_1 = require("./lib/set-defaults");
|
|
@@ -27,7 +27,6 @@ function libraryGenerator(host, schema) {
|
|
|
27
27
|
if (!options.component) {
|
|
28
28
|
options.style = 'none';
|
|
29
29
|
}
|
|
30
|
-
(0, create_ts_config_1.extractTsConfigBase)(host);
|
|
31
30
|
const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true, skipBabelConfig: options.bundler === 'vite', skipHelperLibs: options.bundler === 'vite' }));
|
|
32
31
|
tasks.push(initTask);
|
|
33
32
|
(0, devkit_1.addProjectConfiguration)(host, options.name, {
|
|
@@ -40,12 +39,9 @@ function libraryGenerator(host, schema) {
|
|
|
40
39
|
const lintTask = yield (0, add_linting_1.addLinting)(host, options);
|
|
41
40
|
tasks.push(lintTask);
|
|
42
41
|
(0, create_files_1.createFiles)(host, options);
|
|
43
|
-
if (!options.skipTsConfig) {
|
|
44
|
-
(0, update_base_tsconfig_1.updateBaseTsConfig)(host, options);
|
|
45
|
-
}
|
|
46
42
|
// Set up build target
|
|
47
43
|
if (options.buildable && options.bundler === 'vite') {
|
|
48
|
-
|
|
44
|
+
(0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
49
45
|
const { viteConfigurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
50
46
|
const viteTask = yield viteConfigurationGenerator(host, {
|
|
51
47
|
uiFramework: 'react',
|
|
@@ -63,7 +59,7 @@ function libraryGenerator(host, schema) {
|
|
|
63
59
|
}
|
|
64
60
|
// Set up test target
|
|
65
61
|
if (options.unitTestRunner === 'jest') {
|
|
66
|
-
|
|
62
|
+
(0, devkit_1.ensurePackage)(host, '@nrwl/jest', versions_1.nxVersion);
|
|
67
63
|
const { jestProjectGenerator } = yield Promise.resolve().then(() => require('@nrwl/jest'));
|
|
68
64
|
const jestTask = yield jestProjectGenerator(host, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, skipSerializers: true, compiler: options.compiler }));
|
|
69
65
|
tasks.push(jestTask);
|
|
@@ -76,7 +72,7 @@ function libraryGenerator(host, schema) {
|
|
|
76
72
|
else if (options.unitTestRunner === 'vitest' &&
|
|
77
73
|
options.bundler !== 'vite' // tests are already configured if bundler is vite
|
|
78
74
|
) {
|
|
79
|
-
|
|
75
|
+
(0, devkit_1.ensurePackage)(host, '@nrwl/vite', versions_1.nxVersion);
|
|
80
76
|
const { vitestGenerator } = yield Promise.resolve().then(() => require('@nrwl/vite'));
|
|
81
77
|
const vitestTask = yield vitestGenerator(host, {
|
|
82
78
|
uiFramework: 'react',
|
|
@@ -115,6 +111,10 @@ function libraryGenerator(host, schema) {
|
|
|
115
111
|
const routeTask = (0, update_app_routes_1.updateAppRoutes)(host, options);
|
|
116
112
|
tasks.push(routeTask);
|
|
117
113
|
(0, set_defaults_1.setDefaults)(host, options);
|
|
114
|
+
(0, create_ts_config_1.extractTsConfigBase)(host);
|
|
115
|
+
if (!options.skipTsConfig) {
|
|
116
|
+
(0, js_1.updateRootTsConfig)(host, options);
|
|
117
|
+
}
|
|
118
118
|
if (!options.skipFormat) {
|
|
119
119
|
yield (0, devkit_1.formatFiles)(host);
|
|
120
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,2FAAqF;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.reduxSchematic = exports.reduxGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path = require("path");
|
|
6
|
-
const ts = require("typescript");
|
|
7
6
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
8
7
|
const versions_1 = require("../../utils/versions");
|
|
9
8
|
const devkit_1 = require("@nrwl/devkit");
|
|
10
|
-
const
|
|
9
|
+
const js_1 = require("@nrwl/js");
|
|
10
|
+
let tsModule;
|
|
11
11
|
function reduxGenerator(host, schema) {
|
|
12
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
13
|
const options = normalizeOptions(host, schema);
|
|
@@ -34,10 +34,13 @@ function addReduxPackageDependencies(host) {
|
|
|
34
34
|
}, {});
|
|
35
35
|
}
|
|
36
36
|
function addExportsToBarrel(host, options) {
|
|
37
|
+
if (!tsModule) {
|
|
38
|
+
tsModule = require('typescript');
|
|
39
|
+
}
|
|
37
40
|
const indexFilePath = path.join(options.projectSourcePath, options.js ? 'index.js' : 'index.ts');
|
|
38
41
|
const indexSource = host.read(indexFilePath, 'utf-8');
|
|
39
42
|
if (indexSource !== null) {
|
|
40
|
-
const indexSourceFile =
|
|
43
|
+
const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);
|
|
41
44
|
const statePath = options.directory
|
|
42
45
|
? `./lib/${options.directory}/${options.fileName}`
|
|
43
46
|
: `./lib/${options.fileName}`;
|
|
@@ -51,17 +54,20 @@ function addStoreConfiguration(host, options) {
|
|
|
51
54
|
}
|
|
52
55
|
const mainSource = host.read(options.appMainFilePath, 'utf-8');
|
|
53
56
|
if (!mainSource.includes('redux')) {
|
|
54
|
-
const mainSourceFile =
|
|
57
|
+
const mainSourceFile = tsModule.createSourceFile(options.appMainFilePath, mainSource, tsModule.ScriptTarget.Latest, true);
|
|
55
58
|
const changes = (0, devkit_1.applyChangesToString)(mainSource, (0, ast_utils_1.addReduxStoreToMain)(options.appMainFilePath, mainSourceFile));
|
|
56
59
|
host.write(options.appMainFilePath, changes);
|
|
57
60
|
}
|
|
58
61
|
}
|
|
59
62
|
function updateReducerConfiguration(host, options) {
|
|
63
|
+
if (!tsModule) {
|
|
64
|
+
tsModule = require('typescript');
|
|
65
|
+
}
|
|
60
66
|
if (!options.appProjectSourcePath) {
|
|
61
67
|
return;
|
|
62
68
|
}
|
|
63
69
|
const mainSource = host.read(options.appMainFilePath, 'utf-8');
|
|
64
|
-
const mainSourceFile =
|
|
70
|
+
const mainSourceFile = tsModule.createSourceFile(options.appMainFilePath, mainSource, tsModule.ScriptTarget.Latest, true);
|
|
65
71
|
const changes = (0, devkit_1.applyChangesToString)(mainSource, (0, ast_utils_1.updateReduxStore)(options.appMainFilePath, mainSourceFile, {
|
|
66
72
|
keyName: `${options.constantName}_FEATURE_KEY`,
|
|
67
73
|
reducerName: `${options.propertyName}Reducer`,
|
|
@@ -77,7 +83,7 @@ function normalizeOptions(host, options) {
|
|
|
77
83
|
const projects = (0, devkit_1.getProjects)(host);
|
|
78
84
|
const project = projects.get(options.project);
|
|
79
85
|
const { sourceRoot, projectType } = project;
|
|
80
|
-
const tsConfigJson = (0, devkit_1.readJson)(host, (0,
|
|
86
|
+
const tsConfigJson = (0, devkit_1.readJson)(host, (0, js_1.getRootTsConfigPathInTree)(host));
|
|
81
87
|
const tsPaths = tsConfigJson.compilerOptions
|
|
82
88
|
? tsConfigJson.compilerOptions.paths || {}
|
|
83
89
|
: {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redux.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":";;;;AAAA,6BAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"redux.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +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
|
-
|
|
6
|
+
let tsModule;
|
|
7
7
|
function updateHostWithRemote(host, hostName, remoteName) {
|
|
8
|
+
if (!tsModule) {
|
|
9
|
+
tsModule = require('typescript');
|
|
10
|
+
}
|
|
8
11
|
const hostConfig = (0, devkit_1.readProjectConfiguration)(host, hostName);
|
|
9
12
|
const moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(hostConfig.root, 'module-federation.config.js');
|
|
10
13
|
const remoteDefsPath = (0, devkit_1.joinPathFragments)(hostConfig.sourceRoot, 'remotes.d.ts');
|
|
@@ -13,7 +16,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
|
|
|
13
16
|
// find the host project path
|
|
14
17
|
// Update remotes inside ${host_path}/src/remotes.d.ts
|
|
15
18
|
let sourceCode = host.read(moduleFederationConfigPath).toString();
|
|
16
|
-
const source =
|
|
19
|
+
const source = tsModule.createSourceFile(moduleFederationConfigPath, sourceCode, tsModule.ScriptTarget.Latest, true);
|
|
17
20
|
host.write(moduleFederationConfigPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteToConfig)(source, remoteName)));
|
|
18
21
|
}
|
|
19
22
|
else {
|
|
@@ -22,7 +25,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
|
|
|
22
25
|
}
|
|
23
26
|
if (host.exists(remoteDefsPath)) {
|
|
24
27
|
let sourceCode = host.read(remoteDefsPath).toString();
|
|
25
|
-
const source =
|
|
28
|
+
const source = tsModule.createSourceFile(moduleFederationConfigPath, sourceCode, tsModule.ScriptTarget.Latest, true);
|
|
26
29
|
host.write(remoteDefsPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteDefinition)(source, remoteName)));
|
|
27
30
|
}
|
|
28
31
|
else {
|
|
@@ -30,7 +33,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
|
|
|
30
33
|
}
|
|
31
34
|
if (host.exists(appComponentPath)) {
|
|
32
35
|
let sourceCode = host.read(appComponentPath).toString();
|
|
33
|
-
const source =
|
|
36
|
+
const source = tsModule.createSourceFile(moduleFederationConfigPath, sourceCode, tsModule.ScriptTarget.Latest, true);
|
|
34
37
|
host.write(appComponentPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteRoute)(source, (0, devkit_1.names)(remoteName))));
|
|
35
38
|
}
|
|
36
39
|
else {
|
|
@@ -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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"}
|
|
@@ -2,16 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setupSsrSchematic = exports.setupSsrGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const ts = require("typescript");
|
|
6
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
7
6
|
const init_1 = require("../init/init");
|
|
8
7
|
const versions_1 = require("../../utils/versions");
|
|
9
8
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
9
|
+
let tsModule;
|
|
10
10
|
function readEntryFile(host, path) {
|
|
11
|
+
if (!tsModule) {
|
|
12
|
+
tsModule = require('typescript');
|
|
13
|
+
}
|
|
11
14
|
const content = host.read(path, 'utf-8');
|
|
12
15
|
return {
|
|
13
16
|
content,
|
|
14
|
-
source:
|
|
17
|
+
source: tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true),
|
|
15
18
|
};
|
|
16
19
|
}
|
|
17
20
|
function setupSsrGenerator(tree, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-tailwind.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-tailwind/setup-tailwind.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"setup-tailwind.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-tailwind/setup-tailwind.ts"],"names":[],"mappings":";;;;AACA,yCAQsB;AACtB,2FAAqF;AAErF,mDAI8B;AAE9B,iFAA2E;AAC3E,yDAAqD;AAErD,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAA6B;;QAE7B,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhE,IACE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;YACjE,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAClE;YACA,eAAM,CAAC,IAAI,CACT,wKAAwK,CACzK,CAAC;YACF,OAAO;SACR;QAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YACzE,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,IAAA,oDAAuB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CACR,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,8BAAmB;gBACjC,OAAO,EAAE,yBAAc;gBACvB,WAAW,EAAE,6BAAkB;aAChC,CACF,CACF,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA5CD,wDA4CC;AAED,kBAAe,sBAAsB,CAAC;AAEzB,QAAA,sBAAsB,GAAG,IAAA,2BAAkB,EACtD,sBAAsB,CACvB,CAAC"}
|
|
@@ -5,10 +5,10 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const component_story_1 = require("../component-story/component-story");
|
|
6
6
|
const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
|
|
7
7
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
8
|
-
const ts = require("typescript");
|
|
9
8
|
const devkit_1 = require("@nrwl/devkit");
|
|
10
9
|
const path_1 = require("path");
|
|
11
10
|
const minimatch = require("minimatch");
|
|
11
|
+
let tsModule;
|
|
12
12
|
function projectRootPath(tree, config) {
|
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
const { findStorybookAndBuildTargetsAndCompiler } = yield Promise.resolve().then(() => require('@nrwl/storybook/src/utils/utilities'));
|
|
@@ -34,11 +34,14 @@ function projectRootPath(tree, config) {
|
|
|
34
34
|
exports.projectRootPath = projectRootPath;
|
|
35
35
|
function containsComponentDeclaration(tree, componentPath) {
|
|
36
36
|
var _a;
|
|
37
|
+
if (!tsModule) {
|
|
38
|
+
tsModule = require('typescript');
|
|
39
|
+
}
|
|
37
40
|
const contents = tree.read(componentPath, 'utf-8');
|
|
38
41
|
if (contents === null) {
|
|
39
42
|
throw new Error(`Failed to read ${componentPath}`);
|
|
40
43
|
}
|
|
41
|
-
const sourceFile =
|
|
44
|
+
const sourceFile = tsModule.createSourceFile(componentPath, contents, tsModule.ScriptTarget.Latest, true);
|
|
42
45
|
return !!((0, ast_utils_1.getComponentNode)(sourceFile) ||
|
|
43
46
|
((_a = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile)) === null || _a === void 0 ? void 0 : _a.length));
|
|
44
47
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"stories.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/stories/stories.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
-
|
|
10
|
+
(0, devkit_1.ensurePackage)(host, '@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,7 +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
|
-
|
|
26
|
+
(0, devkit_1.ensurePackage)(host, '@nrwl/storybook', versions_1.nxVersion);
|
|
27
27
|
const { configurationGenerator } = yield Promise.resolve().then(() => require('@nrwl/storybook'));
|
|
28
28
|
let bundler = (_a = schema.bundler) !== null && _a !== void 0 ? _a : 'webpack';
|
|
29
29
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAOsB;AACtB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as ts from 'typescript';
|
|
1
|
+
import type * as ts from 'typescript';
|
|
2
2
|
import { StringChange } from '@nrwl/devkit';
|
|
3
3
|
export declare function addRemoteToConfig(source: ts.SourceFile, app: string): StringChange[];
|
|
4
4
|
export declare function addRemoteDefinition(source: ts.SourceFile, app: string): StringChange[];
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addRemoteRoute = exports.addRemoteDefinition = exports.addRemoteToConfig = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
5
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
7
6
|
const ast_utils_1 = require("../utils/ast-utils");
|
|
7
|
+
let tsModule;
|
|
8
8
|
function addRemoteToConfig(source, app) {
|
|
9
|
-
|
|
9
|
+
if (!tsModule) {
|
|
10
|
+
tsModule = require('typescript');
|
|
11
|
+
}
|
|
12
|
+
const assignments = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.PropertyAssignment);
|
|
10
13
|
const remotesAssignment = assignments.find((s) => s.name.getText() === 'remotes');
|
|
11
14
|
if (remotesAssignment) {
|
|
12
15
|
const arrayExpression = remotesAssignment.initializer;
|
|
@@ -28,15 +31,15 @@ function addRemoteToConfig(source, app) {
|
|
|
28
31
|
},
|
|
29
32
|
].filter(Boolean);
|
|
30
33
|
}
|
|
31
|
-
const binaryExpressions = (0, typescript_1.findNodes)(source,
|
|
34
|
+
const binaryExpressions = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.BinaryExpression);
|
|
32
35
|
const exportExpression = binaryExpressions.find((b) => {
|
|
33
|
-
if (b.left.kind ===
|
|
36
|
+
if (b.left.kind === tsModule.SyntaxKind.PropertyAccessExpression) {
|
|
34
37
|
const pae = b.left;
|
|
35
38
|
return (pae.expression.getText() === 'module' &&
|
|
36
39
|
pae.name.getText() === 'exports');
|
|
37
40
|
}
|
|
38
41
|
});
|
|
39
|
-
if ((exportExpression === null || exportExpression === void 0 ? void 0 : exportExpression.right.kind) ===
|
|
42
|
+
if ((exportExpression === null || exportExpression === void 0 ? void 0 : exportExpression.right.kind) === tsModule.SyntaxKind.ObjectLiteralExpression) {
|
|
40
43
|
const ole = exportExpression.right;
|
|
41
44
|
return [
|
|
42
45
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":";;;
|
|
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.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as ts from 'typescript';
|
|
1
|
+
import type * as ts from 'typescript';
|
|
2
2
|
import { StringChange } from '@nrwl/devkit';
|
|
3
3
|
export declare function addImport(source: ts.SourceFile, statement: string): StringChange[];
|
|
4
4
|
export declare function findMainRenderStatement(source: ts.SourceFile): ts.CallExpression | null;
|