@widget-js/cli 24.1.1-beta.2 → 24.1.1-beta.30

package/{lib/createWidget-4LQ6PVEM.js → dist/createWidget-EFGZUM5G.js}

@@ -157,7 +157,6 @@ async function createWidget() {
     minWidth
   };
   const widgetDefineFile = path.resolve(widgetDir, `${name}.widget.ts`);
-  const widgetFile = path.resolve(widgetDir, `${name}Widget.vue`);
   const widgetViewFile = path.resolve(widgetDir, `${name}WidgetView.vue`);
   const widgetRoutesFile = path.resolve(widgetDir, `${name}WidgetRoutes.ts`);
   await EJSUtils.renderToFile("WidgetDefine.ejs", widgetDefineFile, "typescript", renderOptions);
@@ -178,14 +177,14 @@ async function createWidget() {
   const routeStr = `...${name}WidgetRoutes,`;
   if (!routeContent.includes(importRouteStr)) {
     routeContent = routeContent.replaceAll(
-      "//FBI WANING! IMPORT PLACE",
+      "// FBI WANING! IMPORT PLACE",
       `${importRouteStr}
 //FBI WANING! IMPORT PLACE`
     );
   }
   if (!routeContent.includes(routeStr)) {
-    routeContent = routeContent.replaceAll("//FBI WANING! ROUTE PLACE", `${routeStr}
-    //FBI WANING! ROUTE PLACE`);
+    routeContent = routeContent.replaceAll("// FBI WANING! ROUTE PLACE", `${routeStr}
+    // FBI WANING! ROUTE PLACE`);
   }
   fs.writeFileSync(routeFile, routeContent);
   const gitAdd = `git add ${widgetDir}`;

package/{lib → dist}/index.js

@@ -11,7 +11,7 @@ var cliPackage = JSON.parse(fs.readFileSync(packageJsonPath).toString());
 console.log(gradient.pastel.multiline(figlet.textSync("widget-cli", { horizontalLayout: "full" })));
 program.version(`@widget-js/cli ${cliPackage.version}`).usage("<command> [options]");
 program.command("create").description("Create new widget").action(async () => {
-  const createWidget = await import("./createWidget-4LQ6PVEM.js");
+  const createWidget = await import("./createWidget-EFGZUM5G.js");
   await createWidget.default();
 });
 var dependenciesOption = new Option("-t, --type <type>").choices(["remote", "local"]);
@@ -23,10 +23,15 @@ program.command("init").description("Initialize widget-js project").action(async
   const init = await import("./init-HCEGKTNF.js");
   await init.init();
 });
+var keyOption = new Option("-k, --key <key>");
+program.command("publish").description("Publish widget package with developer key").addOption(keyOption).action(async (options) => {
+  const publishImport = await import("./publish-C52GHJWG.js");
+  await publishImport.publish(options);
+});
 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) => {
-  const release = await import("./release-PIRAQ7A6.js");
+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");
   await release.default(options);
 });
 program.parse(process.argv);

package/dist/publish-C52GHJWG.js

@@ -0,0 +1,50 @@
+// src/publish/index.ts
+import fs from "node:fs";
+import fastGlob from "fast-glob";
+import axios from "axios";
+import consola from "consola";
+import ora from "ora";
+async function publish(options) {
+  if (!options.key) {
+    consola.error("Please provide a developer key with -k or --key option.");
+    return;
+  }
+  const spinner = ora("Search widget.json").start();
+  try {
+    const files = await fastGlob("**/widget.json", { onlyFiles: true, ignore: ["node_modules/**"], absolute: true });
+    if (files.length === 0) {
+      spinner.fail("No widget.json file found.");
+      return;
+    }
+    spinner.succeed(`Widget.json found: ${files[0]}`);
+    const widgetPath = files[0];
+    const widgetContent = fs.readFileSync(widgetPath, "utf-8");
+    const json = JSON.parse(widgetContent);
+    consola.info(`Package name:${json.name}`);
+    const widgets = json.widgets;
+    consola.info(`Widget size:${widgets?.length ?? 0}`);
+    spinner.start("Publishing widget package...");
+    const response = await axios.post("https://widgetjs.cn/api/v1/widget/package", json, {
+      headers: {
+        "Content-Type": "application/json",
+        "Key": options.key
+      }
+    });
+    if (response.data) {
+      if (response.data.code == 200) {
+        spinner.succeed("Widget published successfully.");
+      } else {
+        spinner.fail("Failed to publish widget.");
+        consola.error(response.data.msg);
+      }
+    } else {
+      spinner.fail("Empty Response");
+    }
+  } catch (error) {
+    spinner.fail("Failed to publish widget.");
+    consola.error(error);
+  }
+}
+export {
+  publish
+};

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

@@ -19,7 +19,11 @@ 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();
   });

package/package.json

@@ -1,35 +1,43 @@
 {
   "name": "@widget-js/cli",
   "type": "module",
-  "version": "24.1.1-beta.2",
+  "version": "24.1.1-beta.30",
   "private": false,
   "author": "Neo Fu",
   "license": "MIT",
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "bin": {
-    "widget": "lib/index.js"
+    "widget": "dist/index.js"
   },
   "engines": {
     "node": "^12.0.0 || >= 14.0.0"
   },
+  "files": [
+    "dist",
+    "template"
+  ],
   "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/vue3": "^0.11.20",
+    "@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",
     "minimatch": "^9.0.3",
     "ora": "^6.2.0",
@@ -38,14 +46,14 @@
     "semver": "^7.5.2",
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.1.0",
-    "ws": "^8.11.0",
-    "@widget-js/core": "24.1.1-beta.2",
-    "@widget-js/utils": "24.1.1-beta.2"
+    "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",
@@ -53,8 +61,10 @@
     "@types/semver": "^7.5.0",
     "@types/shelljs": "latest",
     "@types/ssh2-sftp-client": "^9.0.1",
-    "@widget-js/vite-plugin-widget": "^1.2.8",
-    "gradient-string": "^2.0.2",
+    "@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",
@@ -66,20 +76,24 @@
     "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.2",
-    "@widget-js/vue3": "^0.11.20"
+    "webpack-cli": "^5.0.0"
   },
   "scripts": {
-    "build": "rimraf ./lib/ && tsup-node src/index.ts --format esm",
-    "watch": "tsup src/index.ts --format esm --watch",
+    "build": "rimraf ./dist/ && tsup-node src/index.ts",
+    "watch": "tsup-node src/index.ts --watch",
     "build:run": "npm run build && npm run widget",
-    "widget": "node ./lib/index.js",
-    "widget:ftp": "node ./lib/index.js release -t ftp",
-    "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",
+    "widget": "node ./dist/index.js",
+    "widget:ftp": "node ./dist/index.js release -t ftp",
+    "widget:init": "node ./dist/index.js init",
+    "widget:publish": "node ./dist/index.js publish -key 123",
+    "widget:create": "npm run build && node ./dist/index.js create",
+    "widget:local": "npm run build && node ./dist/index.js dependencies -t local",
     "build:publish": "npm run build && npm run pnpm:publish",
-    "pnpm:publish": "pnpm publish --no-git-checks"
+    "pnpm:publish": "pnpm publish --no-git-checks",
+    "remote": "widget dependencies -t remote && pnpm install",
+    "local": "widget dependencies -t local && pnpm install",
+    "link": "pnpm link --global",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
 }

package/template/WidgetConfig.ejs

@@ -1,16 +1,12 @@
 <template>
-    <widget-edit-dialog :widget-params="widgetParams" :option="widgetConfigOption"
-                        v-model="widgetData"
-                        @apply="save()"
-                        @confirm="save({ closeWindow: true })">
+    <widget-edit-dialog :widget-params="widgetParams" :option="widgetConfigOption">
     </widget-edit-dialog>
 </template>
 
 <script lang="ts" setup>
 import {useWidget, WidgetConfigOption} from "@widget-js/vue3";
-import {WidgetData} from "@widget-js/core";
 
-const {widgetData, widgetParams, save} = useWidget(WidgetData)
+const {widgetParams } = useWidget()
 
 //修改成需要设置组件参数配置
 const widgetConfigOption = new WidgetConfigOption({

package/template/WidgetDefine.ejs

@@ -1,22 +1,11 @@
 import {Widget, WidgetKeyword} from "@widget-js/core";
 //TODO 修改组件信息，标题，描述，关键词
-const name = "<%= widgetName %>";
-//组件标题
-const title = {"zh-CN": "<%= title %>"};
-//组件描述
-const description = {"zh-CN": ""};
-//组件关键词
-const keywords = [WidgetKeyword.RECOMMEND];
-//组件路由地址
-const path = "/widget/<%= snakeCaseName %>";
-//配置页路由地址
-const configPagePath = <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>"<% } else { %>undefined<% } %>;
-//组件关键词
 const <%= name %>Widget = new Widget({
-name: name,
-title: title,
-description: description,
-keywords: keywords,
+name: "<%= widgetName %>",
+title: {"zh-CN": "<%= title %>"},
+description: {"zh-CN": ""},
+keywords: [WidgetKeyword.RECOMMEND],
+categories: [],
 lang: "zh-CN",
 width: <%= width %>,
 height: <%= height %>,
@@ -25,8 +14,8 @@ maxWidth: <%= maxWidth %>,
 minHeight: <%= minHeight %>,
 maxHeight: <%= maxHeight %>,
 previewImage: "修改为组件预览图地址",
-path,
-configPagePath
+path: "/widget/<%= snakeCaseName %>",
+configPagePath: <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>?width=600&height=500&frame=true&transparent=false"<% } else { %>undefined<% } %>
 })
 
 export default <%= name %>Widget;

package/template/WidgetRoutes.ejs

@@ -4,7 +4,7 @@ import <%= name %>Widget from "./<%= name %>.widget";
 const path = <%= name %>Widget.path;
 const name = <%= name %>Widget.name;
 <% if (configurable) { %>
-const configPagePath = <%= name %>Widget.configPagePath!;
+const configPagePath = <%= name %>Widget.configPagePath!.split('?')[0];
 
 const <%= name %>WidgetRoutes: RouteRecordRaw[] = [
     {

package/template/WidgetView.ejs

@@ -5,10 +5,9 @@
 </template>
 
 <script lang="ts" setup>
-import {WidgetData} from "@widget-js/core";
 import {useWidget} from "@widget-js/vue3";
 
-const {widgetData, widgetParams} = useWidget(WidgetData);
+const {widgetParams} = useWidget();
 </script>
 
 <style scoped>

package/template/widget-router.ts

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

package/.editorconfig

@@ -1,16 +0,0 @@
-[*]
-charset = utf-8
-end_of_line = crlf
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-max_line_length = 120
-tab_width = 2
-trim_trailing_whitespace = true
-ij_continuation_indent_size = 2
-ij_formatter_off_tag = @formatter:off
-ij_formatter_on_tag = @formatter:on
-ij_formatter_tags_enabled = false
-ij_smart_tabs = false
-ij_visual_guides = none
-ij_wrap_on_typing = false

package/.idea/cli.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/jpa-buddy.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JpaBuddyIdeaProjectConfig">
-    <option name="renamerInitialized" value="true" />
-  </component>
-</project>

package/.idea/misc.xml

@@ -1,8 +0,0 @@
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="jpab" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/cli.iml" filepath="$PROJECT_DIR$/.idea/cli.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
-  </component>
-</project>

package/.prettierrc

@@ -1,21 +0,0 @@
-{
-  "printWidth": 120,
-  "semi": false,
-  "singleQuote": true,
-  "overrides": [
-    {
-      "files": ["**/*.css", "**/*.scss", "**/*.html"],
-      "options": {
-        "singleQuote": false
-      }
-    }
-  ],
-  "trailingComma": "all",
-  "bracketSpacing": false,
-  "arrowParens": "avoid",
-  "proseWrap": "never",
-  "htmlWhitespaceSensitivity": "strict",
-  "vueIndentScriptAndStyle": false,
-  "endOfLine": "lf",
-  "singleAttributePerLine": true
-}

package/jest.config.js

@@ -1,14 +0,0 @@
-module.exports = {
-  roots: ['<rootDir>/test'],
-  testMatch: [
-    '**/__tests__/**/*.+(ts|tsx|js)',
-    '**/?(*.)+(spec|test).+(ts|tsx|js)',
-  ],
-  transform: {
-    '^.+\\.(ts|tsx)$': ['ts-jest', {
-      tsconfig: 'tsconfig.json',
-    }],
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-      './config/fileTransformer.js',
-  },
-}

package/release.json

@@ -1,9 +0,0 @@
-{
-  "fileMap": [
-  ],
-  "ftpConfig": {
-    "host": [
-      "itime"
-    ]
-  }
-}

package/src/build/build.ts

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