@widget-js/cli 1.0.14 → 1.0.16

package/src/build/build.ts

@@ -0,0 +1,35 @@
+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
+  const build = exec('npm run build:preload').on('close', () => {
+    consola.success('done')
+  })
+  //@ts-ignore
+  build.stdout.on('data', data => {
+    consola.log('data', data)
+  })
+
+  //@ts-ignore
+  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/index.ts

@@ -2,8 +2,6 @@ import {Option, program} from 'commander'
 import fs from 'fs'
 import path from 'path'
 import * as process from 'process'
-import createWidget from './createWidget'
-import release from './release/release'
 
 import {fileURLToPath} from 'url'
 import figlet from 'figlet'
@@ -21,7 +19,16 @@ program
   .command('create')
   .description('创建新的组件')
   .action(async () => {
-    await createWidget()
+    const createWidget = await import('./createWidget')
+    await createWidget.default()
+  })
+
+program
+  .command('build')
+  .description('执行编译任务')
+  .action(async () => {
+    const build = await import('./build/build')
+    await build.build()
   })
 
 let typeOption = new Option('-t, --type <type>').choices(['ftp', 'oss'])
@@ -31,8 +38,8 @@ program
   .addOption(typeOption)
   .action(async (options, command) => {
     // @ts-ignore
-    console.log(options)
-    await release(options)
+    let release = await import('./release/release');
+    await release.default(options)
   })
 
 //TODO init 初始化项目

package/src/release/ftp.ts

@@ -8,6 +8,8 @@ import inquirer from 'inquirer'
 import ora from 'ora'
 import * as process from 'process'
 import * as console from 'console'
+import {getPackageVersion} from "../utils";
+
 
 interface PasswordAnswer {
   password: string
@@ -24,10 +26,14 @@ async function checkParentDir(ftpClient: Client, file: string, onMkdir: (dir: st
 
 export function ftpUpload() {
   // 读取
-  const file = path.join(process.cwd(), 'release.json')
-  const releaseConfig = JSON.parse(fs.readFileSync(file).toString()) as ReleaseConfig
+  const releaseJsonFilePath = path.join(process.cwd(), 'release.json')
+  const packageVersion = 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')
-  console.log('SSH Config file:', sshConfigFile)
+  consola.info('SSH Config File Path:', sshConfigFile)
   const sshConfigs = SSHConfig.parse(fs.readFileSync(sshConfigFile).toString())
   let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host)
   if (!sshConfig) {
@@ -51,7 +57,7 @@ export function ftpUpload() {
           passphrase: answer.password,
           privateKey: key,
         })
-        releaseConfig.fileMap.sort((it1, it2) => it1.order - it2.order)
+        releaseConfig.fileMap.sort((it1, it2) => (it1.order ?? 0) - (it2.order ?? 0))
         // upload files
         for (let item of releaseConfig.fileMap) {
           if (typeof item.src == 'string') {
@@ -59,6 +65,11 @@ export function ftpUpload() {
               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 {

package/src/utils.ts

@@ -1,7 +1,16 @@
-export default function exit(code:number = 0) {
-    if (exports.exitProcess) {
-        process.exit(code)
-    } else if (code > 0) {
-        throw new Error(`Process exited with code ${code}`)
-    }
+import path from "path";
+import process from "process";
+import fs from "fs";
+
+export default function exit(code: number = 0) {
+  if (exports.exitProcess) {
+    process.exit(code)
+  } else if (code > 0) {
+    throw new Error(`Process exited with code ${code}`)
+  }
+}
+
+export function getPackageVersion() {
+  const packagePath = path.join(process.cwd(), 'package.json')
+  return JSON.parse(fs.readFileSync(packagePath).toString())['version']
 }