Skip to content

Commit 9a6a77e

Browse files
committed
build: update dart-sass to v1.71.1
1 parent fa146b8 commit 9a6a77e

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
"rollup": "~4.11.0",
192192
"rollup-plugin-sourcemaps": "^0.6.0",
193193
"rxjs": "7.8.1",
194-
"sass": "1.70.0",
194+
"sass": "1.71.1",
195195
"sass-loader": "14.1.0",
196196
"sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz",
197197
"semver": "7.6.0",

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"postcss-loader": "8.1.0",
5454
"resolve-url-loader": "5.0.0",
5555
"rxjs": "7.8.1",
56-
"sass": "1.70.0",
56+
"sass": "1.71.1",
5757
"sass-loader": "14.1.0",
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: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import {
1616
FileImporter,
1717
Importer,
1818
Logger,
19+
NodePackageImporter,
1920
SourceSpan,
20-
StringOptionsWithImporter,
21-
StringOptionsWithoutImporter,
21+
StringOptions,
2222
} from 'sass';
2323
import { maxWorkers } from '../../utils/environment-options';
2424

@@ -50,7 +50,8 @@ type Importers =
5050
| Importer<'sync'>
5151
| Importer<'async'>
5252
| FileImporter<'sync'>
53-
| FileImporter<'async'>;
53+
| FileImporter<'async'>
54+
| NodePackageImporter;
5455

5556
/**
5657
* A response from the Sass render Worker containing the result of the operation.
@@ -104,10 +105,7 @@ export class SassWorkerImplementation {
104105
* @param source The contents to compile.
105106
* @param options The `dart-sass` options to use when rendering the stylesheet.
106107
*/
107-
compileStringAsync(
108-
source: string,
109-
options: StringOptionsWithImporter<'async'> | StringOptionsWithoutImporter<'async'>,
110-
): Promise<CompileResult> {
108+
compileStringAsync(source: string, options: StringOptions<'async'>): Promise<CompileResult> {
111109
// The `functions`, `logger` and `importer` options are JavaScript functions that cannot be transferred.
112110
// If any additional function options are added in the future, they must be excluded as well.
113111
const { functions, importers, url, logger, ...serializableOptions } = options;
@@ -267,7 +265,7 @@ export class SassWorkerImplementation {
267265
options: CanonicalizeContext,
268266
): Promise<string | null> {
269267
for (const importer of importers) {
270-
if (this.isImporter(importer)) {
268+
if (!this.isFileImporter(importer)) {
271269
// Importer
272270
throw new Error('Only File Importers are supported.');
273271
}
@@ -297,7 +295,7 @@ export class SassWorkerImplementation {
297295
};
298296
}
299297

300-
private isImporter(value: Importers): value is Importer {
301-
return 'canonicalize' in value && 'load' in value;
298+
private isFileImporter(value: Importers): value is FileImporter {
299+
return 'findFileUrl' in value;
302300
}
303301
}

yarn.lock

Lines changed: 10 additions & 4 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#b51a0a6543ffbb9844353f33036fc54bda607443":
133-
version "17.3.0-next.0+sha-e9246f7"
134-
uid b51a0a6543ffbb9844353f33036fc54bda607443
133+
version "17.3.0-next.0"
135134
resolved "https://github.com/angular/bazel-builds.git#b51a0a6543ffbb9844353f33036fc54bda607443"
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#eae1b15289d585a0d7888b947e1e57d8eb44e3c1":
150149
version "0.0.0-b6876b1fc6cf590e3223519fbbdedb7f8adbda2d"
151-
uid eae1b15289d585a0d7888b947e1e57d8eb44e3c1
152150
resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#eae1b15289d585a0d7888b947e1e57d8eb44e3c1"
153151
dependencies:
154152
"@angular-devkit/build-angular" "17.2.0-rc.0"
@@ -316,7 +314,6 @@
316314

317315
"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#2382925cf9c460e270725016baefd5d046cc2c59":
318316
version "0.0.0-b6876b1fc6cf590e3223519fbbdedb7f8adbda2d"
319-
uid "2382925cf9c460e270725016baefd5d046cc2c59"
320317
resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#2382925cf9c460e270725016baefd5d046cc2c59"
321318
dependencies:
322319
"@yarnpkg/lockfile" "^1.1.0"
@@ -11676,6 +11673,15 @@ [email protected], sass@^1.69.5:
1167611673
immutable "^4.0.0"
1167711674
source-map-js ">=0.6.2 <2.0.0"
1167811675

11676+
11677+
version "1.71.1"
11678+
resolved "https://registry.yarnpkg.com/sass/-/sass-1.71.1.tgz#dfb09c63ce63f89353777bbd4a88c0a38386ee54"
11679+
integrity sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==
11680+
dependencies:
11681+
chokidar ">=3.0.0 <4.0.0"
11682+
immutable "^4.0.0"
11683+
source-map-js ">=0.6.2 <2.0.0"
11684+
1167911685
"sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz":
1168011686
version "0.0.0"
1168111687
resolved "https://saucelabs.com/downloads/sc-4.9.1-linux.tar.gz#9310bc860f7870a1f872b11c4dc6073a1ad34e5e"

0 commit comments

Comments
 (0)