From 44592c7aa904599bdac9cd4f068df0343fa331b3 Mon Sep 17 00:00:00 2001 From: neobooru <50623835+neobooru@users.noreply.github.com> Date: Fri, 12 Aug 2022 02:20:39 +0200 Subject: [PATCH] Convert sign-xpi to be ESM compatible --- package.json | 2 +- scripts/{sign-xpi.cjs => sign-xpi.js} | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) rename scripts/{sign-xpi.cjs => sign-xpi.js} (56%) diff --git a/package.json b/package.json index 73acf74..97b861d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "build": "webpack --config webpack.prod.cjs", "build:dev": "webpack --config webpack.dev.cjs", "build-zip": "node scripts/build-zip.cjs", - "sign-xpi": "node scripts/sign-xpi.cjs", + "sign-xpi": "node scripts/sign-xpi.js", "watch": "webpack --watch --config webpack.dev.cjs", "lint": "eslint src" }, diff --git a/scripts/sign-xpi.cjs b/scripts/sign-xpi.js similarity index 56% rename from scripts/sign-xpi.cjs rename to scripts/sign-xpi.js index 1e9784b..3ba4874 100644 --- a/scripts/sign-xpi.cjs +++ b/scripts/sign-xpi.js @@ -1,15 +1,18 @@ #!/usr/bin/env node -const path = require("path"); -const { existsSync, renameSync } = require("fs"); -const { argv, exit } = require("process"); -const { signAddon } = require("sign-addon"); -const { version } = require("../package.json"); +import { fileURLToPath } from 'url'; +import { join } from "path"; +import { existsSync, renameSync } from "fs"; +import { argv, exit } from "process"; +import { signAddon } from 'sign-addon'; +import info from "../package.json" assert { type: "json" }; -const RELEASE_DIR = path.join(__dirname, "../release"); +const __dirname = fileURLToPath(new URL('.', import.meta.url)); +const version = info.version; +const RELEASE_DIR = join(__dirname, "../release"); async function main() { - const args = process.argv.slice(2); + const args = argv.slice(2); if (args.length != 3) { console.log("USAGE: yarn sign-zip "); exit(1); @@ -19,8 +22,8 @@ async function main() { const apiKey = args[1]; const apiSecret = args[2]; - const zipPath = path.join(RELEASE_DIR, `SzuruChrome-${version}.zip`); - const xpiPath = path.join(RELEASE_DIR, `SzuruChrome-${version}.xpi`); + const zipPath = join(RELEASE_DIR, `SzuruChrome-${version}.zip`); + const xpiPath = join(RELEASE_DIR, `SzuruChrome-${version}.xpi`); // Ensure the file exists. if (!existsSync(zipPath)) {