Skip to content

Commit 180659d

Browse files
alan-agius4alan-agius4
committed
build: update @types/sass to ^1.43.0
(cherry picked from commit d90e8a7)
1 parent 9c24dad commit 180659d

4 files changed

Lines changed: 36 additions & 41 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"@types/postcss-preset-env": "^6.7.1",
117117
"@types/progress": "^2.0.3",
118118
"@types/resolve": "^1.17.1",
119-
"@types/sass": "^1.16.0",
119+
"@types/sass": "^1.43.0",
120120
"@types/semver": "^7.0.0",
121121
"@types/text-table": "^0.2.1",
122122
"@types/uuid": "^8.0.0",

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ export class SassWorkerImplementation {
7676
render(options: Options, callback: RenderCallback): void {
7777
// The `functions`, `logger` and `importer` options are JavaScript functions that cannot be transferred.
7878
// If any additional function options are added in the future, they must be excluded as well.
79-
const { functions, importer, logger, ...serializableOptions } = options as Options & {
80-
logger?: unknown;
81-
};
79+
const { functions, importer, logger, ...serializableOptions } = options;
8280

8381
// The CLI's configuration does not use or expose the ability to defined custom Sass functions
8482
if (functions && Object.keys(functions).length > 0) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ parentPort.on('message', ({ id, hasImporter, options }: RenderRequestMessage) =>
4848
// `receiveMessageOnPort` function are used to ensure synchronous behavior.
4949
options.importer = function (url, prev) {
5050
Atomics.store(importerSignal, 0, 0);
51-
// `this.fromImport` was added in dart-sass in 1.33.0, `@types/sass` doesn't include it yet.
52-
const { fromImport } = this as { fromImport: boolean };
51+
const { fromImport } = this;
5352
workerImporterPort.postMessage({ id, url, prev, fromImport });
5453
Atomics.wait(importerSignal, 0, 0);
5554

‎yarn.lock‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114

115115
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#047a95f394e81d4a120a21a5802000d0c2e62030":
116116
version "0.0.0"
117-
uid "047a95f394e81d4a120a21a5802000d0c2e62030"
118-
resolved "https://github.com/angular/dev-infra-private-builds.git#047a95f394e81d4a120a21a5802000d0c2e62030"
117+
resolved "https://github.com/angular/dev-infra-private-builds.git#eed375cd53f702e9d496ffcc9adfae1085e13ce7"
119118
dependencies:
120119
"@actions/core" "^1.4.0"
121120
"@actions/github" "^5.0.0"
@@ -128,7 +127,7 @@
128127
"@bazel/protractor" "4.4.0"
129128
"@bazel/runfiles" "4.4.0"
130129
"@bazel/typescript" "4.4.0"
131-
"@microsoft/api-extractor" "7.18.17"
130+
"@microsoft/api-extractor" "7.18.16"
132131
"@octokit/auth-app" "^3.6.0"
133132
"@octokit/core" "^3.5.1"
134133
"@octokit/graphql" "^4.8.0"
@@ -156,7 +155,7 @@
156155
node-fetch "^2.6.1"
157156
prettier "^2.3.2"
158157
protractor "^7.0.0"
159-
rollup "2.58.3"
158+
rollup "2.58.0"
160159
rollup-plugin-sourcemaps "^0.6.3"
161160
selenium-webdriver "3.5.0"
162161
semver "^7.3.5"
@@ -1372,26 +1371,26 @@
13721371
brfs "^1.4.0"
13731372
unicode-trie "^0.3.0"
13741373

1375-
"@microsoft/api-extractor-model@7.13.14":
1376-
version "7.13.14"
1377-
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.13.14.tgz#071bf881942814c7786a20c6805bc5cde4019bc5"
1378-
integrity sha512-mKc917+QhOuOZebSnE77i8Tavj/G5ydIFoJqDIY9LpmAfJjsVHgL2pc7vkvW58QTxH2wadIDK1tLzcteOMEt4w==
1374+
"@microsoft/api-extractor-model@7.13.13":
1375+
version "7.13.13"
1376+
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.13.13.tgz#5c1ac0fff0410b8f23478b15560b24096b8869c6"
1377+
integrity sha512-4Hz2TOL4TljsAfMQe7a8tm+Am8+AkrcgkbnH62S9YuaIC3Cw6jE4H2qP8WC2JJInWJP4pg/ZrUlHrtmtgrqn9Q==
13791378
dependencies:
13801379
"@microsoft/tsdoc" "0.13.2"
13811380
"@microsoft/tsdoc-config" "~0.15.2"
1382-
"@rushstack/node-core-library" "3.43.0"
1381+
"@rushstack/node-core-library" "3.42.3"
13831382

1384-
"@microsoft/api-extractor@7.18.17":
1385-
version "7.18.17"
1386-
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.18.17.tgz#3139f803fcaef919c7ff68e02bd6759bc637a64b"
1387-
integrity sha512-gZuJ//FAyfrOqWssY0cyU2bEo8FOIaIYVs+pU5IDyfImkye6YkT2Qnm5PAFhyYSkfUjV5SjvyuP4+VsDfS3jww==
1383+
"@microsoft/api-extractor@7.18.16":
1384+
version "7.18.16"
1385+
resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.18.16.tgz#c5e077e417938da7e7026124c51d34a90868e7bd"
1386+
integrity sha512-f0EcjGgS8IToUHxfQIr4vxGpBhUdaDOhGyddZpZ5K9e/GcGkImfkGeHpYbK043f2bZV3aagTx6NcIawwE72BKA==
13881387
dependencies:
1389-
"@microsoft/api-extractor-model" "7.13.14"
1388+
"@microsoft/api-extractor-model" "7.13.13"
13901389
"@microsoft/tsdoc" "0.13.2"
13911390
"@microsoft/tsdoc-config" "~0.15.2"
1392-
"@rushstack/node-core-library" "3.43.0"
1393-
"@rushstack/rig-package" "0.3.4"
1394-
"@rushstack/ts-command-line" "4.10.3"
1391+
"@rushstack/node-core-library" "3.42.3"
1392+
"@rushstack/rig-package" "0.3.3"
1393+
"@rushstack/ts-command-line" "4.10.2"
13951394
colors "~1.2.1"
13961395
lodash "~4.17.15"
13971396
resolve "~1.17.0"
@@ -1757,10 +1756,10 @@
17571756
estree-walker "^1.0.1"
17581757
picomatch "^2.2.2"
17591758

1760-
"@rushstack/node-core-library@3.43.0":
1761-
version "3.43.0"
1762-
resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.43.0.tgz#aace43bf49bc907445fa306f8c2e6010a8353cda"
1763-
integrity sha512-MFLW+6X83k6o8m8KnWkDhL/8NCJYHbFnnDokPSX1UHC3JwiEvVhHmEnxZv2YEzwnXeFYoKViub2G2t2liHbHLA==
1759+
"@rushstack/node-core-library@3.42.3":
1760+
version "3.42.3"
1761+
resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.42.3.tgz#e9bc8aee4ba047d1858afcb7822b5aaf973b4fd8"
1762+
integrity sha512-xtiJsHtO4Sf/hVKyf/8d58p3zQh2JAZNs1mmDNCyIlgSRYGdqUkpadvvn5mz7EwF6lwn+xTTaTV5/a32xKjbdw==
17641763
dependencies:
17651764
"@types/node" "12.20.24"
17661765
colors "~1.2.1"
@@ -1772,18 +1771,18 @@
17721771
timsort "~0.3.0"
17731772
z-schema "~3.18.3"
17741773

1775-
"@rushstack/rig-package@0.3.4":
1776-
version "0.3.4"
1777-
resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.3.4.tgz#13987cea8eef2f350e2e7538e028fa839f8c4f3c"
1778-
integrity sha512-NsCzPxPQ8cu7lnqa/4xBQXuCJwaBrb5vEbOC8Q/bMQK7GDOxeVUN3/f+NCYjgQSl39toAm8jQJ7TJe+RYYX3yQ==
1774+
"@rushstack/rig-package@0.3.3":
1775+
version "0.3.3"
1776+
resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.3.3.tgz#6e291d181b2b9b114dd8e806e8389d999142d137"
1777+
integrity sha512-ElPnChxIkUzcU3ywI0Cl7E1aM+2w6vFpAwM6X+oWk7Cyjf2ofItThje9e5qUBtKqvI9sc5jVsHY1bRC8rVwOqQ==
17791778
dependencies:
17801779
resolve "~1.17.0"
17811780
strip-json-comments "~3.1.1"
17821781

1783-
"@rushstack/ts-command-line@4.10.3":
1784-
version "4.10.3"
1785-
resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.10.3.tgz#2b8610473f2aa9e22450273f662abb02a3979a11"
1786-
integrity sha512-DdDfwr8CO6CP/kBZlQrrwKyA6UxOteujaIBrmoHa+J+dyLZC19YA/LK0fAHjr2qHLAJHHXVpZwPH8BpqN84oVg==
1782+
"@rushstack/ts-command-line@4.10.2":
1783+
version "4.10.2"
1784+
resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.10.2.tgz#019d43d8428e243031c66aeac1f088687f6730f3"
1785+
integrity sha512-Weq8B7oJeCQ4ITsaVLhOQombipyg+idpkdkhA6UqLtKvuzq8zTtPpAfhP5ff5L+RCmo1CFCVOBE3i+MvzUR5vA==
17871786
dependencies:
17881787
"@types/argparse" "1.0.38"
17891788
argparse "~1.0.9"
@@ -2248,7 +2247,7 @@
22482247
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
22492248
integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
22502249

2251-
"@types/sass@^1.16.0":
2250+
"@types/sass@^1.43.0":
22522251
version "1.43.0"
22532252
resolved "https://registry.yarnpkg.com/@types/sass/-/sass-1.43.0.tgz#b4cebe057d887ed66dc6813fd6cbef22043057bb"
22542253
integrity sha512-DPSXNJ1rYLo88GyF9tuB4bsYGfpKI1a4+wOQmc+LI1SUoocm9QLRSpz0GxxuyjmJsYFIQo/dDlRSSpIXngff+w==
@@ -9262,10 +9261,10 @@ rollup-plugin-sourcemaps@^0.6.3:
92629261
"@rollup/pluginutils" "^3.0.9"
92639262
source-map-resolve "^0.6.0"
92649263

9265-
rollup@2.58.3:
9266-
version "2.58.3"
9267-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.58.3.tgz#71a08138d9515fb65043b6a18618b2ed9ac8d239"
9268-
integrity sha512-ei27MSw1KhRur4p87Q0/Va2NAYqMXOX++FNEumMBcdreIRLURKy+cE2wcDJKBn0nfmhP2ZGrJkP1XPO+G8FJQw==
9264+
rollup@2.58.0:
9265+
version "2.58.0"
9266+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.58.0.tgz#a643983365e7bf7f5b7c62a8331b983b7c4c67fb"
9267+
integrity sha512-NOXpusKnaRpbS7ZVSzcEXqxcLDOagN6iFS8p45RkoiMqPHDLwJm758UF05KlMoCRbLBTZsPOIa887gZJ1AiXvw==
92699268
optionalDependencies:
92709269
fsevents "~2.3.2"
92719270

@@ -9334,7 +9333,6 @@ sass@1.43.4, sass@^1.32.8:
93349333

93359334
"sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz":
93369335
version "0.0.0"
9337-
uid "992e2cb0d91e54b27a4f5bbd2049f3b774718115"
93389336
resolved "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz#992e2cb0d91e54b27a4f5bbd2049f3b774718115"
93399337

93409338
saucelabs@^1.5.0:

0 commit comments

Comments
 (0)