@shijiu/jsview 1.9.782 → 1.9.825

package/tools/jsview-post-install.js

@@ -6,8 +6,10 @@ const path = require('path');
 const url = require('url');
 const {
   cpSync,
+  execCommand,
   getOptions,
   getPackageObject,
+  isSymlinkSync,
   parseArguments,
   symlinkSync,
   rmSync
@@ -31,8 +33,37 @@ function checkNpmCommand()
 
 function checkNpmLinkForDebug(options, linkablePkgNames)
 {
-  const pkgObj = getPackageObject(options.projectDir);
+  // node 16 不会安装本地包的二次依赖, 需要手动安装。
+  let missingDepPkgs = '';
+  for (const linkableName of linkablePkgNames) {
+    const linkablePath = path.resolve(options.modulesDir, linkableName);
+    const linkablePkgObj = getPackageObject(linkablePath);
+
+    for (const dep in linkablePkgObj.dependencies ?? {}) {
+      const depPath = path.resolve(options.modulesDir, dep);
+      if (fs.existsSync(depPath)) {
+        continue;
+      }
+
+      const depPkg = dep + "@" + linkablePkgObj.dependencies[dep];
+      missingDepPkgs += ' ' + depPkg;
+    }
+
+    for (const devDep in linkablePkgObj.devDependencies ?? {}) {
+      const devDepPath = path.resolve(options.modulesDir, devDep);
+      if (fs.existsSync(devDepPath)) {
+        continue;
+      }
+
+      const devDepPkg = devDep + "@" + linkablePkgObj.devDependencies[devDep];
+      missingDepPkgs += ' ' + devDepPkg;
+    }
+  }
+  console.log('Install missing dependencies')
+  execCommand('npm install --no-save ' + missingDepPkgs);
 
+  // node 18 不会将本地依赖安装成链接，需要手动改成链接。
+  const pkgObj = getPackageObject(options.projectDir);
   for (const linkableName of linkablePkgNames) {
     let linkableTarget = pkgObj.dependencies?.[linkableName];
     if (!linkableTarget || !linkableTarget.startsWith('file:')) {
@@ -41,9 +72,14 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
 
     linkableTarget = linkableTarget.replace('file:', '');
     const linkableTargetPath = path.resolve(options.projectDir, linkableTarget);
+    if (isSymlinkSync(linkableTargetPath)) {
+      continue;
+    }
+
     const linkablePath = path.resolve(options.modulesDir, linkableName);
-    symlinkSync(linkableTargetPath, linkablePath);
+    symlinkSync(options.projectDir, linkableTargetPath, linkablePath);
   }
+
 }
 
 function checkPatches(options, pkgNeedPatch, skipCheckVersion)
@@ -58,7 +94,7 @@ function checkPatches(options, pkgNeedPatch, skipCheckVersion)
       const modulePkgDir = path.resolve(options.modulesDir, pkgName);
       const modulePkgObj = getPackageObject(modulePkgDir);
       if (modulePkgObj.version != patchPkgObj.version) {
-        console.error('Error: ' + pkgName + '@' + modulePkgObj.version + ' is not supported, required version is ' + patchPkgObj.version);
+        console.error('JsView Error: ' + pkgName + '@' + modulePkgObj.version + ' is not supported, required version is ' + patchPkgObj.version);
         process.exit(1);
       }
     } else {
@@ -78,7 +114,7 @@ function installPatches(options, pkgNeedPatch)
   }
 
   console.info('\nCleanup node_modules cache... ');
-  rmSync(options.cacheDir);
+  rmSync(options.projectDir, options.cacheDir);
 }
 
 async function printRevision(options)
@@ -125,11 +161,24 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
 
   const linkablePkgNames = [
     '@shijiu/jsview',
-    '@shijiu/jsview-vue',
-    '@shijiu/jsview-vue-samples',
-    '@shijiu/jsview-react',
-    '@shijiu/jsview-react-samples',
-  ]
+  ];
+  switch (framework) {
+    case 'vue':
+      linkablePkgNames.push(
+        '@shijiu/jsview-vue',
+        '@shijiu/jsview-vue-samples',
+      )
+      break;
+    case 'react':
+      linkablePkgNames.push(
+        '@shijiu/jsview-react',
+        '@shijiu/jsview-react-samples',
+      )
+      break;
+    default:
+      console.error('JsView Error: Bad framework: ' + framework);
+      break;
+  }
 
   checkNpmCommand();
 
@@ -159,8 +208,10 @@ function main(argv)
       break;
     case 'react':
       pkgNeedPatch = [
+        'react-dev-utils',
         'react-dom',
         'react-scripts',
+        'webpack-dev-server',
       ];
       break;
     default:

package/loader/jsview.default.config.js

@@ -1,37 +0,0 @@
-export default {
-    jsviewConfig: {
-        // (可选配置)localStorage支持
-        // domain可以为任意字符串，各Domain的localStorage互相隔离, 默认值是hostname
-        // presetKeys为预置key，可以直接使用localStorage.xxx的形式，避免undefined错误
-        localStorage: {
-            domain: "default",
-            presetKeys: [
-                "value1",
-                "value2"
-            ],
-        },
-
-        // (可选配置)填写main.js或者bundle.js相对于index.html的相对位置，
-        // 用于image/import.then的相对寻址, vue3默认值是/js/
-        jsSubPath: "/js/",
-    },
-
-    vendorConfig: {
-        // (可选配置)设置屏幕坐标映射值，screenWidth为屏幕画布定义的宽度，displayScale为清晰度，
-        // 默认值是画布宽度1280px, 清晰度为1.0
-        designedMap: {
-            screenWidth: 1280,
-            displayScale: 1.0
-        },
-
-        // (可选配置)按键接受的扩展，例如将静音按键(JAVA键值为164)映射为JS键值20001，
-        // PS:注意"164"的引号
-        bindKeys: {
-            keys: {
-                "164": 20001
-            },
-            syncKeys: {
-            }
-        },
-    }
-}

package/loader/loader.js

@@ -1,183 +0,0 @@
-import initHeaderScriptLoader from "./header_script_loader";
-import TargetRevision from "../dom/target_core_revision"
-import AppData from '/src/appConfig/app.config'
-
-// Forge define
-if (typeof window.Forge === 'undefined') { window.Forge = {}; }
-const Forge = window.Forge;
-
-function initDesignedMap(input_designed_map) {
-  window.Forge.DesignMap = function () {
-    let designMap = { width: 1280, displayScale: 1.0 };
-    try {
-      if (input_designed_map) {
-        const new_designed_map = {
-          width: input_designed_map.screenWidth,
-          displayScale: input_designed_map.displayScale
-        };
-        designMap = new_designed_map;
-      }
-    } catch (e) {
-      console.error("load designed map failed");
-    }
-
-    // 设置播放器的屏幕坐标尺寸
-    if (window.JsView && window.JsView.setVideoDesignMapWidth) {
-      window.JsView.setVideoDesignMapWidth(designMap.width);
-    } else {
-      // 借助Audio标签设置基类BaseMedia的屏幕尺寸配置，绕开react的unref语法检测
-      if (Audio.setDesignMapWidth) {
-        Audio.setDesignMapWidth(designMap.width);
-      }
-    }
-
-    return designMap;
-  };
-}
-
-// eslint-disable-next-line no-unused-vars
-let sJsViewForgeAppDefine = null;
-async function selectJsViewRuntime(js_sub_path, input_designed_map, app_name) {
-  // 初始Forge的启动入口
-  initEntry();
-
-  initDesignedMap(input_designed_map);
-  if (window.JsView) {
-    if (app_name && window.JsView.notifyAppName) {
-      window.JsView.notifyAppName(app_name);
-    }
-    initHeaderScriptLoader(js_sub_path);
-    let { domNative } = await import("../dom/jsv-dom.js");
-    sJsViewForgeAppDefine = domNative.JsViewForgeApp;
-    window.JsView.ForgeExt = domNative.ForgeExtension;
-    window.JsView.Dom.JsSubPath = js_sub_path;
-  } else {
-    // 在PC环境下没有处理加载EngineJs, 所以在此加载一下
-    await import("../dom/jsv-engine-js-browser.js");
-
-    // 加载jsv-dom的调试版本
-    await import("../dom/jsv-browser-debug-dom.js");
-  }
-}
-
-// 当confirmEntry和Forge.RunApp都被调用完成后，才会进行JsViewForgeApp运行
-// eslint-disable-next-line no-var
-let sActivityManager = null;
-// eslint-disable-next-line no-var
-let sEntryConfirmed = false;
-let sJsViewApp = null;
-
-function startForgeApp() {
-  if (sActivityManager !== null && sEntryConfirmed) {
-    console.log("Forge.RunApp().");
-    // eslint-disable-next-line new-cap
-    sJsViewApp = new sJsViewForgeAppDefine(sActivityManager);
-  }
-}
-
-function confirmEntry() {
-  sEntryConfirmed = true;
-  if (window.JsView) {
-    checkEngineVersion();
-  }
-  startForgeApp();
-}
-
-function initEntry() {
-  Forge.RunApp = function (activity_manager) {
-    console.log("Call from Forge.Run");
-    sActivityManager = activity_manager;
-    startForgeApp();
-  };
-}
-
-async function runMain() {
-  console.log("main.js loaded...");
-
-  // 确定并进行Forge模块的启动
-  confirmEntry();
-
-  console.log("main.js done...");
-}
-
-function checkEngineVersion() {
-  // 检查配套引擎的版本
-  if (
-    window.JsView.CodeRevision !== TargetRevision.CoreRevision /* Native引擎版本(由APK启动参数 CORE 决定) */ ||
-    window.Forge.Version !== TargetRevision.JseRevision /* JS引擎版本(由APK启动参数 ENGINEJS 决定) */
-  ) {
-    console.warn(
-      `Warning: JsView Engine version miss matched, some effect will be lost. url should be ${TargetRevision.JseUrl}`
-    );
-  }
-}
-
-function getHostName() {
-  const full_url = window.location.href;
-  let idx = full_url.indexOf("://");
-  // const protocol = (idx > 0 ? full_url.substring(0, idx + 1) : "");
-  const host_path = idx > 1 ? full_url.substring(idx + 3) : "";
-
-  idx = host_path.indexOf("/");
-  const host = idx > 0 ? host_path.substring(0, idx) : "";
-
-  return host;
-}
-
-async function startApp(config, onLoaded) {
-  console.log("StartApp...");
-  if (window.JsView) {
-    // 运行在JsView引擎中
-
-    // (可选配置)按键接受的扩展，例如将静音按键(JAVA键值为164)映射为JS键值20001，PS:注意"164"的引号
-    window.JsView.addKeysMap(config.vendorConfig.bindKeys);
-
-    // (可选配置)localStorage支持
-    let storageDomain = config.jsviewConfig.localStorage.domain;
-    if(storageDomain == "default") {
-      storageDomain = getHostName();
-    }
-    window.JsView.setStorageDomain(storageDomain); // Domain可以为任意字符串，各Domain的localStorage互相隔离
-    window.JsView.enableStorageNames(...config.jsviewConfig.localStorage.presetKeys);
-
-    // (可选设置)cookies的支持
-    let cookies_domain = config.jsviewConfig.cookies?.domain;
-    if (cookies_domain) {
-      console.log("Enable cookie for domain " + cookies_domain);
-      window.JsView.setCookieDomain?.(cookies_domain);
-    }
-
-    // JsView Dom相关配置
-    window.JsView.Dom.Render = function () {
-      onLoaded()
-    };
-  } else {
-      await onLoaded()
-  }
-}
-
-async function loadJsViewEnv(config, onLoaded) {
-  // 参数说明：
-  // /static/js/: (可选配置)填写main.js或者bundle.js相对于index.html的相对位置，用于image/import.then的相对寻址
-  // {screenWidth:1280, displayScale:1.0}: (可选配置)设置屏幕坐标映射值，前者为屏幕画布定义的宽度，后者为清晰度，
-  //                                     默认值是画布宽度1280px, 清晰度为1.0
-  await selectJsViewRuntime(config.jsviewConfig.jsSubPath,
-                            config.vendorConfig.designedMap,
-                            AppData.AppName);
-
-  // if (!window.JsView) {
-  //   await import("../utils/JsViewVueWidget/BrowserDebugWidget/WidgetLoader");
-  //   await import("../utils/JsViewPlugin/BrowserPluginLoader");
-  // }
-  
-  await startApp(config, onLoaded);
-
-  // 环境启动后，动态加载React框架和main
-  runMain();
-
-  console.log("index.js loaded AppName=" + AppData.AppName);
-}
-
-export {
-  loadJsViewEnv,
-};

package/loader/loader_webkit.js

@@ -1,40 +0,0 @@
-window.JsvDisableReactWrapper = true; // 设置标识位，有部分高阶组件根据此标识位决定元素的搭建方式
-
-// Forge define
-if (typeof window.Forge === 'undefined') { window.Forge = {}; }
-const Forge = window.Forge;
-
-// const sForgeReactAppDefine = null;
-function loadJsViewProxy(callback, js_sub_path) {
-  callback();
-}
-
-// 当confirmEntry和Forge.RunApp都被调用完成后，才会进行ForgeReactApp运行
-let sActivityManager = null;
-let sEntryConfirmed = false;
-// let sReactApp = null;
-
-function startForgeApp() {
-  if (sActivityManager !== null && sEntryConfirmed) {
-    console.log("Forge.RunApp().");
-    // sReactApp = new sForgeReactAppDefine(sActivityManager);
-  }
-}
-
-function confirmEntry() {
-  sEntryConfirmed = true;
-  startForgeApp();
-}
-
-function initEntry() {
-  Forge.RunApp = function (activity_manager) {
-    sActivityManager = activity_manager;
-    startForgeApp();
-  };
-}
-
-export {
-  loadJsViewProxy,
-  initEntry,
-  confirmEntry
-};

package/tools/index.js

@@ -1,209 +0,0 @@
-module.exports = function (args, opts) {
-    if (!opts) opts = {};
-    
-    var flags = { bools : {}, strings : {} };
-
-    if (typeof opts['boolean'] === 'boolean' && opts['boolean']) {
-      flags.allBools = true;
-    } else {
-      [].concat(opts['boolean']).filter(Boolean).forEach(function (key) {
-          flags.bools[key] = true;
-      });
-    }
-    
-    var aliases = {};
-    Object.keys(opts.alias || {}).forEach(function (key) {
-        aliases[key] = [].concat(opts.alias[key]);
-        aliases[key].forEach(function (x) {
-            aliases[x] = [key].concat(aliases[key].filter(function (y) {
-                return x !== y;
-            }));
-        });
-    });
-
-    [].concat(opts.string).filter(Boolean).forEach(function (key) {
-        flags.strings[key] = true;
-        if (aliases[key]) {
-            flags.strings[aliases[key]] = true;
-        }
-     });
-
-    var defaults = opts['default'] || {};
-    
-    var argv = { _ : [] };
-    Object.keys(flags.bools).forEach(function (key) {
-        setArg(key, defaults[key] === undefined ? false : defaults[key]);
-    });
-    
-    var notFlags = [];
-
-    if (args.indexOf('--') !== -1) {
-        notFlags = args.slice(args.indexOf('--')+1);
-        args = args.slice(0, args.indexOf('--'));
-    }
-
-    function setArg (key, val) {
-        var value = !flags.strings[key] && isNumber(val)
-            ? Number(val) : val
-        ;
-        setKey(argv, key.split('.'), value);
-        
-        (aliases[key] || []).forEach(function (x) {
-            setKey(argv, x.split('.'), value);
-        });
-    }
-    
-    for (var i = 0; i < args.length; i++) {
-        var arg = args[i];
-        
-        if (/^--.+=/.test(arg)) {
-            // Using [\s\S] instead of . because js doesn't support the
-            // 'dotall' regex modifier. See:
-            // http://stackoverflow.com/a/1068308/13216
-            var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
-            setArg(m[1], m[2]);
-        }
-        else if (/^--no-.+/.test(arg)) {
-            var key = arg.match(/^--no-(.+)/)[1];
-            setArg(key, false);
-        }
-        else if (/^--.+/.test(arg)) {
-            var key = arg.match(/^--(.+)/)[1];
-            var next = args[i + 1];
-            if (next !== undefined && !/^-/.test(next)
-            && !flags.bools[key]
-            && !flags.allBools
-            && (aliases[key] ? !flags.bools[aliases[key]] : true)) {
-                setArg(key, next);
-                i++;
-            }
-            else if (/^(true|false)$/.test(next)) {
-                setArg(key, next === 'true');
-                i++;
-            }
-            else {
-                setArg(key, flags.strings[key] ? '' : true);
-            }
-        }
-        else if (/^-[^-]+/.test(arg)) {
-            var letters = arg.slice(1,-1).split('');
-            
-            var broken = false;
-            for (var j = 0; j < letters.length; j++) {
-                var next = arg.slice(j+2);
-                
-                if (next === '-') {
-                    setArg(letters[j], next)
-                    continue;
-                }
-                
-                if (/[A-Za-z]/.test(letters[j])
-                && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) {
-                    setArg(letters[j], next);
-                    broken = true;
-                    break;
-                }
-                
-                if (letters[j+1] && letters[j+1].match(/\W/)) {
-                    setArg(letters[j], arg.slice(j+2));
-                    broken = true;
-                    break;
-                }
-                else {
-                    setArg(letters[j], flags.strings[letters[j]] ? '' : true);
-                }
-            }
-            
-            var key = arg.slice(-1)[0];
-            if (!broken && key !== '-') {
-                if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1])
-                && !flags.bools[key]
-                && (aliases[key] ? !flags.bools[aliases[key]] : true)) {
-                    setArg(key, args[i+1]);
-                    i++;
-                }
-                else if (args[i+1] && /true|false/.test(args[i+1])) {
-                    setArg(key, args[i+1] === 'true');
-                    i++;
-                }
-                else {
-                    setArg(key, flags.strings[key] ? '' : true);
-                }
-            }
-        }
-        else {
-            argv._.push(
-                flags.strings['_'] || !isNumber(arg) ? arg : Number(arg)
-            );
-        }
-    }
-    
-    Object.keys(defaults).forEach(function (key) {
-        if (!hasKey(argv, key.split('.'))) {
-            setKey(argv, key.split('.'), defaults[key]);
-            
-            (aliases[key] || []).forEach(function (x) {
-                setKey(argv, x.split('.'), defaults[key]);
-            });
-        }
-    });
-    
-    if (opts['--']) {
-        argv['--'] = new Array();
-        notFlags.forEach(function(key) {
-            argv['--'].push(key);
-        });
-    }
-    else {
-        notFlags.forEach(function(key) {
-            argv._.push(key);
-        });
-    }
-
-    return argv;
-};
-
-function hasKey (obj, keys) {
-    var o = obj;
-    keys.slice(0,-1).forEach(function (key) {
-        o = (o[key] || {});
-    });
-
-    var key = keys[keys.length - 1];
-    return key in o;
-}
-
-function setKey (obj, keys, value) {
-    var o = obj;
-    for (var i = 0; i < keys.length-1; i++) {
-        var key = keys[i];
-        if (key === '__proto__') return;
-        if (o[key] === undefined) o[key] = {};
-        if (o[key] === Object.prototype || o[key] === Number.prototype
-            || o[key] === String.prototype) o[key] = {};
-        if (o[key] === Array.prototype) o[key] = [];
-        o = o[key];
-    }
-
-    var key = keys[keys.length - 1];
-    if (key === '__proto__') return;
-    if (o === Object.prototype || o === Number.prototype
-        || o === String.prototype) o = {};
-    if (o === Array.prototype) o = [];
-    if (o[key] === undefined || typeof o[key] === 'boolean') {
-        o[key] = value;
-    }
-    else if (Array.isArray(o[key])) {
-        o[key].push(value);
-    }
-    else {
-        o[key] = [ o[key], value ];
-    }
-}
-
-function isNumber (x) {
-    if (typeof x === 'number') return true;
-    if (/^0x[0-9a-f]+$/i.test(x)) return true;
-    return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
-}
-