@nrwl/react 15.6.1 → 15.6.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/CHANGELOG.md +1 -1
- package/package.json +5 -5
- package/plugins/storybook/index.js +3 -8
- package/plugins/storybook/index.js.map +1 -1
- package/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ +3 -3
- package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js +2 -2
- package/src/module-federation/with-module-federation.d.ts +1 -1
- package/src/module-federation/with-module-federation.js +2 -2
- package/src/module-federation/with-module-federation.js.map +1 -1
- package/src/rules/update-module-federation-project.d.ts +2 -2
- package/src/rules/update-module-federation-project.js +2 -0
- package/src/rules/update-module-federation-project.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
## [15.6.
|
|
6
|
+
## [15.6.3](https://github.com/nrwl/nx/compare/15.6.2...15.6.3) (2023-01-27)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/react
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/react",
|
|
3
|
-
"version": "15.6.
|
|
3
|
+
"version": "15.6.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,9 +31,9 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/devkit": "15.6.
|
|
35
|
-
"@nrwl/linter": "15.6.
|
|
36
|
-
"@nrwl/workspace": "15.6.
|
|
34
|
+
"@nrwl/devkit": "15.6.3",
|
|
35
|
+
"@nrwl/linter": "15.6.3",
|
|
36
|
+
"@nrwl/workspace": "15.6.3",
|
|
37
37
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
38
38
|
"chalk": "^4.1.0",
|
|
39
39
|
"minimatch": "3.0.5"
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
44
|
"types": "./index.d.ts",
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "4a5a231a3eca0d648408941147be509cd827dd78"
|
|
46
46
|
}
|
|
@@ -59,18 +59,13 @@ const webpack = (storybookWebpackConfig = {}, options) => tslib_1.__awaiter(void
|
|
|
59
59
|
const tsconfigPath = (0, path_1.join)(options.configDir, 'tsconfig.json');
|
|
60
60
|
const builderOptions = Object.assign(Object.assign({}, options), { root: options.configDir,
|
|
61
61
|
// These are blank because root is the absolute path to .storybook folder
|
|
62
|
-
projectRoot: '', sourceRoot: '', fileReplacements: [], sourceMap: {
|
|
63
|
-
hidden: false,
|
|
64
|
-
scripts: true,
|
|
65
|
-
styles: true,
|
|
66
|
-
vendors: false,
|
|
67
|
-
}, styles: (_a = options.styles) !== null && _a !== void 0 ? _a : [], optimization: {}, tsConfig: tsconfigPath, extractCss: storybookWebpackConfig.mode === 'production', target: 'web' });
|
|
62
|
+
projectRoot: '', sourceRoot: '', fileReplacements: [], sourceMap: true, styles: (_a = options.styles) !== null && _a !== void 0 ? _a : [], optimization: {}, tsConfig: tsconfigPath, extractCss: storybookWebpackConfig.mode === 'production', target: 'web' });
|
|
68
63
|
// ESM build for modern browsers.
|
|
69
64
|
let baseWebpackConfig = {};
|
|
70
|
-
const configure = (0, config_1.
|
|
65
|
+
const configure = (0, config_1.composePluginsSync)(withNx({ skipTypeChecking: true }), withWeb(), (0, with_react_1.withReact)());
|
|
71
66
|
const finalConfig = configure(baseWebpackConfig, {
|
|
72
67
|
options: builderOptions,
|
|
73
|
-
context: {}, // The context is not used here.
|
|
68
|
+
context: { root: devkit_1.workspaceRoot }, // The context is not used here.
|
|
74
69
|
});
|
|
75
70
|
return Object.assign(Object.assign({}, storybookWebpackConfig), { module: Object.assign(Object.assign({}, storybookWebpackConfig.module), { rules: [
|
|
76
71
|
...storybookWebpackConfig.module.rules,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
const { composePlugins, withNx } = require('@nrwl/webpack');
|
|
2
|
+
const { withReact } = require('@nrwl/react');
|
|
3
|
+
const { withModuleFederationForSSR } = require('@nrwl/react/module-federation');
|
|
4
4
|
|
|
5
5
|
const baseConfig = require('./module-federation.config');
|
|
6
6
|
|
|
@@ -19,14 +19,14 @@ function addTailwindStyleImports(tree, project, _options) {
|
|
|
19
19
|
const stylesPath = candidates.find((x) => tree.exists(x));
|
|
20
20
|
if (stylesPath) {
|
|
21
21
|
const content = tree.read(stylesPath).toString();
|
|
22
|
-
tree.write(stylesPath, `@tailwind
|
|
22
|
+
tree.write(stylesPath, `@tailwind base;\n@tailwind components;\n@tailwind utilities;\n${content}`);
|
|
23
23
|
}
|
|
24
24
|
else {
|
|
25
25
|
devkit_1.logger.warn((0, devkit_1.stripIndents) `
|
|
26
26
|
Could not find stylesheet to update. Add the following imports to your stylesheet (e.g. styles.css):
|
|
27
27
|
|
|
28
|
-
@tailwind components;
|
|
29
28
|
@tailwind base;
|
|
29
|
+
@tailwind components;
|
|
30
30
|
@tailwind utilities;
|
|
31
31
|
|
|
32
32
|
See our guide for more details: https://nx.dev/guides/using-tailwind-css-in-react`);
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ModuleFederationConfig } from '@nrwl/devkit';
|
|
2
|
-
export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any) => any>;
|
|
2
|
+
export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any, ctx: any) => any>;
|
|
@@ -21,8 +21,8 @@ function withModuleFederation(options) {
|
|
|
21
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
const reactWebpackConfig = require('../../plugins/webpack');
|
|
23
23
|
const { sharedDependencies, sharedLibraries, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, determineRemoteUrl);
|
|
24
|
-
return (config) => {
|
|
25
|
-
config = reactWebpackConfig(config);
|
|
24
|
+
return (config, ctx) => {
|
|
25
|
+
config = reactWebpackConfig(config, ctx);
|
|
26
26
|
config.output.uniqueName = options.name;
|
|
27
27
|
config.output.publicPath = 'auto';
|
|
28
28
|
config.optimization = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,sEAAoF;AACpF,mCAAoD;AACpD,uFAAwF;AAExF,SAAS,kBAAkB,CAAC,MAAc;;IACxC,MAAM,mBAAmB,GAAG,IAAA,8CAA8B,EAAC,MAAM,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAE,KAAK,CAAC;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM;mJACsF,CAC9I,CAAC;KACH;IAED,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,kBAAkB,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;IAC/C,OAAO,GACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,IAAI,IAAI,iBAAiB,CAAC;AAC5B,CAAC;AAED,SAAsB,oBAAoB,CAAC,OAA+B;;QACxE,MAAM,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAE/D,OAAO,CAAC,MAAM,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,sEAAoF;AACpF,mCAAoD;AACpD,uFAAwF;AAExF,SAAS,kBAAkB,CAAC,MAAc;;IACxC,MAAM,mBAAmB,GAAG,IAAA,8CAA8B,EAAC,MAAM,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAE,KAAK,CAAC;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM;mJACsF,CAC9I,CAAC;KACH;IAED,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,kBAAkB,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;IAC/C,OAAO,GACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,IAAI,IAAI,iBAAiB,CAAC;AAC5B,CAAC;AAED,SAAsB,oBAAoB,CAAC,OAA+B;;QACxE,MAAM,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAE/D,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACrB,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACzC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;YAElC,MAAM,CAAC,YAAY,GAAG;gBACpB,YAAY,EAAE,KAAK;aACpB,CAAC;YAEF,MAAM,CAAC,WAAW,mCACb,MAAM,CAAC,WAAW,KACrB,YAAY,EAAE,IAAI,GACnB,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,IAAI,sBAAsB,CAAC;gBACzB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,aAAa;gBACtB,MAAM,oBACD,kBAAkB,CACtB;aACF,CAAC,EACF,eAAe,CAAC,oBAAoB,EAAE,CACvC,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAtCD,oDAsCC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
export declare function updateModuleFederationProject(host: Tree, options: {
|
|
3
3
|
projectName: string;
|
|
4
4
|
appProjectRoot: string;
|
|
5
5
|
devServerPort?: number;
|
|
6
|
-
}):
|
|
6
|
+
}): GeneratorCallback;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateModuleFederationProject = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("../utils/versions");
|
|
5
6
|
function updateModuleFederationProject(host, options) {
|
|
6
7
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
|
|
7
8
|
projectConfig.targets.build.options = Object.assign(Object.assign({}, projectConfig.targets.build.options), { main: `${options.appProjectRoot}/src/main.ts`, webpackConfig: `${options.appProjectRoot}/webpack.config.js` });
|
|
@@ -27,6 +28,7 @@ function updateModuleFederationProject(host, options) {
|
|
|
27
28
|
},
|
|
28
29
|
};
|
|
29
30
|
(0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
|
|
31
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@nrwl/web': versions_1.nxVersion });
|
|
30
32
|
}
|
|
31
33
|
exports.updateModuleFederationProject = updateModuleFederationProject;
|
|
32
34
|
//# sourceMappingURL=update-module-federation-project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-module-federation-project.js","sourceRoot":"","sources":["../../../../../packages/react/src/rules/update-module-federation-project.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-module-federation-project.js","sourceRoot":"","sources":["../../../../../packages/react/src/rules/update-module-federation-project.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,gDAA8C;AAE9C,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAIC;IAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1E,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCAC9B,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KACtC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,cAAc,EAC7C,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,GAC7D,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,mCAChD,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,KACxD,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,yBAAyB,GAClE,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ;QAClC,0CAA0C,CAAC;IAC7C,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IAEjE,uEAAuE;IACvE,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;QACtC,QAAQ,EAAE,uBAAuB;QACjC,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,IAAI,EAAE,OAAO,CAAC,aAAa;SAC5B;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;aACxD;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;aACvD;SACF;KACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAErE,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,oBAAS,EAAE,CAAC,CAAC;AAC5E,CAAC;AA9CD,sEA8CC"}
|