Skip to content

Commit 785cade

Browse files
Upgrade lightningcss (#17043)
Part of #15897
1 parent 9ddeb09 commit 785cade

File tree

4 files changed

+129
-83
lines changed

4 files changed

+129
-83
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"packageManager": "[email protected]",
6464
"pnpm": {
6565
"patchedDependencies": {
66-
"[email protected].1": "patches/[email protected].1.patch",
66+
"[email protected].2": "patches/[email protected].2.patch",
6767
"@parcel/[email protected]": "patches/@[email protected]"
6868
}
6969
}
Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
diff --git a/node/index.js b/node/index.js
2-
index a9f2f6d5f3394329fcf8bc06af549030c01167a5..db3b1c6cab5e4bac140d2f7a2b2e041d9a0a8a36 100644
2+
index 011d04b450687083e7a0ec9023c41ee79104831c..ef26db49d98c60b5b31f3601f6ad045f0b0e8f4f 100644
33
--- a/node/index.js
44
+++ b/node/index.js
5-
@@ -1,27 +1,43 @@
5+
@@ -1,28 +1,41 @@
66
-let parts = [process.platform, process.arch];
77
-if (process.platform === 'linux') {
8-
- const { MUSL, family } = require('detect-libc');
8+
- const { MUSL, familySync } = require('detect-libc');
9+
- const family = familySync();
910
- if (family === MUSL) {
1011
- parts.push('musl');
1112
- } else if (process.arch === 'arm') {
@@ -17,18 +18,18 @@ index a9f2f6d5f3394329fcf8bc06af549030c01167a5..db3b1c6cab5e4bac140d2f7a2b2e041d
1718
- parts.push('msvc');
1819
-}
1920
+function loadPackage() {
20-
+ if (process.platform === "linux") {
21+
+ if (process.platform === 'linux') {
2122
+ if (process.env.PLATFORM_LIBC === 'musl') {
22-
+ return require(`lightningcss-${process.platform}-${process.arch}-musl`);
23+
+ return require(`lightningcss-${process.platform}-${process.arch}-musl`)
2324
+ } else if (process.env.PLATFORM_LIBC === 'glibc') {
24-
+ if (process.arch === "arm") {
25-
+ return require(`lightningcss-${process.platform}-${process.arch}-gnueabihf`);
25+
+ if (process.arch === 'arm') {
26+
+ return require(`lightningcss-${process.platform}-${process.arch}-gnueabihf`)
2627
+ } else {
27-
+ return require(`lightningcss-${process.platform}-${process.arch}-gnu`);
28+
+ return require(`lightningcss-${process.platform}-${process.arch}-gnu`)
2829
+ }
2930
+ } else {
3031
+ let { MUSL, GLIBC, family, familySync } = require('detect-libc')
31-
32+
3233
-if (process.env.CSS_TRANSFORMER_WASM) {
3334
- module.exports = require(`../pkg`);
3435
-} else {
@@ -42,30 +43,28 @@ index a9f2f6d5f3394329fcf8bc06af549030c01167a5..db3b1c6cab5e4bac140d2f7a2b2e041d
4243
+ if (typeof familySync === 'function') family = familySync()
4344
+
4445
+ if (family === MUSL) {
45-
+ return require(`lightningcss-${process.platform}-${process.arch}-musl`);
46+
+ return require(`lightningcss-${process.platform}-${process.arch}-musl`)
4647
+ } else if (family === GLIBC) {
47-
+ if (process.arch === "arm") {
48-
+ return require(`lightningcss-${process.platform}-${process.arch}-gnueabihf`);
48+
+ if (process.arch === 'arm') {
49+
+ return require(`lightningcss-${process.platform}-${process.arch}-gnueabihf`)
4950
+ } else {
50-
+ return require(`lightningcss-${process.platform}-${process.arch}-gnu`);
51+
+ return require(`lightningcss-${process.platform}-${process.arch}-gnu`)
5152
+ }
5253
+ } else {
53-
+ throw new Error(
54-
+ `Unsupported libc on: ${process.platform}-${process.arch}`
55-
+ );
54+
+ throw new Error(`Unsupported libc on: ${process.platform}-${process.arch}`)
5655
+ }
5756
+ }
58-
+ } else if (process.platform === "win32") {
59-
+ return require(`lightningcss-${process.platform}-${process.arch}-msvc`);
57+
+ } else if (process.platform === 'win32') {
58+
+ return require(`lightningcss-${process.platform}-${process.arch}-msvc`)
6059
+ } else {
61-
+ return require(`lightningcss-${process.platform}-${process.arch}`);
60+
+ return require(`lightningcss-${process.platform}-${process.arch}`)
6261
}
6362
}
64-
63+
6564
-module.exports.browserslistToTargets = require('./browserslistToTargets');
6665
-module.exports.composeVisitors = require('./composeVisitors');
6766
-module.exports.Features = require('./flags').Features;
68-
+module.exports = loadPackage();
69-
+module.exports.browserslistToTargets = require("./browserslistToTargets");
70-
+module.exports.composeVisitors = require("./composeVisitors");
71-
+module.exports.Features = require("./flags").Features;
67+
+module.exports = loadPackage()
68+
+module.exports.browserslistToTargets = require('./browserslistToTargets')
69+
+module.exports.composeVisitors = require('./composeVisitors')
70+
+module.exports.Features = require('./flags').Features

0 commit comments

Comments
 (0)