@widget-js/cli 24.1.1-beta.40 → 24.1.1-beta.43

package/dist/index.js

@@ -35,7 +35,7 @@ program.command("publish").description("Publish widget package with developer ke
 var typeOption = new Option("-t, --type <type>").choices(["ftp", "oss"]);
 var fileOption = new Option("-f, --file <file>");
 program.command("release").description("\u901A\u8FC7FTP/OSS\u53D1\u5E03\u6587\u4EF6\uFF0C\u4EC5\u5185\u90E8\u4F7F\u7528").addOption(typeOption).addOption(fileOption).action(async (options) => {
-  const release = await import("./release-5GS34BAJ.js");
+  const release = await import("./release-MBNSS6M2.js");
   await release.default(options);
 });
 program.parse(process.argv);

package/dist/{release-5GS34BAJ.js → release-MBNSS6M2.js}

@@ -35,46 +35,52 @@ import fs2 from "node:fs";
 import OSS from "ali-oss";
 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";
-var headers = {
-  // 指定Object的存储类型。
-  "x-oss-storage-class": "Standard",
-  // 指定Object的访问权限。
-  "x-oss-object-acl": "public-read",
-  "x-oss-forbid-overwrite": "false",
-  "Cache-Control": "no-cache"
-};
-var clinet = new OSS({
-  // yourRegion填写Bucket所在地域。以华东1（杭州）为例，Region填写为oss-cn-hangzhou。
-  region: "oss-cn-hangzhou",
-  // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
-  accessKeyId: AccessKeyID,
-  accessKeySecret: AccessKeySecret,
-  bucket: "widget-fun"
-});
-async function put(ossPath, file) {
-  try {
-    await clinet.put(ossPath, file, { headers });
-    consola.log(chalk.green(`\u4E0A\u4F20\u6210\u529F\uFF1A${file}->${ossPath}`));
-  } catch (e) {
-    consola.log(e);
+var OssClient = class {
+  headers = {
+    // 指定Object的存储类型。
+    "x-oss-storage-class": "Standard",
+    // 指定Object的访问权限。
+    "x-oss-object-acl": "public-read",
+    "x-oss-forbid-overwrite": "false",
+    "Cache-Control": "no-cache"
+  };
+  client;
+  constructor() {
+    const packageData = JSON.parse(fs2.readFileSync("./package.json").toString());
+    const AccessKeyID = packageData.oss?.id ?? "default";
+    const AccessKeySecret = packageData.oss?.secret ?? "default";
+    this.client = new OSS({
+      // yourRegion填写Bucket所在地域。以华东1（杭州）为例，Region填写为oss-cn-hangzhou。
+      region: "oss-cn-hangzhou",
+      // 阿里云账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM用户进行API访问或日常运维，请登录RAM控制台创建RAM用户。
+      accessKeyId: AccessKeyID,
+      accessKeySecret: AccessKeySecret,
+      bucket: "widget-fun"
+    });
   }
-}
-async function copy(dist, src) {
-  try {
-    await clinet.copy(dist, src, { headers });
-    consola.log(chalk.green(`\u590D\u5236\u6210\u529F\uFF1A${src}->${dist}`));
-  } catch (e) {
-    console.error(e);
+  async put(ossPath, file) {
+    try {
+      await this.client.put(ossPath, file, { headers: this.headers });
+      consola.log(chalk.green(`\u4E0A\u4F20\u6210\u529F\uFF1A${file}->${ossPath}`));
+    } catch (e) {
+      consola.log(e);
+    }
   }
-}
+  async copy(dist, src) {
+    try {
+      await this.client.copy(dist, src, { headers: this.headers });
+      consola.log(chalk.green(`\u590D\u5236\u6210\u529F\uFF1A${src}->${dist}`));
+    } catch (e) {
+      console.error(e);
+    }
+  }
+};
 
 // src/release/ftp.ts
 import path from "node:path";
 import fs3 from "node:fs";
 import os from "node:os";
+import Buffer from "node:buffer";
 import * as process from "node:process";
 import SSHConfig from "@widget-js/ssh-config";
 import Client from "ssh2-sftp-client";
@@ -163,9 +169,13 @@ async function runSSH(sshConfig, releaseConfig) {
 }
 async function ftpUpload(releaseFile = "release.json") {
   const releaseJsonFilePath = path.join(process.cwd(), releaseFile);
-  const packageVersion = Utils.getPackageVersion();
-  consola2.info("Package Version:", packageVersion);
-  const releaseJson = fs3.readFileSync(releaseJsonFilePath).toString().replaceAll("${version}", packageVersion);
+  let releaseJson = fs3.readFileSync(releaseJsonFilePath).toString();
+  const hasPackageJson = fs3.existsSync(Utils.getPackagePath());
+  if (hasPackageJson) {
+    const packageVersion = Utils.getPackageVersion();
+    consola2.info("Package Version:", packageVersion);
+    releaseJson = releaseJson.replaceAll(`\${version}`, packageVersion);
+  }
   const releaseConfig = JSON.parse(releaseJson);
   const sshConfigFile = path.resolve(os.homedir(), ".ssh/config");
   consola2.info("SSH Config File Path:", sshConfigFile);
@@ -212,16 +222,17 @@ async function release(options) {
   }
   const updateZipPath = path2.join(`./dist/update.zip`);
   consola3.log(chalk2.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
+  const ossClient = new OssClient();
   await update_zip_default("./release", updateZipPath);
   consola3.log(chalk2.blue("\u4E0A\u4F20installer.exe\u5230OSS"));
-  await put("version/installer.exe", installerPath);
+  await ossClient.put("version/installer.exe", installerPath);
   consola3.log(chalk2.blue("\u4E0A\u4F20update.zip\u5230OSS"));
-  await put("version/update.zip", updateZipPath);
+  await ossClient.put("version/update.zip", updateZipPath);
   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", Buffer2.from(versionJSON));
-  await Promise.all([copy(`version/history/${version}.exe`, "version/installer.exe"), copy(`version/history/update-${version}.zip`, "version/update.zip")]);
+  await ossClient.put("version/version.json", Buffer2.from(versionJSON));
+  await Promise.all([ossClient.copy(`version/history/${version}.exe`, "version/installer.exe"), ossClient.copy(`version/history/update-${version}.zip`, "version/update.zip")]);
   consola3.log(chalk2.yellow(versionJSON));
 }
 var release_default = release;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@widget-js/cli",
   "type": "module",
-  "version": "24.1.1-beta.40",
+  "version": "24.1.1-beta.43",
   "private": false,
   "author": "Neo Fu",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "fast-glob": "^3.3.2",
     "figlet": "^1.5.2",
     "gradient-string": "^2.0.2",
-    "inquirer": "^8.0.0",
+    "inquirer": "^8.2.6",
     "minimatch": "^9.0.3",
     "ora": "^6.2.0",
     "package-json": "^10.0.1",
@@ -44,8 +44,8 @@
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.1.0",
     "ws": "^8.11.0",
-    "@widget-js/core": "24.1.1-beta.40",
-    "@widget-js/vue3": "24.1.1-beta.40",
+    "@widget-js/core": "24.1.1-beta.49",
+    "@widget-js/vue3": "24.1.1-beta.48",
     "@widget-js/utils": "24.1.1-beta.40"
   },
   "devDependencies": {
@@ -72,11 +72,9 @@
     "typescript": "^5.2.2",
     "vitest": "^0.34.6",
     "vue-router": "^4.2.5",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.0",
-    "@widget-js/core": "24.1.1-beta.40",
-    "@widget-js/vue3": "24.1.1-beta.40",
-    "@widget-js/vite-plugin-widget": "24.1.1-beta.40"
+    "@widget-js/core": "24.1.1-beta.49",
+    "@widget-js/vite-plugin-widget": "24.1.1-beta.41",
+    "@widget-js/vue3": "24.1.1-beta.48"
   },
   "scripts": {
     "build": "tsup-node src/index.ts",

package/readme.md

@@ -10,3 +10,34 @@ pnpm add -D @widget-js/cli
 ```shell
 npx widget
 ```
+
+### Release
+
+```shell
+# 通过ftp发布
+widget release -t ftp
+# 通过oss发布
+widget release -t oss
+```
+#### example
+create `release.json` at project root dir
+```json
+{
+  "fileMap": [
+    {
+      "src": "./dist/",
+      "dest": "/www/wwwroot/test/root/"
+    },
+    {
+      "src": "package.json",
+      "dest": "/www/wwwroot/test/package.json"
+    }
+  ],
+  "ftpConfig": {
+    "host": [
+      "itime"                                           👈~/.ssh/config 里的host名
+    ]
+  }
+}
+```
+this will upload `dist` and `package.json` to ftp server

package/template/WidgetRoutes.ejs

@@ -10,12 +10,12 @@ const <%= name %>WidgetRoutes: RouteRecordRaw[] = [
     {
         path: path,
         name: `${name}`,
-        component: () => import(/* webpackChunkName: "<%= widgetName %>" */ './<%= name %>WidgetView.vue')
+        component: () => import('./<%= name %>WidgetView.vue')
     },
     {
         path: configPagePath,
         name: `${name}.config`,
-        component: () => import(/* webpackChunkName: "<%= widgetName %>.config" */ './<%= name %>ConfigView.vue')
+        component: () => import('./<%= name %>ConfigView.vue')
     }
 ]
 <% } else { %>
@@ -23,7 +23,7 @@ const <%= name %>WidgetRoutes: RouteRecordRaw[] = [
     {
         path: path,
         name: `${name}`,
-        component: () => import(/* webpackChunkName: "<%= widgetName %>" */ './<%= name %>WidgetView.vue')
+        component: () => import('./<%= name %>WidgetView.vue')
     }
 ]
 <% }  %>

package/template/WidgetView.ejs

@@ -1,6 +1,8 @@
 <template>
     <widget-wrapper>
-        <span>Hello World!</span>
+        <div class="content">
+            Hello World!
+        </div>
     </widget-wrapper>
 </template>
 
@@ -11,5 +13,8 @@ const {widgetParams} = useWidget();
 </script>
 
 <style scoped>
-
+.content{
+    padding: 1rem;
+    color: var(--widget-color)
+}
 </style>