zotero-plugin 4.0.2 → 5.0.0

package/bin/release.js

@@ -8137,7 +8137,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
     "package.json"(exports, module) {
       module.exports = {
         name: "zotero-plugin",
-        version: "4.0.2",
+        version: "5.0.0",
         description: "Zotero plugin builder",
         homepage: "https://github.com/retorquere/zotero-plugin/wiki",
         bin: {
@@ -11509,8 +11509,12 @@ Expecting one of '${allowedValues.join("', '")}'`);
   process.on("unhandledRejection", (up) => {
     throw up;
   });
-  program.version(require_package2().version).option("-r, --release-message <value>", "add message to github release").option("-x, --xpi <value>", "xpi filename template", "{name}-{version}.xpi").option("-d, --dry-run", "dry run", !ContinuousIntegration.service).option("-p, --pre-release", "release is a pre-release").parse(process.argv);
+  program.version(require_package2().version).option("-r, --release-message <value>", "add message to github release").option("-x, --xpi <value>", "xpi filename template", "{name}-{version}.xpi").option("-d, --dry-run", "dry run", !ContinuousIntegration.service).option("-p, --pre-release", "release is a pre-release").option("-t, --tag", "tag for release", ContinuousIntegration.tag).parse(process.argv);
   var options = program.opts();
+  if (options.tag && options.tag !== ContinuousIntegration.tag) {
+    console.log("dry-run: tag specified manually, switching to dry-run mode");
+    options.dryRun = true;
+  }
   if (options.releaseMessage?.startsWith("@")) options.releaseMessage = fs2.readFileSync(options.releaseMessage.substring(1), "utf-8");
   var octokit = new Octokit2({ auth: `token ${process.env.GITHUB_TOKEN}` });
   var pkg = __require(path2.join(root_default, "package.json"));
@@ -11529,10 +11533,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
     console.log(`${options.dryRun ? "dry-run: " : ""}${msg}`);
   }
   if (ContinuousIntegration.pull_request) bail("Not releasing pull requests", 0);
-  if (ContinuousIntegration.tag) {
-    if (`v${pkg.version}` !== ContinuousIntegration.tag) bail(`Building tag ${ContinuousIntegration.tag}, but package version is ${pkg.version}`);
+  if (options.tag) {
+    if (`v${pkg.version}` !== options.tag) bail(`Building tag ${options.tag}, but package version is ${pkg.version}`);
     const releaseBranches = ["main", "master"].concat(pkg.xpi.releaseBranches || []);
-    if (ContinuousIntegration.branch && !releaseBranches.includes(ContinuousIntegration.branch)) bail(`Building tag ${ContinuousIntegration.tag}, but branch is ${ContinuousIntegration.branch}`);
+    if (ContinuousIntegration.branch && !releaseBranches.includes(ContinuousIntegration.branch)) bail(`Building tag ${options.tag}, but branch is ${ContinuousIntegration.branch}`);
   }
   var tags = /* @__PURE__ */ new Set();
   for (let regex = /(?:^|\s)(?:#)([a-zA-Z\d]+)/gm, tag; tag = regex.exec(ContinuousIntegration.commit_message); ) {
@@ -11547,13 +11551,13 @@ Expecting one of '${allowedValues.join("', '")}'`);
     if (tags.has("noannounce")) return;
     let build;
     let reason = "";
-    if (ContinuousIntegration.tag) {
+    if (options.tag) {
       build = `${options.preRelease ? "pre-" : ""}release ${ContinuousIntegration.tag}`;
     } else {
       build = `test build ${version_default}`;
     }
     const link = `[${build}](https://github.com/${owner}/${repo}/releases/download/${release.data.tag_name}/${pkg.name}-${version_default}.xpi)`;
-    if (!ContinuousIntegration.tag) {
+    if (!options.tag) {
       reason = ` (${JSON.stringify(ContinuousIntegration.commit_message)})`;
       reason += `
 
@@ -11568,7 +11572,7 @@ This update may name other issues, but the build just dropped here is for you; i
       await octokit.issues.createComment({ owner, repo, issue_number, body });
       if (locked) await octokit.issues.lock({ owner, repo, issue_number });
     } catch (error) {
-      console.log(`Failed to announce '${build}: ${reason}' on ${issue_number}`);
+      report(`Failed to announce '${build}: ${reason}' on ${issue_number}`);
     }
     if (process.env.GITHUB_ENV) fs2.appendFileSync(process.env.GITHUB_ENV, `XPI_RELEASED=${issue_number}
 `);
@@ -11619,13 +11623,17 @@ This update may name other issues, but the build just dropped here is for you; i
     const release = await getRelease(releases_tag, false);
     const assets = (await octokit.repos.listReleaseAssets({ owner, repo, release_id: release.data.id })).data;
     const updates = {
-      "update.rdf": !pkg.xpi.update || pkg.xpi.update.rdf ? "application/rdf+xml" : "",
-      "updates.json": !pkg.xpi.update || pkg.xpi.updates.json ? "application/json" : ""
+      "update.rdf": (pkg.xpi?.minVersion || "6").match(/^6/) ? "application/rdf+xml" : "",
+      "updates.json": (pkg.xpi?.maxVersion || "7").match(/^7/) ? "application/json" : ""
     };
     for (const asset of assets) {
       if (asset.name in updates && updates[asset.name]) {
         report(`removing ${asset.name} from ${release.data.tag_name}`);
-        if (!options.dryRun) await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+        if (options.dryRun) {
+          report(`update ${asset.name}`);
+        } else {
+          await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+        }
       }
     }
     for (const [pointer, mimetype] of Object.entries(updates)) {
@@ -11640,14 +11648,17 @@ This update may name other issues, but the build just dropped here is for you; i
       }
     }
     let release;
-    if (ContinuousIntegration.tag) {
+    if (options.tag) {
       try {
-        await octokit.repos.getReleaseByTag({ owner, repo, tag: ContinuousIntegration.tag });
-        bail(`release ${ContinuousIntegration.tag} exists, bailing`);
+        await octokit.repos.getReleaseByTag({ owner, repo, tag: options.tag });
+        if (!options.dryRun) bail(`release ${options.tag} exists, bailing`);
       } catch (err) {
       }
-      report(`uploading ${xpi} to new release ${ContinuousIntegration.tag}`);
-      if (!options.dryRun) {
+      if (options.dryRun) {
+        report(`create release ${options.tag}`);
+        report(`upload asset ${xpi}`);
+      } else {
+        report(`uploading ${xpi} to new release ${ContinuousIntegration.tag}`);
         release = await octokit.repos.createRelease({ owner, repo, tag_name: ContinuousIntegration.tag, prerelease: !!options.preRelease, body: options.releaseMessage || "" });
         await uploadAsset(release, path2.join(root_default, `xpi/${xpi}`), "application/vnd.zotero.plugin");
       }
@@ -11657,7 +11668,11 @@ This update may name other issues, but the build just dropped here is for you; i
       for (const asset of release.data.assets || []) {
         if (asset.name.endsWith(".xpi") && asset.created_at < EXPIRE_BUILDS) {
           report(`deleting ${asset.name}`);
-          if (!options.dryRun) await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+          if (options.dryRun) {
+            report(`delete asset ${asset.name}`);
+          } else {
+            await octokit.repos.deleteReleaseAsset({ owner, repo, asset_id: asset.id });
+          }
         }
       }
       await uploadAsset(release, path2.join(root_default, `xpi/${xpi}`), "application/vnd.zotero.plugin");

package/install.rdf.pug

@@ -25,5 +25,5 @@ RDF(xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.moz
     em:targetApplication
       Description
         em:id zotero@chnm.gmu.edu
-        em:minVersion #{zotero || '6.0.9'}
-        em:maxVersion 7.*
+        em:minVersion= minVersion
+        em:maxVersion= maxVersion

package/package.json

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

package/rdf.js

@@ -35,79 +35,83 @@ for (const translation of translations) {
         pkg.localizedDescriptions[locale] = description;
     }
 }
-const options_and_vars = Object.assign(Object.assign({}, pkg), { pretty: true });
+const options_and_vars = Object.assign(Object.assign({ minVersion: '6.0.9', maxVersion: '7.*' }, pkg), { pretty: true });
 try {
     Object.assign(options_and_vars, JSON.parse(fs.readFileSync(path.join(root_1.default, 'schema', 'supported.json'), 'utf8')));
 }
 catch (err) { // eslint-disable-line @typescript-eslint/no-unused-vars
     // ignore
 }
-let template;
-console.log('generating install.rdf');
-template = fs.readFileSync(path.join(__dirname, 'install.rdf.pug'), 'utf8');
-template = pug.render(template, options_and_vars);
-fs.writeFileSync(path.join(root_1.default, 'build/install.rdf'), template, { encoding: 'utf8' });
-console.log('generating update.rdf');
-template = fs.readFileSync(path.join(__dirname, 'update.rdf.pug'), 'utf8');
-template = pug.render(template, options_and_vars);
-fs.writeFileSync(path.join(root_1.default, 'gen/update.rdf'), template, { encoding: 'utf8' });
-console.log('generating updates.json');
-fs.writeFileSync(path.join(root_1.default, 'gen/updates.json'), JSON.stringify({
-    addons: {
-        [pkg.id]: {
-            updates: [
-                {
-                    version: options_and_vars.version,
-                    update_link: options_and_vars.updateLink,
-                    applications: {
-                        zotero: {
-                            strict_min_version: '6.999',
+if (options_and_vars.minVersion.match(/^6/)) {
+    let template;
+    console.log('generating install.rdf');
+    template = fs.readFileSync(path.join(__dirname, 'install.rdf.pug'), 'utf8');
+    template = pug.render(template, options_and_vars);
+    fs.writeFileSync(path.join(root_1.default, 'build/install.rdf'), template, { encoding: 'utf8' });
+    console.log('generating update.rdf');
+    template = fs.readFileSync(path.join(__dirname, 'update.rdf.pug'), 'utf8');
+    template = pug.render(template, options_and_vars);
+    fs.writeFileSync(path.join(root_1.default, 'gen/update.rdf'), template, { encoding: 'utf8' });
+}
+if (options_and_vars.maxVersion.match(/^7/)) {
+    console.log('generating updates.json');
+    fs.writeFileSync(path.join(root_1.default, 'gen/updates.json'), JSON.stringify({
+        addons: {
+            [pkg.id]: {
+                updates: [
+                    {
+                        version: options_and_vars.version,
+                        update_link: options_and_vars.updateLink,
+                        applications: {
+                            zotero: {
+                                strict_min_version: '6.999',
+                            },
                         },
                     },
-                },
-            ],
+                ],
+            },
         },
-    },
-}, null, 2));
-const icons = [
-    { 48: (_b = (_a = pkg.xpi) === null || _a === void 0 ? void 0 : _a.iconURL) === null || _b === void 0 ? void 0 : _b.replace(/^chrome:\/\/[^/]+\//, '') },
-].filter(i => i[48]);
-const basename = pkg.id.replace(/@.*/, '');
-for (const i of [`content/skin/${basename}.png`, `skin/${basename}.png`, `${basename}.png`, 'icon.png']) {
-    icons.push({ 48: i });
-    icons.push({ 48: i.replace('/zotero-', '/') });
-}
-for (const i of [...icons]) {
-    icons.push({ 48: i[48].replace(/[.](svg|png)$/, ext => ({ '.svg': '.png', '.png': '.svg' }[ext])) });
-}
-for (const i of [...icons]) {
-    if (i[48].endsWith('.svg')) {
-        i[96] = i[48];
+    }, null, 2));
+    const icons = [
+        { 48: (_b = (_a = pkg.xpi) === null || _a === void 0 ? void 0 : _a.iconURL) === null || _b === void 0 ? void 0 : _b.replace(/^chrome:\/\/[^/]+\//, '') },
+    ].filter(i => i[48]);
+    const basename = pkg.id.replace(/@.*/, '');
+    for (const i of [`content/skin/${basename}.png`, `skin/${basename}.png`, `${basename}.png`, 'icon.png']) {
+        icons.push({ 48: i });
+        icons.push({ 48: i.replace('/zotero-', '/') });
     }
-    else {
-        i[96] = i[48].replace(/([.][^.]+)$/, '@2x$1');
+    for (const i of [...icons]) {
+        icons.push({ 48: i[48].replace(/[.](svg|png)$/, ext => ({ '.svg': '.png', '.png': '.svg' }[ext])) });
     }
-}
-const icon = icons.find(i => fs.existsSync(path.join(root_1.default, ...i[48].split('/'))));
-if (icon) {
-    options_and_vars.icons = {
-        48: icon[48],
-        96: fs.existsSync(path.join(root_1.default, ...icon[96].split('/'))) ? icon[96] : icon[48],
-    };
-}
-console.log('generating manifest.json');
-fs.writeFileSync(path.join(root_1.default, 'build/manifest.json'), JSON.stringify({
-    manifest_version: 2,
-    name: options_and_vars.name,
-    version: options_and_vars.version,
-    description: options_and_vars.description,
-    icons: options_and_vars.icons,
-    applications: {
-        zotero: {
-            id: options_and_vars.id,
-            update_url: options_and_vars.updateURL.replace('/update.rdf', '/updates.json'),
-            strict_min_version: '6.999',
-            strict_max_version: '7.*',
+    for (const i of [...icons]) {
+        if (i[48].endsWith('.svg')) {
+            i[96] = i[48];
+        }
+        else {
+            i[96] = i[48].replace(/([.][^.]+)$/, '@2x$1');
+        }
+    }
+    const icon = icons.find(i => fs.existsSync(path.join(root_1.default, ...i[48].split('/'))));
+    if (icon) {
+        options_and_vars.icons = {
+            48: icon[48],
+            96: fs.existsSync(path.join(root_1.default, ...icon[96].split('/'))) ? icon[96] : icon[48],
+        };
+    }
+    console.log('generating manifest.json');
+    fs.writeFileSync(path.join(root_1.default, 'build/manifest.json'), JSON.stringify({
+        manifest_version: 2,
+        name: options_and_vars.name,
+        version: options_and_vars.version,
+        description: options_and_vars.description,
+        icons: options_and_vars.icons,
+        applications: {
+            zotero: {
+                id: options_and_vars.id,
+                update_url: options_and_vars.updateURL.replace('/update.rdf', '/updates.json'),
+                strict_min_version: '6.999',
+                strict_max_version: '7.*',
+            },
         },
-    },
-}, null, 2));
+    }, null, 2));
+}

package/update.rdf.pug

@@ -9,16 +9,16 @@ RDF:RDF(xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http:/
             em:targetApplication
               RDF:Description
                 em:id zotero@chnm.gmu.edu
-                em:minVersion 5.0
-                em:maxVersion 6.0.*
+                em:minVersion= minVersion
+                em:maxVersion= maxVersion
                 em:updateLink= updateLink
                 if updateInfoURL
                   em:updateInfoURL= updateInfoURL
             em:targetApplication
               RDF:Description
                 em:id juris-m@juris-m.github.io
-                em:minVersion 5.0
-                em:maxVersion 6.0.*
+                em:minVersion= minVersion
+                em:maxVersion= maxVersion
                 em:updateLink= updateLink
                 if updateInfoURL
                   em:updateInfoURL= updateInfoURL