@widget-js/cli 1.0.15 → 1.1.0

package/lib/upgrade-ETO2LGMX.js

@@ -0,0 +1,52 @@
+import {
+  getPackageJson,
+  getPackagePath
+} from "./chunk-SIAOIY3B.js";
+
+// src/upgrade/upgrade.ts
+import packageJson from "package-json";
+import ora from "ora";
+import fs from "fs";
+var packages = {
+  "@widget-js/core": "",
+  "@widget-js/vue3": "",
+  "@widget-js/cli": "",
+  "@widget-js/vite-plugin-widget": ""
+};
+var spinner = ora("Connecting");
+var Upgrade = class {
+  async start() {
+    spinner.start();
+    let json = getPackageJson();
+    let packageNames = Object.keys(packages);
+    let dependencies = json["dependencies"];
+    let devDependencies = json["devDependencies"];
+    await this.upgradePackage(dependencies, packageNames);
+    await this.upgradePackage(devDependencies, packageNames);
+    fs.writeFileSync(getPackagePath(), JSON.stringify(json, null, 2));
+    spinner.succeed("Upgraded!");
+  }
+  async upgradePackage(dependencies, packageNames) {
+    let localPackages = Object.keys(dependencies);
+    for (let localPackage of localPackages) {
+      if (packageNames.indexOf(localPackage) > -1) {
+        let packageVersion = packages[localPackage];
+        if (!packageVersion) {
+          packageVersion = await this.getRemoteVersion(localPackage);
+          packages[localPackage] = packageVersion;
+        }
+        dependencies[localPackage] = `^${packageVersion}`;
+      }
+    }
+  }
+  async getRemoteVersion(packageName) {
+    spinner.info(`Fetching package version:${packageName}`);
+    const metadata = await packageJson(packageName);
+    let version = metadata["version"];
+    spinner.info(`version:${version}`);
+    return version;
+  }
+};
+export {
+  Upgrade
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@widget-js/cli",
-  "version": "1.0.15",
+  "version": "1.1.0",
   "main": "lib/index.js",
   "author": "Neo Fu",
   "license": "MIT",
@@ -9,12 +9,6 @@
     "widget": "lib/index.js"
   },
   "type": "module",
-  "scripts": {
-    "build": "tsup src/index.ts --dts --format esm,cjs",
-    "watch": "tsup src/index.ts --dts --format esm,cjs --watch",
-    "build:run": "npm run build && npm run widget",
-    "widget": "node ./lib/index.js"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +19,6 @@
     "@types/archiver": "^5.3.1",
     "@types/gradient-string": "^1.1.2",
     "@vue/cli-shared-utils": "^5.0.8",
-    "@widget-js/core": "^0.1.14",
     "@widget-js/ssh-config": "^4.2.1",
     "ali-oss": "^6.17.1",
     "archiver": "^5.3.1",
@@ -38,26 +31,26 @@
     "gradient-string": "^2.0.2",
     "inquirer": "^9.1.4",
     "ora": "^6.2.0",
+    "package-json": "^8.1.0",
+    "semver": "^7.3.8",
     "shelljs": "^0.8.5",
     "ssh2-sftp-client": "^9.0.4",
     "ws": "^8.11.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.20.2",
-    "@babel/node": "^7.20.2",
-    "@babel/preset-env": "^7.20.2",
     "@types/ali-oss": "^6.16.7",
     "@types/ejs": "latest",
     "@types/figlet": "^1.5.5",
     "@types/inquirer": "latest",
     "@types/jest": "^29.2.3",
     "@types/node": "^18.11.13",
+    "@types/semver": "^7.5.0",
     "@types/shelljs": "latest",
     "@types/ssh2-sftp-client": "^9.0.0",
     "jest": "^29.5.0",
     "pinst": "^3.0.0",
     "prettier": "^2.8.4",
+    "rimraf": "^4.4.1",
     "ts-jest": "^29.0.3",
     "ts-loader": "^9.4.1",
     "ts-node": "^10.9.1",
@@ -65,5 +58,12 @@
     "typescript": "^4.9.4",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.0"
+  },
+  "scripts": {
+    "build": "rimraf ./lib/ && tsup src/index.ts --dts --format esm,cjs",
+    "watch": "tsup src/index.ts --dts --format esm,cjs --watch",
+    "build:run": "npm run build && npm run widget",
+    "prebuild": "",
+    "widget": "node ./lib/index.js"
   }
-}
+}

package/release.json

@@ -1,5 +1,10 @@
 {
   "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"

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

@@ -1,40 +1,55 @@
-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 { 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 { 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 __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())
+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]')
+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('创建新的组件')
+  .command("create")
+  .description("创建新的组件")
   .action(async () => {
-    await createWidget()
-  })
+    const createWidget = await import("./createWidget");
+    await createWidget.default();
+  });
 
-let typeOption = new Option('-t, --type <type>').choices(['ftp', 'oss'])
 program
-  .command('release')
-  .description('通过FTP/OSS发布文件，仅内部使用')
+  .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
-    console.log(options)
-    await release(options)
-  })
+    let release = await import("./release/release");
+    await release.default(options);
+  });
 
-//TODO init 初始化项目
-//TODO publish 发布
-program.parse(process.argv)
+program.parse(process.argv);

package/src/release/ftp.ts

@@ -1,13 +1,14 @@
-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 * as console from 'console'
+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
@@ -24,10 +25,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) {

package/src/upgrade/upgrade.ts

@@ -0,0 +1,48 @@
+import packageJson from "package-json";
+import ora from "ora";
+import { getPackageJson, getPackagePath } 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 {
+
+  async start() {
+    spinner.start();
+    let json = getPackageJson();
+    let packageNames = Object.keys(packages);
+    let dependencies = json["dependencies"];
+    let devDependencies = json["devDependencies"];
+    await this.upgradePackage(dependencies, packageNames);
+    await this.upgradePackage(devDependencies, packageNames);
+    fs.writeFileSync(getPackagePath(), JSON.stringify(json, null, 2));
+    spinner.succeed("Upgraded!");
+  }
+
+
+  private async 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];
+        if (!packageVersion) {
+          packageVersion = await this.getRemoteVersion(localPackage);
+          packages[localPackage] = packageVersion;
+        }
+        dependencies[localPackage] = `^${packageVersion}`;
+      }
+    }
+  }
+
+  async getRemoteVersion(packageName: string): Promise<string> {
+    spinner.info(`Fetching package version:${packageName}`);
+    const metadata = await packageJson(packageName);
+    let version = metadata["version"];
+    spinner.info(`version:${version}`);
+    return version as string;
+  }
+
+}

package/src/utils.ts

@@ -1,7 +1,23 @@
-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 getPackagePath() {
+  return path.join(process.cwd(), "package.json");
+}
+
+export function getPackageJson() {
+  return JSON.parse(fs.readFileSync(getPackagePath()).toString());
+}
+
+export function getPackageVersion() {
+  return getPackageJson()["version"];
 }

package/tsup.config.ts

@@ -1,5 +1,6 @@
 import { defineConfig } from 'tsup';
 
 export default defineConfig({
-    outDir: 'lib'
+    outDir: 'lib',
+    format: 'none'
 });

package/babel.config.js

@@ -1,20 +0,0 @@
-module.exports = {
-  env: {
-    test: {
-      presets: [
-        '@babel/preset-env'
-      ]
-    },
-    build: {
-      presets: [
-        [
-          '@babel/preset-env',
-          {
-            modules: false,
-            loose: true
-          }
-        ]
-      ]
-    }
-  }
-}