@nx/webpack 16.9.0-beta.1 → 16.9.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "16.9.0-beta.1",
+  "version": "16.9.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "@babel/core": "^7.22.9",
-    "@nrwl/webpack": "16.9.0-beta.1",
-    "@nx/devkit": "16.9.0-beta.1",
-    "@nx/js": "16.9.0-beta.1",
+    "@nrwl/webpack": "16.9.0-beta.3",
+    "@nx/devkit": "16.9.0-beta.3",
+    "@nx/js": "16.9.0-beta.3",
     "autoprefixer": "^10.4.9",
     "babel-loader": "^9.1.2",
     "browserslist": "^4.21.4",
@@ -70,5 +70,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "5056d6cefb2949ba865019e8b71e633fba28c091"
+  "gitHead": "d5692528c089a75c76b21d2d1235d8cc5dbb1d26"
 }

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/models/index.d.ts

@@ -10,7 +10,7 @@ export type WorkspaceLibrary = {
 };
 export type SharedWorkspaceLibraryConfig = {
     getAliases: () => Record<string, string>;
-    getLibraries: (eager?: boolean) => Record<string, SharedLibraryConfig>;
+    getLibraries: (projectRoot: string, eager?: boolean) => Record<string, SharedLibraryConfig>;
     getReplacementPlugin: () => NormalModuleReplacementPlugin;
 };
 export type Remotes = string[] | [remoteName: string, remoteUrl: string][];

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/src/utils/module-federation/share.d.ts

@@ -5,10 +5,10 @@ import { type ProjectGraph } from '@nx/devkit';
  * Build an object of functions to be used with the ModuleFederationPlugin to
  * share Nx Workspace Libraries between Hosts and Remotes.
  *
- * @param libraries - The Nx Workspace Libraries to share
+ * @param workspaceLibs - The Nx Workspace Libraries to share
  * @param tsConfigPath - The path to TS Config File that contains the Path Mappings for the Libraries
  */
-export declare function shareWorkspaceLibraries(libraries: WorkspaceLibrary[], tsConfigPath?: string): SharedWorkspaceLibraryConfig;
+export declare function shareWorkspaceLibraries(workspaceLibs: WorkspaceLibrary[], tsConfigPath?: string): SharedWorkspaceLibraryConfig;
 /**
  * Build the Module Federation Share Config for a specific package and the
  * specified version of that package.

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

@@ -6,15 +6,16 @@ const package_json_1 = require("./package-json");
 const typescript_1 = require("./typescript");
 const secondary_entry_points_1 = require("./secondary-entry-points");
 const devkit_1 = require("@nx/devkit");
+const fs_1 = require("fs");
 /**
  * Build an object of functions to be used with the ModuleFederationPlugin to
  * share Nx Workspace Libraries between Hosts and Remotes.
  *
- * @param libraries - The Nx Workspace Libraries to share
+ * @param workspaceLibs - The Nx Workspace Libraries to share
  * @param tsConfigPath - The path to TS Config File that contains the Path Mappings for the Libraries
  */
-function shareWorkspaceLibraries(libraries, tsConfigPath = process.env.NX_TSCONFIG_PATH ?? (0, typescript_1.getRootTsConfigPath)()) {
-    if (!libraries) {
+function shareWorkspaceLibraries(workspaceLibs, tsConfigPath = process.env.NX_TSCONFIG_PATH ?? (0, typescript_1.getRootTsConfigPath)()) {
+    if (!workspaceLibs) {
         return getEmptySharedLibrariesConfig();
     }
     const tsconfigPathAliases = (0, typescript_1.readTsPathMappings)(tsConfigPath);
@@ -23,7 +24,7 @@ function shareWorkspaceLibraries(libraries, tsConfigPath = process.env.NX_TSCONF
     }
     const pathMappings = [];
     for (const [key, paths] of Object.entries(tsconfigPathAliases)) {
-        const library = libraries.find((lib) => lib.importKey === key);
+        const library = workspaceLibs.find((lib) => lib.importKey === key);
         if (!library) {
             continue;
         }
@@ -41,10 +42,41 @@ function shareWorkspaceLibraries(libraries, tsConfigPath = process.env.NX_TSCONF
     const webpack = require('webpack');
     return {
         getAliases: () => pathMappings.reduce((aliases, library) => ({ ...aliases, [library.name]: library.path }), {}),
-        getLibraries: (eager) => pathMappings.reduce((libraries, library) => ({
-            ...libraries,
-            [library.name]: { requiredVersion: false, eager },
-        }), {}),
+        getLibraries: (projectRoot, eager) => {
+            let pkgJson = null;
+            if (projectRoot &&
+                (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot, 'package.json'))) {
+                pkgJson = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, projectRoot, 'package.json'));
+            }
+            return pathMappings.reduce((libraries, library) => {
+                // Check to see if the library version is declared in the app's package.json
+                let version = pkgJson?.dependencies?.[library.name];
+                if (!version && workspaceLibs.length > 0) {
+                    const workspaceLib = workspaceLibs.find((lib) => lib.importKey === library.name);
+                    const libPackageJsonPath = workspaceLib
+                        ? (0, path_1.join)(workspaceLib.root, 'package.json')
+                        : null;
+                    if (libPackageJsonPath && (0, fs_1.existsSync)(libPackageJsonPath)) {
+                        pkgJson = (0, devkit_1.readJsonFile)(libPackageJsonPath);
+                        if (pkgJson) {
+                            version = pkgJson.version;
+                        }
+                    }
+                }
+                return {
+                    ...libraries,
+                    [library.name]: {
+                        ...(version
+                            ? {
+                                requiredVersion: version,
+                                singleton: true,
+                            }
+                            : { requiredVersion: false }),
+                        eager,
+                    },
+                };
+            }, {});
+        },
         getReplacementPlugin: () => new webpack.NormalModuleReplacementPlugin(/./, (req) => {
             if (!req.request.startsWith('.')) {
                 return;

package/src/utils/with-nx.js

@@ -225,6 +225,7 @@ function withNx(pluginOptions) {
                             minify: TerserPlugin.swcMinify,
                             // `terserOptions` options will be passed to `swc`
                             terserOptions: {
+                                module: true,
                                 mangle: false,
                             },
                         }),