@nrwl/angular 14.8.7 → 14.9.0-beta.1

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

@@ -2,73 +2,75 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackBrowserBuilder = void 0;
 const tslib_1 = require("tslib");
-const architect_1 = require("@angular-devkit/architect");
-const build_angular_1 = require("@angular-devkit/build-angular");
 const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
-const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
+const webpack_nx_build_coordination_plugin_1 = require("@nrwl/webpack/src/plugins/webpack-nx-build-coordination-plugin");
 const fs_1 = require("fs");
-const path_1 = require("path");
+const file_utils_1 = require("nx/src/project-graph/file-utils");
+const operators_1 = require("nx/src/project-graph/operators");
+const utils_1 = require("nx/src/tasks-runner/utils");
 const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const webpack_merge_1 = require("webpack-merge");
+const operators_2 = require("rxjs/operators");
+const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
-function buildApp(options, context) {
-    const { buildLibsFromSource, customWebpackConfig } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig"]);
-    // If there is a path to custom webpack config
-    // Invoke our own support for custom webpack config
-    if (customWebpackConfig && customWebpackConfig.path) {
-        const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
-        if ((0, fs_1.existsSync)(pathToWebpackConfig)) {
-            return buildAppWithCustomWebpackConfiguration(delegateOptions, context, pathToWebpackConfig);
-        }
-        else {
-            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}`);
-        }
-    }
-    return (0, build_angular_1.executeBrowserBuilder)(delegateOptions, context);
-}
-function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
-    return (0, build_angular_1.executeBrowserBuilder)(options, context, {
-        webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const customWebpackConfiguration = (0, webpack_1.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, context.target);
-            }
-            else {
-                return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
-            }
-        }),
-    });
+const validate_options_1 = require("./validate-options");
+function shouldSkipInitialTargetRun(projectGraph, project, target) {
+    var _a;
+    const nxJson = (0, file_utils_1.readNxJson)();
+    const defaultDependencyConfigs = Object.entries((_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : {}).reduce((acc, [targetName, dependencyConfig]) => {
+        acc[targetName] = dependencyConfig.dependsOn;
+        return acc;
+    }, {});
+    const projectDependencyConfigs = (0, utils_1.getDependencyConfigs)({ project, target }, defaultDependencyConfigs, projectGraph);
+    // if the task runner already ran the target, skip the initial run
+    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) &&
+        (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}`);
+    }
+    const pathToIndexFileTransformer = indexFileTransformer &&
+        (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
+    if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
+        throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
+    }
     let dependencies;
-    if (!options.buildLibsFromSource) {
-        const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_2.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, context.target.target, context.target.configuration);
-        dependencies = result.dependencies;
-        options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, options.tsConfig), context.workspaceRoot, result.target.data.root, dependencies);
-        process.env.NX_TSCONFIG_PATH = options.tsConfig;
+    let projectGraph;
+    if (!buildLibsFromSource) {
+        projectGraph = (0, devkit_1.readCachedProjectGraph)();
+        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateBuilderOptions.tsConfig, context, { projectGraph });
+        dependencies = foundDependencies;
+        delegateBuilderOptions.tsConfig = tsConfigPath;
     }
-    return (0, rxjs_1.of)(!options.buildLibsFromSource
-        ? (0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.workspaceRoot, context.target.project, context.target.target, dependencies)
-        : true).pipe((0, operators_1.switchMap)((result) => {
-        if (result) {
-            return buildApp(options, context);
-        }
-        else {
-            // just pass on the result
-            return (0, rxjs_1.of)({ success: false });
+    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) => {
+            if (!buildLibsFromSource && delegateBuilderOptions.watch) {
+                const workspaceDependencies = dependencies
+                    .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
+                    .map((dep) => dep.node.name);
+                // default for `nx run-many` is --all projects
+                // by passing an empty string for --projects, run-many will default to
+                // run the target for all projects.
+                // This will occur when workspaceDependencies = []
+                if (workspaceDependencies.length > 0) {
+                    const skipInitialRun = shouldSkipInitialTargetRun(projectGraph, context.target.project, context.target.target);
+                    baseWebpackConfig.plugins.push(new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${context.target.target} --projects=${workspaceDependencies.join(',')}`, skipInitialRun));
+                }
+            }
+            if (!pathToWebpackConfig) {
+                return baseWebpackConfig;
+            }
+            return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, delegateBuilderOptions, context.target);
+        } }, (pathToIndexFileTransformer
+        ? {
+            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, delegateBuilderOptions.tsConfig, context.target),
         }
-    }));
+        : {})))));
 }
 exports.executeWebpackBrowserBuilder = executeWebpackBrowserBuilder;
-exports.default = (0, architect_1.createBuilder)(executeWebpackBrowserBuilder);
+exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackBrowserBuilder);
 //# sourceMappingURL=webpack-browser.impl.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}

package/src/builders/webpack-dev-server/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/builders/webpack-dev-server/lib/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/builders/webpack-dev-server/lib/normalize-options.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAAC,MAAc;IAC7C,uBACE,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,IAAI,EAChB,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,IACP,MAAM,EACT;AACJ,CAAC;AATD,4CASC"}

package/src/builders/webpack-dev-server/schema.d.ts

@@ -0,0 +1,21 @@
+export interface Schema {
+  browserTarget: string;
+  port: number;
+  host: string;
+  proxyConfig?: string;
+  ssl: boolean;
+  sslKey?: string;
+  sslCert?: string;
+  headers?: Record<string, string>;
+  open: boolean;
+  verbose?: boolean;
+  liveReload: boolean;
+  publicHost?: string;
+  allowedHosts?: string[];
+  servePath?: string;
+  disableHostCheck?: boolean;
+  hmr?: boolean;
+  watch?: boolean;
+  poll?: number;
+  buildLibsFromSource?: boolean;
+}

package/src/builders/webpack-dev-server/schema.json

@@ -0,0 +1,116 @@
+{
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Schema for Webpack Dev Server",
+  "description": "The webpack-dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
+  "examplesFile": "../../../docs/webpack-dev-server-examples.md",
+  "type": "object",
+  "presets": [
+    {
+      "name": "Using a Different Port",
+      "keys": ["browserTarget", "port"]
+    }
+  ],
+  "properties": {
+    "browserTarget": {
+      "type": "string",
+      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "port": {
+      "type": "number",
+      "description": "Port to listen on.",
+      "default": 4200
+    },
+    "host": {
+      "type": "string",
+      "description": "Host to listen on.",
+      "default": "localhost"
+    },
+    "proxyConfig": {
+      "type": "string",
+      "description": "Proxy configuration file. For more information, see https://angular.io/guide/build#proxying-to-a-backend-server."
+    },
+    "ssl": {
+      "type": "boolean",
+      "description": "Serve using HTTPS.",
+      "default": false
+    },
+    "sslKey": {
+      "type": "string",
+      "description": "SSL key to use for serving HTTPS."
+    },
+    "sslCert": {
+      "type": "string",
+      "description": "SSL certificate to use for serving HTTPS."
+    },
+    "headers": {
+      "type": "object",
+      "description": "Custom HTTP headers to be added to all responses.",
+      "propertyNames": {
+        "pattern": "^[-_A-Za-z0-9]+$"
+      },
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "open": {
+      "type": "boolean",
+      "description": "Opens the url in default browser.",
+      "default": false,
+      "alias": "o"
+    },
+    "verbose": {
+      "type": "boolean",
+      "description": "Adds more details to output logging."
+    },
+    "liveReload": {
+      "type": "boolean",
+      "description": "Whether to reload the page on change, using live-reload.",
+      "default": true
+    },
+    "publicHost": {
+      "type": "string",
+      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
+    },
+    "allowedHosts": {
+      "type": "array",
+      "description": "List of hosts that are allowed to access the dev server.",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "servePath": {
+      "type": "string",
+      "description": "The pathname where the app will be served."
+    },
+    "disableHostCheck": {
+      "type": "boolean",
+      "description": "Don't verify connected clients are part of allowed hosts.",
+      "default": false
+    },
+    "hmr": {
+      "type": "boolean",
+      "description": "Enable hot module replacement.",
+      "default": false
+    },
+    "watch": {
+      "type": "boolean",
+      "description": "Rebuild on change.",
+      "default": true
+    },
+    "poll": {
+      "type": "number",
+      "description": "Enable and define the file watching poll time period in milliseconds."
+    },
+    "buildLibsFromSource": {
+      "type": "boolean",
+      "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options.",
+      "x-priority": "important"
+    }
+  },
+  "additionalProperties": false,
+  "required": ["browserTarget"]
+}

package/src/builders/webpack-dev-server/webpack-dev-server.impl.d.ts

@@ -0,0 +1,4 @@
+import type { Schema } from './schema';
+export declare function executeWebpackDevServerBuilder(rawOptions: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
+declare const _default: any;
+export default _default;

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

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeWebpackDevServerBuilder = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const webpack_nx_build_coordination_plugin_1 = require("@nrwl/webpack/src/plugins/webpack-nx-build-coordination-plugin");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
+const fs_1 = require("fs");
+const operators_1 = require("nx/src/project-graph/operators");
+const webpack_1 = require("../utilities/webpack");
+const lib_1 = require("./lib");
+const buildable_libs_1 = require("../utilities/buildable-libs");
+const rxjs_1 = require("rxjs");
+const operators_2 = require("rxjs/operators");
+const typescript_1 = require("nx/src/utils/typescript");
+function executeWebpackDevServerBuilder(rawOptions, context) {
+    var _a, _b, _c;
+    process.env.NX_TSCONFIG_PATH = (0, typescript_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;
+    let pathToWebpackConfig;
+    if ((_c = buildTargetOptions.customWebpackConfig) === null || _c === void 0 ? void 0 : _c.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}`);
+        }
+    }
+    let pathToIndexFileTransformer;
+    if (buildTargetOptions.indexFileTransformer) {
+        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.indexFileTransformer);
+        if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
+            throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
+        }
+    }
+    let dependencies;
+    if (!buildLibsFromSource) {
+        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetOptions.buildTargetTsConfigPath, context, {
+            target: parsedBrowserTarget.target,
+        });
+        dependencies = foundDependencies;
+        // We can't just pass the tsconfig path in memory to the angular builder
+        // function because we can't pass the build target options to it, the build
+        // targets options will be retrieved by the builder from the project
+        // configuration. Therefore, we patch the method in the context to retrieve
+        // 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);
+            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* () {
+            if (!buildLibsFromSource) {
+                const workspaceDependencies = dependencies
+                    .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
+                    .map((dep) => dep.node.name);
+                // default for `nx run-many` is --all projects
+                // by passing an empty string for --projects, run-many will default to
+                // run the target for all projects.
+                // This will occur when workspaceDependencies = []
+                if (workspaceDependencies.length > 0) {
+                    baseWebpackConfig.plugins.push(new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBrowserTarget.target} --projects=${workspaceDependencies.join(',')}`));
+                }
+            }
+            if (!pathToWebpackConfig) {
+                return baseWebpackConfig;
+            }
+            return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
+        }) }, (pathToIndexFileTransformer
+        ? {
+            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
+        }
+        : {})))));
+}
+exports.executeWebpackDevServerBuilder = executeWebpackDevServerBuilder;
+exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackDevServerBuilder);
+//# sourceMappingURL=webpack-dev-server.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}

package/src/builders/webpack-server/schema.d.ts

@@ -1,21 +1,9 @@
-export interface Schema {
-  browserTarget: string;
-  port: number;
-  host: string;
-  proxyConfig?: string;
-  ssl: boolean;
-  sslKey?: string;
-  sslCert?: string;
-  headers?: Record<string, string>;
-  open: boolean;
-  verbose?: boolean;
-  liveReload: boolean;
-  publicHost?: string;
-  allowedHosts?: string[];
-  servePath?: string;
-  disableHostCheck?: boolean;
-  hmr?: boolean;
-  watch?: boolean;
-  poll?: number;
+import { ServerBuilderOptions } from '@angular-devkit/build-angular';
+
+export interface Schema extends ServerBuilderOptions {
+  customWebpackConfig?: {
+    path: string;
+  };
   buildLibsFromSource?: boolean;
+  bundleDependencies?: boolean | 'none' | 'all';
 }