@nx/react 16.9.0-beta.2 → 16.9.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "16.9.0-beta.2",
+  "version": "16.9.0-beta.4",
   "private": false,
   "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.",
   "repository": {
@@ -31,21 +31,20 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/react": "16.9.0-beta.2",
-    "@nx/devkit": "16.9.0-beta.2",
-    "@nx/js": "16.9.0-beta.2",
-    "@nx/linter": "16.9.0-beta.2",
-    "@nx/web": "16.9.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "file-loader": "^6.2.0",
     "minimatch": "3.0.5",
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "@nx/devkit": "16.9.0-beta.4",
+    "@nx/js": "16.9.0-beta.4",
+    "@nx/linter": "16.9.0-beta.4",
+    "@nx/web": "16.9.0-beta.4",
+    "@nrwl/react": "*"
   },
   "publishConfig": {
     "access": "public"
   },
-  "type": "commonjs",
-  "gitHead": "e11d538fa2c7266066d554d9405abab8e0a65040"
+  "type": "commonjs"
 }

package/plugins/component-testing/index.js

@@ -75,7 +75,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
         if (!buildTarget) {
             throw new Error(`Unable to find the 'devServerTarget' executor option in the '${ctTargetName}' target of the '${ctProjectName}' project`);
         }
-        webpackConfig = buildTargetWebpack(graph, buildTarget, ctProjectName);
+        webpackConfig = buildTargetWebpack(ctExecutorContext, buildTarget, ctProjectName);
     }
     catch (e) {
         devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to build a webpack config with the project graph. 
@@ -126,7 +126,8 @@ function withSchemaDefaults(target, context) {
     options.generateIndexHtml ??= true;
     return options;
 }
-function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
+function buildTargetWebpack(ctx, buildTarget, componentTestingProjectName) {
+    const graph = ctx.projectGraph;
     const parsed = (0, devkit_1.parseTargetString)(buildTarget, graph);
     const buildableProjectConfig = graph.nodes[parsed.project]?.data;
     const ctProjectConfig = graph.nodes[componentTestingProjectName]?.data;

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -11,7 +11,7 @@ const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const tsnode_register_1 = require("@nx/js/src/utils/typescript/tsnode-register");
 function getBuildOptions(buildTarget, context) {
-    const target = (0, devkit_1.parseTargetString)(buildTarget, context.projectGraph);
+    const target = (0, devkit_1.parseTargetString)(buildTarget, context);
     const buildOptions = (0, devkit_1.readTargetOptions)(target, context);
     return {
         ...buildOptions,

package/src/module-federation/utils.d.ts

@@ -8,5 +8,5 @@ export declare function getModuleFederationConfig(mfConfig: ModuleFederationConf
     sharedDependencies: {
         [x: string]: import("@nx/webpack/src/utils/module-federation").SharedLibraryConfig;
     };
-    mappedRemotes: Record<string, string>;
+    mappedRemotes: {};
 }>;

package/src/module-federation/utils.js

@@ -46,12 +46,18 @@ async function getModuleFederationConfig(mfConfig, options = { isServer: false }
     };
     (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
     (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
+    // Choose the correct mapRemotes function based on the server state.
     const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
-    const determineRemoteUrlFn = options.determineRemoteUrl ||
-        getFunctionDeterminateRemoteUrl(options.isServer);
-    const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
-        ? {}
-        : mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrlFn);
+    // Determine the URL function, either from provided options or by using a default.
+    const determineRemoteUrlFunction = options.determineRemoteUrl
+        ? options.determineRemoteUrl
+        : getFunctionDeterminateRemoteUrl(options.isServer);
+    // Map the remotes if they exist, otherwise default to an empty object.
+    let mappedRemotes = {};
+    if (mfConfig.remotes && mfConfig.remotes.length > 0) {
+        const isLibraryTypeVar = mfConfig.library?.type === 'var';
+        mappedRemotes = mapRemotesFunction(mfConfig.remotes, 'js', determineRemoteUrlFunction, isLibraryTypeVar);
+    }
     return { sharedLibraries, sharedDependencies, mappedRemotes };
 }
 exports.getModuleFederationConfig = getModuleFederationConfig;

package/src/module-federation/with-module-federation.js

@@ -12,6 +12,10 @@ async function withModuleFederation(options) {
     return (config, ctx) => {
         config.output.uniqueName = options.name;
         config.output.publicPath = 'auto';
+        if (options.library?.type === 'var') {
+            config.output.scriptType = 'text/javascript';
+            config.experiments.outputModule = false;
+        }
         config.optimization = {
             runtimeChunk: false,
         };
@@ -28,6 +32,13 @@ async function withModuleFederation(options) {
             shared: {
                 ...sharedDependencies,
             },
+            /**
+             * remoteType: 'script' is required for the remote to be loaded as a script tag.
+             * remotes will need to be defined as:
+             *  { appX: 'appX@http://localhost:3001/remoteEntry.js' }
+             *  { appY: 'appY@http://localhost:3002/remoteEntry.js' }
+             */
+            ...(options.library?.type === 'var' ? { remoteType: 'script' } : {}),
         }), sharedLibraries.getReplacementPlugin());
         return config;
     };

package/CHANGELOG.md

@@ -1,8 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-
-
-**Note:** Version bump only for package @nx/react