zotero-plugin-scaffold 0.0.15 → 0.0.17

package/README.md

@@ -64,9 +64,6 @@ export default defineConfig({
   name: pkg.config.addonName,
   id: pkg.config.addonID,
   namespace: pkg.config.addonRef,
-  updateURL: `https://raw.githubusercontent.com/{{owner}}/{{repo}}/main/update.json`,
-  xpiDownloadLink:
-    "https://github.com/{{owner}}/{{repo}}/releases/download/v{{version}}/{{xpiName}}.xpi",
   build: {
     esbuildOptions: [
       {
@@ -159,7 +156,7 @@ pnpm run lint:fix
 
 ## License
 
-GNU Affero General Public License Version 3
+GNU Affero General Public License Version 3.
 
 ## Acknowledgements
 

package/dist/cli.mjs

@@ -2,19 +2,19 @@ import { Config, Build, Serve, Release } from './index.mjs';
 import { Command } from 'commander';
 import consola from 'consola';
 import updateNotifier from 'update-notifier';
+import 'bumpp';
+import 'chalk';
+import 'std-env';
 import 'c12';
 import 'fs-extra';
 import 'hookable';
 import 'path';
 import 'radash';
 import 'crypto';
-import 'chalk';
-import 'std-env';
 import 'esbuild';
 import 'fast-glob';
 import 'replace-in-file';
 import 'web-ext';
-import 'bumpp';
 import 'conventional-changelog';
 import 'mime';
 import 'octokit';
@@ -23,7 +23,7 @@ import 'chokidar';
 import 'process';
 
 const name = "zotero-plugin-scaffold";
-const version = "0.0.15";
+const version = "0.0.17";
 const description = "A scaffold for Zotero plugin development.";
 const scripts = {
 	dev: "unbuild --stub",

package/dist/index.d.mts

@@ -332,8 +332,6 @@ interface UserConfig extends RecursivePartial<Config$1> {
     name: string;
     id: string;
     namespace: string;
-    xpiDownloadLink: string;
-    updateURL: string;
 }
 interface Context extends Config$1 {
     pkgUser: any;

package/dist/index.d.ts

@@ -332,8 +332,6 @@ interface UserConfig extends RecursivePartial<Config$1> {
     name: string;
     id: string;
     namespace: string;
-    xpiDownloadLink: string;
-    updateURL: string;
 }
 interface Context extends Config$1 {
     pkgUser: any;

package/dist/index.mjs

@@ -1,17 +1,17 @@
+import versionBump, { ProgressEvent } from 'bumpp';
+import chalk from 'chalk';
+import consola, { createConsola } from 'consola';
+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 { dash, template, assign, debounce } from 'radash';
 import * as crypto from 'crypto';
-import chalk from 'chalk';
-import { isCI, isWindows, isMacOS, isLinux } from 'std-env';
-import consola, { createConsola } from 'consola';
 import { buildSync } from 'esbuild';
 import glob from 'fast-glob';
 import replaceInFile from 'replace-in-file';
 import webext from 'web-ext';
-import versionBump from 'bumpp';
 import conventionalChangelog from 'conventional-changelog';
 import mime from 'mime';
 import { Octokit } from 'octokit';
@@ -19,6 +19,42 @@ import { execSync, spawn } from 'child_process';
 import chokidar from 'chokidar';
 import { exit } from 'process';
 
+const LogLevels = {
+  trace: 5,
+  debug: 4,
+  info: 3,
+  warn: 1,
+  error: 0
+};
+function bumppProgress({
+  event,
+  script,
+  updatedFiles,
+  skippedFiles,
+  newVersion
+}) {
+  switch (event) {
+    case ProgressEvent.FileUpdated:
+      consola.success(`Updated ${updatedFiles.pop()} to ${newVersion}`);
+      break;
+    case ProgressEvent.FileSkipped:
+      consola.info(`${skippedFiles.pop()} did not need to be updated`);
+      break;
+    case ProgressEvent.GitCommit:
+      consola.success("Git commit");
+      break;
+    case ProgressEvent.GitTag:
+      consola.success("Git tag");
+      break;
+    case ProgressEvent.GitPush:
+      consola.success("Git push");
+      break;
+    case ProgressEvent.NpmScript:
+      consola.success(`Npm run ${script}`);
+      break;
+  }
+}
+
 function dateFormat(fmt, date) {
   let ret;
   const opt = {
@@ -145,12 +181,14 @@ const defaultConfig = {
   release: {
     bumpp: {
       release: "prompt",
+      confirm: true,
       preid: "beta",
       // execute: "npm run build",
       all: false,
-      commit: "Release v%s",
+      commit: "chore(publish): release v%s",
       tag: "v%s",
-      push: true
+      push: true,
+      progress: bumppProgress
     }
   },
   logLevel: "info"
@@ -162,14 +200,6 @@ function generateHashSync(filePath, algorithm) {
   return `${algorithm}:${hash}`;
 }
 
-const LogLevels = {
-  trace: 5,
-  debug: 4,
-  info: 3,
-  warn: 1,
-  error: 0
-};
-
 var __defProp$3 = Object.defineProperty;
 var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$3 = (obj, key, value) => {
@@ -473,9 +503,7 @@ class Release extends Base {
       await this.bump();
     } else {
       if (glob.globSync(`${this.dist}/*.xpi`).length == 0) {
-        this.logger.error(
-          "No xpi file found, are you sure you have run the build?"
-        );
+        throw new Error("No xpi file found, are you sure you have run build?");
       }
       await this.uploadXPI();
       await this.uploadUpdateJSON();
@@ -518,9 +546,6 @@ class Release extends Base {
       if (res.status == 200) {
         return res.data;
       }
-    }).catch((err) => {
-      this.logger.debug(err);
-      return void 0;
     });
   }
   async creatRelease(options) {
@@ -528,9 +553,6 @@ class Release extends Base {
       if (res.status == 201) {
         return res.data;
       }
-    }).catch((err) => {
-      this.logger.debug(err);
-      return void 0;
     });
   }
   async uploadAsset(releaseID, asset) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin-scaffold",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "A scaffold for Zotero plugin development.",
   "type": "module",
   "exports": {