@shijiu/jsview 1.9.843 → 1.9.859

package/dom/jsv-browser-debug-dom.js

@@ -1,4 +1,5 @@
-import './browser-root-style.css'
+// 再vite环境下，dynamic import css文件没有生效，所以直接卸载了index.html中.
+// import './browser-root-style.css'
 
 import JsvCodeDebug from './jsv-code-debug.mjs'
 
@@ -8,11 +9,11 @@ if (!JsvCodeDebug.enableDebug) {
   // Release entry
   domBrowser = await import('./bin/jsview-browser-debug-dom.min');
 } else {
-  // Debug entry
-  domBrowser = await import(JsvCodeDebug.domBrowserPath);
-
-  // for Webpack
-  // domBrowser = await import('./code/src/dom-browser-hook');
+  // Debug entry (兼容webpack写法)
+  domBrowser = await import(
+    /* webpackExclude: /@shijiu\/jsview\/dom\/code\/node_modules\// */
+    `${JsvCodeDebug.domBrowserPath}`
+  );
 }
 
 export default domBrowser;

package/dom/jsv-code-debug.mjs

@@ -1,4 +1,3 @@
-
 const JsvCodeDebug = {
   // true: Debug entry
   // false: Release entry

package/dom/jsv-dom.js

@@ -6,11 +6,11 @@ if (!JsvCodeDebug.enableDebug) {
   // Release entry
   domNative = await import('./bin/jsview-dom.min');
 } else {
-  // Debug entry
-  domNative = await import(JsvCodeDebug.domNativePath);
-
-  // for Webpack
-  // domNative = await import('./code/src/dom-wrapper');
+  // Debug entry (兼容webpack写法)
+  domNative = await import(
+    /* webpackExclude: /@shijiu\/jsview\/dom\/code\/node_modules\// */
+    `${JsvCodeDebug.domNativePath}`
+  );
 }
 
 export {

package/dom/jsv-engine-js-browser.js

@@ -6,11 +6,11 @@ if (!JsvCodeDebug.enableDebug) {
   // Release entry
   engineBrowser = await import("./bin/jsview-engine-js-browser.min");
 } else {
-  // Debug entry
-  engineBrowser = await import(JsvCodeDebug.engineBrowserPath);
-
-  // for Webpack
-  // engineBrowser = await import('./code/src/engine-js/browser');
+  // Debug entry (兼容webpack写法)
+  engineBrowser = await import(
+    /* webpackExclude: /@shijiu\/jsview\/dom\/code\/node_modules\// */
+    `${JsvCodeDebug.engineBrowserPath}`
+  );
 }
 
 export default engineBrowser;

package/dom/jsv-forge-define.js

@@ -6,11 +6,11 @@ if (!JsvCodeDebug.enableDebug) {
   // Release entry
   forgeDefine = await import('./bin/jsview-forge-define.min');
 } else {
-  // Debug entry
-  forgeDefine = await import(JsvCodeDebug.forgeDefinePath);
-
-  // for Webpack
-  // forgeDefine = await import('./code/src/engine-js');
+  // Debug entry (兼容webpack写法)
+  forgeDefine = await import(
+    /* webpackExclude: /@shijiu\/jsview\/dom\/code\/node_modules\// */
+    `${JsvCodeDebug.forgeDefinePath}`
+  );
 }
 
 const Forge = forgeDefine.Forge;

package/dom/target_core_revision.mjs

@@ -3,8 +3,8 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 1021253,
-  "CoreRevisionAndBranch": "1021253",
+  "CoreRevision": 1021272,
+  "CoreRevisionAndBranch": "1021272",
   "JseRevision": "1.0.827",
   "JseUrl":
     "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_react_r827.jsv.6825753b.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "1.9.843",
+  "version": "1.9.859",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/patches/node_modules/react-scripts/config/webpack.config.js

@@ -323,6 +323,16 @@ module.exports = function (webpackEnv) {
       ],
     },
     resolve: {
+      // JsView Added >>>
+      // 解决JsViewDom的Code Debug中，import(variable)时，npm start报错。
+      fallback: {
+        "buffer": false,
+        "child_process": false,
+        "os": false,
+        "path": false,
+        "stream": false,
+        "worker_threads": false,
+      },
       // This allows you to set a fallback for where webpack should look for modules.
       // We placed these paths second because we want `node_modules` to "win"
       // if there are any conflicts. This matches Node resolution mechanism.
@@ -447,7 +457,7 @@ module.exports = function (webpackEnv) {
 // JsView Modified >>>
 // 将jsview和jsviewDebugPath计入打包
               // include: paths.appSrc,
-              include: [paths.appSrc, paths.jsviewPath, paths.jsviewDebugPath ],
+              include: [ paths.appSrc, paths.jsviewPath, paths.jsviewDebugPath ],
 // JsView Modified <<<
               loader: require.resolve('babel-loader'),
               options: {

package/patches/node_modules/vite/dist/node/jsview-vite-extension.js

@@ -48,7 +48,7 @@ const jsviewConfig = defineConfig({
       'qr.js'
     ],
     exclude: [
-      '@shijiu/jsview/loader/jsview-main.js', // 解决windows上出现解析异常的问题。
+      '@shijiu/jsview/loader/jsview-main.mjs', // 解决windows上出现解析异常的问题。
       'jsview',
       'jsview-vue',
       'jsview-vue-samples',
@@ -67,7 +67,7 @@ const jsviewConfig = defineConfig({
       'jsview-vue-samples': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview-vue-samples'),
       'jsview-react': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview-react'),
       'jsview-react-samples': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview-react-samples'),
-      '/js/main.jsv.js': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview/loader/jsview-main.js'),
+      '/js/main.jsv.mjs': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview/loader/jsview-main.mjs'),
     },
     preserveSymlinks: true
   },
@@ -154,6 +154,29 @@ function jsvSaveUrlToCache(urls) {
   fs.writeFileSync(urlCacheFilePath, `export default "${urls.network[0]}"`)
 }
 
+async function checkDomDebugDisabled() {
+  // production 时检查jsview-dom是否处于Debug模式。
+  if (process.env.NODE_ENV !== 'production') {
+    return;
+  }
+
+  const moduleDir = getModuleDir();
+  const jsviewDomCodeDebugFilePath = path.resolve(moduleDir, '@shijiu/jsview/dom/jsv-code-debug.mjs');
+  if (!fs.existsSync(jsviewDomCodeDebugFilePath)) {
+    return;
+  }
+
+  const { default: jsviewDomCodeDebug } = await import(jsviewDomCodeDebugFilePath);
+  if (jsviewDomCodeDebug.enableDebug) {
+    throw new Error('JsView Error: Dom debug is enabled, please disable it first.')
+  }
+}
+
+async function main() {
+  await checkDomDebugDisabled();
+}
+await main()
+
 export {
   jsvCreateJsViewViteConfig,
   jsvSaveUrlToCache,

package/tools/jsview-post-build.js

@@ -7,6 +7,7 @@ const path = require('path');
 const {
   checkNodeVersion,
   getOptions,
+  parseArguments,
 } = require('./jsview-common');
 
 // main.js处理AppData信息
@@ -138,7 +139,27 @@ function redirectSourceMappingURL(options)
   };
 }
 
-function makeDebugMap(options)
+function makeMainJsvMjs(options, framework)
+{
+  if (framework != 'vue') {
+    return;
+  }
+
+  let jsEntryFilePath;
+  const jsFileNames = fs.readdirSync(options.distJsDir);
+  for(const fileName of jsFileNames) {
+    if (fileName.startsWith('main.jsv') && fileName.endsWith('.js')) {
+      jsEntryFilePath = path.resolve(options.distJsDir, fileName);
+      break;
+    }
+  };
+
+  const to = jsEntryFilePath.replace(/.js$/, '.mjs');
+  console.log(' -> ' + path.relative(options.projectDir, to));
+  fs.copyFileSync(jsEntryFilePath, to);
+}
+
+function makeDebugMap(options, framework)
 {
   fs.mkdirSync(options.distDebugMapDir, { recursive: true });
 
@@ -159,7 +180,11 @@ function makeDebugMap(options)
   };
 
   if (jsEntryFilePath) {
-    const to = path.resolve(options.distJsDir, 'main.jsv.js');
+    let extName = path.extname(jsEntryFilePath);
+    if (framework == 'vue') {
+      extName = '.mjs'
+    }
+    const to = path.resolve(options.distJsDir, 'main.jsv' + extName);
     console.log(' -> ' + path.relative(options.projectDir, to));
     fs.copyFileSync(jsEntryFilePath, to);
   }
@@ -176,7 +201,7 @@ function makeDebugMap(options)
   fs.copyFileSync(jsmapServePath, to);
 }
 
-async function main()
+async function main(argv)
 {
   checkNodeVersion();
 
@@ -199,9 +224,19 @@ async function main()
   await signApp(options);
   console.info('Signed JsView App.');
 
+  console.info('Making JsView main.jsv.mjs...');
+  makeMainJsvMjs(options, argv.framework);
+  console.info('Made JsView main.jsv.mjs...');
+
   console.info('Making JsView Debug map...');
-  makeDebugMap(options);
+  makeDebugMap(options, argv.framework);
   console.info('Made JsView Debug map.');
 }
 
-main();
+const requiredUsages = {
+  '--framework': 'Select from [vue|react]',
+};
+const optionalUsages = {
+};
+const argv = parseArguments(requiredUsages, optionalUsages);
+main(argv);

package/tools/jsview-run-android.js

@@ -30,11 +30,12 @@ async function getExtraOptions(argv)
     const baseUrlFile = url.pathToFileURL(options.baseUrlFile);
     let { default: baseUrl } = await import(baseUrlFile);
     baseUrl = baseUrl.replace(/\u001b\[.*?m/g, '')
-    options.entryUrl = baseUrl + 'js/main.jsv.js';
 
+    let entryUrl = baseUrl + 'js/main.jsv.js';
     if (argv.framework === 'vue') {
-        options.entryUrl += '?module=true';
+        entryUrl = 'js/main.jsv.mjs';
     }
+    options.entryUrl = baseUrl + entryUrl;
 
     return options;
 }