@shijiu/jsview-vue 0.9.0 → 0.9.247

package/README.md

@@ -1,3 +1,9 @@
+jsview-vue和jsview-vue/test是两个完全独立的工程。
+
+jsview-vue用于开发和部署@shijiu/jsview-vue module，不需要做npm install。
+
+jsview-vue/test用于调试jsview-vue，需要在npm start之前运行npm ci安装依赖包，参照jsview-vue/test/README.md。
+
 1. 更新git submodule:
 
 ``` git submodule update --init --recursive ```
@@ -8,8 +14,8 @@
 
 3. 发布:
 
-``` npm publish --access=public  --registry https://registry.npmjs.com ```
+``` npm deploy ```
 
 4. 注意事项：
 
-生效时间和是否可以强制制定版本
+TODO: 生效时间和是否可以强制制定版本

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "0.9.00",
+  "version": "0.9.247",
   "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": {
-    "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"
+    "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"
   },
   "repository": "system/jsview-vue",
   "bugs": "http://gitlab.qcast.cn/system/jsview-vue/issues",

package/scripts/common.js

@@ -24,6 +24,7 @@ function updateVersion(projectDir, ignoreChanges)
   if (!ignoreChanges) {
     let cmdLine = 'cd ' + projectDir + ' && git status --porcelain';
     let gitChanges = execSync(cmdLine, { stderr: "inherit" });
+    gitChanges = gitChanges.toString();
     if (gitChanges) {
       return gitChanges;
     }

package/scripts/deploy-fast-pack.js

@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+
+function main() {
+  console.log(process.argv)
+
+  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,19 @@
+#!/usr/bin/env node
+
+const { execSync } = require('child_process');
+
+function main() {
+  console.log(process.argv)
+
+  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 publish --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}

@@ -2,8 +2,42 @@
 
 const fs = require('fs');
 const path = require('path');
+const readline = require('readline')
 const { execSync } = require('child_process');
-const { cpSync } = require('./common');
+const { cpSync, 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 input = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    input.on('SIGINT', function () {
+      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;
+    }
+  }
+}
 
 function buildAndInstallModules(moduleName, projectDir, sourceDir, distBinDir) {
   console.info('\nBuilding ' + moduleName + '... ');
@@ -14,13 +48,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 main() {
+async function main() {
   const options = {};
   options.projectDir = process.cwd();
   options.domBinDir = path.resolve(options.projectDir, 'dom/bin');
@@ -28,6 +62,8 @@ 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);

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

package/scripts/update-version.js

@@ -1,32 +0,0 @@
-#!/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();