piclist 1.3.9 → 1.6.1

package/dist/lib/Commander.d.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
 import { type Inquirer } from 'inquirer';
-import { type IPlugin, type ICommander, type IPicGo } from '../types/index.js';
+import { type IPlugin, type ICommander, type IPicGo } from '../types';
 export declare class Commander implements ICommander {
     private readonly name;
     static currentPlugin: string | null;

package/dist/lib/LifecyclePlugins.d.ts

@@ -1,4 +1,4 @@
-import { type IPlugin, type ILifecyclePlugins } from '../types/index.js';
+import { type IPlugin, type ILifecyclePlugins } from '../types';
 export declare class LifecyclePlugins implements ILifecyclePlugins {
     static currentPlugin: string | null;
     private readonly list;

package/dist/lib/Logger.d.ts

@@ -1,4 +1,4 @@
-import { type ILogArgvType, type ILogArgvTypeWithError, type ILogger, type IPicGo } from '../types/index.js';
+import { type ILogArgvType, type ILogArgvTypeWithError, type ILogger, type IPicGo } from '../types';
 export declare class Logger implements ILogger {
     private readonly level;
     private readonly ctx;

package/dist/lib/PluginHandler.d.ts

@@ -1,4 +1,4 @@
-import { type IProcessEnv, type IPluginHandler, type IPluginHandlerOptions, type IPicGo, type IPluginHandlerResult } from '../types/index.js';
+import { type IProcessEnv, type IPluginHandler, type IPluginHandlerOptions, type IPicGo, type IPluginHandlerResult } from '../types';
 export declare class PluginHandler implements IPluginHandler {
     private readonly ctx;
     constructor(ctx: IPicGo);

package/dist/lib/PluginLoader.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo, type IPicGoPlugin, type IPluginLoader, type IPicGoPluginInterface } from '../types/index.js';
+import { type IPicGo, type IPicGoPlugin, type IPluginLoader, type IPicGoPluginInterface } from '../types/index';
 /**
  * Local plugin loader, file system is required
  */

package/dist/lib/Request.d.ts

@@ -1,5 +1,5 @@
 import { type AxiosRequestConfig } from 'axios';
-import { type IPicGo, type IRequestConfig, type IOldReqOptions, type IResponse, type IRequest } from '../types/index.js';
+import { type IPicGo, type IRequestConfig, type IOldReqOptions, type IResponse, type IRequest } from '../types';
 export declare class Request implements IRequest {
     private readonly ctx;
     private proxy;

package/dist/plugins/beforetransformer/compress.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo, type IPluginConfig } from '../../types/index.js';
+import { type IPicGo, type IPluginConfig } from '../../types';
 declare const _default: {
     config: (ctx: IPicGo) => IPluginConfig[];
 };

package/dist/plugins/beforetransformer/watermark.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo, type IPluginConfig } from '../../types/index.js';
+import { type IPicGo, type IPluginConfig } from '../../types';
 declare const _default: {
     config: (ctx: IPicGo) => IPluginConfig[];
 };

package/dist/plugins/beforeupload/buildInRename.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo, type IPluginConfig } from '../../types/index.js';
+import { type IPicGo, type IPluginConfig } from '../../types';
 declare const _default: {
     config: (ctx: IPicGo) => IPluginConfig[];
 };

package/dist/plugins/commander/config.d.ts

@@ -1,3 +1,3 @@
-import { type IPlugin } from '../../types/index.js';
+import { type IPlugin } from '../../types';
 declare const config: IPlugin;
 export default config;

package/dist/plugins/commander/i18n.d.ts

@@ -1,3 +1,3 @@
-import { type IPlugin } from '../../types/index.js';
+import { type IPlugin } from '../../types';
 declare const i18n: IPlugin;
 export default i18n;

package/dist/plugins/commander/index.d.ts

@@ -1,3 +1,3 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 declare const _default: (ctx: IPicGo) => void;
 export default _default;

package/dist/plugins/commander/init.d.ts

@@ -1,3 +1,3 @@
-import { type IPlugin } from '../../types/index.js';
+import { type IPlugin } from '../../types';
 declare const init: IPlugin;
 export default init;

package/dist/plugins/commander/pluginHandler.d.ts

@@ -1,3 +1,3 @@
-import { type IPlugin } from '../../types/index.js';
+import { type IPlugin } from '../../types';
 declare const pluginHandler: IPlugin;
 export default pluginHandler;

package/dist/plugins/commander/proxy.d.ts

@@ -1,3 +1,3 @@
-import { type IPlugin } from '../../types/index.js';
+import { type IPlugin } from '../../types';
 declare const proxy: IPlugin;
 export default proxy;

package/dist/plugins/commander/setting.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 declare const setting: {
     handle: (ctx: IPicGo) => void;
 };

package/dist/plugins/commander/upload.d.ts

@@ -1,3 +1,3 @@
-import { type IPlugin } from '../../types/index.js';
+import { type IPlugin } from '../../types';
 declare const upload: IPlugin;
 export default upload;

package/dist/plugins/commander/use.d.ts

@@ -1,3 +1,3 @@
-import { type IPlugin } from '../../types/index.js';
+import { type IPlugin } from '../../types';
 declare const use: IPlugin;
 export default use;

package/dist/plugins/transformer/base64.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 declare const _default: {
     handle: (ctx: IPicGo) => Promise<IPicGo>;
 };

package/dist/plugins/transformer/index.d.ts

@@ -1,3 +1,3 @@
-import { type IPicGoPlugin } from '../../types/index.js';
+import { type IPicGoPlugin } from '../../types';
 declare const buildInTransformers: IPicGoPlugin;
 export default buildInTransformers;

package/dist/plugins/transformer/path.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 declare const _default: {
     handle: (ctx: IPicGo) => Promise<IPicGo>;
 };

package/dist/plugins/uploader/aliyun.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/github.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/imgur.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/index.d.ts

@@ -1,3 +1,3 @@
-import { type IPicGoPlugin } from '../../types/index.js';
+import { type IPicGoPlugin } from '../../types';
 declare const buildInUploaders: IPicGoPlugin;
 export default buildInUploaders;

package/dist/plugins/uploader/local.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/piclist.d.ts

@@ -1,2 +1,2 @@
-import type { IPicGo } from '../../types/index.js';
+import type { IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/qiniu.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/sftp.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/smms.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/tcyun.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export interface ISignature {
     signature: string;
     appId: string;

package/dist/plugins/uploader/telegraph.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/upyun.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/plugins/uploader/webdav.d.ts

@@ -1,2 +1,2 @@
-import { type IPicGo } from '../../types/index.js';
+import { type IPicGo } from '../../types';
 export default function register(ctx: IPicGo): void;

package/dist/types/index.d.ts

@@ -3,7 +3,7 @@
 import { type Command } from 'commander';
 import { type Inquirer } from 'inquirer';
 import { type FormatEnum, type GravityEnum } from 'sharp';
-import { type IRequestPromiseOptions } from './oldRequest.js';
+import { type IRequestPromiseOptions } from './oldRequest';
 export interface IPicGo extends NodeJS.EventEmitter {
     /**
      * picgo configPath

package/dist/utils/common.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { type IImgSize, type IPathTransformedImgInfo, type IPluginNameType, type ILogger, type IPicGo, type IBuildInCompressOptions, type IBuildInWaterMarkOptions } from '../types/index.js';
+import { type IImgSize, type IPathTransformedImgInfo, type IPluginNameType, type ILogger, type IPicGo, type IBuildInCompressOptions, type IBuildInWaterMarkOptions } from '../types';
 import sharp from 'sharp';
 export declare function randomStringGenerator(length: number): string;
 export declare function renameFileNameWithTimestamp(oldName: string): string;

package/dist/utils/createContext.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo } from '../types/index.js';
+import { type IPicGo } from '../types';
 /**
  * create an unique context for each upload process
  * @param ctx

package/dist/utils/db.d.ts

@@ -1,5 +1,5 @@
-import { type IConfig, type IPicGo } from '../types/index.js';
-import { type IJSON } from '@picgo/store/dist/types/index.js';
+import { type IConfig, type IPicGo } from '../types';
+import { type IJSON } from '@picgo/store/dist/types';
 declare class DB {
     private readonly ctx;
     private readonly db;

package/dist/utils/getClipboardImage.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo, type IClipboardImage } from '../types/index.js';
+import { type IPicGo, type IClipboardImage } from '../types';
 export type Platform = 'darwin' | 'win32' | 'win10' | 'linux' | 'wsl';
 declare const getClipboardImage: (ctx: IPicGo) => Promise<IClipboardImage>;
 export default getClipboardImage;

package/dist/utils/initUtils.d.ts

@@ -1,4 +1,4 @@
-import { type IPicGo, type IOptions } from '../types/index.js';
+import { type IPicGo, type IOptions } from '../types';
 /**
  * Generate template files to destination files.
  * @param {PicGo} ctx

package/dist/utils/interfaces.d.ts

@@ -1,8 +1,8 @@
 /** This file is deprecated */
 /// <reference types="node" />
-import { type PicGo } from '../core/PicGo.js';
-import type LifecyclePlugins from '../lib/LifecyclePlugins.js';
-import { type IWebdavPlistConfig } from '../types/index.js';
+import { type PicGo } from '../core/PicGo';
+import type LifecyclePlugins from '../lib/LifecyclePlugins';
+import { type IWebdavPlistConfig } from '../types';
 /**
  * for plugin config
  */

package/dist/utils/sshClient.d.ts

@@ -1,5 +1,5 @@
 import { NodeSSH } from 'node-ssh-no-cpu-features';
-import { type ISftpPlistConfig } from '../types/index.js';
+import { type ISftpPlistConfig } from '../types';
 declare class SSHClient {
     private static _instance;
     private static _client;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piclist",
-  "version": "1.3.9",
+  "version": "1.6.1",
   "description": "Modified PicGo core, A tool for picture uploading",
   "author": {
     "name": "Kuingsmile",
@@ -11,13 +11,12 @@
     "url": "https://github.com/Kuingsmile/PicList/issues",
     "email": "pkukuing@gmail.com"
   },
-  "type":"module",
-  "main": "dist/index.esm.js",
+  "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
   "bin": {
-    "picgo": "./bin/picgo.js",
-    "picgo-server": "./bin/picgo-server.js"
+    "picgo": "./bin/picgo",
+    "picgo-server": "./bin/picgo-server"
   },
   "publishConfig": {
     "access": "public"
@@ -47,17 +46,16 @@
       "path": "./node_modules/cz-customizable"
     },
     "cz-customizable": {
-      "config": "./node_modules/@picgo/bump-version/.cz-config.js"
+      "config": "./node_modules/node-bump-version/.cz-config.js"
     }
   },
   "commitlint": {
     "extends": [
-      "./node_modules/@picgo/bump-version/commitlint-picgo"
+      "./node_modules/node-bump-version/commitlint-node"
     ]
   },
   "license": "MIT",
   "devDependencies": {
-    "@picgo/bump-version": "^1.1.2",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.2.1",
@@ -93,6 +91,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^5.0.0",
     "husky": "^1.3.1",
+    "node-bump-version": "^1.0.0",
     "pre-commit": "^1.2.2",
     "rollup": "^2.79.1",
     "rollup-plugin-copy": "^3.5.0",
@@ -131,8 +130,8 @@
     "sharp": "^0.32.1",
     "text-to-svg": "^3.1.5",
     "tunnel": "^0.0.6",
-    "uuid": "^9.0.1",
-    "webdav": "^5.3.0"
+    "uuid": "^9.0.0",
+    "webdav": "^4.11.2"
   },
   "repository": {
     "type": "git",

package/rollup.config.js

@@ -1,6 +1,7 @@
 import { terser } from 'rollup-plugin-terser'
 import pkg from './package.json'
 import typescript from 'rollup-plugin-typescript2'
+import commonjs from '@rollup/plugin-commonjs'
 import copy from 'rollup-plugin-copy'
 import { string } from 'rollup-plugin-string'
 import json from '@rollup/plugin-json'
@@ -27,8 +28,8 @@ const commonOptions = {
     typescript({
       tsconfigOverride: {
         compilerOptions: {
-          target: 'es2019',
-          module: 'esnext'
+          target: 'ES2017',
+          module: 'ES2015'
         }
       }
     }),
@@ -38,6 +39,7 @@ const commonOptions = {
       ]
     }),
     // terser(),
+    commonjs(),
     string({
       // Required to be specified
       include: [
@@ -61,6 +63,17 @@ if (!isDev) {
   commonOptions.plugins.push(terser())
 }
 
+/** @type import('rollup').RollupOptions */
+const nodeCjs = {
+  output: [{
+    file: 'dist/index.cjs.js',
+    format: 'cjs',
+    banner,
+    sourcemap
+  }],
+  ...commonOptions
+}
+
 const nodeEsm = {
   output: [{
     file: 'dist/index.esm.js',
@@ -72,6 +85,9 @@ const nodeEsm = {
 }
 
 const bundles = []
-bundles.push(nodeEsm)
+const env = process.env.BUNDLES || ''
+if (env.includes('cjs')) bundles.push(nodeCjs)
+if (env.includes('esm')) bundles.push(nodeEsm)
+if (bundles.length === 0) bundles.push(nodeCjs, nodeEsm)
 
 export default bundles

package/dist/dirname.d.ts

@@ -1 +0,0 @@
-export declare const projectRoot: string;