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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "16.9.0-beta.2",
+  "version": "16.9.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -30,9 +30,6 @@
   },
   "dependencies": {
     "@babel/core": "^7.22.9",
-    "@nrwl/webpack": "16.9.0-beta.2",
-    "@nx/devkit": "16.9.0-beta.2",
-    "@nx/js": "16.9.0-beta.2",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
     "browserslist": "^4.21.4",
@@ -64,11 +61,13 @@
     "webpack": "^5.80.0",
     "webpack-dev-server": "^4.9.3",
     "webpack-node-externals": "^3.0.0",
-    "webpack-subresource-integrity": "^5.1.0"
+    "webpack-subresource-integrity": "^5.1.0",
+    "@nx/devkit": "16.9.0-beta.4",
+    "@nx/js": "16.9.0-beta.4",
+    "@nrwl/webpack": "*"
   },
   "publishConfig": {
     "access": "public"
   },
-  "type": "commonjs",
-  "gitHead": "e11d538fa2c7266066d554d9405abab8e0a65040"
+  "type": "commonjs"
 }

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

@@ -47,7 +47,7 @@ async function* devServerExecutor(serveOptions, context) {
 }
 exports.devServerExecutor = devServerExecutor;
 function getBuildOptions(options, context) {
-    const target = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
+    const target = (0, devkit_1.parseTargetString)(options.buildTarget, context);
     const overrides = {
         watch: false,
     };

package/src/executors/ssr-dev-server/ssr-dev-server.impl.js

@@ -7,7 +7,7 @@ const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_until_server_is_listening_1 = require("./lib/wait-until-server-is-listening");
 async function* ssrDevServerExecutor(options, context) {
     const browserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, context.projectGraph);
-    const serverTarget = (0, devkit_1.parseTargetString)(options.serverTarget, context.projectGraph);
+    const serverTarget = (0, devkit_1.parseTargetString)(options.serverTarget, context);
     const browserOptions = (0, devkit_1.readTargetOptions)(browserTarget, context);
     const serverOptions = (0, devkit_1.readTargetOptions)(serverTarget, context);
     const runBrowser = await (0, devkit_1.runExecutor)(browserTarget, { ...browserOptions, ...options.browserTargetOptions }, context);

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

@@ -7,7 +7,7 @@ import { Remotes } from './models';
  * @param remoteEntryExt - The file extension of the remoteEntry file
  * @param determineRemoteUrl - The function used to lookup the URL of the served remote
  */
-export declare function mapRemotes(remotes: Remotes, remoteEntryExt: 'js' | 'mjs', determineRemoteUrl: (remote: string) => string): Record<string, string>;
+export declare function mapRemotes(remotes: Remotes, remoteEntryExt: 'js' | 'mjs', determineRemoteUrl: (remote: string) => string, isRemoteGlobal?: boolean): Record<string, string>;
 /**
  * Map remote names to a format that can be understood and used by Module
  * Federation.

package/src/utils/module-federation/remotes.js

@@ -10,25 +10,40 @@ const path_1 = require("path");
  * @param remoteEntryExt - The file extension of the remoteEntry file
  * @param determineRemoteUrl - The function used to lookup the URL of the served remote
  */
-function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl) {
+function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl, isRemoteGlobal = false) {
     const mappedRemotes = {};
     for (const remote of remotes) {
         if (Array.isArray(remote)) {
-            const [remoteName, remoteLocation] = remote;
-            const remoteLocationExt = (0, path_1.extname)(remoteLocation);
-            mappedRemotes[remoteName] = ['.js', '.mjs'].includes(remoteLocationExt)
-                ? remoteLocation
-                : `${remoteLocation.endsWith('/')
-                    ? remoteLocation.slice(0, -1)
-                    : remoteLocation}/remoteEntry.${remoteEntryExt}`;
+            mappedRemotes[remote[0]] = handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal);
         }
         else if (typeof remote === 'string') {
-            mappedRemotes[remote] = determineRemoteUrl(remote);
+            mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl, isRemoteGlobal);
         }
     }
     return mappedRemotes;
 }
 exports.mapRemotes = mapRemotes;
+// Helper function to deal with remotes that are arrays
+function handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal) {
+    const [remoteName, remoteLocation] = remote;
+    const remoteLocationExt = (0, path_1.extname)(remoteLocation);
+    // If remote location already has .js or .mjs extension
+    if (['.js', '.mjs'].includes(remoteLocationExt)) {
+        return remoteLocation;
+    }
+    const baseRemote = remoteLocation.endsWith('/')
+        ? remoteLocation.slice(0, -1)
+        : remoteLocation;
+    const globalPrefix = isRemoteGlobal
+        ? `${remoteName.replace(/-/g, '_')}@`
+        : '';
+    return `${globalPrefix}${baseRemote}/remoteEntry.${remoteEntryExt}`;
+}
+// Helper function to deal with remotes that are strings
+function handleStringRemote(remote, determineRemoteUrl, isRemoteGlobal) {
+    const globalPrefix = isRemoteGlobal ? `${remote.replace(/-/g, '_')}@` : '';
+    return `${globalPrefix}${determineRemoteUrl(remote)}`;
+}
 /**
  * Map remote names to a format that can be understood and used by Module
  * Federation.

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/webpack