@widget-js/cli 1.2.8 → 1.2.9

package/lib/{chunk-YHUBPHJK.js → chunk-PCGVPLNI.js}

@@ -1,8 +1,8 @@
 // src/utils/PrettierUtils.ts
-import prettier from "prettier";
+import { format } from "prettier";
 var PrettierUtils = class {
-  static format(code, parser) {
-    return prettier.format(code, {
+  static async format(code, parser) {
+    return format(code, {
       parser,
       tabWidth: 2,
       singleQuote: true
@@ -16,11 +16,11 @@ import fs from "fs";
 import ejs from "ejs";
 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 = PrettierUtils.format(code, parser);
+    const formattedEJSCode = await PrettierUtils.format(code, parser);
     fs.writeFileSync(outputFile, formattedEJSCode);
   }
 };

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

@@ -1,6 +1,6 @@
 import {
   EJSUtils
-} from "./chunk-YHUBPHJK.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-SD5E5C5P.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-AO2J5DEO.js");
+  const init = await import("./init-FUMP334Y.js");
   await init.init();
 });
 var typeOption = new Option("-t, --type <type>").choices(["ftp", "oss"]);

package/lib/{init-AO2J5DEO.js → init-FUMP334Y.js}

@@ -1,7 +1,7 @@
 import {
   EJSUtils,
   PrettierUtils
-} from "./chunk-YHUBPHJK.js";
+} from "./chunk-PCGVPLNI.js";
 import {
   promptChecker_default
 } from "./chunk-3GPAHQ6O.js";
@@ -40,9 +40,9 @@ async function addWidgetTs() {
   let widgetTs = path.join(process.cwd(), "widget.package.ts");
   if (!fs.existsSync(widgetTs)) {
     spinner.info("creating widget.package.ts");
-    EJSUtils.renderToFile("WidgetPackage.ejs", widgetTs, "typescript", { name });
+    await EJSUtils.renderToFile("WidgetPackage.ejs", widgetTs, "typescript", { name });
   }
-  addVitePlugin();
+  await addVitePlugin();
   spinner.succeed("Done! Be sure to replace the contents of widget.package.ts with your own.");
 }
 async function addDependencies() {
@@ -74,7 +74,7 @@ async function addVitePlugin() {
   viteConfig = viteConfig.replace("import", `import widget from '@widget-js/vite-plugin-widget'
 import`);
   viteConfig = viteConfig.replace("vue()", `vue(),widget()`);
-  fs.writeFileSync(viteConfigPath, PrettierUtils.format(viteConfig, "typescript"));
+  fs.writeFileSync(viteConfigPath, await PrettierUtils.format(viteConfig, "typescript"));
 }
 async function addDependency(packageName, dependencies) {
   spinner.info(`Adding dependencies ${packageName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "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",
@@ -64,9 +64,8 @@
     "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"
+    "@widget-js/vue3": "^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

@@ -37,10 +37,10 @@ async function addWidgetTs() {
   let widgetTs = path.join(process.cwd(), 'widget.package.ts')
   if (!fs.existsSync(widgetTs)) {
     spinner.info('creating widget.package.ts')
-    EJSUtils.renderToFile('WidgetPackage.ejs', widgetTs, 'typescript', {name})
+    await EJSUtils.renderToFile('WidgetPackage.ejs', widgetTs, 'typescript', {name})
   }
 
-  addVitePlugin()
+  await addVitePlugin()
 
   spinner.succeed('Done! Be sure to replace the contents of widget.package.ts with your own.')
 }
@@ -80,7 +80,7 @@ async function addVitePlugin() {
   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, PrettierUtils.format(viteConfig, 'typescript'))
+  fs.writeFileSync(viteConfigPath,await PrettierUtils.format(viteConfig, 'typescript'))
 }
 
 async function addDependency(packageName: string, dependencies: any) {

package/src/utils/EJSUtils.ts

@@ -6,12 +6,12 @@ import {dirname} from 'dirname-filename-esm'
 import {PrettierUtils} from './PrettierUtils'
 
 export class EJSUtils {
-  static renderToFile(templateFile: string, outputFile: string, parser: BuiltInParserName, renderOptions: Data) {
+  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 = PrettierUtils.format(code,parser)
+    const formattedEJSCode =await PrettierUtils.format(code,parser)
     fs.writeFileSync(outputFile, formattedEJSCode)
   }
 }

package/src/utils/PrettierUtils.ts

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

package/vite.config.ts

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

package/widget.package.ts

@@ -1,20 +0,0 @@
-import { WidgetPackage } from '@widget-js/core';
-
-//TODO 完善组件包信息
-export default new WidgetPackage({
-  author: '修改成你的信息',
-  description: {
-    'zh-CN': '修改成你的组件描述',
-  },
-  entry: 'index.html',
-  hash: true,
-  homepage: '',
-  name: 'cn.te',
-  title: {
-    'zh-CN': '修改成你的组件标题',
-  },
-  version: '1.0.0',
-  devOptions: {
-    folder: './src/widgets/',
-  },
-});