supabase 1.26.6 → 1.26.8

package/README.md

@@ -49,25 +49,7 @@ brew upgrade supabase
 
 #### Windows
 
-Available via [Scoop](https://scoop.sh) and [Chocolatey](https://chocolatey.org).
-
-##### via Chocolatey
-
-To install:
-
-```powershell
-choco install supabase
-```
-
-To upgrade:
-
-```powershell
-choco upgrade supabase
-```
-
-##### via Scoop
-
-To install:
+Available via [Scoop](https://scoop.sh). To install:
 
 ```powershell
 scoop bucket add supabase https://github.com/supabase/scoop-bucket.git

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supabase",
-  "version": "1.26.6",
+  "version": "1.26.8",
   "description": "Supabase CLI",
   "repository": "supabase/cli",
   "homepage": "https://supabase.com/docs/reference/cli",
@@ -12,11 +12,10 @@
     "scripts"
   ],
   "scripts": {
-    "preinstall": "node scripts/preinstall.js"
+    "postinstall": "node scripts/postinstall.js"
   },
-  "url": "https://github.com/supabase/cli/releases/download/v{{version}}/{{bin_name}}_{{version}}_{{platform}}_{{arch}}.tar.gz",
-  "bin": "bin/supabase",
   "dependencies": {
+    "bin-links": "^4.0.1",
     "node-fetch": "^3.2.10",
     "tar": "6.1.13"
   },

package/scripts/postinstall.js

@@ -0,0 +1,110 @@
+#!/usr/bin/env node
+
+// Ref 1: https://github.com/sanathkr/go-npm
+// Ref 2: https://blog.xendit.engineer/how-we-repurposed-npm-to-publish-and-distribute-our-go-binaries-for-internal-cli-23981b80911b
+"use strict";
+
+import binLinks from "bin-links";
+import fs from "fs";
+import fetch from "node-fetch";
+import path from "path";
+import tar from "tar";
+import zlib from "zlib";
+
+// Mapping from Node's `process.arch` to Golang's `$GOARCH`
+const ARCH_MAPPING = {
+  x64: "amd64",
+  arm64: "arm64",
+};
+
+// Mapping between Node's `process.platform` to Golang's
+const PLATFORM_MAPPING = {
+  darwin: "darwin",
+  linux: "linux",
+  win32: "windows",
+};
+
+// TODO: import pkg from "../package.json" assert { type: "json" };
+const readPackageJson = async () => {
+  const packageJsonPath = path.join(".", "package.json");
+  const contents = await fs.promises.readFile(packageJsonPath);
+  return JSON.parse(contents);
+};
+
+const parsePackageJson = (packageJson) => {
+  const arch = ARCH_MAPPING[process.arch];
+  if (!arch) {
+    throw Error(
+      "Installation is not supported for this architecture: " + process.arch
+    );
+  }
+
+  const platform = PLATFORM_MAPPING[process.platform];
+  if (!platform) {
+    throw Error(
+      "Installation is not supported for this platform: " + process.platform
+    );
+  }
+
+  // Build the download url from package.json
+  const pkgName = packageJson.name;
+  const version = packageJson.version;
+  const repo = packageJson.repository;
+  const url = `https://github.com/${repo}/releases/download/v${version}/${pkgName}_${version}_${platform}_${arch}.tar.gz`;
+
+  let binPath = path.join("bin", "supabase");
+  if (platform == "windows") {
+    binPath += ".exe";
+  }
+
+  return { binPath, url };
+};
+
+const errGlobal = `Installing Supabase CLI as a global module is not supported.
+Please use one of the supported package managers: https://github.com/supabase/cli#install-the-cli
+`;
+
+/**
+ * Reads the configuration from application's package.json,
+ * downloads the binary from package url and stores at
+ * ./bin in the package's root.
+ *
+ *  See: https://docs.npmjs.com/files/package.json#bin
+ */
+async function main() {
+  const yarnGlobal = JSON.parse(
+    process.env.npm_config_argv || "{}"
+  ).original?.includes("global");
+  if (process.env.npm_config_global || yarnGlobal) {
+    throw errGlobal;
+  }
+
+  const pkg = await readPackageJson();
+  const { binPath, url } = parsePackageJson(pkg);
+  const binDir = path.dirname(binPath);
+  await fs.promises.mkdir(binDir, { recursive: true });
+
+  // First we will Un-GZip, then we will untar.
+  const ungz = zlib.createGunzip();
+  const binName = path.basename(binPath);
+  const untar = tar.x({ cwd: binDir }, [binName]);
+
+  console.info("Downloading", url);
+  const resp = await fetch(url);
+  resp.body.pipe(ungz).pipe(untar);
+  await new Promise((resolve, reject) => {
+    untar.on("error", reject);
+    untar.on("end", () => resolve());
+  });
+
+  // Link the binaries in postinstall to support yarn
+  await binLinks({
+    path: path.resolve("."),
+    pkg: { ...pkg, bin: { [pkg.name]: binPath } },
+  });
+
+  // TODO: verify checksums
+  console.info("Installed Supabase CLI successfully");
+}
+
+await main();

package/scripts/preinstall.js

@@ -1,135 +0,0 @@
-#!/usr/bin/env node
-
-// Ref 1: https://github.com/sanathkr/go-npm
-// Ref 2: https://blog.xendit.engineer/how-we-repurposed-npm-to-publish-and-distribute-our-go-binaries-for-internal-cli-23981b80911b
-"use strict";
-
-import fetch from "node-fetch";
-import path from "path";
-import tar from "tar";
-import zlib from "zlib";
-import fs from "fs";
-
-// Mapping from Node's `process.arch` to Golang's `$GOARCH`
-const ARCH_MAPPING = {
-  x64: "amd64",
-  arm64: "arm64",
-};
-
-// Mapping between Node's `process.platform` to Golang's
-const PLATFORM_MAPPING = {
-  darwin: "darwin",
-  linux: "linux",
-  win32: "windows",
-};
-
-function validateConfiguration(packageJson) {
-  if (!packageJson.name) {
-    return "'name' property must be specified";
-  }
-
-  if (!packageJson.version) {
-    return "'version' property must be specified";
-  }
-
-  if (!packageJson.bin) {
-    return "'bin' property must be specified";
-  }
-
-  if (!packageJson.url) {
-    return "'url' property must be specified";
-  }
-}
-
-async function parsePackageJson() {
-  if (!ARCH_MAPPING[process.arch]) {
-    throw Error(
-      "Installation is not supported for this architecture: " + process.arch
-    );
-  }
-
-  if (!PLATFORM_MAPPING[process.platform]) {
-    throw Error(
-      "Installation is not supported for this platform: " + process.platform
-    );
-  }
-
-  const packageJsonPath = path.join(".", "package.json");
-  const contents = await fs.promises.readFile(packageJsonPath);
-  const packageJson = JSON.parse(contents);
-  const error = validateConfiguration(packageJson);
-  if (error) {
-    throw Error("Invalid package.json: " + error);
-  }
-
-  // We have validated the config. It exists in all its glory
-  const pkgName = packageJson.name.toString();
-  const bin = packageJson.bin.toString();
-  const binName = path.basename(bin);
-  const binPath = path.dirname(bin);
-  let url = packageJson.url.toString();
-  let version = packageJson.version.toString();
-
-  // strip the 'v' if necessary v0.0.1 => 0.0.1
-  if (version[0] === "v") version = version.substr(1);
-
-  // Interpolate variables in URL, if necessary
-  url = url.replace(/{{arch}}/g, ARCH_MAPPING[process.arch]);
-  url = url.replace(/{{platform}}/g, PLATFORM_MAPPING[process.platform]);
-  url = url.replace(/{{version}}/g, version);
-  url = url.replace(/{{bin_name}}/g, binName);
-
-  return { pkgName, binName, binPath, url, version };
-}
-
-const errGlobal = `Installing Supabase CLI as a global module is not supported.
-Please use one of the supported package managers: https://github.com/supabase/cli#install-the-cli
-`;
-
-/**
- * Reads the configuration from application's package.json,
- * validates properties, copied the binary from the package and stores at
- * ./bin in the package's root.
- *
- *  See: https://docs.npmjs.com/files/package.json#bin
- */
-async function main() {
-  if (process.env.npm_config_global) {
-    throw errGlobal;
-  }
-
-  const opts = await parsePackageJson();
-  await fs.promises.mkdir(opts.binPath, { recursive: true });
-
-  // First we will Un-GZip, then we will untar.
-  const ungz = zlib.createGunzip();
-  // Binary name on Windows has .exe suffix
-  const ext = process.platform === "win32" ? ".exe" : "";
-  const untar = tar.x({ cwd: opts.binPath }, [opts.binName + ext]);
-
-  console.info("Downloading", opts.url);
-  const resp = await fetch(opts.url);
-  resp.body.pipe(ungz).pipe(untar);
-  await new Promise((resolve, reject) => {
-    untar.on("error", reject);
-    untar.on("end", () => resolve());
-  });
-
-  // Creates a hardlink for npm to find the binary on Windows
-  if (ext) {
-    const bin = path.join(opts.binPath, opts.binName);
-    await fs.promises.link(bin + ext, bin);
-  }
-
-  // Copy binary because yarn runs as postinstall
-  if (process.env.npm_config_user_agent.startsWith("yarn/")) {
-    const src = path.join("..", opts.pkgName, opts.binPath, opts.binName);
-    const dst = path.join("..", ".bin", opts.binName);
-    await fs.promises.symlink(src, dst);
-  }
-
-  // TODO: verify checksums
-  console.info("Installed Supabase CLI successfully");
-}
-
-await main();