Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"terser": "5.43.1",
"tree-kill": "1.2.2",
"tslib": "2.8.1",
"webpack": "5.105.0",
"webpack": "5.112.0",
"webpack-dev-middleware": "7.4.2",
"webpack-dev-server": "5.2.6",
"webpack-merge": "6.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ describe('Browser Builder Web Worker support', () => {
);
expect(workerContent).toContain('hello from worker');
expect(workerContent).toContain('bar');
expect(workerContent).toContain('"hello"===o&&postMessage');
expect(workerContent).toContain('"hello"===e&&postMessage');

// Main bundle should reference hashed worker bundle.
const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{16}\.js/) as string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import { Compilation, Compiler, Dependency, Module, NormalModule } from 'webpack
import { addWarning } from '../../../utils/webpack-diagnostics';

// Webpack doesn't export these so the deep imports can potentially break.
const AMDDefineDependency = require('webpack/lib/dependencies/AMDDefineDependency');
const CommonJsExportsDependency = require('webpack/lib/dependencies/CommonJsExportsDependency');
const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency');
const CommonJsSelfReferenceDependency = require('webpack/lib/dependencies/CommonJsSelfReferenceDependency');
const AMDDefineDependency = require('webpack/lib/dependencies/amd/AMDDefineDependency');
const CommonJsExportsDependency = require('webpack/lib/dependencies/commonjs/CommonJsExportsDependency');
const CommonJsRequireDependency = require('webpack/lib/dependencies/commonjs/CommonJsRequireDependency');
const CommonJsSelfReferenceDependency = require('webpack/lib/dependencies/commonjs/CommonJsSelfReferenceDependency');

export interface CommonJsUsageWarnPluginOptions {
/** A list of CommonJS or AMD packages that are allowed to be used without a warning. Use `'*'` to allow all. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { AsyncDependenciesBlock, Chunk, Compiler, Template, dependencies } from 'webpack';

// `ImportDependency` is not part of Webpack's depenencies typings.
const ImportDependency: typeof dependencies.ModuleDependency = require('webpack/lib/dependencies/ImportDependency');
const ImportDependency: typeof dependencies.ModuleDependency = require('webpack/lib/dependencies/import/ImportDependency');

const PLUGIN_NAME = 'named-chunks-plugin';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,16 @@ export function statsErrorsToString(
// This below cleans up the error from stacks.
// See: https://github.com/webpack/webpack/issues/15980
const index = error.message.search(/[\n\s]+at /);
const message =
let message =
statsConfig.errorStack || index === -1 ? error.message : error.message.substring(0, index);

// Clean up error message paths when not verbose
// Ex: Execution of module code from module graph (./src/styles.scss.webpack[javascript/auto]!=!...) failed
// to Execution of module code from module graph (./src/styles.scss) failed
if (message && !statsConfig.errorDetails) {
message = message.replace(/([^(\s]+)\.webpack\[[^\]]+\]!=![^\s)]+/g, '$1');
}

if (!/^error/i.test(message)) {
output += r('Error: ');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"devDependencies": {
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
"@ngtools/webpack": "workspace:0.0.0-PLACEHOLDER",
"webpack": "5.105.0",
"webpack": "5.112.0",
"webpack-dev-server": "5.2.6"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ngtools/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"@angular/compiler": "20.3.7",
"@angular/compiler-cli": "20.3.7",
"typescript": "5.9.2",
"webpack": "5.105.0"
"webpack": "5.112.0"
}
}
Loading
Loading