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

package/package.json

@@ -1,25 +1,26 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.2.11",
-  "main": "lib/index.js",
+  "type": "module",
+  "version": "24.1.1-beta.2",
+  "private": false,
   "author": "Neo Fu",
   "license": "MIT",
-  "private": false,
+  "main": "lib/index.js",
   "bin": {
     "widget": "lib/index.js"
   },
-  "type": "module",
-  "publishConfig": {
-    "access": "public"
-  },
   "engines": {
     "node": "^12.0.0 || >= 14.0.0"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
     "@types/archiver": "^5.3.1",
     "@types/gradient-string": "^1.1.2",
     "@vue/cli-shared-utils": "^5.0.8",
     "@widget-js/ssh-config": "^4.2.1",
+    "@widget-js/vue3": "^0.11.20",
     "ali-oss": "^6.17.1",
     "archiver": "^5.3.1",
     "chalk": "^4.1.2",
@@ -29,19 +30,17 @@
     "dirname-filename-esm": "^1.1.1",
     "ejs": "^3.1.8",
     "figlet": "^1.5.2",
-    "gradient-string": "^2.0.2",
     "inquirer": "^8.0.0",
     "minimatch": "^9.0.3",
     "ora": "^6.2.0",
     "package-json": "^8.1.0",
     "prettier": "^3.1.1",
-    "semver": "^7.3.8",
+    "semver": "^7.5.2",
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.1.0",
     "ws": "^8.11.0",
-    "@widget-js/core": "^0.11.20",
-    "@widget-js/vue3": "^0.11.20",
-    "@widget-js/utils": "0.10.21"
+    "@widget-js/core": "24.1.1-beta.2",
+    "@widget-js/utils": "24.1.1-beta.2"
   },
   "devDependencies": {
     "@types/ali-oss": "^6.16.7",
@@ -49,10 +48,13 @@
     "@types/figlet": "^1.5.5",
     "@types/inquirer": "latest",
     "@types/jest": "^29.2.3",
+    "@types/minimist": "^1.2.5",
     "@types/node": "^18.11.13",
     "@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",
     "jest": "^29.5.0",
     "pinst": "^3.0.0",
     "rimraf": "^4.4.1",
@@ -65,8 +67,7 @@
     "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/core": "24.1.1-beta.2",
     "@widget-js/vue3": "^0.11.20"
   },
   "scripts": {
@@ -78,6 +79,7 @@
     "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",
-    "pnpm:publish": "npm run build && pnpm publish --no-git-checks"
+    "build:publish": "npm run build && npm run pnpm:publish",
+    "pnpm:publish": "pnpm publish --no-git-checks"
   }
 }

package/src/build/build.ts

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

package/src/createWidget.ts

@@ -1,16 +1,17 @@
-import path from 'path'
-import fs from 'fs'
+import path from 'node:path'
+import fs from 'node:fs'
+import { fileURLToPath } from 'node:url'
 import consola from 'consola'
-import promptChecker from './promts/promptChecker'
-import {paramCase, snakeCase} from 'change-case'
+import { paramCase, snakeCase } from 'change-case'
 import inquirer from 'inquirer'
 import shell from 'shelljs'
-import exit from './utils.js'
 import chalk from 'chalk'
-import {scanWidgetPackage} from '@widget-js/utils'
-import {fileURLToPath} from 'url'
-import {EJSUtils} from './utils/EJSUtils'
-import {WidgetPackageUtils} from "./utils/WidgetPackageUtils";
+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)
@@ -32,24 +33,27 @@ interface RenderOptions {
 }
 
 export default async function createWidget() {
-  let widgetPackage = await scanWidgetPackage()
+  const widgetPackage = await scanWidgetPackage()
   if (!widgetPackage) {
     consola.error('widget.ts or widget.json not found')
     return
   }
-  let widgetRootDir = WidgetPackageUtils.getRootDir(widgetPackage);
+  const widgetRootDir = WidgetPackageUtils.getRootDir(widgetPackage)
   if (widgetPackage.devOptions && widgetPackage.devOptions.folder) {
     consola.info(`组件路径：${widgetRootDir}`)
-  } else {
+  }
+  else {
     consola.info(`没有配置devOptions.folder，使用默认路径${widgetRootDir}`)
   }
 
   const getMiddleValue = (arr: number[]) => {
     if (arr.length === 1) {
       return arr[0]
-    } else if (arr.length === 2) {
+    }
+    else if (arr.length === 2) {
       return Math.max(...arr)
-    } else {
+    }
+    else {
       const max = Math.max(...arr)
       const min = Math.min(...arr)
       const sum = arr[0] + arr[1] + arr[2]
@@ -57,13 +61,13 @@ export default async function createWidget() {
     }
   }
 
-  let name = await promptChecker(
+  const name = await promptChecker(
     {
       type: 'input',
       name: 'name',
       message: chalk.blue('请输入组件名(大驼峰式)，如：CountdownClock'),
     },
-    answer => {
+    (answer) => {
       const name = answer.name
       if (name == null || name === '') {
         consola.log(chalk.red('组件名不能为空'))
@@ -75,13 +79,13 @@ export default async function createWidget() {
 
   consola.log(chalk.green(name))
 
-  let title = await promptChecker({
+  const title = await promptChecker({
     type: 'input',
     name: 'title',
     message: chalk.blue('请输入组件标题，如：倒计时'),
   })
   consola.log(chalk.green(title))
-  let answerW = await promptChecker(
+  const answerW = await promptChecker(
     {
       type: 'checkbox',
       name: 'w',
@@ -90,7 +94,7 @@ export default async function createWidget() {
       ),
       choices: [1, 2, 3, 4, 5, 6],
     },
-    answer => {
+    (answer) => {
       if (answer.w.length === 0) {
         consola.log(chalk.red('宽度必须选择'))
         return false
@@ -105,7 +109,7 @@ export default async function createWidget() {
   )
   consola.log(chalk.green(answerW))
 
-  let answerH = await promptChecker(
+  const answerH = await promptChecker(
     {
       type: 'checkbox',
       name: 'h',
@@ -114,7 +118,7 @@ export default async function createWidget() {
       ),
       choices: [1, 2, 3, 4, 5, 6],
     },
-    answer => {
+    (answer) => {
       if (answer.h.length === 0) {
         consola.log(chalk.red('高度必须选择'))
         return false
@@ -130,7 +134,7 @@ export default async function createWidget() {
 
   consola.log(chalk.green(answerH))
 
-  let configurable = await promptChecker({
+  const configurable = await promptChecker({
     type: 'confirm',
     name: 'configurable',
     message: chalk.blue('组件是否可配置，例如修改背景颜色，字体大小等'),
@@ -147,13 +151,14 @@ export default async function createWidget() {
   const snakeCaseName = snakeCase(name)
   const paramCaseName = paramCase(name)
 
-  const widgetName = widgetPackage.name + '.' + snakeCaseName
+  const widgetName = `${widgetPackage.name}.${snakeCaseName}`
 
   const widgetDir = path.join(widgetRootDir, paramCaseName)
   if (!fs.existsSync(widgetDir)) {
     fs.mkdirSync(widgetDir)
-  } else {
-    let answer = await inquirer.prompt([
+  }
+  else {
+    const answer = await inquirer.prompt([
       {
         type: 'confirm',
         name: 'override',
@@ -166,19 +171,19 @@ export default async function createWidget() {
   }
 
   const renderOptions: RenderOptions = {
-    name: name,
-    snakeCaseName: snakeCaseName,
-    paramCaseName: paramCaseName,
+    name,
+    snakeCaseName,
+    paramCaseName,
     packageName: widgetPackage.name,
-    widgetName: widgetName,
-    title: title,
-    configurable: configurable,
-    width: width,
-    height: height,
-    maxWidth: maxWidth,
-    minHeight: minHeight,
-    maxHeight: maxHeight,
-    minWidth: minWidth,
+    widgetName,
+    title,
+    configurable,
+    width,
+    height,
+    maxWidth,
+    minHeight,
+    maxHeight,
+    minWidth,
   }
 
   const widgetDefineFile = path.resolve(widgetDir, `${name}.widget.ts`)
@@ -199,7 +204,8 @@ export default async function createWidget() {
   let routeContent
   if (fs.existsSync(routeFile)) {
     routeContent = fs.readFileSync(routeFile, 'utf8')
-  } else {
+  }
+  else {
     routeContent = fs.readFileSync(path.join(__dirname, '../template/widget-router.ts'), 'utf8')
   }
   const importRouteStr = `import ${name}WidgetRoutes from "./${paramCaseName}/${name}WidgetRoutes";`
@@ -216,8 +222,8 @@ export default async function createWidget() {
 
   fs.writeFileSync(routeFile, routeContent)
 
-  //添加到版本控制
-  let gitAdd = `git add ${widgetDir}`
+  // 添加到版本控制
+  const gitAdd = `git add ${widgetDir}`
   consola.info(chalk.grey(gitAdd))
   shell.exec(gitAdd)
   consola.log('=================')

package/src/dependencies/index.ts

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

package/src/dependencies/localDependencies.ts

@@ -1,28 +1,27 @@
-import ora from "ora";
-import { getPackagePath, Utils, widgetPackages} from "../utils";
-import fs from "fs";
+import fs from 'node:fs'
+import ora from 'ora'
+import { Utils, getPackagePath, widgetPackages } from '../utils'
 
-
-const spinner = ora("Connecting");
+const spinner = ora('Connecting')
 
 export namespace LocalDependencies {
   export async function start() {
-    spinner.start();
-    let json = Utils.getPackageJson();
-    let packageNames = Object.keys(widgetPackages);
-    let dependencies = json["dependencies"];
-    let 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:*)!");
+    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[]) {
-    let localPackages = Object.keys(dependencies);
-    for (let localPackage of localPackages) {
-      if (packageNames.indexOf(localPackage) > -1) {
-        dependencies[localPackage] = `workspace:*`;
+    const localPackages = Object.keys(dependencies)
+    for (const localPackage of localPackages) {
+      if (packageNames.includes(localPackage)) {
+        dependencies[localPackage] = `workspace:*`
       }
     }
   }

package/src/dependencies/remoteDependencies.ts

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

package/src/index.ts

@@ -1,56 +1,56 @@
-import {Option, program} from "commander";
-import fs from "fs";
-import path from "path";
-import * as process from "process";
+import fs from 'node:fs'
+import path from 'node:path'
+import * as process from 'node:process'
+import { Option, program } from 'commander'
 
-import figlet from "figlet";
-import gradient from "gradient-string";
-import {dirname} from "dirname-filename-esm";
+import figlet from 'figlet'
+import gradient from 'gradient-string'
+import { dirname } from 'dirname-filename-esm'
 
 //
-const packageJsonPath = path.join(dirname(import.meta), "../package.json");
-let cliPackage = JSON.parse(fs.readFileSync(packageJsonPath).toString());
+const packageJsonPath = path.join(dirname(import.meta), '../package.json')
+const 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]");
+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")
+  .command('create')
+  .description('Create new widget')
   .action(async () => {
-    const createWidget = await import("./createWidget");
-    await createWidget.default();
-  });
+    const createWidget = await import('./createWidget')
+    await createWidget.default()
+  })
 
-let dependenciesOption = new Option("-t, --type <type>").choices(["remote", "local"]);
+const 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)")
+  .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/index");
-    await dependencies.default(options);
-  });
+    const dependencies = await import('./dependencies/index')
+    await dependencies.default(options)
+  })
 
 program
-  .command("init")
-  .description("Initialize widget-js project")
+  .command('init')
+  .description('Initialize widget-js project')
   .action(async () => {
-    const init = await import("./init/init");
-    await init.init();
-  });
+    const init = await import('./init/init')
+    await init.init()
+  })
 
-let typeOption = new Option("-t, --type <type>").choices(["ftp", "oss"]);
-let fileOption = new Option("-f, --file <file>");
+const typeOption = new Option('-t, --type <type>').choices(['ftp', 'oss'])
+const fileOption = new Option('-f, --file <file>')
 program
-  .command("release")
-  .description("通过FTP/OSS发布文件，仅内部使用")
+  .command('release')
+  .description('通过FTP/OSS发布文件，仅内部使用')
   .addOption(typeOption)
   .addOption(fileOption)
   .action(async (options, command) => {
-    // @ts-ignore
-    let release = await import("./release/release");
-    await release.default(options);
-  });
+    // @ts-expect-error
+    const release = await import('./release/release')
+    await release.default(options)
+  })
 
-program.parse(process.argv);
+program.parse(process.argv)

package/src/init/init.ts

@@ -1,16 +1,17 @@
-import {Utils} from '../utils'
-import path from 'path'
-import process from 'process'
-import fs from 'fs'
+import path from 'node:path'
+import process from 'node:process'
+import fs from 'node:fs'
+import { fileURLToPath } from 'node:url'
 import consola from 'consola'
-import promptChecker from '../promts/promptChecker'
 import chalk from 'chalk'
-import {EJSUtils} from '../utils/EJSUtils'
 import ora from 'ora'
-import {PrettierUtils} from '../utils/PrettierUtils'
-import {scanWidgetPackage} from '@widget-js/utils'
-import {WidgetPackageUtils} from '../utils/WidgetPackageUtils'
-import {fileURLToPath} from "url";
+import { scanWidgetPackage } from '@widget-js/utils'
+import { Utils } from '../utils'
+import promptChecker from '../promts/promptChecker'
+import { EJSUtils } from '../utils/EJSUtils'
+import { PrettierUtils } from '../utils/PrettierUtils'
+import { WidgetPackageUtils } from '../utils/WidgetPackageUtils'
+
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 const spinner = ora('Loading')
@@ -21,13 +22,13 @@ export async function init() {
 }
 
 async function addWidgetTs() {
-  let name = await promptChecker(
+  const name = await promptChecker(
     {
       type: 'input',
       name: 'name',
       message: chalk.blue('组件包 包名 （示例 cn.widget.countdown）：'),
     },
-    answer => {
+    (answer) => {
       const name = answer.name
       if (name == null || name === '') {
         consola.log(chalk.red(`包名不能为空`))
@@ -37,12 +38,13 @@ async function addWidgetTs() {
     },
   )
 
-  let widgetPackageTs = path.join(process.cwd(), 'widget.package.ts')
+  const widgetPackageTs = path.join(process.cwd(), 'widget.package.ts')
   if (fs.existsSync(widgetPackageTs)) {
     spinner.info('widget.package.ts已存在，跳过')
-  } else {
+  }
+  else {
     spinner.info('创建 widget.package.ts')
-    await EJSUtils.renderToFile('WidgetPackage.ejs', widgetPackageTs, 'typescript', {name})
+    await EJSUtils.renderToFile('WidgetPackage.ejs', widgetPackageTs, 'typescript', { name })
   }
 
   await addVitePlugin()
@@ -56,21 +58,21 @@ async function addWidgetTs() {
  */
 async function addDependencies() {
   const packageJson = Utils.getPackageJson()
-  let dependencies = packageJson['dependencies']
-  let devDependencies = packageJson['devDependencies']
+  let dependencies = packageJson.dependencies
+  const devDependencies = packageJson.devDependencies
   if (!dependencies) {
     dependencies = {}
   }
   if (!devDependencies) {
-    packageJson['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
+  packageJson.dependencies = dependencies
+  packageJson.devDependencies = devDependencies
 
   fs.writeFileSync(Utils.getPackagePath(), JSON.stringify(packageJson, null, 2))
 }
@@ -83,7 +85,7 @@ async function addVitePlugin() {
     return
   }
   let viteConfig = fs.readFileSync(viteConfigPath).toString()
-  viteConfig = `import widget from '@widget-js/vite-plugin-widget'\n` + viteConfig
+  viteConfig = `import widget from '@widget-js/vite-plugin-widget'\n${viteConfig}`
   viteConfig = viteConfig.replace('vue()', `vue(),widget()`)
   fs.writeFileSync(viteConfigPath, await PrettierUtils.format(viteConfig, 'typescript'))
 }