zotero-plugin-scaffold 0.0.24 → 0.0.27

package/dist/cli.mjs

@@ -24,14 +24,15 @@ import 'chokidar';
 import 'process';
 
 const name = "zotero-plugin-scaffold";
-const version = "0.0.24";
+const version = "0.0.27";
 const description = "A scaffold for Zotero plugin development.";
 const scripts = {
 	dev: "unbuild --stub",
 	build: "tsc --noEmit && unbuild",
-	lint: "eslint --max-warnings=0 . && prettier --check .",
-	"lint:fix": "eslint --fix . && prettier --write .",
+	lint: "eslint . & prettier --check .",
+	"lint:fix": "eslint --fix . & prettier --write .",
 	release: "bumpp --commit \"chore(release): publish v%s\"",
+	"update:deps": "pnpx taze minor -w -f -l",
 	test: "echo \"Error: no test specified\" && exit 1"
 };
 const type = "module";
@@ -78,27 +79,27 @@ const directories = {
 const engines = {
 	node: ">=18"
 };
-const packageManager = "pnpm@9.1.1";
+const packageManager = "pnpm@9.1.3";
 const dependencies = {
-	"@inquirer/prompts": "5.0.3",
+	"@inquirer/prompts": "5.0.4",
 	bumpp: "9.4.1",
 	c12: "1.10.0",
 	chalk: "5.3.0",
 	chokidar: "3.6.0",
-	commander: "12.0.0",
+	commander: "12.1.0",
 	consola: "3.2.3",
 	"conventional-changelog": "6.0.0",
-	esbuild: "0.21.2",
+	esbuild: "0.21.4",
 	"fast-glob": "3.3.2",
 	"fs-extra": "11.2.0",
 	hookable: "5.5.3",
 	mime: "4.0.3",
 	octokit: "4.0.2",
 	radash: "12.1.0",
-	"replace-in-file": "7.1.0",
+	"replace-in-file": "7.2.0",
 	"std-env": "3.7.0",
 	"update-notifier": "7.0.0",
-	"web-ext": "7.11.0"
+	"web-ext": "7.12.0"
 };
 const devDependencies = {
 	"@trivago/prettier-plugin-sort-imports": "4.3.0",
@@ -106,12 +107,10 @@ const devDependencies = {
 	"@types/fs-extra": "11.0.4",
 	"@types/node": "20.12.12",
 	"@types/update-notifier": "6.0.8",
-	"@typescript-eslint/eslint-plugin": "7.9.0",
-	"@typescript-eslint/parser": "7.9.0",
-	eslint: "8.57.0",
-	"eslint-config-prettier": "9.1.0",
+	eslint: "9.3.0",
 	prettier: "3.2.5",
 	typescript: "5.4.5",
+	"typescript-eslint": "8.0.0-alpha.20",
 	unbuild: "2.0.0"
 };
 const pnpm = {

package/dist/index.d.mts

@@ -649,7 +649,7 @@ declare class Release extends Base {
             starred_at?: string | undefined;
         } | null;
     }>;
-    uploadUpdateJSON(): Promise<void>;
+    refreshUpdateManifest(): Promise<void>;
     getChangelog(): Promise<string>;
     getClient(): Octokit;
     get owner(): string;

package/dist/index.d.ts

@@ -649,7 +649,7 @@ declare class Release extends Base {
             starred_at?: string | undefined;
         } | null;
     }>;
-    uploadUpdateJSON(): Promise<void>;
+    refreshUpdateManifest(): Promise<void>;
     getChangelog(): Promise<string>;
     getClient(): Octokit;
     get owner(): string;

package/dist/index.mjs

@@ -5,7 +5,7 @@ import { isCI, isWindows, isMacOS, isLinux } from 'std-env';
 import { loadConfig as loadConfig$1 } from 'c12';
 import fs from 'fs-extra';
 import { createHooks } from 'hookable';
-import path from 'path';
+import path, { join, basename } from 'path';
 import { dash, template, assign, debounce } from 'radash';
 import * as crypto from 'crypto';
 import { buildSync } from 'esbuild';
@@ -84,6 +84,7 @@ async function loadConfig(overrides) {
   const result = await loadConfig$1({
     name: "zotero-plugin",
     dotenv: true,
+    packageJson: true,
     defaults: getDefaultConfig(),
     overrides
   });
@@ -376,7 +377,7 @@ class Build extends Base {
     const MessagesInHTML = /* @__PURE__ */ new Set();
     replaceInFile.sync({
       files: [`${this.dist}/addon/**/*.xhtml`, `${this.dist}/addon/**/*.html`],
-      // @ts-expect-error ReplaceInFileConfig has processor
+      // @ts-ignore ReplaceInFileConfig has processor
       processor: (input) => {
         const matchs = [...input.matchAll(/(data-l10n-id)="(\S*)"/g)];
         matchs.map((match) => {
@@ -404,7 +405,7 @@ class Build extends Base {
       const MessageInThisLang = /* @__PURE__ */ new Set();
       replaceInFile.sync({
         files: [`${this.dist}/addon/locale/${localeName}/**/*.ftl`],
-        // @ts-expect-error ReplaceInFileConfig has processor
+        // @ts-ignore ReplaceInFileConfig has processor
         processor: (fltContent) => {
           const lines = fltContent.split("\n");
           const prefixedLines = lines.map((line) => {
@@ -466,7 +467,8 @@ class Build extends Base {
       }
     };
     fs.writeJsonSync(`${this.dist}/update-beta.json`, data, { spaces: 2 });
-    !this.isPreRelease ? fs.writeJsonSync(`${this.dist}/update.json`, data, { spaces: 2 }) : "pass";
+    if (!this.isPreRelease)
+      fs.writeJsonSync(`${this.dist}/update.json`, data, { spaces: 2 });
     this.logger.log(
       `Prepare Update.json for ${this.isPreRelease ? "\x1B[31m Prerelease \x1B[0m" : "\x1B[32m Release \x1B[0m"}`
     );
@@ -516,7 +518,7 @@ class Release extends Base {
       this.logger.info("Uploading XPI...");
       await this.uploadXPI();
       this.logger.info("Uploading update manifest...");
-      await this.uploadUpdateJSON();
+      await this.refreshUpdateManifest();
     }
     this.logger.success(
       `Done in ${(( new Date()).getTime() - t.getTime()) / 1e3} s.`
@@ -528,7 +530,9 @@ class Release extends Base {
    * release: bump version, run build, git add, git commit, git tag, git push
    */
   async bump() {
-    await versionBump(this.ctx.release.bumpp);
+    const result = await versionBump(this.ctx.release.bumpp);
+    this.ctx.version = result.newVersion;
+    this.ctx.release.bumpp.tag = result.tag;
   }
   /**
    * Create new release and upload XPI to asset
@@ -537,7 +541,7 @@ class Release extends Base {
     const release = await this.creatRelease({
       owner: this.owner,
       repo: this.repo,
-      tag_name: `v${this.version}`,
+      tag_name: this.ctx.release.bumpp.tag.toString().replaceAll("%s", this.version),
       name: `Release v${this.version}`,
       body: await this.getChangelog(),
       prerelease: this.version.includes("-"),
@@ -546,10 +550,7 @@ class Release extends Base {
     if (!release)
       throw new Error("Create release failed!");
     this.logger.debug("Uploading xpi asset...");
-    await this.uploadAsset(
-      release.id,
-      path.join(this.dist, `${this.xpiName}.xpi`)
-    );
+    await this.uploadAsset(release.id, join(this.dist, `${this.xpiName}.xpi`));
   }
   async getReleaseByTag(tag) {
     return await this.client.rest.repos.getReleaseByTag({
@@ -586,30 +587,22 @@ class Release extends Base {
         "content-type": mime.getType(asset) || "application/octet-stream",
         "content-length": fs.statSync(asset).size
       },
-      name: path.basename(asset)
+      name: basename(asset)
     }).then((res) => {
       return res.data;
     });
   }
-  async uploadUpdateJSON() {
-    const assets = ["update.json", "update-beta.json"];
+  async refreshUpdateManifest() {
+    const assets = glob.globSync(`${this.dist}/*.json`).map((p) => basename(p));
     const release = await this.getReleaseByTag("release") ?? await this.creatRelease({
       owner: this.owner,
       repo: this.repo,
       tag_name: "release",
+      prerelease: true,
       make_latest: "false"
     });
     if (!release)
       throw new Error("Get or create 'release' failed.");
-    await this.client.rest.repos.updateRelease({
-      owner: this.owner,
-      repo: this.repo,
-      release_id: release.id,
-      name: "Release Manifest",
-      body: `This release is used to host \`update.json\`, please do not delete or modify it! 
- Updated in UTC ${( new Date()).toISOString()} for version ${this.version}`,
-      make_latest: "false"
-    });
     const existAssets = await this.client.rest.repos.listReleaseAssets({
       owner: this.owner,
       repo: this.repo,
@@ -619,16 +612,28 @@ class Release extends Base {
     });
     if (existAssets) {
       for (const existAsset of existAssets) {
-        await this.client.rest.repos.deleteReleaseAsset({
-          owner: this.owner,
-          repo: this.repo,
-          asset_id: existAsset.id
-        });
+        if (assets.includes(existAsset.name)) {
+          await this.client.rest.repos.deleteReleaseAsset({
+            owner: this.owner,
+            repo: this.repo,
+            asset_id: existAsset.id
+          });
+        }
       }
     }
     for (const asset of assets) {
-      await this.uploadAsset(release.id, path.join(this.dist, asset));
+      await this.uploadAsset(release.id, join(this.dist, asset));
     }
+    await this.client.rest.repos.updateRelease({
+      owner: this.owner,
+      repo: this.repo,
+      release_id: release.id,
+      name: "Release Manifest",
+      body: `This release is used to host \`update.json\`, please do not delete or modify it! 
+ Updated in UTC ${( new Date()).toISOString()} for version ${this.version}`,
+      prerelease: true,
+      make_latest: "false"
+    });
   }
   getChangelog() {
     return new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin-scaffold",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "description": "A scaffold for Zotero plugin development.",
   "type": "module",
   "exports": {
@@ -47,25 +47,25 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@inquirer/prompts": "5.0.3",
+    "@inquirer/prompts": "5.0.4",
     "bumpp": "9.4.1",
     "c12": "1.10.0",
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
-    "commander": "12.0.0",
+    "commander": "12.1.0",
     "consola": "3.2.3",
     "conventional-changelog": "6.0.0",
-    "esbuild": "0.21.2",
+    "esbuild": "0.21.4",
     "fast-glob": "3.3.2",
     "fs-extra": "11.2.0",
     "hookable": "5.5.3",
     "mime": "4.0.3",
     "octokit": "4.0.2",
     "radash": "12.1.0",
-    "replace-in-file": "7.1.0",
+    "replace-in-file": "7.2.0",
     "std-env": "3.7.0",
     "update-notifier": "7.0.0",
-    "web-ext": "7.11.0"
+    "web-ext": "7.12.0"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "4.3.0",
@@ -73,20 +73,19 @@
     "@types/fs-extra": "11.0.4",
     "@types/node": "20.12.12",
     "@types/update-notifier": "6.0.8",
-    "@typescript-eslint/eslint-plugin": "7.9.0",
-    "@typescript-eslint/parser": "7.9.0",
-    "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
+    "eslint": "9.3.0",
     "prettier": "3.2.5",
     "typescript": "5.4.5",
+    "typescript-eslint": "8.0.0-alpha.20",
     "unbuild": "2.0.0"
   },
   "scripts": {
     "dev": "unbuild --stub",
     "build": "tsc --noEmit && unbuild",
-    "lint": "eslint --max-warnings=0 . && prettier --check .",
-    "lint:fix": "eslint --fix . && prettier --write .",
+    "lint": "eslint . & prettier --check .",
+    "lint:fix": "eslint --fix . & prettier --write .",
     "release": "bumpp --commit \"chore(release): publish v%s\"",
+    "update:deps": "pnpx taze minor -w -f -l",
     "test": "echo \"Error: no test specified\" && exit 1"
   }
 }