From d4d4a299de39685e59f256c81d8e60ce6efd8b23 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 1 Jan 2025 18:02:40 +0100 Subject: [PATCH] build: enable specifying custom sass compiler path by env-var Signed-off-by: Felix Buehler Signed-off-by: Christoph Heiss --- package.json | 7 ++++++- patches/sass-embedded.patch | 15 +++++++++++++++ pnpm-lock.yaml | 35 ++++++++++++++++++++--------------- 3 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 patches/sass-embedded.patch diff --git i/package.json w/package.json index 897b42e..7a91a85 100644 --- i/package.json +++ w/package.json @@ -32,6 +32,9 @@ "license": "Apache-2.0", "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af", "pnpm": { - "neverBuiltDependencies": [] + "neverBuiltDependencies": [], + "patchedDependencies": { + "sass-embedded": "patches/sass-embedded.patch" + } } } diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch new file mode 100644 index 0000000..f941a8e --- /dev/null +++ b/patches/sass-embedded.patch @@ -0,0 +1,15 @@ +diff --git a/dist/lib/src/compiler-path.js b/dist/lib/src/compiler-path.js +index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644 +--- a/dist/lib/src/compiler-path.js ++++ b/dist/lib/src/compiler-path.js +@@ -24,6 +24,10 @@ function isLinuxMusl(path) { + } + /** The full command for the embedded compiler executable. */ + exports.compilerCommand = (() => { ++ const binPath = process.env.SASS_EMBEDDED_BIN_PATH; ++ if (binPath) { ++ return [binPath]; ++ } + const platform = process.platform === 'linux' && isLinuxMusl(process.execPath) + ? 'linux-musl' + : process.platform; diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml index 5df58fb..bb27c4b 100644 --- i/pnpm-lock.yaml +++ w/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +patchedDependencies: + sass-embedded: + hash: 6wjvcsryx2tfkpottp4wf5nbzi + path: patches/sass-embedded.patch + importers: .: @@ -29,7 +34,7 @@ importers: version: 9.21.0 '@vitejs/plugin-vue': specifier: ^5.2.1 - version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13) + version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13) '@vue/eslint-config-prettier': specifier: ^10.2.0 version: 10.2.0(eslint@9.21.0)(prettier@3.5.2) @@ -50,13 +55,13 @@ importers: version: 3.5.2 sass-embedded: specifier: ^1.85.0 - version: 1.85.0 + version: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) vite: specifier: ^6.1.3 - version: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) + version: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) vite-plugin-pwa: specifier: ^0.21.1 - version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0) + version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0) packages: @@ -3477,9 +3482,9 @@ snapshots: '@types/trusted-types@2.0.7': {} - '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)': + '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)': dependencies: - vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) + vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) vue: 3.5.13 '@vue/compiler-core@3.5.13': @@ -4702,7 +4707,7 @@ snapshots: sass-embedded-win32-x64@1.85.0: optional: true - sass-embedded@1.85.0: + sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi): dependencies: '@bufbuild/protobuf': 2.2.3 buffer-builder: 0.2.0 @@ -5001,25 +5006,25 @@ snapshots: varint@6.0.0: {} - vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0): + vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0): dependencies: debug: 4.4.0 pretty-bytes: 6.1.1 tinyglobby: 0.2.12 - vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0) + vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0) workbox-build: 7.3.0 workbox-window: 7.3.0 transitivePeerDependencies: - supports-color - vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0): + vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0): dependencies: esbuild: 0.24.2 postcss: 8.5.3 rollup: 4.38.0 optionalDependencies: fsevents: 2.3.3 - sass-embedded: 1.85.0 + sass-embedded: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) terser: 5.39.0 yaml: 2.7.0