Merge remote-tracking branch 'origin/main' into merge-main

CHANGELOG.md

@@ -1,3 +1,57 @@
+## 1.69.5
+
+### JS API
+
+* Compatibility with Node.js 21.0.0.
+
+## 1.69.4
+
+* No user-visible changes.
+
+## 1.69.3
+
+### Embedded Sass
+
+* Fix TypeScript type locations in `package.json`.
+
+## 1.69.2
+
+### JS API
+
+* Fix a bug where Sass crashed when running in the browser if there was a global
+  variable named `process`.
+
+## 1.69.1
+
+* No user-visible changes.
+
+## 1.69.0
+
+* Add a `meta.get-mixin()` function that returns a mixin as a first-class Sass
+  value.
+
+* Add a `meta.apply()` mixin that includes a mixin value.
+
+* Add a `meta.module-mixins()` function which returns a map from mixin names in
+  a module to the first-class mixins that belong to those names.
+
+* Add a `meta.accepts-content()` function which returns whether or not a mixin
+  value can take a content block.
+
+* Add support for the relative color syntax from CSS Color 5. This syntax
+  cannot be used to create Sass color values. It is always emitted as-is in the
+  CSS output.
+
+### Dart API
+
+* Deprecate `Deprecation.calcInterp` since it was never actually emitted as a
+  deprecation.
+
+### Embedded Sass
+
+* Fix a rare race condition where the embedded compiler could freeze when a
+  protocol error was immediately followed by another request.
+
 ## 1.68.0
 
 * Fix the source spans associated with the `abs-percent` deprecation.

npm/darwin-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-darwin-arm64",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The darwin-arm64 binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

npm/darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-darwin-x64",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The darwin-x64 binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

npm/linux-arm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-linux-arm",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The linux-arm binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

npm/linux-arm64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-linux-arm64",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The linux-arm64 binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

npm/linux-ia32/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-linux-ia32",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The linux-ia32 binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

npm/linux-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-linux-x64",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The linux-x64 binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

npm/win32-ia32/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-win32-ia32",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The win32-ia32 binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

npm/win32-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-embedded-win32-x64",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "description": "The win32-x64 binary for sass-embedded",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",

package.json

@@ -1,18 +1,18 @@
 {
   "name": "sass-embedded",
-  "version": "1.68.0",
+  "version": "1.69.5",
   "protocol-version": "2.3.0",
-  "compiler-version": "1.68.0",
+  "compiler-version": "1.69.5",
   "description": "Node.js library that communicates with Embedded Dart Sass using the Embedded Sass protocol",
   "repository": "sass/embedded-host-node",
   "author": "Google Inc.",
   "license": "MIT",
   "exports": {
     "import": {
-      "types": "./dist/lib/index.m.d.ts",
+      "types": "./dist/types/index.m.d.ts",
       "default": "./dist/lib/index.mjs"
     },
-    "types": "./dist/lib/index.d.ts",
+    "types": "./dist/types/index.d.ts",
     "default": "./dist/lib/index.js"
   },
   "main": "dist/lib/index.js",
@@ -35,14 +35,14 @@
     "test": "jest"
   },
   "optionalDependencies": {
-    "sass-embedded-darwin-arm64": "1.68.0",
-    "sass-embedded-darwin-x64": "1.68.0",
-    "sass-embedded-linux-arm": "1.68.0",
-    "sass-embedded-linux-arm64": "1.68.0",
-    "sass-embedded-linux-ia32": "1.68.0",
-    "sass-embedded-linux-x64": "1.68.0",
-    "sass-embedded-win32-ia32": "1.68.0",
-    "sass-embedded-win32-x64": "1.68.0"
+    "sass-embedded-darwin-arm64": "1.69.5",
+    "sass-embedded-darwin-x64": "1.69.5",
+    "sass-embedded-linux-arm": "1.69.5",
+    "sass-embedded-linux-arm64": "1.69.5",
+    "sass-embedded-linux-ia32": "1.69.5",
+    "sass-embedded-linux-x64": "1.69.5",
+    "sass-embedded-win32-ia32": "1.69.5",
+    "sass-embedded-win32-x64": "1.69.5"
   },
   "dependencies": {
     "@bufbuild/protobuf": "^1.0.0",

tool/prepare-release.ts

@@ -15,11 +15,12 @@ void (async () => {
     await getLanguageRepo('lib/src/vendor');
 
     console.log('Transpiling TS into dist.');
-    shell.exec('tsc');
+    shell.exec('tsc -p tsconfig.build.json');
     shell.cp('lib/index.mjs', 'dist/lib/index.mjs');
 
     console.log('Copying JS API types to dist.');
     shell.cp('-R', 'lib/src/vendor/sass', 'dist/types');
+    shell.cp('dist/types/index.d.ts', 'dist/types/index.m.d.ts');
     await fs.unlink('dist/types/README.md');
 
     console.log('Ready for publishing to npm.');