@shijiu/jsview-vue 0.9.243 → 0.9.246

package/README.md

@@ -8,4 +8,8 @@
 
 3. 发布:
 
-``` npm publish --access=public  --registry https://registry.npmjs.com ```
+``` npm publish --access=public  --registry https://registry.npmjs.com ```
+
+4. 注意事项：
+
+生效时间和是否可以强制制定版本

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "0.9.243",
+  "version": "0.9.246",
   "bin": {
     "jsview-post-build": "./scripts/post-build.js",
     "jsview-post-install": "./scripts/post-install.js",
     "jsview-install-local-packages": "./scripts/install-local-packages.js"
   },
   "scripts": {
-    "prepack": "./scripts/pre-pack.js"
+    "deploy": "node ./scripts/update-version.js && npm publish --access=public  --registry https://registry.npmjs.com",
+    "prepack": "node ./scripts/update-version.js && node ./scripts/pre-pack.js"
   },
   "repository": "system/jsview-vue",
   "bugs": "http://gitlab.qcast.cn/system/jsview-vue/issues",

package/scripts/common.js

@@ -2,6 +2,40 @@
 
 const path = require("path");
 const fs = require("fs");
+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);
+  console.log(pkgPkgObj.version, patchVersion)
+  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" });
+    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);
+}
 
 function cpSync(workDir, src, dest) {
   const exists = fs.existsSync(src);
@@ -53,6 +87,7 @@ function deleteFolderRecursive(path) {
 }
 
 module.exports = {
+  updateVersion,
   cpSync,
   rmSync
 }

package/scripts/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

@@ -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

@@ -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/scripts/pre-pack.js

@@ -20,25 +20,6 @@ function buildAndInstallModules(moduleName, projectDir, sourceDir, distBinDir) {
   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() {
   const options = {};
   options.projectDir = process.cwd();
@@ -53,8 +34,6 @@ function main() {
   buildAndInstallModules('jsview-vue3-engine-widget',
                          options.projectDir,
                          options.widgetSourceDir, options.widgetBinDir);
-
-  upPackageVersion(options);
 }
 
 main();

package/scripts/update-version.js

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+const readline = require('readline')
+const { updateVersion } = require('./common');
+
+function main() {
+  const options = {};
+  options.projectDir = process.cwd();
+
+  const gitChanges = updateVersion(options.projectDir);
+  if (gitChanges) {
+    const input = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    console.log('Git changes:\n' + gitChanges);
+
+    input.question('Warning: Git working directory not clean, do you want to update version continue? [yes/NO]\n',
+                   answer => {
+                     input.close();
+                     if (answer.toLowerCase() === 'yes') {
+                       updateVersion(options.projectDir, true);
+                     } else {
+                       console.error("Error: User cancelled.")
+                       process.exit(1);
+                     }
+                   });
+  }
+}
+
+main();