@angular-devkit/build-angular 14.0.0-next.8 → 14.0.0-rc.1

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

@@ -0,0 +1,65 @@
+"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.logExperimentalWarnings = void 0;
+const UNSUPPORTED_OPTIONS = [
+    'allowedCommonJsDependencies',
+    'budgets',
+    'extractLicenses',
+    'fileReplacements',
+    'progress',
+    'scripts',
+    'statsJson',
+    // * i18n support
+    'localize',
+    // The following two have no effect when localize is not enabled
+    // 'i18nDuplicateTranslation',
+    // 'i18nMissingTranslation',
+    // * Serviceworker support
+    'ngswConfigPath',
+    'serviceWorker',
+    // * Stylesheet preprocessor support
+    'inlineStyleLanguage',
+    // The following option has no effect until preprocessors are supported
+    // 'stylePreprocessorOptions',
+    // * Watch mode
+    'watch',
+    'poll',
+    // * Deprecated
+    'deployUrl',
+    // * Always enabled with esbuild
+    // 'commonChunk',
+    // * Currently unsupported by esbuild
+    'namedChunks',
+    'vendorChunk',
+    'webWorkerTsConfig',
+];
+function logExperimentalWarnings(options, context) {
+    // Warn about experimental status of this builder
+    context.logger.warn(`The esbuild browser application builder ('browser-esbuild') is currently experimental.`);
+    // Validate supported options
+    // Currently only a subset of the Webpack-based browser builder options are supported.
+    for (const unsupportedOption of UNSUPPORTED_OPTIONS) {
+        const value = options[unsupportedOption];
+        if (value === undefined || value === false) {
+            continue;
+        }
+        if (Array.isArray(value) && value.length === 0) {
+            continue;
+        }
+        if (typeof value === 'object' && Object.keys(value).length === 0) {
+            continue;
+        }
+        if (unsupportedOption === 'inlineStyleLanguage' && value === 'css') {
+            continue;
+        }
+        context.logger.warn(`The '${unsupportedOption}' option is currently unsupported by this experimental builder and will be ignored.`);
+    }
+}
+exports.logExperimentalWarnings = logExperimentalWarnings;

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

@@ -0,0 +1,19 @@
+/**
+ * @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 { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
+import { Schema as BrowserBuilderOptions } from '../browser/schema';
+/**
+ * Main execution function for the esbuild-based application builder.
+ * The options are compatible with the Webpack-based builder.
+ * @param options The browser builder options to use when setting up the application build
+ * @param context The Architect builder context object
+ * @returns A promise with the builder result output
+ */
+export declare function execute(options: BrowserBuilderOptions, context: BuilderContext): Promise<BuilderOutput>;
+declare const _default: import("@angular-devkit/architect/src/internal").Builder<BrowserBuilderOptions & import("../../../../core/src").JsonObject>;
+export default _default;

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

@@ -0,0 +1,258 @@
+"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
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.execute = void 0;
+const architect_1 = require("@angular-devkit/architect");
+const assert = __importStar(require("assert"));
+const fs_1 = require("fs");
+const path = __importStar(require("path"));
+const utils_1 = require("../../utils");
+const copy_assets_1 = require("../../utils/copy-assets");
+const index_html_generator_1 = require("../../utils/index-file/index-html-generator");
+const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
+const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
+const configs_1 = require("../../webpack/configs");
+const compiler_plugin_1 = require("./compiler-plugin");
+const esbuild_1 = require("./esbuild");
+const experimental_warnings_1 = require("./experimental-warnings");
+const options_1 = require("./options");
+const stylesheets_1 = require("./stylesheets");
+/**
+ * Main execution function for the esbuild-based application builder.
+ * The options are compatible with the Webpack-based builder.
+ * @param options The browser builder options to use when setting up the application build
+ * @param context The Architect builder context object
+ * @returns A promise with the builder result output
+ */
+// eslint-disable-next-line max-lines-per-function
+async function execute(options, context) {
+    var _a, _b, _c, _d, _e, _f;
+    const startTime = Date.now();
+    // Only AOT is currently supported
+    if (options.aot !== true) {
+        context.logger.error('JIT mode is currently not supported by this experimental builder. AOT mode must be used.');
+        return { success: false };
+    }
+    // Inform user of experimental status of builder and options
+    (0, experimental_warnings_1.logExperimentalWarnings)(options, context);
+    // Determine project name from builder context target
+    const projectName = (_a = context.target) === null || _a === void 0 ? void 0 : _a.project;
+    if (!projectName) {
+        context.logger.error(`The 'browser-esbuild' builder requires a target to be specified.`);
+        return { success: false };
+    }
+    const { workspaceRoot, mainEntryPoint, polyfillsEntryPoint, optimizationOptions, outputPath, sourcemapOptions, tsconfig, assets, outputNames, } = await (0, options_1.normalizeOptions)(context, projectName, options);
+    // Clean output path if enabled
+    if (options.deleteOutputPath) {
+        (0, utils_1.deleteOutputDir)(workspaceRoot, options.outputPath);
+    }
+    // Setup bundler entry points
+    const entryPoints = {
+        main: mainEntryPoint,
+    };
+    if (polyfillsEntryPoint) {
+        entryPoints['polyfills'] = polyfillsEntryPoint;
+    }
+    // Create reverse lookup used during index HTML generation
+    const entryPointNameLookup = new Map(Object.entries(entryPoints).map(([name, filePath]) => [path.relative(workspaceRoot, filePath), name]));
+    // Execute esbuild
+    const result = await bundleCode(workspaceRoot, entryPoints, outputNames, options, optimizationOptions, sourcemapOptions, tsconfig);
+    // Log all warnings and errors generated during bundling
+    await (0, esbuild_1.logMessages)(context, result);
+    // Return if the bundling failed to generate output files or there are errors
+    if (!result.outputFiles || result.errors.length) {
+        return { success: false };
+    }
+    // Structure the bundling output files
+    const initialFiles = [];
+    const outputFiles = [];
+    for (const outputFile of result.outputFiles) {
+        // 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;
+        if (entryPoint) {
+            // An entryPoint value indicates an initial file
+            initialFiles.push({
+                // Remove leading directory separator
+                file: outputFile.path.slice(1),
+                name: (_d = entryPointNameLookup.get(entryPoint)) !== null && _d !== void 0 ? _d : '',
+                extension: path.extname(outputFile.path),
+            });
+        }
+        outputFiles.push(outputFile);
+    }
+    // Create output directory if needed
+    try {
+        await fs_1.promises.mkdir(outputPath, { recursive: true });
+    }
+    catch (e) {
+        const reason = 'message' in e ? e.message : 'Unknown error';
+        context.logger.error('Unable to create output directory: ' + reason);
+        return { success: false };
+    }
+    // Process global stylesheets
+    if (options.styles) {
+        // resolveGlobalStyles is temporarily reused from the Webpack builder code
+        const { entryPoints: stylesheetEntrypoints, noInjectNames } = (0, configs_1.resolveGlobalStyles)(options.styles, workspaceRoot, !!options.preserveSymlinks);
+        for (const [name, files] of Object.entries(stylesheetEntrypoints)) {
+            const virtualEntryData = files.map((file) => `@import '${file}';`).join('\n');
+            const sheetResult = await (0, stylesheets_1.bundleStylesheetText)(virtualEntryData, { virtualName: `angular:style/global;${name}`, resolvePath: workspaceRoot }, {
+                optimization: !!optimizationOptions.styles.minify,
+                sourcemap: !!sourcemapOptions.styles,
+                outputNames: noInjectNames.includes(name) ? { media: outputNames.media } : outputNames,
+            });
+            await (0, esbuild_1.logMessages)(context, sheetResult);
+            if (!sheetResult.path) {
+                // Failed to process the stylesheet
+                assert.ok(sheetResult.errors.length, `Global stylesheet processing for '${name}' failed with no errors.`);
+                return { success: false };
+            }
+            // The virtual stylesheets will be named `stdin` by esbuild. This must be replaced
+            // with the actual name of the global style and the leading directory separator must
+            // also be removed to make the path relative.
+            const sheetPath = sheetResult.path.replace('stdin', name).slice(1);
+            outputFiles.push(createOutputFileFromText(sheetPath, sheetResult.contents));
+            if (sheetResult.map) {
+                outputFiles.push(createOutputFileFromText(sheetPath + '.map', sheetResult.map));
+            }
+            if (!noInjectNames.includes(name)) {
+                initialFiles.push({
+                    file: sheetPath,
+                    name,
+                    extension: '.css',
+                });
+            }
+            outputFiles.push(...sheetResult.resourceFiles);
+        }
+    }
+    // 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 : [],
+        });
+        // Create an index HTML generator that reads from the in-memory output files
+        const indexHtmlGenerator = new index_html_generator_1.IndexHtmlGenerator({
+            indexPath: path.join(context.workspaceRoot, (0, webpack_browser_config_1.getIndexInputFile)(options.index)),
+            entrypoints,
+            sri: options.subresourceIntegrity,
+            optimization: optimizationOptions,
+            crossOrigin: options.crossOrigin,
+        });
+        indexHtmlGenerator.readAsset = async function (path) {
+            // Remove leading directory separator
+            path = path.slice(1);
+            const file = outputFiles.find((file) => file.path === path);
+            if (file) {
+                return file.text;
+            }
+            throw new Error(`Output file does not exist: ${path}`);
+        };
+        const { content, warnings, errors } = await indexHtmlGenerator.process({
+            baseHref: options.baseHref,
+            lang: undefined,
+            outputPath: '/',
+            files: initialFiles,
+        });
+        for (const error of errors) {
+            context.logger.error(error);
+        }
+        for (const warning of warnings) {
+            context.logger.warn(warning);
+        }
+        outputFiles.push(createOutputFileFromText((0, webpack_browser_config_1.getIndexOutputFile)(options.index), content));
+    }
+    // Copy assets
+    if (assets) {
+        await (0, copy_assets_1.copyAssets)(assets, [outputPath], workspaceRoot);
+    }
+    // Write output files
+    await Promise.all(outputFiles.map((file) => fs_1.promises.writeFile(path.join(outputPath, file.path), file.contents)));
+    context.logger.info(`Complete. [${(Date.now() - startTime) / 1000} seconds]`);
+    return { success: true };
+}
+exports.execute = execute;
+function createOutputFileFromText(path, text) {
+    return {
+        path,
+        text,
+        get contents() {
+            return Buffer.from(this.text, 'utf-8');
+        },
+    };
+}
+async function bundleCode(workspaceRoot, entryPoints, outputNames, options, optimizationOptions, sourcemapOptions, tsconfig) {
+    return (0, esbuild_1.bundle)({
+        absWorkingDir: workspaceRoot,
+        bundle: true,
+        format: 'esm',
+        entryPoints,
+        entryNames: outputNames.bundles,
+        assetNames: outputNames.media,
+        target: 'es2020',
+        mainFields: ['es2020', 'browser', 'module', 'main'],
+        conditions: ['es2020', 'module'],
+        resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
+        logLevel: options.verbose ? 'debug' : 'silent',
+        metafile: true,
+        minify: optimizationOptions.scripts,
+        pure: ['forwardRef'],
+        outdir: '/',
+        sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
+        splitting: true,
+        tsconfig,
+        write: false,
+        platform: 'browser',
+        preserveSymlinks: options.preserveSymlinks,
+        plugins: [
+            (0, compiler_plugin_1.createCompilerPlugin)(
+            // JS/TS options
+            {
+                sourcemap: !!sourcemapOptions.scripts,
+                tsconfig,
+                advancedOptimizations: options.buildOptimizer,
+            }, 
+            // Component stylesheet options
+            {
+                workspaceRoot,
+                optimization: !!optimizationOptions.styles.minify,
+                sourcemap: !!sourcemapOptions.styles,
+                outputNames,
+            }),
+        ],
+        define: {
+            'ngDevMode': optimizationOptions.scripts ? 'false' : 'true',
+            'ngJitMode': 'false',
+        },
+    });
+}
+exports.default = (0, architect_1.createBuilder)(execute);

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

@@ -0,0 +1,34 @@
+/**
+ * @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 { BuilderContext } from '@angular-devkit/architect';
+import { Schema as BrowserBuilderOptions } from '../browser/schema';
+/**
+ * Normalize the user provided options by creating full paths for all path based options
+ * and converting multi-form options into a single form that can be directly used
+ * by the build process.
+ *
+ * @param context The context for current builder execution.
+ * @param projectName The name of the project for the current execution.
+ * @param options An object containing the options to use for the build.
+ * @returns An object containing normalized options required to perform the build.
+ */
+export declare function normalizeOptions(context: BuilderContext, projectName: string, options: BrowserBuilderOptions): Promise<{
+    workspaceRoot: string;
+    mainEntryPoint: string;
+    polyfillsEntryPoint: string | undefined;
+    optimizationOptions: import("../../utils").NormalizedOptimizationOptions;
+    outputPath: string;
+    sourcemapOptions: import("../browser/schema").SourceMapClass;
+    tsconfig: string;
+    projectRoot: string;
+    assets: import("../browser/schema").AssetPatternClass[] | undefined;
+    outputNames: {
+        bundles: string;
+        media: string;
+    };
+}>;

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

@@ -0,0 +1,87 @@
+"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
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const path = __importStar(require("path"));
+const utils_1 = require("../../utils");
+const schema_1 = require("../browser/schema");
+/**
+ * Normalize the user provided options by creating full paths for all path based options
+ * and converting multi-form options into a single form that can be directly used
+ * by the build process.
+ *
+ * @param context The context for current builder execution.
+ * @param projectName The name of the project for the current execution.
+ * @param options An object containing the options to use for the build.
+ * @returns An object containing normalized options required to perform the build.
+ */
+async function normalizeOptions(context, projectName, options) {
+    var _a, _b, _c, _d;
+    const workspaceRoot = context.workspaceRoot;
+    const projectMetadata = await context.getProjectMetadata(projectName);
+    const projectRoot = path.join(workspaceRoot, (_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '');
+    const projectSourceRoot = path.join(workspaceRoot, (_b = projectMetadata.sourceRoot) !== null && _b !== void 0 ? _b : 'src');
+    // Normalize options
+    const mainEntryPoint = path.join(workspaceRoot, options.main);
+    const polyfillsEntryPoint = options.polyfills && path.join(workspaceRoot, options.polyfills);
+    const tsconfig = path.join(workspaceRoot, options.tsConfig);
+    const outputPath = path.join(workspaceRoot, options.outputPath);
+    const optimizationOptions = (0, utils_1.normalizeOptimization)(options.optimization);
+    const sourcemapOptions = (0, utils_1.normalizeSourceMaps)((_c = options.sourceMap) !== null && _c !== void 0 ? _c : false);
+    const assets = ((_d = options.assets) === null || _d === void 0 ? void 0 : _d.length)
+        ? (0, utils_1.normalizeAssetPatterns)(options.assets, workspaceRoot, projectRoot, projectSourceRoot)
+        : undefined;
+    const outputNames = {
+        bundles: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Bundles
+            ? '[name].[hash]'
+            : '[name]',
+        media: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Media
+            ? '[name].[hash]'
+            : '[name]',
+    };
+    if (options.resourcesOutputPath) {
+        outputNames.media = path.join(options.resourcesOutputPath, outputNames.media);
+    }
+    return {
+        workspaceRoot,
+        mainEntryPoint,
+        polyfillsEntryPoint,
+        optimizationOptions,
+        outputPath,
+        sourcemapOptions,
+        tsconfig,
+        projectRoot,
+        assets,
+        outputNames,
+    };
+}
+exports.normalizeOptions = normalizeOptions;

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

@@ -0,0 +1,52 @@
+/**
+ * @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 { OutputFile } from 'esbuild';
+export interface BundleStylesheetOptions {
+    workspaceRoot?: string;
+    optimization: boolean;
+    preserveSymlinks?: boolean;
+    sourcemap: boolean | 'external';
+    outputNames?: {
+        bundles?: string;
+        media?: string;
+    };
+}
+/**
+ * Bundle a stylesheet that exists as a file on the filesystem.
+ *
+ * @param filename The path to the file to bundle.
+ * @param options The stylesheet bundling options to use.
+ * @returns The bundle result object.
+ */
+export declare function bundleStylesheetFile(filename: string, options: BundleStylesheetOptions): Promise<{
+    errors: import("esbuild").Message[];
+    warnings: import("esbuild").Message[];
+    contents: string;
+    map: string | undefined;
+    path: string | undefined;
+    resourceFiles: OutputFile[];
+}>;
+/**
+ * Bundle stylesheet text data from a string.
+ *
+ * @param data The string content of a stylesheet to bundle.
+ * @param dataOptions The options to use to resolve references and name output of the stylesheet data.
+ * @param bundleOptions  The stylesheet bundling options to use.
+ * @returns The bundle result object.
+ */
+export declare function bundleStylesheetText(data: string, dataOptions: {
+    resolvePath: string;
+    virtualName?: string;
+}, bundleOptions: BundleStylesheetOptions): Promise<{
+    errors: import("esbuild").Message[];
+    warnings: import("esbuild").Message[];
+    contents: string;
+    map: string | undefined;
+    path: string | undefined;
+    resourceFiles: OutputFile[];
+}>;

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

@@ -0,0 +1,118 @@
+"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
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bundleStylesheetText = exports.bundleStylesheetFile = void 0;
+const path = __importStar(require("path"));
+const esbuild_1 = require("./esbuild");
+async function bundleStylesheet(entry, options) {
+    var _a, _b;
+    // Execute esbuild
+    const result = await (0, esbuild_1.bundle)({
+        ...entry,
+        absWorkingDir: options.workspaceRoot,
+        bundle: true,
+        entryNames: (_a = options.outputNames) === null || _a === void 0 ? void 0 : _a.bundles,
+        assetNames: (_b = options.outputNames) === null || _b === void 0 ? void 0 : _b.media,
+        logLevel: 'silent',
+        minify: options.optimization,
+        sourcemap: options.sourcemap,
+        outdir: '/',
+        write: false,
+        platform: 'browser',
+        preserveSymlinks: options.preserveSymlinks,
+        conditions: ['style'],
+        mainFields: ['style'],
+        plugins: [
+        // TODO: preprocessor plugins
+        ],
+    });
+    // Extract the result of the bundling from the output files
+    let contents = '';
+    let map;
+    let outputPath;
+    const resourceFiles = [];
+    if (result.outputFiles) {
+        for (const outputFile of result.outputFiles) {
+            const filename = path.basename(outputFile.path);
+            if (filename.endsWith('.css')) {
+                outputPath = outputFile.path;
+                contents = outputFile.text;
+            }
+            else if (filename.endsWith('.css.map')) {
+                map = outputFile.text;
+            }
+            else {
+                // The output files could also contain resources (images/fonts/etc.) that were referenced
+                resourceFiles.push(outputFile);
+            }
+        }
+    }
+    return {
+        errors: result.errors,
+        warnings: result.warnings,
+        contents,
+        map,
+        path: outputPath,
+        resourceFiles,
+    };
+}
+/**
+ * Bundle a stylesheet that exists as a file on the filesystem.
+ *
+ * @param filename The path to the file to bundle.
+ * @param options The stylesheet bundling options to use.
+ * @returns The bundle result object.
+ */
+async function bundleStylesheetFile(filename, options) {
+    return bundleStylesheet({ entryPoints: [filename] }, options);
+}
+exports.bundleStylesheetFile = bundleStylesheetFile;
+/**
+ * Bundle stylesheet text data from a string.
+ *
+ * @param data The string content of a stylesheet to bundle.
+ * @param dataOptions The options to use to resolve references and name output of the stylesheet data.
+ * @param bundleOptions  The stylesheet bundling options to use.
+ * @returns The bundle result object.
+ */
+async function bundleStylesheetText(data, dataOptions, bundleOptions) {
+    const result = bundleStylesheet({
+        stdin: {
+            contents: data,
+            sourcefile: dataOptions.virtualName,
+            resolveDir: dataOptions.resolvePath,
+            loader: 'css',
+        },
+    }, bundleOptions);
+    return result;
+}
+exports.bundleStylesheetText = bundleStylesheetText;

package/src/utils/service-worker.d.ts

@@ -5,4 +5,4 @@
  * 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
  */
-export declare function augmentAppWithServiceWorker(appRoot: string, outputPath: string, baseHref: string, ngswConfigPath?: string): Promise<void>;
+export declare function augmentAppWithServiceWorker(appRoot: string, workspaceRoot: string, outputPath: string, baseHref: string, ngswConfigPath?: string): Promise<void>;

package/src/utils/service-worker.js

@@ -75,10 +75,10 @@ class CliFilesystem {
         return items;
     }
 }
-async function augmentAppWithServiceWorker(appRoot, outputPath, baseHref, ngswConfigPath) {
+async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, baseHref, ngswConfigPath) {
     // Determine the configuration file path
     const configPath = ngswConfigPath
-        ? path.normalize(ngswConfigPath)
+        ? path.join(workspaceRoot, ngswConfigPath)
         : path.join(appRoot, 'ngsw-config.json');
     // Read the configuration file
     let config;

package/src/webpack/configs/common.js

@@ -319,6 +319,7 @@ async function getCommonConfig(wco) {
             asyncWebAssembly: true,
         },
         infrastructureLogging: {
+            debug: verbose,
             level: verbose ? 'verbose' : 'error',
         },
         stats: (0, helpers_1.getStatsOptions)(verbose),