zotero-plugin 2.0.21 → 2.0.22

package/continuous-integration.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContinuousIntegration = void 0;
-const tslib_1 = require("tslib");
-const child_process = tslib_1.__importStar(require("child_process"));
+import * as child_process from 'child_process';
 class ContinuousIntegrationSingleton {
     constructor() {
         var _a;
@@ -60,4 +56,4 @@ class ContinuousIntegrationSingleton {
         return int;
     }
 }
-exports.ContinuousIntegration = new ContinuousIntegrationSingleton; // eslint-disable-line @typescript-eslint/naming-convention,no-underscore-dangle,id-blacklist,id-match
+export const ContinuousIntegration = new ContinuousIntegrationSingleton; // eslint-disable-line @typescript-eslint/naming-convention,no-underscore-dangle,id-blacklist,id-match

package/copy-assets.js

@@ -1,9 +1,6 @@
-"use strict";
 /* eslint-disable no-console, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const fs = tslib_1.__importStar(require("fs-extra"));
-const path = tslib_1.__importStar(require("path"));
+import * as fs from 'fs-extra';
+import * as path from 'path';
 function allow(file) {
     switch (path.basename(file)) {
         case '.DS_Store':

package/debug-log.js

@@ -1,9 +1,5 @@
-"use strict";
 /* eslint-disable no-magic-numbers */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DebugLog = void 0;
-const tslib_1 = require("tslib");
-const UZip = tslib_1.__importStar(require("uzip"));
+import * as UZip from 'uzip';
 class DebugLogSender {
     constructor() {
         this.id = {
@@ -165,4 +161,4 @@ class DebugLogSender {
         });
     }
 }
-exports.DebugLog = new DebugLogSender;
+export const DebugLog = new DebugLogSender;

package/loader/json.d.ts

@@ -1,2 +1 @@
-declare const _default: (source: string) => string;
-export = _default;
+export default function loader(source: string): string;

package/loader/json.js

@@ -1,6 +1,5 @@
-"use strict";
 /* eslint-disable @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
-const jsesc = require("jsesc");
+import jsesc from 'jsesc';
 function normalize(obj) {
     if (Array.isArray(obj)) {
         return obj.map(normalize); // eslint-disable-line @typescript-eslint/no-unsafe-return
@@ -16,11 +15,11 @@ function normalize(obj) {
     }
     return obj; // eslint-disable-line @typescript-eslint/no-unsafe-return
 }
-module.exports = function loader(source) {
+export default function loader(source) {
     if (this.cacheable)
         this.cacheable();
     const value = typeof source === 'string' ? JSON.parse(source) : source;
     // const jsesc_options = { compact: false, indent: '  ' }
     const jsesc_options = { compact: true };
     return `module.exports = ${jsesc(normalize(value), jsesc_options)};`; // eslint-disable-line @typescript-eslint/restrict-template-expressions
-};
+}

package/loader/peggy.d.ts

@@ -1,2 +1 @@
-declare const _default: (source: string) => string;
-export = _default;
+export default function loader(source: string): string;

package/loader/peggy.js

@@ -1,10 +1,8 @@
-"use strict";
 /* eslint-disable prefer-arrow/prefer-arrow-functions, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
-const tslib_1 = require("tslib");
-const peggy = tslib_1.__importStar(require("peggy"));
-module.exports = function loader(source) {
+import * as peggy from 'peggy';
+export default function loader(source) {
     return peggy.generate(source, {
         output: 'source',
         format: 'commonjs',
     });
-};
+}

package/loader/wrap.d.ts

@@ -1,2 +1 @@
-declare const _default: (source: string) => string;
-export = _default;
+export default function loader(source: string): string;

package/loader/wrap.js

@@ -1,10 +1,8 @@
-"use strict";
 /* eslint-disable no-console, prefer-template, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/restrict-template-expressions */
-const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
-const root_1 = tslib_1.__importDefault(require("../root"));
-const pkg = Object.assign({}, require(path.join(root_1.default, 'package.json')));
-module.exports = function loader(source) {
+import * as path from 'path';
+import root from '../root';
+const pkg = Object.assign({}, require(path.join(root, 'package.json')));
+export default function loader(source) {
     // this.cacheable()
     const src = this.resourcePath.substring(process.cwd().length + 1);
     const loading = `
@@ -30,4 +28,4 @@ module.exports = function loader(source) {
         default:
             throw new Error(`Unexpected extension on ${src}`);
     }
-};
+}

package/make-dirs.js

@@ -1,13 +1,10 @@
-"use strict";
 /* eslint-disable no-console, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const rimraf_1 = require("rimraf");
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-const root_1 = tslib_1.__importDefault(require("./root"));
+import { rimrafSync } from 'rimraf';
+import * as fs from 'fs';
+import * as path from 'path';
+import root from './root';
 console.log('make build dirs');
-for (const dir of [path.join(root_1.default, 'build'), path.join(root_1.default, 'gen'), path.join(root_1.default, 'xpi')]) {
-    (0, rimraf_1.rimrafSync)(dir);
+for (const dir of [path.join(root, 'build'), path.join(root, 'gen'), path.join(root, 'xpi')]) {
+    rimrafSync(dir);
     fs.mkdirSync(dir);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zotero-plugin",
-  "version": "2.0.21",
+  "version": "2.0.22",
   "description": "Zotero plugin builder",
   "homepage": "https://github.com/retorquere/zotero-plugin/wiki",
   "bin": {
@@ -18,7 +18,7 @@
     "preversion": "npm test",
     "postversion": "git push --follow-tags",
     "test": "eslint . --ext .ts && npm run build",
-    "build": "tsc && chmod +x bin/*.js",
+    "build": "tsc && ./bundle.mjs && chmod +x bin/*.js",
     "pack": "npm test && npm pack",
     "prepublishOnly": "npm install && npm run build",
     "ncu": "ncu -u && npm i && git add package.json package-lock.json && git commit -m ncu"
@@ -109,5 +109,8 @@
   ],
   "bugs": {
     "url": "https://github.com/retorquere/zotero-plugin/issues"
+  },
+  "devDependencies": {
+    "esbuild": "^0.23.0"
   }
 }

package/rdf.js

@@ -1,26 +1,23 @@
-"use strict";
 /* eslint-disable no-console, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/restrict-template-expressions, no-magic-numbers */
 var _a, _b;
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-const glob_1 = require("glob");
-const pug = tslib_1.__importStar(require("pug"));
-const PropertiesReader = require("properties-reader");
-const uriTemplate = require("uri-templates");
-const root_1 = tslib_1.__importDefault(require("./root"));
-const version_1 = tslib_1.__importDefault(require("./version"));
-const pkg = Object.assign({}, require(path.join(root_1.default, 'package.json')));
+import * as fs from 'fs';
+import * as path from 'path';
+import { globSync as glob } from 'glob';
+import * as pug from 'pug';
+import PropertiesReader from 'properties-reader';
+import uriTemplate from 'uri-templates';
+import root from './root';
+import version from './version';
+const pkg = Object.assign({}, require(path.join(root, 'package.json')));
 if (!pkg.id)
     pkg.id = `${pkg.name.replace(/^zotero-/, '')}@${pkg.author.email.replace(/.*@/, '')}`.toLowerCase();
 if (pkg.xpi)
     Object.assign(pkg, pkg.xpi);
-pkg.version = version_1.default;
+pkg.version = version;
 if (pkg.updateLink)
     pkg.updateLink = uriTemplate(pkg.updateLink).fill({ version: pkg.version });
 pkg.updateURL = `${pkg.xpi.releaseURL}update.rdf`;
-const translations = (0, glob_1.globSync)(path.join(root_1.default, 'locale/*/*.properties'));
+const translations = glob(path.join(root, 'locale/*/*.properties'));
 for (const translation of translations) {
     const locale = path.basename(path.dirname(translation));
     const properties = PropertiesReader(translation);
@@ -37,7 +34,7 @@ for (const translation of translations) {
 }
 const options_and_vars = Object.assign(Object.assign({}, pkg), { pretty: true });
 try {
-    Object.assign(options_and_vars, JSON.parse(fs.readFileSync(path.join(root_1.default, 'schema', 'supported.json'), 'utf8')));
+    Object.assign(options_and_vars, JSON.parse(fs.readFileSync(path.join(root, 'schema', 'supported.json'), 'utf8')));
 }
 catch (err) { // eslint-disable-line @typescript-eslint/no-unused-vars
     // ignore
@@ -46,13 +43,13 @@ 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' });
+fs.writeFileSync(path.join(root, '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' });
+fs.writeFileSync(path.join(root, 'gen/update.rdf'), template, { encoding: 'utf8' });
 console.log('generating updates.json');
-fs.writeFileSync(path.join(root_1.default, 'gen/updates.json'), JSON.stringify({
+fs.writeFileSync(path.join(root, 'gen/updates.json'), JSON.stringify({
     addons: {
         [pkg.id]: {
             updates: [
@@ -88,15 +85,15 @@ for (const i of [...icons]) {
         i[96] = i[48].replace(/([.][^.]+)$/, '@2x$1');
     }
 }
-const icon = icons.find(i => fs.existsSync(path.join(root_1.default, ...i[48].split('/'))));
+const icon = icons.find(i => fs.existsSync(path.join(root, ...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],
+        96: fs.existsSync(path.join(root, ...icon[96].split('/'))) ? icon[96] : icon[48],
     };
 }
 console.log('generating manifest.json');
-fs.writeFileSync(path.join(root_1.default, 'build/manifest.json'), JSON.stringify({
+fs.writeFileSync(path.join(root, 'build/manifest.json'), JSON.stringify({
     manifest_version: 2,
     name: options_and_vars.name,
     version: options_and_vars.version,

package/root.js

@@ -1,3 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = process.cwd();
+export default process.cwd();

package/version.js

@@ -1,30 +1,27 @@
-"use strict";
 /* eslint-disable no-console */
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const path = tslib_1.__importStar(require("path"));
-const os = tslib_1.__importStar(require("os"));
-const fs = tslib_1.__importStar(require("fs"));
-const root_1 = tslib_1.__importDefault(require("./root"));
-const continuous_integration_1 = require("./continuous-integration");
+import * as path from 'path';
+import * as os from 'os';
+import * as fs from 'fs';
+import root from './root';
+import { ContinuousIntegration as CI } from './continuous-integration';
 let version = null;
-const version_js = path.join(root_1.default, 'gen/version.js');
+const version_js = path.join(root, 'gen/version.js');
 if (fs.existsSync(version_js)) {
     version = require(version_js); // eslint-disable-line @typescript-eslint/no-require-imports
 }
 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
-    if (continuous_integration_1.ContinuousIntegration.service && !continuous_integration_1.ContinuousIntegration.tag) {
-        const issue = continuous_integration_1.ContinuousIntegration.issue ? `.${continuous_integration_1.ContinuousIntegration.issue}` : '';
-        version = `${version}${issue}.${continuous_integration_1.ContinuousIntegration.build_number}`;
+    version = require(path.join(root, 'package.json')).version; // eslint-disable-line @typescript-eslint/no-require-imports
+    if (CI.service && !CI.tag) {
+        const issue = CI.issue ? `.${CI.issue}` : '';
+        version = `${version}${issue}.${CI.build_number}`;
     }
-    else if (!continuous_integration_1.ContinuousIntegration.service) {
+    else if (!CI.service) {
         version = `${version}.${os.userInfo().username}.${os.hostname()}`;
     }
     if (!fs.existsSync(path.dirname(version_js)))
         fs.mkdirSync(path.dirname(version_js));
     fs.writeFileSync(version_js, `module.exports = ${JSON.stringify(version)};\n`, 'utf8');
 }
-exports.default = version;
+export default version;