@shijiu/jsview-vue 0.9.249 → 0.9.254

package/scripts/deploy-git-commit-empty.js

@@ -1,21 +1,21 @@
-#!/usr/bin/env node
-
-const { execSync } = require('child_process');
-
-function main() {
-  // 安装dom和widget
-  let cmdLine = "git diff --cached";
-  console.info("\nRunning [" + cmdLine + "]... ");
-  let ret = execSync(cmdLine, { stderr: "inherit" });
-  if(ret) {
-    console.error("\nError: There have same uncommitted files in cache, please cleanup first.");
-    process.exit(1);
-  }
-
-
-  // 安装dom和widget
-  cmdLine = "git commit --allow-empty -m \"强制版本+1\"";
-  console.info("\nRunning [" + cmdLine + "]... ");
-  execSync(cmdLine, { stdio: "inherit", stderr: "inherit" });
-}
-main();
+#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+
+function main() {
+  // 安装dom和widget
+  let cmdLine = "git diff --cached";
+  console.info("\nRunning [" + cmdLine + "]... ");
+  let ret = execSync(cmdLine, { stderr: "inherit" });
+  if(ret) {
+    console.error("\nError: There have same uncommitted files in cache, please cleanup first.");
+    process.exit(1);
+  }
+
+
+  // 安装dom和widget
+  cmdLine = "git commit --allow-empty -m \"强制版本+1\"";
+  console.info("\nRunning [" + cmdLine + "]... ");
+  execSync(cmdLine, { stdio: "inherit", stderr: "inherit" });
+}
+main();

package/scripts/deploy-prepare.js

@@ -1,59 +1,56 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
-const { cpSync, syncReadIO, updateVersion } = require('./common');
-
-async function updateVersionWithPrompt() {
-  const options = {};
-  options.projectDir = process.cwd();
-
-  const gitChanges = updateVersion(options.projectDir);
-  if (gitChanges) {
-    console.log('Git changes:\n' + gitChanges);
-
-    const answer = await syncReadIO('Warning: Git working directory not clean, do you want to update version continue? [yes/NO]\n');
-    if (answer?.toLowerCase() === 'yes') {
-      updateVersion(options.projectDir, true);
-    } else {
-      console.error("Error: User cancelled.")
-      process.exit(1);
-    }
-  }
-}
-
-function buildAndInstallModules(moduleName, projectDir, sourceDir, distBinDir) {
-  console.info('\nBuilding ' + moduleName + '... ');
-  pkgPkgFile = path.resolve(sourceDir, 'package.json');
-  if (!fs.existsSync(pkgPkgFile)) {
-    console.error('Error: Failed to build ' + moduleName + ', "' + path.relative(options.projectDir, pkgPkgFile) + '" is not exists.');
-    process.exit(1);
-  }
-
-  cmdLine = 'cd ' + sourceDir + ' && npm install && npm run build';
-  console.info('Run [' + cmdLine + ']... ');
-  execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
-
-  cpSync(projectDir, path.resolve(sourceDir, 'dist'), distBinDir);
-}
-
-async function main() {
-  const options = {};
-  options.projectDir = process.cwd();
-  options.domBinDir = path.resolve(options.projectDir, 'dom/bin');
-  options.widgetBinDir = path.resolve(options.projectDir, 'utils/JsViewEngineWidget/bin');
-  options.domSourceDir = path.resolve(options.projectDir, 'deps/jsview-dom');
-  options.widgetSourceDir = path.resolve(options.projectDir, 'deps/jsview-vue3-engine-widget');
-
-  const ret = await updateVersionWithPrompt();
-
-  buildAndInstallModules('jsview-dom',
-                         options.projectDir,
-                         options.domSourceDir, options.domBinDir);
-  buildAndInstallModules('jsview-vue3-engine-widget',
-                         options.projectDir,
-                         options.widgetSourceDir, options.widgetBinDir);
-}
-
-main();
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+const { cpSync, syncReadIO, updateVersion } = require('./common');
+
+async function updateVersionWithPrompt(projectDir) {
+  const gitChanges = updateVersion(projectDir);
+  if (gitChanges) {
+    console.log('Git changes:\n' + gitChanges);
+
+    const answer = await syncReadIO('Warning: Git working directory not clean, do you want to update version continue? [yes/NO]\n');
+    if (answer?.toLowerCase() === 'yes') {
+      updateVersion(projectDir, true);
+    } else {
+      console.error("Error: User cancelled.")
+      process.exit(1);
+    }
+  }
+}
+
+function buildAndInstallModules(moduleName, projectDir, sourceDir, distBinDir) {
+  console.info('\nBuilding ' + moduleName + '... ');
+  pkgPkgFile = path.resolve(sourceDir, 'package.json');
+  if (!fs.existsSync(pkgPkgFile)) {
+    console.error('Error: Failed to build ' + moduleName + ', "' + path.relative(projectDir, pkgPkgFile) + '" is not exists.');
+    process.exit(1);
+  }
+
+  cmdLine = 'cd ' + sourceDir + ' && npm install && npm run build';
+  console.info('Run [' + cmdLine + ']... ');
+  execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
+
+  cpSync(projectDir, path.resolve(sourceDir, 'dist'), distBinDir);
+}
+
+async function main() {
+  const options = {};
+  options.projectDir = process.cwd();
+  options.domBinDir = path.resolve(options.projectDir, 'dom/bin');
+  options.widgetBinDir = path.resolve(options.projectDir, 'utils/JsViewEngineWidget/bin');
+  options.domSourceDir = path.resolve(options.projectDir, 'deps/jsview-dom');
+  options.widgetSourceDir = path.resolve(options.projectDir, 'deps/jsview-vue3-engine-widget');
+
+  const ret = await updateVersionWithPrompt(options.projectDir);
+
+  buildAndInstallModules('jsview-dom',
+                         options.projectDir,
+                         options.domSourceDir, options.domBinDir);
+  buildAndInstallModules('jsview-vue3-engine-widget',
+                         options.projectDir,
+                         options.widgetSourceDir, options.widgetBinDir);
+}
+
+main();

package/scripts/jsview-install-local-packages.js

@@ -1,73 +1,73 @@
-#!/usr/bin/env node
-
-const path = require("path");
-const fs = require("fs");
-const { execSync } = require('child_process');
-const { cpSync, rmSync } = require('./common');
-
-function installPackages(options) {
-  // react/vue3共同的dom
-  const jsviewDomDir = options.rootDir + '/jsview/dom/bin/';
-  const jsviewDomPath = fs.readdirSync(jsviewDomDir).pop(); // 选择最后一个tgz
-  console.info('Found jsview-dom package: ' + jsviewDomDir + '/' + jsviewDomPath);
-  let cmdLine = "npm install file:" + jsviewDomDir + '/' + jsviewDomPath + " jsview-dom";
-  console.info("\nRunning [" + cmdLine + "]... ");
-  execSync(cmdLine, { stdio: "inherit", stderr: "inherit" });
-
-  // vue专有的widget
-  const jsviewReactWidgetDir = options.rootDir + '/jsview/utils/JsViewEngineWidget/bin/';
-  const jsviewReactWidgetPath = fs.readdirSync(jsviewReactWidgetDir).pop(); // 选择最后一个tgz
-  console.info('Found jsview-vue-widget package: ' + jsviewReactWidgetDir + '/' + jsviewReactWidgetPath);
-  cmdLine = "npm install file:" + jsviewReactWidgetDir + '/' + jsviewReactWidgetPath + " @shijiu-jsview/vue-widget";
-  console.info("\nRunning [" + cmdLine + "]... ");
-  execSync(cmdLine, { stdio: "inherit", stderr: "inherit" });
-
-  console.info("\nPatching jsview from " + options.patchDir);
-  cpSync(
-    options.rootDir,
-    options.patchDir + "/node_modules",
-    options.rootDir + "/node_modules"
-  );
-
-  console.info("\nCleanup node_modules cache... ");
-  const nodeModuleCacheDir = options.rootDir + "/node_modules/.cache";
-  rmSync(nodeModuleCacheDir);
-}
-
-async function printRevision(options) {
-  const jsveiwVersionFile = options.jsviewDir + "/dom/target_core_revision.js";
-
-  const jsviewTargetVersion = require(jsveiwVersionFile);
-
-  console.log("");
-  console.log("**************************************************");
-  console.log("* Update revision to:");
-  console.log("* CORE: " + jsviewTargetVersion.CoreRevision);
-  console.log("* ENGINE JS URL: " + jsviewTargetVersion.JseUrl);
-  console.log("**************************************************");
-}
-
-function backupPkgLock() {
-  const pkgLockName = 'package-lock.json';
-  const scriptDir = path.resolve(__dirname);
-  const rootDir = path.join(scriptDir, '/../../');
-
-  console.info("\nBackuping " + pkgLockName);
-  cpSync(rootDir, rootDir + pkgLockName, rootDir + '/jsview/patch/' + pkgLockName);
-}
-
-function main() {
-  const options = {
-    rootDir: path.resolve(__dirname, "../../"),
-    jsviewDir: path.resolve(__dirname, "../"),
-    patchDir: path.resolve(__dirname, "../patch"),
-  };
-
-
-  installPackages(options);
-
-  backupPkgLock();
-
-  printRevision(options);
-}
-main();
+#!/usr/bin/env node
+
+const path = require("path");
+const fs = require("fs");
+const { execSync } = require('child_process');
+const { cpSync, rmSync } = require('./common');
+
+function installPackages(options) {
+  // react/vue3共同的dom
+  const jsviewDomDir = options.rootDir + '/jsview/dom/bin/';
+  const jsviewDomPath = fs.readdirSync(jsviewDomDir).pop(); // 选择最后一个tgz
+  console.info('Found jsview-dom package: ' + jsviewDomDir + '/' + jsviewDomPath);
+  let cmdLine = "npm install file:" + jsviewDomDir + '/' + jsviewDomPath + " jsview-dom";
+  console.info("\nRunning [" + cmdLine + "]... ");
+  execSync(cmdLine, { stdio: "inherit", stderr: "inherit" });
+
+  // vue专有的widget
+  const jsviewReactWidgetDir = options.rootDir + '/jsview/utils/JsViewEngineWidget/bin/';
+  const jsviewReactWidgetPath = fs.readdirSync(jsviewReactWidgetDir).pop(); // 选择最后一个tgz
+  console.info('Found jsview-vue-widget package: ' + jsviewReactWidgetDir + '/' + jsviewReactWidgetPath);
+  cmdLine = "npm install file:" + jsviewReactWidgetDir + '/' + jsviewReactWidgetPath + " @shijiu-jsview/vue-widget";
+  console.info("\nRunning [" + cmdLine + "]... ");
+  execSync(cmdLine, { stdio: "inherit", stderr: "inherit" });
+
+  console.info("\nPatching jsview from " + options.patchDir);
+  cpSync(
+    options.rootDir,
+    options.patchDir + "/node_modules",
+    options.rootDir + "/node_modules"
+  );
+
+  console.info("\nCleanup node_modules cache... ");
+  const nodeModuleCacheDir = options.rootDir + "/node_modules/.cache";
+  rmSync(nodeModuleCacheDir);
+}
+
+async function printRevision(options) {
+  const jsveiwVersionFile = options.jsviewDir + "/dom/target_core_revision.js";
+
+  const jsviewTargetVersion = require(jsveiwVersionFile);
+
+  console.log("");
+  console.log("**************************************************");
+  console.log("* Update revision to:");
+  console.log("* CORE: " + jsviewTargetVersion.CoreRevision);
+  console.log("* ENGINE JS URL: " + jsviewTargetVersion.JseUrl);
+  console.log("**************************************************");
+}
+
+function backupPkgLock() {
+  const pkgLockName = 'package-lock.json';
+  const scriptDir = path.resolve(__dirname);
+  const rootDir = path.join(scriptDir, '/../../');
+
+  console.info("\nBackuping " + pkgLockName);
+  cpSync(rootDir, rootDir + pkgLockName, rootDir + '/jsview/patch/' + pkgLockName);
+}
+
+function main() {
+  const options = {
+    rootDir: path.resolve(__dirname, "../../"),
+    jsviewDir: path.resolve(__dirname, "../"),
+    patchDir: path.resolve(__dirname, "../patch"),
+  };
+
+
+  installPackages(options);
+
+  backupPkgLock();
+
+  printRevision(options);
+}
+main();

package/scripts/jsview-post-build.js

@@ -1,127 +1,127 @@
-#!/usr/bin/env node
-
-const crypto = require('crypto');
-const fs = require('fs');
-const path = require('path');
-
-// main.js处理AppData信息
-function prepareMainAppData(options, fileMd5)
-{
-  // 加载私钥文件
-  const privateKeyFile = path.resolve(options.appConfigDir, 'app_sign_private_key.crt');
-  if (!fs.existsSync(privateKeyFile)) {
-    console.error('Failed to open private key file from ' + privateKeyFile);
-    process.exit(1);
-  }
-  const privateKeyText = fs.readFileSync(privateKeyFile);
-  if (privateKeyText.indexOf('-----BEGIN PRIVATE KEY-----') < 0) {
-    console.error('Get private from src/appConfig/app_sign_private_key.crt failed.');
-    process.exit(1);
-  }
-
-  // 加载公钥文件
-  const publicKeyFile = path.resolve(options.appConfigDir, 'app_sign_public_key.pem');
-  if (!fs.existsSync(publicKeyFile)) {
-    console.error('Failed to open public key file from ' + publicKeyFile);
-    process.exit(1);
-  }
-  const publicKeyText = fs.readFileSync(publicKeyFile);
-  if (publicKeyText.indexOf('-----BEGIN PUBLIC KEY-----') < 0) {
-    console.error('Get private from src/appConfig/app_sign_public_key.pem failed.');
-    process.exit(1);
-  }
-  // 公钥格式转化pem -> der，因为java中的解码处理只识别der格式
-  let publicKeyDerText = publicKeyText.toString();
-  if (publicKeyDerText.indexOf('\r') >= 0) {
-    publicKeyDerText = publicKeyDerText.replace(/\r/g, '');
-  }        
-  if (publicKeyDerText.indexOf('\n') >= 0) {
-    publicKeyDerText = publicKeyDerText.replace(/\n/g, '');
-  }
-  publicKeyDerText = publicKeyDerText.replace('-----BEGIN PUBLIC KEY-----', '');
-  publicKeyDerText = publicKeyDerText.replace('-----END PUBLIC KEY-----', '');
-
-  // 编码md5值
-  const encryptCodeBase64 = crypto.privateEncrypt({
-      key: privateKeyText, 
-      padding: crypto.constants.RSA_PKCS1_PADDING
-    }, 
-    Buffer.from(fileMd5)
-  ).toString('base64');
-
-  // 校验publicKey是否是配对的
-  const decryptCode = crypto.publicDecrypt({
-      key: publicKeyText,
-      padding: crypto.constants.RSA_PKCS1_PADDING
-    }, 
-    Buffer.from(encryptCodeBase64, 'base64')
-  ).toString();
-  if (decryptCode !== fileMd5) {
-    console.error('Error: public key dismath to private key!');
-    process.exit(1);
-  }
-
-  // 获取AppData信息
-  const appConfigFile = path.resolve(options.appConfigDir, 'app_config.json');
-  if (!fs.existsSync(appConfigFile)) {
-    console.error('Failed to open app config file from ' + appConfigFile);
-    process.exit(1);
-  }
-  const appConfigText = fs.readFileSync(appConfigFile);
-  const appDataOriginJson = JSON.parse(appConfigText);
-
-  // 组装AppData
-  let targetAppData = {};
-  Object.assign(targetAppData, appDataOriginJson); // 同步包括AppName在内的所有信息
-  targetAppData.PublicKeys = [publicKeyDerText]; // 使用签名数组，支持后续追加签名
-  targetAppData.EncryptCodes = [encryptCodeBase64]; // 同样使用数组，支持后续追加
-
-  return JSON.stringify(targetAppData);
-}
-
-function signApp(options)
-{
-  const jsDir = path.resolve(options.distDir, 'js');
-  const jsFiles = fs.readdirSync(jsDir);
-  jsFiles.forEach((file, index) => {
-    if (!file.endsWith('.js')) {
-      return;
-    }
-
-    const jsFile = path.resolve(jsDir, file);
-    console.log('Updating ' + path.relative(options.projectDir, jsFile));
-
-    var jsvAppContents = fs.readFileSync(jsFile);
-    const jsvAppMd5 = crypto.createHash('md5').update(jsvAppContents).digest('hex');
-    let appDataInfo = '';
-    if (jsFile.indexOf('main.jsv.') > 0) {
-      // 对main文件加入应用头信息
-      appDataInfo = prepareMainAppData(options, jsvAppMd5);
-
-      // 格式化jsvapp信息 /*jsvapp:内容长度:{内容}*/
-      // 使用TextEncoder解决中文长度问题
-      const infoLen = new TextEncoder().encode(appDataInfo).length;
-      appDataInfo = '/*jsvapp:' + infoLen + ':' + appDataInfo + '*/';
-    }
-    jsvAppContents = '/*jsvmd5:' + jsvAppMd5 + '*/' + appDataInfo + jsvAppContents;
-    fs.writeFileSync(jsFile, jsvAppContents);
-  });
-}
-
-function main() {
-  const options = {};
-  options.projectDir = process.cwd();
-  options.modulesDir = path.resolve(options.projectDir, "node_modules");
-  options.jsviewDir = path.resolve(options.modulesDir, "@shijiu/jsview-vue");
-  options.patchesDir = path.resolve(options.jsviewDir, "patches");
-  options.distDir = path.resolve(options.projectDir, "dist");
-  options.appConfigDir = path.resolve(options.projectDir, "src/appConfig");
-
-  console.info('Signing JsView App...');
-  console.info();
-  signApp(options);
-  console.info();
-  console.info('Sign complete.');
-}
-
-main();
+#!/usr/bin/env node
+
+const crypto = require('crypto');
+const fs = require('fs');
+const path = require('path');
+
+// main.js处理AppData信息
+function prepareMainAppData(options, fileMd5)
+{
+  // 加载私钥文件
+  const privateKeyFile = path.resolve(options.appConfigDir, 'app_sign_private_key.crt');
+  if (!fs.existsSync(privateKeyFile)) {
+    console.error('Failed to open private key file from ' + privateKeyFile);
+    process.exit(1);
+  }
+  const privateKeyText = fs.readFileSync(privateKeyFile);
+  if (privateKeyText.indexOf('-----BEGIN PRIVATE KEY-----') < 0) {
+    console.error('Get private from src/appConfig/app_sign_private_key.crt failed.');
+    process.exit(1);
+  }
+
+  // 加载公钥文件
+  const publicKeyFile = path.resolve(options.appConfigDir, 'app_sign_public_key.pem');
+  if (!fs.existsSync(publicKeyFile)) {
+    console.error('Failed to open public key file from ' + publicKeyFile);
+    process.exit(1);
+  }
+  const publicKeyText = fs.readFileSync(publicKeyFile);
+  if (publicKeyText.indexOf('-----BEGIN PUBLIC KEY-----') < 0) {
+    console.error('Get private from src/appConfig/app_sign_public_key.pem failed.');
+    process.exit(1);
+  }
+  // 公钥格式转化pem -> der，因为java中的解码处理只识别der格式
+  let publicKeyDerText = publicKeyText.toString();
+  if (publicKeyDerText.indexOf('\r') >= 0) {
+    publicKeyDerText = publicKeyDerText.replace(/\r/g, '');
+  }        
+  if (publicKeyDerText.indexOf('\n') >= 0) {
+    publicKeyDerText = publicKeyDerText.replace(/\n/g, '');
+  }
+  publicKeyDerText = publicKeyDerText.replace('-----BEGIN PUBLIC KEY-----', '');
+  publicKeyDerText = publicKeyDerText.replace('-----END PUBLIC KEY-----', '');
+
+  // 编码md5值
+  const encryptCodeBase64 = crypto.privateEncrypt({
+      key: privateKeyText, 
+      padding: crypto.constants.RSA_PKCS1_PADDING
+    }, 
+    Buffer.from(fileMd5)
+  ).toString('base64');
+
+  // 校验publicKey是否是配对的
+  const decryptCode = crypto.publicDecrypt({
+      key: publicKeyText,
+      padding: crypto.constants.RSA_PKCS1_PADDING
+    }, 
+    Buffer.from(encryptCodeBase64, 'base64')
+  ).toString();
+  if (decryptCode !== fileMd5) {
+    console.error('Error: public key dismath to private key!');
+    process.exit(1);
+  }
+
+  // 获取AppData信息
+  const appConfigFile = path.resolve(options.appConfigDir, 'app_config.json');
+  if (!fs.existsSync(appConfigFile)) {
+    console.error('Failed to open app config file from ' + appConfigFile);
+    process.exit(1);
+  }
+  const appConfigText = fs.readFileSync(appConfigFile);
+  const appDataOriginJson = JSON.parse(appConfigText);
+
+  // 组装AppData
+  let targetAppData = {};
+  Object.assign(targetAppData, appDataOriginJson); // 同步包括AppName在内的所有信息
+  targetAppData.PublicKeys = [publicKeyDerText]; // 使用签名数组，支持后续追加签名
+  targetAppData.EncryptCodes = [encryptCodeBase64]; // 同样使用数组，支持后续追加
+
+  return JSON.stringify(targetAppData);
+}
+
+function signApp(options)
+{
+  const jsDir = path.resolve(options.distDir, 'js');
+  const jsFiles = fs.readdirSync(jsDir);
+  jsFiles.forEach((file, index) => {
+    if (!file.endsWith('.js')) {
+      return;
+    }
+
+    const jsFile = path.resolve(jsDir, file);
+    console.log('Updating ' + path.relative(options.projectDir, jsFile));
+
+    var jsvAppContents = fs.readFileSync(jsFile);
+    const jsvAppMd5 = crypto.createHash('md5').update(jsvAppContents).digest('hex');
+    let appDataInfo = '';
+    if (jsFile.indexOf('main.jsv.') > 0) {
+      // 对main文件加入应用头信息
+      appDataInfo = prepareMainAppData(options, jsvAppMd5);
+
+      // 格式化jsvapp信息 /*jsvapp:内容长度:{内容}*/
+      // 使用TextEncoder解决中文长度问题
+      const infoLen = new TextEncoder().encode(appDataInfo).length;
+      appDataInfo = '/*jsvapp:' + infoLen + ':' + appDataInfo + '*/';
+    }
+    jsvAppContents = '/*jsvmd5:' + jsvAppMd5 + '*/' + appDataInfo + jsvAppContents;
+    fs.writeFileSync(jsFile, jsvAppContents);
+  });
+}
+
+function main() {
+  const options = {};
+  options.projectDir = process.cwd();
+  options.modulesDir = path.resolve(options.projectDir, "node_modules");
+  options.jsviewDir = path.resolve(options.modulesDir, "@shijiu/jsview-vue");
+  options.patchesDir = path.resolve(options.jsviewDir, "patches");
+  options.distDir = path.resolve(options.projectDir, "dist");
+  options.appConfigDir = path.resolve(options.projectDir, "src/appConfig");
+
+  console.info('Signing JsView App...');
+  console.info();
+  signApp(options);
+  console.info();
+  console.info('Sign complete.');
+}
+
+main();