@nx/webpack 20.0.0-beta.4 → 20.0.0-beta.6

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/webpack with @nx/webpack",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
     "update-17-2-1-webpack-config-setup": {
       "cli": "nx",
       "version": "17.2.1-beta.0",
@@ -20,24 +14,6 @@
     }
   },
   "packageJsonUpdates": {
-    "16.3.0": {
-      "version": "16.3.0-beta.8",
-      "packages": {
-        "@svgr/webpack": {
-          "version": "^8.0.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.4.1": {
-      "version": "16.4.1-beta.0",
-      "packages": {
-        "webpack": {
-          "version": "^5.80.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "19.6.0": {
       "version": "19.6.0-beta.1",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "20.0.0-beta.4",
+  "version": "20.0.0-beta.6",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -69,9 +69,8 @@
     "webpack-dev-server": "^5.0.4",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "20.0.0-beta.4",
-    "@nx/js": "20.0.0-beta.4",
-    "@nrwl/webpack": "20.0.0-beta.4"
+    "@nx/devkit": "20.0.0-beta.6",
+    "@nx/js": "20.0.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -7,10 +7,12 @@ const init_1 = require("../init/init");
 const has_plugin_1 = require("../../utils/has-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function configurationGenerator(tree, options) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...options });
 }
 async function configurationGeneratorInternal(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'webpack', 'configuration');
     const tasks = [];
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/init/init.js

@@ -4,12 +4,14 @@ exports.webpackInitGenerator = webpackInitGenerator;
 exports.webpackInitGeneratorInternal = webpackInitGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function webpackInitGenerator(tree, schema) {
     return webpackInitGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function webpackInitGeneratorInternal(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'webpack', 'init');
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -15,17 +15,20 @@ function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl, isRemoteGlobal
     const mappedRemotes = {};
     for (const remote of remotes) {
         if (Array.isArray(remote)) {
-            mappedRemotes[remote[0]] = handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal);
+            const remoteName = normalizeRemoteName(remote[0]);
+            mappedRemotes[remoteName] = handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal);
         }
         else if (typeof remote === 'string') {
-            mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl, isRemoteGlobal);
+            const remoteName = normalizeRemoteName(remote);
+            mappedRemotes[remoteName] = handleStringRemote(remoteName, determineRemoteUrl, isRemoteGlobal);
         }
     }
     return mappedRemotes;
 }
 // Helper function to deal with remotes that are arrays
 function handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal) {
-    const [remoteName, remoteLocation] = remote;
+    let [remoteName, remoteLocation] = remote;
+    remoteName = normalizeRemoteName(remoteName);
     const remoteLocationExt = (0, path_1.extname)(remoteLocation);
     // If remote location already has .js or .mjs extension
     if (['.js', '.mjs'].includes(remoteLocationExt)) {
@@ -63,7 +66,8 @@ function mapRemotesForSSR(remotes, remoteEntryExt, determineRemoteUrl) {
     const mappedRemotes = {};
     for (const remote of remotes) {
         if (Array.isArray(remote)) {
-            const [remoteName, remoteLocation] = remote;
+            let [remoteName, remoteLocation] = remote;
+            remoteName = normalizeRemoteName(remoteName);
             const remoteLocationExt = (0, path_1.extname)(remoteLocation);
             mappedRemotes[remoteName] = `${remoteName}@${['.js', '.mjs'].includes(remoteLocationExt)
                 ? remoteLocation
@@ -72,8 +76,12 @@ function mapRemotesForSSR(remotes, remoteEntryExt, determineRemoteUrl) {
                     : remoteLocation}/remoteEntry.${remoteEntryExt}`}`;
         }
         else if (typeof remote === 'string') {
-            mappedRemotes[remote] = `${remote}@${determineRemoteUrl(remote)}`;
+            const remoteName = normalizeRemoteName(remote);
+            mappedRemotes[remoteName] = `${remoteName}@${determineRemoteUrl(remote)}`;
         }
     }
     return mappedRemotes;
 }
+function normalizeRemoteName(remote) {
+    return remote.replace(/-/g, '_');
+}

package/src/utils/module-federation/secondary-entry-points.js

@@ -78,7 +78,10 @@ function recursivelyCollectSecondaryEntryPointsFromDirectory(pkgName, pkgVersion
 }
 function collectPackagesFromExports(pkgName, pkgVersion, exports, collectedPackages) {
     for (const [relativeEntryPoint, exportOptions] of Object.entries(exports)) {
-        if (exportOptions?.['default']?.search(/\.(js|mjs|cjs)$/)) {
+        const defaultExportOptions = typeof exportOptions?.['default'] === 'string'
+            ? exportOptions?.['default']
+            : exportOptions?.['default']?.['default'];
+        if (defaultExportOptions?.search(/\.(js|mjs|cjs)$/)) {
             let entryPointName = (0, devkit_1.joinPathFragments)(pkgName, relativeEntryPoint);
             if (entryPointName.endsWith('.json')) {
                 entryPointName = (0, path_1.dirname)(entryPointName);

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

@@ -222,8 +222,12 @@ function addStringDependencyToSharedConfig(sharedConfig, dependency, projectGrap
         sharedConfig[dependency] = config;
     }
     else {
-        throw new Error(`The specified dependency "${dependency}" in the additionalShared configuration does not exist in the project graph. ` +
-            `Please check your additionalShared configuration and make sure you are including valid workspace projects or npm packages.`);
+        const pkgJsonPath = require.resolve(`${dependency}/package.json`);
+        if (!pkgJsonPath) {
+            throw new Error(`Could not find package ${dependency} when applying it as a shared package. Are you sure it has been installed?`);
+        }
+        const pkgJson = (0, devkit_1.readJsonFile)(pkgJsonPath);
+        const config = getNpmPackageSharedConfig(dependency, pkgJson.version);
     }
 }
 function getEmptySharedLibrariesConfig() {

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/webpack', '@nx/webpack');
-    await (0, devkit_1.formatFiles)(tree);
-}