@angular-devkit/build-angular 14.1.0-next.4 → 14.1.0-rc.3

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.1.0-next.4",
+  "version": "14.1.0-rc.3",
   "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.1401.0-next.4",
-    "@angular-devkit/build-webpack": "0.1401.0-next.4",
-    "@angular-devkit/core": "14.1.0-next.4",
+    "@angular-devkit/architect": "0.1401.0-rc.3",
+    "@angular-devkit/build-webpack": "0.1401.0-rc.3",
+    "@angular-devkit/core": "14.1.0-rc.3",
     "@babel/core": "7.18.6",
     "@babel/generator": "7.18.7",
     "@babel/helper-annotate-as-pure": "7.18.6",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.18.6",
     "@babel/template": "7.18.6",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.1.0-next.4",
+    "@ngtools/webpack": "14.1.0-rc.3",
     "ansi-colors": "4.1.3",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",

package/src/builders/browser-esbuild/compiler-plugin.d.ts

@@ -11,4 +11,5 @@ export declare function createCompilerPlugin(pluginOptions: {
     sourcemap: boolean;
     tsconfig: string;
     advancedOptimizations?: boolean;
+    thirdPartySourcemaps?: boolean;
 }, styleOptions: BundleStylesheetOptions): Plugin;

package/src/builders/browser-esbuild/compiler-plugin.js

@@ -167,18 +167,25 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 const result = {};
                 // Create TypeScript compiler host
                 const host = typescript_1.default.createIncrementalCompilerHost(compilerOptions);
-                // Temporarily add a readResource hook to allow for a transformResource hook.
-                // Once the AOT compiler allows only a transformResource hook this can be removed.
-                host.readResource = function (fileName) {
-                    var _a;
-                    // Provide same no file found behavior as @ngtools/webpack
-                    return (_a = this.readFile(fileName)) !== null && _a !== void 0 ? _a : '';
+                // Temporarily process external resources via readResource.
+                // The AOT compiler currently requires this hook to allow for a transformResource hook.
+                // Once the AOT compiler allows only a transformResource hook, this can be reevaluated.
+                host.readResource = async function (fileName) {
+                    var _a, _b, _c;
+                    // Template resources (.html) files are not bundled or transformed
+                    if (fileName.endsWith('.html')) {
+                        return (_a = this.readFile(fileName)) !== null && _a !== void 0 ? _a : '';
+                    }
+                    const { contents, errors, warnings } = await (0, stylesheets_1.bundleStylesheetFile)(fileName, styleOptions);
+                    ((_b = result.errors) !== null && _b !== void 0 ? _b : (result.errors = [])).push(...errors);
+                    ((_c = result.warnings) !== null && _c !== void 0 ? _c : (result.warnings = [])).push(...warnings);
+                    return contents;
                 };
                 // Add an AOT compiler resource transform hook
                 host.transformResource = async function (data, context) {
                     var _a, _b, _c;
-                    // Only style resources are transformed currently
-                    if (context.type !== 'style') {
+                    // Only inline style resources are transformed separately currently
+                    if (context.resourceFile || context.type !== 'style') {
                         return null;
                     }
                     // The file with the resource content will either be an actual file (resourceFile)
@@ -256,10 +263,12 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         ],
                     };
                 }
+                const useInputSourcemap = pluginOptions.sourcemap &&
+                    (!!pluginOptions.thirdPartySourcemaps || !/[\\/]node_modules[\\/]/.test(args.path));
                 const data = (_a = typescriptResult.content) !== null && _a !== void 0 ? _a : '';
                 const babelResult = await (0, core_1.transformAsync)(data, {
                     filename: args.path,
-                    inputSourceMap: (pluginOptions.sourcemap ? undefined : false),
+                    inputSourceMap: (useInputSourcemap ? undefined : false),
                     sourceMaps: pluginOptions.sourcemap ? 'inline' : false,
                     compact: false,
                     configFile: false,
@@ -285,10 +294,12 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 var _a;
                 const angularPackage = /[\\/]node_modules[\\/]@angular[\\/]/.test(args.path);
                 const linkerPluginCreator = (await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/linker/babel')).createEs2015LinkerPlugin;
+                const useInputSourcemap = pluginOptions.sourcemap &&
+                    (!!pluginOptions.thirdPartySourcemaps || !/[\\/]node_modules[\\/]/.test(args.path));
                 const data = await fs_1.promises.readFile(args.path, 'utf-8');
                 const result = await (0, core_1.transformAsync)(data, {
                     filename: args.path,
-                    inputSourceMap: (pluginOptions.sourcemap ? undefined : false),
+                    inputSourceMap: (useInputSourcemap ? undefined : false),
                     sourceMaps: pluginOptions.sourcemap ? 'inline' : false,
                     compact: false,
                     configFile: false,

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

@@ -7,8 +7,6 @@
  */
 import { BuilderContext } from '@angular-devkit/architect';
 import { BuildFailure, BuildOptions, BuildResult, Message, OutputFile } from 'esbuild';
-/** Default outdir setting for esbuild. */
-export declare const DEFAULT_OUTDIR: string;
 /**
  * Determines if an unknown value is an esbuild BuildFailure error object thrown by esbuild.
  * @param value A potential esbuild BuildFailure error object.

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

@@ -7,11 +7,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logMessages = exports.bundle = exports.isEsBuildFailure = exports.DEFAULT_OUTDIR = void 0;
+exports.logMessages = exports.bundle = exports.isEsBuildFailure = void 0;
 const esbuild_1 = require("esbuild");
-const path_1 = require("path");
-/** Default outdir setting for esbuild. */
-exports.DEFAULT_OUTDIR = (0, path_1.resolve)('/virtual-output');
 /**
  * Determines if an unknown value is an esbuild BuildFailure error object thrown by esbuild.
  * @param value A potential esbuild BuildFailure error object.

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

@@ -57,7 +57,7 @@ const stylesheets_1 = require("./stylesheets");
  */
 // eslint-disable-next-line max-lines-per-function
 async function buildEsbuildBrowser(options, context) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const startTime = Date.now();
     // Only AOT is currently supported
     if (options.aot !== true) {
@@ -101,7 +101,7 @@ async function buildEsbuildBrowser(options, context) {
         // Entries in the metafile are relative to the `absWorkingDir` option which is set to the workspaceRoot
         const relativeFilePath = path.relative(workspaceRoot, outputFile.path);
         const entryPoint = (_c = (_b = result.metafile) === null || _b === void 0 ? void 0 : _b.outputs[relativeFilePath]) === null || _c === void 0 ? void 0 : _c.entryPoint;
-        outputFile.path = path.relative(esbuild_1.DEFAULT_OUTDIR, outputFile.path);
+        outputFile.path = relativeFilePath;
         if (entryPoint) {
             // An entryPoint value indicates an initial file
             initialFiles.push({
@@ -130,9 +130,11 @@ async function buildEsbuildBrowser(options, context) {
                 .map((file) => `@import '${file.replace(/\\/g, '/')}';`)
                 .join('\n');
             const sheetResult = await (0, stylesheets_1.bundleStylesheetText)(virtualEntryData, { virtualName: `angular:style/global;${name}`, resolvePath: workspaceRoot }, {
+                workspaceRoot,
                 optimization: !!optimizationOptions.styles.minify,
-                sourcemap: !!sourcemapOptions.styles,
+                sourcemap: !!sourcemapOptions.styles && (sourcemapOptions.hidden ? 'external' : true),
                 outputNames: noInjectNames.includes(name) ? { media: outputNames.media } : outputNames,
+                includePaths: (_e = options.stylePreprocessorOptions) === null || _e === void 0 ? void 0 : _e.includePaths,
             });
             await (0, esbuild_1.logMessages)(context, sheetResult);
             if (!sheetResult.path) {
@@ -161,8 +163,8 @@ async function buildEsbuildBrowser(options, context) {
     // Generate index HTML file
     if (options.index) {
         const entrypoints = (0, package_chunk_sort_1.generateEntryPoints)({
-            scripts: (_e = options.scripts) !== null && _e !== void 0 ? _e : [],
-            styles: (_f = options.styles) !== null && _f !== void 0 ? _f : [],
+            scripts: (_f = options.scripts) !== null && _f !== void 0 ? _f : [],
+            styles: (_g = options.styles) !== null && _g !== void 0 ? _g : [],
         });
         // Create an index HTML generator that reads from the in-memory output files
         const indexHtmlGenerator = new index_html_generator_1.IndexHtmlGenerator({
@@ -228,6 +230,7 @@ function createOutputFileFromText(path, text) {
     };
 }
 async function bundleCode(workspaceRoot, entryPoints, outputNames, options, optimizationOptions, sourcemapOptions, tsconfig) {
+    var _a;
     return (0, esbuild_1.bundle)({
         absWorkingDir: workspaceRoot,
         bundle: true,
@@ -243,7 +246,7 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
         metafile: true,
         minify: optimizationOptions.scripts,
         pure: ['forwardRef'],
-        outdir: esbuild_1.DEFAULT_OUTDIR,
+        outdir: workspaceRoot,
         sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
         splitting: true,
         tsconfig,
@@ -256,6 +259,7 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
             // JS/TS options
             {
                 sourcemap: !!sourcemapOptions.scripts,
+                thirdPartySourcemaps: sourcemapOptions.vendor,
                 tsconfig,
                 advancedOptimizations: options.buildOptimizer,
             }, 
@@ -269,6 +273,7 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
                 // of sourcemap processing.
                 !!sourcemapOptions.styles && (sourcemapOptions.hidden ? false : 'inline'),
                 outputNames,
+                includePaths: (_a = options.stylePreprocessorOptions) === null || _a === void 0 ? void 0 : _a.includePaths,
             }),
         ],
         define: {

package/src/builders/browser-esbuild/sass-plugin.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import type { Plugin } from 'esbuild';
+export declare function createSassPlugin(options: {
+    sourcemap: boolean;
+    includePaths?: string[];
+}): Plugin;

package/src/builders/browser-esbuild/sass-plugin.js

@@ -0,0 +1,52 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSassPlugin = void 0;
+const sass_service_1 = require("../../sass/sass-service");
+function createSassPlugin(options) {
+    return {
+        name: 'angular-sass',
+        setup(build) {
+            let sass;
+            build.onStart(() => {
+                sass = new sass_service_1.SassWorkerImplementation();
+            });
+            build.onEnd(() => {
+                sass === null || sass === void 0 ? void 0 : sass.close();
+            });
+            build.onLoad({ filter: /\.s[ac]ss$/ }, async (args) => {
+                const result = await new Promise((resolve, reject) => {
+                    sass.render({
+                        file: args.path,
+                        includePaths: options.includePaths,
+                        indentedSyntax: args.path.endsWith('.sass'),
+                        outputStyle: 'expanded',
+                        sourceMap: options.sourcemap,
+                        sourceMapContents: options.sourcemap,
+                        sourceMapEmbed: options.sourcemap,
+                        quietDeps: true,
+                    }, (error, result) => {
+                        if (error) {
+                            reject(error);
+                        }
+                        if (result) {
+                            resolve(result);
+                        }
+                    });
+                });
+                return {
+                    contents: result.css,
+                    loader: 'css',
+                    watchFiles: result.stats.includedFiles,
+                };
+            });
+        },
+    };
+}
+exports.createSassPlugin = createSassPlugin;

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

@@ -7,7 +7,7 @@
  */
 import type { OutputFile } from 'esbuild';
 export interface BundleStylesheetOptions {
-    workspaceRoot?: string;
+    workspaceRoot: string;
     optimization: boolean;
     preserveSymlinks?: boolean;
     sourcemap: boolean | 'external' | 'inline';
@@ -15,6 +15,7 @@ export interface BundleStylesheetOptions {
         bundles?: string;
         media?: string;
     };
+    includePaths?: string[];
 }
 /**
  * Bundle a stylesheet that exists as a file on the filesystem.

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

@@ -33,6 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundleStylesheetText = exports.bundleStylesheetFile = void 0;
 const path = __importStar(require("path"));
 const esbuild_1 = require("./esbuild");
+const sass_plugin_1 = require("./sass-plugin");
 async function bundleStylesheet(entry, options) {
     var _a, _b;
     // Execute esbuild
@@ -45,14 +46,14 @@ async function bundleStylesheet(entry, options) {
         logLevel: 'silent',
         minify: options.optimization,
         sourcemap: options.sourcemap,
-        outdir: esbuild_1.DEFAULT_OUTDIR,
+        outdir: options.workspaceRoot,
         write: false,
         platform: 'browser',
         preserveSymlinks: options.preserveSymlinks,
         conditions: ['style'],
         mainFields: ['style'],
         plugins: [
-        // TODO: preprocessor plugins
+            (0, sass_plugin_1.createSassPlugin)({ sourcemap: !!options.sourcemap, includePaths: options.includePaths }),
         ],
     });
     // Extract the result of the bundling from the output files
@@ -62,7 +63,7 @@ async function bundleStylesheet(entry, options) {
     const resourceFiles = [];
     if (result.outputFiles) {
         for (const outputFile of result.outputFiles) {
-            outputFile.path = path.relative(esbuild_1.DEFAULT_OUTDIR, outputFile.path);
+            outputFile.path = path.relative(options.workspaceRoot, outputFile.path);
             const filename = path.basename(outputFile.path);
             if (filename.endsWith('.css')) {
                 outputPath = outputFile.path;

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);
+                    }
+                }
+            });
         });
     }
 }