@widget-js/cli 1.1.0 → 1.1.2

package/release.json

@@ -1,21 +1,21 @@
-{
-  "fileMap": [
-    {
-      "src": "./dist/youlu-${version}-setup-win-ia32.exe",
-      "dest": "/www/wwwroot/download.tool-vip.com/youlu/youlu.exe",
-      "order": 0
-    },
-    {
-      "src": ".gitignore",
-      "dest": "/www/wwwroot/template/aa/.gitignore"
-    },
-    {
-      "src": "/www/wwwroot/template/aa/.gitignore",
-      "dest": "/www/wwwroot/template/bbb/.gitignorexxx",
-      "remoteCopy": true
-    }
-  ],
-  "ftpConfig": {
-    "host": "youlu"
-  }
-}
+{
+  "fileMap": [
+    {
+      "src": "./dist/youlu-${version}-setup-win-ia32.exe",
+      "dest": "/www/wwwroot/download.tool-vip.com/youlu/youlu.exe",
+      "order": 0
+    },
+    {
+      "src": ".gitignore",
+      "dest": "/www/wwwroot/template/aa/.gitignore"
+    },
+    {
+      "src": "/www/wwwroot/template/aa/.gitignore",
+      "dest": "/www/wwwroot/template/bbb/.gitignorexxx",
+      "remoteCopy": true
+    }
+  ],
+  "ftpConfig": {
+    "host": "youlu"
+  }
+}

package/src/build/build.ts

@@ -1,35 +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')
-    })
-}
+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/dependencies/index.ts

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

package/src/dependencies/localDependencies.ts

@@ -0,0 +1,30 @@
+import ora from "ora";
+import {getPackageJson, getPackagePath, widgetPackages} from "../utils";
+import fs from "fs";
+
+
+const spinner = ora("Connecting");
+
+export namespace LocalDependencies {
+  export async function start() {
+    spinner.start();
+    let json = 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:*)!");
+  }
+
+  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:*`;
+      }
+    }
+  }
+
+}

package/src/{upgrade/upgrade.ts → dependencies/remoteDependencies.ts}

@@ -1,43 +1,40 @@
 import packageJson from "package-json";
 import ora from "ora";
-import { getPackageJson, getPackagePath } from "../utils";
+import {getPackageJson, getPackagePath, widgetPackages} from "../utils";
 import fs from "fs";
 
-const packages: { [key: string]: string } = {
-  "@widget-js/core": "", "@widget-js/vue3": "", "@widget-js/cli": "", "@widget-js/vite-plugin-widget": ""
-};
 const spinner = ora("Connecting");
 
-export class Upgrade {
+export namespace RemoteDependencies {
 
-  async start() {
+  export async function start() {
     spinner.start();
     let json = getPackageJson();
-    let packageNames = Object.keys(packages);
+    let packageNames = Object.keys(widgetPackages);
     let dependencies = json["dependencies"];
     let devDependencies = json["devDependencies"];
-    await this.upgradePackage(dependencies, packageNames);
-    await this.upgradePackage(devDependencies, packageNames);
+    await upgradePackage(dependencies, packageNames);
+    await upgradePackage(devDependencies, packageNames);
     fs.writeFileSync(getPackagePath(), JSON.stringify(json, null, 2));
-    spinner.succeed("Upgraded!");
+    spinner.succeed("Using remote versions!");
   }
 
 
-  private async upgradePackage(dependencies: { [key: string]: string }, packageNames: string[]) {
+  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 = packages[localPackage];
+        let packageVersion = widgetPackages[localPackage];
         if (!packageVersion) {
-          packageVersion = await this.getRemoteVersion(localPackage);
-          packages[localPackage] = packageVersion;
+          packageVersion = await getRemoteVersion(localPackage);
+          widgetPackages[localPackage] = packageVersion;
         }
         dependencies[localPackage] = `^${packageVersion}`;
       }
     }
   }
 
-  async getRemoteVersion(packageName: string): Promise<string> {
+  async function getRemoteVersion(packageName: string): Promise<string> {
     spinner.info(`Fetching package version:${packageName}`);
     const metadata = await packageJson(packageName);
     let version = metadata["version"];

package/src/index.ts

@@ -1,55 +1,56 @@
-import { Option, program } from "commander";
-import fs from "fs";
-import path from "path";
-import * as process from "process";
-
-import { fileURLToPath } from "url";
-import figlet from "figlet";
-import gradient from "gradient-string";
-import consola from "consola";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-//
-const packageJsonPath = path.join(__dirname, "../package.json");
-let 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("创建新的组件")
-  .action(async () => {
-    const createWidget = await import("./createWidget");
-    await createWidget.default();
-  });
-
-program
-  .command("upgrade")
-  .description("升级依赖")
-  .action(async () => {
-    const upgrade = await import("./upgrade/upgrade");
-    const instance = new upgrade.Upgrade();
-    await instance.start()
-  });
-
-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"]);
-program
-  .command("release")
-  .description("通过FTP/OSS发布文件，仅内部使用")
-  .addOption(typeOption)
-  .action(async (options, command) => {
-    // @ts-ignore
-    let release = await import("./release/release");
-    await release.default(options);
-  });
-
-program.parse(process.argv);
+import {Option, program} from "commander";
+import fs from "fs";
+import path from "path";
+import * as process from "process";
+
+import {fileURLToPath} from "url";
+import figlet from "figlet";
+import gradient from "gradient-string";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+//
+const packageJsonPath = path.join(__dirname, "../package.json");
+let 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("创建新的组件")
+  .action(async () => {
+    const createWidget = await import("./createWidget");
+    await createWidget.default();
+  });
+
+let dependenciesOption = new Option("-t, --type <type>").choices(["remote", "local"]);
+
+program
+  .command("dependencies")
+  .description("将@widget-js依赖版本设置成远程或者本地")
+  .addOption(dependenciesOption)
+  .action(async (options) => {
+    let dependencies = await import("./dependencies/index");
+    await dependencies.default(options);
+  });
+
+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"]);
+program
+  .command("release")
+  .description("通过FTP/OSS发布文件，仅内部使用")
+  .addOption(typeOption)
+  .action(async (options, command) => {
+    // @ts-ignore
+    let release = await import("./release/release");
+    await release.default(options);
+  });
+
+program.parse(process.argv);

package/src/release/ftp.ts

@@ -1,116 +1,116 @@
-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 { getPackageVersion } from "../utils";
-
-
-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)
-  }
-}
-
-export function ftpUpload() {
-  // 读取
-  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')
-  consola.info('SSH Config File Path:', sshConfigFile)
-  const sshConfigs = SSHConfig.parse(fs.readFileSync(sshConfigFile).toString())
-  let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host)
-  if (!sshConfig) {
-    consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
-    return
-  }
-  consola.info(sshConfig)
-  inquirer
-    .prompt<PasswordAnswer>([{type: 'password', name: 'password', mask: '*', message: 'Enter key pair password'}])
-    .then(async (answer: PasswordAnswer) => {
-      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)
-              } else {
-                await checkParentDir(ftpClient, item.dest, dir => {
-                  spinner.warn(`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 interface ReleaseConfig {
-  fileMap: {
-    src: string | object
-    dest: string
-    remoteCopy: boolean
-    order: number
-  }[]
-  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 { getPackageVersion } from "../utils";
+
+
+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)
+  }
+}
+
+export function ftpUpload() {
+  // 读取
+  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')
+  consola.info('SSH Config File Path:', sshConfigFile)
+  const sshConfigs = SSHConfig.parse(fs.readFileSync(sshConfigFile).toString())
+  let sshConfig = sshConfigs.compute(releaseConfig.ftpConfig.host)
+  if (!sshConfig) {
+    consola.error(`SSH config ${releaseConfig.ftpConfig.host} not found`)
+    return
+  }
+  consola.info(sshConfig)
+  inquirer
+    .prompt<PasswordAnswer>([{type: 'password', name: 'password', mask: '*', message: 'Enter key pair password'}])
+    .then(async (answer: PasswordAnswer) => {
+      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)
+              } else {
+                await checkParentDir(ftpClient, item.dest, dir => {
+                  spinner.warn(`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 interface ReleaseConfig {
+  fileMap: {
+    src: string | object
+    dest: string
+    remoteCopy: boolean
+    order: number
+  }[]
+  ftpConfig: FTPConfig
+}
+
+export interface FTPConfig {
+  host: string
+}