@nx/angular 16.8.0-beta.3 → 16.8.0-beta.5

package/mf/mf.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadRemoteModule = exports.setRemoteDefinitions = exports.setRemoteUrlResolver = void 0;
-const tslib_1 = require("tslib");
 let resolveRemoteUrl;
 function setRemoteUrlResolver(_resolveRemoteUrl) {
     resolveRemoteUrl = _resolveRemoteUrl;
@@ -14,45 +13,41 @@ function setRemoteDefinitions(definitions) {
 exports.setRemoteDefinitions = setRemoteDefinitions;
 let remoteModuleMap = new Map();
 let remoteContainerMap = new Map();
-function loadRemoteModule(remoteName, moduleName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const remoteModuleKey = `${remoteName}:${moduleName}`;
-        if (remoteModuleMap.has(remoteModuleKey)) {
-            return remoteModuleMap.get(remoteModuleKey);
-        }
-        const container = remoteContainerMap.has(remoteName)
-            ? remoteContainerMap.get(remoteName)
-            : yield loadRemoteContainer(remoteName);
-        const factory = yield container.get(moduleName);
-        const Module = factory();
-        remoteModuleMap.set(remoteModuleKey, Module);
-        return Module;
-    });
+async function loadRemoteModule(remoteName, moduleName) {
+    const remoteModuleKey = `${remoteName}:${moduleName}`;
+    if (remoteModuleMap.has(remoteModuleKey)) {
+        return remoteModuleMap.get(remoteModuleKey);
+    }
+    const container = remoteContainerMap.has(remoteName)
+        ? remoteContainerMap.get(remoteName)
+        : await loadRemoteContainer(remoteName);
+    const factory = await container.get(moduleName);
+    const Module = factory();
+    remoteModuleMap.set(remoteModuleKey, Module);
+    return Module;
 }
 exports.loadRemoteModule = loadRemoteModule;
 function loadModule(url) {
     return Promise.resolve(`${url}`).then(s => require(s));
 }
 let initialSharingScopeCreated = false;
-function loadRemoteContainer(remoteName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!resolveRemoteUrl && !remoteUrlDefinitions) {
-            throw new Error('Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.');
-        }
-        if (!initialSharingScopeCreated) {
-            initialSharingScopeCreated = true;
-            yield __webpack_init_sharing__('default');
-        }
-        const remoteUrl = remoteUrlDefinitions
-            ? remoteUrlDefinitions[remoteName]
-            : yield resolveRemoteUrl(remoteName);
-        let containerUrl = remoteUrl;
-        if (!remoteUrl.endsWith('.mjs') && !remoteUrl.endsWith('.js')) {
-            containerUrl = `${remoteUrl}${remoteUrl.endsWith('/') ? '' : '/'}remoteEntry.mjs`;
-        }
-        const container = yield loadModule(containerUrl);
-        yield container.init(__webpack_share_scopes__.default);
-        remoteContainerMap.set(remoteName, container);
-        return container;
-    });
+async function loadRemoteContainer(remoteName) {
+    if (!resolveRemoteUrl && !remoteUrlDefinitions) {
+        throw new Error('Call setRemoteDefinitions or setRemoteUrlResolver to allow Dynamic Federation to find the remote apps correctly.');
+    }
+    if (!initialSharingScopeCreated) {
+        initialSharingScopeCreated = true;
+        await __webpack_init_sharing__('default');
+    }
+    const remoteUrl = remoteUrlDefinitions
+        ? remoteUrlDefinitions[remoteName]
+        : await resolveRemoteUrl(remoteName);
+    let containerUrl = remoteUrl;
+    if (!remoteUrl.endsWith('.mjs') && !remoteUrl.endsWith('.js')) {
+        containerUrl = `${remoteUrl}${remoteUrl.endsWith('/') ? '' : '/'}remoteEntry.mjs`;
+    }
+    const container = await loadModule(containerUrl);
+    await container.init(__webpack_share_scopes__.default);
+    remoteContainerMap.set(remoteName, container);
+    return container;
 }

package/migrations.json

@@ -1345,6 +1345,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.8.0": {
+      "version": "16.8.0-beta.2",
+      "packages": {
+        "esbuild": {
+          "version": "^0.19.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.8.0-beta.3",
+  "version": "16.8.0-beta.5",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -66,14 +66,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.8.0-beta.3",
-    "@nx/cypress": "16.8.0-beta.3",
-    "@nx/devkit": "16.8.0-beta.3",
-    "@nx/jest": "16.8.0-beta.3",
-    "@nx/js": "16.8.0-beta.3",
-    "@nx/linter": "16.8.0-beta.3",
-    "@nx/webpack": "16.8.0-beta.3",
-    "@nx/workspace": "16.8.0-beta.3",
+    "@nrwl/angular": "16.8.0-beta.5",
+    "@nx/cypress": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/jest": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
+    "@nx/linter": "16.8.0-beta.5",
+    "@nx/webpack": "16.8.0-beta.5",
+    "@nx/workspace": "16.8.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -93,7 +93,7 @@
     "@angular-devkit/schematics": ">= 14.0.0 < 17.0.0",
     "@nguniversal/builders": ">= 14.0.0 < 17.0.0",
     "@schematics/angular": ">= 14.0.0 < 17.0.0",
-    "esbuild": "^0.17.5",
+    "esbuild": "^0.19.2",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
   "peerDependenciesMeta": {
@@ -110,5 +110,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/plugins/component-testing.js

@@ -26,7 +26,6 @@ const semver_1 = require("semver");
  * @param options override options
  */
 function nxComponentTestingPreset(pathToConfig, options) {
-    var _a, _b, _c, _d, _e;
     let graph;
     try {
         graph = (0, devkit_1.readCachedProjectGraph)();
@@ -41,12 +40,12 @@ ${e.stack ? e.stack : e}`);
     }
     const ctProjectConfig = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
-    const ctContext = (0, ct_helpers_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test', ctConfigurationName);
+    const ctContext = (0, ct_helpers_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
     const buildTarget = getBuildableTarget(ctContext);
-    if (!buildTarget.project && !((_b = (_a = graph.nodes) === null || _a === void 0 ? void 0 : _a[buildTarget.project]) === null || _b === void 0 ? void 0 : _b.data)) {
+    if (!buildTarget.project && !graph.nodes?.[buildTarget.project]?.data) {
         throw new Error((0, devkit_1.stripIndents) `Unable to find project configuration for build target. 
     Project Name? ${buildTarget.project}
-    Has project config? ${!!((_d = (_c = graph.nodes) === null || _c === void 0 ? void 0 : _c[buildTarget.project]) === null || _d === void 0 ? void 0 : _d.data)}`);
+    Has project config? ${!!graph.nodes?.[buildTarget.project]?.data}`);
     }
     const fromWorkspaceRoot = (0, path_1.relative)(ctContext.root, pathToConfig);
     const normalizedFromWorkspaceRootPath = (0, fs_1.lstatSync)(pathToConfig).isFile()
@@ -55,25 +54,34 @@ ${e.stack ? e.stack : e}`);
     const offset = isOffsetNeeded(ctContext, ctProjectConfig)
         ? (0, devkit_1.offsetFromRoot)(normalizedFromWorkspaceRootPath)
         : undefined;
-    const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, (_e = graph.nodes[buildTarget.project]) === null || _e === void 0 ? void 0 : _e.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
+    const buildContext = (0, ct_helpers_1.createExecutorContext)(graph, graph.nodes[buildTarget.project]?.data.targets, buildTarget.project, buildTarget.target, buildTarget.configuration);
     const buildableProjectConfig = normalizeBuildTargetOptions(buildContext, ctContext, offset);
-    return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, { testingType: 'component' })), { 
+    return {
+        ...(0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, { testingType: 'component' }),
         // NOTE: cannot use a glob pattern since it will break cypress generated tsconfig.
-        specPattern: ['src/**/*.cy.ts', 'src/**/*.cy.js'], 
-        // cypress defaults to a relative path from the workspaceRoot instead of projectRoot
-        // set as absolute path in case this changes internally to cypress, this path isn't OS dependent
-        indexHtmlFile: (0, devkit_1.joinPathFragments)(ctContext.root, ctProjectConfig.root, 'cypress', 'support', 'component-index.html'), devServer: Object.assign(Object.assign({}, {
-            framework: 'angular',
-            bundler: 'webpack',
-        }), { options: {
+        specPattern: ['src/**/*.cy.ts', 'src/**/*.cy.js'],
+        // Cy v12.17.0+ does not work with aboslute paths for index file
+        // but does with relative pathing, since relative path is the default location, we can omit it
+        indexHtmlFile: requiresAbsolutePath()
+            ? (0, devkit_1.joinPathFragments)(ctContext.root, ctProjectConfig.root, 'cypress', 'support', 'component-index.html')
+            : undefined,
+        devServer: {
+            // cypress uses string union type,
+            // need to use const to prevent typing to string
+            ...{
+                framework: 'angular',
+                bundler: 'webpack',
+            },
+            options: {
                 projectConfig: buildableProjectConfig,
-            } }) });
+            },
+        },
+    };
 }
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 function getBuildableTarget(ctContext) {
-    var _a, _b;
-    const targets = (_b = (_a = ctContext.projectGraph.nodes[ctContext.projectName]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.targets;
-    const targetConfig = targets === null || targets === void 0 ? void 0 : targets[ctContext.targetName];
+    const targets = ctContext.projectGraph.nodes[ctContext.projectName]?.data?.targets;
+    const targetConfig = targets?.[ctContext.targetName];
     if (!targetConfig) {
         throw new Error((0, devkit_1.stripIndents) `Unable to find component testing target configuration in project '${ctContext.projectName}'.
       Has targets? ${!!targets}
@@ -92,7 +100,6 @@ function getBuildableTarget(ctContext) {
     return (0, devkit_1.parseTargetString)(cypressCtOptions.devServerTarget, ctContext.projectGraph);
 }
 function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
-    var _a, _b;
     const options = (0, devkit_1.readTargetOptions)({
         project: buildContext.projectName,
         target: buildContext.targetName,
@@ -125,7 +132,10 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
         buildOptions.index =
             typeof buildOptions.index === 'string'
                 ? (0, devkit_1.joinPathFragments)(offset, buildOptions.index)
-                : Object.assign(Object.assign({}, buildOptions.index), { input: (0, devkit_1.joinPathFragments)(offset, buildOptions.index.input) });
+                : {
+                    ...buildOptions.index,
+                    input: (0, devkit_1.joinPathFragments)(offset, buildOptions.index.input),
+                };
         buildOptions.fileReplacements = buildOptions.fileReplacements.map((fr) => {
             fr.replace = (0, devkit_1.joinPathFragments)(offset, fr.replace);
             fr.with = (0, devkit_1.joinPathFragments)(offset, fr.with);
@@ -141,19 +151,19 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
             buildOptions.assets = buildOptions.assets.map((asset) => {
                 return typeof asset === 'string'
                     ? (0, devkit_1.joinPathFragments)(offset, asset)
-                    : Object.assign(Object.assign({}, asset), { input: (0, devkit_1.joinPathFragments)(offset, asset.input) });
+                    : { ...asset, input: (0, devkit_1.joinPathFragments)(offset, asset.input) };
             });
             buildOptions.styles = buildOptions.styles.map((style) => {
                 return typeof style === 'string'
                     ? (0, devkit_1.joinPathFragments)(offset, style)
-                    : Object.assign(Object.assign({}, style), { input: (0, devkit_1.joinPathFragments)(offset, style.input) });
+                    : { ...style, input: (0, devkit_1.joinPathFragments)(offset, style.input) };
             });
             buildOptions.scripts = buildOptions.scripts.map((script) => {
                 return typeof script === 'string'
                     ? (0, devkit_1.joinPathFragments)(offset, script)
-                    : Object.assign(Object.assign({}, script), { input: (0, devkit_1.joinPathFragments)(offset, script.input) });
+                    : { ...script, input: (0, devkit_1.joinPathFragments)(offset, script.input) };
             });
-            if (((_a = buildOptions.stylePreprocessorOptions) === null || _a === void 0 ? void 0 : _a.includePaths.length) > 0) {
+            if (buildOptions.stylePreprocessorOptions?.includePaths.length > 0) {
                 buildOptions.stylePreprocessorOptions = {
                     includePaths: buildOptions.stylePreprocessorOptions.includePaths.map((path) => {
                         return (0, devkit_1.joinPathFragments)(offset, path);
@@ -169,7 +179,7 @@ function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
         buildOptions.scripts = [];
         buildOptions.stylePreprocessorOptions = { includePaths: [] };
     }
-    const config = (_b = buildContext.projectGraph.nodes[buildContext.projectName]) === null || _b === void 0 ? void 0 : _b.data;
+    const config = buildContext.projectGraph.nodes[buildContext.projectName]?.data;
     if (!config.sourceRoot) {
         devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to find the 'sourceRoot' in the project configuration.
 Will set 'sourceRoot' to '${config.root}/src'
@@ -181,13 +191,14 @@ Note: this may fail, setting the correct 'sourceRoot' for ${buildContext.project
         sourceRoot: offset
             ? (0, devkit_1.joinPathFragments)(offset, config.sourceRoot)
             : config.sourceRoot,
-        buildOptions: Object.assign(Object.assign({}, buildOptions), { 
+        buildOptions: {
+            ...buildOptions,
             // this property is only valid for cy v12.9.0+
-            workspaceRoot: offset ? undefined : ctContext.root }),
+            workspaceRoot: offset ? undefined : ctContext.root,
+        },
     };
 }
 function withSchemaDefaults(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     if (!options.main) {
         throw new Error('Missing executor options "main"');
     }
@@ -201,19 +212,19 @@ function withSchemaDefaults(options) {
     // otherwise the 'buildOptimizer' cannot be used without 'aot' error is thrown
     options.buildOptimizer = false;
     options.aot = false;
-    (_a = options.assets) !== null && _a !== void 0 ? _a : (options.assets = []);
-    (_b = options.allowedCommonJsDependencies) !== null && _b !== void 0 ? _b : (options.allowedCommonJsDependencies = []);
-    (_c = options.budgets) !== null && _c !== void 0 ? _c : (options.budgets = []);
-    (_d = options.commonChunk) !== null && _d !== void 0 ? _d : (options.commonChunk = true);
-    (_e = options.crossOrigin) !== null && _e !== void 0 ? _e : (options.crossOrigin = 'none');
-    (_f = options.deleteOutputPath) !== null && _f !== void 0 ? _f : (options.deleteOutputPath = true);
-    (_g = options.extractLicenses) !== null && _g !== void 0 ? _g : (options.extractLicenses = true);
-    (_h = options.fileReplacements) !== null && _h !== void 0 ? _h : (options.fileReplacements = []);
-    (_j = options.inlineStyleLanguage) !== null && _j !== void 0 ? _j : (options.inlineStyleLanguage = 'css');
-    (_k = options.i18nDuplicateTranslation) !== null && _k !== void 0 ? _k : (options.i18nDuplicateTranslation = 'warning');
-    (_l = options.outputHashing) !== null && _l !== void 0 ? _l : (options.outputHashing = 'none');
-    (_m = options.progress) !== null && _m !== void 0 ? _m : (options.progress = true);
-    (_o = options.scripts) !== null && _o !== void 0 ? _o : (options.scripts = []);
+    options.assets ??= [];
+    options.allowedCommonJsDependencies ??= [];
+    options.budgets ??= [];
+    options.commonChunk ??= true;
+    options.crossOrigin ??= 'none';
+    options.deleteOutputPath ??= true;
+    options.extractLicenses ??= true;
+    options.fileReplacements ??= [];
+    options.inlineStyleLanguage ??= 'css';
+    options.i18nDuplicateTranslation ??= 'warning';
+    options.outputHashing ??= 'none';
+    options.progress ??= true;
+    options.scripts ??= [];
     return options;
 }
 /**
@@ -222,8 +233,7 @@ function withSchemaDefaults(options) {
  * this file should get cleaned up via the cypress executor
  */
 function getTempStylesForTailwind(ctExecutorContext) {
-    var _a;
-    const ctProjectConfig = (_a = ctExecutorContext.projectGraph.nodes[ctExecutorContext.projectName]) === null || _a === void 0 ? void 0 : _a.data;
+    const ctProjectConfig = ctExecutorContext.projectGraph.nodes[ctExecutorContext.projectName]?.data;
     // angular only supports `tailwind.config.{js,cjs}`
     const ctProjectTailwindConfig = (0, path_1.join)(ctExecutorContext.root, ctProjectConfig.root, 'tailwind.config');
     const exts = ['js', 'cjs'];
@@ -250,8 +260,7 @@ function getTempStylesForTailwind(ctExecutorContext) {
 }
 function isOffsetNeeded(ctExecutorContext, ctProjectConfig) {
     try {
-        const { version = null } = require('cypress/package.json');
-        const supportsWorkspaceRoot = !!version && (0, semver_1.gte)(version, '12.9.0');
+        const supportsWorkspaceRoot = isCyVersionGreaterThanOrEqual('12.9.0');
         // if using cypress <v12.9.0 then we require the offset
         if (!supportsWorkspaceRoot) {
             return true;
@@ -274,3 +283,32 @@ function isOffsetNeeded(ctExecutorContext, ctProjectConfig) {
         return true;
     }
 }
+/**
+ * check if the cypress version is able to understand absolute paths to the indexHtmlFile option
+ * this is required for nx to work with cypress <v12.17.0 since the relative pathing is causes issues
+ * with invalid pathing.
+ * v12.17.0+ works with relative pathing
+ *
+ * if there is an error thrown then we assume it is an older version of cypress and use the absolute path
+ * as that was supported for longer.
+ *
+ * */
+function requiresAbsolutePath() {
+    try {
+        return !isCyVersionGreaterThanOrEqual('12.17.0');
+    }
+    catch (e) {
+        if (process.env.NX_VERBOSE_LOGGING === 'true') {
+            devkit_1.logger.error(e);
+        }
+        return true;
+    }
+}
+/**
+ * Checks if the install cypress version is greater than or equal to the provided version.
+ * Does not catch errors as any custom logic for error handling is required on consumer side.
+ * */
+function isCyVersionGreaterThanOrEqual(version) {
+    const { version: cyVersion = null } = require('cypress/package.json');
+    return !!cyVersion && (0, semver_1.gte)(cyVersion, version);
+}

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeModuleFederationDevServerBuilder = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const webpack_dev_server_impl_1 = require("../webpack-dev-server/webpack-dev-server.impl");
@@ -12,8 +11,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
 function executeModuleFederationDevServerBuilder(schema, context) {
-    var _a, _b, _c;
-    const options = tslib_1.__rest(schema, []);
+    const { ...options } = schema;
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
     const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     const project = workspaceProjects[context.target.project];
@@ -29,7 +27,7 @@ function executeModuleFederationDevServerBuilder(schema, context) {
         pathToManifestFile = userPathToManifestFile;
     }
     (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
-    const remotesToSkip = new Set((_a = (0, find_matching_projects_1.findMatchingProjects)(options.skipRemotes, projectGraph.nodes)) !== null && _a !== void 0 ? _a : []);
+    const remotesToSkip = new Set((0, find_matching_projects_1.findMatchingProjects)(options.skipRemotes, projectGraph.nodes) ?? []);
     if (remotesToSkip.size > 0) {
         devkit_1.logger.info(`Remotes not served automatically: ${[...remotesToSkip].join(', ')}`);
     }
@@ -44,10 +42,10 @@ function executeModuleFederationDevServerBuilder(schema, context) {
     for (const remote of remotes) {
         const isDev = devServeRemotes.includes(remote);
         const target = isDev ? 'serve' : 'serve-static';
-        if (!((_b = workspaceProjects[remote].targets) === null || _b === void 0 ? void 0 : _b[target])) {
+        if (!workspaceProjects[remote].targets?.[target]) {
             throw new Error(`Could not find "${target}" target in "${remote}" project.`);
         }
-        else if (!((_c = workspaceProjects[remote].targets) === null || _c === void 0 ? void 0 : _c[target].executor)) {
+        else if (!workspaceProjects[remote].targets?.[target].executor) {
             throw new Error(`Could not find executor for "${target}" target in "${remote}" project.`);
         }
         const runOptions = {};

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeModuleFederationDevSSRBuilder = void 0;
-const tslib_1 = require("tslib");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
 const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const devkit_1 = require("@nx/devkit");
@@ -13,8 +12,7 @@ const child_process_1 = require("child_process");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const fs_1 = require("fs");
 function executeModuleFederationDevSSRBuilder(schema, context) {
-    var _a, _b, _c;
-    const options = tslib_1.__rest(schema, []);
+    const { ...options } = schema;
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
     const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     const project = workspaceProjects[context.target.project];
@@ -30,7 +28,7 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
         pathToManifestFile = userPathToManifestFile;
     }
     (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
-    const remotesToSkip = new Set((_a = options.skipRemotes) !== null && _a !== void 0 ? _a : []);
+    const remotesToSkip = new Set(options.skipRemotes ?? []);
     const staticRemotes = (0, module_federation_1.getStaticRemotes)(project, context, workspaceProjects, remotesToSkip);
     const dynamicRemotes = (0, module_federation_1.getDynamicRemotes)(project, context, workspaceProjects, remotesToSkip, pathToManifestFile);
     const remotes = [...staticRemotes, ...dynamicRemotes];
@@ -43,10 +41,10 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
     for (const remote of remotes) {
         const isDev = devServeRemotes.includes(remote);
         const target = isDev ? 'serve-ssr' : 'static-server';
-        if (!((_b = workspaceProjects[remote].targets) === null || _b === void 0 ? void 0 : _b[target])) {
+        if (!workspaceProjects[remote].targets?.[target]) {
             throw new Error(`Could not find "${target}" target in "${remote}" project.`);
         }
-        else if (!((_c = workspaceProjects[remote].targets) === null || _c === void 0 ? void 0 : _c[target].executor)) {
+        else if (!workspaceProjects[remote].targets?.[target].executor) {
             throw new Error(`Could not find executor for "${target}" target in "${remote}" project.`);
         }
         const runOptions = {};

package/src/builders/utilities/buildable-libs.js

@@ -5,9 +5,8 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function createTmpTsConfigForBuildableLibs(tsConfigPath, context, options) {
-    var _a, _b;
     let dependencies;
-    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((_a = options === null || options === void 0 ? void 0 : options.projectGraph) !== null && _a !== void 0 ? _a : (0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, (_b = options === null || options === void 0 ? void 0 : options.target) !== null && _b !== void 0 ? _b : context.target.target, context.target.configuration);
+    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(options?.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, options?.target ?? context.target.target, context.target.configuration);
     dependencies = result.dependencies;
     const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, tsConfigPath), context.workspaceRoot, result.target.data.root, dependencies);
     process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;

package/src/builders/utilities/module-federation.js

@@ -56,7 +56,7 @@ function getModuleFederationConfig(tsconfigPath, workspaceRoot, projectRoot) {
             mfConfigPath: moduleFederationConfigPath,
         };
     }
-    catch (_a) {
+    catch {
         throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nx/angular:host"?`);
     }
 }
@@ -83,8 +83,7 @@ function getStaticRemotes(project, context, workspaceProjects, remotesToSkip) {
 }
 exports.getStaticRemotes = getStaticRemotes;
 function validateDevRemotes(options, workspaceProjects) {
-    var _a;
-    const invalidDevRemotes = (_a = options.devRemotes) === null || _a === void 0 ? void 0 : _a.filter((remote) => !workspaceProjects[remote]);
+    const invalidDevRemotes = options.devRemotes?.filter((remote) => !workspaceProjects[remote]);
     if (invalidDevRemotes.length) {
         throw new Error(invalidDevRemotes.length === 1
             ? `Invalid dev remote provided: ${invalidDevRemotes[0]}.`

package/src/builders/utilities/webpack.js

@@ -1,29 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveIndexHtmlTransformer = exports.resolveCustomWebpackConfig = exports.mergeCustomWebpackConfig = void 0;
-const tslib_1 = require("tslib");
 const webpack_merge_1 = require("webpack-merge");
 const tsnode_register_1 = require("@nx/js/src/utils/typescript/tsnode-register");
-function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, target) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const customWebpackConfiguration = resolveCustomWebpackConfig(pathToWebpackConfig, options.tsConfig);
-        // The extra Webpack configuration file can also export a Promise, for instance:
-        // `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
-        // then await will just resolve that object.
-        const config = yield customWebpackConfiguration;
-        // The extra Webpack configuration file can export a synchronous or asynchronous function,
-        // for instance: `module.exports = async config => { ... }`.
-        if (typeof config === 'function') {
-            return config(baseWebpackConfig, options, target);
-        }
-        else {
-            return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
-        }
-    });
+async function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, target) {
+    const customWebpackConfiguration = resolveCustomWebpackConfig(pathToWebpackConfig, options.tsConfig);
+    // The extra Webpack configuration file can also export a Promise, for instance:
+    // `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
+    // then await will just resolve that object.
+    const config = await customWebpackConfiguration;
+    // The extra Webpack configuration file can export a synchronous or asynchronous function,
+    // for instance: `module.exports = async config => { ... }`.
+    if (typeof config === 'function') {
+        return config(baseWebpackConfig, options, target);
+    }
+    else {
+        return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
+    }
 }
 exports.mergeCustomWebpackConfig = mergeCustomWebpackConfig;
 function resolveCustomWebpackConfig(path, tsConfig) {
-    var _a;
     (0, tsnode_register_1.tsNodeRegister)(path, tsConfig);
     const customWebpackConfig = require(path);
     // If the user provides a configuration in TS file
@@ -31,14 +27,13 @@ function resolveCustomWebpackConfig(path, tsConfig) {
     // `module.exports = { ... }`. And the second one is:
     // `export default { ... }`. The ESM format is compiled into:
     // `{ default: { ... } }`
-    return (_a = customWebpackConfig.default) !== null && _a !== void 0 ? _a : customWebpackConfig;
+    return customWebpackConfig.default ?? customWebpackConfig;
 }
 exports.resolveCustomWebpackConfig = resolveCustomWebpackConfig;
 function resolveIndexHtmlTransformer(path, tsConfig, target) {
-    var _a;
     (0, tsnode_register_1.tsNodeRegister)(path, tsConfig);
     const indexTransformer = require(path);
-    const transform = (_a = indexTransformer.default) !== null && _a !== void 0 ? _a : indexTransformer;
+    const transform = indexTransformer.default ?? indexTransformer;
     return (indexHtml) => transform(target, indexHtml);
 }
 exports.resolveIndexHtmlTransformer = resolveIndexHtmlTransformer;

package/src/builders/webpack-browser/webpack-browser.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackBrowserBuilder = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const webpack_nx_build_coordination_plugin_1 = require("@nx/webpack/src/plugins/webpack-nx-build-coordination-plugin");
 const fs_1 = require("fs");
@@ -14,9 +13,8 @@ const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const validate_options_1 = require("./validate-options");
 function shouldSkipInitialTargetRun(projectGraph, project, target) {
-    var _a;
     const nxJson = (0, configuration_1.readNxJson)();
-    const defaultDependencyConfigs = Object.entries((_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : {}).reduce((acc, [targetName, dependencyConfig]) => {
+    const defaultDependencyConfigs = Object.entries(nxJson.targetDefaults ?? {}).reduce((acc, [targetName, dependencyConfig]) => {
         acc[targetName] = dependencyConfig.dependsOn;
         return acc;
     }, {});
@@ -25,11 +23,10 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
     return projectDependencyConfigs.some((d) => d.target === target && d.projects === 'dependencies');
 }
 function executeWebpackBrowserBuilder(options, context) {
-    var _a;
     (0, validate_options_1.validateOptions)(options);
-    (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
-    const { buildLibsFromSource, customWebpackConfig, indexFileTransformer } = options, delegateBuilderOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig", "indexFileTransformer"]);
-    const pathToWebpackConfig = (customWebpackConfig === null || customWebpackConfig === void 0 ? void 0 : customWebpackConfig.path) &&
+    options.buildLibsFromSource ??= true;
+    const { buildLibsFromSource, customWebpackConfig, indexFileTransformer, ...delegateBuilderOptions } = options;
+    const pathToWebpackConfig = customWebpackConfig?.path &&
         (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
     if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
         throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
@@ -47,7 +44,8 @@ function executeWebpackBrowserBuilder(options, context) {
         dependencies = foundDependencies;
         delegateBuilderOptions.tsConfig = tsConfigPath;
     }
-    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateBuilderOptions, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => {
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateBuilderOptions, context, {
+        webpackConfiguration: (baseWebpackConfig) => {
             if (!buildLibsFromSource && delegateBuilderOptions.watch) {
                 const workspaceDependencies = dependencies
                     .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
@@ -67,11 +65,13 @@ function executeWebpackBrowserBuilder(options, context) {
                 return baseWebpackConfig;
             }
             return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, delegateBuilderOptions, context.target);
-        } }, (pathToIndexFileTransformer
-        ? {
-            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, delegateBuilderOptions.tsConfig, context.target),
-        }
-        : {})))));
+        },
+        ...(pathToIndexFileTransformer
+            ? {
+                indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, delegateBuilderOptions.tsConfig, context.target),
+            }
+            : {}),
+    })));
 }
 exports.executeWebpackBrowserBuilder = executeWebpackBrowserBuilder;
 exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackBrowserBuilder);

package/src/builders/webpack-dev-server/lib/normalize-options.js

@@ -2,6 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 function normalizeOptions(schema) {
-    return Object.assign({ host: 'localhost', port: 4200, liveReload: true, open: false, ssl: false }, schema);
+    return {
+        host: 'localhost',
+        port: 4200,
+        liveReload: true,
+        open: false,
+        ssl: false,
+        ...schema,
+    };
 }
 exports.normalizeOptions = normalizeOptions;