@nx/angular 16.8.0-beta.4 → 16.8.0-beta.6

package/src/migrations/update-16-1-0/update-server-executor-config.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const executors = [
@@ -8,22 +7,20 @@ const executors = [
     '@nx/angular:server',
     '@nrwl/angular:server',
 ];
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        executors.forEach((executor) => {
-            (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_options, projectName, targetName, configurationName) => {
-                const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-                const configToUpdate = configurationName
-                    ? projectConfiguration.targets[targetName].configurations[configurationName]
-                    : projectConfiguration.targets[targetName].options;
-                if (configToUpdate.buildOptimizer === undefined &&
-                    configToUpdate.optimization !== undefined) {
-                    configToUpdate.buildOptimizer = !!configToUpdate.optimization;
-                }
-                (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-            });
+async function default_1(tree) {
+    executors.forEach((executor) => {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_options, projectName, targetName, configurationName) => {
+            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            const configToUpdate = configurationName
+                ? projectConfiguration.targets[targetName].configurations[configurationName]
+                : projectConfiguration.targets[targetName].options;
+            if (configToUpdate.buildOptimizer === undefined &&
+                configToUpdate.optimization !== undefined) {
+                configToUpdate.buildOptimizer = !!configToUpdate.optimization;
+            }
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
         });
-        yield (0, devkit_1.formatFiles)(tree);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
@@ -17,30 +16,28 @@ const dataPersistenceOperators = [
     'pessimisticUpdate',
 ];
 const newImportPath = '@ngrx/router-store/data-persistence';
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = yield (0, projects_1.getProjectsFilteredByDependencies)(tree, angularPluginTargetNames);
-        if (!projects.length) {
-            return;
-        }
-        (0, ensure_typescript_1.ensureTypescript)();
-        tsquery = require('@phenomnomnominal/tsquery').tsquery;
-        const cachedFileMap = (0, nx_deps_cache_1.readProjectFileMapCache)().projectFileMap;
-        const filesWithNxAngularImports = [];
-        for (const { graphNode } of projects) {
-            const files = filterFilesWithNxAngularDep(cachedFileMap[graphNode.name] || []);
-            filesWithNxAngularImports.push(...files);
-        }
-        let isAnyFileUsingDataPersistence = false;
-        for (const { file } of filesWithNxAngularImports) {
-            const updated = replaceDataPersistenceInFile(tree, file);
-            isAnyFileUsingDataPersistence || (isAnyFileUsingDataPersistence = updated);
-        }
-        if (isAnyFileUsingDataPersistence) {
-            addNgrxRouterStoreIfNotInstalled(tree);
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-    });
+async function default_1(tree) {
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)(tree, angularPluginTargetNames);
+    if (!projects.length) {
+        return;
+    }
+    (0, ensure_typescript_1.ensureTypescript)();
+    tsquery = require('@phenomnomnominal/tsquery').tsquery;
+    const cachedFileMap = (0, nx_deps_cache_1.readProjectFileMapCache)().projectFileMap;
+    const filesWithNxAngularImports = [];
+    for (const { graphNode } of projects) {
+        const files = filterFilesWithNxAngularDep(cachedFileMap[graphNode.name] || []);
+        filesWithNxAngularImports.push(...files);
+    }
+    let isAnyFileUsingDataPersistence = false;
+    for (const { file } of filesWithNxAngularImports) {
+        const updated = replaceDataPersistenceInFile(tree, file);
+        isAnyFileUsingDataPersistence ||= updated;
+    }
+    if (isAnyFileUsingDataPersistence) {
+        addNgrxRouterStoreIfNotInstalled(tree);
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;
 function replaceDataPersistenceInFile(tree, file) {
@@ -108,17 +105,16 @@ function getOriginalIdentifierTextFromImportSpecifier(importSpecifier) {
 }
 function addNgrxRouterStoreIfNotInstalled(tree) {
     const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
-    if ((dependencies === null || dependencies === void 0 ? void 0 : dependencies['@ngrx/router-store']) ||
-        (devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies['@ngrx/router-store'])) {
+    if (dependencies?.['@ngrx/router-store'] ||
+        devDependencies?.['@ngrx/router-store']) {
         return;
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, { '@ngrx/router-store': versions_1.ngrxVersion }, {});
 }
 function filterFilesWithNxAngularDep(files) {
-    var _a;
     const filteredFiles = [];
     for (const file of files) {
-        if ((_a = file.deps) === null || _a === void 0 ? void 0 : _a.some((dep) => angularPluginTargetNames.includes((0, project_graph_1.fileDataDepTarget)(dep)))) {
+        if (file.deps?.some((dep) => angularPluginTargetNames.includes((0, project_graph_1.fileDataDepTarget)(dep)))) {
             filteredFiles.push(file);
         }
     }

package/src/migrations/update-16-4-0/rename-angular-eslint-accesibility-rules.js

@@ -1,26 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 // https://github.com/angular-eslint/angular-eslint/blob/24a4de54a8991c93924abf1dfb78b132a6269aef/packages/schematics/src/migrations/update-16-0-0/update-16-0-0.ts
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
-            if (!filePath.endsWith('.eslintrc.json')) {
-                return;
-            }
-            (0, devkit_1.updateJson)(tree, filePath, (json) => {
-                if (json.overrides) {
-                    for (const override of json.overrides) {
-                        modifyRules(override);
-                    }
+async function default_1(tree) {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
+        if (!filePath.endsWith('.eslintrc.json')) {
+            return;
+        }
+        (0, devkit_1.updateJson)(tree, filePath, (json) => {
+            if (json.overrides) {
+                for (const override of json.overrides) {
+                    modifyRules(override);
                 }
-                modifyRules(json);
-                return json;
-            });
+            }
+            modifyRules(json);
+            return json;
         });
-        yield (0, devkit_1.formatFiles)(tree);
     });
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;
 function modifyRules(parent) {

package/src/migrations/update-16-4-0/update-angular-cli.js

@@ -1,27 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~16.1.0';
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let shouldFormat = false;
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            var _a, _b;
-            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
-                json.devDependencies['@angular/cli'] = exports.angularCliVersion;
-                shouldFormat = true;
-            }
-            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
-                json.dependencies['@angular/cli'] = exports.angularCliVersion;
-                shouldFormat = true;
-            }
-            return json;
-        });
-        if (shouldFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
         }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
     });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;

package/src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executors = new Set([
     '@nx/angular:ng-packagr-lite',
@@ -8,32 +7,28 @@ const executors = new Set([
     '@nx/angular:package',
     '@nrwl/angular:package',
 ]);
-function default_1(tree) {
-    var _a;
-    var _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // use project graph to get the expanded target configurations
-        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        for (const [projectName, { data: projectData }] of Object.entries(projectGraph.nodes)) {
-            if (projectData.projectType !== 'library') {
+async function default_1(tree) {
+    // use project graph to get the expanded target configurations
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    for (const [projectName, { data: projectData }] of Object.entries(projectGraph.nodes)) {
+        if (projectData.projectType !== 'library') {
+            continue;
+        }
+        for (const [targetName, target] of Object.entries(projectData.targets || {})) {
+            if (!executors.has(target.executor)) {
                 continue;
             }
-            for (const [targetName, target] of Object.entries(projectData.targets || {})) {
-                if (!executors.has(target.executor)) {
-                    continue;
-                }
-                if (!target.options ||
-                    target.options.updateBuildableProjectDepsInPackageJson === undefined) {
-                    // read the project configuration to write the explicit project configuration
-                    // and avoid writing the expanded target configuration
-                    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-                    (_a = (_b = project.targets[targetName]).options) !== null && _a !== void 0 ? _a : (_b.options = {});
-                    project.targets[targetName].options.updateBuildableProjectDepsInPackageJson = true;
-                    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
-                }
+            if (!target.options ||
+                target.options.updateBuildableProjectDepsInPackageJson === undefined) {
+                // read the project configuration to write the explicit project configuration
+                // and avoid writing the expanded target configuration
+                const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+                project.targets[targetName].options ??= {};
+                project.targets[targetName].options.updateBuildableProjectDepsInPackageJson = true;
+                (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
             }
         }
-        yield (0, devkit_1.formatFiles)(tree);
-    });
+    }
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = default_1;

package/src/migrations/update-16-7-0/update-angular-cli.js

@@ -1,27 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 exports.angularCliVersion = '~16.2.0';
-function default_1(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let shouldFormat = false;
-        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-            var _a, _b;
-            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
-                json.devDependencies['@angular/cli'] = exports.angularCliVersion;
-                shouldFormat = true;
-            }
-            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
-                json.dependencies['@angular/cli'] = exports.angularCliVersion;
-                shouldFormat = true;
-            }
-            return json;
-        });
-        if (shouldFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
         }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
     });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
 }
 exports.default = default_1;

package/src/migrations/utils/projects.js

@@ -1,21 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectsFilteredByDependencies = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function getProjectsFilteredByDependencies(tree, dependencies) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        return Object.entries(projectGraph.dependencies)
-            .filter(([node, deps]) => {
-            var _a;
-            return !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]) &&
-                deps.some(({ target }) => dependencies.includes(target));
-        })
-            .map(([projectName]) => ({
-            project: (0, devkit_1.readProjectConfiguration)(tree, projectName),
-            graphNode: projectGraph.nodes[projectName],
-        }));
-    });
+async function getProjectsFilteredByDependencies(tree, dependencies) {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    return Object.entries(projectGraph.dependencies)
+        .filter(([node, deps]) => !projectGraph.externalNodes?.[node] &&
+        deps.some(({ target }) => dependencies.includes(target)))
+        .map(([projectName]) => ({
+        project: (0, devkit_1.readProjectConfiguration)(tree, projectName),
+        graphNode: projectGraph.nodes[projectName],
+    }));
 }
 exports.getProjectsFilteredByDependencies = getProjectsFilteredByDependencies;

package/src/utils/get-mf-projects.js

@@ -4,8 +4,7 @@ exports.getMFProjects = void 0;
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 function _getMfProjects(tree, CUSTOM_WEBPACK_OPTION, MODULE_FEDERATION_IDENTIFIER, projects) {
     return (opts, projectName) => {
-        var _a;
-        const webpackPath = (_a = opts[CUSTOM_WEBPACK_OPTION]) === null || _a === void 0 ? void 0 : _a.path;
+        const webpackPath = opts[CUSTOM_WEBPACK_OPTION]?.path;
         if (!webpackPath || !tree.exists(webpackPath)) {
             return;
         }

package/src/utils/mf/utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModuleFederationConfig = exports.getFunctionDeterminateRemoteUrl = exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = exports.DEFAULT_NPM_PACKAGES_TO_AVOID = exports.applyDefaultEagerPackages = void 0;
-const tslib_1 = require("tslib");
 const module_federation_1 = require("@nx/devkit/src/utils/module-federation");
 const devkit_1 = require("@nx/devkit");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
@@ -14,7 +13,7 @@ function applyDefaultEagerPackages(sharedConfig) {
         if (!sharedConfig[pkg]) {
             continue;
         }
-        sharedConfig[pkg] = Object.assign(Object.assign({}, sharedConfig[pkg]), { eager: true });
+        sharedConfig[pkg] = { ...sharedConfig[pkg], eager: true };
     }
 }
 exports.applyDefaultEagerPackages = applyDefaultEagerPackages;
@@ -31,58 +30,58 @@ function getFunctionDeterminateRemoteUrl(isServer = false) {
     const target = 'serve';
     const remoteEntry = isServer ? 'server/remoteEntry.js' : 'remoteEntry.mjs';
     return function (remote) {
-        var _a, _b, _c, _d, _e;
         const remoteConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(remote);
-        const serveTarget = (_a = remoteConfiguration === null || remoteConfiguration === void 0 ? void 0 : remoteConfiguration.targets) === null || _a === void 0 ? void 0 : _a[target];
+        const serveTarget = remoteConfiguration?.targets?.[target];
         if (!serveTarget) {
             throw new Error(`Cannot automatically determine URL of remote (${remote}). Looked for property "host" in the project's "serve" target.\n
       You can also use the tuple syntax in your webpack config to configure your remotes. e.g. \`remotes: [['remote1', 'http://localhost:4201']]\``);
         }
-        const host = (_c = (_b = serveTarget.options) === null || _b === void 0 ? void 0 : _b.host) !== null && _c !== void 0 ? _c : `http${serveTarget.options.ssl ? 's' : ''}://localhost`;
-        const port = (_e = (_d = serveTarget.options) === null || _d === void 0 ? void 0 : _d.port) !== null && _e !== void 0 ? _e : 4201;
+        const host = serveTarget.options?.host ??
+            `http${serveTarget.options.ssl ? 's' : ''}://localhost`;
+        const port = serveTarget.options?.port ?? 4201;
         return `${host.endsWith('/') ? host.slice(0, -1) : host}:${port}/${remoteEntry}`;
     };
 }
 exports.getFunctionDeterminateRemoteUrl = getFunctionDeterminateRemoteUrl;
-function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let projectGraph;
-        try {
-            projectGraph = (0, devkit_1.readCachedProjectGraph)();
-        }
-        catch (e) {
-            projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
-        }
-        if (!((_a = projectGraph.nodes[mfConfig.name]) === null || _a === void 0 ? void 0 : _a.data)) {
-            throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
-        }
-        const dependencies = (0, module_federation_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
-        if (mfConfig.shared) {
-            dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.importKey, {}) !== false);
-            dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}) !== false);
+async function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
+    let projectGraph;
+    try {
+        projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    }
+    catch (e) {
+        projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    }
+    if (!projectGraph.nodes[mfConfig.name]?.data) {
+        throw Error(`Cannot find project "${mfConfig.name}". Check that the name is correct in module-federation.config.js`);
+    }
+    const dependencies = (0, module_federation_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
+    if (mfConfig.shared) {
+        dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.importKey, {}) !== false);
+        dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}) !== false);
+    }
+    const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
+    const npmPackages = (0, module_federation_1.sharePackages)(Array.from(new Set([
+        ...exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
+        ...dependencies.npmPackages.filter((pkg) => !exports.DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)),
+    ])));
+    exports.DEFAULT_NPM_PACKAGES_TO_AVOID.forEach((pkgName) => {
+        if (pkgName in npmPackages) {
+            delete npmPackages[pkgName];
         }
-        const sharedLibraries = (0, module_federation_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
-        const npmPackages = (0, module_federation_1.sharePackages)(Array.from(new Set([
-            ...exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
-            ...dependencies.npmPackages.filter((pkg) => !exports.DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)),
-        ])));
-        exports.DEFAULT_NPM_PACKAGES_TO_AVOID.forEach((pkgName) => {
-            if (pkgName in npmPackages) {
-                delete npmPackages[pkgName];
-            }
-        });
-        const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
-        applyDefaultEagerPackages(sharedDependencies);
-        (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
-        (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
-        const determineRemoteUrlFn = options.determineRemoteUrl ||
-            getFunctionDeterminateRemoteUrl(options.isServer);
-        const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
-        const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
-            ? {}
-            : mapRemotesFunction(mfConfig.remotes, 'mjs', determineRemoteUrlFn);
-        return { sharedLibraries, sharedDependencies, mappedRemotes };
     });
+    const sharedDependencies = {
+        ...sharedLibraries.getLibraries(),
+        ...npmPackages,
+    };
+    applyDefaultEagerPackages(sharedDependencies);
+    (0, module_federation_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
+    (0, module_federation_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
+    const determineRemoteUrlFn = options.determineRemoteUrl ||
+        getFunctionDeterminateRemoteUrl(options.isServer);
+    const mapRemotesFunction = options.isServer ? module_federation_1.mapRemotesForSSR : module_federation_1.mapRemotes;
+    const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
+        ? {}
+        : mapRemotesFunction(mfConfig.remotes, 'mjs', determineRemoteUrlFn);
+    return { sharedLibraries, sharedDependencies, mappedRemotes };
 }
 exports.getModuleFederationConfig = getModuleFederationConfig;

package/src/utils/mf/with-module-federation-ssr.js

@@ -1,31 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederationForSSR = void 0;
-const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
-function withModuleFederationForSSR(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, {
-            isServer: true,
-        });
-        return (config) => {
-            var _a, _b, _c, _d, _e, _f;
-            return (Object.assign(Object.assign({}, (config !== null && config !== void 0 ? config : {})), { target: false, output: Object.assign(Object.assign({}, ((_a = config.output) !== null && _a !== void 0 ? _a : {})), { uniqueName: options.name }), optimization: Object.assign(Object.assign({}, ((_b = config.optimization) !== null && _b !== void 0 ? _b : {})), { runtimeChunk: false }), resolve: Object.assign(Object.assign({}, ((_c = config.resolve) !== null && _c !== void 0 ? _c : {})), { alias: Object.assign(Object.assign({}, ((_e = (_d = config.resolve) === null || _d === void 0 ? void 0 : _d.alias) !== null && _e !== void 0 ? _e : {})), sharedLibraries.getAliases()) }), plugins: [
-                    ...((_f = config.plugins) !== null && _f !== void 0 ? _f : []),
-                    new (require('@module-federation/node').UniversalFederationPlugin)({
-                        name: options.name,
-                        filename: 'remoteEntry.js',
-                        exposes: options.exposes,
-                        remotes: mappedRemotes,
-                        shared: Object.assign({}, sharedDependencies),
-                        library: {
-                            type: 'commonjs-module',
-                        },
-                        isServer: true,
-                    }, {}),
-                    sharedLibraries.getReplacementPlugin(),
-                ] }));
-        };
+async function withModuleFederationForSSR(options) {
+    const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options, {
+        isServer: true,
+    });
+    return (config) => ({
+        ...(config ?? {}),
+        target: false,
+        output: {
+            ...(config.output ?? {}),
+            uniqueName: options.name,
+        },
+        optimization: {
+            ...(config.optimization ?? {}),
+            runtimeChunk: false,
+        },
+        resolve: {
+            ...(config.resolve ?? {}),
+            alias: {
+                ...(config.resolve?.alias ?? {}),
+                ...sharedLibraries.getAliases(),
+            },
+        },
+        plugins: [
+            ...(config.plugins ?? []),
+            new (require('@module-federation/node').UniversalFederationPlugin)({
+                name: options.name,
+                filename: 'remoteEntry.js',
+                exposes: options.exposes,
+                remotes: mappedRemotes,
+                shared: {
+                    ...sharedDependencies,
+                },
+                library: {
+                    type: 'commonjs-module',
+                },
+                isServer: true,
+            }, {}),
+            sharedLibraries.getReplacementPlugin(),
+        ],
     });
 }
 exports.withModuleFederationForSSR = withModuleFederationForSSR;

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

@@ -1,29 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withModuleFederation = void 0;
-const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
 const ModuleFederationPlugin = require("webpack/lib/container/ModuleFederationPlugin");
-function withModuleFederation(options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { sharedLibraries, sharedDependencies, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options);
-        return (config) => {
-            var _a, _b, _c, _d, _e, _f, _g;
-            return (Object.assign(Object.assign({}, (config !== null && config !== void 0 ? config : {})), { output: Object.assign(Object.assign({}, ((_a = config.output) !== null && _a !== void 0 ? _a : {})), { uniqueName: options.name, publicPath: 'auto' }), optimization: Object.assign(Object.assign({}, ((_b = config.optimization) !== null && _b !== void 0 ? _b : {})), { runtimeChunk: false }), resolve: Object.assign(Object.assign({}, ((_c = config.resolve) !== null && _c !== void 0 ? _c : {})), { alias: Object.assign(Object.assign({}, ((_e = (_d = config.resolve) === null || _d === void 0 ? void 0 : _d.alias) !== null && _e !== void 0 ? _e : {})), sharedLibraries.getAliases()) }), experiments: Object.assign(Object.assign({}, ((_f = config.experiments) !== null && _f !== void 0 ? _f : {})), { outputModule: true }), plugins: [
-                    ...((_g = config.plugins) !== null && _g !== void 0 ? _g : []),
-                    new ModuleFederationPlugin({
-                        name: options.name,
-                        filename: 'remoteEntry.mjs',
-                        exposes: options.exposes,
-                        remotes: mappedRemotes,
-                        shared: Object.assign({}, sharedDependencies),
-                        library: {
-                            type: 'module',
-                        },
-                    }),
-                    sharedLibraries.getReplacementPlugin(),
-                ] }));
-        };
+async function withModuleFederation(options) {
+    const { sharedLibraries, sharedDependencies, mappedRemotes } = await (0, utils_1.getModuleFederationConfig)(options);
+    return (config) => ({
+        ...(config ?? {}),
+        output: {
+            ...(config.output ?? {}),
+            uniqueName: options.name,
+            publicPath: 'auto',
+        },
+        optimization: {
+            ...(config.optimization ?? {}),
+            runtimeChunk: false,
+        },
+        resolve: {
+            ...(config.resolve ?? {}),
+            alias: {
+                ...(config.resolve?.alias ?? {}),
+                ...sharedLibraries.getAliases(),
+            },
+        },
+        experiments: {
+            ...(config.experiments ?? {}),
+            outputModule: true,
+        },
+        plugins: [
+            ...(config.plugins ?? []),
+            new ModuleFederationPlugin({
+                name: options.name,
+                filename: 'remoteEntry.mjs',
+                exposes: options.exposes,
+                remotes: mappedRemotes,
+                shared: {
+                    ...sharedDependencies,
+                },
+                library: {
+                    type: 'module',
+                },
+            }),
+            sharedLibraries.getReplacementPlugin(),
+        ],
     });
 }
 exports.withModuleFederation = withModuleFederation;