@nx/react 16.0.0-beta.1 → 16.0.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/generators.json +1 -1
- package/package.json +7 -6
- package/plugins/component-testing/index.js +2 -2
- package/plugins/component-testing/index.js.map +1 -1
- package/plugins/component-testing/webpack-fallback.js +1 -1
- package/plugins/component-testing/webpack-fallback.js.map +1 -1
- package/plugins/storybook/index.js +8 -5
- package/plugins/storybook/index.js.map +1 -1
- package/plugins/webpack.d.ts +1 -1
- package/plugins/webpack.js +1 -1
- package/plugins/webpack.js.map +1 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +1 -1
- package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js +1 -1
- package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js.map +1 -1
- package/src/generators/application/application.js +4 -2
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__ +3 -3
- package/src/generators/application/files/base-webpack/.babelrc__tmpl__ +1 -1
- package/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__ +3 -3
- package/src/generators/application/files/base-webpack/webpack.config.js__tmpl__ +2 -2
- package/src/generators/application/files/nx-welcome/src/app/nx-welcome.tsx +2 -2
- package/src/generators/application/lib/add-cypress.js +2 -2
- package/src/generators/application/lib/add-cypress.js.map +1 -1
- package/src/generators/application/lib/add-project.js +2 -2
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/install-common-dependencies.js +1 -1
- package/src/generators/application/lib/install-common-dependencies.js.map +1 -1
- package/src/generators/application/lib/set-defaults.js +3 -3
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/application/lib/update-jest-config.js +3 -3
- package/src/generators/application/lib/update-jest-config.js.map +1 -1
- package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +1 -1
- package/src/generators/cypress-component-configuration/lib/add-files.js +8 -4
- package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
- package/src/generators/cypress-component-configuration/lib/update-configs.js +2 -0
- package/src/generators/cypress-component-configuration/lib/update-configs.js.map +1 -1
- package/src/generators/host/files/module-federation/webpack.config.js__tmpl__ +3 -3
- package/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__ +3 -3
- package/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__ +1 -1
- package/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ +3 -3
- package/src/generators/host/lib/setup-ssr-for-host.js +1 -2
- package/src/generators/host/lib/setup-ssr-for-host.js.map +1 -1
- package/src/generators/init/init.js +4 -4
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/files/common/.babelrc__tmpl__ +1 -1
- package/src/generators/library/files/common/tsconfig.lib.json__tmpl__ +3 -3
- package/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ +3 -3
- package/src/generators/library/lib/add-rollup-build-target.js +3 -3
- package/src/generators/library/lib/add-rollup-build-target.js.map +1 -1
- package/src/generators/library/lib/install-common-dependencies.d.ts +2 -2
- package/src/generators/library/lib/install-common-dependencies.js +10 -3
- package/src/generators/library/lib/install-common-dependencies.js.map +1 -1
- package/src/generators/library/lib/set-defaults.js +3 -3
- package/src/generators/library/lib/set-defaults.js.map +1 -1
- package/src/generators/remote/files/module-federation/webpack.config.js__tmpl__ +3 -3
- package/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__ +1 -1
- package/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__ +3 -3
- package/src/generators/remote/lib/update-host-with-remote.js +3 -3
- package/src/generators/remote/lib/update-host-with-remote.js.map +1 -1
- package/src/generators/setup-ssr/setup-ssr.js +3 -3
- package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
- package/src/generators/setup-tailwind/files/tailwind.config.js__tmpl__ +1 -1
- package/src/generators/setup-tailwind/lib/update-project.js +5 -4
- package/src/generators/setup-tailwind/lib/update-project.js.map +1 -1
- package/src/generators/storybook-configuration/configuration.js +3 -2
- package/src/generators/storybook-configuration/configuration.js.map +1 -1
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js +3 -3
- package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map +1 -1
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +3 -3
- package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +1 -1
- package/src/module-federation/ast-utils.js +3 -3
- package/src/module-federation/ast-utils.js.map +1 -1
- package/src/module-federation/load-config.js +1 -1
- package/src/module-federation/load-config.js.map +1 -1
- package/src/rules/update-module-federation-project.js +3 -3
- package/src/rules/update-module-federation-project.js.map +1 -1
- package/src/utils/ast-utils.js +28 -28
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/jest-utils.js +2 -2
- package/src/utils/jest-utils.js.map +1 -1
- package/src/utils/lint.js +2 -2
- package/src/utils/lint.js.map +1 -1
- package/src/utils/versions.d.ts +0 -1
- package/src/utils/versions.js +1 -2
- package/src/utils/versions.js.map +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
const { composePlugins, withNx } = require('@
|
|
2
|
-
const { withReact } = require('@
|
|
3
|
-
const { withModuleFederationForSSR } = require('@
|
|
1
|
+
const { composePlugins, withNx } = require('@nx/webpack');
|
|
2
|
+
const { withReact } = require('@nx/react');
|
|
3
|
+
const { withModuleFederationForSSR } = require('@nx/react/module-federation');
|
|
4
4
|
|
|
5
5
|
const baseConfig = require('./module-federation.config');
|
|
6
6
|
|
|
@@ -9,8 +9,7 @@ function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
|
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
10
|
const tasks = [];
|
|
11
11
|
let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
|
|
12
|
-
project.targets.serve.executor =
|
|
13
|
-
'@nrwl/react:module-federation-ssr-dev-server';
|
|
12
|
+
project.targets.serve.executor = '@nx/react:module-federation-ssr-dev-server';
|
|
14
13
|
(0, devkit_1.updateProjectConfiguration)(tree, appName, project);
|
|
15
14
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/module-federation-ssr'), project.root, Object.assign(Object.assign({}, options), { remotes: defaultRemoteManifest.map(({ name, port }) => {
|
|
16
15
|
const remote = (0, normalize_options_1.normalizeProjectName)(Object.assign(Object.assign({}, options), { name }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr-for-host.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/setup-ssr-for-host.ts"],"names":[],"mappings":";;;;AACA,uCAQoB;AAGpB,sDAAsE;AACtE,+EAA+E;AAE/E,SAAsB,eAAe,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,qBAAuD;;QAEvD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ
|
|
1
|
+
{"version":3,"file":"setup-ssr-for-host.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/setup-ssr-for-host.ts"],"names":[],"mappings":";;;;AACA,uCAQoB;AAGpB,sDAAsE;AACtE,+EAA+E;AAE/E,SAAsB,eAAe,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,qBAAuD;;QAEvD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,4CAA4C,CAAC;QAC9E,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gCAAgC,CAAC,EAC9D,OAAO,CAAC,IAAI,kCAEP,OAAO,KACV,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;gBACpD,MAAM,MAAM,GAAG,IAAA,wCAAoB,kCAAM,OAAO,KAAE,IAAI,IAAG,CAAC;gBAC1D,uCACK,IAAA,cAAK,EAAC,MAAM,CAAC,KAChB,IAAI,IACJ;YACJ,CAAC,CAAC,EACF,OAAO,EACP,IAAI,EAAE,EAAE,EACR,sBAAsB,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,IAEnE,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,yBAAyB,EAAE,sCAA2B;SACvD,EACD,EAAE,CACH,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAxCD,0CAwCC"}
|
|
@@ -8,12 +8,12 @@ const versions_1 = require("../../utils/versions");
|
|
|
8
8
|
function setDefault(host) {
|
|
9
9
|
const workspace = (0, devkit_1.readNxJson)(host);
|
|
10
10
|
workspace.generators = workspace.generators || {};
|
|
11
|
-
const reactGenerators = workspace.generators['@
|
|
12
|
-
const generators = Object.assign(Object.assign({}, workspace.generators), { '@
|
|
11
|
+
const reactGenerators = workspace.generators['@nx/react'] || {};
|
|
12
|
+
const generators = Object.assign(Object.assign({}, workspace.generators), { '@nx/react': Object.assign(Object.assign({}, reactGenerators), { application: Object.assign(Object.assign({}, reactGenerators.application), { babel: true }) }) });
|
|
13
13
|
(0, devkit_1.updateNxJson)(host, Object.assign(Object.assign({}, workspace), { generators }));
|
|
14
14
|
}
|
|
15
15
|
function updateDependencies(host, schema) {
|
|
16
|
-
(0, devkit_1.removeDependenciesFromPackageJson)(host, ['@
|
|
16
|
+
(0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react'], []);
|
|
17
17
|
const dependencies = {
|
|
18
18
|
react: versions_1.reactVersion,
|
|
19
19
|
'react-dom': versions_1.reactDomVersion,
|
|
@@ -22,7 +22,7 @@ function updateDependencies(host, schema) {
|
|
|
22
22
|
dependencies['tslib'] = versions_1.tsLibVersion;
|
|
23
23
|
}
|
|
24
24
|
return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, {
|
|
25
|
-
'@
|
|
25
|
+
'@nx/react': versions_1.nxVersion,
|
|
26
26
|
'@types/node': versions_1.typesNodeVersion,
|
|
27
27
|
'@types/react': versions_1.typesReactVersion,
|
|
28
28
|
'@types/react-dom': versions_1.typesReactDomVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAWoB;AAEpB,+BAA0D;AAC1D,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,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAWoB;AAEpB,+BAA0D;AAC1D,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,WAAW,CAAC,IAAI,EAAE,CAAC;IAChE,MAAM,UAAU,mCACX,SAAS,CAAC,UAAU,KACvB,WAAW,kCACN,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,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3D,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,WAAW,EAAE,oBAAS;QACtB,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,aAAa,EAAE,oBAAS,CAAC,CAAC;YACxC,MAAM,EAAE,oBAAoB,EAAE,GAAG,2CAC/B,sCAAsC,EACvC,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,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AA3CD,gDA2CC;AAED,kBAAe,kBAAkB,CAAC;AAErB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
"types": ["node"]
|
|
6
6
|
},
|
|
7
7
|
"files": [<% if (style === 'styled-jsx') { %>
|
|
8
|
-
"<%= offsetFromRoot %>node_modules/@
|
|
9
|
-
"<%= offsetFromRoot %>node_modules/@
|
|
10
|
-
"<%= offsetFromRoot %>node_modules/@
|
|
8
|
+
"<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
|
|
9
|
+
"<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
|
|
10
|
+
"<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
|
|
11
11
|
],
|
|
12
12
|
"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
|
|
13
13
|
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
"types": ["node"]
|
|
6
6
|
},
|
|
7
7
|
"files": [<% if (style === 'styled-jsx') { %>
|
|
8
|
-
"<%= offsetFromRoot %>node_modules/@
|
|
9
|
-
"<%= offsetFromRoot %>node_modules/@
|
|
10
|
-
"<%= offsetFromRoot %>node_modules/@
|
|
8
|
+
"<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
|
|
9
|
+
"<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
|
|
10
|
+
"<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
|
|
11
11
|
],
|
|
12
12
|
"exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx"],
|
|
13
13
|
"include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
|
|
@@ -9,7 +9,7 @@ function addRollupBuildTarget(host, options) {
|
|
|
9
9
|
var _a;
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
|
|
12
|
-
// These are used in `@
|
|
12
|
+
// These are used in `@nx/react/plugins/bundle-rollup`
|
|
13
13
|
(0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
14
14
|
'@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
|
|
15
15
|
'@svgr/rollup': versions_1.svgrRollupVersion,
|
|
@@ -24,7 +24,7 @@ function addRollupBuildTarget(host, options) {
|
|
|
24
24
|
external.push('react/jsx-runtime');
|
|
25
25
|
}
|
|
26
26
|
targets.build = {
|
|
27
|
-
executor: '@
|
|
27
|
+
executor: '@nx/rollup:rollup',
|
|
28
28
|
outputs: ['{options.outputPath}'],
|
|
29
29
|
options: {
|
|
30
30
|
outputPath: libsDir !== '.'
|
|
@@ -34,7 +34,7 @@ function addRollupBuildTarget(host, options) {
|
|
|
34
34
|
project: `${options.projectRoot}/package.json`,
|
|
35
35
|
entryFile: (0, maybe_js_1.maybeJs)(options, `${options.projectRoot}/src/index.ts`),
|
|
36
36
|
external,
|
|
37
|
-
rollupConfig: `@
|
|
37
|
+
rollupConfig: `@nx/react/plugins/bundle-rollup`,
|
|
38
38
|
compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel',
|
|
39
39
|
assets: [
|
|
40
40
|
{
|
|
@@ -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,uCAOoB;AAEpB,yCAAqC;AAErC,sDAIiC;AAEjC,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAyB;;;QAEzB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,sBAAa,EAC3C,YAAY,EACZ,oBAAS,CACV,CAAC;QAEF,
|
|
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,uCAOoB;AAEpB,yCAAqC;AAErC,sDAIiC;AAEjC,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAyB;;;QAEzB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,sBAAa,EAC3C,YAAY,EACZ,oBAAS,CACV,CAAC;QAEF,sDAAsD;QACtD,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,mBAAmB;YAC7B,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,iCAAiC;gBAC/C,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,kCAAO,OAAO,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC;;CACpE;AA/DD,oDA+DC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { Tree } from '@nx/devkit';
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nx/devkit';
|
|
2
2
|
import { NormalizedSchema } from '../schema';
|
|
3
|
-
export declare function installCommonDependencies(host: Tree, options: NormalizedSchema):
|
|
3
|
+
export declare function installCommonDependencies(host: Tree, options: NormalizedSchema): GeneratorCallback;
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.installCommonDependencies = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
|
|
5
6
|
const versions_1 = require("../../../utils/versions");
|
|
6
7
|
function installCommonDependencies(host, options) {
|
|
7
|
-
const
|
|
8
|
+
const tasks = [];
|
|
9
|
+
const devDependencies = {};
|
|
8
10
|
// Vite requires style preprocessors to be installed manually.
|
|
9
|
-
// `@
|
|
11
|
+
// `@nx/webpack` installs them automatically for now.
|
|
10
12
|
// TODO(jack): Once we clean up webpack we can remove this check
|
|
11
13
|
if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
|
|
12
14
|
switch (options.style) {
|
|
@@ -21,10 +23,15 @@ function installCommonDependencies(host, options) {
|
|
|
21
23
|
break;
|
|
22
24
|
}
|
|
23
25
|
}
|
|
24
|
-
|
|
26
|
+
const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
25
27
|
react: versions_1.reactVersion,
|
|
26
28
|
'react-dom': versions_1.reactDomVersion,
|
|
27
29
|
}, devDependencies);
|
|
30
|
+
tasks.push(baseInstallTask);
|
|
31
|
+
if (options.compiler === 'swc') {
|
|
32
|
+
tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
|
|
33
|
+
}
|
|
34
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
28
35
|
}
|
|
29
36
|
exports.installCommonDependencies = installCommonDependencies;
|
|
30
37
|
//# sourceMappingURL=install-common-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-common-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/install-common-dependencies.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"install-common-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/install-common-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AACpB,oFAA+E;AAC/E,sDAMiC;AAGjC,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,MAAM,KAAK,GAAwB,EAAE,CAAC;IACtC,MAAM,eAAe,GAAG,EAAE,CAAC;IAE3B,8DAA8D;IAC9D,qDAAqD;IACrD,gEAAgE;IAChE,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACrE,QAAQ,OAAO,CAAC,KAAK,EAAE;YACrB,KAAK,MAAM;gBACT,eAAe,CAAC,MAAM,CAAC,GAAG,sBAAW,CAAC;gBACtC,MAAM;YACR,KAAK,MAAM;gBACT,eAAe,CAAC,MAAM,CAAC,GAAG,sBAAW,CAAC;gBACtC,MAAM;YACR,KAAK,MAAM,EAAE,sDAAsD;gBACjE,eAAe,CAAC,QAAQ,CAAC,GAAG,wBAAa,CAAC;gBAC1C,MAAM;SACT;KACF;IAED,MAAM,eAAe,GAAG,IAAA,qCAA4B,EAClD,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;KAC7B,EACD,eAAe,CAChB,CAAC;IACF,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE5B,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,EAAE;QAC9B,KAAK,CAAC,IAAI,CAAC,IAAA,yCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;KACtC;IAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC;AAvCD,8DAuCC"}
|
|
@@ -6,10 +6,10 @@ function setDefaults(host, options) {
|
|
|
6
6
|
var _a, _b;
|
|
7
7
|
const nxJson = (0, devkit_1.readNxJson)(host);
|
|
8
8
|
nxJson.generators = nxJson.generators || {};
|
|
9
|
-
nxJson.generators['@
|
|
10
|
-
const prev = Object.assign({}, nxJson.generators['@
|
|
9
|
+
nxJson.generators['@nx/react'] = nxJson.generators['@nx/react'] || {};
|
|
10
|
+
const prev = Object.assign({}, nxJson.generators['@nx/react']);
|
|
11
11
|
const libDefaults = Object.assign(Object.assign({}, prev.library), { unitTestRunner: (_b = (_a = prev.library) === null || _a === void 0 ? void 0 : _a.unitTestRunner) !== null && _b !== void 0 ? _b : options.unitTestRunner });
|
|
12
|
-
nxJson.generators = Object.assign(Object.assign({}, nxJson.generators), { '@
|
|
12
|
+
nxJson.generators = Object.assign(Object.assign({}, nxJson.generators), { '@nx/react': Object.assign(Object.assign({}, prev), { library: libDefaults }) });
|
|
13
13
|
(0, devkit_1.updateNxJson)(host, nxJson);
|
|
14
14
|
}
|
|
15
15
|
exports.setDefaults = setDefaults;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAA4D;AAG5D,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;;IAC/D,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAA4D;AAG5D,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;;IAC/D,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAEtE,MAAM,IAAI,qBAAQ,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAE,CAAC;IAEnD,MAAM,WAAW,mCACZ,IAAI,CAAC,OAAO,KACf,cAAc,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,cAAc,mCAAI,OAAO,CAAC,cAAc,GACvE,CAAC;IAEF,MAAM,CAAC,UAAU,mCACZ,MAAM,CAAC,UAAU,KACpB,WAAW,kCACN,IAAI,KACP,OAAO,EAAE,WAAW,MAEvB,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAtBD,kCAsBC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
const { composePlugins, withNx } = require('@
|
|
2
|
-
const { withReact } = require('@
|
|
3
|
-
const { withModuleFederation } = require('@
|
|
1
|
+
const { composePlugins, withNx } = require('@nx/webpack');
|
|
2
|
+
const { withReact } = require('@nx/react');
|
|
3
|
+
const { withModuleFederation } = require('@nx/react/module-federation');
|
|
4
4
|
|
|
5
5
|
const baseConfig = require('./module-federation.config');
|
|
6
6
|
|
|
@@ -34,7 +34,7 @@ const server = app.listen(port, () => {
|
|
|
34
34
|
console.log(`Express server listening on http://localhost:${port}`);
|
|
35
35
|
|
|
36
36
|
/**
|
|
37
|
-
* DO NOT REMOVE IF USING @
|
|
37
|
+
* DO NOT REMOVE IF USING @nx/react:module-federation-dev-ssr executor
|
|
38
38
|
* to serve your Host application with this Remote application.
|
|
39
39
|
* This message allows Nx to determine when the Remote is ready to be
|
|
40
40
|
* consumed by the Host.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
const { composePlugins, withNx } = require('@
|
|
2
|
-
const { withReact } = require('@
|
|
3
|
-
const { withModuleFederationForSSR } = require('@
|
|
1
|
+
const { composePlugins, withNx } = require('@nx/webpack');
|
|
2
|
+
const { withReact } = require('@nx/react');
|
|
3
|
+
const { withModuleFederationForSSR } = require('@nx/react/module-federation');
|
|
4
4
|
|
|
5
5
|
const baseConfig = require("./module-federation.server.config");
|
|
6
6
|
|
|
@@ -22,7 +22,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
|
|
|
22
22
|
}
|
|
23
23
|
else {
|
|
24
24
|
// TODO(jack): Point to the nx.dev guide when ready.
|
|
25
|
-
devkit_1.logger.warn(`Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@
|
|
25
|
+
devkit_1.logger.warn(`Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@nx/react:host"?`);
|
|
26
26
|
}
|
|
27
27
|
if (host.exists(remoteDefsPath)) {
|
|
28
28
|
let sourceCode = host.read(remoteDefsPath).toString();
|
|
@@ -30,7 +30,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
|
|
|
30
30
|
host.write(remoteDefsPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteDefinition)(source, remoteName)));
|
|
31
31
|
}
|
|
32
32
|
else {
|
|
33
|
-
devkit_1.logger.warn(`Could not find remote definitions at ${remoteDefsPath}. Did you generate this project with "@
|
|
33
|
+
devkit_1.logger.warn(`Could not find remote definitions at ${remoteDefsPath}. Did you generate this project with "@nx/react:host"?`);
|
|
34
34
|
}
|
|
35
35
|
if (host.exists(appComponentPath)) {
|
|
36
36
|
let sourceCode = host.read(appComponentPath).toString();
|
|
@@ -38,7 +38,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
|
|
|
38
38
|
host.write(appComponentPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteRoute)(source, (0, devkit_1.names)(remoteName))));
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
|
-
devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@
|
|
41
|
+
devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@nx/react:host"?`);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
exports.updateHostWithRemote = updateHostWithRemote;
|
|
@@ -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,uCAOoB;AACpB,oEAI8C;AAC9C,qFAAiF;AAEjF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,oBAAoB,CAClC,IAAU,EACV,QAAgB,EAChB,UAAkB;IAElB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,UAAU,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5D,MAAM,0BAA0B,GAAG,IAAA,0BAAiB,EAClD,UAAU,CAAC,IAAI,EACf,6BAA6B,CAC9B,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,UAAU,CAAC,UAAU,EACrB,cAAc,CACf,CAAC;IACF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IAE3E,IAAI,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,EAAE;QAC3C,6BAA6B;QAC7B,sDAAsD;QACtD,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,0BAA0B,EAC1B,UAAU,EACV,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CACR,0BAA0B,EAC1B,IAAA,6BAAoB,EAAC,UAAU,EAAE,IAAA,6BAAiB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CACxE,CAAC;KACH;SAAM;QACL,oDAAoD;QACpD,eAAM,CAAC,IAAI,CACT,mCAAmC,0BAA0B,
|
|
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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"}
|
|
@@ -53,7 +53,7 @@ function setupSsrGenerator(tree, options) {
|
|
|
53
53
|
projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
|
|
54
54
|
projectConfig.targets = Object.assign(Object.assign({}, projectConfig.targets), { server: {
|
|
55
55
|
dependsOn: ['build'],
|
|
56
|
-
executor: '@
|
|
56
|
+
executor: '@nx/webpack:webpack',
|
|
57
57
|
outputs: ['{options.outputPath}'],
|
|
58
58
|
defaultConfiguration: 'production',
|
|
59
59
|
options: {
|
|
@@ -83,7 +83,7 @@ function setupSsrGenerator(tree, options) {
|
|
|
83
83
|
},
|
|
84
84
|
},
|
|
85
85
|
}, 'serve-browser': projectConfig.targets.serve, 'serve-server': {
|
|
86
|
-
executor: '@
|
|
86
|
+
executor: '@nx/js:node',
|
|
87
87
|
defaultConfiguration: 'development',
|
|
88
88
|
options: {
|
|
89
89
|
buildTarget: `${options.project}:server:development`,
|
|
@@ -98,7 +98,7 @@ function setupSsrGenerator(tree, options) {
|
|
|
98
98
|
},
|
|
99
99
|
},
|
|
100
100
|
}, serve: {
|
|
101
|
-
executor: '@
|
|
101
|
+
executor: '@nx/webpack:ssr-dev-server',
|
|
102
102
|
defaultConfiguration: 'development',
|
|
103
103
|
options: {
|
|
104
104
|
browserTarget: `${options.project}:build:development`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAYoB;AACpB,uCAAyC;AAGzC,mDAM8B;AAC9B,qDAAwD;AACxD,qFAAiF;AAEjF,IAAI,QAAqC,CAAC;AAE1C,SAAS,aAAa,CACpB,IAAU,EACV,IAAY;IAEZ,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;IACzC,OAAO;QACL,OAAO;QACP,MAAM,EAAE,QAAQ,CAAC,gBAAgB,CAC/B,IAAI,EACJ,OAAO,EACP,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL;KACF,CAAC;AACJ,CAAC;AAOD,SAAsB,iBAAiB,CAAC,IAAU,EAAE,OAAe;;;QACjE,MAAM,IAAA,cAAa,EAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;QACvC,MAAM,mBAAmB,GAAuB;YAC9C,MAAA,OAAO,CAAC,sBAAsB,mCAAI,SAAS;YAC3C,KAAK;YACL,KAAK;YACL,SAAS;YACT,SAAS;SACV,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YACnB,OAAO;gBACL,UAAU;gBACV,QAAQ,EAAE,IAAA,0BAAiB,EACzB,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,IAAI,EAC9C,GAAG,UAAU,MAAM,CACpB;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAC9D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAChC,CAAC;QAEF,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,IAAI,KAAK,CACb,uGAAuG,CACxG,CAAC;SACH;QAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE;YAChE,MAAM,IAAI,KAAK,CACb,WAAW,OAAO,CAAC,OAAO,wCAAwC,CACnE,CAAC;SACH;QAED,IAAI,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,WAAW,OAAO,CAAC,OAAO,+BAA+B,CAAC,CAAC;SAC5E;QAED,MAAM,kBAAkB,GAAG,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,0CAAE,UAAU,CAAC;QAE5E,IAAI,CAAC,kBAAkB,EAAE;YACvB,MAAM,IAAI,KAAK,CACb,WAAW,OAAO,CAAC,OAAO,sDAAsD,CACjF,CAAC;SACH;QAED,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,IAAA,0BAAiB,EAChE,kBAAkB,EAClB,SAAS,CACV,CAAC;QACF,aAAa,CAAC,OAAO,mCAChB,aAAa,CAAC,OAAO,KACxB,MAAM,EAAE;gBACN,SAAS,EAAE,CAAC,OAAO,CAAC;gBACpB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
function updateProject(tree, config, options) {
|
|
6
|
-
var _a, _b, _c;
|
|
7
|
-
var
|
|
8
|
-
if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@
|
|
9
|
-
(
|
|
6
|
+
var _a, _b, _c, _d, _e;
|
|
7
|
+
var _f;
|
|
8
|
+
if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nx/webpack:webpack' ||
|
|
9
|
+
((_d = (_c = config === null || config === void 0 ? void 0 : config.targets) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.executor) === '@nrwl/webpack:webpack') {
|
|
10
|
+
(_e = (_f = config.targets.build).options) !== null && _e !== void 0 ? _e : (_f.options = {});
|
|
10
11
|
config.targets.build.options.postcssConfig = (0, devkit_1.joinPathFragments)(config.root, 'postcss.config.js');
|
|
11
12
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, config);
|
|
12
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/setup-tailwind/lib/update-project.ts"],"names":[],"mappings":";;;AACA,uCAA2E;AAI3E,SAAgB,aAAa,CAC3B,IAAU,EACV,MAA4B,EAC5B,OAA6B;;;IAE7B,
|
|
1
|
+
{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/setup-tailwind/lib/update-project.ts"],"names":[],"mappings":";;;AACA,uCAA2E;AAI3E,SAAgB,aAAa,CAC3B,IAAU,EACV,MAA4B,EAC5B,OAA6B;;;IAE7B,IACE,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,qBAAqB;QAC1D,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,uBAAuB,EAC5D;QACA,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,EAAC,OAAO,uCAAP,OAAO,GAAK,EAAE,EAAC;QACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,GAAG,IAAA,0BAAiB,EAC5D,MAAM,CAAC,IAAI,EACX,mBAAmB,CACpB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3D;AACH,CAAC;AAhBD,sCAgBC"}
|
|
@@ -22,13 +22,14 @@ function generateStories(host, schema) {
|
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
24
|
function storybookConfigurationGenerator(host, schema) {
|
|
25
|
-
var _a, _b;
|
|
25
|
+
var _a, _b, _c;
|
|
26
26
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
27
27
|
const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
|
|
28
28
|
let bundler = (_a = schema.bundler) !== null && _a !== void 0 ? _a : 'webpack';
|
|
29
29
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
|
|
30
30
|
if (projectConfig.projectType === 'application' &&
|
|
31
|
-
((_b = projectConfig.targets['build']) === null || _b === void 0 ? void 0 : _b.executor) === '@
|
|
31
|
+
(((_b = projectConfig.targets['build']) === null || _b === void 0 ? void 0 : _b.executor) === '@nx/vite:build' ||
|
|
32
|
+
((_c = projectConfig.targets['build']) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/vite:build')) {
|
|
32
33
|
bundler = 'vite';
|
|
33
34
|
if (schema.bundler !== 'vite') {
|
|
34
35
|
devkit_1.logger.info(`The project ${schema.name} is set up to use Vite. So
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,uCAMoB;AACpB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,aAAa,EAAE,oBAAS,CAAC,CAAC;QACxC,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,oCAAoC,EACrC,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;YAC/B,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAE9C,eAAe,EAAE,oBAAS,CAAC,CAAC;QAE9B,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,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,uCAMoB;AACpB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,aAAa,EAAE,oBAAS,CAAC,CAAC;QACxC,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,oCAAoC,EACrC,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;YAC/B,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAE9C,eAAe,EAAE,oBAAS,CAAC,CAAC;QAE9B,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,CAAC,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,gBAAgB;gBAC5D,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,kBAAkB,CAAC,EAClE;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,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,OAAO;YACP,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;YACvD,qBAAqB,EACnB,OAAO,KAAK,MAAM;gBAChB,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,2BAA2B;YACjC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;;CACpB;AAjDD,0EAiDC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const devkit_2 = require("@nx/devkit");
|
|
7
7
|
const ts = require("typescript");
|
|
8
|
-
const
|
|
8
|
+
const js_1 = require("@nx/js");
|
|
9
9
|
function migrateToWebPack5(tree) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
allReactProjectsWithStorybookConfiguration(tree).forEach((project) => {
|
|
@@ -61,10 +61,10 @@ function editProjectMainJs(tree, projectMainJsFile, projectName) {
|
|
|
61
61
|
const file = getTsSourceFile(tree, projectMainJsFile);
|
|
62
62
|
const appFileContent = tree.read(projectMainJsFile, 'utf-8');
|
|
63
63
|
newContents = appFileContent;
|
|
64
|
-
moduleExportsFull = (0,
|
|
64
|
+
moduleExportsFull = (0, js_1.findNodes)(file, [ts.SyntaxKind.ExpressionStatement]);
|
|
65
65
|
if (moduleExportsFull && moduleExportsFull[0]) {
|
|
66
66
|
const moduleExports = moduleExportsFull[0];
|
|
67
|
-
const listOfStatements = (0,
|
|
67
|
+
const listOfStatements = (0, js_1.findNodes)(moduleExports, [
|
|
68
68
|
ts.SyntaxKind.SyntaxList,
|
|
69
69
|
]);
|
|
70
70
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":";;;;AAAA,uCAA+C;AAC/C,uCAKoB;AAEpB,iCAAkC;AAClC
|
|
1
|
+
{"version":3,"file":"webpack5-changes-utils.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.migrateReactDomRender = exports.update = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
6
|
+
const js_1 = require("@nx/js");
|
|
7
7
|
const ts = require("typescript");
|
|
8
8
|
function update(tree) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -25,7 +25,7 @@ function update(tree) {
|
|
|
25
25
|
}
|
|
26
26
|
exports.update = update;
|
|
27
27
|
function migrateReactDomRender(sourcePath, source) {
|
|
28
|
-
const allImports = (0,
|
|
28
|
+
const allImports = (0, js_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
29
29
|
const reactDomImport = allImports.find((x) => x.moduleSpecifier.getText() === "'react-dom'");
|
|
30
30
|
const changes = [];
|
|
31
31
|
if (reactDomImport) {
|
|
@@ -35,7 +35,7 @@ function migrateReactDomRender(sourcePath, source) {
|
|
|
35
35
|
text: '/client',
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
const calls = (0,
|
|
38
|
+
const calls = (0, js_1.findNodes)(source, ts.SyntaxKind.CallExpression);
|
|
39
39
|
const renderCall = calls.find((x) => {
|
|
40
40
|
if (x.expression.kind !== ts.SyntaxKind.PropertyAccessExpression)
|
|
41
41
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-react-dom-render-for-v18.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB
|
|
1
|
+
{"version":3,"file":"update-react-dom-render-for-v18.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addRemoteRoute = exports.addRemoteDefinition = exports.addRemoteToConfig = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const
|
|
5
|
+
const js_1 = require("@nx/js");
|
|
6
6
|
const ast_utils_1 = require("../utils/ast-utils");
|
|
7
7
|
const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
|
|
8
8
|
let tsModule;
|
|
@@ -10,7 +10,7 @@ function addRemoteToConfig(source, app) {
|
|
|
10
10
|
if (!tsModule) {
|
|
11
11
|
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
12
|
}
|
|
13
|
-
const assignments = (0,
|
|
13
|
+
const assignments = (0, js_1.findNodes)(source, tsModule.SyntaxKind.PropertyAssignment);
|
|
14
14
|
const remotesAssignment = assignments.find((s) => s.name.getText() === 'remotes');
|
|
15
15
|
if (remotesAssignment) {
|
|
16
16
|
const arrayExpression = remotesAssignment.initializer;
|
|
@@ -32,7 +32,7 @@ function addRemoteToConfig(source, app) {
|
|
|
32
32
|
},
|
|
33
33
|
].filter(Boolean);
|
|
34
34
|
}
|
|
35
|
-
const binaryExpressions = (0,
|
|
35
|
+
const binaryExpressions = (0, js_1.findNodes)(source, tsModule.SyntaxKind.BinaryExpression);
|
|
36
36
|
const exportExpression = binaryExpressions.find((b) => {
|
|
37
37
|
if (b.left.kind === tsModule.SyntaxKind.PropertyAccessExpression) {
|
|
38
38
|
const pae = b.left;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":";;;AACA,uCAAsD;AACtD
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ function loadModuleFederationConfigFromContext(context) {
|
|
|
10
10
|
}
|
|
11
11
|
catch (_a) {
|
|
12
12
|
// TODO(jack): Add a link to guide
|
|
13
|
-
throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@
|
|
13
|
+
throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/react:host"?`);
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
exports.loadModuleFederationConfigFromContext = loadModuleFederationConfigFromContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-config.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/load-config.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAG5B,SAAgB,qCAAqC,CACnD,OAAwB;IAExB,MAAM,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;IAEF,IAAI;QACF,OAAO,OAAO,CAAC,0BAA0B,CAA2B,CAAC;KACtE;IAAC,WAAM;QACN,kCAAkC;QAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"load-config.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/load-config.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAG5B,SAAgB,qCAAqC,CACnD,OAAwB;IAExB,MAAM,CAAC,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACvE,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;IAEF,IAAI;QACF,OAAO,OAAO,CAAC,0BAA0B,CAA2B,CAAC;KACtE;IAAC,WAAM;QACN,kCAAkC;QAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,qDAAqD,CAClG,CAAC;KACH;AACH,CAAC;AAlBD,sFAkBC"}
|