@widget-js/cli 1.2.7 → 1.2.9

package/lib/{chunk-36QWOCKO.js → chunk-PCGVPLNI.js}

@@ -1,23 +1,31 @@
+// src/utils/PrettierUtils.ts
+import { format } from "prettier";
+var PrettierUtils = class {
+  static async format(code, parser) {
+    return format(code, {
+      parser,
+      tabWidth: 2,
+      singleQuote: true
+    });
+  }
+};
+
 // src/utils/EJSUtils.ts
 import path from "path";
 import fs from "fs";
 import ejs from "ejs";
-import prettier from "prettier";
 import { dirname } from "dirname-filename-esm";
 var EJSUtils = class {
-  static renderToFile(templateFile, outputFile, parser, renderOptions) {
+  static async renderToFile(templateFile, outputFile, parser, renderOptions) {
     const defineTemplatePath = path.join(dirname(import.meta), "../template", templateFile);
     let defineTemplate = fs.readFileSync(defineTemplatePath, "utf8");
     let code = ejs.render(defineTemplate, renderOptions);
-    const formattedEJSCode = prettier.format(code, {
-      parser,
-      tabWidth: 2,
-      singleQuote: true
-    });
+    const formattedEJSCode = await PrettierUtils.format(code, parser);
     fs.writeFileSync(outputFile, formattedEJSCode);
   }
 };
 
 export {
+  PrettierUtils,
   EJSUtils
 };

package/lib/{createWidget-UCZL7NIF.js → createWidget-MZL6DPP2.js}

@@ -1,6 +1,6 @@
 import {
   EJSUtils
-} from "./chunk-36QWOCKO.js";
+} from "./chunk-PCGVPLNI.js";
 import {
   promptChecker_default
 } from "./chunk-3GPAHQ6O.js";
@@ -164,12 +164,12 @@ async function createWidget() {
   const widgetFile = path.resolve(widgetDir, `${name}Widget.vue`);
   const widgetViewFile = path.resolve(widgetDir, `${name}WidgetView.vue`);
   const widgetRoutesFile = path.resolve(widgetDir, `${name}WidgetRoutes.ts`);
-  EJSUtils.renderToFile("WidgetDefine.ejs", widgetDefineFile, "typescript", renderOptions);
-  EJSUtils.renderToFile("WidgetView.ejs", widgetViewFile, "vue", renderOptions);
-  EJSUtils.renderToFile("WidgetRoutes.ejs", widgetRoutesFile, "typescript", renderOptions);
+  await EJSUtils.renderToFile("WidgetDefine.ejs", widgetDefineFile, "typescript", renderOptions);
+  await EJSUtils.renderToFile("WidgetView.ejs", widgetViewFile, "vue", renderOptions);
+  await EJSUtils.renderToFile("WidgetRoutes.ejs", widgetRoutesFile, "typescript", renderOptions);
   if (configurable) {
     const configFile = path.resolve(widgetDir, `${name}ConfigView.vue`);
-    EJSUtils.renderToFile("WidgetConfig.ejs", configFile, "vue", renderOptions);
+    await EJSUtils.renderToFile("WidgetConfig.ejs", configFile, "vue", renderOptions);
   }
   const routeFile = path.join(widgetFolder, "widget-router.ts");
   let routeContent;

package/lib/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-UCZL7NIF.js");
+  const createWidget = await import("./createWidget-MZL6DPP2.js");
   await createWidget.default();
 });
 var dependenciesOption = new Option("-t, --type <type>").choices(["remote", "local"]);
@@ -20,7 +20,7 @@ program.command("dependencies").description("Set @widget-js dependencies to loca
   await dependencies.default(options);
 });
 program.command("init").description("Initialize widget-js project").action(async () => {
-  const init = await import("./init-2NOIC3PQ.js");
+  const init = await import("./init-FUMP334Y.js");
   await init.init();
 });
 var typeOption = new Option("-t, --type <type>").choices(["ftp", "oss"]);

package/lib/{init-2NOIC3PQ.js → init-FUMP334Y.js}

@@ -1,6 +1,7 @@
 import {
-  EJSUtils
-} from "./chunk-36QWOCKO.js";
+  EJSUtils,
+  PrettierUtils
+} from "./chunk-PCGVPLNI.js";
 import {
   promptChecker_default
 } from "./chunk-3GPAHQ6O.js";
@@ -25,23 +26,24 @@ async function addWidgetTs() {
     {
       type: "input",
       name: "name",
-      message: chalk.blue("\u8BF7\u8F93\u5165\u7EC4\u4EF6\u5305\u540D(\u4E00\u822C\u4E3A\u5012\u7F6E\u57DF\u540D\u3001\u53EA\u80FD\u5C0F\u5199\u5B57\u6BCD)\uFF0C\u5982\uFF1Acn.widget.countdown")
+      message: chalk.blue("\u7EC4\u4EF6\u5305\u540D \uFF08\u793A\u4F8B cn.widget.countdown\uFF09\uFF1A")
     },
     (answer) => {
       const name2 = answer.name;
       if (name2 == null || name2 === "") {
-        consola.log(chalk.red("\u5305\u540D\u4E0D\u80FD\u4E3A\u7A7A"));
+        consola.log(chalk.red(`\u7EC4\u4EF6\u5305\u540D\u4E0D\u80FD\u4E3A\u7A7A`));
         return false;
       }
       return true;
     }
   );
-  let widgetTs = path.join(process.cwd(), "widget.ts");
+  let widgetTs = path.join(process.cwd(), "widget.package.ts");
   if (!fs.existsSync(widgetTs)) {
-    spinner.info("creating widget.ts");
-    EJSUtils.renderToFile("WidgetPackage.ejs", widgetTs, "typescript", { name });
-    spinner.succeed("Done! Be sure to replace the contents of widget.ts with your own.");
+    spinner.info("creating widget.package.ts");
+    await EJSUtils.renderToFile("WidgetPackage.ejs", widgetTs, "typescript", { name });
   }
+  await addVitePlugin();
+  spinner.succeed("Done! Be sure to replace the contents of widget.package.ts with your own.");
 }
 async function addDependencies() {
   spinner.info("Adding dependencies");
@@ -61,6 +63,19 @@ async function addDependencies() {
   packageJson["devDependencies"] = devDependencies;
   fs.writeFileSync(Utils.getPackagePath(), JSON.stringify(packageJson, null, 2));
 }
+async function addVitePlugin() {
+  spinner.info("Adding vite plugin");
+  const viteConfigPath = path.join(process.cwd(), "vite.config.ts");
+  if (!fs.existsSync(viteConfigPath)) {
+    spinner.warn("vite.config.ts not exists");
+    return;
+  }
+  let viteConfig = fs.readFileSync(viteConfigPath).toString();
+  viteConfig = viteConfig.replace("import", `import widget from '@widget-js/vite-plugin-widget'
+import`);
+  viteConfig = viteConfig.replace("vue()", `vue(),widget()`);
+  fs.writeFileSync(viteConfigPath, await PrettierUtils.format(viteConfig, "typescript"));
+}
 async function addDependency(packageName, dependencies) {
   spinner.info(`Adding dependencies ${packageName}`);
   if (dependencies[packageName]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -34,11 +34,12 @@
     "minimatch": "^9.0.3",
     "ora": "^6.2.0",
     "package-json": "^8.1.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.1.1",
     "semver": "^7.3.8",
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.1.0",
     "ws": "^8.11.0",
+    "@widget-js/core": "^0.11.20",
     "@widget-js/utils": "0.10.21"
   },
   "devDependencies": {
@@ -64,7 +65,7 @@
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.0",
     "@widget-js/vue3": "^0.11.20",
-    "@widget-js/core": "0.11.20"
+    "@widget-js/core": "0.11.21"
   },
   "scripts": {
     "build": "rimraf ./lib/ && tsup-node src/index.ts --format esm",

package/src/createWidget.ts

@@ -192,13 +192,13 @@ export default async function createWidget() {
   const widgetViewFile = path.resolve(widgetDir, `${name}WidgetView.vue`)
   const widgetRoutesFile = path.resolve(widgetDir, `${name}WidgetRoutes.ts`)
 
-  EJSUtils.renderToFile('WidgetDefine.ejs', widgetDefineFile, 'typescript', renderOptions)
+  await EJSUtils.renderToFile('WidgetDefine.ejs', widgetDefineFile, 'typescript', renderOptions)
   // EJSUtils.renderToFile('Widget.ejs', widgetFile, 'vue', renderOptions)
-  EJSUtils.renderToFile('WidgetView.ejs', widgetViewFile, 'vue', renderOptions)
-  EJSUtils.renderToFile('WidgetRoutes.ejs', widgetRoutesFile, 'typescript', renderOptions)
+  await EJSUtils.renderToFile('WidgetView.ejs', widgetViewFile, 'vue', renderOptions)
+  await EJSUtils.renderToFile('WidgetRoutes.ejs', widgetRoutesFile, 'typescript', renderOptions)
   if (configurable) {
     const configFile = path.resolve(widgetDir, `${name}ConfigView.vue`)
-    EJSUtils.renderToFile('WidgetConfig.ejs', configFile, 'vue', renderOptions)
+    await EJSUtils.renderToFile('WidgetConfig.ejs', configFile, 'vue', renderOptions)
   }
   // 注册路由
   const routeFile = path.join(widgetFolder, 'widget-router.ts')

package/src/init/init.ts

@@ -1,76 +1,93 @@
-import {Utils} from "../utils";
-import path from "path";
-import process from "process";
-import fs from "fs";
-import consola from "consola";
-import promptChecker from "../promts/promptChecker";
-import chalk from "chalk";
-import {EJSUtils} from "../utils/EJSUtils";
-import ora from "ora";
-const spinner = ora("Loading");
-
-export async function init() {
-  await addDependencies();
-  await addWidgetTs();
-}
-
-async function addWidgetTs() {
-  let name = await promptChecker(
-    {
-      type: 'input',
-      name: 'name',
-      message: chalk.blue('请输入组件包名(一般为倒置域名、只能小写字母)，如：cn.widget.countdown'),
-    },
-    answer => {
-      const name = answer.name
-      if (name == null || name === '') {
-        consola.log(chalk.red('包名不能为空'))
-        return false
-      }
-      return true
-    },
-  )
-
-  let widgetTs = path.join(process.cwd(), "widget.ts");
-  if (!fs.existsSync(widgetTs)) {
-    spinner.info('creating widget.ts')
-    EJSUtils.renderToFile('WidgetPackage.ejs', widgetTs, 'typescript', {name})
-    spinner.succeed('Done! Be sure to replace the contents of widget.ts with your own.')
-  }
-}
-
-/**
- * 增加widget-js依赖
- */
-async function addDependencies() {
-  spinner.info("Adding dependencies")
-  const packageJson = Utils.getPackageJson();
-  let dependencies = packageJson["dependencies"];
-  let devDependencies = packageJson["devDependencies"];
-  if (!dependencies) {
-    dependencies = {};
-  }
-  if (!devDependencies) {
-    packageJson["devDependencies"] = {};
-  }
-
-  await addDependency('@widget-js/core', dependencies)
-  await addDependency('@widget-js/vue3', dependencies)
-  await addDependency('@widget-js/vite-plugin-widget', devDependencies)
-
-  packageJson["dependencies"] = dependencies;
-  packageJson["devDependencies"] = devDependencies;
-
-  fs.writeFileSync(Utils.getPackagePath(), JSON.stringify(packageJson, null, 2));
-}
-
-
-async function addDependency(packageName: string, dependencies: any) {
-  spinner.info(`Adding dependencies ${packageName}`)
-  if (dependencies[packageName]) {
-    return;
-  }
-  const remoteVersion = await Utils.getRemoteVersion(packageName);
-  dependencies[packageName] = `^${remoteVersion}`;
-}
-
+import {Utils} from '../utils'
+import path from 'path'
+import process from 'process'
+import fs from 'fs'
+import consola from 'consola'
+import promptChecker from '../promts/promptChecker'
+import chalk from 'chalk'
+import {EJSUtils} from '../utils/EJSUtils'
+import ora from 'ora'
+import {vi} from 'vitest'
+import {PrettierUtils} from '../utils/PrettierUtils'
+
+const spinner = ora('Loading')
+
+export async function init() {
+  await addDependencies()
+  await addWidgetTs()
+}
+
+async function addWidgetTs() {
+  let name = await promptChecker(
+    {
+      type: 'input',
+      name: 'name',
+      message: chalk.blue('组件包名 （示例 cn.widget.countdown）：'),
+    },
+    answer => {
+      const name = answer.name
+      if (name == null || name === '') {
+        consola.log(chalk.red(`组件包名不能为空`))
+        return false
+      }
+      return true
+    },
+  )
+
+  let widgetTs = path.join(process.cwd(), 'widget.package.ts')
+  if (!fs.existsSync(widgetTs)) {
+    spinner.info('creating widget.package.ts')
+    await EJSUtils.renderToFile('WidgetPackage.ejs', widgetTs, 'typescript', {name})
+  }
+
+  await addVitePlugin()
+
+  spinner.succeed('Done! Be sure to replace the contents of widget.package.ts with your own.')
+}
+
+/**
+ * 增加widget-js依赖
+ */
+async function addDependencies() {
+  spinner.info('Adding dependencies')
+  const packageJson = Utils.getPackageJson()
+  let dependencies = packageJson['dependencies']
+  let devDependencies = packageJson['devDependencies']
+  if (!dependencies) {
+    dependencies = {}
+  }
+  if (!devDependencies) {
+    packageJson['devDependencies'] = {}
+  }
+
+  await addDependency('@widget-js/core', dependencies)
+  await addDependency('@widget-js/vue3', dependencies)
+  await addDependency('@widget-js/vite-plugin-widget', devDependencies)
+
+  packageJson['dependencies'] = dependencies
+  packageJson['devDependencies'] = devDependencies
+
+  fs.writeFileSync(Utils.getPackagePath(), JSON.stringify(packageJson, null, 2))
+}
+
+async function addVitePlugin() {
+  spinner.info('Adding vite plugin')
+  const viteConfigPath = path.join(process.cwd(), 'vite.config.ts')
+  if (!fs.existsSync(viteConfigPath)) {
+    spinner.warn('vite.config.ts not exists')
+    return
+  }
+  let viteConfig = fs.readFileSync(viteConfigPath).toString()
+  viteConfig = viteConfig.replace('import', `import widget from '@widget-js/vite-plugin-widget'\nimport`)
+  viteConfig = viteConfig.replace('vue()', `vue(),widget()`)
+  fs.writeFileSync(viteConfigPath,await PrettierUtils.format(viteConfig, 'typescript'))
+}
+
+async function addDependency(packageName: string, dependencies: any) {
+  spinner.info(`Adding dependencies ${packageName}`)
+  if (dependencies[packageName]) {
+    return
+  }
+  const remoteVersion = await Utils.getRemoteVersion(packageName)
+  dependencies[packageName] = `^${remoteVersion}`
+}

package/src/utils/EJSUtils.ts

@@ -1,25 +1,17 @@
-import path from "path";
-import fs from "fs";
-import ejs, {Data} from "ejs";
-import prettier, {BuiltInParserName} from 'prettier'
-import { dirname } from 'dirname-filename-esm';
-
-export class EJSUtils{
-  static renderToFile(
-    templateFile: string,
-    outputFile: string,
-    parser: BuiltInParserName,
-    renderOptions: Data,
-  ) {
-    const defineTemplatePath = path.join(dirname(import.meta),'../template', templateFile)
-    let defineTemplate = fs.readFileSync(defineTemplatePath, 'utf8')
-    // Format the EJS code using Prettier
-    let code = ejs.render(defineTemplate, renderOptions)
-    const formattedEJSCode = prettier.format(code, {
-      parser: parser,
-      tabWidth: 2,
-      singleQuote: true,
-    })
-    fs.writeFileSync(outputFile, formattedEJSCode)
-  }
-}
+import path from 'path'
+import fs from 'fs'
+import ejs, {Data} from 'ejs'
+import {BuiltInParserName} from 'prettier'
+import {dirname} from 'dirname-filename-esm'
+import {PrettierUtils} from './PrettierUtils'
+
+export class EJSUtils {
+  static async renderToFile(templateFile: string, outputFile: string, parser: BuiltInParserName, renderOptions: Data) {
+    const defineTemplatePath = path.join(dirname(import.meta), '../template', templateFile)
+    let defineTemplate = fs.readFileSync(defineTemplatePath, 'utf8')
+    // Format the EJS code using Prettier
+    let code = ejs.render(defineTemplate, renderOptions)
+    const formattedEJSCode =await PrettierUtils.format(code,parser)
+    fs.writeFileSync(outputFile, formattedEJSCode)
+  }
+}

package/src/utils/PrettierUtils.ts

@@ -0,0 +1,11 @@
+import {BuiltInParserName, format} from 'prettier'
+
+export class PrettierUtils {
+  static async format(code: string, parser: BuiltInParserName) {
+    return format(code, {
+      parser: parser,
+      tabWidth: 2,
+      singleQuote: true,
+    })
+  }
+}

package/template/WidgetPackage.ejs

@@ -10,8 +10,6 @@ export default new WidgetPackage({
   hash: true,
   homepage: '',
   name: '<%= name  %>',
-  remoteEntry: '',
-  remotePackage: '',
   title: {
     'zh-CN': '修改成你的组件标题',
   },

package/vite.config.ts

@@ -0,0 +1,14 @@
+import { fileURLToPath, URL } from 'node:url';
+
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [vue()],
+  resolve: {
+    alias: {
+      '@': fileURLToPath(new URL('./src', import.meta.url)),
+    },
+  },
+});

package/widget.package.ts

@@ -1,23 +0,0 @@
-import {WidgetPackage} from "@widget-js/core";
-
-export default new WidgetPackage({
-  author: "Neo Fu",
-  description: {
-    "zh-CN": "包含知乎、B站、抖音、微博等平台的热搜组件。",
-  },
-  entry: "index.html",
-  hash: true,
-  homepage: "https://widgetjs.cn",
-  name: "cn.widgetjs.widgets.hotspot",
-  remoteEntry: "https://rtugeek.gitee.io/hotspot",
-  remotePackage: "https://rtugeek.gitee.io/hotspot/widget.json",
-  title: {
-    "zh-CN": "全网热点组件",
-  },
-  version: "1.0.0",
-  devOptions: {
-    folder: "./src/widgets/",
-    route: true,
-    devUrl: "http://localhost:5173/hotspot"
-  }
-});