@widget-js/cli 1.2.11 → 24.1.1-beta.10

package/lib/{release-XUYU5WNC.js → release-5GS34BAJ.js}

@@ -1,22 +1,29 @@
 import {
   promptChecker_default
-} from "./chunk-3GPAHQ6O.js";
+} from "./chunk-XPJ33Y5L.js";
 import {
   Utils
-} from "./chunk-IJH6LXRT.js";
+} from "./chunk-RDJH7Z4C.js";
 
 // src/release/release.ts
-import fs4 from "fs";
-import path2 from "path";
+import fs4 from "node:fs";
+import path2 from "node:path";
+import { Buffer as Buffer2 } from "node:buffer";
+import chalk2 from "chalk";
+import consola3 from "consola";
 
 // src/release/update-zip.ts
-import fs from "fs";
+import fs from "node:fs";
 import archiver from "archiver";
 function zipDirectory(sourceDir, outPath, ignoreDir) {
   const archive = archiver("zip", { zlib: { level: 9 } });
   const stream = fs.createWriteStream(outPath);
   return new Promise((resolve, reject) => {
-    archive.glob("**/*", { cwd: sourceDir, ignore: ["node_modules/**"] }).on("error", (err) => reject(err)).pipe(stream);
+    const ignore = ["node_modules/**"];
+    if (ignoreDir) {
+      ignore.push(...ignoreDir);
+    }
+    archive.glob("**/*", { cwd: sourceDir, ignore }).on("error", (err) => reject(err)).pipe(stream);
     stream.on("close", () => resolve());
     archive.finalize();
   });
@@ -24,9 +31,10 @@ function zipDirectory(sourceDir, outPath, ignoreDir) {
 var update_zip_default = zipDirectory;
 
 // src/release/oss.ts
+import fs2 from "node:fs";
 import OSS from "ali-oss";
-import fs2 from "fs";
 import chalk from "chalk";
+import consola from "consola";
 var packageData = JSON.parse(fs2.readFileSync("./package.json").toString());
 var AccessKeyID = packageData.oss?.id ?? "default";
 var AccessKeySecret = packageData.oss?.secret ?? "default";
@@ -48,37 +56,34 @@ var clinet = new OSS({
 });
 async function put(ossPath, file) {
   try {
-    const result = await clinet.put(ossPath, file, { headers });
-    console.log(chalk.green(`\u4E0A\u4F20\u6210\u529F\uFF1A${file}->${ossPath}`));
+    await clinet.put(ossPath, file, { headers });
+    consola.log(chalk.green(`\u4E0A\u4F20\u6210\u529F\uFF1A${file}->${ossPath}`));
   } catch (e) {
-    console.log(e);
+    consola.log(e);
   }
 }
 async function copy(dist, src) {
   try {
-    const result = await clinet.copy(dist, src, { headers });
-    console.log(chalk.green(`\u590D\u5236\u6210\u529F\uFF1A${src}->${dist}`));
+    await clinet.copy(dist, src, { headers });
+    consola.log(chalk.green(`\u590D\u5236\u6210\u529F\uFF1A${src}->${dist}`));
   } catch (e) {
     console.error(e);
   }
 }
 
-// src/release/release.ts
-import chalk2 from "chalk";
-
 // src/release/ftp.ts
-import path from "path";
-import fs3 from "fs";
+import path from "node:path";
+import fs3 from "node:fs";
+import os from "node:os";
+import * as process from "node:process";
 import SSHConfig from "@widget-js/ssh-config";
-import os from "os";
 import Client from "ssh2-sftp-client";
-import consola from "consola";
+import consola2 from "consola";
 import inquirer from "inquirer";
 import ora from "ora";
-import * as process from "process";
 import { minimatch } from "minimatch";
 async function checkParentDir(ftpClient, file, onMkdir) {
-  let dir = path.dirname(file);
+  const dir = path.dirname(file);
   const dirExists = await ftpClient.exists(dir);
   if (!dirExists) {
     onMkdir(dir);
@@ -86,31 +91,31 @@ async function checkParentDir(ftpClient, file, onMkdir) {
   }
 }
 async function runSSH(sshConfig, releaseConfig) {
-  consola.info("run ssh:", sshConfig);
+  consola2.info("run ssh:", sshConfig);
   const answer = await inquirer.prompt([
     { type: "password", name: "password", mask: "*", message: "Enter key pair password" }
   ]);
-  let ftpClient = new Client();
-  const port = sshConfig["Port"];
+  const ftpClient = new Client();
+  const port = sshConfig.Port;
   const key = fs3.readFileSync(path.resolve(os.homedir(), ".ssh/id_rsa"));
   const spinner = ora("Connecting");
   try {
     spinner.start();
     await ftpClient.connect({
-      host: sshConfig["HostName"],
-      port: port ? parseInt(port) : 22,
-      username: sshConfig["User"],
+      host: sshConfig.HostName,
+      port: port ? Number.parseInt(port) : 22,
+      username: sshConfig.User,
       passphrase: answer.password,
       privateKey: key
     });
     releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0));
-    for (let item of releaseConfig.fileMap) {
+    for (const item of releaseConfig.fileMap) {
       if (typeof item.src == "string") {
         if (item.remoteCopy) {
           await checkParentDir(ftpClient, item.dest, (dir) => {
             spinner.warn(`Create Dir: ${dir}`);
           });
-          let destExists = await ftpClient.exists(item.dest);
+          const destExists = await ftpClient.exists(item.dest);
           if (destExists) {
             spinner.warn(`Delete exists file:${item.dest}`);
             await ftpClient.delete(item.dest);
@@ -128,7 +133,7 @@ async function runSSH(sshConfig, releaseConfig) {
             await ftpClient.uploadDir(localFile, item.dest, {
               filter: (filePath, isDirectory) => {
                 if (item.ignorePattern && !isDirectory) {
-                  let fileName = path.basename(filePath);
+                  const fileName = path.basename(filePath);
                   if (minimatch(fileName, item.ignorePattern)) {
                     spinner.warn(`Skip file:${filePath}`);
                     return false;
@@ -159,16 +164,16 @@ async function runSSH(sshConfig, releaseConfig) {
 async function ftpUpload(releaseFile = "release.json") {
   const releaseJsonFilePath = path.join(process.cwd(), releaseFile);
   const packageVersion = Utils.getPackageVersion();
-  consola.info("Package Version:", packageVersion);
-  let releaseJson = fs3.readFileSync(releaseJsonFilePath).toString().replaceAll("${version}", packageVersion);
+  consola2.info("Package Version:", packageVersion);
+  const releaseJson = fs3.readFileSync(releaseJsonFilePath).toString().replaceAll("${version}", packageVersion);
   const releaseConfig = JSON.parse(releaseJson);
   const sshConfigFile = path.resolve(os.homedir(), ".ssh/config");
-  consola.info("SSH Config File Path:", sshConfigFile);
+  consola2.info("SSH Config File Path:", sshConfigFile);
   const sshConfigs = SSHConfig.parse(fs3.readFileSync(sshConfigFile).toString());
-  for (let host of releaseConfig.ftpConfig.host) {
-    let sshConfig = sshConfigs.compute(host);
+  for (const host of releaseConfig.ftpConfig.host) {
+    const sshConfig = sshConfigs.compute(host);
     if (!sshConfig) {
-      consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`);
+      consola2.error(`SSH config ${releaseConfig.ftpConfig.host} not found`);
       return;
     }
     await runSSH(sshConfig, releaseConfig);
@@ -176,16 +181,16 @@ async function ftpUpload(releaseFile = "release.json") {
 }
 
 // src/release/release.ts
-var release = async (options) => {
+async function release(options) {
   if (options.type == "ftp") {
     await ftpUpload(options.file);
     return;
   }
   const packageJSON = JSON.parse(fs4.readFileSync("package.json", "utf-8"));
   const changelogJSON = JSON.parse(fs4.readFileSync("changelog.json", "utf-8"));
-  const version = packageJSON["version"];
+  const version = packageJSON.version;
   const changelog = changelogJSON[version];
-  let needUpdateElectron = await promptChecker_default({
+  const needUpdateElectron = await promptChecker_default({
     type: "confirm",
     name: "electron",
     message: chalk2.blue("\u7528\u6237\u662F\u5426\u9700\u8981\u66F4\u65B0Electron?")
@@ -206,20 +211,19 @@ var release = async (options) => {
     installerPath = path2.join(`./dist/app-${version}-setup-win-x64.exe`);
   }
   const updateZipPath = path2.join(`./dist/update.zip`);
-  console.log(chalk2.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
+  consola3.log(chalk2.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
   await update_zip_default("./release", updateZipPath);
-  console.log(chalk2.blue("\u4E0A\u4F20installer.exe\u5230OSS"));
+  consola3.log(chalk2.blue("\u4E0A\u4F20installer.exe\u5230OSS"));
   await put("version/installer.exe", installerPath);
-  console.log(chalk2.blue("\u4E0A\u4F20update.zip\u5230OSS"));
+  consola3.log(chalk2.blue("\u4E0A\u4F20update.zip\u5230OSS"));
   await put("version/update.zip", updateZipPath);
-  console.log(chalk2.blue("\u66F4\u65B0\u7248\u672C\u4FE1\u606F"));
+  consola3.log(chalk2.blue("\u66F4\u65B0\u7248\u672C\u4FE1\u606F"));
   versionInfo.downloadLink = "https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip";
   const versionJSON = JSON.stringify(versionInfo, null, 2);
-  await put("version/version.json", Buffer.from(versionJSON));
-  copy(`version/history/${version}.exe`, "version/installer.exe");
-  copy(`version/history/update-${version}.zip`, "version/update.zip");
-  console.log(chalk2.yellow(versionJSON));
-};
+  await put("version/version.json", Buffer2.from(versionJSON));
+  await Promise.all([copy(`version/history/${version}.exe`, "version/installer.exe"), copy(`version/history/update-${version}.zip`, "version/update.zip")]);
+  consola3.log(chalk2.yellow(versionJSON));
+}
 var release_default = release;
 export {
   release_default as default

package/package.json

@@ -1,33 +1,37 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.2.11",
-  "main": "lib/index.js",
+  "type": "module",
+  "version": "24.1.1-beta.10",
+  "private": false,
   "author": "Neo Fu",
   "license": "MIT",
-  "private": false,
+  "main": "lib/index.js",
   "bin": {
     "widget": "lib/index.js"
   },
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
   "engines": {
     "node": "^12.0.0 || >= 14.0.0"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
     "@types/archiver": "^5.3.1",
-    "@types/gradient-string": "^1.1.2",
     "@vue/cli-shared-utils": "^5.0.8",
+    "@widget-js/core": "^24.1.1-beta.9",
     "@widget-js/ssh-config": "^4.2.1",
+    "@widget-js/utils": "^24.1.1-beta.9",
+    "@widget-js/vue3": "^24.1.1-beta.10",
     "ali-oss": "^6.17.1",
     "archiver": "^5.3.1",
+    "axios": "^1.7.2",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
     "commander": "^9.4.1",
     "consola": "^2.15.3",
     "dirname-filename-esm": "^1.1.1",
     "ejs": "^3.1.8",
+    "fast-glob": "^3.3.2",
     "figlet": "^1.5.2",
     "gradient-string": "^2.0.2",
     "inquirer": "^8.0.0",
@@ -35,24 +39,28 @@
     "ora": "^6.2.0",
     "package-json": "^8.1.0",
     "prettier": "^3.1.1",
-    "semver": "^7.3.8",
+    "semver": "^7.5.2",
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.1.0",
-    "ws": "^8.11.0",
-    "@widget-js/core": "^0.11.20",
-    "@widget-js/vue3": "^0.11.20",
-    "@widget-js/utils": "0.10.21"
+    "ws": "^8.11.0"
   },
   "devDependencies": {
+    "@antfu/eslint-config": "^2.21.1",
     "@types/ali-oss": "^6.16.7",
     "@types/ejs": "latest",
     "@types/figlet": "^1.5.5",
+    "@types/gradient-string": "^1.1.2",
     "@types/inquirer": "latest",
     "@types/jest": "^29.2.3",
+    "@types/minimist": "^1.2.5",
     "@types/node": "^18.11.13",
     "@types/semver": "^7.5.0",
     "@types/shelljs": "latest",
     "@types/ssh2-sftp-client": "^9.0.1",
+    "@widget-js/core": "^24.1.1-beta.9",
+    "@widget-js/vite-plugin-widget": "^24.1.1-beta.9",
+    "@widget-js/vue3": "^24.1.1-beta.10",
+    "eslint": "8.48.0",
     "jest": "^29.5.0",
     "pinst": "^3.0.0",
     "rimraf": "^4.4.1",
@@ -64,10 +72,7 @@
     "vitest": "^0.34.6",
     "vue-router": "^4.2.5",
     "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.0",
-    "@widget-js/vite-plugin-widget": "^1.2.8",
-    "@widget-js/core": "0.11.21",
-    "@widget-js/vue3": "^0.11.20"
+    "webpack-cli": "^5.0.0"
   },
   "scripts": {
     "build": "rimraf ./lib/ && tsup-node src/index.ts --format esm",
@@ -76,8 +81,14 @@
     "widget": "node ./lib/index.js",
     "widget:ftp": "node ./lib/index.js release -t ftp",
     "widget:init": "node ./lib/index.js init",
+    "widget:publish": "node ./lib/index.js publish -key 123",
     "widget:create": "npm run build && node ./lib/index.js create",
     "widget:local": "npm run build && node ./lib/index.js dependencies -t local",
-    "pnpm:publish": "npm run build && pnpm publish --no-git-checks"
+    "build:publish": "npm run build && npm run pnpm:publish",
+    "pnpm:publish": "pnpm publish --no-git-checks",
+    "remote": "widget dependencies -t remote && pnpm install",
+    "local": "widget dependencies -t local && pnpm install",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
 }

package/src/build/build.ts

@@ -1,27 +1,27 @@
+import { exec } from 'node:child_process'
 import ora from 'ora'
-import {exec} from 'child_process'
 import consola from 'consola'
 
 export function build() {
   const preloadSpinner = ora('Preload').start()
   const mainSpinner = ora('Main').start()
-  //@ts-ignore
+  // @ts-expect-error
   const build = exec('npm run build:preload').on('close', () => {
     consola.success('done')
   })
-  //@ts-ignore
-  build.stdout.on('data', data => {
+  // @ts-expect-error
+  build.stdout.on('data', (data) => {
     consola.log('data', data)
   })
 
-  //@ts-ignore
+  // @ts-expect-error
   exec('npm run build:main', (error, stdout, stderr) => {
     if (error) {
-      consola.error('error: ' + error)
+      consola.error(`error: ${error}`)
       return
     }
-    consola.log('stdout: ' + stdout)
-    consola.log('stderr: ' + typeof stderr)
+    consola.log(`stdout: ${stdout}`)
+    consola.log(`stderr: ${typeof stderr}`)
   })
     .on('message', () => {
       consola.log('on-message')