@nx/react 16.0.0-rc.0 → 16.0.0

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/react",
3
- "version": "16.0.0-rc.0",
3
+ "version": "16.0.0",
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,11 +31,11 @@
31
31
  "migrations": "./migrations.json"
32
32
  },
33
33
  "dependencies": {
34
- "@nrwl/react": "16.0.0-rc.0",
35
- "@nx/devkit": "16.0.0-rc.0",
36
- "@nx/js": "16.0.0-rc.0",
37
- "@nx/linter": "16.0.0-rc.0",
38
- "@nx/web": "16.0.0-rc.0",
34
+ "@nrwl/react": "16.0.0",
35
+ "@nx/devkit": "16.0.0",
36
+ "@nx/js": "16.0.0",
37
+ "@nx/linter": "16.0.0",
38
+ "@nx/web": "16.0.0",
39
39
  "@phenomnomnominal/tsquery": "~5.0.1",
40
40
  "@svgr/webpack": "^6.1.2",
41
41
  "chalk": "^4.1.0",
@@ -46,5 +46,5 @@
46
46
  "access": "public"
47
47
  },
48
48
  "types": "./index.d.ts",
49
- "gitHead": "19e34df1cd3e286cacc9e73781cbb8fbbcd6fc69"
49
+ "gitHead": "f537a4caebbf6f65f5f5733fb9ad9c9167d4b504"
50
50
  }
@@ -13,9 +13,9 @@ const ct_utils_1 = require("../../utils/ct-utils");
13
13
  */
14
14
  function cypressComponentConfigGenerator(tree, options) {
15
15
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
16
- const { cypressComponentProject } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
16
+ const { cypressComponentConfiguration: baseCyCtConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
17
17
  const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
18
- const installTask = yield cypressComponentProject(tree, {
18
+ const installTask = yield baseCyCtConfig(tree, {
19
19
  project: options.project,
20
20
  skipFormat: true,
21
21
  });
@@ -1 +1 @@
1
- {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mDAAiD;AACjD,+CAA2C;AAC3C,mDAA+E;AAG/E;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAAC,aAAa,EAAE,oBAAS,CAAC,CAAC;QAC5E,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAgB,MAAM,IAAA,qCAA0B,EAAC,IAAI,EAAE;YAChE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,qBAAqB;gBACrB,gBAAgB;gBAChB,uBAAuB;gBACvB,kBAAkB;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AA/BD,0EA+BC;AAED,kBAAe,+BAA+B,CAAC"}
1
+ {"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AACpB,mDAAiD;AACjD,+CAA2C;AAC3C,mDAA+E;AAG/E;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,6BAA6B,EAAE,cAAc,EAAE,GAAG,IAAA,sBAAa,EAErE,aAAa,EAAE,oBAAS,CAAC,CAAC;QAC5B,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE;YAC7C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAgB,MAAM,IAAA,qCAA0B,EAAC,IAAI,EAAE;YAChE,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,qBAAqB;gBACrB,gBAAgB;gBAChB,uBAAuB;gBACvB,kBAAkB;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAEpD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAjCD,0EAiCC;AAED,kBAAe,+BAA+B,CAAC"}
@@ -1,12 +1,12 @@
1
- const { composePlugins, withNx } = require('@nx/webpack');
2
- const { withReact } = require('@nx/react');
3
- const { withModuleFederationForSSR } = require('@nx/react/module-federation');
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
 
7
7
  const defaultConfig = {
8
- ...baseConfig
8
+ ...baseConfig
9
9
  };
10
10
 
11
11
  // Nx plugins for webpack to build config object from Nx options and context.
12
- module.exports = composePlugins(withNx(), withReact(), withModuleFederationForSSR(defaultConfig));
12
+ module.exports = composePlugins(withNx(), withReact({ssr: true}), withModuleFederationForSSR(defaultConfig));
@@ -1,12 +1,12 @@
1
- const { composePlugins, withNx } = require('@nx/webpack');
2
- const { withReact } = require('@nx/react');
3
- const { withModuleFederationForSSR } = require('@nx/react/module-federation');
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
 
7
7
  const defaultConfig = {
8
- ...baseConfig,
8
+ ...baseConfig,
9
9
  };
10
10
 
11
11
  // Nx plugins for webpack to build config object from Nx options and context.
12
- module.exports = composePlugins(withNx(), withReact(), withModuleFederationForSSR(defaultConfig));
12
+ module.exports = composePlugins(withNx(), withReact({ssr: true}), withModuleFederationForSSR(defaultConfig));
@@ -1,6 +1,8 @@
1
1
  import { ModuleFederationConfig } from '@nx/devkit/src/utils/module-federation';
2
- export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, determineRemoteUrl: (remote: string) => string, options?: {
2
+ export declare function getFunctionDeterminateRemoteUrl(isServer?: boolean): (remote: string) => string;
3
+ export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, options?: {
3
4
  isServer: boolean;
5
+ determineRemoteUrl?: (remote: string) => string;
4
6
  }): Promise<{
5
7
  sharedLibraries: import("@nx/devkit").SharedWorkspaceLibraryConfig;
6
8
  sharedDependencies: {
@@ -1,10 +1,28 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getModuleFederationConfig = void 0;
3
+ exports.getModuleFederationConfig = exports.getFunctionDeterminateRemoteUrl = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const module_federation_1 = require("@nx/devkit/src/utils/module-federation");
6
6
  const devkit_1 = require("@nx/devkit");
7
- function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isServer: false }) {
7
+ const project_graph_1 = require("nx/src/project-graph/project-graph");
8
+ function getFunctionDeterminateRemoteUrl(isServer = false) {
9
+ const target = isServer ? 'serve-server' : 'serve';
10
+ const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.js';
11
+ return function (remote) {
12
+ var _a, _b, _c, _d, _e;
13
+ const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
14
+ const serveTarget = (_a = remoteConfiguration === null || remoteConfiguration === void 0 ? void 0 : remoteConfiguration.targets) === null || _a === void 0 ? void 0 : _a[target];
15
+ if (!serveTarget) {
16
+ throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "${serveTarget}" target.\n
17
+ You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
18
+ }
19
+ const host = (_c = (_b = serveTarget.options) === null || _b === void 0 ? void 0 : _b.host) !== null && _c !== void 0 ? _c : 'http://localhost';
20
+ const port = (_e = (_d = serveTarget.options) === null || _d === void 0 ? void 0 : _d.port) !== null && _e !== void 0 ? _e : 4201;
21
+ return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/${remoteEntry}`;
22
+ };
23
+ }
24
+ exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
25
+ function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
8
26
  var _a;
9
27
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
10
28
  let projectGraph;
@@ -29,9 +47,11 @@ function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isS
29
47
  (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
30
48
  (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
31
49
  const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
50
+ const determineRemoteUrlFn = options.determineRemoteUrl ||
51
+ getFunctionDeterminateRemoteUrl(options.isServer);
32
52
  const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
33
53
  ? {}
34
- : mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrl);
54
+ : mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrlFn);
35
55
  return { sharedLibraries, sharedDependencies, mappedRemotes };
36
56
  });
37
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/utils.ts"],"names":[],"mappings":";;;;AAAA,8EASgD;AAEhD,uCAIoB;AAEpB,SAAsB,yBAAyB,CAC7C,QAAgC,EAChC,kBAA8C,EAC9C,UAAiC,EAAE,QAAQ,EAAE,KAAK,EAAE;;;QAEpD,IAAI,YAA0B,CAAC;QAC/B,IAAI;YACF,YAAY,GAAG,IAAA,+BAAsB,GAAE,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;SAChD;QAED,MAAM,OAAO,GAAG,MAAA,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,0CAAE,IAAI,CAAC;QAExD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,KAAK,CACT,wBAAwB,QAAQ,CAAC,IAAI,kEAAkE,CACxG,CAAC;SACH;QAED,MAAM,YAAY,GAAG,IAAA,kDAA8B,EACjD,YAAY,EACZ,QAAQ,CAAC,IAAI,CACd,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,YAAY,CAAC,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC,MAAM,CACtE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,KAAK,CACtD,CAAC;YACF,YAAY,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,CACxD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,KAAK,CAC5C,CAAC;SACH;QAED,MAAM,eAAe,GAAG,IAAA,2CAAuB,EAC7C,YAAY,CAAC,kBAAkB,CAChC,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,iCAAa,EAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE5D,MAAM,kBAAkB,mCACnB,eAAe,CAAC,YAAY,EAAE,GAC9B,WAAW,CACf,CAAC;QAEF,IAAA,uCAAmB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACzD,IAAA,yCAAqB,EACnB,kBAAkB,EAClB,QAAQ,CAAC,gBAAgB,EACzB,YAAY,CACb,CAAC;QAEF,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,oCAAgB,CAAC,CAAC,CAAC,8BAAU,CAAC;QAC5E,MAAM,aAAa,GACjB,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAChD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAErE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAC;;CAC/D;AA3DD,8DA2DC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/utils.ts"],"names":[],"mappings":";;;;AAAA,8EASgD;AAEhD,uCAIoB;AACpB,sEAAoF;AAEpF,SAAgB,+BAA+B,CAAC,WAAoB,KAAK;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACnD,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAE1E,OAAO,UAAU,MAAc;;QAC7B,MAAM,mBAAmB,GAAG,IAAA,8CAA8B,EAAC,MAAM,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAG,MAAM,CAAC,CAAC;QAE3D,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM,mDAAmD,WAAW;mJACsB,CAC5I,CAAC;SACH;QAED,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,kBAAkB,CAAC;QAC7D,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;QAC/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,IAAI,WAAW,EAAE,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AArBD,0EAqBC;AAED,SAAsB,yBAAyB,CAC7C,QAAgC,EAChC,UAGI,EAAE,QAAQ,EAAE,KAAK,EAAE;;;QAEvB,IAAI,YAA0B,CAAC;QAC/B,IAAI;YACF,YAAY,GAAG,IAAA,+BAAsB,GAAE,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;SAChD;QAED,MAAM,OAAO,GAAG,MAAA,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,0CAAE,IAAI,CAAC;QAExD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,KAAK,CACT,wBAAwB,QAAQ,CAAC,IAAI,kEAAkE,CACxG,CAAC;SACH;QAED,MAAM,YAAY,GAAG,IAAA,kDAA8B,EACjD,YAAY,EACZ,QAAQ,CAAC,IAAI,CACd,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,YAAY,CAAC,kBAAkB,GAAG,YAAY,CAAC,kBAAkB,CAAC,MAAM,CACtE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,KAAK,CACtD,CAAC;YACF,YAAY,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,CACxD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,KAAK,CAC5C,CAAC;SACH;QAED,MAAM,eAAe,GAAG,IAAA,2CAAuB,EAC7C,YAAY,CAAC,kBAAkB,CAChC,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,iCAAa,EAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE5D,MAAM,kBAAkB,mCACnB,eAAe,CAAC,YAAY,EAAE,GAC9B,WAAW,CACf,CAAC;QAEF,IAAA,uCAAmB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QACzD,IAAA,yCAAqB,EACnB,kBAAkB,EAClB,QAAQ,CAAC,gBAAgB,EACzB,YAAY,CACb,CAAC;QAEF,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,oCAAgB,CAAC,CAAC,CAAC,8BAAU,CAAC;QAC5E,MAAM,oBAAoB,GACxB,OAAO,CAAC,kBAAkB;YAC1B,+BAA+B,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpD,MAAM,aAAa,GACjB,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;YAChD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAEvE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAC;;CAC/D;AAhED,8DAgEC"}
@@ -2,28 +2,13 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.withModuleFederationForSSR = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const project_graph_1 = require("nx/src/project-graph/project-graph");
6
5
  const utils_1 = require("./utils");
7
- function determineRemoteUrl(remote) {
8
- var _a, _b, _c, _d, _e;
9
- const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
10
- const serveTarget = (_a = remoteConfiguration === null || remoteConfiguration === void 0 ? void 0 : remoteConfiguration.targets) === null || _a === void 0 ? void 0 : _a['serve-server'];
11
- if (!serveTarget) {
12
- throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "serve-server" target.\n
13
- You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
14
- }
15
- const host = (_c = (_b = serveTarget.options) === null || _b === void 0 ? void 0 : _b.host) !== null && _c !== void 0 ? _c : 'http://localhost';
16
- const port = (_e = (_d = serveTarget.options) === null || _d === void 0 ? void 0 : _d.port) !== null && _e !== void 0 ? _e : 4201;
17
- return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/server/remoteEntry.js`;
18
- }
19
6
  function withModuleFederationForSSR(options) {
20
7
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
21
- const reactWebpackConfig = require('../../plugins/webpack');
22
- const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, determineRemoteUrl, {
8
+ const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, {
23
9
  isServer: true,
24
10
  });
25
11
  return (config) => {
26
- config = reactWebpackConfig(config);
27
12
  config.target = false;
28
13
  config.output.uniqueName = options.name;
29
14
  config.optimization = {
@@ -1 +1 @@
1
- {"version":3,"file":"with-module-federation-ssr.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation-ssr.ts"],"names":[],"mappings":";;;;AACA,sEAAoF;AACpF,mCAAoD;AAEpD,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,0CAAG,cAAc,CAAC,CAAC;IAEnE,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,wBAAwB,CAAC;AACnC,CAAC;AAED,SAAsB,0BAA0B,CAC9C,OAA+B;;QAE/B,MAAM,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE,kBAAkB,EAAE;YAC3D,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEL,OAAO,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAEpC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;YACtB,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,MAAM,CAAC,YAAY,GAAG;gBACpB,YAAY,EAAE,KAAK;aACpB,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,CAChE;gBACE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,aAAa;gBACtB,MAAM,oBACD,kBAAkB,CACtB;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB;iBACxB;gBACD,QAAQ,EAAE,IAAI;aACf,EACD,EAAE,CACH,EACD,eAAe,CAAC,oBAAoB,EAAE,CACvC,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAzCD,gEAyCC"}
1
+ {"version":3,"file":"with-module-federation-ssr.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation-ssr.ts"],"names":[],"mappings":";;;;AACA,mCAAoD;AAEpD,SAAsB,0BAA0B,CAC9C,OAA+B;;QAE/B,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEL,OAAO,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;YACtB,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,MAAM,CAAC,YAAY,GAAG;gBACpB,YAAY,EAAE,KAAK;aACpB,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,yBAAyB,CAAC,CAChE;gBACE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,aAAa;gBACtB,MAAM,oBACD,kBAAkB,CACtB;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB;iBACxB;gBACD,QAAQ,EAAE,IAAI;aACf,EACD,EAAE,CACH,EACD,eAAe,CAAC,oBAAoB,EAAE,CACvC,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AArCD,gEAqCC"}
@@ -2,32 +2,17 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.withModuleFederation = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const project_graph_1 = require("nx/src/project-graph/project-graph");
6
5
  const utils_1 = require("./utils");
7
6
  const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
8
- function determineRemoteUrl(remote) {
9
- var _a, _b, _c, _d, _e;
10
- const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
11
- const serveTarget = (_a = remoteConfiguration === null || remoteConfiguration === void 0 ? void 0 : remoteConfiguration.targets) === null || _a === void 0 ? void 0 : _a.serve;
12
- if (!serveTarget) {
13
- throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "serve" target.\n
14
- You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
15
- }
16
- const host = (_c = (_b = serveTarget.options) === null || _b === void 0 ? void 0 : _b.host) !== null && _c !== void 0 ? _c : 'http://localhost';
17
- const port = (_e = (_d = serveTarget.options) === null || _d === void 0 ? void 0 : _d.port) !== null && _e !== void 0 ? _e : 4201;
18
- return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/remoteEntry.js`;
19
- }
20
7
  /**
21
8
  * @param {ModuleFederationConfig} options
22
9
  * @return {Promise<AsyncNxWebpackPlugin>}
23
10
  */
24
11
  function withModuleFederation(options) {
25
12
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
26
- const reactWebpackConfig = require('../../plugins/webpack');
27
- const { sharedDependencies, sharedLibraries, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, determineRemoteUrl);
13
+ const { sharedDependencies, sharedLibraries, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options);
28
14
  return (config, ctx) => {
29
15
  var _a;
30
- config = reactWebpackConfig(config, ctx);
31
16
  config.output.uniqueName = options.name;
32
17
  config.output.publicPath = 'auto';
33
18
  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;AAEpD,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;;;GAGG;AACH,SAAsB,oBAAoB,CACxC,OAA+B;;QAE/B,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,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC9C,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
+ {"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,mCAAoD;AAEpD,uFAAwF;AAExF;;;GAGG;AACH,SAAsB,oBAAoB,CACxC,OAA+B;;QAE/B,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,CAAC,CAAC;QAE3C,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;;YACrB,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,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC9C,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;AAnCD,oDAmCC"}