diff --git a/package.json b/package.json index b1519993a..3a3910ce8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular-devkit/build-webpack", - "version": "0.2100.0-next.8+sha-2ffc527", + "version": "0.2100.3+sha-4dd3c1a", "description": "Webpack Builder for Architect", "experimental": true, "main": "src/index.js", @@ -16,7 +16,7 @@ "./*.js": "./*.js" }, "dependencies": { - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#2ffc527", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4dd3c1a", "rxjs": "7.8.2" }, "peerDependencies": { @@ -34,7 +34,7 @@ "type": "git", "url": "https://github.com/angular/angular-cli.git" }, - "packageManager": "pnpm@10.19.0", + "packageManager": "pnpm@10.25.0", "engines": { "node": "^20.19.0 || ^22.12.0 || >=24.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", diff --git a/src/builders/webpack-dev-server/index.d.ts b/src/builders/webpack-dev-server/index.d.ts index 6459809bf..ddefd4abc 100644 --- a/src/builders/webpack-dev-server/index.d.ts +++ b/src/builders/webpack-dev-server/index.d.ts @@ -7,8 +7,8 @@ */ import { Builder, BuilderContext } from '@angular-devkit/architect'; import { Observable } from 'rxjs'; -import webpack from 'webpack'; -import WebpackDevServer from 'webpack-dev-server'; +import type webpack from 'webpack'; +import type WebpackDevServer from 'webpack-dev-server'; import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack'; import { Schema as WebpackDevServerBuilderSchema } from './schema'; export type WebpackDevServerFactory = typeof WebpackDevServer; diff --git a/src/builders/webpack-dev-server/index.js b/src/builders/webpack-dev-server/index.js index e5e0ab3eb..9a03e658b 100644 --- a/src/builders/webpack-dev-server/index.js +++ b/src/builders/webpack-dev-server/index.js @@ -6,6 +6,39 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/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 () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; @@ -15,8 +48,6 @@ const architect_1 = require("@angular-devkit/architect"); const node_assert_1 = __importDefault(require("node:assert")); const node_path_1 = require("node:path"); const rxjs_1 = require("rxjs"); -const webpack_1 = __importDefault(require("webpack")); -const webpack_dev_server_1 = __importDefault(require("webpack-dev-server")); const utils_1 = require("../../utils"); function runWebpackDevServer(config, context, options = {}) { const createWebpack = (c) => { @@ -30,14 +61,16 @@ function runWebpackDevServer(config, context, options = {}) { } } else { - return (0, rxjs_1.of)((0, webpack_1.default)(c)); + return (0, rxjs_1.from)(Promise.resolve().then(() => __importStar(require('webpack'))).then((mod) => mod.default(c))); } }; const createWebpackDevServer = (webpack, config) => { if (options.webpackDevServerFactory) { return new options.webpackDevServerFactory(config, webpack); } - return new webpack_dev_server_1.default(config, webpack); + else { + return (0, rxjs_1.from)(Promise.resolve().then(() => __importStar(require('webpack-dev-server'))).then((mod) => new mod.default(config, webpack))); + } }; const { logging: log = (stats, config) => { if (config.stats !== false) { @@ -45,7 +78,12 @@ function runWebpackDevServer(config, context, options = {}) { context.logger.info(stats.toString(statsOptions)); } }, shouldProvideStats = true, } = options; - return createWebpack({ ...config, watch: false }).pipe((0, rxjs_1.switchMap)((webpackCompiler) => new rxjs_1.Observable((obs) => { + return createWebpack({ ...config, watch: false }).pipe((0, rxjs_1.switchMap)(async (webpackCompiler) => { + return [ + webpackCompiler, + options.webpackDevServerFactory ?? (await Promise.resolve().then(() => __importStar(require('webpack-dev-server')))).default, + ]; + }), (0, rxjs_1.switchMap)(([webpackCompiler, webpackDevServerFactory]) => new rxjs_1.Observable((obs) => { (0, node_assert_1.default)(webpackCompiler, 'Webpack compiler factory did not return a compiler instance.'); const devServerConfig = options.devServerConfig || config.devServer || {}; devServerConfig.host ??= 'localhost'; @@ -62,7 +100,7 @@ function runWebpackDevServer(config, context, options = {}) { outputPath: stats.compilation.outputOptions.path, }); }); - const devServer = createWebpackDevServer(webpackCompiler, devServerConfig); + const devServer = new webpackDevServerFactory(devServerConfig, webpackCompiler); devServer.startCallback((err) => { if (err) { obs.error(err); diff --git a/src/builders/webpack-dev-server/index.js.map b/src/builders/webpack-dev-server/index.js.map index 1e4cbafc5..ed4b29e8b 100644 --- a/src/builders/webpack-dev-server/index.js.map +++ b/src/builders/webpack-dev-server/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/webpack/index.d.ts b/src/builders/webpack/index.d.ts index ea1f2957b..fd8174e48 100644 --- a/src/builders/webpack/index.d.ts +++ b/src/builders/webpack/index.d.ts @@ -7,7 +7,7 @@ */ import { Builder, BuilderContext, BuilderOutput } from '@angular-devkit/architect'; import { Observable } from 'rxjs'; -import webpack from 'webpack'; +import type webpack from 'webpack'; import { EmittedFiles } from '../../utils'; import { Schema as RealWebpackBuilderSchema } from './schema'; export type WebpackBuilderSchema = RealWebpackBuilderSchema; diff --git a/src/builders/webpack/index.js b/src/builders/webpack/index.js index 0271ed796..8d6cfb3b4 100644 --- a/src/builders/webpack/index.js +++ b/src/builders/webpack/index.js @@ -6,6 +6,39 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.dev/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 () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; @@ -15,7 +48,6 @@ const architect_1 = require("@angular-devkit/architect"); const node_assert_1 = __importDefault(require("node:assert")); const node_path_1 = require("node:path"); const rxjs_1 = require("rxjs"); -const webpack_1 = __importDefault(require("webpack")); const utils_1 = require("../../utils"); function runWebpack(config, context, options = {}) { const { logging: log = (stats, config) => { @@ -35,7 +67,7 @@ function runWebpack(config, context, options = {}) { } } else { - return (0, rxjs_1.of)((0, webpack_1.default)(c)); + return (0, rxjs_1.from)(Promise.resolve().then(() => __importStar(require('webpack'))).then((mod) => mod.default(c))); } }; return createWebpack({ ...config, watch: false }).pipe((0, rxjs_1.switchMap)((webpackCompiler) => new rxjs_1.Observable((obs) => { diff --git a/src/builders/webpack/index.js.map b/src/builders/webpack/index.js.map index 053088837..70514afb7 100644 --- a/src/builders/webpack/index.js.map +++ b/src/builders/webpack/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/uniqueId b/uniqueId index 9d58bcfca..dd4bf0e66 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Oct 23 2025 13:27:04 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Fri Dec 12 2025 17:08:35 GMT+0000 (Coordinated Universal Time) \ No newline at end of file