@angular-devkit/build-angular 18.0.0-next.2 → 18.0.0-next.4

package/src/builders/ng-packagr/index.js

@@ -31,23 +31,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
+const private_1 = require("@angular/build/private");
 const architect_1 = require("@angular-devkit/architect");
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const rxjs_1 = require("rxjs");
 const normalize_cache_1 = require("../../utils/normalize-cache");
-const purge_cache_1 = require("../../utils/purge-cache");
 /**
  * @experimental Direct usage of this function is considered experimental.
  */
 function execute(options, context) {
     return (0, rxjs_1.from)((async () => {
         // Purge old build disk cache.
-        await (0, purge_cache_1.purgeStaleBuildCache)(context);
+        await (0, private_1.purgeStaleBuildCache)(context);
         const root = context.workspaceRoot;
         const packager = (await Promise.resolve().then(() => __importStar(require('ng-packagr')))).ngPackagr();
-        packager.forProject((0, path_1.resolve)(root, options.project));
+        packager.forProject((0, node_path_1.resolve)(root, options.project));
         if (options.tsConfig) {
-            packager.withTsConfig((0, path_1.resolve)(root, options.tsConfig));
+            packager.withTsConfig((0, node_path_1.resolve)(root, options.tsConfig));
         }
         const projectName = context.target?.project;
         if (!projectName) {
@@ -57,10 +57,11 @@ function execute(options, context) {
         const { enabled: cacheEnabled, path: cacheDirectory } = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot);
         const ngPackagrOptions = {
             cacheEnabled,
-            cacheDirectory: (0, path_1.join)(cacheDirectory, 'ng-packagr'),
+            poll: options.poll,
+            cacheDirectory: (0, node_path_1.join)(cacheDirectory, 'ng-packagr'),
         };
         return { packager, ngPackagrOptions };
-    })()).pipe((0, rxjs_1.switchMap)(({ packager, ngPackagrOptions }) => options.watch ? packager.watch(ngPackagrOptions) : packager.build(ngPackagrOptions)), (0, rxjs_1.mapTo)({ success: true }), (0, rxjs_1.catchError)((err) => (0, rxjs_1.of)({ success: false, error: err.message })));
+    })()).pipe((0, rxjs_1.switchMap)(({ packager, ngPackagrOptions }) => options.watch ? packager.watch(ngPackagrOptions) : packager.build(ngPackagrOptions)), (0, rxjs_1.map)(() => ({ success: true })), (0, rxjs_1.catchError)((err) => (0, rxjs_1.of)({ success: false, error: err.message })));
 }
 exports.execute = execute;
 exports.default = (0, architect_1.createBuilder)(execute);

package/src/builders/ng-packagr/schema.d.ts

@@ -2,6 +2,10 @@
  * ng-packagr target options for Build Architect. Use to build library projects.
  */
 export interface Schema {
+    /**
+     * Enable and define the file watching poll time period in milliseconds.
+     */
+    poll?: number;
     /**
      * The file path for the ng-packagr configuration file, relative to the current workspace.
      */

package/src/builders/ng-packagr/schema.json

@@ -16,6 +16,10 @@
       "type": "boolean",
       "description": "Run build when files change.",
       "default": false
+    },
+    "poll": {
+      "type": "number",
+      "description": "Enable and define the file watching poll time period in milliseconds."
     }
   },
   "additionalProperties": false,

package/src/builders/prerender/index.js

@@ -34,6 +34,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
+const private_1 = require("@angular/build/private");
 const architect_1 = require("@angular-devkit/architect");
 const fs = __importStar(require("fs"));
 const promises_1 = require("node:fs/promises");
@@ -43,7 +44,6 @@ const piscina_1 = __importDefault(require("piscina"));
 const utils_1 = require("../../utils");
 const environment_options_1 = require("../../utils/environment-options");
 const error_1 = require("../../utils/error");
-const service_worker_1 = require("../../utils/service-worker");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 class RoutesSet extends Set {
     add(value) {
@@ -188,7 +188,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, b
             if (browserOptions.serviceWorker) {
                 spinner.start('Generating service worker...');
                 try {
-                    await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+                    await (0, private_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
                 }
                 catch (error) {
                     spinner.fail('Service worker generation failed.');

package/src/builders/prerender/render-worker.js

@@ -84,7 +84,7 @@ async function render({ indexFile, deployUrl, minifyCss, outputPath, serverBundl
         });
     }
     if (inlineCriticalCss) {
-        const { InlineCriticalCssProcessor } = await Promise.resolve().then(() => __importStar(require('../../utils/index-file/inline-critical-css')));
+        const { InlineCriticalCssProcessor } = await Promise.resolve().then(() => __importStar(require('@angular/build/private')));
         const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
             deployUrl: deployUrl,
             minify: minifyCss,

package/src/builders/server/index.js

@@ -31,6 +31,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = void 0;
+const private_1 = require("@angular/build/private");
 const architect_1 = require("@angular-devkit/architect");
 const build_webpack_1 = require("@angular-devkit/build-webpack");
 const promises_1 = require("node:fs/promises");
@@ -45,9 +46,7 @@ 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");
 /**
  * @experimental Direct usage of this function is considered experimental.
@@ -55,7 +54,7 @@ const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 function execute(options, context, transforms = {}) {
     const root = context.workspaceRoot;
     // Check Angular version.
-    (0, version_1.assertCompatibleAngularVersion)(root);
+    (0, private_1.assertCompatibleAngularVersion)(root);
     const baseOutputPath = path.resolve(root, options.outputPath);
     let outputPaths;
     return (0, rxjs_1.from)(initialize(options, context, transforms.webpackConfiguration)).pipe((0, rxjs_1.concatMap)(({ config, i18n, projectRoot, projectSourceRoot }) => {
@@ -134,7 +133,7 @@ exports.execute = execute;
 exports.default = (0, architect_1.createBuilder)(execute);
 async function initialize(options, context, webpackConfigurationTransform) {
     // Purge old build disk cache.
-    await (0, purge_cache_1.purgeStaleBuildCache)(context);
+    await (0, private_1.purgeStaleBuildCache)(context);
     await checkTsConfigForPreserveWhitespacesSetting(context, options.tsConfig);
     const browserslist = (await Promise.resolve().then(() => __importStar(require('browserslist')))).default;
     const originalOutputPath = options.outputPath;

package/src/builders/server/platform-server-exports-loader.js

@@ -15,6 +15,7 @@ const node_path_1 = require("node:path");
  * @see https://github.com/webpack/webpack/issues/15936.
  */
 function default_1(content, map) {
+    const extractorPath = (0, node_path_1.join)((0, node_path_1.dirname)(require.resolve('@angular/build/package.json')), 'src/utils/routes-extractor/extractor.js');
     const source = `${content}
 
   // EXPORTS added by @angular-devkit/build-angular
@@ -22,7 +23,7 @@ function default_1(content, map) {
   ` +
         // We do not import it directly so that node.js modules are resolved using the correct context.
         // Remove source map URL comments from the code if a sourcemap is present as this will not match the file.
-        (0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, '../../utils/routes-extractor/extractor.js'), 'utf-8').replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
+        (0, node_fs_1.readFileSync)(extractorPath, 'utf-8').replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
     this.callback(null, source, map);
     return;
 }

package/src/builders/ssr-dev-server/index.js

@@ -31,13 +31,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.log = exports.execute = void 0;
+const private_1 = require("@angular/build/private");
 const architect_1 = require("@angular-devkit/architect");
 const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const url = __importStar(require("url"));
-const utils_1 = require("../../utils");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 /** Log messages to ignore and not rely to the logger */
 const IGNORED_STDOUT_MESSAGES = [
     'server listening on',
@@ -78,7 +78,7 @@ function execute(options, context) {
   DON'T USE IT FOR PRODUCTION!
   ****************************************************************************************
  `);
-    return (0, rxjs_1.zip)(browserTargetRun, serverTargetRun, (0, utils_2.getAvailablePort)()).pipe((0, rxjs_1.switchMap)(([br, sr, nodeServerPort]) => {
+    return (0, rxjs_1.zip)(browserTargetRun, serverTargetRun, (0, utils_1.getAvailablePort)()).pipe((0, rxjs_1.switchMap)(([br, sr, nodeServerPort]) => {
         return (0, rxjs_1.combineLatest)([br.output, sr.output]).pipe(
         // This is needed so that if both server and browser emit close to each other
         // we only emit once. This typically happens on the first build.
@@ -101,7 +101,7 @@ function execute(options, context) {
                 context.logger.info('\nCompiled successfully.');
             }
         }), (0, rxjs_1.debounce)(([builderOutput]) => builderOutput.success && !options.inspect
-            ? (0, utils_2.waitUntilServerIsListening)(nodeServerPort)
+            ? (0, utils_1.waitUntilServerIsListening)(nodeServerPort)
             : rxjs_1.EMPTY), (0, rxjs_1.finalize)(() => {
             void br.stop();
             void sr.stop();
@@ -162,7 +162,7 @@ function startNodeServer(serverOutput, port, logger, inspectMode = false) {
         args.unshift('--inspect-brk');
     }
     return (0, rxjs_1.of)(null).pipe((0, rxjs_1.delay)(0), // Avoid EADDRINUSE error since it will cause the kill event to be finish.
-    (0, rxjs_1.switchMap)(() => (0, utils_2.spawnAsObservable)('node', args, { env, shell: true })), (0, rxjs_1.tap)((res) => log({ stderr: res.stderr, stdout: res.stdout }, logger)), (0, rxjs_1.ignoreElements)(), 
+    (0, rxjs_1.switchMap)(() => (0, utils_1.spawnAsObservable)('node', args, { env, shell: true })), (0, rxjs_1.tap)((res) => log({ stderr: res.stderr, stdout: res.stdout }, logger)), (0, rxjs_1.ignoreElements)(), 
     // Emit a signal after the process has been started
     (0, rxjs_1.startWith)(undefined));
 }
@@ -171,7 +171,7 @@ async function initBrowserSync(browserSyncInstance, nodeServerPort, options, con
         return browserSyncInstance;
     }
     const { port: browserSyncPort, open, host, publicHost, proxyConfig } = options;
-    const bsPort = browserSyncPort || (await (0, utils_2.getAvailablePort)());
+    const bsPort = browserSyncPort || (await (0, utils_1.getAvailablePort)());
     const bsOptions = {
         proxy: {
             target: `localhost:${nodeServerPort}`,
@@ -223,21 +223,24 @@ async function initBrowserSync(browserSyncInstance, nodeServerPort, options, con
         if (hasPathname) {
             const { createProxyMiddleware } = await Promise.resolve().then(() => __importStar(require('http-proxy-middleware')));
             // Remove leading slash
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            (bsOptions.scriptPath = (p) => p.substring(1)),
-                (bsOptions.middleware = [
-                    createProxyMiddleware(defaultSocketIoPath, {
-                        target: url.format({
-                            protocol: 'http',
-                            hostname: host,
-                            port: bsPort,
-                            pathname: path,
-                        }),
-                        ws: true,
-                        logLevel: 'silent',
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            bsOptions.scriptPath = (p) => p.substring(1);
+            bsOptions.middleware = [
+                createProxyMiddleware({
+                    pathFilter: defaultSocketIoPath,
+                    target: url.format({
+                        protocol: 'http',
+                        hostname: host,
+                        port: bsPort,
+                        pathname: path,
                     }),
-                ]);
+                    ws: true,
+                    logger: {
+                        info: () => { },
+                        warn: () => { },
+                        error: () => { },
+                    },
+                }),
+            ];
         }
     }
     if (proxyConfig) {
@@ -283,21 +286,18 @@ function getSslConfig(root, options) {
     return ssl;
 }
 async function getProxyConfig(root, proxyConfig) {
-    const proxy = await (0, utils_1.loadProxyConfiguration)(root, proxyConfig, false);
-    const createdProxies = [];
+    const proxy = await (0, private_1.loadProxyConfiguration)(root, proxyConfig);
+    if (!proxy) {
+        return [];
+    }
     const { createProxyMiddleware } = await Promise.resolve().then(() => __importStar(require('http-proxy-middleware')));
-    for (const [key, context] of Object.entries(proxy)) {
-        if (typeof key === 'string') {
-            createdProxies.push(createProxyMiddleware(key.replace(/^\*$/, '**').replace(/\/\*$/, ''), 
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            context));
-        }
-        else {
-            createdProxies.push(
+    return Object.entries(proxy).map(([key, context]) => {
+        const filterRegExp = new RegExp(key);
+        return createProxyMiddleware({
+            pathFilter: (pathname) => filterRegExp.test(pathname),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            createProxyMiddleware(key, context));
-        }
-    }
-    return createdProxies;
+            ...context,
+        });
+    });
 }
 exports.default = (0, architect_1.createBuilder)(execute);

package/src/builders/web-test-runner/index.js

@@ -10,12 +10,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const private_1 = require("@angular/build/private");
 const architect_1 = require("@angular-devkit/architect");
 const node_fs_1 = require("node:fs");
 const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const test_files_1 = require("../../utils/test-files");
-const application_1 = require("../application");
 const schema_1 = require("../browser-esbuild/schema");
 const builder_status_warnings_1 = require("./builder-status-warnings");
 const options_1 = require("./options");
@@ -67,7 +67,7 @@ async function buildTests(testFiles, outputPath, options, ctx) {
     }
     // Build tests with `application` builder, using test files as entry points.
     // Also bundle in Jasmine and the Jasmine runner script, which need to share chunked dependencies.
-    const buildOutput = await first((0, application_1.buildApplicationInternal)({
+    const buildOutput = await first((0, private_1.buildApplicationInternal)({
         entryPoints,
         tsConfig: options.tsConfig,
         outputPath,

package/src/index.d.ts

@@ -8,7 +8,7 @@
 export * from './transforms';
 export { AssetPattern, AssetPatternClass as AssetPatternObject, Budget, CrossOrigin, FileReplacement, OptimizationClass as OptimizationObject, OptimizationUnion, OutputHashing, Schema as BrowserBuilderOptions, SourceMapClass as SourceMapObject, SourceMapUnion, StylePreprocessorOptions, Type, } from './builders/browser/schema';
 export { buildWebpackBrowser as executeBrowserBuilder, BrowserBuilderOutput, } from './builders/browser';
-export { buildApplication, ApplicationBuilderOptions } from './builders/application';
+export { buildApplication, ApplicationBuilderOptions } from '@angular/build';
 export { executeDevServerBuilder, DevServerBuilderOptions, DevServerBuilderOutput, } from './builders/dev-server';
 export { execute as executeExtractI18nBuilder, ExtractI18nBuilderOptions, } from './builders/extract-i18n';
 export { execute as executeKarmaBuilder, KarmaBuilderOptions, KarmaConfigOptions, } from './builders/karma';

package/src/index.js

@@ -29,8 +29,8 @@ Object.defineProperty(exports, "OutputHashing", { enumerable: true, get: functio
 Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return schema_1.Type; } });
 var browser_1 = require("./builders/browser");
 Object.defineProperty(exports, "executeBrowserBuilder", { enumerable: true, get: function () { return browser_1.buildWebpackBrowser; } });
-var application_1 = require("./builders/application");
-Object.defineProperty(exports, "buildApplication", { enumerable: true, get: function () { return application_1.buildApplication; } });
+var build_1 = require("@angular/build");
+Object.defineProperty(exports, "buildApplication", { enumerable: true, get: function () { return build_1.buildApplication; } });
 var dev_server_1 = require("./builders/dev-server");
 Object.defineProperty(exports, "executeDevServerBuilder", { enumerable: true, get: function () { return dev_server_1.executeDevServerBuilder; } });
 var extract_i18n_1 = require("./builders/extract-i18n");

package/src/tools/babel/presets/application.js

@@ -147,7 +147,7 @@ function default_1(api, options) {
         needRuntimeTransform = true;
     }
     if (options.optimize) {
-        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure, } = require('../plugins');
+        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure, } = require('@angular/build/private');
         if (options.optimize.pureTopLevel) {
             plugins.push(markTopLevelPure);
         }

package/src/tools/webpack/configs/styles.js

@@ -34,11 +34,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStylesConfig = void 0;
+const private_1 = require("@angular/build/private");
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const path = __importStar(require("node:path"));
 const node_url_1 = require("node:url");
 const tailwind_1 = require("../../../utils/tailwind");
-const sass_service_1 = require("../../sass/sass-service");
 const plugins_1 = require("../plugins");
 const css_optimizer_plugin_1 = require("../plugins/css-optimizer-plugin");
 const styles_webpack_plugin_1 = require("../plugins/styles-webpack-plugin");
@@ -66,7 +66,7 @@ async function getStylesConfig(wco) {
             extraPlugins.push(new plugins_1.RemoveHashPlugin({ chunkNames: noInjectNames, hashFormat }));
         }
     }
-    const sassImplementation = new sass_service_1.SassWorkerImplementation();
+    const sassImplementation = new private_1.SassWorkerImplementation();
     extraPlugins.push({
         apply(compiler) {
             compiler.hooks.shutdown.tap('sass-worker', () => {

package/src/tools/webpack/plugins/any-component-style-budget-checker.d.ts

@@ -5,14 +5,14 @@
  * 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 { BudgetEntry } from '@angular/build/private';
 import { Compiler } from 'webpack';
-import { Budget } from '../../../builders/browser/schema';
 /**
  * Check budget sizes for component styles by emitting a warning or error if a
  * budget is exceeded by a particular component's styles.
  */
 export declare class AnyComponentStyleBudgetChecker {
     private readonly budgets;
-    constructor(budgets: Budget[]);
+    constructor(budgets: BudgetEntry[]);
     apply(compiler: Compiler): void;
 }

package/src/tools/webpack/plugins/any-component-style-budget-checker.js

@@ -31,10 +31,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnyComponentStyleBudgetChecker = void 0;
+const private_1 = require("@angular/build/private");
 const path = __importStar(require("path"));
 const webpack_1 = require("webpack");
-const schema_1 = require("../../../builders/browser/schema");
-const bundle_calculator_1 = require("../../../utils/bundle-calculator");
 const webpack_diagnostics_1 = require("../../../utils/webpack-diagnostics");
 const PLUGIN_NAME = 'AnyComponentStyleBudgetChecker';
 /**
@@ -44,7 +43,7 @@ const PLUGIN_NAME = 'AnyComponentStyleBudgetChecker';
 class AnyComponentStyleBudgetChecker {
     budgets;
     constructor(budgets) {
-        this.budgets = budgets.filter((budget) => budget.type === schema_1.Type.AnyComponentStyle);
+        this.budgets = budgets.filter((budget) => budget.type === private_1.BudgetType.AnyComponentStyle);
     }
     apply(compiler) {
         compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
@@ -64,22 +63,20 @@ class AnyComponentStyleBudgetChecker {
                 const componentStyles = Object.keys(compilation.assets)
                     .filter((name) => cssExtensions.includes(path.extname(name)))
                     .map((name) => ({
+                    name,
                     size: compilation.assets[name].size(),
-                    label: name,
+                    componentStyle: true,
                 }));
-                const thresholds = this.budgets.flatMap((budget) => [...(0, bundle_calculator_1.calculateThresholds)(budget)]);
-                for (const { size, label } of componentStyles) {
-                    for (const { severity, message } of (0, bundle_calculator_1.checkThresholds)(thresholds[Symbol.iterator](), size, label)) {
-                        switch (severity) {
-                            case bundle_calculator_1.ThresholdSeverity.Warning:
-                                (0, webpack_diagnostics_1.addWarning)(compilation, message);
-                                break;
-                            case bundle_calculator_1.ThresholdSeverity.Error:
-                                (0, webpack_diagnostics_1.addError)(compilation, message);
-                                break;
-                            default:
-                                assertNever(severity);
-                        }
+                for (const { severity, message } of (0, private_1.checkBudgets)(this.budgets, { chunks: [], assets: componentStyles }, true)) {
+                    switch (severity) {
+                        case private_1.ThresholdSeverity.Warning:
+                            (0, webpack_diagnostics_1.addWarning)(compilation, message);
+                            break;
+                        case private_1.ThresholdSeverity.Error:
+                            (0, webpack_diagnostics_1.addError)(compilation, message);
+                            break;
+                        default:
+                            assertNever(severity);
                     }
                 }
             });

package/src/tools/webpack/plugins/css-optimizer-plugin.js

@@ -8,8 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CssOptimizerPlugin = void 0;
+const private_1 = require("@angular/build/private");
 const webpack_diagnostics_1 = require("../../../utils/webpack-diagnostics");
-const utils_1 = require("../../esbuild/utils");
 const esbuild_executor_1 = require("./esbuild-executor");
 /**
  * The name of the plugin provided to Webpack when tapping Webpack compiler hooks.
@@ -26,7 +26,7 @@ class CssOptimizerPlugin {
     esbuild = new esbuild_executor_1.EsbuildExecutor();
     constructor(options) {
         if (options?.supportedBrowsers) {
-            this.targets = (0, utils_1.transformSupportedBrowsersToTargets)(options.supportedBrowsers);
+            this.targets = (0, private_1.transformSupportedBrowsersToTargets)(options.supportedBrowsers);
         }
     }
     apply(compiler) {

package/src/tools/webpack/plugins/index-html-webpack-plugin.d.ts

@@ -5,8 +5,8 @@
  * 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 { IndexHtmlGenerator, IndexHtmlGeneratorOptions, IndexHtmlGeneratorProcessOptions } from '@angular/build/private';
 import { Compilation, Compiler } from 'webpack';
-import { IndexHtmlGenerator, IndexHtmlGeneratorOptions, IndexHtmlGeneratorProcessOptions } from '../../../utils/index-file/index-html-generator';
 export interface IndexHtmlWebpackPluginOptions extends IndexHtmlGeneratorOptions, Omit<IndexHtmlGeneratorProcessOptions, 'files'> {
 }
 export declare class IndexHtmlWebpackPlugin extends IndexHtmlGenerator {

package/src/tools/webpack/plugins/index-html-webpack-plugin.js

@@ -8,13 +8,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexHtmlWebpackPlugin = void 0;
+const private_1 = require("@angular/build/private");
 const path_1 = require("path");
 const webpack_1 = require("webpack");
 const error_1 = require("../../../utils/error");
-const index_html_generator_1 = require("../../../utils/index-file/index-html-generator");
 const webpack_diagnostics_1 = require("../../../utils/webpack-diagnostics");
 const PLUGIN_NAME = 'index-html-webpack-plugin';
-class IndexHtmlWebpackPlugin extends index_html_generator_1.IndexHtmlGenerator {
+class IndexHtmlWebpackPlugin extends private_1.IndexHtmlGenerator {
     options;
     _compilation;
     get compilation() {
@@ -51,7 +51,7 @@ class IndexHtmlWebpackPlugin extends index_html_generator_1.IndexHtmlGenerator {
                         });
                     }
                 }
-                const { content, warnings, errors } = await this.process({
+                const { csrContent: content, warnings, errors, } = await this.process({
                     files,
                     outputPath: (0, path_1.dirname)(this.options.outputPath),
                     baseHref: this.options.baseHref,

package/src/tools/webpack/plugins/javascript-optimizer-plugin.js

@@ -11,10 +11,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JavaScriptOptimizerPlugin = void 0;
+const private_1 = require("@angular/build/private");
 const piscina_1 = __importDefault(require("piscina"));
 const environment_options_1 = require("../../../utils/environment-options");
 const webpack_diagnostics_1 = require("../../../utils/webpack-diagnostics");
-const utils_1 = require("../../esbuild/utils");
 const esbuild_executor_1 = require("./esbuild-executor");
 /**
  * The maximum number of Workers that will be created to execute optimize tasks.
@@ -38,7 +38,7 @@ class JavaScriptOptimizerPlugin {
     constructor(options) {
         this.options = options;
         if (options.supportedBrowsers) {
-            this.targets = (0, utils_1.transformSupportedBrowsersToTargets)(options.supportedBrowsers);
+            this.targets = (0, private_1.transformSupportedBrowsersToTargets)(options.supportedBrowsers);
         }
     }
     apply(compiler) {

package/src/tools/webpack/plugins/service-worker-plugin.js

@@ -8,7 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceWorkerPlugin = void 0;
-const service_worker_1 = require("../../../utils/service-worker");
+const private_1 = require("@angular/build/private");
 class ServiceWorkerPlugin {
     options;
     constructor(options) {
@@ -31,7 +31,7 @@ class ServiceWorkerPlugin {
                 throw new Error('Compilation output path cannot be empty.');
             }
             try {
-                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref, ngswConfigPath, 
+                await (0, private_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref, ngswConfigPath, 
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 compiler.inputFileSystem.promises, 
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/tools/webpack/utils/stats.d.ts

@@ -5,25 +5,12 @@
  * 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 { BudgetCalculatorResult } from '@angular/build/private';
 import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
 import { logging } from '@angular-devkit/core';
 import { Configuration, StatsCompilation } from 'webpack';
 import { Schema as BrowserBuilderOptions } from '../../../builders/browser/schema';
-import { BudgetCalculatorResult } from '../../../utils/bundle-calculator';
 import { WebpackStatsOptions } from './helpers';
-export declare function formatSize(size: number): string;
-export type BundleStatsData = [
-    files: string,
-    names: string,
-    rawSize: number | string,
-    estimatedTransferSize: number | string
-];
-export interface BundleStats {
-    initial: boolean;
-    stats: BundleStatsData;
-}
-export declare function generateEsbuildBuildStatsTable([browserStats, serverStats]: [browserStats: BundleStats[], serverStats: BundleStats[]], colors: boolean, showTotalSize: boolean, showEstimatedTransferSize: boolean, budgetFailures?: BudgetCalculatorResult[], verbose?: boolean): string;
-export declare function generateBuildStatsTable(data: BundleStats[], colors: boolean, showTotalSize: boolean, showEstimatedTransferSize: boolean, budgetFailures?: BudgetCalculatorResult[]): string;
 export declare function statsWarningsToString(json: StatsCompilation, statsConfig: WebpackStatsOptions): string;
 export declare function statsErrorsToString(json: StatsCompilation, statsConfig: WebpackStatsOptions): string;
 export declare function statsHasErrors(json: StatsCompilation): boolean;