@angular-devkit/build-angular 15.0.0 → 15.1.0-next.0

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

@@ -25,6 +25,27 @@ function createSassPlugin(options) {
     return {
         name: 'angular-sass',
         setup(build) {
+            const resolveUrl = async (url, previousResolvedModules) => {
+                let result = await build.resolve(url, {
+                    kind: 'import-rule',
+                    // This should ideally be the directory of the importer file from Sass
+                    // but that is not currently available from the Sass importer API.
+                    resolveDir: build.initialOptions.absWorkingDir,
+                });
+                // Workaround to support Yarn PnP without access to the importer file from Sass
+                if (!result.path && (previousResolvedModules === null || previousResolvedModules === void 0 ? void 0 : previousResolvedModules.size)) {
+                    for (const previous of previousResolvedModules) {
+                        result = await build.resolve(url, {
+                            kind: 'import-rule',
+                            resolveDir: previous,
+                        });
+                        if (result.path) {
+                            break;
+                        }
+                    }
+                }
+                return result;
+            };
             build.onLoad({ filter: /\.s[ac]ss$/ }, async (args) => {
                 // Lazily load Sass when a Sass file is found
                 sassWorkerPool !== null && sassWorkerPool !== void 0 ? sassWorkerPool : (sassWorkerPool = new sass_service_1.SassWorkerImplementation(true));
@@ -41,39 +62,18 @@ function createSassPlugin(options) {
                         importers: [
                             {
                                 findFileUrl: async (url, { previousResolvedModules }) => {
-                                    let result = await build.resolve(url, {
-                                        kind: 'import-rule',
-                                        // This should ideally be the directory of the importer file from Sass
-                                        // but that is not currently available from the Sass importer API.
-                                        resolveDir: build.initialOptions.absWorkingDir,
-                                    });
-                                    // Workaround to support Yarn PnP without access to the importer file from Sass
-                                    if (!result.path && (previousResolvedModules === null || previousResolvedModules === void 0 ? void 0 : previousResolvedModules.size)) {
-                                        for (const previous of previousResolvedModules) {
-                                            result = await build.resolve(url, {
-                                                kind: 'import-rule',
-                                                resolveDir: previous,
-                                            });
-                                        }
-                                    }
+                                    const result = await resolveUrl(url, previousResolvedModules);
                                     // Check for package deep imports
                                     if (!result.path) {
                                         const parts = url.split('/');
-                                        const hasScope = parts.length > 2 && parts[0].startsWith('@');
-                                        if (hasScope || parts.length > 1) {
-                                            const [nameOrScope, nameOrFirstPath, ...pathPart] = parts;
-                                            const packageName = hasScope
-                                                ? `${nameOrScope}/${nameOrFirstPath}`
-                                                : nameOrScope;
-                                            const packageResult = await build.resolve(packageName + '/package.json', {
-                                                kind: 'import-rule',
-                                                // This should ideally be the directory of the importer file from Sass
-                                                // but that is not currently available from the Sass importer API.
-                                                resolveDir: build.initialOptions.absWorkingDir,
-                                            });
-                                            if (packageResult.path) {
-                                                return (0, node_url_1.pathToFileURL)((0, node_path_1.join)((0, node_path_1.dirname)(packageResult.path), !hasScope ? nameOrFirstPath : '', ...pathPart));
-                                            }
+                                        const hasScope = parts.length >= 2 && parts[0].startsWith('@');
+                                        const [nameOrScope, nameOrFirstPath, ...pathPart] = parts;
+                                        const packageName = hasScope
+                                            ? `${nameOrScope}/${nameOrFirstPath}`
+                                            : nameOrScope;
+                                        const packageResult = await resolveUrl(packageName + '/package.json', previousResolvedModules);
+                                        if (packageResult.path) {
+                                            return (0, node_url_1.pathToFileURL)((0, node_path_1.join)((0, node_path_1.dirname)(packageResult.path), !hasScope ? nameOrFirstPath : '', ...pathPart));
                                         }
                                     }
                                     return result.path ? (0, node_url_1.pathToFileURL)(result.path) : null;

package/src/builders/server/index.js

@@ -37,9 +37,13 @@ const path = __importStar(require("path"));
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const utils_1 = require("../../utils");
+const color_1 = require("../../utils/color");
+const copy_assets_1 = require("../../utils/copy-assets");
+const error_1 = require("../../utils/error");
 const i18n_inlining_1 = require("../../utils/i18n-inlining");
 const output_paths_1 = require("../../utils/output-paths");
 const purge_cache_1 = require("../../utils/purge-cache");
+const spinner_1 = require("../../utils/spinner");
 const version_1 = require("../../utils/version");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const configs_1 = require("../../webpack/configs");
@@ -54,7 +58,7 @@ function execute(options, context, transforms = {}) {
     (0, version_1.assertCompatibleAngularVersion)(root);
     const baseOutputPath = path.resolve(root, options.outputPath);
     let outputPaths;
-    return (0, rxjs_1.from)(initialize(options, context, transforms.webpackConfiguration)).pipe((0, operators_1.concatMap)(({ config, i18n }) => {
+    return (0, rxjs_1.from)(initialize(options, context, transforms.webpackConfiguration)).pipe((0, operators_1.concatMap)(({ config, i18n, projectRoot, projectSourceRoot }) => {
         return (0, build_webpack_1.runWebpack)(config, context, {
             webpackFactory: require('webpack'),
             logging: (stats, config) => {
@@ -63,19 +67,47 @@ function execute(options, context, transforms = {}) {
                 }
             },
         }).pipe((0, operators_1.concatMap)(async (output) => {
+            var _a;
             const { emittedFiles = [], outputPath, webpackStats } = output;
             if (!webpackStats) {
                 throw new Error('Webpack stats build result is required.');
             }
-            let success = output.success;
-            if (success && i18n.shouldInline) {
-                outputPaths = (0, output_paths_1.ensureOutputPaths)(baseOutputPath, i18n);
-                success = await (0, i18n_inlining_1.i18nInlineEmittedFiles)(context, emittedFiles, i18n, baseOutputPath, Array.from(outputPaths.values()), [], outputPath, options.i18nMissingTranslation);
+            if (!output.success) {
+                return output;
+            }
+            const spinner = new spinner_1.Spinner();
+            spinner.enabled = options.progress !== false;
+            outputPaths = (0, output_paths_1.ensureOutputPaths)(baseOutputPath, i18n);
+            // Copy assets
+            if (!options.watch && ((_a = options.assets) === null || _a === void 0 ? void 0 : _a.length)) {
+                spinner.start('Copying assets...');
+                try {
+                    await (0, copy_assets_1.copyAssets)((0, utils_1.normalizeAssetPatterns)(options.assets, context.workspaceRoot, projectRoot, projectSourceRoot), Array.from(outputPaths.values()), context.workspaceRoot);
+                    spinner.succeed('Copying assets complete.');
+                }
+                catch (err) {
+                    spinner.fail(color_1.colors.redBright('Copying of assets failed.'));
+                    (0, error_1.assertIsError)(err);
+                    return {
+                        ...output,
+                        success: false,
+                        error: 'Unable to copy assets: ' + err.message,
+                    };
+                }
+            }
+            if (i18n.shouldInline) {
+                const success = await (0, i18n_inlining_1.i18nInlineEmittedFiles)(context, emittedFiles, i18n, baseOutputPath, Array.from(outputPaths.values()), [], outputPath, options.i18nMissingTranslation);
+                if (!success) {
+                    return {
+                        ...output,
+                        success: false,
+                    };
+                }
             }
             (0, stats_1.webpackStatsLogger)(context.logger, webpackStats, config);
-            return { ...output, success };
+            return output;
         }));
-    }), (0, operators_1.map)((output) => {
+    }), (0, operators_1.concatMap)(async (output) => {
         if (!output.success) {
             return output;
         }
@@ -102,8 +134,10 @@ async function initialize(options, context, webpackConfigurationTransform) {
     await (0, purge_cache_1.purgeStaleBuildCache)(context);
     const browserslist = (await Promise.resolve().then(() => __importStar(require('browserslist')))).default;
     const originalOutputPath = options.outputPath;
-    const { config, i18n } = await (0, webpack_browser_config_1.generateI18nBrowserWebpackConfigFromContext)({
-        ...options,
+    // Assets are processed directly by the builder except when watching
+    const adjustedOptions = options.watch ? options : { ...options, assets: [] };
+    const { config, projectRoot, projectSourceRoot, i18n } = await (0, webpack_browser_config_1.generateI18nBrowserWebpackConfigFromContext)({
+        ...adjustedOptions,
         buildOptimizer: false,
         aot: true,
         platform: 'server',
@@ -119,7 +153,7 @@ async function initialize(options, context, webpackConfigurationTransform) {
         (0, utils_1.deleteOutputDir)(context.workspaceRoot, originalOutputPath);
     }
     const transformedConfig = (_a = (await (webpackConfigurationTransform === null || webpackConfigurationTransform === void 0 ? void 0 : webpackConfigurationTransform(config)))) !== null && _a !== void 0 ? _a : config;
-    return { config: transformedConfig, i18n };
+    return { config: transformedConfig, i18n, projectRoot, projectSourceRoot };
 }
 /**
  * Add `@angular/platform-server` exports.

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

@@ -1,4 +1,8 @@
 export interface Schema {
+    /**
+     * List of static application assets.
+     */
+    assets?: AssetPattern[];
     /**
      * Delete the output path before building.
      */
@@ -110,6 +114,30 @@ export interface Schema {
      */
     watch?: boolean;
 }
+export declare type AssetPattern = AssetPatternClass | string;
+export interface AssetPatternClass {
+    /**
+     * Allow glob patterns to follow symlink directories. This allows subdirectories of the
+     * symlink to be searched.
+     */
+    followSymlinks?: boolean;
+    /**
+     * The pattern to match.
+     */
+    glob: string;
+    /**
+     * An array of globs to ignore.
+     */
+    ignore?: string[];
+    /**
+     * The input directory path in which to apply 'glob'. Defaults to the project root.
+     */
+    input: string;
+    /**
+     * Absolute path within the output.
+     */
+    output: string;
+}
 export interface FileReplacement {
     replace?: string;
     replaceWith?: string;

package/src/builders/server/schema.json

@@ -4,6 +4,14 @@
   "title": "Universal Target",
   "type": "object",
   "properties": {
+    "assets": {
+      "type": "array",
+      "description": "List of static application assets.",
+      "default": [],
+      "items": {
+        "$ref": "#/definitions/assetPattern"
+      }
+    },
     "main": {
       "type": "string",
       "description": "The name of the main entry-point file."
@@ -212,6 +220,44 @@
   "additionalProperties": false,
   "required": ["outputPath", "main", "tsConfig"],
   "definitions": {
+    "assetPattern": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "followSymlinks": {
+              "type": "boolean",
+              "default": false,
+              "description": "Allow glob patterns to follow symlink directories. This allows subdirectories of the symlink to be searched."
+            },
+            "glob": {
+              "type": "string",
+              "description": "The pattern to match."
+            },
+            "input": {
+              "type": "string",
+              "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
+            },
+            "ignore": {
+              "description": "An array of globs to ignore.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "output": {
+              "type": "string",
+              "description": "Absolute path within the output."
+            }
+          },
+          "additionalProperties": false,
+          "required": ["glob", "input", "output"]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "fileReplacement": {
       "oneOf": [
         {

package/src/sass/rebasing-importer.d.ts

@@ -6,10 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <reference types="node" />
-/// <reference types="node" />
 import { RawSourceMap } from '@ampproject/remapping';
-import { Dirent } from 'node:fs';
 import type { FileImporter, Importer, ImporterResult } from 'sass';
+/**
+ * A preprocessed cache entry for the files and directories within a previously searched
+ * directory when performing Sass import resolution.
+ */
+export interface DirectoryEntry {
+    files: Set<string>;
+    directories: Set<string>;
+}
 /**
  * A Sass Importer base class that provides the load logic to rebase all `url()` functions
  * within a stylesheet. The rebasing will ensure that the URLs in the output of the Sass compiler
@@ -42,7 +48,7 @@ declare abstract class UrlRebasingImporter implements Importer<'sync'> {
  */
 export declare class RelativeUrlRebasingImporter extends UrlRebasingImporter {
     private directoryCache;
-    constructor(entryDirectory: string, directoryCache?: Map<string, Dirent[]>, rebaseSourceMaps?: Map<string, RawSourceMap>);
+    constructor(entryDirectory: string, directoryCache?: Map<string, DirectoryEntry>, rebaseSourceMaps?: Map<string, RawSourceMap>);
     canonicalize(url: string, options: {
         fromImport: boolean;
     }): URL | null;
@@ -59,7 +65,7 @@ export declare class RelativeUrlRebasingImporter extends UrlRebasingImporter {
      * Checks an array of potential stylesheet files to determine if there is a valid
      * stylesheet file. More than one discovered file may indicate an error.
      * @param found An array of discovered stylesheet files.
-     * @returns A fully resolved URL for a stylesheet file or `null` if not found.
+     * @returns A fully resolved path for a stylesheet file or `null` if not found.
      * @throws If there are ambiguous files discovered.
      */
     private checkFound;
@@ -71,7 +77,7 @@ export declare class RelativeUrlRebasingImporter extends UrlRebasingImporter {
  */
 export declare class ModuleUrlRebasingImporter extends RelativeUrlRebasingImporter {
     private finder;
-    constructor(entryDirectory: string, directoryCache: Map<string, Dirent[]>, rebaseSourceMaps: Map<string, RawSourceMap> | undefined, finder: FileImporter<'sync'>['findFileUrl']);
+    constructor(entryDirectory: string, directoryCache: Map<string, DirectoryEntry>, rebaseSourceMaps: Map<string, RawSourceMap> | undefined, finder: FileImporter<'sync'>['findFileUrl']);
     canonicalize(url: string, options: {
         fromImport: boolean;
     }): URL | null;
@@ -83,7 +89,7 @@ export declare class ModuleUrlRebasingImporter extends RelativeUrlRebasingImport
  */
 export declare class LoadPathsUrlRebasingImporter extends RelativeUrlRebasingImporter {
     private loadPaths;
-    constructor(entryDirectory: string, directoryCache: Map<string, Dirent[]>, rebaseSourceMaps: Map<string, RawSourceMap> | undefined, loadPaths: Iterable<string>);
+    constructor(entryDirectory: string, directoryCache: Map<string, DirectoryEntry>, rebaseSourceMaps: Map<string, RawSourceMap> | undefined, loadPaths: Iterable<string>);
     canonicalize(url: string, options: {
         fromImport: boolean;
     }): URL | null;