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
4 changes: 2 additions & 2 deletions modules/testing/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"@angular-devkit/build-angular": "workspace:*",
"@angular-devkit/core": "workspace:*",
"@angular/ssr": "workspace:*",
"@vitest/coverage-v8": "4.1.9",
"@vitest/coverage-v8": "4.1.10",
"browser-sync": "3.0.4",
"istanbul-lib-instrument": "6.0.3",
"jsdom": "29.1.1",
"ng-packagr": "22.1.0-next.2",
"rxjs": "7.8.2",
"vitest": "4.1.9"
"vitest": "4.1.10"
}
}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,20 @@
"@types/watchpack": "^2.4.4",
"@types/yargs": "^17.0.20",
"@types/yargs-parser": "^21.0.0",
"@typescript-eslint/eslint-plugin": "8.62.0",
"@typescript-eslint/parser": "8.62.0",
"@typescript-eslint/eslint-plugin": "8.63.0",
"@typescript-eslint/parser": "8.63.0",
"ajv": "8.20.0",
"buffer": "6.0.3",
"esbuild": "0.28.1",
"esbuild-wasm": "0.28.1",
"eslint": "10.5.0",
"eslint": "10.6.0",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-import": "2.32.0",
"express": "5.2.1",
"fast-glob": "3.3.3",
"globals": "17.7.0",
"http-proxy": "^1.18.1",
"http-proxy-middleware": "4.1.1",
"http-proxy-middleware": "4.2.0",
"husky": "9.1.7",
"jasmine": "~6.3.0",
"jasmine-core": "~6.3.0",
Expand All @@ -120,16 +120,16 @@
"lodash": "^4.17.21",
"magic-string": "0.30.21",
"prettier": "^3.0.0",
"puppeteer": "25.2.0",
"quicktype-core": "23.2.6",
"puppeteer": "25.3.0",
"quicktype-core": "23.3.23",
"rollup": "4.62.2",
"rollup-license-plugin": "~3.2.0",
"rollup-plugin-dts": "6.4.1",
"rollup-plugin-sourcemaps2": "0.5.7",
"rollup-plugin-sourcemaps2": "0.5.8",
"semver": "7.8.5",
"source-map-support": "0.5.21",
"tslib": "2.8.1",
"undici": "8.5.0",
"undici": "8.7.0",
"unenv": "^1.10.0",
"verdaccio": "6.7.4",
"verdaccio-auth-memory": "^13.0.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/angular/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@
"esbuild": "0.28.1",
"https-proxy-agent": "9.1.0",
"jsonc-parser": "3.3.1",
"listr2": "10.2.1",
"listr2": "10.2.2",
"magic-string": "0.30.21",
"mrmime": "2.0.1",
"parse5-html-rewriting-stream": "8.0.1",
"picomatch": "4.0.4",
"picomatch": "4.0.5",
"piscina": "5.2.0",
"rolldown": "1.1.2",
"rolldown": "1.1.5",
"sass": "1.101.0",
"semver": "7.8.5",
"source-map-support": "0.5.21",
"tinyglobby": "0.2.17",
"vite": "8.1.0",
"vite": "8.1.4",
"watchpack": "2.5.2"
},
"optionalDependencies": {
Expand All @@ -54,10 +54,10 @@
"jsdom": "29.1.1",
"less": "4.6.7",
"ng-packagr": "22.1.0-next.2",
"postcss": "8.5.15",
"postcss": "8.5.16",
"rollup": "4.62.2",
"rxjs": "7.8.2",
"vitest": "4.1.9"
"vitest": "4.1.10"
},
"peerDependencies": {
"@angular/compiler": "0.0.0-ANGULAR-FW-PEER-DEP",
Expand Down
18 changes: 11 additions & 7 deletions packages/angular/build/src/builders/dev-server/vite/hmr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,17 @@ export async function invalidateUpdatedFiles(
// Clear the server app cache and trigger module evaluation before reload to initiate dependency optimization.
// The querystring is needed as a workaround for:
// `ɵgetOrCreateAngularServerApp` can be undefined right after an error.
const { ɵdestroyAngularServerApp } = (await server.ssrLoadModule(
`/main.server.mjs?timestamp=${Date.now()}`,
)) as {
ɵdestroyAngularServerApp: typeof destroyAngularServerApp;
};

ɵdestroyAngularServerApp();
try {
const { ɵdestroyAngularServerApp } = (await server.ssrLoadModule(
`/main.server.mjs?timestamp=${Date.now()}`,
)) as {
ɵdestroyAngularServerApp: typeof destroyAngularServerApp;
};

ɵdestroyAngularServerApp();
} catch {
// Ignored as the next SSR request will resolve compile errors and outdated pre-bundles.
}
Comment thread
alan-agius4 marked this conversation as resolved.
}

return updatedFiles;
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"@listr2/prompt-adapter-inquirer": "4.2.4",
"@modelcontextprotocol/sdk": "1.29.0",
"@schematics/angular": "workspace:0.0.0-PLACEHOLDER",
"algoliasearch": "5.55.1",
"algoliasearch": "5.55.2",
"jsonc-parser": "3.3.1",
"listr2": "10.2.1",
"listr2": "10.2.2",
"npm-package-arg": "14.0.0",
"parse5-html-rewriting-stream": "8.0.1",
"semver": "7.8.5",
Expand Down
16 changes: 8 additions & 8 deletions packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"@discoveryjs/json-ext": "1.1.0",
"@ngtools/webpack": "workspace:0.0.0-PLACEHOLDER",
"ansi-colors": "4.1.3",
"autoprefixer": "10.5.1",
"autoprefixer": "10.5.2",
"babel-loader": "10.1.1",
"browserslist": "^4.26.0",
"copy-webpack-plugin": "14.0.0",
"css-loader": "7.1.4",
"esbuild-wasm": "0.28.1",
"http-proxy-middleware": "4.1.1",
"http-proxy-middleware": "4.2.0",
"istanbul-lib-instrument": "6.0.3",
"jsonc-parser": "3.3.1",
"karma-source-map-support": "1.4.0",
Expand All @@ -40,9 +40,9 @@
"mini-css-extract-plugin": "2.10.2",
"open": "11.0.0",
"ora": "9.4.1",
"picomatch": "4.0.4",
"picomatch": "4.0.5",
"piscina": "5.2.0",
"postcss": "8.5.15",
"postcss": "8.5.16",
"postcss-loader": "8.2.1",
"resolve-url-loader": "5.0.0",
"rxjs": "7.8.2",
Expand All @@ -51,12 +51,12 @@
"semver": "7.8.5",
"source-map-loader": "5.0.0",
"source-map-support": "0.5.21",
"terser": "5.48.0",
"terser": "5.49.0",
"tinyglobby": "0.2.17",
"tslib": "2.8.1",
"webpack": "5.107.2",
"webpack": "5.108.4",
"webpack-dev-middleware": "8.0.3",
"webpack-dev-server": "5.2.5",
"webpack-dev-server": "5.2.6",
"webpack-merge": "6.0.1",
"webpack-subresource-integrity": "5.1.0"
},
Expand All @@ -67,7 +67,7 @@
"@angular/ssr": "workspace:*",
"browser-sync": "3.0.4",
"ng-packagr": "22.1.0-next.2",
"undici": "8.5.0"
"undici": "8.7.0"
},
"peerDependencies": {
"@angular/compiler-cli": "0.0.0-ANGULAR-FW-PEER-DEP",
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 @@ -221,9 +221,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
4 changes: 2 additions & 2 deletions packages/angular_devkit/build_webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"devDependencies": {
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
"@ngtools/webpack": "workspace:0.0.0-PLACEHOLDER",
"webpack": "5.107.2",
"webpack-dev-server": "5.2.5"
"webpack": "5.108.4",
"webpack-dev-server": "5.2.6"
},
"peerDependencies": {
"webpack": "^5.30.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"ajv": "8.20.0",
"ajv-formats": "3.0.1",
"jsonc-parser": "3.3.1",
"picomatch": "4.0.4",
"picomatch": "4.0.5",
"rxjs": "7.8.2",
"source-map": "0.7.6"
},
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 @@ -20,6 +20,6 @@
"@angular/compiler": "22.1.0-next.3",
"@angular/compiler-cli": "22.1.0-next.3",
"typescript": "6.0.3",
"webpack": "5.107.2"
"webpack": "5.108.4"
}
}
Loading
Loading