@shijiu/jsview-vue 0.9.243 → 0.9.249

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "0.9.243",
+  "version": "0.9.249",
   "bin": {
-    "jsview-post-build": "./scripts/post-build.js",
-    "jsview-post-install": "./scripts/post-install.js",
-    "jsview-install-local-packages": "./scripts/install-local-packages.js"
+    "jsview-post-build": "./scripts/jsview-post-build.js",
+    "jsview-post-install": "./scripts/jsview-post-install.js",
+    "jsview-install-local-packages": "./scripts/jsview-install-local-packages.js"
   },
   "scripts": {
-    "prepack": "./scripts/pre-pack.js"
+    "fast-publish": "node ./scripts/deploy-fast-publish.js",
+    "fast-pack": "node ./scripts/deploy-fast-pack.js"
   },
   "repository": "system/jsview-vue",
   "bugs": "http://gitlab.qcast.cn/system/jsview-vue/issues",

package/scripts/common.js

@@ -1,7 +1,63 @@
 #!/usr/bin/env node
 
-const path = require("path");
 const fs = require("fs");
+const path = require("path");
+const readline = require('readline')
+const { execSync } = require('child_process');
+
+function updateVersion(projectDir, ignoreChanges)
+{
+  let cmdLine = 'cd ' + projectDir + ' && git rev-list --count HEAD';
+  let patchVersion = execSync(cmdLine, { stderr: "inherit" });
+  patchVersion = parseInt(patchVersion);
+
+  pkgPkgFile = path.resolve(projectDir, 'package.json');
+  if (!fs.existsSync(pkgPkgFile)) {
+    console.error('Error: Failed to install jsview patches, "' + path.relative(projectDir, pkgPkgFile) + '" is not exists.');
+    process.exit(1);
+  }
+  pkgPkgObj = require(pkgPkgFile);
+  if (pkgPkgObj.version.endsWith("." + patchVersion)) {
+    console.info('\nFound version: ' + pkgPkgObj.version);
+    return;
+  }
+
+  if (!ignoreChanges) {
+    let cmdLine = 'cd ' + projectDir + ' && git status --porcelain';
+    let gitChanges = execSync(cmdLine, { stderr: "inherit" });
+    gitChanges = gitChanges.toString();
+    if (gitChanges) {
+      return gitChanges;
+    }
+  }
+
+  // 替换PatchVersion为git 提交数。
+  pkgPkgObj.version = pkgPkgObj.version.replace(/\.[0-9]*$/, '.' + patchVersion);
+
+  fs.writeFileSync(pkgPkgFile, JSON.stringify(pkgPkgObj, null, 2));
+  console.info('\nUpdated version to ' + pkgPkgObj.version);
+}
+
+async function syncReadIO(prompt) {
+  const input = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  input.on('SIGINT', function () {
+    console.error("Error: User cancelled.")
+    process.exit(1);
+  });
+
+  let ret;
+  input.question(prompt,
+                 answer => {
+                   input.close();
+                   ret = answer;
+                 });
+  for await (const line of input) {}
+
+  return ret;
+}
 
 function cpSync(workDir, src, dest) {
   const exists = fs.existsSync(src);
@@ -54,5 +110,7 @@ function deleteFolderRecursive(path) {
 
 module.exports = {
   cpSync,
-  rmSync
+  rmSync,
+  syncReadIO,
+  updateVersion,
 }

package/scripts/deploy-fast-pack.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+
+function main() {
+  const options = {};
+  options.projectDir = process.cwd();
+
+  let cmdLine = 'cd ' + options.projectDir + '&& node ./scripts/deploy-prepare.js';
+  console.info('Run [' + cmdLine + ']... ');
+  execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
+
+  cmdLine = 'cd ' + options.projectDir + '&& npm pack';
+  console.info('Run [' + cmdLine + ']... ');
+  execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
+}
+main();

package/scripts/deploy-fast-publish.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+
+const readline = require('readline')
+const { execSync } = require('child_process');
+const { syncReadIO } = require('./common');
+
+async function login() {
+  const password = await syncReadIO('\nPlease input password of qcast@npmjs.com: ');
+  if (!password) {
+    console.error("Error: Bad password.")
+    process.exit(1);
+  }
+
+  let cmdLine = 'npm-cli-login -u qcast -e support@qcast.cn -p ' + password;
+  console.info('Run [' + cmdLine + ']... ');
+  try {
+    ret = execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
+  } catch (err) {
+    console.error("Failed to exec npm-cli-login.")
+    console.error("If you are not you can install this command with `npm install -g npm-cli-login`.")
+    process.exit(1)
+  }
+}
+
+async function main() {
+  const options = {};
+  options.projectDir = process.cwd();
+
+  cmdLine = 'cd ' + options.projectDir + '&& node ./scripts/deploy-prepare.js';
+  console.info('Run [' + cmdLine + ']... ');
+  execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
+
+  await login();
+
+  cmdLine = 'cd ' + options.projectDir + '&& npm publish --tag latest --access=public --registry https://registry.npmjs.com';
+  console.info('Run [' + cmdLine + ']... ');
+  execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
+}
+main();

package/scripts/{pre-pack.js → deploy-prepare.js}

@@ -3,7 +3,25 @@
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
-const { cpSync } = require('./common');
+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 + '... ');
@@ -14,32 +32,13 @@ function buildAndInstallModules(moduleName, projectDir, sourceDir, distBinDir) {
   }
 
   cmdLine = 'cd ' + sourceDir + ' && npm install && npm run build';
-  console.info('Rnn [' + cmdLine + ']... ');
+  console.info('Run [' + cmdLine + ']... ');
   execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
 
   cpSync(projectDir, path.resolve(sourceDir, 'dist'), distBinDir);
 }
 
-function upPackageVersion(options)
-{
-  let patchVersion = execSync('git rev-list --count HEAD', { stderr: "inherit" });
-  patchVersion = parseInt(patchVersion);
-
-  pkgPkgFile = path.resolve(options.projectDir, 'package.json');
-  if (!fs.existsSync(pkgPkgFile)) {
-    console.error('Error: Failed to install jsview patches, "' + path.relative(options.projectDir, pkgPkgFile) + '" is not exists.');
-    process.exit(1);
-  }
-  pkgPkgObj = require(pkgPkgFile);
-
-  // 替换PatchVersion为git 提交数。
-  pkgPkgObj.version = pkgPkgObj.version.replace(/\.[0-9]*$/, '.' + patchVersion);
-
-  fs.writeFileSync(pkgPkgFile, JSON.stringify(pkgPkgObj, null, 2));
-  console.info('\nUpdated version to ' + pkgPkgObj.version);
-}
-
-function main() {
+async function main() {
   const options = {};
   options.projectDir = process.cwd();
   options.domBinDir = path.resolve(options.projectDir, 'dom/bin');
@@ -47,14 +46,14 @@ function main() {
   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);
-
-  upPackageVersion(options);
 }
 
 main();

package/scripts/{install-local-packages.js → jsview-install-local-packages.js}

@@ -3,55 +3,7 @@
 const path = require("path");
 const fs = require("fs");
 const { execSync } = require('child_process');
-
-function cpSync(workDir, src, dest) {
-  const exists = fs.existsSync(src);
-  const stats = exists && fs.statSync(src);
-  const isDirectory = exists && stats.isDirectory();
-  if (isDirectory) {
-    if (fs.existsSync(dest) == false) {
-      fs.mkdirSync(dest);
-    }
-    fs.readdirSync(src).forEach(function(childItemName) {
-      cpSync(
-        workDir,
-        path.join(src, childItemName),
-        path.join(dest, childItemName)
-      );
-    });
-  } else {
-    console.info(
-      "  " + path.relative(workDir, src) + " -> " + path.relative(workDir, dest)
-    );
-    fs.copyFileSync(src, dest);
-  }
-}
-
-function rmSync(path) {
-  if (!!fs.rmSync) {
-    fs.rmSync(path, { recursive: true, force: true });
-  } else {
-    deleteFolderRecursive(path)
-  }
-}
-
-function deleteFolderRecursive(path) {
-  var files = [];
-  if (fs.existsSync(path)) {
-    files = fs.readdirSync(path);
-    files.forEach(function(file, index) {
-      var curPath = path + "/" + file;
-      if (fs.lstatSync(curPath).isDirectory()) {
-        // recurse
-        deleteFolderRecursive(curPath);
-      } else {
-        // delete file
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(path);
-  }
-}
+const { cpSync, rmSync } = require('./common');
 
 function installPackages(options) {
   // react/vue3共同的dom

package/scripts/{post-build.js → jsview-post-build.js}

@@ -7,7 +7,6 @@ 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)) {

package/scripts/{post-install.js → jsview-post-install.js}

@@ -2,55 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-
-function cpSync(workDir, src, dest) {
-  const exists = fs.existsSync(src);
-  const stats = exists && fs.statSync(src);
-  const isDirectory = exists && stats.isDirectory();
-  if (isDirectory) {
-    if (fs.existsSync(dest) == false) {
-      fs.mkdirSync(dest);
-    }
-    fs.readdirSync(src).forEach(function(childItemName) {
-      cpSync(
-        workDir,
-        path.join(src, childItemName),
-        path.join(dest, childItemName)
-      );
-    });
-  } else {
-    console.info(
-      '  ' + path.relative(workDir, src) + ' -> ' + path.relative(workDir, dest)
-    );
-    fs.copyFileSync(src, dest);
-  }
-}
-
-function rmSync(path) {
-  if (!!fs.rmSync) {
-    fs.rmSync(path, { recursive: true, force: true });
-  } else {
-    deleteFolderRecursive(path)
-  }
-}
-
-function deleteFolderRecursive(path) {
-  var files = [];
-  if (fs.existsSync(path)) {
-    files = fs.readdirSync(path);
-    files.forEach(function(file, index) {
-      var curPath = path + '/' + file;
-      if (fs.lstatSync(curPath).isDirectory()) {
-        // recurse
-        deleteFolderRecursive(curPath);
-      } else {
-        // delete file
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(path);
-  }
-}
+const { cpSync, rmSync } = require('./common');
 
 function checkNpmCommand() {
   let command = process.env.npm_command;

package/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "deps/jsview-dom"]
-	path = deps/jsview-dom
-	url = http://gitlab.qcast.cn/system/jsview-dom.git
-[submodule "deps/jsview-vue3-engine-widget"]
-	path = deps/jsview-vue3-engine-widget
-	url = http://gitlab.qcast.cn/system/jsview-vue3-engine-widget.git

package/README.md

@@ -1,11 +0,0 @@
-1. 更新git submodule:
-
-``` git submodule update --init --recursive ```
-
-2. 打包:
-
-``` npm pack ```
-
-3. 发布:
-
-``` npm publish --access=public  --registry https://registry.npmjs.com ```

package/doc/IMPORT_CHANGE_LOG.txt

@@ -1,3 +0,0 @@
-2021.9.1
-====================================
-1. 代码从jsview-export-react-sample分离后出版上传

package/doc/git_commit.md

@@ -1,15 +0,0 @@
-提交规范：
-
-主模块:子模块:改动点
-
-主模块: react_js 或者 java_app
-
-子模块: 
-	react_js
-		红包雨
-		Video播放
-		简易Simplewidget
-		...
-	java_app: DemoApp
-	
-例如: react_js:红包雨:提交XXXX修改

package/doc/test_version_up.txt

@@ -1 +0,0 @@
-+8332