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

package/src/builders/webpack-dev-server/webpack-dev-server.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackDevServerBuilder = 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 project_graph_1 = require("nx/src/project-graph/project-graph");
@@ -14,20 +13,24 @@ const rxjs_1 = require("rxjs");
 const operators_2 = require("rxjs/operators");
 const js_1 = require("@nx/js");
 function executeWebpackDevServerBuilder(rawOptions, context) {
-    var _a, _b, _c;
     process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
     const options = (0, lib_1.normalizeOptions)(rawOptions);
     const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
     const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
     const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
-    const buildTargetOptions = Object.assign(Object.assign({}, buildTarget.options), (parsedBrowserTarget.configuration
-        ? buildTarget.configurations[parsedBrowserTarget.configuration]
-        : buildTarget.defaultConfiguration
-            ? buildTarget.configurations[buildTarget.defaultConfiguration]
-            : {}));
-    const buildLibsFromSource = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetOptions.buildLibsFromSource) !== null && _b !== void 0 ? _b : true;
+    const buildTargetOptions = {
+        ...buildTarget.options,
+        ...(parsedBrowserTarget.configuration
+            ? buildTarget.configurations[parsedBrowserTarget.configuration]
+            : buildTarget.defaultConfiguration
+                ? buildTarget.configurations[buildTarget.defaultConfiguration]
+                : {}),
+    };
+    const buildLibsFromSource = options.buildLibsFromSource ??
+        buildTargetOptions.buildLibsFromSource ??
+        true;
     let pathToWebpackConfig;
-    if ((_c = buildTargetOptions.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.path) {
+    if (buildTargetOptions.customWebpackConfig?.path) {
         pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.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}`);
@@ -53,18 +56,19 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
         // the target options to overwrite the tsconfig path to use the generated
         // one with the updated path mappings.
         const originalGetTargetOptions = context.getTargetOptions;
-        context.getTargetOptions = (target) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const options = yield originalGetTargetOptions(target);
+        context.getTargetOptions = async (target) => {
+            const options = await originalGetTargetOptions(target);
             options.tsConfig = tsConfigPath;
             return options;
-        });
+        };
         // The buildTargetConfiguration also needs to use the generated tsconfig path
         // otherwise the build will fail if customWebpack function/file is referencing
         // local libs. This synchronize the behavior with webpack-browser and
         // webpack-server implementation.
         buildTargetOptions.tsConfig = tsConfigPath;
     }
-    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, {
+        webpackConfiguration: async (baseWebpackConfig) => {
             if (!buildLibsFromSource) {
                 const workspaceDependencies = dependencies
                     .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
@@ -83,11 +87,13 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
                 return baseWebpackConfig;
             }
             return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
-        }) }, (pathToIndexFileTransformer
-        ? {
-            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
-        }
-        : {})))));
+        },
+        ...(pathToIndexFileTransformer
+            ? {
+                indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
+            }
+            : {}),
+    })));
 }
 exports.executeWebpackDevServerBuilder = executeWebpackDevServerBuilder;
 exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackDevServerBuilder);

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackServerBuilder = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const rxjs_1 = require("rxjs");
@@ -12,7 +11,7 @@ const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const validate_options_1 = require("./validate-options");
 function buildServerApp(options, context) {
-    const { buildLibsFromSource, customWebpackConfig } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig"]);
+    const { buildLibsFromSource, customWebpackConfig, ...delegateOptions } = options;
     // If there is a path to custom webpack config
     // Invoke our own support for custom webpack config
     if (customWebpackConfig && customWebpackConfig.path) {
@@ -28,14 +27,14 @@ function buildServerApp(options, context) {
 }
 function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
     return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeServerBuilder }) => executeServerBuilder(options, context, {
-        webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        webpackConfiguration: async (baseWebpackConfig) => {
             // Angular 15 auto includes code from @angular/platform-server
             // This includes the code outside the shared scope created by ModuleFederation
             // This code will be included in the generated code from our generators,
             // maintaining it within the shared scope.
             // Therefore, if the build is an MF Server build, remove the auto-includes from
             // the base webpack config from Angular
-            let mergedConfig = yield (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target);
+            let mergedConfig = await (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target);
             if (mergedConfig.plugins
                 .map((p) => p.constructor.name)
                 .includes('UniversalFederationPlugin')) {
@@ -45,11 +44,10 @@ function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWe
                     : !m.loader.endsWith('@angular-devkit/build-angular/src/builders/server/platform-server-exports-loader.js'));
             }
             return mergedConfig;
-        }),
+        },
     })));
 }
 function executeWebpackServerBuilder(options, context) {
-    var _a;
     (0, validate_options_1.validateOptions)(options);
     const installedAngularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     // default bundleDependencies to true if supported by Angular version
@@ -57,7 +55,7 @@ function executeWebpackServerBuilder(options, context) {
         options.bundleDependencies === undefined) {
         options.bundleDependencies = true;
     }
-    (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
+    options.buildLibsFromSource ??= true;
     if (!options.buildLibsFromSource) {
         const { tsConfigPath } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(options.tsConfig, context);
         options.tsConfig = tsConfigPath;

package/src/executors/browser-esbuild/browser-esbuild.impl.js

@@ -1,31 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const validate_options_1 = require("./lib/validate-options");
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_1 = require("./lib/buildable-libs");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
-function esbuildExecutor(options, context) {
-    var _a;
-    return tslib_1.__asyncGenerator(this, arguments, function* esbuildExecutor_1() {
-        (0, validate_options_1.validateOptions)(options);
-        (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
-        const { buildLibsFromSource } = options, delegateExecutorOptions = tslib_1.__rest(options, ["buildLibsFromSource"]);
-        let dependencies;
-        let projectGraph = context.projectGraph;
-        if (!buildLibsFromSource) {
-            projectGraph = projectGraph !== null && projectGraph !== void 0 ? projectGraph : (0, devkit_1.readCachedProjectGraph)();
-            const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateExecutorOptions.tsConfig, context, { projectGraph });
-            dependencies = foundDependencies;
-            delegateExecutorOptions.tsConfig = tsConfigPath;
-        }
-        const { buildEsbuildBrowser } = yield tslib_1.__await(Promise.resolve().then(() => require('@angular-devkit/build-angular/src/builders/browser-esbuild/index')));
-        const builderContext = yield tslib_1.__await((0, ngcli_adapter_1.createBuilderContext)({
-            builderName: 'browser-esbuild',
-            description: 'Build a browser application',
-            optionSchema: yield tslib_1.__await(Promise.resolve().then(() => require('@angular-devkit/build-angular/src/builders/browser-esbuild/schema.json'))),
-        }, context));
-        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(buildEsbuildBrowser(delegateExecutorOptions, builderContext)))));
-    });
+async function* esbuildExecutor(options, context) {
+    (0, validate_options_1.validateOptions)(options);
+    options.buildLibsFromSource ??= true;
+    const { buildLibsFromSource, ...delegateExecutorOptions } = options;
+    let dependencies;
+    let projectGraph = context.projectGraph;
+    if (!buildLibsFromSource) {
+        projectGraph = projectGraph ?? (0, devkit_1.readCachedProjectGraph)();
+        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateExecutorOptions.tsConfig, context, { projectGraph });
+        dependencies = foundDependencies;
+        delegateExecutorOptions.tsConfig = tsConfigPath;
+    }
+    const { buildEsbuildBrowser } = await Promise.resolve().then(() => require('@angular-devkit/build-angular/src/builders/browser-esbuild/index'));
+    const builderContext = await (0, ngcli_adapter_1.createBuilderContext)({
+        builderName: 'browser-esbuild',
+        description: 'Build a browser application',
+        optionSchema: await Promise.resolve().then(() => require('@angular-devkit/build-angular/src/builders/browser-esbuild/schema.json')),
+    }, context);
+    return yield* buildEsbuildBrowser(delegateExecutorOptions, builderContext);
 }
 exports.default = esbuildExecutor;

package/src/executors/browser-esbuild/lib/buildable-libs.js

@@ -5,9 +5,8 @@ const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 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.root, context.projectName, (_b = options === null || options === void 0 ? void 0 : options.target) !== null && _b !== void 0 ? _b : context.targetName, context.configurationName);
+    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(options?.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, options?.target ?? context.targetName, context.configurationName);
     dependencies = result.dependencies;
     const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, tsConfigPath), context.root, result.target.data.root, dependencies);
     process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;

package/src/executors/delegate-build/delegate-build.impl.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.delegateBuildExecutor = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
-function delegateBuildExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* delegateBuildExecutor_1() {
-        const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
-        options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
-        if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
-            return yield tslib_1.__await({ success: false });
-        }
-        const { buildTarget } = options, targetOptions = tslib_1.__rest(options, ["buildTarget"]);
-        const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context.projectGraph);
-        yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)(delegateTarget, targetOptions, context)))));
-    });
+async function* delegateBuildExecutor(options, context) {
+    const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+    options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.root, options.tsConfig), context.root, target.data.root, dependencies);
+    if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
+        return { success: false };
+    }
+    const { buildTarget, ...targetOptions } = options;
+    const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context.projectGraph);
+    yield* await (0, devkit_1.runExecutor)(delegateTarget, targetOptions, context);
 }
 exports.delegateBuildExecutor = delegateBuildExecutor;
 exports.default = delegateBuildExecutor;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js

@@ -9,7 +9,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxCompileNgcTransformFactory = void 0;
-const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/lib/graph/transform");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const tsconfig_1 = require("ng-packagr/lib/ts/tsconfig");
@@ -18,9 +17,7 @@ const ts = require("typescript");
 const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
 const compile_source_files_1 = require("../../ngc/compile-source-files");
 const nxCompileNgcTransformFactory = (StylesheetProcessor, options) => {
-    return (0, transform_1.transformFromPromise)((graph) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        var _b;
+    return (0, transform_1.transformFromPromise)(async (graph) => {
         try {
             const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
             const entryPoints = graph.filter(nodes_1.isEntryPoint);
@@ -34,8 +31,8 @@ const nxCompileNgcTransformFactory = (StylesheetProcessor, options) => {
                 : entryPoint.data.destinationFiles.esm2022;
             const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;
             const { moduleResolutionCache } = entryPoint.cache;
-            (_a = (_b = entryPoint.cache).stylesheetProcessor) !== null && _a !== void 0 ? _a : (_b.stylesheetProcessor = new StylesheetProcessor(basePath, cssUrl, styleIncludePaths, options.cacheEnabled && options.cacheDirectory, options.watch, options.tailwindConfig));
-            yield (0, compile_source_files_1.compileSourceFiles)(graph, tsConfig, moduleResolutionCache, {
+            entryPoint.cache.stylesheetProcessor ??= new StylesheetProcessor(basePath, cssUrl, styleIncludePaths, options.cacheEnabled && options.cacheDirectory, options.watch, options.tailwindConfig);
+            await (0, compile_source_files_1.compileSourceFiles)(graph, tsConfig, moduleResolutionCache, {
                 outDir: path.dirname(esmModulePath),
                 declarationDir: path.dirname(declarations),
                 declaration: true,
@@ -48,6 +45,6 @@ const nxCompileNgcTransformFactory = (StylesheetProcessor, options) => {
             throw error;
         }
         return graph;
-    }));
+    });
 };
 exports.nxCompileNgcTransformFactory = nxCompileNgcTransformFactory;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/entry-point.transform.js

@@ -7,7 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxEntryPointTransformFactory = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("ng-packagr/lib/graph/node");
 const select_1 = require("ng-packagr/lib/graph/select");
@@ -36,18 +35,18 @@ const rxjs_1 = require("rxjs");
  * @param compileTs Transformation compiling typescript sources to ES2022 modules.
  * @param writeBundles Transformation flattening ES2022 modules to ESM2022, UMD, and minified UMD.
  */
-const nxEntryPointTransformFactory = (compileTs, writePackage) => (0, rxjs_1.pipe)((0, transform_1.transformFromPromise)((graph) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+const nxEntryPointTransformFactory = (compileTs, writePackage) => (0, rxjs_1.pipe)((0, transform_1.transformFromPromise)(async (graph) => {
     // Peek the first entry point from the graph
     const entryPoint = graph.find((0, nodes_1.byEntryPoint)().and(select_1.isInProgress));
     devkit_1.logger.info('\n------------------------------------------------------------------------------');
     devkit_1.logger.info(`Building entry point '${entryPoint.data.entryPoint.moduleId}'`);
     devkit_1.logger.info('------------------------------------------------------------------------------');
-})), 
+}), 
 // TypeScript sources compilation
 compileTs, 
 // After TypeScript: write package
-writePackage, (0, transform_1.transformFromPromise)((graph) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+writePackage, (0, transform_1.transformFromPromise)(async (graph) => {
     const entryPoint = graph.find((0, nodes_1.byEntryPoint)().and(select_1.isInProgress));
     entryPoint.state = node_1.STATE_DONE;
-})));
+}));
 exports.nxEntryPointTransformFactory = nxEntryPointTransformFactory;