@widget-js/cli 1.2.2 → 1.2.4

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<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

@@ -0,0 +1,6 @@
+<?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,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>

package/lib/{chunk-KAH4IVEE.js → chunk-IJH6LXRT.js}

@@ -7,6 +7,7 @@ var widgetPackages = {
   "@widget-js/core": "",
   "@widget-js/vue3": "",
   "@widget-js/cli": "",
+  "@widget-js/utils": "",
   "@widget-js/vite-plugin-widget": ""
 };
 function exit(code = 0) {

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

@@ -6,7 +6,7 @@ import {
 } from "./chunk-3GPAHQ6O.js";
 import {
   exit
-} from "./chunk-KAH4IVEE.js";
+} from "./chunk-IJH6LXRT.js";
 
 // src/createWidget.ts
 import path from "path";
@@ -165,7 +165,6 @@ 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);
-  EJSUtils.renderToFile("Widget.ejs", widgetFile, "vue", renderOptions);
   EJSUtils.renderToFile("WidgetView.ejs", widgetViewFile, "vue", renderOptions);
   EJSUtils.renderToFile("WidgetRoutes.ejs", widgetRoutesFile, "typescript", renderOptions);
   if (configurable) {

package/lib/{dependencies-UDW4LKDQ.js → dependencies-MRJDJJ6Q.js}

@@ -2,7 +2,7 @@ import {
   Utils,
   getPackagePath,
   widgetPackages
-} from "./chunk-KAH4IVEE.js";
+} from "./chunk-IJH6LXRT.js";
 
 // src/dependencies/remoteDependencies.ts
 import ora from "ora";

package/lib/index.js

@@ -11,22 +11,22 @@ 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-QSHTD2M7.js");
+  const createWidget = await import("./createWidget-UCZL7NIF.js");
   await createWidget.default();
 });
 var dependenciesOption = new Option("-t, --type <type>").choices(["remote", "local"]);
 program.command("dependencies").description("Set @widget-js dependencies to local(workspace:*) or remote(^1.0.0 etc)").addOption(dependenciesOption).action(async (options) => {
-  let dependencies = await import("./dependencies-UDW4LKDQ.js");
+  let dependencies = await import("./dependencies-MRJDJJ6Q.js");
   await dependencies.default(options);
 });
 program.command("init").description("Initialize widget-js project").action(async () => {
-  const init = await import("./init-SS2RG3IV.js");
+  const init = await import("./init-2NOIC3PQ.js");
   await init.init();
 });
 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-VEU3T5KK.js");
+  let release = await import("./release-NJG7IUNP.js");
   await release.default(options);
 });
 program.parse(process.argv);

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

@@ -6,7 +6,7 @@ import {
 } from "./chunk-3GPAHQ6O.js";
 import {
   Utils
-} from "./chunk-KAH4IVEE.js";
+} from "./chunk-IJH6LXRT.js";
 
 // src/init/init.ts
 import path from "path";

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

@@ -3,7 +3,7 @@ import {
 } from "./chunk-3GPAHQ6O.js";
 import {
   Utils
-} from "./chunk-KAH4IVEE.js";
+} from "./chunk-IJH6LXRT.js";
 
 // src/release/release.ts
 import fs4 from "fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -62,7 +62,7 @@
     "vitest": "^0.34.6",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.0",
-    "@widget-js/core": "0.10.14"
+    "@widget-js/core": "0.10.19"
   },
   "scripts": {
     "build": "rimraf ./lib/ && tsup-node src/index.ts --format esm",

package/src/createWidget.ts

@@ -193,7 +193,7 @@ export default async function createWidget() {
   const widgetRoutesFile = path.resolve(widgetDir, `${name}WidgetRoutes.ts`)
 
   EJSUtils.renderToFile('WidgetDefine.ejs', widgetDefineFile, 'typescript', renderOptions)
-  EJSUtils.renderToFile('Widget.ejs', widgetFile, 'vue', renderOptions)
+  // EJSUtils.renderToFile('Widget.ejs', widgetFile, 'vue', renderOptions)
   EJSUtils.renderToFile('WidgetView.ejs', widgetViewFile, 'vue', renderOptions)
   EJSUtils.renderToFile('WidgetRoutes.ejs', widgetRoutesFile, 'typescript', renderOptions)
   if (configurable) {

package/src/release/ftp.ts

@@ -1,140 +1,140 @@
-import path from 'path'
-import fs from 'fs'
-import SSHConfig from '@widget-js/ssh-config'
-import os from 'os'
-import Client from 'ssh2-sftp-client'
-import consola from 'consola'
-import inquirer from 'inquirer'
-import ora from 'ora'
-import * as process from 'process'
-import {Utils} from '../utils'
-import {minimatch} from 'minimatch'
-
-interface PasswordAnswer {
-  password: string
-}
-
-async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: string) => void) {
-  let dir = path.dirname(file)
-  const dirExists = await ftpClient.exists(dir)
-  if (!dirExists) {
-    onMkdir(dir)
-    await ftpClient.mkdir(dir, true)
-  }
-}
-
-async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfig: ReleaseConfig) {
-  consola.info('run ssh:', sshConfig)
-  const answer = await inquirer.prompt<PasswordAnswer>([
-    {type: 'password', name: 'password', mask: '*', message: 'Enter key pair password'},
-  ])
-
-  let ftpClient = new Client()
-  const port = sshConfig['Port']
-  const key = fs.readFileSync(path.resolve(os.homedir(), '.ssh/id_rsa'))
-  const spinner = ora('Connecting')
-  try {
-    spinner.start()
-    await ftpClient.connect({
-      host: sshConfig['HostName'] as string,
-      port: port ? parseInt(port as string) : 22,
-      username: sshConfig['User'] as string,
-      passphrase: answer.password,
-      privateKey: key,
-    })
-    releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0))
-    // upload files
-    for (let item of releaseConfig.fileMap) {
-      if (typeof item.src == 'string') {
-        if (item.remoteCopy) {
-          await checkParentDir(ftpClient, item.dest, dir => {
-            spinner.warn(`Create Dir: ${dir}`)
-          })
-          let destExists = await ftpClient.exists(item.dest)
-          if (destExists) {
-            spinner.warn(`Delete exists file:${item.dest}`)
-            await ftpClient.delete(item.dest)
-          }
-          spinner.info(`Copying File: ${item.src} -> ${item.dest}`)
-          await ftpClient.rcopy(item.src, item.dest)
-        } else {
-          const localFile = path.resolve(process.cwd(), item.src as string)
-          if (!item.remoteCopy && !fs.existsSync(localFile)) {
-            spinner.warn(`Skip not exists file:${localFile}`)
-            continue
-          }
-          if (fs.lstatSync(localFile).isDirectory()) {
-            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
-            await ftpClient.uploadDir(localFile, item.dest, {
-              filter: (filePath: string, isDirectory: boolean):boolean => {
-                if (item.ignorePattern && !isDirectory) {
-                  let fileName = path.basename(filePath)
-                  if (minimatch(fileName, item.ignorePattern)) {
-                    spinner.warn(`Skip file:${filePath}`)
-                    return false
-                  }
-                }
-                return true;
-              },
-            })
-          } else {
-            await checkParentDir(ftpClient, item.dest, dir => {
-              spinner.succeed(`Create Dir: ${dir}`)
-            })
-
-            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`)
-            await ftpClient.put(localFile, item.dest)
-          }
-        }
-      } else {
-        await ftpClient.put(Buffer.from(JSON.stringify(item.src), 'utf-8'), item.dest)
-      }
-    }
-    spinner.succeed('Files uploaded!')
-    await ftpClient.end()
-  } catch (e) {
-    spinner.fail(`Connection error:${e}`)
-    await ftpClient.end()
-  }
-}
-
-export async function ftpUpload(releaseFile: string = 'release.json') {
-  // 读取
-  const releaseJsonFilePath = path.join(process.cwd(), releaseFile)
-  const packageVersion = Utils.getPackageVersion()
-  consola.info('Package Version:', packageVersion)
-
-  let releaseJson = fs.readFileSync(releaseJsonFilePath).toString().replaceAll('${version}', packageVersion)
-  const releaseConfig = JSON.parse(releaseJson) as ReleaseConfig
-  const sshConfigFile = path.resolve(os.homedir(), '.ssh/config')
-  consola.info('SSH Config File Path:', sshConfigFile)
-  const sshConfigs = SSHConfig.parse(fs.readFileSync(sshConfigFile).toString())
-  for (let host of releaseConfig.ftpConfig.host) {
-    let sshConfig = sshConfigs.compute(host)
-    if (!sshConfig) {
-      consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
-      return
-    }
-    await runSSH(sshConfig, releaseConfig)
-  }
-}
-
-export interface FileMapConfig {
-  src: string | object
-  dest: string
-  remoteCopy: boolean
-  order: number
-  /**
-   * 支持glob、正则表达式
-   */
-  ignorePattern?: string
-}
-
-export interface ReleaseConfig {
-  fileMap: FileMapConfig[]
-  ftpConfig: FTPConfig
-}
-
-export interface FTPConfig {
-  host: string[]
-}
+import path from 'path'
+import fs from 'fs'
+import SSHConfig from '@widget-js/ssh-config'
+import os from 'os'
+import Client from 'ssh2-sftp-client'
+import consola from 'consola'
+import inquirer from 'inquirer'
+import ora from 'ora'
+import * as process from 'process'
+import {Utils} from '../utils'
+import {minimatch} from 'minimatch'
+
+interface PasswordAnswer {
+  password: string
+}
+
+async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: string) => void) {
+  let dir = path.dirname(file)
+  const dirExists = await ftpClient.exists(dir)
+  if (!dirExists) {
+    onMkdir(dir)
+    await ftpClient.mkdir(dir, true)
+  }
+}
+
+async function runSSH(sshConfig: Record<string, string | string[]>, releaseConfig: ReleaseConfig) {
+  consola.info('run ssh:', sshConfig)
+  const answer = await inquirer.prompt<PasswordAnswer>([
+    {type: 'password', name: 'password', mask: '*', message: 'Enter key pair password'},
+  ])
+
+  let ftpClient = new Client()
+  const port = sshConfig['Port']
+  const key = fs.readFileSync(path.resolve(os.homedir(), '.ssh/id_rsa'))
+  const spinner = ora('Connecting')
+  try {
+    spinner.start()
+    await ftpClient.connect({
+      host: sshConfig['HostName'] as string,
+      port: port ? parseInt(port as string) : 22,
+      username: sshConfig['User'] as string,
+      passphrase: answer.password,
+      privateKey: key,
+    })
+    releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0))
+    // upload files
+    for (let item of releaseConfig.fileMap) {
+      if (typeof item.src == 'string') {
+        if (item.remoteCopy) {
+          await checkParentDir(ftpClient, item.dest, dir => {
+            spinner.warn(`Create Dir: ${dir}`)
+          })
+          let destExists = await ftpClient.exists(item.dest)
+          if (destExists) {
+            spinner.warn(`Delete exists file:${item.dest}`)
+            await ftpClient.delete(item.dest)
+          }
+          spinner.info(`Copying File: ${item.src} -> ${item.dest}`)
+          await ftpClient.rcopy(item.src, item.dest)
+        } else {
+          const localFile = path.resolve(process.cwd(), item.src as string)
+          if (!item.remoteCopy && !fs.existsSync(localFile)) {
+            spinner.warn(`Skip not exists file:${localFile}`)
+            continue
+          }
+          if (fs.lstatSync(localFile).isDirectory()) {
+            spinner.info(`Uploading Dir: ${localFile} -> ${item.dest}`)
+            await ftpClient.uploadDir(localFile, item.dest, {
+              filter: (filePath: string, isDirectory: boolean):boolean => {
+                if (item.ignorePattern && !isDirectory) {
+                  let fileName = path.basename(filePath)
+                  if (minimatch(fileName, item.ignorePattern)) {
+                    spinner.warn(`Skip file:${filePath}`)
+                    return false
+                  }
+                }
+                return true;
+              },
+            })
+          } else {
+            await checkParentDir(ftpClient, item.dest, dir => {
+              spinner.succeed(`Create Dir: ${dir}`)
+            })
+
+            spinner.info(`Uploading File: ${localFile} -> ${item.dest}`)
+            await ftpClient.put(localFile, item.dest)
+          }
+        }
+      } else {
+        await ftpClient.put(Buffer.from(JSON.stringify(item.src), 'utf-8'), item.dest)
+      }
+    }
+    spinner.succeed('Files uploaded!')
+    await ftpClient.end()
+  } catch (e) {
+    spinner.fail(`Connection error:${e}`)
+    await ftpClient.end()
+  }
+}
+
+export async function ftpUpload(releaseFile: string = 'release.json') {
+  // 读取
+  const releaseJsonFilePath = path.join(process.cwd(), releaseFile)
+  const packageVersion = Utils.getPackageVersion()
+  consola.info('Package Version:', packageVersion)
+
+  let releaseJson = fs.readFileSync(releaseJsonFilePath).toString().replaceAll('${version}', packageVersion)
+  const releaseConfig = JSON.parse(releaseJson) as ReleaseConfig
+  const sshConfigFile = path.resolve(os.homedir(), '.ssh/config')
+  consola.info('SSH Config File Path:', sshConfigFile)
+  const sshConfigs = SSHConfig.parse(fs.readFileSync(sshConfigFile).toString())
+  for (let host of releaseConfig.ftpConfig.host) {
+    let sshConfig = sshConfigs.compute(host)
+    if (!sshConfig) {
+      consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
+      return
+    }
+    await runSSH(sshConfig, releaseConfig)
+  }
+}
+
+export interface FileMapConfig {
+  src: string | object
+  dest: string
+  remoteCopy: boolean
+  order: number
+  /**
+   * 支持glob、正则表达式
+   */
+  ignorePattern?: string
+}
+
+export interface ReleaseConfig {
+  fileMap: FileMapConfig[]
+  ftpConfig: FTPConfig
+}
+
+export interface FTPConfig {
+  host: string[]
+}

package/src/utils.ts

@@ -4,7 +4,7 @@ import fs from "fs";
 import packageJson from "package-json";
 
 export const widgetPackages: { [key: string]: string } = {
-  "@widget-js/core": "", "@widget-js/vue3": "", "@widget-js/cli": "", "@widget-js/vite-plugin-widget": ""
+  "@widget-js/core": "", "@widget-js/vue3": "", "@widget-js/cli": "","@widget-js/utils": "", "@widget-js/vite-plugin-widget": ""
 };
 export default function exit(code: number = 0) {
   if (exports.exitProcess) {

package/template/WidgetView.ejs

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

package/.idea/codeStyles/Project.xml

@@ -1,64 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/template/Widget.ejs

@@ -1,11 +0,0 @@
-<template>
-    <!-- TODO 这里只写组件内容，不做自定义数据、业务处理   -->
-</template>
-
-<script lang="ts" setup>
-
-</script>
-
-<style scoped>
-
-</style>