diff --git a/package.json b/package.json index 1496cc71a..9adef15e9 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { "name": "@angular-devkit/build-angular", - "version": "20.1.0-next.3+sha-2c32774", + "version": "20.1.0+sha-eb29941", "description": "Angular Webpack Build Facade", "main": "src/index.js", "typings": "src/index.d.ts", "builders": "builders.json", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#2c32774", - "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#2c32774", - "@angular-devkit/core": "github:angular/angular-devkit-core-builds#2c32774", - "@angular/build": "github:angular/angular-build-builds#2c32774", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#eb29941", + "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#eb29941", + "@angular-devkit/core": "github:angular/angular-devkit-core-builds#eb29941", + "@angular/build": "github:angular/angular-build-builds#eb29941", "@babel/core": "7.27.7", "@babel/generator": "7.27.5", "@babel/helper-annotate-as-pure": "7.27.3", @@ -21,7 +21,7 @@ "@babel/preset-env": "7.27.2", "@babel/runtime": "7.27.6", "@discoveryjs/json-ext": "0.6.3", - "@ngtools/webpack": "github:angular/ngtools-webpack-builds#2c32774", + "@ngtools/webpack": "github:angular/ngtools-webpack-builds#eb29941", "ansi-colors": "4.1.3", "autoprefixer": "10.4.21", "babel-loader": "10.0.0", @@ -65,19 +65,19 @@ "esbuild": "0.25.5" }, "peerDependencies": { - "@angular/core": "^20.0.0 || ^20.1.0-next.0", - "@angular/compiler-cli": "^20.0.0 || ^20.1.0-next.0", - "@angular/localize": "^20.0.0 || ^20.1.0-next.0", - "@angular/platform-browser": "^20.0.0 || ^20.1.0-next.0", - "@angular/platform-server": "^20.0.0 || ^20.1.0-next.0", - "@angular/service-worker": "^20.0.0 || ^20.1.0-next.0", - "@angular/ssr": "github:angular/angular-ssr-builds#2c32774", + "@angular/core": "^20.0.0", + "@angular/compiler-cli": "^20.0.0", + "@angular/localize": "^20.0.0", + "@angular/platform-browser": "^20.0.0", + "@angular/platform-server": "^20.0.0", + "@angular/service-worker": "^20.0.0", + "@angular/ssr": "github:angular/angular-ssr-builds#eb29941", "@web/test-runner": "^0.20.0", "browser-sync": "^3.0.2", "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", "karma": "^6.3.0", - "ng-packagr": "^20.0.0 || ^20.1.0-next.0", + "ng-packagr": "^20.0.0", "protractor": "^7.0.0", "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0", "typescript": ">=5.8 <5.9" diff --git a/src/builders/karma/index.js b/src/builders/karma/index.js index c21cbda0a..c3dcec061 100644 --- a/src/builders/karma/index.js +++ b/src/builders/karma/index.js @@ -56,18 +56,27 @@ function execute(options, context, transforms = {}) { // Check Angular version. (0, private_1.assertCompatibleAngularVersion)(context.workspaceRoot); return (0, rxjs_1.from)(getExecuteWithBuilder(options, context)).pipe((0, rxjs_1.mergeMap)(([useEsbuild, executeWithBuilder]) => { - const karmaOptions = getBaseKarmaOptions(options, context, useEsbuild); - if (useEsbuild && transforms.webpackConfiguration) { - context.logger.warn(`This build is using the application builder but transforms.webpackConfiguration was provided. The transform will be ignored.`); + if (useEsbuild) { + if (transforms.webpackConfiguration) { + context.logger.warn(`This build is using the application builder but transforms.webpackConfiguration was provided. The transform will be ignored.`); + } + if (options.fileReplacements) { + options.fileReplacements = (0, utils_1.normalizeFileReplacements)(options.fileReplacements, './'); + } + if (typeof options.polyfills === 'string') { + options.polyfills = [options.polyfills]; + } + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return executeWithBuilder(options, context, transforms); } - if (useEsbuild && options.fileReplacements) { - options.fileReplacements = (0, utils_1.normalizeFileReplacements)(options.fileReplacements, './'); + else { + const karmaOptions = getBaseKarmaOptions(options, context); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return executeWithBuilder(options, context, karmaOptions, transforms); } - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return executeWithBuilder(options, context, karmaOptions, transforms); })); } -function getBaseKarmaOptions(options, context, useEsbuild) { +function getBaseKarmaOptions(options, context) { let singleRun; if (options.watch !== undefined) { singleRun = !options.watch; @@ -79,7 +88,7 @@ function getBaseKarmaOptions(options, context, useEsbuild) { } const karmaOptions = options.karmaConfig ? {} - : getBuiltInKarmaConfig(context.workspaceRoot, projectName, useEsbuild); + : getBuiltInKarmaConfig(context.workspaceRoot, projectName); karmaOptions.singleRun = singleRun; // Workaround https://github.com/angular/angular-cli/issues/28271, by clearing context by default // for single run executions. Not clearing context for multi-run (watched) builds allows the @@ -104,7 +113,7 @@ function getBaseKarmaOptions(options, context, useEsbuild) { } return karmaOptions; } -function getBuiltInKarmaConfig(workspaceRoot, projectName, useEsbuild) { +function getBuiltInKarmaConfig(workspaceRoot, projectName) { let coverageFolderName = projectName.charAt(0) === '@' ? projectName.slice(1) : projectName; if (/[A-Z]/.test(coverageFolderName)) { coverageFolderName = core_1.strings.dasherize(coverageFolderName); @@ -113,13 +122,13 @@ function getBuiltInKarmaConfig(workspaceRoot, projectName, useEsbuild) { // Any changes to the config here need to be synced to: packages/schematics/angular/config/files/karma.conf.js.template return { basePath: '', - frameworks: ['jasmine', ...(useEsbuild ? [] : ['@angular-devkit/build-angular'])], + frameworks: ['jasmine', '@angular-devkit/build-angular'], plugins: [ 'karma-jasmine', 'karma-chrome-launcher', 'karma-jasmine-html-reporter', 'karma-coverage', - ...(useEsbuild ? [] : ['@angular-devkit/build-angular/plugins/karma']), + '@angular-devkit/build-angular/plugins/karma', ].map((p) => workspaceRootRequire(p)), jasmineHtmlReporter: { suppressAll: true, // removes the duplicated traces @@ -151,8 +160,8 @@ async function getExecuteWithBuilder(options, context) { const useEsbuild = await checkForEsbuild(options, context); let execute; if (useEsbuild) { - const { executeKarmaInternal } = await Promise.resolve().then(() => __importStar(require('@angular/build/private'))); - execute = executeKarmaInternal; + const { executeKarmaBuilder } = await Promise.resolve().then(() => __importStar(require('@angular/build'))); + execute = executeKarmaBuilder; } else { const browserBuilderModule = await Promise.resolve().then(() => __importStar(require('./browser_builder'))); diff --git a/src/utils/normalize-cache.js b/src/utils/normalize-cache.js index 460681610..ec9cdcd8e 100644 --- a/src/utils/normalize-cache.js +++ b/src/utils/normalize-cache.js @@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.normalizeCacheOptions = normalizeCacheOptions; const node_path_1 = require("node:path"); /** Version placeholder is replaced during the build process with actual package version */ -const VERSION = '20.1.0-next.3+sha-2c32774'; +const VERSION = '20.1.0+sha-eb29941'; function hasCacheMetadata(value) { return (!!value && typeof value === 'object' && diff --git a/uniqueId b/uniqueId index 49d2353e6..b75a5deb4 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Tue Jul 01 2025 21:33:03 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Tue Jul 15 2025 23:20:28 GMT+0000 (Coordinated Universal Time) \ No newline at end of file pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy