Remove broken launcher config from optional dependencies' package.json (#322)

ntkme · web-flow · commit 53abf9865d40 · 2024-08-01T20:09:48.000Z
diff --git a/npm/android-arm/package.json b/npm/android-arm/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "android"
   ],
diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "android"
   ],
diff --git a/npm/android-ia32/package.json b/npm/android-ia32/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "android"
   ],
diff --git a/npm/android-x64/package.json b/npm/android-x64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "android"
   ],
diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "darwin"
   ],
diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "darwin"
   ],
diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "linux"
   ],
diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "linux"
   ],
diff --git a/npm/linux-ia32/package.json b/npm/linux-ia32/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "linux"
   ],
diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass"
-  },
   "os": [
     "linux"
   ],
diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass.bat"
-  },
   "os": [
     "win32"
   ],
diff --git a/npm/win32-ia32/package.json b/npm/win32-ia32/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass.bat"
-  },
   "os": [
     "win32"
   ],
diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json
@@ -11,9 +11,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "bin": {
-    "sass": "./dart-sass/sass.bat"
-  },
   "os": [
     "win32"
   ],
diff --git a/tool/prepare-optional-release.ts b/tool/prepare-optional-release.ts
@@ -112,47 +112,6 @@ async function downloadRelease(options: {
   await fs.unlink(zippedAssetPath);
 }
 
-// Patch the launcher script if needed.
-//
-// For linux both `-linux-` and `-linux-musl-` packages will be installed
-// because npm doesn't know how to select packages based on LibC. To avoid
-// conflicts, only the `-linux-` packages have "bin" scripts defined in
-// package.json, which we patch to detect which LibC is available and launch the
-// correct binary.
-async function patchLauncherScript(
-  path: string,
-  dartPlatform: DartPlatform,
-  dartArch: DartArch
-) {
-  if (dartPlatform !== 'linux') return;
-
-  const scriptPath = p.join(path, 'dart-sass', 'sass');
-  console.log(`Patching ${scriptPath} script.`);
-
-  const shebang = Buffer.from('#!/bin/sh\n');
-  const buffer = await fs.readFile(scriptPath);
-  if (!buffer.subarray(0, shebang.length).equals(shebang)) {
-    throw new Error(`${scriptPath} is not a shell script!`);
-  }
-
-  const lines = buffer.toString('utf-8').split('\n');
-  const index = lines.findIndex(line => line.startsWith('path='));
-  if (index < 0) {
-    throw new Error(`The format of ${scriptPath} has changed!`);
-  }
-
-  lines.splice(
-    index + 1,
-    0,
-    '# Detect linux-musl',
-    'if grep -qm 1 /ld-musl- /proc/self/exe; then',
-    `  path="$path/../../sass-embedded-linux-musl-${dartArch}/dart-sass"`,
-    'fi'
-  );
-
-  await fs.writeFile(scriptPath, lines.join('\n'));
-}
-
 void (async () => {
   try {
     const version = pkg['compiler-version'] as string;
@@ -178,7 +137,6 @@ void (async () => {
         `${getArchiveExtension(dartPlatform)}`,
       outPath,
     });
-    await patchLauncherScript(outPath, dartPlatform, dartArch);
   } catch (error) {
     console.error(error);
     process.exitCode = 1;
