@shijiu/jsview-vue 0.9.249 → 0.9.254

package/scripts/jsview-post-install.js

@@ -1,78 +1,78 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const { cpSync, rmSync } = require('./common');
-
-function checkNpmCommand() {
-  let command = process.env.npm_command;
-  if(!command) {
-    command = process.env.npm_config_refer; // for linux
-  }
-  if(command == 'ci') {
-    return;
-  }
-
-  console.warn();
-  console.warn(`!!! Warn: Not recommended for use 'npm ${process.env.npm_command} '.`);
-  console.warn('Please use "npm ci" to install node modules.');
-  console.warn();
-}
-
-function checkPackageVersion(options, name, version)
-{
-  pkgPkgFile = path.resolve(options.modulesDir, name, '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);
-  if (pkgPkgObj.version != version) {
-    console.error('Error: ' + name + '@' + pkgPkgObj.version + ' is not supported, required version is ' + version);
-    process.exit(1);
-  }
-}
-
-function installPatches(options) {
-  console.info('\nPatching jsview from ' + options.patchesDir);
-  cpSync(
-    options.projectDir,
-    options.patchesDir + '/node_modules',
-    options.projectDir + '/node_modules'
-  );
-
-  console.info('\nCleanup node_modules cache... ');
-  const nodeModuleCacheDir = options.projectDir + '/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('* Update revision to:');
-  console.log('* CORE: ' + jsviewTargetVersion.CoreRevision);
-  console.log('* ENGINE JS URL: ' + jsviewTargetVersion.JseUrl);
-  console.log('**************************************************');
-}
-
-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');
-
-  checkNpmCommand();
-
-  checkPackageVersion(options, 'vue', '3.2.8');
-  checkPackageVersion(options, '@vue/compiler-sfc', '3.2.8');
-
-  installPatches(options);
-
-  printRevision(options);
-}
-main();
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const { cpSync, rmSync } = require('./common');
+
+function checkNpmCommand() {
+  let command = process.env.npm_command;
+  if(!command) {
+    command = process.env.npm_config_refer; // for linux
+  }
+  if(command == 'ci') {
+    return;
+  }
+
+  console.warn();
+  console.warn(`!!! Warn: Not recommended for use 'npm ${process.env.npm_command} '.`);
+  console.warn('Please use "npm ci" to install node modules.');
+  console.warn();
+}
+
+function checkPackageVersion(options, name, version)
+{
+  pkgPkgFile = path.resolve(options.modulesDir, name, '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);
+  if (pkgPkgObj.version != version) {
+    console.error('Error: ' + name + '@' + pkgPkgObj.version + ' is not supported, required version is ' + version);
+    process.exit(1);
+  }
+}
+
+function installPatches(options) {
+  console.info('\nPatching jsview from ' + options.patchesDir);
+  cpSync(
+    options.projectDir,
+    options.patchesDir + '/node_modules',
+    options.projectDir + '/node_modules'
+  );
+
+  console.info('\nCleanup node_modules cache... ');
+  const nodeModuleCacheDir = options.projectDir + '/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('* Update revision to:');
+  console.log('* CORE: ' + jsviewTargetVersion.CoreRevision);
+  console.log('* ENGINE JS URL: ' + jsviewTargetVersion.JseUrl);
+  console.log('**************************************************');
+}
+
+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');
+
+  checkNpmCommand();
+
+  checkPackageVersion(options, 'vue', '3.2.8');
+  checkPackageVersion(options, '@vue/compiler-sfc', '3.2.8');
+
+  installPatches(options);
+
+  printRevision(options);
+}
+main();

package/scripts/jsview-run-android.js

@@ -1,64 +1,64 @@
-#!/usr/bin/env node
-
-const childProcess = require('child_process');
-const path = require('path');
-
-function getOptions() {
-    const options = {
-        androidPackage: "com.qcode.jsview.sample_demo/com.qcode.jsview.sample.SingleActivity",
-        coreRevision: null,
-        jseUrl: null,
-        homepageUrl: null,
-    }
-
-    if (process.argv.length >= 3) {
-        options.androidPackage = process.argv[2];
-    }
-
-    const rootDir = process.cwd();
-    const jsviewDir = path.resolve(rootDir, 'jsview');
-    const jsveiwVersionFile = path.resolve(jsviewDir, 'dom/target_core_revision.js');
-    const jsviewTargetVersion = require(jsveiwVersionFile);
-    options.coreRevision = jsviewTargetVersion.CoreRevision;
-    options.jseUrl = jsviewTargetVersion.JseUrl;
-
-    const homepageUrlFile = path.resolve(rootDir, 'node_modules/.cache/jsview/network');
-    let homepageUrl = require(homepageUrlFile);
-    homepageUrl = homepageUrl.replace(/\u001b\[.*?m/g, '')
-    options.homepageUrl = homepageUrl + "js/main.jsv.js";
-
-    return options;
-}
-
-function printRevision(options) {
-    console.log("**************************************************");
-    console.log("* Android Package: " + options.androidPackage);
-    console.log("* Core:            " + options.coreRevision);
-    console.log("* Engine JS url:   " + options.jseUrl);
-    console.log("* Homepage url:    " + options.homepageUrl);
-    console.log("**************************************************");
-}
-
-function androidStartActivity(options) {
-    let cmdline = "adb shell am start";
-    cmdline += ` -n ${options.androidPackage}`;
-    cmdline += ` --es COREVERSIONRANGE "${options.coreRevision}"`;
-    cmdline += ` --es ENGINE "${options.jseUrl}"`;
-    cmdline += ` --es URL "${options.homepageUrl}"`;
-    console.log(`Run command: ${cmdline}\n`);
-    try {
-        childProcess.execSync(cmdline, {stdio: [0, 1, 2]});
-    } catch (e) {
-        // console.log(e);
-    }
-}
-
-
-function main() {
-    const options = getOptions();
-
-    printRevision(options);
-
-    androidStartActivity(options);
-}
-main()
+#!/usr/bin/env node
+
+const childProcess = require('child_process');
+const path = require('path');
+
+function getOptions() {
+    const options = {
+        androidPackage: "com.qcode.jsview.sample_demo/com.qcode.jsview.sample.SingleActivity",
+        coreRevision: null,
+        jseUrl: null,
+        homepageUrl: null,
+    }
+
+    if (process.argv.length >= 3) {
+        options.androidPackage = process.argv[2];
+    }
+
+    const rootDir = process.cwd();
+    const jsviewDir = path.resolve(rootDir, 'jsview');
+    const jsveiwVersionFile = path.resolve(jsviewDir, 'dom/target_core_revision.js');
+    const jsviewTargetVersion = require(jsveiwVersionFile);
+    options.coreRevision = jsviewTargetVersion.CoreRevision;
+    options.jseUrl = jsviewTargetVersion.JseUrl;
+
+    const homepageUrlFile = path.resolve(rootDir, 'node_modules/.cache/jsview/network');
+    let homepageUrl = require(homepageUrlFile);
+    homepageUrl = homepageUrl.replace(/\u001b\[.*?m/g, '')
+    options.homepageUrl = homepageUrl + "js/main.jsv.js";
+
+    return options;
+}
+
+function printRevision(options) {
+    console.log("**************************************************");
+    console.log("* Android Package: " + options.androidPackage);
+    console.log("* Core:            " + options.coreRevision);
+    console.log("* Engine JS url:   " + options.jseUrl);
+    console.log("* Homepage url:    " + options.homepageUrl);
+    console.log("**************************************************");
+}
+
+function androidStartActivity(options) {
+    let cmdline = "adb shell am start";
+    cmdline += ` -n ${options.androidPackage}`;
+    cmdline += ` --es COREVERSIONRANGE "${options.coreRevision}"`;
+    cmdline += ` --es ENGINE "${options.jseUrl}"`;
+    cmdline += ` --es URL "${options.homepageUrl}"`;
+    console.log(`Run command: ${cmdline}\n`);
+    try {
+        childProcess.execSync(cmdline, {stdio: [0, 1, 2]});
+    } catch (e) {
+        // console.log(e);
+    }
+}
+
+
+function main() {
+    const options = getOptions();
+
+    printRevision(options);
+
+    androidStartActivity(options);
+}
+main()

package/scripts/make-js.sh

@@ -1,181 +1,181 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-
-print_usage()
-{
-	echo '
-NAME
-       make-js
-
-SYNOPSIS
-       make-js
-
-DESCRIPTION
-       build sample_with_button APK. auto setup code revision
-       Example: ./make-js
-
-OPTIONS
-		--certpath=Path(from folder react_js) of certification, such as src/appConfig = react_js/src/appConfig/
-			default value is src/appConfig
-		-h, --help
-                 Optional. Print help infomation and exit successfully.;
-    ';
-}
-
-parse_options()
-{
-	cmd_getopt="getopt";
-	if [ "$KERNEL_NAME" == "Darwin" ]; then
-		cmd_getopt="/usr/local/Cellar/gnu-getopt/2.37.2/bin/getopt";
-	fi
-
-	options=`$cmd_getopt -o h \
-			 --long "certpath:,help" \
-			 -n 'make-js' -- "$@"`;
-	eval set -- "$options"
-	while true; do
-		case "$1" in
-			(-h | --help)
-				print_usage;
-				exit 0;
-				;;
-			(--certpath)
-				CERT_PATH=$2;
-				shift 2;
-				;;
-			(- | --)
-				shift;
-				break;
-				;;
-			(*)
-				echo "Internal error!";
-				exit 1;
-				;;
-		esac
-	done
-}
-
-logdbg()
-{
-	if [[ $DEBUG_VERBOSE == false ]]; then
-		return;
-	fi
-
-	echo -e " [d]: $@";
-}
-
-logtrace()
-{
-	echo -e "\033[1;34m [-]: $@ \033[00m";
-}
-
-loginfo()
-{
-	echo -e "\033[1;32m [+]: $@ \033[00m";
-}
-
-logwarn()
-{
-	echo -e "\033[1;33m [!]: $@ \033[00m";
-}
-
-logerr_and_exit()
-{
-	echo -e "\033[1;31m [x]: $@ \033[00m";
-	exit 1;
-}
-
-trim() {
-	local var="$*"
-	var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
-	var="${var%"${var##*[![:space:]]}"}"   # remove trailing whitespace characters
-	echo -n "$var"
-}
-
-print_version_log()
-{
-	logtrace "*********************************************************";
-	logtrace " Version infomation";
-	logtrace "    codeRevision   : ${CODE_REVISION}";
-	logtrace "*********************************************************";
-}
-
-prepare_env()
-{
-	CODE_REVISION="$(git rev-list --count HEAD)";
-}
-
-# common variable
-SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd);
-PROJECT_DIR=$(dirname "$SCRIPT_DIR");
-PROJECT_DIR=$(dirname "$PROJECT_DIR");
-KERNEL_NAME=$(uname -s);
-DEBUG_VERBOSE=false;
-CERT_PATH=src/appConfig
-
-# specific variable
-CODE_REVISION=0;
-
-main_run()
-{
-	loginfo "parsing options";
-	parse_options $@;
-	
-	loginfo "prepare env";
-	prepare_env;
-
-	print_version_log;
-
-	# TODO: cd 到vue工程代码的根目录(有node_modules的那个目录)
-	# cd react_js;
-	
-	# 更新环境状态
-	#if [ -f "package-lock.json-perfect" ]; then
-		#loginfo "USE package-lock.json-perfect"
-		#cp package-lock.json-perfect package-lock.json
-	#fi
-	npm ci
-	#cd jsview/
-	#node scripts/do-patch.js
-	#cd ../
-		
-	loginfo "CERT_PATH=${CERT_PATH}"
-		
-    # 替换App为DemoHomepage
-    SED_CMD='sed -i ';
-    if [ "$KERNEL_NAME" == "Darwin" ]; then
-        SED_CMD+=' ""';
-    fi
-    $SED_CMD 's|@/App.vue|jsview/samples/DemoHomepage/App.vue|' src/main.ts;
-
-
-	# 生成crt和pem签名文件
-	cp ${CERT_PATH}/app_sign_private_key_sample.crt src/appConfig/app_sign_private_key.crt
-	cp ${CERT_PATH}/app_sign_public_key_sample.pem src/appConfig/app_sign_public_key.pem
-		
-	# 编译JS
-	npm run-script build
-
-	# 输出主文件路径
-	local main_path=`find dist | grep "main\..*\.js$"`
-	echo "MAIN JS SUB_PATH: ${main_path}"
-
-	# 输出 Core 版本信息
-	local core_revision=`cat jsview/dom/target_core_revision.js | grep "CoreRevision"`
-	core_revision=${core_revision#*\"CoreRevision\":}; # 去掉开头
-	core_revision=${core_revision%,*}; # 去掉末尾的引号
-	echo "CORE REVISION: ${core_revision}"
-	
-	# 输出 engineJs 信息
-	local engine_js=`cat jsview/dom/target_core_revision.js | grep "JsViewES6"`
-	engine_js=${engine_js#*\"}; # 去掉开头的引号
-	engine_js=${engine_js%\",*}; # 去掉末尾的引号
-	echo "ENGINE JS: ${engine_js}"
-	
-	loginfo "DONE !!!";
-	loginfo "BUILD SUCCESSED";
-}
-
-main_run $@;
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+
+print_usage()
+{
+	echo '
+NAME
+       make-js
+
+SYNOPSIS
+       make-js
+
+DESCRIPTION
+       build sample_with_button APK. auto setup code revision
+       Example: ./make-js
+
+OPTIONS
+		--certpath=Path(from folder react_js) of certification, such as src/appConfig = react_js/src/appConfig/
+			default value is src/appConfig
+		-h, --help
+                 Optional. Print help infomation and exit successfully.;
+    ';
+}
+
+parse_options()
+{
+	cmd_getopt="getopt";
+	if [ "$KERNEL_NAME" == "Darwin" ]; then
+		cmd_getopt="/usr/local/Cellar/gnu-getopt/2.37.2/bin/getopt";
+	fi
+
+	options=`$cmd_getopt -o h \
+			 --long "certpath:,help" \
+			 -n 'make-js' -- "$@"`;
+	eval set -- "$options"
+	while true; do
+		case "$1" in
+			(-h | --help)
+				print_usage;
+				exit 0;
+				;;
+			(--certpath)
+				CERT_PATH=$2;
+				shift 2;
+				;;
+			(- | --)
+				shift;
+				break;
+				;;
+			(*)
+				echo "Internal error!";
+				exit 1;
+				;;
+		esac
+	done
+}
+
+logdbg()
+{
+	if [[ $DEBUG_VERBOSE == false ]]; then
+		return;
+	fi
+
+	echo -e " [d]: $@";
+}
+
+logtrace()
+{
+	echo -e "\033[1;34m [-]: $@ \033[00m";
+}
+
+loginfo()
+{
+	echo -e "\033[1;32m [+]: $@ \033[00m";
+}
+
+logwarn()
+{
+	echo -e "\033[1;33m [!]: $@ \033[00m";
+}
+
+logerr_and_exit()
+{
+	echo -e "\033[1;31m [x]: $@ \033[00m";
+	exit 1;
+}
+
+trim() {
+	local var="$*"
+	var="${var#"${var%%[![:space:]]*}"}"   # remove leading whitespace characters
+	var="${var%"${var##*[![:space:]]}"}"   # remove trailing whitespace characters
+	echo -n "$var"
+}
+
+print_version_log()
+{
+	logtrace "*********************************************************";
+	logtrace " Version infomation";
+	logtrace "    codeRevision   : ${CODE_REVISION}";
+	logtrace "*********************************************************";
+}
+
+prepare_env()
+{
+	CODE_REVISION="$(git rev-list --count HEAD)";
+}
+
+# common variable
+SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd);
+PROJECT_DIR=$(dirname "$SCRIPT_DIR");
+PROJECT_DIR=$(dirname "$PROJECT_DIR");
+KERNEL_NAME=$(uname -s);
+DEBUG_VERBOSE=false;
+CERT_PATH=src/appConfig
+
+# specific variable
+CODE_REVISION=0;
+
+main_run()
+{
+	loginfo "parsing options";
+	parse_options $@;
+	
+	loginfo "prepare env";
+	prepare_env;
+
+	print_version_log;
+
+	# TODO: cd 到vue工程代码的根目录(有node_modules的那个目录)
+	# cd react_js;
+	
+	# 更新环境状态
+	#if [ -f "package-lock.json-perfect" ]; then
+		#loginfo "USE package-lock.json-perfect"
+		#cp package-lock.json-perfect package-lock.json
+	#fi
+	npm ci
+	#cd jsview/
+	#node scripts/do-patch.js
+	#cd ../
+		
+	loginfo "CERT_PATH=${CERT_PATH}"
+		
+    # 替换App为DemoHomepage
+    SED_CMD='sed -i ';
+    if [ "$KERNEL_NAME" == "Darwin" ]; then
+        SED_CMD+=' ""';
+    fi
+    $SED_CMD 's|@/App.vue|jsview/samples/DemoHomepage/App.vue|' src/main.ts;
+
+
+	# 生成crt和pem签名文件
+	cp ${CERT_PATH}/app_sign_private_key_sample.crt src/appConfig/app_sign_private_key.crt
+	cp ${CERT_PATH}/app_sign_public_key_sample.pem src/appConfig/app_sign_public_key.pem
+		
+	# 编译JS
+	npm run-script build
+
+	# 输出主文件路径
+	local main_path=`find dist | grep "main\..*\.js$"`
+	echo "MAIN JS SUB_PATH: ${main_path}"
+
+	# 输出 Core 版本信息
+	local core_revision=`cat jsview/dom/target_core_revision.js | grep "CoreRevision"`
+	core_revision=${core_revision#*\"CoreRevision\":}; # 去掉开头
+	core_revision=${core_revision%,*}; # 去掉末尾的引号
+	echo "CORE REVISION: ${core_revision}"
+	
+	# 输出 engineJs 信息
+	local engine_js=`cat jsview/dom/target_core_revision.js | grep "JsViewES6"`
+	engine_js=${engine_js#*\"}; # 去掉开头的引号
+	engine_js=${engine_js%\",*}; # 去掉末尾的引号
+	echo "ENGINE JS: ${engine_js}"
+	
+	loginfo "DONE !!!";
+	loginfo "BUILD SUCCESSED";
+}
+
+main_run $@;

package/utils/JsViewEngineWidget/bin/index.js

@@ -1 +1 @@
-export * from "./jsview-vue-widget.min.js"
+export * from "./jsview-vue-widget.min.js"

package/utils/JsViewEngineWidget/bin/package.json

@@ -1,11 +1,11 @@
-{
-  "name": "@shijiu-jsview/vue-widget",
-  "version": "1.0.0",
-  "description": "A Vue widget library used to get jsview support",
-  "main": "index.js",
-  "keywords": [
-    "jsview-vue",
-    "widget"
-  ],
-  "author": "Donglin.lu <donglin.lu@qcast.cn>"
-}
+{
+  "name": "@shijiu-jsview/vue-widget",
+  "version": "1.0.0",
+  "description": "A Vue widget library used to get jsview support",
+  "main": "index.js",
+  "keywords": [
+    "jsview-vue",
+    "widget"
+  ],
+  "author": "Donglin.lu <donglin.lu@qcast.cn>"
+}