Skip to content

Commit 203c0ee

Browse files
alan-agius4clydin
authored andcommitted
build: update all non-major dependencies
1 parent afa76bb commit 203c0ee

File tree

7 files changed

+105
-41
lines changed

7 files changed

+105
-41
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ yarn_install(
115115

116116
http_archive(
117117
name = "aspect_bazel_lib",
118-
sha256 = "ac6392cbe5e1cc7701bbd81caf94016bae6f248780e12af4485d4a7127b4cb2b",
119-
strip_prefix = "bazel-lib-2.6.1",
120-
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.6.1/bazel-lib-v2.6.1.tar.gz",
118+
sha256 = "357dad9d212327c35d9244190ef010aad315e73ffa1bed1a29e20c372f9ca346",
119+
strip_prefix = "bazel-lib-2.7.0",
120+
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.0/bazel-lib-v2.7.0.tar.gz",
121121
)
122122

123123
load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "aspect_bazel_lib_register_toolchains")

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@angular/forms": "18.0.0-next.3",
6363
"@angular/localize": "18.0.0-next.3",
6464
"@angular/material": "18.0.0-next.3",
65-
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#8a6d5db9df6a201f317e9ccfb41a7ebd54197419",
65+
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#659ec125dd4253015d6a4a4665835e4e7d5c65a6",
6666
"@angular/platform-browser": "18.0.0-next.3",
6767
"@angular/platform-browser-dynamic": "18.0.0-next.3",
6868
"@angular/platform-server": "18.0.0-next.3",
@@ -163,7 +163,7 @@
163163
"license-webpack-plugin": "4.0.2",
164164
"loader-utils": "3.2.1",
165165
"lodash.template": "^4.5.0",
166-
"magic-string": "0.30.8",
166+
"magic-string": "0.30.9",
167167
"mini-css-extract-plugin": "2.8.1",
168168
"mrmime": "2.0.0",
169169
"ng-packagr": "18.0.0-next.1",
@@ -187,7 +187,7 @@
187187
"rollup": "~4.14.0",
188188
"rollup-plugin-sourcemaps": "^0.6.0",
189189
"rxjs": "7.8.1",
190-
"sass": "1.72.0",
190+
"sass": "1.74.1",
191191
"sass-loader": "14.1.1",
192192
"sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz",
193193
"semver": "7.6.0",
@@ -204,7 +204,7 @@
204204
"tslib": "2.6.2",
205205
"typescript": "5.4.4",
206206
"undici": "6.11.1",
207-
"verdaccio": "5.30.2",
207+
"verdaccio": "5.30.3",
208208
"verdaccio-auth-memory": "^10.0.0",
209209
"vite": "5.2.8",
210210
"watchpack": "2.4.1",

packages/angular_devkit/build_angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"less-loader": "12.2.0",
4242
"license-webpack-plugin": "4.0.2",
4343
"loader-utils": "3.2.1",
44-
"magic-string": "0.30.8",
44+
"magic-string": "0.30.9",
4545
"mini-css-extract-plugin": "2.8.1",
4646
"mrmime": "2.0.0",
4747
"open": "8.4.2",
@@ -53,7 +53,7 @@
5353
"postcss-loader": "8.1.1",
5454
"resolve-url-loader": "5.0.0",
5555
"rxjs": "7.8.1",
56-
"sass": "1.72.0",
56+
"sass": "1.74.1",
5757
"sass-loader": "14.1.1",
5858
"semver": "7.6.0",
5959
"source-map-loader": "5.0.0",

packages/angular_devkit/build_angular/src/tools/sass/sass-service.ts

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { MessageChannel, Worker } from 'node:worker_threads';
1212
import {
1313
CanonicalizeContext,
1414
CompileResult,
15+
Deprecation,
1516
Exception,
1617
FileImporter,
1718
Importer,
@@ -53,19 +54,39 @@ type Importers =
5354
| FileImporter<'async'>
5455
| NodePackageImporter;
5556

57+
export interface SerializableVersion {
58+
major: number;
59+
minor: number;
60+
patch: number;
61+
}
62+
63+
export interface SerializableDeprecation extends Omit<Deprecation, 'obsoleteIn' | 'deprecatedIn'> {
64+
/** The version this deprecation first became active in. */
65+
deprecatedIn: SerializableVersion | null;
66+
/** The version this deprecation became obsolete in. */
67+
obsoleteIn: SerializableVersion | null;
68+
}
69+
70+
export type SerializableWarningMessage = (
71+
| {
72+
deprecation: true;
73+
deprecationType: SerializableDeprecation;
74+
}
75+
| { deprecation: false }
76+
) & {
77+
message: string;
78+
span?: Omit<SourceSpan, 'url'> & { url?: string };
79+
stack?: string;
80+
};
81+
5682
/**
5783
* A response from the Sass render Worker containing the result of the operation.
5884
*/
5985
interface RenderResponseMessage {
6086
id: number;
6187
error?: Exception;
6288
result?: Omit<CompileResult, 'loadedUrls'> & { loadedUrls: string[] };
63-
warnings?: {
64-
message: string;
65-
deprecation: boolean;
66-
stack?: string;
67-
span?: Omit<SourceSpan, 'url'> & { url?: string };
68-
}[];
89+
warnings?: SerializableWarningMessage[];
6990
}
7091

7192
/**

packages/angular_devkit/build_angular/src/tools/sass/worker.ts

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { dirname } from 'node:path';
1111
import { fileURLToPath, pathToFileURL } from 'node:url';
1212
import { MessagePort, parentPort, receiveMessageOnPort, workerData } from 'node:worker_threads';
1313
import {
14+
Deprecation,
1415
Exception,
1516
FileImporter,
1617
SourceSpan,
@@ -24,6 +25,7 @@ import {
2425
RelativeUrlRebasingImporter,
2526
sassBindWorkaround,
2627
} from './rebasing-importer';
28+
import type { SerializableDeprecation, SerializableWarningMessage } from './sass-service';
2729

2830
/**
2931
* A request to render a Sass stylesheet using the supplied options.
@@ -73,14 +75,7 @@ parentPort.on('message', (message: RenderRequestMessage) => {
7375

7476
const { id, hasImporter, hasLogger, source, options, rebase } = message;
7577
const entryDirectory = dirname(options.url);
76-
let warnings:
77-
| {
78-
message: string;
79-
deprecation: boolean;
80-
stack?: string;
81-
span?: Omit<SourceSpan, 'url'> & { url?: string };
82-
}[]
83-
| undefined;
78+
let warnings: SerializableWarningMessage[] | undefined;
8479
try {
8580
const directoryCache = new Map<string, DirectoryEntry>();
8681
const rebaseSourceMaps = options.sourceMap ? new Map<string, RawSourceMap>() : undefined;
@@ -153,13 +148,17 @@ parentPort.on('message', (message: RenderRequestMessage) => {
153148
importer: relativeImporter,
154149
logger: hasLogger
155150
? {
156-
warn(message, { deprecation, span, stack }) {
151+
warn(message, warnOptions) {
157152
warnings ??= [];
158153
warnings.push({
154+
...warnOptions,
159155
message,
160-
deprecation,
161-
stack,
162-
span: span && convertSourceSpan(span),
156+
span: warnOptions.span && convertSourceSpan(warnOptions.span),
157+
...convertDeprecation(
158+
warnOptions.deprecation,
159+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
160+
(warnOptions as any).deprecationType,
161+
),
163162
});
164163
},
165164
}
@@ -240,3 +239,35 @@ function convertSourceSpan(span: SourceSpan): Omit<SourceSpan, 'url'> & { url?:
240239
url: span.url ? fileURLToPath(span.url) : undefined,
241240
};
242241
}
242+
243+
function convertDeprecation(
244+
deprecation: boolean,
245+
deprecationType: Deprecation | undefined,
246+
): { deprecation: false } | { deprecation: true; deprecationType: SerializableDeprecation } {
247+
if (!deprecation || !deprecationType) {
248+
return { deprecation: false };
249+
}
250+
251+
const { obsoleteIn, deprecatedIn, ...rest } = deprecationType;
252+
253+
return {
254+
deprecation: true,
255+
deprecationType: {
256+
...rest,
257+
obsoleteIn: obsoleteIn
258+
? {
259+
major: obsoleteIn.major,
260+
minor: obsoleteIn.minor,
261+
patch: obsoleteIn.patch,
262+
}
263+
: null,
264+
deprecatedIn: deprecatedIn
265+
? {
266+
major: deprecatedIn.major,
267+
minor: deprecatedIn.minor,
268+
patch: deprecatedIn.patch,
269+
}
270+
: null,
271+
},
272+
};
273+
}

packages/angular_devkit/schematics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"dependencies": {
1616
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
1717
"jsonc-parser": "3.2.1",
18-
"magic-string": "0.30.8",
18+
"magic-string": "0.30.9",
1919
"ora": "5.4.1",
2020
"rxjs": "7.8.1"
2121
}

yarn.lock

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@
130130
tslib "^2.3.0"
131131

132132
"@angular/bazel@https://github.com/angular/bazel-builds.git#41e7aa5241ab1f15340eaecaa365cb111b74af50":
133-
version "18.0.0-next.3+sha-a84cb62"
134-
uid "41e7aa5241ab1f15340eaecaa365cb111b74af50"
133+
version "18.0.0-next.3"
135134
resolved "https://github.com/angular/bazel-builds.git#41e7aa5241ab1f15340eaecaa365cb111b74af50"
136135
dependencies:
137136
"@microsoft/api-extractor" "^7.24.2"
@@ -148,7 +147,6 @@
148147

149148
"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#eb9ed9f3fad9f3829e29fb1b4be5dc6a5a41e68b":
150149
version "0.0.0-86c4e22089a8e19ccf02ba52d2e93a744d62ac03"
151-
uid eb9ed9f3fad9f3829e29fb1b4be5dc6a5a41e68b
152150
resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#eb9ed9f3fad9f3829e29fb1b4be5dc6a5a41e68b"
153151
dependencies:
154152
"@angular-devkit/build-angular" "17.3.3"
@@ -314,10 +312,9 @@
314312
"@material/typography" "15.0.0-canary.7f224ddd4.0"
315313
tslib "^2.3.0"
316314

317-
"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#8a6d5db9df6a201f317e9ccfb41a7ebd54197419":
318-
version "0.0.0-86c4e22089a8e19ccf02ba52d2e93a744d62ac03"
319-
uid "8a6d5db9df6a201f317e9ccfb41a7ebd54197419"
320-
resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#8a6d5db9df6a201f317e9ccfb41a7ebd54197419"
315+
"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#659ec125dd4253015d6a4a4665835e4e7d5c65a6":
316+
version "0.0.0-4a904a92b839e4529f3d768df02148398a5fcdb6"
317+
resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#659ec125dd4253015d6a4a4665835e4e7d5c65a6"
321318
dependencies:
322319
"@yarnpkg/lockfile" "^1.1.0"
323320
typescript "~4.9.0"
@@ -9915,6 +9912,13 @@ magic-string@0.30.8, magic-string@^0.30.0, magic-string@^0.30.3:
99159912
dependencies:
99169913
"@jridgewell/sourcemap-codec" "^1.4.15"
99179914

9915+
magic-string@0.30.9:
9916+
version "0.30.9"
9917+
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.9.tgz#8927ae21bfdd856310e07a1bc8dd5e73cb6c251d"
9918+
integrity sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==
9919+
dependencies:
9920+
"@jridgewell/sourcemap-codec" "^1.4.15"
9921+
99189922
make-dir@^2.1.0:
99199923
version "2.1.0"
99209924
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -12343,7 +12347,16 @@ sass@1.71.1:
1234312347
immutable "^4.0.0"
1234412348
source-map-js ">=0.6.2 <2.0.0"
1234512349

12346-
sass@1.72.0, sass@^1.69.5:
12350+
sass@1.74.1:
12351+
version "1.74.1"
12352+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.74.1.tgz#686fc227d3707dd25cb2925e1db8e4562be29319"
12353+
integrity sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==
12354+
dependencies:
12355+
chokidar ">=3.0.0 <4.0.0"
12356+
immutable "^4.0.0"
12357+
source-map-js ">=0.6.2 <2.0.0"
12358+
12359+
sass@^1.69.5:
1234712360
version "1.72.0"
1234812361
resolved "https://registry.yarnpkg.com/sass/-/sass-1.72.0.tgz#5b9978943fcfb32b25a6a5acb102fc9dabbbf41c"
1234912362
integrity sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==
@@ -12354,7 +12367,6 @@ sass@1.72.0, sass@^1.69.5:
1235412367

1235512368
"sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz":
1235612369
version "0.0.0"
12357-
uid "9310bc860f7870a1f872b11c4dc6073a1ad34e5e"
1235812370
resolved "https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz#9310bc860f7870a1f872b11c4dc6073a1ad34e5e"
1235912371

1236012372
saucelabs@^1.5.0:
@@ -13876,10 +13888,10 @@ verdaccio-htpasswd@12.0.0-next-7.13:
1387613888
http-errors "2.0.0"
1387713889
unix-crypt-td-js "1.1.4"
1387813890

13879-
verdaccio@5.30.2:
13880-
version "5.30.2"
13881-
resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-5.30.2.tgz#14f574e5613708fee3a52cbb2338132f56650aec"
13882-
integrity sha512-Mm1+Mtxo7Pu4WU/VUB9eP0PgNQpRoNxlvtzwT/uAWIx94idZoR3xRDxmqH4B++E3mCB1IO31in7Wr/z6U/tmCQ==
13891+
verdaccio@5.30.3:
13892+
version "5.30.3"
13893+
resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-5.30.3.tgz#d36ca91f3ad741dbeba57e28426c7fd23d663f95"
13894+
integrity sha512-s/ZhSRBusW2o+ZkERyzEIbVL3zo8QLpTQPVoB/pn/Yv6+ngflP+anK4xCYiXXQJhqEdBz3cwApa8UgOEaNSS4Q==
1388313895
dependencies:
1388413896
"@cypress/request" "3.0.1"
1388513897
"@verdaccio/config" "7.0.0-next-7.13"

0 commit comments

Comments
 (0)