@shijiu/jsview-vue 0.9.247 → 0.9.248

package/README.md

@@ -8,13 +8,13 @@ jsview-vue/test用于调试jsview-vue，需要在npm start之前运行npm ci安
 
 ``` git submodule update --init --recursive ```
 
-2. 打包:
+2. 打包(为了自动管理版本号，所以不用npm pack):
 
-``` npm pack ```
+``` npm run fast-pack 或 ./scripts/deploy-fast-pack.js```
 
-3. 发布:
+3. 发布(为了自动管理版本号，所以不用npm publish):
 
-``` npm deploy ```
+``` npm run fast-publish 或 ./scripts/deploy-fast-publish.js```
 
 4. 注意事项：
 

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "0.9.247",
+  "version": "0.9.248",
   "bin": {
     "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": {
-    "fast-publish": "node ./scripts/deploy-update-version.js && npm publish --access=public  --registry https://registry.npmjs.com",
-    "fast-pack": "node ./scripts/deploy-update-version.js && node ./scripts/deploy-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,8 @@
 #!/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)
@@ -37,6 +38,27 @@ function updateVersion(projectDir, ignoreChanges)
   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);
   const stats = exists && fs.statSync(src);
@@ -87,7 +109,8 @@ function deleteFolderRecursive(path) {
 }
 
 module.exports = {
-  updateVersion,
   cpSync,
-  rmSync
+  rmSync,
+  syncReadIO,
+  updateVersion,
 }

package/scripts/deploy-fast-pack.js

@@ -3,8 +3,6 @@
 const { execSync } = require('child_process');
 
 function main() {
-  console.log(process.argv)
-
   const options = {};
   options.projectDir = process.cwd();
 

package/scripts/deploy-fast-publish.js

@@ -1,18 +1,38 @@
 #!/usr/bin/env node
 
+const readline = require('readline')
 const { execSync } = require('child_process');
+const { syncReadIO } = require('./common');
 
-function main() {
-  console.log(process.argv)
+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();
 
-  let cmdLine = 'cd ' + options.projectDir + '&& node ./scripts/deploy-prepare.js';
+  cmdLine = 'cd ' + options.projectDir + '&& node ./scripts/deploy-prepare.js';
   console.info('Run [' + cmdLine + ']... ');
   execSync(cmdLine, { stdio: 'inherit', stderr: 'inherit' });
 
-  cmdLine = 'cd ' + options.projectDir + '&& npm publish --access=public  --registry https://registry.npmjs.com';
+  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' });
 }

package/scripts/deploy-prepare.js

@@ -2,9 +2,8 @@
 
 const fs = require('fs');
 const path = require('path');
-const readline = require('readline')
 const { execSync } = require('child_process');
-const { cpSync, updateVersion } = require('./common');
+const { cpSync, syncReadIO, updateVersion } = require('./common');
 
 async function updateVersionWithPrompt() {
   const options = {};
@@ -14,27 +13,12 @@ async function updateVersionWithPrompt() {
   if (gitChanges) {
     console.log('Git changes:\n' + gitChanges);
 
-    const input = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-    input.on('SIGINT', function () {
+    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);
-    });
-
-    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);
-                     }
-                   });
-    for await (const line of input) {
-      return 0;
     }
   }
 }