@angular-devkit/build-angular 14.0.4 → 14.0.7

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.4",
+  "version": "14.0.7",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1400.4",
-    "@angular-devkit/build-webpack": "0.1400.4",
-    "@angular-devkit/core": "14.0.4",
+    "@angular-devkit/architect": "0.1400.7",
+    "@angular-devkit/build-webpack": "0.1400.7",
+    "@angular-devkit/core": "14.0.7",
     "@babel/core": "7.17.10",
     "@babel/generator": "7.17.10",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.17.9",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.0.4",
+    "@ngtools/webpack": "14.0.7",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",

package/src/builders/app-shell/index.js

@@ -95,7 +95,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         }
         await fs.promises.writeFile(outputIndexPath, html);
         if (browserOptions.serviceWorker) {
-            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref, browserOptions.ngswConfigPath);
+            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref !== null && baseHref !== void 0 ? baseHref : '/', browserOptions.ngswConfigPath);
         }
     }
     return browserResult;

package/src/builders/browser/index.d.ts

@@ -28,7 +28,7 @@ export declare type BrowserBuilderOutput = BuilderOutput & {
     outputs: {
         locale?: string;
         path: string;
-        baseHref: string;
+        baseHref?: string;
     }[];
 };
 /**

package/src/builders/browser/index.js

@@ -117,9 +117,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     }), (0, operators_1.switchMap)(
     // eslint-disable-next-line max-lines-per-function
     ({ config, projectRoot, projectSourceRoot, i18n, target, cacheOptions }) => {
-        var _a;
         const normalizedOptimization = (0, utils_1.normalizeOptimization)(options.optimization);
-        const defaultBaseHref = (_a = options.baseHref) !== null && _a !== void 0 ? _a : '/';
         return (0, build_webpack_1.runWebpack)(config, context, {
             webpackFactory: require('webpack'),
             logging: transforms.logging ||
@@ -129,7 +127,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     }
                 }),
         }).pipe((0, operators_1.concatMap)(async (buildEvent) => {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const spinner = new spinner_1.Spinner();
             spinner.enabled = options.progress !== false;
             const { success, emittedFiles = [], outputPath: webpackOutputPath } = buildEvent;
@@ -218,7 +216,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
                                 const { content, warnings, errors } = await indexHtmlGenerator.process({
-                                    baseHref: getLocaleBaseHref(i18n, locale) || defaultBaseHref,
+                                    baseHref: (_f = getLocaleBaseHref(i18n, locale)) !== null && _f !== void 0 ? _f : options.baseHref,
                                     // i18nLocale is used when Ivy is disabled
                                     lang: locale || undefined,
                                     outputPath,
@@ -254,7 +252,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         spinner.start('Generating service worker...');
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
-                                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, (_f = getLocaleBaseHref(i18n, locale)) !== null && _f !== void 0 ? _f : defaultBaseHref, options.ngswConfigPath);
+                                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, (_h = (_g = getLocaleBaseHref(i18n, locale)) !== null && _g !== void 0 ? _g : options.baseHref) !== null && _h !== void 0 ? _h : '/', options.ngswConfigPath);
                             }
                             catch (error) {
                                 spinner.fail('Service worker generation failed.');
@@ -278,11 +276,11 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     return ({
                         locale,
                         path,
-                        baseHref: (_a = getLocaleBaseHref(i18n, locale)) !== null && _a !== void 0 ? _a : defaultBaseHref,
+                        baseHref: (_a = getLocaleBaseHref(i18n, locale)) !== null && _a !== void 0 ? _a : options.baseHref,
                     });
                 })) || {
                 path: baseOutputPath,
-                baseHref: defaultBaseHref,
+                baseHref: options.baseHref,
             },
         })));
     }));

package/src/builders/browser-esbuild/index.js

@@ -249,7 +249,11 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
             {
                 workspaceRoot,
                 optimization: !!optimizationOptions.styles.minify,
-                sourcemap: !!sourcemapOptions.styles,
+                sourcemap: 
+                // Hidden component stylesheet sourcemaps are inaccessible which is effectively
+                // the same as being disabled. Disabling has the advantage of avoiding the overhead
+                // of sourcemap processing.
+                !!sourcemapOptions.styles && (sourcemapOptions.hidden ? false : 'inline'),
                 outputNames,
             }),
         ],

package/src/builders/browser-esbuild/stylesheets.d.ts

@@ -10,7 +10,7 @@ export interface BundleStylesheetOptions {
     workspaceRoot?: string;
     optimization: boolean;
     preserveSymlinks?: boolean;
-    sourcemap: boolean | 'external';
+    sourcemap: boolean | 'external' | 'inline';
     outputNames?: {
         bundles?: string;
         media?: string;

package/src/builders/karma/find-tests.js

@@ -71,6 +71,8 @@ async function findMatchingTests(pattern, workspaceRoot, projectSourceRoot) {
     }
     return globPromise(normalizedPattern, {
         cwd: projectSourceRoot,
+        root: projectSourceRoot,
+        nomount: true,
     });
 }
 async function isDirectory(path) {

package/src/utils/copy-assets.js

@@ -37,17 +37,18 @@ exports.copyAssets = void 0;
 const fs = __importStar(require("fs"));
 const glob_1 = __importDefault(require("glob"));
 const path = __importStar(require("path"));
-function globAsync(pattern, options) {
-    return new Promise((resolve, reject) => (0, glob_1.default)(pattern, options, (e, m) => (e ? reject(e) : resolve(m))));
-}
+const util_1 = require("util");
+const globPromise = (0, util_1.promisify)(glob_1.default);
 async function copyAssets(entries, basePaths, root, changed) {
     const defaultIgnore = ['.gitkeep', '**/.DS_Store', '**/Thumbs.db'];
     for (const entry of entries) {
         const cwd = path.resolve(root, entry.input);
-        const files = await globAsync(entry.glob, {
+        const files = await globPromise(entry.glob, {
             cwd,
             dot: true,
             nodir: true,
+            root: cwd,
+            nomount: true,
             ignore: entry.ignore ? defaultIgnore.concat(entry.ignore) : defaultIgnore,
             follow: entry.followSymlinks,
         });

package/src/webpack/configs/common.js

@@ -307,7 +307,7 @@ async function getCommonConfig(wco) {
                                 supportedBrowsers: buildOptions.supportedBrowsers,
                                 instrumentCode: codeCoverage
                                     ? {
-                                        includedBasePath: sourceRoot,
+                                        includedBasePath: sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : projectRoot,
                                         excludedPaths: (0, helpers_1.getInstrumentationExcludedPaths)(root, codeCoverageExclude),
                                     }
                                     : undefined,

package/src/webpack/plugins/common-js-usage-warn-plugin.js

@@ -12,7 +12,9 @@ const path_1 = require("path");
 const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 // Webpack doesn't export these so the deep imports can potentially break.
 const AMDDefineDependency = require('webpack/lib/dependencies/AMDDefineDependency');
+const CommonJsExportsDependency = require('webpack/lib/dependencies/CommonJsExportsDependency');
 const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency');
+const CommonJsSelfReferenceDependency = require('webpack/lib/dependencies/CommonJsSelfReferenceDependency');
 class CommonJsUsageWarnPlugin {
     constructor(options = {}) {
         this.options = options;
@@ -81,7 +83,10 @@ class CommonJsUsageWarnPlugin {
     }
     hasCommonJsDependencies(compilation, dependencies, checkParentModules = false) {
         for (const dep of dependencies) {
-            if (dep instanceof CommonJsRequireDependency || dep instanceof AMDDefineDependency) {
+            if (dep instanceof CommonJsRequireDependency ||
+                dep instanceof CommonJsExportsDependency ||
+                dep instanceof CommonJsSelfReferenceDependency ||
+                dep instanceof AMDDefineDependency) {
                 return true;
             }
             if (checkParentModules) {

package/src/webpack/plugins/scripts-webpack-plugin.js

@@ -35,6 +35,10 @@ const loader_utils_1 = require("loader-utils");
 const path = __importStar(require("path"));
 const webpack_1 = require("webpack");
 const Entrypoint = require('webpack/lib/Entrypoint');
+/**
+ * The name of the plugin provided to Webpack when tapping Webpack compiler hooks.
+ */
+const PLUGIN_NAME = 'scripts-webpack-plugin';
 function addDependencies(compilation, scripts) {
     for (const script of scripts) {
         compilation.fileDependencies.add(script);
@@ -88,8 +92,8 @@ class ScriptsWebpackPlugin {
         const scripts = this.options.scripts
             .filter((script) => !!script)
             .map((script) => path.resolve(this.options.basePath || '', script));
-        compiler.hooks.thisCompilation.tap('scripts-webpack-plugin', (compilation) => {
-            compilation.hooks.additionalAssets.tapPromise('scripts-webpack-plugin', async () => {
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.additionalAssets.tapPromise(PLUGIN_NAME, async () => {
                 if (await this.shouldSkip(compilation, scripts)) {
                     if (this._cachedOutput) {
                         this._insertOutput(compilation, this._cachedOutput, true);
@@ -129,14 +133,24 @@ class ScriptsWebpackPlugin {
                     concatSource.add('\n;');
                 });
                 const combinedSource = new webpack_1.sources.CachedSource(concatSource);
-                const filename = (0, loader_utils_1.interpolateName)({ resourcePath: 'scripts.js' }, this.options.filename, {
-                    content: combinedSource.source(),
-                });
-                const output = { filename, source: combinedSource };
+                const output = { filename: this.options.filename, source: combinedSource };
                 this._insertOutput(compilation, output);
                 this._cachedOutput = output;
                 addDependencies(compilation, scripts);
             });
+            compilation.hooks.processAssets.tapPromise({
+                name: PLUGIN_NAME,
+                stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING,
+            }, async () => {
+                const assetName = this.options.filename;
+                const asset = compilation.getAsset(assetName);
+                if (asset) {
+                    const interpolatedFilename = (0, loader_utils_1.interpolateName)({ resourcePath: 'scripts.js' }, assetName, { content: asset.source.source() });
+                    if (assetName !== interpolatedFilename) {
+                        compilation.renameAsset(assetName, interpolatedFilename);
+                    }
+                }
+            });
         });
     }
 }

package/src/webpack/utils/helpers.d.ts

@@ -21,7 +21,7 @@ export declare function getOutputHashFormat(outputHashing?: OutputHashing, lengt
 export declare type NormalizedEntryPoint = Required<Exclude<ScriptElement | StyleElement, string>>;
 export declare function normalizeExtraEntryPoints(extraEntryPoints: (ScriptElement | StyleElement)[], defaultBundleName: string): NormalizedEntryPoint[];
 export declare function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath: string) => string;
-export declare function getInstrumentationExcludedPaths(sourceRoot: string, excludedPaths: string[]): Set<string>;
+export declare function getInstrumentationExcludedPaths(root: string, excludedPaths: string[]): Set<string>;
 export declare function getCacheSettings(wco: WebpackConfigOptions, angularVersion: string): WebpackOptionsNormalized['cache'];
 export declare function globalScriptsByBundleName(root: string, scripts: ScriptElement[]): {
     bundleName: string;

package/src/webpack/utils/helpers.js

@@ -121,12 +121,12 @@ function assetNameTemplateFactory(hashFormat) {
     };
 }
 exports.assetNameTemplateFactory = assetNameTemplateFactory;
-function getInstrumentationExcludedPaths(sourceRoot, excludedPaths) {
+function getInstrumentationExcludedPaths(root, excludedPaths) {
     const excluded = new Set();
     for (const excludeGlob of excludedPaths) {
         glob_1.default
-            .sync(excludeGlob, { nodir: true, cwd: sourceRoot })
-            .forEach((p) => excluded.add(path.join(sourceRoot, p)));
+            .sync(excludeGlob, { nodir: true, cwd: root, root, nomount: true })
+            .forEach((p) => excluded.add(path.join(root, p)));
     }
     return excluded;
 }