@widget-js/cli 1.2.4 → 1.2.6

package/lib/index.js

@@ -26,7 +26,7 @@ program.command("init").description("Initialize widget-js project").action(async
 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, command) => {
-  let release = await import("./release-NJG7IUNP.js");
+  let release = await import("./release-XUYU5WNC.js");
   await release.default(options);
 });
 program.parse(process.argv);

package/lib/{release-NJG7IUNP.js → release-XUYU5WNC.js}

@@ -198,14 +198,14 @@ var release = async (options) => {
     updateWindowsApi: false,
     downloadLink: ""
   };
-  let installerPath = path2.join(`./packaged/widgets-${version}-setup-win-x64.exe`);
+  let installerPath = path2.join(`./dist/widgets-${version}-setup-win-x64.exe`);
   if (!fs4.existsSync(installerPath)) {
-    installerPath = path2.join(`./packaged/electron-${version}-setup-win-x64.exe`);
+    installerPath = path2.join(`./dist/electron-${version}-setup-win-x64.exe`);
   }
   if (!fs4.existsSync(installerPath)) {
-    installerPath = path2.join(`./packaged/app-${version}-setup-win-x64.exe`);
+    installerPath = path2.join(`./dist/app-${version}-setup-win-x64.exe`);
   }
-  const updateZipPath = path2.join(`./packaged/update.zip`);
+  const updateZipPath = path2.join(`./dist/update.zip`);
   console.log(chalk2.blue("\u538B\u7F29\u66F4\u65B0\u6587\u4EF6\u4E2D"));
   await update_zip_default("./release", updateZipPath);
   console.log(chalk2.blue("\u4E0A\u4F20installer.exe\u5230OSS"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -34,12 +34,12 @@
     "minimatch": "^9.0.3",
     "ora": "^6.2.0",
     "package-json": "^8.1.0",
-    "semver": "^7.3.8",
     "prettier": "^2.8.8",
+    "semver": "^7.3.8",
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.1.0",
     "ws": "^8.11.0",
-    "@widget-js/utils": "0.7.19"
+    "@widget-js/utils": "0.10.21"
   },
   "devDependencies": {
     "@types/ali-oss": "^6.16.7",
@@ -60,9 +60,11 @@
     "tsup": "^6.5.0",
     "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": "0.10.19"
+    "@widget-js/vue3": "^0.11.20",
+    "@widget-js/core": "0.11.20"
   },
   "scripts": {
     "build": "rimraf ./lib/ && tsup-node src/index.ts --format esm",
@@ -73,6 +75,6 @@
     "widget:init": "node ./lib/index.js init",
     "widget:create": "npm run build && node ./lib/index.js create",
     "widget:local": "npm run build && node ./lib/index.js dependencies -t local",
-    "pnpm:publish": "pnpm publish --no-git-checks"
+    "pnpm:publish": "npm run build && pnpm publish --no-git-checks"
   }
 }

package/src/release/release.ts

@@ -45,14 +45,14 @@ const release = async (options: any) => {
     downloadLink: '',
   }
 
-  let installerPath = path.join(`./packaged/widgets-${version}-setup-win-x64.exe`)
+  let installerPath = path.join(`./dist/widgets-${version}-setup-win-x64.exe`)
   if (!fs.existsSync(installerPath)) {
-    installerPath = path.join(`./packaged/electron-${version}-setup-win-x64.exe`)
+    installerPath = path.join(`./dist/electron-${version}-setup-win-x64.exe`)
   }
   if (!fs.existsSync(installerPath)) {
-    installerPath = path.join(`./packaged/app-${version}-setup-win-x64.exe`)
+    installerPath = path.join(`./dist/app-${version}-setup-win-x64.exe`)
   }
-  const updateZipPath = path.join(`./packaged/update.zip`)
+  const updateZipPath = path.join(`./dist/update.zip`)
 
   console.log(chalk.blue('压缩更新文件中'))
   await zipDirectory('./release', updateZipPath)

package/template/WidgetConfig.ejs

@@ -1,32 +1,25 @@
 <template>
     <widget-edit-dialog :widget-params="widgetParams" :option="widgetConfigOption"
                         :widget-data="widgetData"
-                        @confirm="onSaveClick()">
-        <template v-slot:form>
-            <!--  TODO 这里写自定义表单内容          -->
-        </template>
+                        @apply="save()"
+                        @confirm="save({ closeWindow: true })">
     </widget-edit-dialog>
 </template>
 
 <script lang="ts" setup>
-import {useWidget, WidgetConfigOption,WidgetEditDialog} from "@widget-js/vue3";
-import {WidgetData, WidgetDataApi} from "@widget-js/core";
-import {reactive} from "vue";
+import {useWidget, WidgetConfigOption, WidgetEditDialog} from "@widget-js/vue3";
+import {WidgetData} from "@widget-js/core";
 
-const {widgetData, widgetParams} = useWidget(WidgetData)
+const {widgetData, widgetParams, save} = useWidget(WidgetData)
 
 //修改成需要设置组件参数配置
-const widgetConfigOption = reactive(new WidgetConfigOption({
-    custom: true,
-    backgroundColor: true,
-    borderRadius: true,
-    preview: false
-}));
+const widgetConfigOption = new WidgetConfigOption({
+  custom: true,
+  backgroundColor: true,
+  borderRadius: true,
+  preview: false
+});
 
-const onSaveClick = async () => {
-    await WidgetDataApi.save(widgetData);
-    window.close();
-}
 </script>
 
 <style scoped>

package/template/WidgetDefine.ejs

@@ -12,7 +12,7 @@ const path = "/widget/<%= snakeCaseName %>";
 //配置页路由地址
 const configPagePath = <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>"<% } else { %>undefined<% } %>;
 //组件关键词
-const <%= name %>WidgetDefine = new Widget({
+const <%= name %>Widget = new Widget({
 name: name,
 title: title,
 description: description,

package/template/WidgetRoutes.ejs

@@ -1,11 +1,12 @@
+import type { RouteRecordRaw } from 'vue-router'
 import <%= name %>WidgetDefine from "./<%= name %>.widget";
 
 const path = <%= name %>WidgetDefine.path;
 const name = <%= name %>WidgetDefine.name;
 <% if (configurable) { %>
-const configPagePath = <%= name %>WidgetDefine.configPagePath;
+const configPagePath = <%= name %>WidgetDefine.configPagePath!;
 
-const <%= name %>WidgetRoutes = [
+const <%= name %>WidgetRoutes: RouteRecordRaw[] = [
     {
         path: path,
         name: `${name}`,
@@ -18,7 +19,7 @@ const <%= name %>WidgetRoutes = [
     }
 ]
 <% } else { %>
-const <%= name %>WidgetRoutes = [
+const <%= name %>WidgetRoutes: RouteRecordRaw[] = [
     {
         path: path,
         name: `${name}`,

package/template/WidgetView.ejs

@@ -1,12 +1,12 @@
 <template>
     <widget-wrapper>
-        <!-- TODO:组件页面，这里编写组件业务逻辑-->
+        <!-- TODO:这里编写组件页面-->
     </widget-wrapper>
 </template>
 
 <script lang="ts" setup>
 import {WidgetData} from "@widget-js/core";
-import {useWidget,WidgetWrapper} from "@widget-js/vue3";
+import {useWidget} from "@widget-js/vue3";
 
 const {widgetData, widgetParams} = useWidget(WidgetData);
 </script>

package/template/widget-router.ts

@@ -1,6 +1,6 @@
+import type { RouteRecordRaw } from 'vue-router'
 //FBI WANING! IMPORT PLACE, DONT DELETE THIS LINE
-
-const WidgetRouter = [
+const WidgetRouter: RouteRecordRaw[] = [
     //FBI WANING! ROUTE PLACE, DONT DELETE THIS LINE
 ];
 export default WidgetRouter