Update Sass to 1.83.1 (#590)

stenciljs · Jan 7, 2025 · 61ac438 · 61ac438
1 parent 9f99928
commit 61ac438
Show file tree

Hide file tree

Showing 9 changed files with 1,038 additions and 593 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,17 +31,17 @@
   },
   "devDependencies": {
     "@ionic/prettier-config": "^4.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.0",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-typescript": "^12.1.2",
     "@stencil/core": "^4.0.0",
     "@types/jest": "^29.0.0",
     "@types/node": "^20.2.0",
     "jest": "^29.0.0",
     "np": "^10.0.0",
     "prettier": "^3.0.0",
-    "rimraf": "^6.0.0",
-    "rollup": "^4.0.0",
-    "sass": "^1.58.3",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.30.1",
+    "sass-embedded": "^1.83.1",
     "terser": "^5.3.8",
     "ts-jest": "^29.0.0",
     "typescript": "~5.0.0"

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -1,5 +1,4 @@
 import fs from 'node:fs/promises'
-import pluginSass from './rollup.plugin.sass.mjs';
 import typescript from '@rollup/plugin-typescript';
 import rollupResolve from '@rollup/plugin-node-resolve';
 
@@ -14,13 +13,13 @@ export default {
 
   plugins: [
     typescript(),
-    pluginSass(),
     rollupResolve({
       preferBuiltins: true
     }),
   ],
 
   external: [
+    "sass-embedded",
     'fs',
     'path'
   ],

diff --git a/rollup.plugin.sass.mjs b/rollup.plugin.sass.mjs
diff --git a/src/diagnostics.ts b/src/diagnostics.ts
@@ -1,4 +1,4 @@
-import { LegacyException } from 'sass';
+import type { LegacyException } from 'sass-embedded';
 import * as d from './declarations';
 
 /**

diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import { type LegacyException, type LegacyResult, render } from 'sass';
+import { type LegacyException, type LegacyResult, render } from 'sass-embedded';
 
 import * as d from './declarations';
 import { loadDiagnostic } from './diagnostics';

diff --git a/src/util.ts b/src/util.ts
@@ -1,6 +1,5 @@
 import path from 'node:path';
-import type { LegacyAsyncImporter, LegacyImporterResult } from 'sass';
-import type { LegacyOptions } from 'sass/types/legacy/options';
+import type { LegacyAsyncImporter, LegacyImporterResult, LegacyOptions } from 'sass-embedded';
 
 import * as d from './declarations';
 
@@ -147,6 +146,8 @@ export function getRenderOptions(
     renderOpts.importer = importers;
   }
 
+  renderOpts.silenceDeprecations = [...(renderOpts.silenceDeprecations ?? []), 'legacy-js-api'];
+
   return renderOpts;
 }
 

diff --git a/test/fixtures/sass/test-b.sass b/test/fixtures/sass/test-b.sass
@@ -1,4 +1,4 @@
-@import 'variables'
+@use 'variables'
 
 body
-  color: $color
+  color: variables.$color
diff --git a/test/fixtures/scss/test-b.scss b/test/fixtures/scss/test-b.scss
@@ -1,5 +1,5 @@
-@import 'variables';
+@use 'variables';
 
 body {
-  color: $color;
-}
+  color: variables.$color;
+}