Skip to content

Commit 851ffc8

Browse files
committed
build: update all non-major dependencies
See associated pull request for more information. Closes angular#30721 as a pr takeover
1 parent c07fdd2 commit 851ffc8

File tree

11 files changed

+559
-471
lines changed

11 files changed

+559
-471
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
with:
2424
persist-credentials: false
2525
- name: Initialize CodeQL
26-
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
26+
uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
2727
with:
2828
languages: javascript-typescript
2929
build-mode: none
3030
config-file: .github/codeql/config.yml
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
32+
uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
3333
with:
3434
category: '/language:javascript-typescript'

.github/workflows/perf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# identity federation. This allows us to request short lived credentials on demand, rather than storing
4848
# credentials in secrets long term. More information can be found at:
4949
# https://docs.github.com/en/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform
50-
- uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
50+
- uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
5151
with:
5252
project_id: 'internal-200822'
5353
workload_identity_provider: 'projects/823469418460/locations/global/workloadIdentityPools/measurables-tracking/providers/angular'

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@
9494
"@types/yargs": "^17.0.20",
9595
"@types/yargs-parser": "^21.0.0",
9696
"@types/yarnpkg__lockfile": "^1.1.5",
97-
"@typescript-eslint/eslint-plugin": "8.37.0",
98-
"@typescript-eslint/parser": "8.37.0",
97+
"@typescript-eslint/eslint-plugin": "8.38.0",
98+
"@typescript-eslint/parser": "8.38.0",
9999
"ajv": "8.17.1",
100100
"ansi-colors": "4.1.3",
101101
"beasties": "0.3.5",
102102
"buffer": "6.0.3",
103-
"esbuild": "0.25.6",
104-
"esbuild-wasm": "0.25.6",
103+
"esbuild": "0.25.8",
104+
"esbuild-wasm": "0.25.8",
105105
"eslint": "9.31.0",
106-
"eslint-config-prettier": "10.1.5",
106+
"eslint-config-prettier": "10.1.8",
107107
"eslint-plugin-header": "3.1.1",
108108
"eslint-plugin-import": "2.32.0",
109109
"express": "5.1.0",
@@ -112,8 +112,8 @@
112112
"http-proxy": "^1.18.1",
113113
"http-proxy-middleware": "3.0.5",
114114
"husky": "9.1.7",
115-
"jasmine": "~5.8.0",
116-
"jasmine-core": "~5.8.0",
115+
"jasmine": "~5.9.0",
116+
"jasmine-core": "~5.9.0",
117117
"jasmine-reporters": "^2.5.2",
118118
"jasmine-spec-reporter": "~7.0.0",
119119
"karma": "~6.4.0",
@@ -141,7 +141,7 @@
141141
"ts-node": "^10.9.1",
142142
"tslib": "2.8.1",
143143
"typescript": "5.9.0-beta",
144-
"undici": "7.11.0",
144+
"undici": "7.12.0",
145145
"unenv": "^1.10.0",
146146
"verdaccio": "6.1.5",
147147
"verdaccio-auth-memory": "^10.0.0",

packages/angular/build/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@
2323
"@babel/core": "7.28.0",
2424
"@babel/helper-annotate-as-pure": "7.27.3",
2525
"@babel/helper-split-export-declaration": "7.24.7",
26-
"@inquirer/confirm": "5.1.13",
26+
"@inquirer/confirm": "5.1.14",
2727
"@vitejs/plugin-basic-ssl": "2.1.0",
2828
"beasties": "0.3.5",
2929
"browserslist": "^4.23.0",
30-
"esbuild": "0.25.6",
30+
"esbuild": "0.25.8",
3131
"https-proxy-agent": "7.0.6",
3232
"istanbul-lib-instrument": "6.0.3",
3333
"jsonc-parser": "3.3.1",
3434
"listr2": "9.0.1",
3535
"magic-string": "0.30.17",
3636
"mrmime": "2.0.1",
3737
"parse5-html-rewriting-stream": "8.0.0",
38-
"picomatch": "4.0.2",
38+
"picomatch": "4.0.3",
3939
"piscina": "5.1.3",
4040
"rollup": "4.45.1",
4141
"sass": "1.89.2",
4242
"semver": "7.7.2",
4343
"source-map-support": "0.5.21",
4444
"tinyglobby": "0.2.14",
45-
"vite": "7.0.4",
45+
"vite": "7.0.5",
4646
"watchpack": "2.4.4"
4747
},
4848
"optionalDependencies": {
@@ -52,7 +52,7 @@
5252
"@angular/ssr": "workspace:*",
5353
"@angular-devkit/core": "workspace:*",
5454
"jsdom": "26.1.0",
55-
"less": "4.3.0",
55+
"less": "4.4.0",
5656
"ng-packagr": "20.2.0-next.0",
5757
"postcss": "8.5.6",
5858
"rxjs": "7.8.2",

packages/angular/build/src/tools/vite/middlewares/assets-middleware.ts

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88

99
import { lookup as lookupMimeType } from 'mrmime';
10+
import { createHash } from 'node:crypto';
11+
import { readFileSync } from 'node:fs';
12+
import type { ServerResponse } from 'node:http';
1013
import { extname } from 'node:path';
1114
import type { Connect, ViteDevServer } from 'vite';
1215
import { AngularMemoryOutputFiles, AngularOutputAssets, pathnameWithoutBasePath } from '../utils';
@@ -17,6 +20,8 @@ export interface ComponentStyleRecord {
1720
reload?: boolean;
1821
}
1922

23+
const JS_TS_REGEXP = /\.[cm]?[tj]sx?$/;
24+
2025
export function createAngularAssetsMiddleware(
2126
server: ViteDevServer,
2227
assets: AngularOutputAssets,
@@ -38,15 +43,28 @@ export function createAngularAssetsMiddleware(
3843
// Rewrite all build assets to a vite raw fs URL
3944
const asset = assets.get(pathname);
4045
if (asset) {
41-
// Workaround to disable Vite transformer middleware.
42-
// See: https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/middlewares/transform.ts#L201 and
43-
// https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/transformRequest.ts#L204-L206
44-
req.headers.accept = 'text/html';
45-
46-
// The encoding needs to match what happens in the vite static middleware.
47-
// ref: https://github.com/vitejs/vite/blob/d4f13bd81468961c8c926438e815ab6b1c82735e/packages/vite/src/node/server/middlewares/static.ts#L163
48-
req.url = `${server.config.base}@fs/${encodeURI(asset.source)}`;
49-
next();
46+
// This is a workaround to serve JS and TS files without Vite transformations.
47+
if (JS_TS_REGEXP.test(extension)) {
48+
const contents = readFileSync(asset.source);
49+
const etag = `W/${createHash('sha256').update(contents).digest('hex')}`;
50+
if (checkAndHandleEtag(req, res, etag)) {
51+
return;
52+
}
53+
54+
const mimeType = lookupMimeType(extension);
55+
if (mimeType) {
56+
res.setHeader('Content-Type', mimeType);
57+
}
58+
59+
res.setHeader('ETag', etag);
60+
res.setHeader('Cache-Control', 'no-cache');
61+
res.end(contents);
62+
} else {
63+
// The encoding needs to match what happens in the vite static middleware.
64+
// ref: https://github.com/vitejs/vite/blob/d4f13bd81468961c8c926438e815ab6b1c82735e/packages/vite/src/node/server/middlewares/static.ts#L163
65+
req.url = `${server.config.base}@fs/${encodeURI(asset.source)}`;
66+
next();
67+
}
5068

5169
return;
5270
}
@@ -100,12 +118,8 @@ export function createAngularAssetsMiddleware(
100118
componentStyle.used.add(componentId);
101119
}
102120

103-
// Report if there are no changes to avoid reprocessing
104121
const etag = `W/"${outputFile.contents.byteLength}-${outputFile.hash}-${componentId}"`;
105-
if (req.headers['if-none-match'] === etag) {
106-
res.statusCode = 304;
107-
res.end();
108-
122+
if (checkAndHandleEtag(req, res, etag)) {
109123
return;
110124
}
111125

@@ -134,12 +148,8 @@ export function createAngularAssetsMiddleware(
134148
}
135149
}
136150

137-
// Avoid resending the content if it has not changed since last request
138151
const etag = `W/"${outputFile.contents.byteLength}-${outputFile.hash}"`;
139-
if (req.headers['if-none-match'] === etag) {
140-
res.statusCode = 304;
141-
res.end();
142-
152+
if (checkAndHandleEtag(req, res, etag)) {
143153
return;
144154
}
145155

@@ -188,3 +198,18 @@ export function createAngularAssetsMiddleware(
188198
next();
189199
};
190200
}
201+
202+
function checkAndHandleEtag(
203+
req: Connect.IncomingMessage,
204+
res: ServerResponse,
205+
etag: string,
206+
): boolean {
207+
if (req.headers['if-none-match'] === etag) {
208+
res.statusCode = 304;
209+
res.end();
210+
211+
return true;
212+
}
213+
214+
return false;
215+
}

packages/angular/cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
"@angular-devkit/architect": "workspace:0.0.0-EXPERIMENTAL-PLACEHOLDER",
2626
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
2727
"@angular-devkit/schematics": "workspace:0.0.0-PLACEHOLDER",
28-
"@inquirer/prompts": "7.6.0",
28+
"@inquirer/prompts": "7.7.1",
2929
"@listr2/prompt-adapter-inquirer": "3.0.1",
30-
"@modelcontextprotocol/sdk": "1.15.1",
30+
"@modelcontextprotocol/sdk": "1.16.0",
3131
"@schematics/angular": "workspace:0.0.0-PLACEHOLDER",
3232
"@yarnpkg/lockfile": "1.1.0",
33-
"algoliasearch": "5.32.0",
33+
"algoliasearch": "5.34.0",
3434
"ini": "5.0.0",
3535
"jsonc-parser": "3.3.1",
3636
"listr2": "9.0.1",

packages/angular_devkit/build_angular/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@
2828
"browserslist": "^4.21.5",
2929
"copy-webpack-plugin": "13.0.0",
3030
"css-loader": "7.1.2",
31-
"esbuild-wasm": "0.25.6",
31+
"esbuild-wasm": "0.25.8",
3232
"fast-glob": "3.3.3",
3333
"http-proxy-middleware": "3.0.5",
3434
"istanbul-lib-instrument": "6.0.3",
3535
"jsonc-parser": "3.3.1",
3636
"karma-source-map-support": "1.4.0",
37-
"less": "4.3.0",
37+
"less": "4.4.0",
3838
"less-loader": "12.3.0",
3939
"license-webpack-plugin": "4.0.2",
4040
"loader-utils": "3.3.1",
4141
"mini-css-extract-plugin": "2.9.2",
4242
"open": "10.2.0",
4343
"ora": "8.2.0",
44-
"picomatch": "4.0.2",
44+
"picomatch": "4.0.3",
4545
"piscina": "5.1.3",
4646
"postcss": "8.5.6",
4747
"postcss-loader": "8.1.1",
@@ -62,14 +62,14 @@
6262
"webpack-subresource-integrity": "5.1.0"
6363
},
6464
"optionalDependencies": {
65-
"esbuild": "0.25.6"
65+
"esbuild": "0.25.8"
6666
},
6767
"devDependencies": {
6868
"@angular/ssr": "workspace:*",
6969
"@web/test-runner": "0.20.2",
7070
"browser-sync": "3.0.4",
7171
"ng-packagr": "20.2.0-next.0",
72-
"undici": "7.11.0"
72+
"undici": "7.12.0"
7373
},
7474
"peerDependencies": {
7575
"@angular/core": "0.0.0-ANGULAR-FW-PEER-DEP",

packages/angular_devkit/build_angular/src/builders/browser/specs/web-worker_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ describe('Browser Builder Web Worker support', () => {
124124
);
125125
expect(workerContent).toContain('hello from worker');
126126
expect(workerContent).toContain('bar');
127-
expect(workerContent).toContain('"hello"===e&&postMessage');
127+
expect(workerContent).toContain('"hello"===o&&postMessage');
128128

129129
// Main bundle should reference hashed worker bundle.
130130
const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{16}\.js/) as string;

packages/angular_devkit/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"ajv": "8.17.1",
2929
"ajv-formats": "3.0.1",
3030
"jsonc-parser": "3.3.1",
31-
"picomatch": "4.0.2",
31+
"picomatch": "4.0.3",
3232
"rxjs": "7.8.2",
3333
"source-map": "0.7.4"
3434
},

packages/angular_devkit/schematics_cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"dependencies": {
1919
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
2020
"@angular-devkit/schematics": "workspace:0.0.0-PLACEHOLDER",
21-
"@inquirer/prompts": "7.6.0",
21+
"@inquirer/prompts": "7.7.1",
2222
"ansi-colors": "4.1.3",
2323
"yargs-parser": "22.0.0"
2424
}

0 commit comments

Comments
 (0)