@widget-js/cli 1.1.0 → 1.1.2

package/src/release/release.ts

@@ -1,75 +1,74 @@
-import fs from 'fs'
-import path from 'path'
-import promptChecker from '../promts/promptChecker.js'
-import zipDirectory from './update-zip.js'
-import {copy, put} from './oss.js'
-import chalk from 'chalk'
-import {ftpUpload} from './ftp'
-
-async function delay(time: number) {
-  return new Promise<void>((resolve, reject) => {
-    setTimeout(() => {
-      resolve()
-    }, time)
-  })
-}
-
-const release = async (options: any) => {
-  console.log()
-  if (options.type == 'ftp') {
-    await ftpUpload()
-    return
-  }
-  const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf-8'))
-  const changelogJSON = JSON.parse(fs.readFileSync('changelog.json', 'utf-8'))
-  const version = packageJSON['version']
-  const changelog = changelogJSON[version]
-
-  let needUpdateElectron = await promptChecker({
-    type: 'confirm',
-    name: 'electron',
-    message: chalk.blue('用户是否需要更新Electron?'),
-  })
-  //
-  // let needUpdateNodeModule = await promptChecker({
-  //     type: "confirm",
-  //     name: 'electron',
-  //     message: chalk.blue("用户是否需要更新node_module?")
-  // });
-
-  const versionInfo = {
-    version: version,
-    releaseNote: changelog,
-    updateElectron: needUpdateElectron,
-    updateNodeModule: false,
-    updateWindowsApi: false,
-    downloadLink: '',
-  }
-
-  let installerPath = path.join(`./packaged/widgets-${version}-setup-win-x64.exe`)
-  if (!fs.existsSync(installerPath)) {
-    installerPath = path.join(`./packaged/electron-${version}-setup-win-x64.exe`)
-  }
-  const updateZipPath = path.join(`./packaged/update.zip`)
-
-  console.log(chalk.blue('压缩更新文件中'))
-  await zipDirectory('./release', updateZipPath)
-
-  console.log(chalk.blue('上传installer.exe到OSS'))
-  await put('version/installer.exe', installerPath)
-
-  console.log(chalk.blue('上传update.zip到OSS'))
-  await put('version/update.zip', updateZipPath)
-
-  console.log(chalk.blue('更新版本信息'))
-  versionInfo.downloadLink = 'https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip'
-  const versionJSON = JSON.stringify(versionInfo, null, 2)
-  await put('version/version.json', Buffer.from(versionJSON))
-
-  copy(`version/history/${version}.exe`, 'version/installer.exe')
-  copy(`version/history/update-${version}.zip`, 'version/update.zip')
-
-  console.log(chalk.yellow(versionJSON))
-}
-
-export default release
+import fs from 'fs'
+import path from 'path'
+import promptChecker from '../promts/promptChecker.js'
+import zipDirectory from './update-zip.js'
+import {copy, put} from './oss.js'
+import chalk from 'chalk'
+import {ftpUpload} from './ftp'
+
+async function delay(time: number) {
+  return new Promise<void>((resolve, reject) => {
+    setTimeout(() => {
+      resolve()
+    }, time)
+  })
+}
+
+const release = async (options: any) => {
+  if (options.type == 'ftp') {
+    await ftpUpload()
+    return
+  }
+  const packageJSON = JSON.parse(fs.readFileSync('package.json', 'utf-8'))
+  const changelogJSON = JSON.parse(fs.readFileSync('changelog.json', 'utf-8'))
+  const version = packageJSON['version']
+  const changelog = changelogJSON[version]
+
+  let needUpdateElectron = await promptChecker({
+    type: 'confirm',
+    name: 'electron',
+    message: chalk.blue('用户是否需要更新Electron?'),
+  })
+  //
+  // let needUpdateNodeModule = await promptChecker({
+  //     type: "confirm",
+  //     name: 'electron',
+  //     message: chalk.blue("用户是否需要更新node_module?")
+  // });
+
+  const versionInfo = {
+    version: version,
+    releaseNote: changelog,
+    updateElectron: needUpdateElectron,
+    updateNodeModule: false,
+    updateWindowsApi: false,
+    downloadLink: '',
+  }
+
+  let installerPath = path.join(`./packaged/widgets-${version}-setup-win-x64.exe`)
+  if (!fs.existsSync(installerPath)) {
+    installerPath = path.join(`./packaged/electron-${version}-setup-win-x64.exe`)
+  }
+  const updateZipPath = path.join(`./packaged/update.zip`)
+
+  console.log(chalk.blue('压缩更新文件中'))
+  await zipDirectory('./release', updateZipPath)
+
+  console.log(chalk.blue('上传installer.exe到OSS'))
+  await put('version/installer.exe', installerPath)
+
+  console.log(chalk.blue('上传update.zip到OSS'))
+  await put('version/update.zip', updateZipPath)
+
+  console.log(chalk.blue('更新版本信息'))
+  versionInfo.downloadLink = 'https://widget-fun.oss-cn-hangzhou.aliyuncs.com/version/update.zip'
+  const versionJSON = JSON.stringify(versionInfo, null, 2)
+  await put('version/version.json', Buffer.from(versionJSON))
+
+  copy(`version/history/${version}.exe`, 'version/installer.exe')
+  copy(`version/history/update-${version}.zip`, 'version/update.zip')
+
+  console.log(chalk.yellow(versionJSON))
+}
+
+export default release

package/src/utils.ts

@@ -2,22 +2,25 @@ import path from "path";
 import process from "process";
 import fs from "fs";
 
+export const widgetPackages: { [key: string]: string } = {
+    "@widget-js/core": "", "@widget-js/vue3": "", "@widget-js/cli": "", "@widget-js/vite-plugin-widget": ""
+};
 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}`);
-  }
+    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");
+    return path.join(process.cwd(), "package.json");
 }
 
 export function getPackageJson() {
-  return JSON.parse(fs.readFileSync(getPackagePath()).toString());
+    return JSON.parse(fs.readFileSync(getPackagePath()).toString());
 }
 
 export function getPackageVersion() {
-  return getPackageJson()["version"];
+    return getPackageJson()["version"];
 }

package/template/WidgetConfig.ejs

@@ -3,13 +3,6 @@
     <widget-edit-dialog :widget-params="widgetParams" :option="widgetConfigOption"
                         :widget-data="widgetData"
                         @confirm="onSaveClick()">
-        <template v-slot:widget>
-            <!-- 组件配置内容   -->
-            <<%= paramCaseName  %>-widget :style="{
-        width:`${widgetParams.widthPx}px`,
-        height:`${widgetParams.heightPx}px`
-      }" :background-color="widgetData.backgroundColor"></<%= paramCaseName  %>-widget>
-        </template>
         <template v-slot:form>
             <!--  TODO 这里写自定义表单内容          -->
         </template>
@@ -20,7 +13,7 @@
 
 import <%= name %>Widget from "./<%= name%>Widget.vue";
 import {useWidget, WidgetConfigOption, WidgetEditDialog} from "@widget-js/vue3";
-import {WidgetData, WidgetDataRepository} from "@widget-js/core";
+import {WidgetData, WidgetDataApi} from "@widget-js/core";
 import {reactive} from "vue";
 
 export default {
@@ -33,14 +26,15 @@ export default {
     const widgetConfigOption = reactive(new WidgetConfigOption({
       custom: true,
       backgroundColor: true,
-      borderRadius: true
+      borderRadius: true,
+      preview: false
     }));
 
     return {widgetData, widgetParams, widgetConfigOption}
   },
   methods: {
     async onSaveClick() {
-      await WidgetDataRepository.save(this.widgetData);
+      await WidgetDataApi.save(this.widgetData);
       window.close();
     }
   }

package/.idea/codeStyles/Project.xml

@@ -1,58 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </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="80" />
-      <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="80" />
-      <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="80" />
-      <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="80" />
-      <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/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>

package/lib/upgrade-ETO2LGMX.js

@@ -1,52 +0,0 @@
-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
-};