zotero-plugin 6.0.0 → 6.0.2

package/bin/fetch-log.mjs

@@ -11,7 +11,7 @@ import { Entry as KeyRingEntry } from "@napi-rs/keyring";
 import prompts from "prompts";
 
 // package.json
-var version = "6.0.0";
+var version = "6.0.2";
 
 // bin/crypto.ts
 import crypto from "crypto";

package/bin/release.mjs

@@ -15,7 +15,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "zotero-plugin",
-      version: "6.0.0",
+      version: "6.0.2",
       description: "Zotero plugin builder",
       homepage: "https://github.com/retorquere/zotero-plugin/wiki",
       bin: {
@@ -208,12 +208,15 @@ import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
 var version = null;
+function load(vpath) {
+  return JSON.parse(fs.readFileSync(vpath, "utf-8")).version;
+}
 var version_json = path.join(root_default, "gen/version.json");
 if (fs.existsSync(version_json)) {
-  version = __require(version_json).version;
+  version = load(version_json);
 } else {
   console.log("writing version");
-  version = __require(path.join(root_default, "package.json")).version;
+  version = load(path.join(root_default, "package.json"));
   if (ContinuousIntegration.service && !ContinuousIntegration.tag) {
     const issue = ContinuousIntegration.issue && process.env.VERSION_WITH_ISSUE !== "false" ? `.${ContinuousIntegration.issue}` : "";
     version = `${version}${issue}.${ContinuousIntegration.build_number}`;

package/bin/zipup.mjs

@@ -1,13 +1,7 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // bin/zipup.ts
-import * as archiver from "archiver";
+import archiver from "archiver";
 import * as fs2 from "fs";
 import * as path2 from "path";
 
@@ -74,12 +68,15 @@ var ContinuousIntegration = new ContinuousIntegrationSingleton();
 
 // version.ts
 var version = null;
+function load(vpath) {
+  return JSON.parse(fs.readFileSync(vpath, "utf-8")).version;
+}
 var version_json = path.join(root_default, "gen/version.json");
 if (fs.existsSync(version_json)) {
-  version = __require(version_json).version;
+  version = load(version_json);
 } else {
   console.log("writing version");
-  version = __require(path.join(root_default, "package.json")).version;
+  version = load(path.join(root_default, "package.json"));
   if (ContinuousIntegration.service && !ContinuousIntegration.tag) {
     const issue = ContinuousIntegration.issue && process.env.VERSION_WITH_ISSUE !== "false" ? `.${ContinuousIntegration.issue}` : "";
     version = `${version}${issue}.${ContinuousIntegration.build_number}`;
@@ -97,7 +94,32 @@ var xpi = path2.join(root_default, "xpi", `${target}-${version_default}.xpi`);
 console.log(`creating ${xpi}`);
 if (fs2.existsSync(xpi)) fs2.unlinkSync(xpi);
 if (!fs2.existsSync(path2.dirname(xpi))) fs2.mkdirSync(path2.dirname(xpi));
-var archive = archiver.create("zip", {});
-archive.pipe(fs2.createWriteStream(xpi));
-archive.directory(`${root_default}/${source}`, false);
-archive.finalize();
+async function main() {
+  await new Promise((resolve, reject) => {
+    const xpi2 = path2.join(root_default, "xpi", `${target}-${version_default}.xpi`);
+    const output = fs2.createWriteStream(xpi2);
+    const archive = archiver("zip", { zlib: { level: 9 } });
+    output.on("close", () => {
+      console.log(archive.pointer() + " total bytes");
+      console.log("Archiver has been finalized and the output file descriptor has closed.");
+      resolve();
+    });
+    archive.on("warning", (err) => {
+      if (err.code === "ENOENT") {
+        console.warn(err.message);
+      } else {
+        console.error(err);
+      }
+    });
+    archive.on("error", (err) => {
+      reject(err);
+    });
+    archive.pipe(output);
+    archive.directory(`${root_default}/${source}`, false);
+    archive.finalize();
+  });
+}
+main().catch((err) => {
+  console.log(err);
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Zotero plugin builder",
   "homepage": "https://github.com/retorquere/zotero-plugin/wiki",
   "bin": {

package/version.js

@@ -8,14 +8,16 @@ const path = tslib_1.__importStar(require("path"));
 const continuous_integration_1 = require("./continuous-integration");
 const root_1 = tslib_1.__importDefault(require("./root"));
 let version = null;
+function load(vpath) {
+    return JSON.parse(fs.readFileSync(vpath, 'utf-8')).version;
+}
 const version_json = path.join(root_1.default, 'gen/version.json');
 if (fs.existsSync(version_json)) {
-    version = require(version_json).version; // eslint-disable-line @typescript-eslint/no-require-imports
+    version = load(version_json);
 }
 else {
     console.log('writing version');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
-    version = require(path.join(root_1.default, 'package.json')).version; // eslint-disable-line @typescript-eslint/no-require-imports
+    version = load(path.join(root_1.default, 'package.json'));
     if (continuous_integration_1.ContinuousIntegration.service && !continuous_integration_1.ContinuousIntegration.tag) {
         const issue = continuous_integration_1.ContinuousIntegration.issue && process.env.VERSION_WITH_ISSUE !== 'false' ? `.${continuous_integration_1.ContinuousIntegration.issue}` : '';
         version = `${version}${issue}.${continuous_integration_1.ContinuousIntegration.build_number}`;