From 0432b4ccfc0f9cb26e55e00778d033194dbd39e2 Mon Sep 17 00:00:00 2001 From: Sass Bot Date: Thu, 11 Apr 2024 23:12:29 +0000 Subject: [PATCH 01/14] Update Dart Sass version and release --- CHANGELOG.md | 10 ++++++++ npm/android-arm/package.json | 2 +- npm/android-arm64/package.json | 2 +- npm/android-ia32/package.json | 2 +- npm/android-x64/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ia32/package.json | 2 +- npm/linux-musl-arm/package.json | 2 +- npm/linux-musl-arm64/package.json | 2 +- npm/linux-musl-ia32/package.json | 2 +- npm/linux-musl-x64/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/win32-arm64/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- package.json | 38 +++++++++++++++---------------- 19 files changed, 46 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1979177f..ae92aca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 1.75.0 + +* Fix a bug in which stylesheet canonicalization could be cached incorrectly + when custom importers or the Node.js package importer made decisions based on + the URL of the containing stylesheet. + +### JS API + +* Allow `importer` to be passed without `url` in `StringOptionsWithImporter`. + ## 1.74.1 * No user-visible changes. diff --git a/npm/android-arm/package.json b/npm/android-arm/package.json index 66248754..2a6fbbbb 100644 --- a/npm/android-arm/package.json +++ b/npm/android-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm", - "version": "1.74.1", + "version": "1.75.0", "description": "The android-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index 41f06166..e70557d9 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm64", - "version": "1.74.1", + "version": "1.75.0", "description": "The android-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-ia32/package.json b/npm/android-ia32/package.json index 45453a15..4d925a55 100644 --- a/npm/android-ia32/package.json +++ b/npm/android-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-ia32", - "version": "1.74.1", + "version": "1.75.0", "description": "The android-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-x64/package.json b/npm/android-x64/package.json index a83a3bf1..3dbdb05c 100644 --- a/npm/android-x64/package.json +++ b/npm/android-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-x64", - "version": "1.74.1", + "version": "1.75.0", "description": "The android-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index d91f90f1..d21f1ff2 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-arm64", - "version": "1.74.1", + "version": "1.75.0", "description": "The darwin-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 6cd713c3..1dff1433 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-x64", - "version": "1.74.1", + "version": "1.75.0", "description": "The darwin-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 57c3d1fb..d19736fa 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index bb3b2066..597e316d 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm64", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-ia32/package.json b/npm/linux-ia32/package.json index 632ff253..53b353ed 100644 --- a/npm/linux-ia32/package.json +++ b/npm/linux-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-ia32", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm/package.json b/npm/linux-musl-arm/package.json index ccdec118..e69b2752 100644 --- a/npm/linux-musl-arm/package.json +++ b/npm/linux-musl-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-musl-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm64/package.json b/npm/linux-musl-arm64/package.json index 0c9d14e3..ce6e77c3 100644 --- a/npm/linux-musl-arm64/package.json +++ b/npm/linux-musl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm64", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-musl-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-ia32/package.json b/npm/linux-musl-ia32/package.json index 885bd534..ce51d9e6 100644 --- a/npm/linux-musl-ia32/package.json +++ b/npm/linux-musl-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-ia32", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-musl-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-x64/package.json b/npm/linux-musl-x64/package.json index dca8e304..f7350336 100644 --- a/npm/linux-musl-x64/package.json +++ b/npm/linux-musl-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-x64", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-musl-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index f858a1d5..059c98ac 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-x64", - "version": "1.74.1", + "version": "1.75.0", "description": "The linux-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json index feb70cb9..ecaeb950 100644 --- a/npm/win32-arm64/package.json +++ b/npm/win32-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-arm64", - "version": "1.74.1", + "version": "1.75.0", "description": "The win32-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 6abde34e..292405f0 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-ia32", - "version": "1.74.1", + "version": "1.75.0", "description": "The win32-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index e986cd9e..9d898963 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-x64", - "version": "1.74.1", + "version": "1.75.0", "description": "The win32-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/package.json b/package.json index 04109903..21539aba 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "sass-embedded", - "version": "1.74.1", + "version": "1.75.0", "protocol-version": "2.6.0", - "compiler-version": "1.74.1", + "compiler-version": "1.75.0", "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol", "repository": "sass/embedded-host-node", "author": "Google Inc.", @@ -35,23 +35,23 @@ "test": "jest" }, "optionalDependencies": { - "sass-embedded-android-arm": "1.74.1", - "sass-embedded-android-arm64": "1.74.1", - "sass-embedded-android-ia32": "1.74.1", - "sass-embedded-android-x64": "1.74.1", - "sass-embedded-darwin-arm64": "1.74.1", - "sass-embedded-darwin-x64": "1.74.1", - "sass-embedded-linux-arm": "1.74.1", - "sass-embedded-linux-arm64": "1.74.1", - "sass-embedded-linux-ia32": "1.74.1", - "sass-embedded-linux-x64": "1.74.1", - "sass-embedded-linux-musl-arm": "1.74.1", - "sass-embedded-linux-musl-arm64": "1.74.1", - "sass-embedded-linux-musl-ia32": "1.74.1", - "sass-embedded-linux-musl-x64": "1.74.1", - "sass-embedded-win32-arm64": "1.74.1", - "sass-embedded-win32-ia32": "1.74.1", - "sass-embedded-win32-x64": "1.74.1" + "sass-embedded-android-arm": "1.75.0", + "sass-embedded-android-arm64": "1.75.0", + "sass-embedded-android-ia32": "1.75.0", + "sass-embedded-android-x64": "1.75.0", + "sass-embedded-darwin-arm64": "1.75.0", + "sass-embedded-darwin-x64": "1.75.0", + "sass-embedded-linux-arm": "1.75.0", + "sass-embedded-linux-arm64": "1.75.0", + "sass-embedded-linux-ia32": "1.75.0", + "sass-embedded-linux-x64": "1.75.0", + "sass-embedded-linux-musl-arm": "1.75.0", + "sass-embedded-linux-musl-arm64": "1.75.0", + "sass-embedded-linux-musl-ia32": "1.75.0", + "sass-embedded-linux-musl-x64": "1.75.0", + "sass-embedded-win32-arm64": "1.75.0", + "sass-embedded-win32-ia32": "1.75.0", + "sass-embedded-win32-x64": "1.75.0" }, "dependencies": { "@bufbuild/protobuf": "^1.0.0", From fd32e8efe0612601706e4dd76cbc4d70139569c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Fri, 12 Apr 2024 16:17:07 -0700 Subject: [PATCH 02/14] Fix test regression caused by node fixing CVE-2024-27980 (#286) --- lib/src/compiler/async.ts | 4 ++++ lib/src/compiler/sync.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/src/compiler/async.ts b/lib/src/compiler/async.ts index 6b4d77a4..417b82a9 100644 --- a/lib/src/compiler/async.ts +++ b/lib/src/compiler/async.ts @@ -43,6 +43,10 @@ export class AsyncCompiler { // current working directory. // https://github.com/sass/embedded-host-node/pull/261#discussion_r1438712923 cwd: path.dirname(compilerCommand[0]), + // Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980 + shell: ['.bat', '.cmd'].includes( + path.extname(compilerCommand[0]).toLowerCase() + ), windowsHide: true, } ); diff --git a/lib/src/compiler/sync.ts b/lib/src/compiler/sync.ts index 50b7bb33..33838e0e 100644 --- a/lib/src/compiler/sync.ts +++ b/lib/src/compiler/sync.ts @@ -43,6 +43,10 @@ export class Compiler { // current working directory. // https://github.com/sass/embedded-host-node/pull/261#discussion_r1438712923 cwd: path.dirname(compilerCommand[0]), + // Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980 + shell: ['.bat', '.cmd'].includes( + path.extname(compilerCommand[0]).toLowerCase() + ), windowsHide: true, } ); From 3080e761d4b4fe3497408311fcc0735a1db7777c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Wed, 17 Apr 2024 14:33:08 -0700 Subject: [PATCH 03/14] Implement access tracking for containingUrl (#285) --- lib/src/canonicalize-context.ts | 32 ++++++++++++++++++++++++++++++++ lib/src/importer-registry.ts | 27 +++++++++++++++------------ lib/src/legacy/importer.ts | 26 +++++++++++++++++++++++++- lib/src/legacy/index.ts | 19 ++++++++++++++----- lib/src/value/argument-list.ts | 8 ++++++-- package.json | 2 +- 6 files changed, 93 insertions(+), 21 deletions(-) create mode 100644 lib/src/canonicalize-context.ts diff --git a/lib/src/canonicalize-context.ts b/lib/src/canonicalize-context.ts new file mode 100644 index 00000000..46111a8a --- /dev/null +++ b/lib/src/canonicalize-context.ts @@ -0,0 +1,32 @@ +// Copyright 2024 Google LLC. Use of this source code is governed by an +// MIT-style license that can be found in the LICENSE file or at +// https://opensource.org/licenses/MIT. + +export class CanonicalizeContext { + readonly fromImport: boolean; + + private readonly _containingUrl: URL | null; + + get containingUrl(): URL | null { + this._containingUrlAccessed = true; + return this._containingUrl; + } + + private _containingUrlAccessed = false; + + /** + * Whether the `containingUrl` getter has been accessed. + * + * This is marked as public so that the importer registry can access it, but + * it's not part of the package's public API and should not be accessed by + * user code. It may be renamed or removed without warning in the future. + */ + get containingUrlAccessed(): boolean { + return this._containingUrlAccessed; + } + + constructor(containingUrl: URL | null, fromImport: boolean) { + this._containingUrl = containingUrl; + this.fromImport = fromImport; + } +} diff --git a/lib/src/importer-registry.ts b/lib/src/importer-registry.ts index 9a1cb337..0f8bdc22 100644 --- a/lib/src/importer-registry.ts +++ b/lib/src/importer-registry.ts @@ -7,6 +7,7 @@ import * as p from 'path'; import {URL} from 'url'; import {inspect} from 'util'; +import {CanonicalizeContext} from './canonicalize-context'; import * as utils from './utils'; import {FileImporter, Importer, Options} from './vendor/sass'; import * as proto from './vendor/embedded_sass_pb'; @@ -115,21 +116,22 @@ export class ImporterRegistry { throw utils.compilerError('Unknown CanonicalizeRequest.importer_id'); } + const canonicalizeContext = new CanonicalizeContext( + request.containingUrl ? new URL(request.containingUrl) : null, + request.fromImport + ); + return catchOr( () => { return thenOr( - importer.canonicalize(request.url, { - fromImport: request.fromImport, - containingUrl: request.containingUrl - ? new URL(request.containingUrl) - : null, - }), + importer.canonicalize(request.url, canonicalizeContext), url => new proto.InboundMessage_CanonicalizeResponse({ result: url === null ? {case: undefined} : {case: 'url', value: url.toString()}, + containingUrlUnused: !canonicalizeContext.containingUrlAccessed, }) ); }, @@ -197,15 +199,15 @@ export class ImporterRegistry { throw utils.compilerError('Unknown FileImportRequest.importer_id'); } + const canonicalizeContext = new CanonicalizeContext( + request.containingUrl ? new URL(request.containingUrl) : null, + request.fromImport + ); + return catchOr( () => { return thenOr( - importer.findFileUrl(request.url, { - fromImport: request.fromImport, - containingUrl: request.containingUrl - ? new URL(request.containingUrl) - : null, - }), + importer.findFileUrl(request.url, canonicalizeContext), url => { if (!url) return new proto.InboundMessage_FileImportResponse(); if (url.protocol !== 'file:') { @@ -216,6 +218,7 @@ export class ImporterRegistry { } return new proto.InboundMessage_FileImportResponse({ result: {case: 'fileUrl', value: url.toString()}, + containingUrlUnused: !canonicalizeContext.containingUrlAccessed, }); } ); diff --git a/lib/src/legacy/importer.ts b/lib/src/legacy/importer.ts index 97ef9117..5977a3d5 100644 --- a/lib/src/legacy/importer.ts +++ b/lib/src/legacy/importer.ts @@ -86,10 +86,34 @@ export class LegacyImporterWrapper canonicalize( url: string, - options: {fromImport: boolean} + options: {fromImport: boolean; containingUrl: URL | null} ): PromiseOr { if (url.startsWith(endOfLoadProtocol)) return new URL(url); + // Emulate a base importer instead of using a real base importer, + // because we want to mark containingUrl as used, which is impossible + // in a real base importer. + if (options.containingUrl !== null) { + try { + const absoluteUrl = new URL(url, options.containingUrl).toString(); + const resolved = this.canonicalize(absoluteUrl, { + fromImport: options.fromImport, + containingUrl: null, + }); + if (resolved !== null) return resolved; + } catch (error: unknown) { + if ( + error instanceof TypeError && + isErrnoException(error) && + error.code === 'ERR_INVALID_URL' + ) { + // ignore + } else { + throw error; + } + } + } + if ( url.startsWith(legacyImporterProtocolPrefix) || url.startsWith(legacyImporterProtocol) diff --git a/lib/src/legacy/index.ts b/lib/src/legacy/index.ts index 404937cf..d7543e35 100644 --- a/lib/src/legacy/index.ts +++ b/lib/src/legacy/index.ts @@ -184,11 +184,20 @@ function convertStringOptions( ): StringOptions & {legacy: true} { const modernOptions = convertOptions(options, sync); - // Find the first non-NodePackageImporter to pass as legacy `importer` option. - // NodePackageImporter will be passed in `modernOptions.importers`. - const importer = modernOptions.importers?.find( - _importer => !(_importer instanceof NodePackageImporter) - ) as Importer | FileImporter; + // Use a no-op base importer, because the LegacyImporterWrapper will emulate + // the base importer by itself in order to mark containingUrl as accessed. + const importer = modernOptions.importers?.some( + importer => importer instanceof LegacyImporterWrapper + ) + ? { + canonicalize() { + return null; + }, + load() { + return null; + }, + } + : undefined; return { ...modernOptions, diff --git a/lib/src/value/argument-list.ts b/lib/src/value/argument-list.ts index e5c41cb1..b898796a 100644 --- a/lib/src/value/argument-list.ts +++ b/lib/src/value/argument-list.ts @@ -31,6 +31,8 @@ export class SassArgumentList extends SassList { */ readonly keywordsInternal: OrderedMap; + private _keywordsAccessed = false; + /** * Whether the `keywords` getter has been accessed. * @@ -38,10 +40,12 @@ export class SassArgumentList extends SassList { * part of the package's public API and should not be accessed by user code. * It may be renamed or removed without warning in the future. */ - keywordsAccessed = false; + get keywordsAccessed(): boolean { + return this._keywordsAccessed; + } get keywords(): OrderedMap { - this.keywordsAccessed = true; + this._keywordsAccessed = true; return this.keywordsInternal; } diff --git a/package.json b/package.json index 21539aba..9f82ef44 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "sass-embedded", "version": "1.75.0", - "protocol-version": "2.6.0", + "protocol-version": "2.7.0", "compiler-version": "1.75.0", "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol", "repository": "sass/embedded-host-node", From b3a7fef5e98fffae49b581dc75686719d29a361e Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Tue, 30 Apr 2024 14:20:01 -0700 Subject: [PATCH 04/14] Add a deprecation for functions and mixins beginning with `--` (#292) --- lib/src/deprecations.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/src/deprecations.ts b/lib/src/deprecations.ts index 7fe782d3..1c679573 100644 --- a/lib/src/deprecations.ts +++ b/lib/src/deprecations.ts @@ -157,6 +157,13 @@ export const deprecations: typeof api.deprecations = { description: 'Using the current working directory as an implicit load path.', }, + 'css-function-mixin': { + id: 'css-function-mixin', + status: 'active', + deprecatedIn: new Version(1, 76, 0), + obsoleteIn: null, + description: 'Function and mixin names beginning with --.', + }, import: { id: 'import', status: 'future', From 7cf4e6e7e96f081fedd55e51408c999cf1ed3b9c Mon Sep 17 00:00:00 2001 From: Sass Bot Date: Tue, 30 Apr 2024 21:41:02 +0000 Subject: [PATCH 05/14] Update Dart Sass version and release --- CHANGELOG.md | 8 +++++++ npm/android-arm/package.json | 2 +- npm/android-arm64/package.json | 2 +- npm/android-ia32/package.json | 2 +- npm/android-x64/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ia32/package.json | 2 +- npm/linux-musl-arm/package.json | 2 +- npm/linux-musl-arm64/package.json | 2 +- npm/linux-musl-ia32/package.json | 2 +- npm/linux-musl-x64/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/win32-arm64/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- package.json | 38 +++++++++++++++---------------- 19 files changed, 44 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae92aca1..adfce2e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.76.0 + +* Throw errors for misplaced statements in keyframe blocks. + +* Mixins and functions whose names begin with `--` are now deprecated for + forwards-compatibility with the in-progress CSS functions and mixins spec. + This deprecation is named `css-function-mixin`. + ## 1.75.0 * Fix a bug in which stylesheet canonicalization could be cached incorrectly diff --git a/npm/android-arm/package.json b/npm/android-arm/package.json index 2a6fbbbb..c5b42a8d 100644 --- a/npm/android-arm/package.json +++ b/npm/android-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm", - "version": "1.75.0", + "version": "1.76.0", "description": "The android-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index e70557d9..c6c60228 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm64", - "version": "1.75.0", + "version": "1.76.0", "description": "The android-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-ia32/package.json b/npm/android-ia32/package.json index 4d925a55..22900a3a 100644 --- a/npm/android-ia32/package.json +++ b/npm/android-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-ia32", - "version": "1.75.0", + "version": "1.76.0", "description": "The android-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-x64/package.json b/npm/android-x64/package.json index 3dbdb05c..518cbf4f 100644 --- a/npm/android-x64/package.json +++ b/npm/android-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-x64", - "version": "1.75.0", + "version": "1.76.0", "description": "The android-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index d21f1ff2..41f3b7ad 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-arm64", - "version": "1.75.0", + "version": "1.76.0", "description": "The darwin-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 1dff1433..272a4626 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-x64", - "version": "1.75.0", + "version": "1.76.0", "description": "The darwin-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index d19736fa..d0e81ee6 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 597e316d..7c0ec264 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm64", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-ia32/package.json b/npm/linux-ia32/package.json index 53b353ed..3a204b43 100644 --- a/npm/linux-ia32/package.json +++ b/npm/linux-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-ia32", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm/package.json b/npm/linux-musl-arm/package.json index e69b2752..eb948097 100644 --- a/npm/linux-musl-arm/package.json +++ b/npm/linux-musl-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-musl-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm64/package.json b/npm/linux-musl-arm64/package.json index ce6e77c3..7aaed60b 100644 --- a/npm/linux-musl-arm64/package.json +++ b/npm/linux-musl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm64", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-musl-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-ia32/package.json b/npm/linux-musl-ia32/package.json index ce51d9e6..7920ba3d 100644 --- a/npm/linux-musl-ia32/package.json +++ b/npm/linux-musl-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-ia32", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-musl-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-x64/package.json b/npm/linux-musl-x64/package.json index f7350336..ca9f4b47 100644 --- a/npm/linux-musl-x64/package.json +++ b/npm/linux-musl-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-x64", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-musl-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 059c98ac..1dde329f 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-x64", - "version": "1.75.0", + "version": "1.76.0", "description": "The linux-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json index ecaeb950..32d4ddf9 100644 --- a/npm/win32-arm64/package.json +++ b/npm/win32-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-arm64", - "version": "1.75.0", + "version": "1.76.0", "description": "The win32-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 292405f0..53d4e3ea 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-ia32", - "version": "1.75.0", + "version": "1.76.0", "description": "The win32-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 9d898963..fdcf702e 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-x64", - "version": "1.75.0", + "version": "1.76.0", "description": "The win32-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/package.json b/package.json index 9f82ef44..635ac99b 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "sass-embedded", - "version": "1.75.0", + "version": "1.76.0", "protocol-version": "2.7.0", - "compiler-version": "1.75.0", + "compiler-version": "1.76.0", "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol", "repository": "sass/embedded-host-node", "author": "Google Inc.", @@ -35,23 +35,23 @@ "test": "jest" }, "optionalDependencies": { - "sass-embedded-android-arm": "1.75.0", - "sass-embedded-android-arm64": "1.75.0", - "sass-embedded-android-ia32": "1.75.0", - "sass-embedded-android-x64": "1.75.0", - "sass-embedded-darwin-arm64": "1.75.0", - "sass-embedded-darwin-x64": "1.75.0", - "sass-embedded-linux-arm": "1.75.0", - "sass-embedded-linux-arm64": "1.75.0", - "sass-embedded-linux-ia32": "1.75.0", - "sass-embedded-linux-x64": "1.75.0", - "sass-embedded-linux-musl-arm": "1.75.0", - "sass-embedded-linux-musl-arm64": "1.75.0", - "sass-embedded-linux-musl-ia32": "1.75.0", - "sass-embedded-linux-musl-x64": "1.75.0", - "sass-embedded-win32-arm64": "1.75.0", - "sass-embedded-win32-ia32": "1.75.0", - "sass-embedded-win32-x64": "1.75.0" + "sass-embedded-android-arm": "1.76.0", + "sass-embedded-android-arm64": "1.76.0", + "sass-embedded-android-ia32": "1.76.0", + "sass-embedded-android-x64": "1.76.0", + "sass-embedded-darwin-arm64": "1.76.0", + "sass-embedded-darwin-x64": "1.76.0", + "sass-embedded-linux-arm": "1.76.0", + "sass-embedded-linux-arm64": "1.76.0", + "sass-embedded-linux-ia32": "1.76.0", + "sass-embedded-linux-x64": "1.76.0", + "sass-embedded-linux-musl-arm": "1.76.0", + "sass-embedded-linux-musl-arm64": "1.76.0", + "sass-embedded-linux-musl-ia32": "1.76.0", + "sass-embedded-linux-musl-x64": "1.76.0", + "sass-embedded-win32-arm64": "1.76.0", + "sass-embedded-win32-ia32": "1.76.0", + "sass-embedded-win32-x64": "1.76.0" }, "dependencies": { "@bufbuild/protobuf": "^1.0.0", From 2ffa0e1b8c807778db1026a709b6158b2ef51fe2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 13:43:32 -0700 Subject: [PATCH 06/14] Bump minipass from 7.0.4 to 7.1.0 (#294) Bumps [minipass](https://github.com/isaacs/minipass) from 7.0.4 to 7.1.0. - [Changelog](https://github.com/isaacs/minipass/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/minipass/compare/v7.0.4...v7.1.0) --- updated-dependencies: - dependency-name: minipass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 635ac99b..f75fb1b8 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "extract-zip": "^2.0.1", "gts": "^5.0.0", "jest": "^29.4.1", - "minipass": "7.0.4", + "minipass": "7.1.0", "npm-run-all": "^4.1.5", "shelljs": "^0.8.4", "source-map-js": "^1.0.2", From bce32f3e8f29494c0a64dd2b4c23cfdc48ec7880 Mon Sep 17 00:00:00 2001 From: Sass Bot Date: Tue, 7 May 2024 01:10:43 +0000 Subject: [PATCH 07/14] Update Dart Sass version and release --- CHANGELOG.md | 4 ++++ npm/android-arm/package.json | 2 +- npm/android-arm64/package.json | 2 +- npm/android-ia32/package.json | 2 +- npm/android-x64/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ia32/package.json | 2 +- npm/linux-musl-arm/package.json | 2 +- npm/linux-musl-arm64/package.json | 2 +- npm/linux-musl-ia32/package.json | 2 +- npm/linux-musl-x64/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/win32-arm64/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- package.json | 38 +++++++++++++++---------------- 19 files changed, 40 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adfce2e9..52adaf61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.77.0 + +* *Don't* throw errors for at-rules in keyframe blocks. + ## 1.76.0 * Throw errors for misplaced statements in keyframe blocks. diff --git a/npm/android-arm/package.json b/npm/android-arm/package.json index c5b42a8d..f935bcbe 100644 --- a/npm/android-arm/package.json +++ b/npm/android-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm", - "version": "1.76.0", + "version": "1.77.0", "description": "The android-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index c6c60228..c9a36521 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm64", - "version": "1.76.0", + "version": "1.77.0", "description": "The android-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-ia32/package.json b/npm/android-ia32/package.json index 22900a3a..4620c678 100644 --- a/npm/android-ia32/package.json +++ b/npm/android-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-ia32", - "version": "1.76.0", + "version": "1.77.0", "description": "The android-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-x64/package.json b/npm/android-x64/package.json index 518cbf4f..10276fda 100644 --- a/npm/android-x64/package.json +++ b/npm/android-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-x64", - "version": "1.76.0", + "version": "1.77.0", "description": "The android-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 41f3b7ad..be689ce3 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-arm64", - "version": "1.76.0", + "version": "1.77.0", "description": "The darwin-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 272a4626..c1222e4c 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-x64", - "version": "1.76.0", + "version": "1.77.0", "description": "The darwin-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index d0e81ee6..702ed29a 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 7c0ec264..c372175a 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm64", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-ia32/package.json b/npm/linux-ia32/package.json index 3a204b43..000ad42a 100644 --- a/npm/linux-ia32/package.json +++ b/npm/linux-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-ia32", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm/package.json b/npm/linux-musl-arm/package.json index eb948097..9cadc576 100644 --- a/npm/linux-musl-arm/package.json +++ b/npm/linux-musl-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-musl-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm64/package.json b/npm/linux-musl-arm64/package.json index 7aaed60b..39eadc87 100644 --- a/npm/linux-musl-arm64/package.json +++ b/npm/linux-musl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm64", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-musl-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-ia32/package.json b/npm/linux-musl-ia32/package.json index 7920ba3d..dd82bac1 100644 --- a/npm/linux-musl-ia32/package.json +++ b/npm/linux-musl-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-ia32", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-musl-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-x64/package.json b/npm/linux-musl-x64/package.json index ca9f4b47..64a98caa 100644 --- a/npm/linux-musl-x64/package.json +++ b/npm/linux-musl-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-x64", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-musl-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 1dde329f..2539ff2c 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-x64", - "version": "1.76.0", + "version": "1.77.0", "description": "The linux-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json index 32d4ddf9..093a1b05 100644 --- a/npm/win32-arm64/package.json +++ b/npm/win32-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-arm64", - "version": "1.76.0", + "version": "1.77.0", "description": "The win32-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 53d4e3ea..abefa1ba 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-ia32", - "version": "1.76.0", + "version": "1.77.0", "description": "The win32-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index fdcf702e..463d9e05 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-x64", - "version": "1.76.0", + "version": "1.77.0", "description": "The win32-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/package.json b/package.json index f75fb1b8..524a2d50 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "sass-embedded", - "version": "1.76.0", + "version": "1.77.0", "protocol-version": "2.7.0", - "compiler-version": "1.76.0", + "compiler-version": "1.77.0", "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol", "repository": "sass/embedded-host-node", "author": "Google Inc.", @@ -35,23 +35,23 @@ "test": "jest" }, "optionalDependencies": { - "sass-embedded-android-arm": "1.76.0", - "sass-embedded-android-arm64": "1.76.0", - "sass-embedded-android-ia32": "1.76.0", - "sass-embedded-android-x64": "1.76.0", - "sass-embedded-darwin-arm64": "1.76.0", - "sass-embedded-darwin-x64": "1.76.0", - "sass-embedded-linux-arm": "1.76.0", - "sass-embedded-linux-arm64": "1.76.0", - "sass-embedded-linux-ia32": "1.76.0", - "sass-embedded-linux-x64": "1.76.0", - "sass-embedded-linux-musl-arm": "1.76.0", - "sass-embedded-linux-musl-arm64": "1.76.0", - "sass-embedded-linux-musl-ia32": "1.76.0", - "sass-embedded-linux-musl-x64": "1.76.0", - "sass-embedded-win32-arm64": "1.76.0", - "sass-embedded-win32-ia32": "1.76.0", - "sass-embedded-win32-x64": "1.76.0" + "sass-embedded-android-arm": "1.77.0", + "sass-embedded-android-arm64": "1.77.0", + "sass-embedded-android-ia32": "1.77.0", + "sass-embedded-android-x64": "1.77.0", + "sass-embedded-darwin-arm64": "1.77.0", + "sass-embedded-darwin-x64": "1.77.0", + "sass-embedded-linux-arm": "1.77.0", + "sass-embedded-linux-arm64": "1.77.0", + "sass-embedded-linux-ia32": "1.77.0", + "sass-embedded-linux-x64": "1.77.0", + "sass-embedded-linux-musl-arm": "1.77.0", + "sass-embedded-linux-musl-arm64": "1.77.0", + "sass-embedded-linux-musl-ia32": "1.77.0", + "sass-embedded-linux-musl-x64": "1.77.0", + "sass-embedded-win32-arm64": "1.77.0", + "sass-embedded-win32-ia32": "1.77.0", + "sass-embedded-win32-x64": "1.77.0" }, "dependencies": { "@bufbuild/protobuf": "^1.0.0", From 62a80b7b62e8494ff33f315e038bc7f1a1b006d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Fri, 10 May 2024 14:29:31 -0700 Subject: [PATCH 08/14] Set containingUrlUnused when FileImporter returns null (#297) --- lib/src/importer-registry.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/src/importer-registry.ts b/lib/src/importer-registry.ts index 0f8bdc22..749a912b 100644 --- a/lib/src/importer-registry.ts +++ b/lib/src/importer-registry.ts @@ -209,7 +209,11 @@ export class ImporterRegistry { return thenOr( importer.findFileUrl(request.url, canonicalizeContext), url => { - if (!url) return new proto.InboundMessage_FileImportResponse(); + if (!url) { + return new proto.InboundMessage_FileImportResponse({ + containingUrlUnused: !canonicalizeContext.containingUrlAccessed, + }); + } if (url.protocol !== 'file:') { throw ( `FileImporter ${inspect(importer)} returned non-file: URL ` + From a8036afa5b6ee3b47527ed451c99446533080e83 Mon Sep 17 00:00:00 2001 From: Sass Bot Date: Fri, 10 May 2024 23:08:21 +0000 Subject: [PATCH 09/14] Update Dart Sass version and release --- CHANGELOG.md | 4 ++++ npm/android-arm/package.json | 2 +- npm/android-arm64/package.json | 2 +- npm/android-ia32/package.json | 2 +- npm/android-x64/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ia32/package.json | 2 +- npm/linux-musl-arm/package.json | 2 +- npm/linux-musl-arm64/package.json | 2 +- npm/linux-musl-ia32/package.json | 2 +- npm/linux-musl-x64/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/win32-arm64/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- package.json | 38 +++++++++++++++---------------- 19 files changed, 40 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52adaf61..0c306b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.77.1 + +* Fix a crash that could come up with importers in certain contexts. + ## 1.77.0 * *Don't* throw errors for at-rules in keyframe blocks. diff --git a/npm/android-arm/package.json b/npm/android-arm/package.json index f935bcbe..6e800ddb 100644 --- a/npm/android-arm/package.json +++ b/npm/android-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm", - "version": "1.77.0", + "version": "1.77.1", "description": "The android-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index c9a36521..7738b238 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm64", - "version": "1.77.0", + "version": "1.77.1", "description": "The android-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-ia32/package.json b/npm/android-ia32/package.json index 4620c678..ef8c2a9e 100644 --- a/npm/android-ia32/package.json +++ b/npm/android-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-ia32", - "version": "1.77.0", + "version": "1.77.1", "description": "The android-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-x64/package.json b/npm/android-x64/package.json index 10276fda..2d107914 100644 --- a/npm/android-x64/package.json +++ b/npm/android-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-x64", - "version": "1.77.0", + "version": "1.77.1", "description": "The android-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index be689ce3..9af3e6dd 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-arm64", - "version": "1.77.0", + "version": "1.77.1", "description": "The darwin-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index c1222e4c..748e4888 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-x64", - "version": "1.77.0", + "version": "1.77.1", "description": "The darwin-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 702ed29a..0be79f98 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index c372175a..8a3890b9 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm64", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-ia32/package.json b/npm/linux-ia32/package.json index 000ad42a..e2aee2cb 100644 --- a/npm/linux-ia32/package.json +++ b/npm/linux-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-ia32", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm/package.json b/npm/linux-musl-arm/package.json index 9cadc576..364f86b1 100644 --- a/npm/linux-musl-arm/package.json +++ b/npm/linux-musl-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-musl-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm64/package.json b/npm/linux-musl-arm64/package.json index 39eadc87..ff7450fb 100644 --- a/npm/linux-musl-arm64/package.json +++ b/npm/linux-musl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm64", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-musl-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-ia32/package.json b/npm/linux-musl-ia32/package.json index dd82bac1..79a3a881 100644 --- a/npm/linux-musl-ia32/package.json +++ b/npm/linux-musl-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-ia32", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-musl-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-x64/package.json b/npm/linux-musl-x64/package.json index 64a98caa..f300636b 100644 --- a/npm/linux-musl-x64/package.json +++ b/npm/linux-musl-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-x64", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-musl-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 2539ff2c..9c8dca04 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-x64", - "version": "1.77.0", + "version": "1.77.1", "description": "The linux-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json index 093a1b05..768eaeca 100644 --- a/npm/win32-arm64/package.json +++ b/npm/win32-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-arm64", - "version": "1.77.0", + "version": "1.77.1", "description": "The win32-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index abefa1ba..ae302cb2 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-ia32", - "version": "1.77.0", + "version": "1.77.1", "description": "The win32-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 463d9e05..aa7795a8 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-x64", - "version": "1.77.0", + "version": "1.77.1", "description": "The win32-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/package.json b/package.json index 524a2d50..3666448a 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "sass-embedded", - "version": "1.77.0", + "version": "1.77.1", "protocol-version": "2.7.0", - "compiler-version": "1.77.0", + "compiler-version": "1.77.1", "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol", "repository": "sass/embedded-host-node", "author": "Google Inc.", @@ -35,23 +35,23 @@ "test": "jest" }, "optionalDependencies": { - "sass-embedded-android-arm": "1.77.0", - "sass-embedded-android-arm64": "1.77.0", - "sass-embedded-android-ia32": "1.77.0", - "sass-embedded-android-x64": "1.77.0", - "sass-embedded-darwin-arm64": "1.77.0", - "sass-embedded-darwin-x64": "1.77.0", - "sass-embedded-linux-arm": "1.77.0", - "sass-embedded-linux-arm64": "1.77.0", - "sass-embedded-linux-ia32": "1.77.0", - "sass-embedded-linux-x64": "1.77.0", - "sass-embedded-linux-musl-arm": "1.77.0", - "sass-embedded-linux-musl-arm64": "1.77.0", - "sass-embedded-linux-musl-ia32": "1.77.0", - "sass-embedded-linux-musl-x64": "1.77.0", - "sass-embedded-win32-arm64": "1.77.0", - "sass-embedded-win32-ia32": "1.77.0", - "sass-embedded-win32-x64": "1.77.0" + "sass-embedded-android-arm": "1.77.1", + "sass-embedded-android-arm64": "1.77.1", + "sass-embedded-android-ia32": "1.77.1", + "sass-embedded-android-x64": "1.77.1", + "sass-embedded-darwin-arm64": "1.77.1", + "sass-embedded-darwin-x64": "1.77.1", + "sass-embedded-linux-arm": "1.77.1", + "sass-embedded-linux-arm64": "1.77.1", + "sass-embedded-linux-ia32": "1.77.1", + "sass-embedded-linux-x64": "1.77.1", + "sass-embedded-linux-musl-arm": "1.77.1", + "sass-embedded-linux-musl-arm64": "1.77.1", + "sass-embedded-linux-musl-ia32": "1.77.1", + "sass-embedded-linux-musl-x64": "1.77.1", + "sass-embedded-win32-arm64": "1.77.1", + "sass-embedded-win32-ia32": "1.77.1", + "sass-embedded-win32-x64": "1.77.1" }, "dependencies": { "@bufbuild/protobuf": "^1.0.0", From e07a8aeb8790ed0029d83108cb15d62e97ff9d41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 14:17:51 -0700 Subject: [PATCH 10/14] Bump minipass from 7.1.0 to 7.1.1 (#298) Bumps [minipass](https://github.com/isaacs/minipass) from 7.1.0 to 7.1.1. - [Changelog](https://github.com/isaacs/minipass/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/minipass/compare/v7.1.0...v7.1.1) --- updated-dependencies: - dependency-name: minipass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3666448a..54d1f47b 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "extract-zip": "^2.0.1", "gts": "^5.0.0", "jest": "^29.4.1", - "minipass": "7.1.0", + "minipass": "7.1.1", "npm-run-all": "^4.1.5", "shelljs": "^0.8.4", "source-map-js": "^1.0.2", From 38e7d6aaa114c03368a20ac247413349b31ef008 Mon Sep 17 00:00:00 2001 From: Sass Bot Date: Thu, 16 May 2024 22:24:52 +0000 Subject: [PATCH 11/14] Update Dart Sass version and release --- CHANGELOG.md | 14 ++++++++++++ npm/android-arm/package.json | 2 +- npm/android-arm64/package.json | 2 +- npm/android-ia32/package.json | 2 +- npm/android-x64/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ia32/package.json | 2 +- npm/linux-musl-arm/package.json | 2 +- npm/linux-musl-arm64/package.json | 2 +- npm/linux-musl-ia32/package.json | 2 +- npm/linux-musl-x64/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/win32-arm64/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- package.json | 38 +++++++++++++++---------------- 19 files changed, 50 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c306b1a..9d64f38c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +## 1.77.2 + +* Don't emit deprecation warnings for functions and mixins beginning with `__`. + +* Allow user-defined functions whose names begin with `_` and otherwise look + like vendor-prefixed functions with special CSS syntax. + +### Command-Line Interface + +* Properly handle the `--silence-deprecation` flag. + +* Handle the `--fatal-deprecation` and `--future-deprecation` flags for + `--interactive` mode. + ## 1.77.1 * Fix a crash that could come up with importers in certain contexts. diff --git a/npm/android-arm/package.json b/npm/android-arm/package.json index 6e800ddb..f1aae5f3 100644 --- a/npm/android-arm/package.json +++ b/npm/android-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm", - "version": "1.77.1", + "version": "1.77.2", "description": "The android-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index 7738b238..fd542236 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm64", - "version": "1.77.1", + "version": "1.77.2", "description": "The android-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-ia32/package.json b/npm/android-ia32/package.json index ef8c2a9e..df1671df 100644 --- a/npm/android-ia32/package.json +++ b/npm/android-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-ia32", - "version": "1.77.1", + "version": "1.77.2", "description": "The android-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-x64/package.json b/npm/android-x64/package.json index 2d107914..0cbebd1e 100644 --- a/npm/android-x64/package.json +++ b/npm/android-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-x64", - "version": "1.77.1", + "version": "1.77.2", "description": "The android-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 9af3e6dd..46614507 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-arm64", - "version": "1.77.1", + "version": "1.77.2", "description": "The darwin-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 748e4888..9c4e62ec 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-x64", - "version": "1.77.1", + "version": "1.77.2", "description": "The darwin-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 0be79f98..ae097dbb 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 8a3890b9..2781e211 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm64", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-ia32/package.json b/npm/linux-ia32/package.json index e2aee2cb..a307acff 100644 --- a/npm/linux-ia32/package.json +++ b/npm/linux-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-ia32", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm/package.json b/npm/linux-musl-arm/package.json index 364f86b1..f15d44a7 100644 --- a/npm/linux-musl-arm/package.json +++ b/npm/linux-musl-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-musl-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm64/package.json b/npm/linux-musl-arm64/package.json index ff7450fb..d896a146 100644 --- a/npm/linux-musl-arm64/package.json +++ b/npm/linux-musl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm64", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-musl-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-ia32/package.json b/npm/linux-musl-ia32/package.json index 79a3a881..9d46b1a1 100644 --- a/npm/linux-musl-ia32/package.json +++ b/npm/linux-musl-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-ia32", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-musl-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-x64/package.json b/npm/linux-musl-x64/package.json index f300636b..c63bab40 100644 --- a/npm/linux-musl-x64/package.json +++ b/npm/linux-musl-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-x64", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-musl-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 9c8dca04..c83e41b1 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-x64", - "version": "1.77.1", + "version": "1.77.2", "description": "The linux-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json index 768eaeca..6d7a2c6e 100644 --- a/npm/win32-arm64/package.json +++ b/npm/win32-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-arm64", - "version": "1.77.1", + "version": "1.77.2", "description": "The win32-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index ae302cb2..6f7d651e 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-ia32", - "version": "1.77.1", + "version": "1.77.2", "description": "The win32-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index aa7795a8..98b3db42 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-x64", - "version": "1.77.1", + "version": "1.77.2", "description": "The win32-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/package.json b/package.json index 54d1f47b..0508662d 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "sass-embedded", - "version": "1.77.1", + "version": "1.77.2", "protocol-version": "2.7.0", - "compiler-version": "1.77.1", + "compiler-version": "1.77.2", "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol", "repository": "sass/embedded-host-node", "author": "Google Inc.", @@ -35,23 +35,23 @@ "test": "jest" }, "optionalDependencies": { - "sass-embedded-android-arm": "1.77.1", - "sass-embedded-android-arm64": "1.77.1", - "sass-embedded-android-ia32": "1.77.1", - "sass-embedded-android-x64": "1.77.1", - "sass-embedded-darwin-arm64": "1.77.1", - "sass-embedded-darwin-x64": "1.77.1", - "sass-embedded-linux-arm": "1.77.1", - "sass-embedded-linux-arm64": "1.77.1", - "sass-embedded-linux-ia32": "1.77.1", - "sass-embedded-linux-x64": "1.77.1", - "sass-embedded-linux-musl-arm": "1.77.1", - "sass-embedded-linux-musl-arm64": "1.77.1", - "sass-embedded-linux-musl-ia32": "1.77.1", - "sass-embedded-linux-musl-x64": "1.77.1", - "sass-embedded-win32-arm64": "1.77.1", - "sass-embedded-win32-ia32": "1.77.1", - "sass-embedded-win32-x64": "1.77.1" + "sass-embedded-android-arm": "1.77.2", + "sass-embedded-android-arm64": "1.77.2", + "sass-embedded-android-ia32": "1.77.2", + "sass-embedded-android-x64": "1.77.2", + "sass-embedded-darwin-arm64": "1.77.2", + "sass-embedded-darwin-x64": "1.77.2", + "sass-embedded-linux-arm": "1.77.2", + "sass-embedded-linux-arm64": "1.77.2", + "sass-embedded-linux-ia32": "1.77.2", + "sass-embedded-linux-x64": "1.77.2", + "sass-embedded-linux-musl-arm": "1.77.2", + "sass-embedded-linux-musl-arm64": "1.77.2", + "sass-embedded-linux-musl-ia32": "1.77.2", + "sass-embedded-linux-musl-x64": "1.77.2", + "sass-embedded-win32-arm64": "1.77.2", + "sass-embedded-win32-ia32": "1.77.2", + "sass-embedded-win32-x64": "1.77.2" }, "dependencies": { "@bufbuild/protobuf": "^1.0.0", From 01ba13bcda04c05c5710a66d72b67131a09af318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 13:14:25 -0700 Subject: [PATCH 12/14] Bump minipass from 7.1.1 to 7.1.2 (#301) Bumps [minipass](https://github.com/isaacs/minipass) from 7.1.1 to 7.1.2. - [Changelog](https://github.com/isaacs/minipass/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/minipass/compare/v7.1.1...v7.1.2) --- updated-dependencies: - dependency-name: minipass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0508662d..ba3997d4 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "extract-zip": "^2.0.1", "gts": "^5.0.0", "jest": "^29.4.1", - "minipass": "7.1.1", + "minipass": "7.1.2", "npm-run-all": "^4.1.5", "shelljs": "^0.8.4", "source-map-js": "^1.0.2", From 002e8473d267b37e2cd17a69408a8a9b73134f9a Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Wed, 29 May 2024 14:24:08 -0700 Subject: [PATCH 13/14] Generate deprecations list from language repo (#300) --- lib/index.ts | 2 +- lib/src/deprecations.ts | 150 ++------------------------------------- lib/src/version.ts | 24 +++++++ tool/get-deprecations.ts | 67 +++++++++++++++++ tool/init.ts | 3 + 5 files changed, 101 insertions(+), 145 deletions(-) create mode 100644 lib/src/version.ts create mode 100644 tool/get-deprecations.ts diff --git a/lib/index.ts b/lib/index.ts index 96ce209b..e148d962 100644 --- a/lib/index.ts +++ b/lib/index.ts @@ -40,8 +40,8 @@ export { Deprecation, DeprecationOrId, DeprecationStatus, - Version, } from './src/deprecations'; +export {Version} from './src/version'; export {render, renderSync} from './src/legacy'; export const info = `sass-embedded\t${pkg.version}`; diff --git a/lib/src/deprecations.ts b/lib/src/deprecations.ts index 1c679573..e30527c4 100644 --- a/lib/src/deprecations.ts +++ b/lib/src/deprecations.ts @@ -2,33 +2,17 @@ // MIT-style license that can be found in the LICENSE file or at // https://opensource.org/licenses/MIT. -import * as api from './vendor/sass'; +import {deprecations} from './vendor/deprecations'; +import {Deprecation, DeprecationOrId} from './vendor/sass'; +import {Version} from './version'; +export {deprecations} from './vendor/deprecations'; export {Deprecation, DeprecationOrId, DeprecationStatus} from './vendor/sass'; -export class Version implements api.Version { - constructor( - readonly major: number, - readonly minor: number, - readonly patch: number - ) {} - static parse(version: string): Version { - const match = version.match(/^(\d+)\.(\d+)\.(\d+)$/); - if (match === null) { - throw new Error(`Invalid version ${version}`); - } - return new Version( - parseInt(match[1]), - parseInt(match[2]), - parseInt(match[3]) - ); - } -} - /** * Returns whether the given deprecation was active in the given version. */ -function isActiveIn(deprecation: api.Deprecation, version: Version) { +function isActiveIn(deprecation: Deprecation, version: Version) { const deprecatedIn = deprecation.deprecatedIn; if (deprecation.status !== 'active' || !deprecatedIn) return false; if (version.major > deprecatedIn.major) return true; @@ -43,7 +27,7 @@ function isActiveIn(deprecation: api.Deprecation, version: Version) { * that's ready to include in a CompileRequest. */ export function getDeprecationIds( - arr: (api.DeprecationOrId | Version)[] + arr: (DeprecationOrId | Version)[] ): string[] { return arr.flatMap(item => { if (item instanceof Version) { @@ -56,125 +40,3 @@ export function getDeprecationIds( return item.id; }); } - -export const deprecations: typeof api.deprecations = { - 'call-string': { - id: 'call-string', - status: 'active', - deprecatedIn: new Version(0, 0, 0), - obsoleteIn: null, - description: 'Passing a string directly to meta.call().', - }, - elseif: { - id: 'elseif', - status: 'active', - deprecatedIn: new Version(1, 3, 2), - obsoleteIn: null, - description: '@elseif.', - }, - 'moz-document': { - id: 'moz-document', - status: 'active', - deprecatedIn: new Version(1, 7, 2), - obsoleteIn: null, - description: '@-moz-document.', - }, - 'relative-canonical': { - id: 'relative-canonical', - status: 'active', - deprecatedIn: new Version(1, 14, 2), - obsoleteIn: null, - }, - 'new-global': { - id: 'new-global', - status: 'active', - deprecatedIn: new Version(1, 17, 2), - obsoleteIn: null, - description: 'Declaring new variables with !global.', - }, - 'color-module-compat': { - id: 'color-module-compat', - status: 'active', - deprecatedIn: new Version(1, 23, 0), - obsoleteIn: null, - description: - 'Using color module functions in place of plain CSS functions.', - }, - 'slash-div': { - id: 'slash-div', - status: 'active', - deprecatedIn: new Version(1, 33, 0), - obsoleteIn: null, - description: '/ operator for division.', - }, - 'bogus-combinators': { - id: 'bogus-combinators', - status: 'active', - deprecatedIn: new Version(1, 54, 0), - obsoleteIn: null, - description: 'Leading, trailing, and repeated combinators.', - }, - 'strict-unary': { - id: 'strict-unary', - status: 'active', - deprecatedIn: new Version(1, 55, 0), - obsoleteIn: null, - description: 'Ambiguous + and - operators.', - }, - 'function-units': { - id: 'function-units', - status: 'active', - deprecatedIn: new Version(1, 56, 0), - obsoleteIn: null, - description: 'Passing invalid units to built-in functions.', - }, - 'duplicate-var-flags': { - id: 'duplicate-var-flags', - status: 'active', - deprecatedIn: new Version(1, 62, 0), - obsoleteIn: null, - description: 'Using !default or !global multiple times for one variable.', - }, - 'null-alpha': { - id: 'null-alpha', - status: 'active', - deprecatedIn: new Version(1, 62, 3), - obsoleteIn: null, - description: 'Passing null as alpha in the JS API.', - }, - 'abs-percent': { - id: 'abs-percent', - status: 'active', - deprecatedIn: new Version(1, 65, 0), - obsoleteIn: null, - description: 'Passing percentages to the Sass abs() function.', - }, - 'fs-importer-cwd': { - id: 'fs-importer-cwd', - status: 'active', - deprecatedIn: new Version(1, 73, 0), - obsoleteIn: null, - description: - 'Using the current working directory as an implicit load path.', - }, - 'css-function-mixin': { - id: 'css-function-mixin', - status: 'active', - deprecatedIn: new Version(1, 76, 0), - obsoleteIn: null, - description: 'Function and mixin names beginning with --.', - }, - import: { - id: 'import', - status: 'future', - deprecatedIn: null, - obsoleteIn: null, - description: '@import rules.', - }, - 'user-authored': { - id: 'user-authored', - status: 'user', - deprecatedIn: null, - obsoleteIn: null, - }, -}; diff --git a/lib/src/version.ts b/lib/src/version.ts new file mode 100644 index 00000000..772b8258 --- /dev/null +++ b/lib/src/version.ts @@ -0,0 +1,24 @@ +// Copyright 2024 Google LLC. Use of this source code is governed by an +// MIT-style license that can be found in the LICENSE file or at +// https://opensource.org/licenses/MIT. + +import * as api from './vendor/sass'; + +export class Version implements api.Version { + constructor( + readonly major: number, + readonly minor: number, + readonly patch: number + ) {} + static parse(version: string): Version { + const match = version.match(/^(\d+)\.(\d+)\.(\d+)$/); + if (match === null) { + throw new Error(`Invalid version ${version}`); + } + return new Version( + parseInt(match[1]), + parseInt(match[2]), + parseInt(match[3]) + ); + } +} diff --git a/tool/get-deprecations.ts b/tool/get-deprecations.ts new file mode 100644 index 00000000..73618b4d --- /dev/null +++ b/tool/get-deprecations.ts @@ -0,0 +1,67 @@ +// Generates the list of deprecations from spec/deprecations.yaml in the +// language repo. + +import * as fs from 'fs'; +import {parse} from 'yaml'; + +interface YamlData { + [key: string]: { + description: string; + 'dart-sass': { + status: 'active' | 'future' | 'obsolete'; + deprecated?: string; + obsolete?: string; + }; + }; +} + +const yamlFile = 'build/sass/spec/deprecations.yaml'; + +/** + * Converts a version string in the form X.Y.Z to be code calling the Version + * constructor, or null if the string is undefined. + */ +function toVersionCode(version: string | undefined): string { + if (!version) return 'null'; + const match = version.match(/^(\d+)\.(\d+)\.(\d+)$/); + if (match === null) { + throw new Error(`Invalid version ${version}`); + } + return `new Version(${match[1]}, ${match[2]}, ${match[3]})`; +} + +/** + * Generates the list of deprecations based on the YAML file in the language + * repo. + */ +export async function getDeprecations(outDirectory: string) { + const yamlText = fs.readFileSync(yamlFile, 'utf8'); + + const deprecations = parse(yamlText) as YamlData; + let tsText = + "import {Deprecations} from './sass';\n" + + "import {Version} from '../version';\n\n" + + 'export const deprecations: Deprecations = {\n'; + for (const [id, deprecation] of Object.entries(deprecations)) { + const key = id.includes('-') ? `'${id}'` : id; + const dartSass = deprecation['dart-sass']; + tsText += + ` ${key}: {\n` + + ` id: '${id}',\n` + + ` description: '${deprecation.description}',\n` + + ` status: '${dartSass.status}',\n` + + ` deprecatedIn: ${toVersionCode(dartSass.deprecated)},\n` + + ` obsoleteIn: ${toVersionCode(dartSass.obsolete)},\n` + + ' },\n'; + } + tsText += + " 'user-authored': {\n" + + " id: 'user-authored',\n" + + " status: 'user',\n" + + ' deprecatedIn: null,\n' + + ' obsoleteIn: null,\n' + + ' },\n' + + '}\n'; + + fs.writeFileSync(`${outDirectory}/deprecations.ts`, tsText); +} diff --git a/tool/init.ts b/tool/init.ts index a178675f..230cd09d 100644 --- a/tool/init.ts +++ b/tool/init.ts @@ -4,6 +4,7 @@ import yargs from 'yargs'; +import {getDeprecations} from './get-deprecations'; import {getEmbeddedCompiler} from './get-embedded-compiler'; import {getLanguageRepo} from './get-language-repo'; @@ -65,6 +66,8 @@ void (async () => { await getEmbeddedCompiler(outPath); } } + + await getDeprecations(outPath); } catch (error) { console.error(error); process.exitCode = 1; From 82e15906f5cb14a45a3dc0ceb2014f3ff3d5af40 Mon Sep 17 00:00:00 2001 From: Sass Bot Date: Wed, 29 May 2024 21:58:49 +0000 Subject: [PATCH 14/14] Update Dart Sass version and release --- CHANGELOG.md | 8 +++++++ npm/android-arm/package.json | 2 +- npm/android-arm64/package.json | 2 +- npm/android-ia32/package.json | 2 +- npm/android-x64/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-arm/package.json | 2 +- npm/linux-arm64/package.json | 2 +- npm/linux-ia32/package.json | 2 +- npm/linux-musl-arm/package.json | 2 +- npm/linux-musl-arm64/package.json | 2 +- npm/linux-musl-ia32/package.json | 2 +- npm/linux-musl-x64/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/win32-arm64/package.json | 2 +- npm/win32-ia32/package.json | 2 +- npm/win32-x64/package.json | 2 +- package.json | 38 +++++++++++++++---------------- 19 files changed, 44 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d64f38c..d06b712f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.77.3 + +### Dart API + +* `Deprecation.duplicateVariableFlags` has been deprecated and replaced with + `Deprecation.duplicateVarFlags` to make it consistent with the + `duplicate-var-flags` name used on the command line and in the JS API. + ## 1.77.2 * Don't emit deprecation warnings for functions and mixins beginning with `__`. diff --git a/npm/android-arm/package.json b/npm/android-arm/package.json index f1aae5f3..31001aef 100644 --- a/npm/android-arm/package.json +++ b/npm/android-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm", - "version": "1.77.2", + "version": "1.77.3", "description": "The android-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index fd542236..849f79d7 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-arm64", - "version": "1.77.2", + "version": "1.77.3", "description": "The android-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-ia32/package.json b/npm/android-ia32/package.json index df1671df..beeeba0d 100644 --- a/npm/android-ia32/package.json +++ b/npm/android-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-ia32", - "version": "1.77.2", + "version": "1.77.3", "description": "The android-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/android-x64/package.json b/npm/android-x64/package.json index 0cbebd1e..825f950c 100644 --- a/npm/android-x64/package.json +++ b/npm/android-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-android-x64", - "version": "1.77.2", + "version": "1.77.3", "description": "The android-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 46614507..fcfc9f1d 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-arm64", - "version": "1.77.2", + "version": "1.77.3", "description": "The darwin-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 9c4e62ec..a3b9b1e3 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-darwin-x64", - "version": "1.77.2", + "version": "1.77.3", "description": "The darwin-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index ae097dbb..45f56274 100644 --- a/npm/linux-arm/package.json +++ b/npm/linux-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index 2781e211..61d82dd5 100644 --- a/npm/linux-arm64/package.json +++ b/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-arm64", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-ia32/package.json b/npm/linux-ia32/package.json index a307acff..82a27457 100644 --- a/npm/linux-ia32/package.json +++ b/npm/linux-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-ia32", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm/package.json b/npm/linux-musl-arm/package.json index f15d44a7..0ed6b12c 100644 --- a/npm/linux-musl-arm/package.json +++ b/npm/linux-musl-arm/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-musl-arm binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-arm64/package.json b/npm/linux-musl-arm64/package.json index d896a146..c7192ad7 100644 --- a/npm/linux-musl-arm64/package.json +++ b/npm/linux-musl-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-arm64", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-musl-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-ia32/package.json b/npm/linux-musl-ia32/package.json index 9d46b1a1..a6726169 100644 --- a/npm/linux-musl-ia32/package.json +++ b/npm/linux-musl-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-ia32", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-musl-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-musl-x64/package.json b/npm/linux-musl-x64/package.json index c63bab40..0d8d06d8 100644 --- a/npm/linux-musl-x64/package.json +++ b/npm/linux-musl-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-musl-x64", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-musl-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index c83e41b1..5db3156b 100644 --- a/npm/linux-x64/package.json +++ b/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-linux-x64", - "version": "1.77.2", + "version": "1.77.3", "description": "The linux-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json index 6d7a2c6e..9f6ee597 100644 --- a/npm/win32-arm64/package.json +++ b/npm/win32-arm64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-arm64", - "version": "1.77.2", + "version": "1.77.3", "description": "The win32-arm64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json index 6f7d651e..40fa2ee2 100644 --- a/npm/win32-ia32/package.json +++ b/npm/win32-ia32/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-ia32", - "version": "1.77.2", + "version": "1.77.3", "description": "The win32-ia32 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json index 98b3db42..21561855 100644 --- a/npm/win32-x64/package.json +++ b/npm/win32-x64/package.json @@ -1,6 +1,6 @@ { "name": "sass-embedded-win32-x64", - "version": "1.77.2", + "version": "1.77.3", "description": "The win32-x64 binary for sass-embedded", "repository": "sass/embedded-host-node", "author": "Google Inc.", diff --git a/package.json b/package.json index ba3997d4..b2f836a1 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "sass-embedded", - "version": "1.77.2", + "version": "1.77.3", "protocol-version": "2.7.0", - "compiler-version": "1.77.2", + "compiler-version": "1.77.3", "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol", "repository": "sass/embedded-host-node", "author": "Google Inc.", @@ -35,23 +35,23 @@ "test": "jest" }, "optionalDependencies": { - "sass-embedded-android-arm": "1.77.2", - "sass-embedded-android-arm64": "1.77.2", - "sass-embedded-android-ia32": "1.77.2", - "sass-embedded-android-x64": "1.77.2", - "sass-embedded-darwin-arm64": "1.77.2", - "sass-embedded-darwin-x64": "1.77.2", - "sass-embedded-linux-arm": "1.77.2", - "sass-embedded-linux-arm64": "1.77.2", - "sass-embedded-linux-ia32": "1.77.2", - "sass-embedded-linux-x64": "1.77.2", - "sass-embedded-linux-musl-arm": "1.77.2", - "sass-embedded-linux-musl-arm64": "1.77.2", - "sass-embedded-linux-musl-ia32": "1.77.2", - "sass-embedded-linux-musl-x64": "1.77.2", - "sass-embedded-win32-arm64": "1.77.2", - "sass-embedded-win32-ia32": "1.77.2", - "sass-embedded-win32-x64": "1.77.2" + "sass-embedded-android-arm": "1.77.3", + "sass-embedded-android-arm64": "1.77.3", + "sass-embedded-android-ia32": "1.77.3", + "sass-embedded-android-x64": "1.77.3", + "sass-embedded-darwin-arm64": "1.77.3", + "sass-embedded-darwin-x64": "1.77.3", + "sass-embedded-linux-arm": "1.77.3", + "sass-embedded-linux-arm64": "1.77.3", + "sass-embedded-linux-ia32": "1.77.3", + "sass-embedded-linux-x64": "1.77.3", + "sass-embedded-linux-musl-arm": "1.77.3", + "sass-embedded-linux-musl-arm64": "1.77.3", + "sass-embedded-linux-musl-ia32": "1.77.3", + "sass-embedded-linux-musl-x64": "1.77.3", + "sass-embedded-win32-arm64": "1.77.3", + "sass-embedded-win32-ia32": "1.77.3", + "sass-embedded-win32-x64": "1.77.3" }, "dependencies": { "@bufbuild/protobuf": "^1.0.0",