@widget-js/cli 24.1.1-beta.15 → 24.1.1-beta.17

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

@@ -178,14 +178,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-EBGZI7JV.js");
   await createWidget.default();
 });
 var dependenciesOption = new Option("-t, --type <type>").choices(["remote", "local"]);

package/package.json

@@ -1,17 +1,21 @@
 {
   "name": "@widget-js/cli",
   "type": "module",
-  "version": "24.1.1-beta.15",
+  "version": "24.1.1-beta.17",
   "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"
   },
@@ -75,19 +79,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:publish": "node ./lib/index.js publish -key 123",
-    "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",
     "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

@@ -5,6 +5,7 @@ name: "<%= widgetName %>",
 title: {"zh-CN": "<%= title %>"},
 description: {"zh-CN": ""},
 keywords: [WidgetKeyword.RECOMMEND],
+categories: [],
 lang: "zh-CN",
 width: <%= width %>,
 height: <%= height %>,
@@ -14,7 +15,7 @@ minHeight: <%= minHeight %>,
 maxHeight: <%= maxHeight %>,
 previewImage: "修改为组件预览图地址",
 path: "/widget/<%= snakeCaseName %>",
-configPagePath: <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>"<% } else { %>undefined<% } %>
+configPagePath: <% if (configurable) { %>"/widget/config/<%= snakeCaseName %>?width=600&height=500&frame=true&transparent=false"<% } else { %>undefined<% } %>
 })
 
 export default <%= name %>Widget;

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/.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/codeStyles/Project.xml

@@ -1,60 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_TYPE_BRACES" value="false" />
-    </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="120" />
-      <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="120" />
-      <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="120" />
-      <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="120" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </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/.idea/misc.xml

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

package/src/createWidget.ts

@@ -1,232 +0,0 @@
-import path from 'node:path'
-import fs from 'node:fs'
-import { fileURLToPath } from 'node:url'
-import consola from 'consola'
-import { paramCase, snakeCase } from 'change-case'
-import inquirer from 'inquirer'
-import shell from 'shelljs'
-import chalk from 'chalk'
-import { scanWidgetPackage } from '@widget-js/utils'
-import exit from './utils.js'
-import promptChecker from './promts/promptChecker'
-import { EJSUtils } from './utils/EJSUtils'
-import { WidgetPackageUtils } from './utils/WidgetPackageUtils'
-
-// import vm from "vm";
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-interface RenderOptions {
-  name: string
-  snakeCaseName: string
-  paramCaseName: string
-  packageName: string
-  widgetName: string
-  title: string
-  configurable: string
-  width: number
-  height: number
-  maxWidth: number
-  minHeight: number
-  maxHeight: number
-  minWidth: number
-}
-
-export default async function createWidget() {
-  const widgetPackage = await scanWidgetPackage()
-  if (!widgetPackage) {
-    consola.error('widget.ts or widget.json not found')
-    return
-  }
-  const widgetRootDir = WidgetPackageUtils.getRootDir(widgetPackage)
-  if (widgetPackage.devOptions && widgetPackage.devOptions.folder) {
-    consola.info(`组件路径：${widgetRootDir}`)
-  }
-  else {
-    consola.info(`没有配置devOptions.folder，使用默认路径${widgetRootDir}`)
-  }
-
-  const getMiddleValue = (arr: number[]) => {
-    if (arr.length === 1) {
-      return arr[0]
-    }
-    else if (arr.length === 2) {
-      return Math.max(...arr)
-    }
-    else {
-      const max = Math.max(...arr)
-      const min = Math.min(...arr)
-      const sum = arr[0] + arr[1] + arr[2]
-      return sum - max - min
-    }
-  }
-
-  const name = await promptChecker(
-    {
-      type: 'input',
-      name: 'name',
-      message: chalk.blue('请输入组件名(大驼峰式)，如：CountdownClock'),
-    },
-    (answer) => {
-      const name = answer.name
-      if (name == null || name === '') {
-        consola.log(chalk.red('组件名不能为空'))
-        return false
-      }
-      return true
-    },
-  )
-
-  consola.log(chalk.green(name))
-
-  const title = await promptChecker({
-    type: 'input',
-    name: 'title',
-    message: chalk.blue('请输入组件标题，如：倒计时'),
-  })
-  consola.log(chalk.green(title))
-  const answerW = await promptChecker(
-    {
-      type: 'checkbox',
-      name: 'w',
-      message: chalk.blue(
-        '请选择组件宽度，最多选3个，例如选中2,4,6，代表组件最小宽为2，默认宽为4，最大宽为6，单选代表不可拉伸',
-      ),
-      choices: [1, 2, 3, 4, 5, 6],
-    },
-    (answer) => {
-      if (answer.w.length === 0) {
-        consola.log(chalk.red('宽度必须选择'))
-        return false
-      }
-
-      if (answer.w.length > 3) {
-        consola.log(chalk.red('宽度最多选择3个'))
-        return false
-      }
-      return true
-    },
-  )
-  consola.log(chalk.green(answerW))
-
-  const answerH = await promptChecker(
-    {
-      type: 'checkbox',
-      name: 'h',
-      message: chalk.blue(
-        '请选择组件高度，最多选3个，例如选中1,2，代表组件最小高为1，默认高为2，最大高为2，单选代表不可拉伸',
-      ),
-      choices: [1, 2, 3, 4, 5, 6],
-    },
-    (answer) => {
-      if (answer.h.length === 0) {
-        consola.log(chalk.red('高度必须选择'))
-        return false
-      }
-
-      if (answer.h.length > 3) {
-        consola.log(chalk.red('高度最多选择3个'))
-        return false
-      }
-      return true
-    },
-  )
-
-  consola.log(chalk.green(answerH))
-
-  const configurable = await promptChecker({
-    type: 'confirm',
-    name: 'configurable',
-    message: chalk.blue('组件是否可配置，例如修改背景颜色，字体大小等'),
-  })
-
-  consola.log(chalk.green(configurable))
-
-  const width = getMiddleValue(answerW)
-  const height = getMiddleValue(answerH)
-  const minWidth = Math.min(...answerW)
-  const maxWidth = Math.max(...answerW)
-  const minHeight = Math.min(...answerH)
-  const maxHeight = Math.max(...answerH)
-  const snakeCaseName = snakeCase(name)
-  const paramCaseName = paramCase(name)
-
-  const widgetName = `${widgetPackage.name}.${snakeCaseName}`
-
-  const widgetDir = path.join(widgetRootDir, paramCaseName)
-  if (!fs.existsSync(widgetDir)) {
-    fs.mkdirSync(widgetDir)
-  }
-  else {
-    const answer = await inquirer.prompt([
-      {
-        type: 'confirm',
-        name: 'override',
-        message: chalk.red('组件名已存在，是否继续?'),
-      },
-    ])
-    if (!answer.override) {
-      exit()
-    }
-  }
-
-  const renderOptions: RenderOptions = {
-    name,
-    snakeCaseName,
-    paramCaseName,
-    packageName: widgetPackage.name,
-    widgetName,
-    title,
-    configurable,
-    width,
-    height,
-    maxWidth,
-    minHeight,
-    maxHeight,
-    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)
-  // EJSUtils.renderToFile('Widget.ejs', widgetFile, 'vue', 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`)
-    await EJSUtils.renderToFile('WidgetConfig.ejs', configFile, 'vue', renderOptions)
-  }
-  // 注册路由
-  const routeFile = path.join(widgetRootDir, 'widget-router.ts')
-  let routeContent
-  if (fs.existsSync(routeFile)) {
-    routeContent = fs.readFileSync(routeFile, 'utf8')
-  }
-  else {
-    routeContent = fs.readFileSync(path.join(__dirname, '../template/widget-router.ts'), 'utf8')
-  }
-  const importRouteStr = `import ${name}WidgetRoutes from "./${paramCaseName}/${name}WidgetRoutes";`
-  const routeStr = `...${name}WidgetRoutes,`
-  if (!routeContent.includes(importRouteStr)) {
-    routeContent = routeContent.replaceAll(
-      '//FBI WANING! IMPORT PLACE',
-      `${importRouteStr}\n//FBI WANING! IMPORT PLACE`,
-    )
-  }
-  if (!routeContent.includes(routeStr)) {
-    routeContent = routeContent.replaceAll('//FBI WANING! ROUTE PLACE', `${routeStr}\n    //FBI WANING! ROUTE PLACE`)
-  }
-
-  fs.writeFileSync(routeFile, routeContent)
-
-  // 添加到版本控制
-  const gitAdd = `git add ${widgetDir}`
-  consola.info(chalk.grey(gitAdd))
-  shell.exec(gitAdd)
-  consola.log('=================')
-  consola.info(`已创建组件：${widgetDir}`)
-  consola.success('Happy coding!')
-}

package/src/dependencies/index.ts

@@ -1,13 +0,0 @@
-import { RemoteDependencies } from './remoteDependencies'
-import { LocalDependencies } from './localDependencies'
-
-export type DependenciesOptions = 'remote' | 'local'
-export default async function (options: any) {
-  const type = options.type as DependenciesOptions
-  if (type == 'remote') {
-    await RemoteDependencies.start()
-  }
-  else {
-    await LocalDependencies.start()
-  }
-}

package/src/dependencies/localDependencies.ts

@@ -1,29 +0,0 @@
-import fs from 'node:fs'
-import ora from 'ora'
-import { Utils, getPackagePath, widgetPackages } from '../utils'
-
-const spinner = ora('Connecting')
-
-export namespace LocalDependencies {
-  export async function start() {
-    spinner.start()
-    const json = Utils.getPackageJson()
-    const packageNames = Object.keys(widgetPackages)
-    const dependencies = json.dependencies
-    const devDependencies = json.devDependencies
-    await setWorkspaceVersion(dependencies, packageNames)
-    await setWorkspaceVersion(devDependencies, packageNames)
-    fs.writeFileSync(getPackagePath(), JSON.stringify(json, null, 2))
-    spinner.succeed('Using local versions(workspace:*)!')
-  }
-
-  async function setWorkspaceVersion(dependencies: { [key: string]: string }, packageNames: string[]) {
-    const localPackages = Object.keys(dependencies)
-    for (const localPackage of localPackages) {
-      if (packageNames.includes(localPackage)) {
-        dependencies[localPackage] = `workspace:*`
-      }
-    }
-  }
-
-}

package/src/dependencies/remoteDependencies.ts

@@ -1,37 +0,0 @@
-import fs from 'node:fs'
-import ora from 'ora'
-import { Utils, getPackagePath, widgetPackages } from '../utils'
-
-const spinner = ora('Connecting')
-
-export namespace RemoteDependencies {
-
-  export async function start() {
-    spinner.start()
-    const json = Utils.getPackageJson()
-    const packageNames = Object.keys(widgetPackages)
-    const dependencies = json.dependencies
-    const devDependencies = json.devDependencies
-    await upgradePackage(dependencies, packageNames)
-    await upgradePackage(devDependencies, packageNames)
-    fs.writeFileSync(getPackagePath(), JSON.stringify(json, null, 2))
-    spinner.succeed('Using remote versions!')
-  }
-
-  async function upgradePackage(dependencies: { [key: string]: string }, packageNames: string[]) {
-    const localPackages = Object.keys(dependencies)
-    for (const localPackage of localPackages) {
-      if (packageNames.includes(localPackage)) {
-        let packageVersion = widgetPackages[localPackage]
-        if (!packageVersion) {
-          spinner.info(`Fetching package version:${localPackage}`)
-          packageVersion = await Utils.getRemoteVersion(localPackage)
-          widgetPackages[localPackage] = packageVersion
-          spinner.info(`version:${packageVersion}`)
-        }
-        dependencies[localPackage] = `^${packageVersion}`
-      }
-    }
-  }
-
-}