@shijiu/jsview 1.9.825 → 1.9.837

package/loader/jsview-loader.js

@@ -52,6 +52,9 @@ export default class JsViewLoader {
       // 加载jsv-dom的调试版本
       await import("../dom/jsv-browser-debug-dom.js");
 
+      // 将jsv-forge-define单独做chunk, 解决npm run build后出现的循环import问题。
+      await import("../dom/jsv-forge-define.js");
+
       this.#forgeAppClass = JsViewBrowserForgeApp;
     }
   }

package/package.json

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

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

@@ -25,7 +25,11 @@ const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
 // like /todos/42/static/js/bundle.7289d.js. We have to know the root.
 const publicUrlOrPath = getPublicUrlOrPath(
   process.env.NODE_ENV === 'development',
-  require(resolveApp('package.json')).homepage,
+// JsView Modified >>>
+// index.html 使用相对路径
+  //require(resolveApp('package.json')).homepage,
+  require(resolveApp('package.json')).homepage ?? './',
+// JsView Modified <<<
   process.env.PUBLIC_URL
 );
 

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

@@ -6,6 +6,7 @@ import fullReload from 'vite-plugin-full-reload';
 // https://vitejs.dev/config/
 const jsviewConfig = defineConfig({
   assetsInclude: ['**/*.bmp'],
+  base: './', // index.html 使用相对路径
   build: {
     assetsInlineLimit: 0,
     //cssTarget: 'css/', // 未生效
@@ -23,12 +24,15 @@ const jsviewConfig = defineConfig({
     },
     rollupOptions: {
       output: {
-        format: 'esm',
-        entryFileNames: 'js/main.jsv.[hash].js',
+        assetFileNames: (chunkInfo) => chunkInfo.name.endsWith('.css')
+          ? 'css/[name].[hash].css' : 'assets/[name].[hash].[ext]',
         //chunkFileNames: 'js/[name].[hash].js',
         chunkFileNames: 'js/chunk.jsv.[hash].js',
-        assetFileNames: (chunkInfo) => chunkInfo.name.endsWith('.css')
-          ? 'css/[name].[hash].css' : 'assets/[name].[hash].[ext]'
+        entryFileNames: 'js/main.jsv.[hash].js',
+        format: 'esm',
+        manualChunks: {
+          'vue': ['vue', '\0plugin-vue:export-helper'], // 将vue和_export_sfc独立出来，防止被集成在main.js中导致import deadloop.
+        },
       },
     },
     sourcemap: true,
@@ -152,4 +156,4 @@ function jsvSaveUrlToCache(urls) {
 export {
   jsvCreateJsViewViteConfig,
   jsvSaveUrlToCache,
-}
+}

package/tools/jsview-common.js

@@ -179,7 +179,7 @@ function getOptions(framework)
   options.jsviewPatchesDir = path.resolve(options.jsviewDir, 'patches');
   options.jsviewPatchModulesDir = path.resolve(options.jsviewPatchesDir, 'node_modules');
   options.jsviewToolsDir = path.resolve(options.jsviewDir, 'tools');
-  options.jsviewRevisionFile = path.resolve(options.jsviewDir, 'dom', 'target_core_revision.mjs');
+  options.jsviewDomRevisionFile = path.resolve(options.jsviewDir, 'dom', 'target_core_revision.mjs');
 
   options.jsviewVueDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-vue');
   options.jsviewReactDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-react');
@@ -244,7 +244,7 @@ function cpSync(workDir, srcPath, destPath, ignore=[])
 
 function rmSync(workDir, filePath)
 {
-  const desc = '  -x ' + path.relative(workDir, filePath);
+  const desc = '  -* ' + path.relative(workDir, filePath);
   console.info(desc);
   fs.rmSync(filePath, { recursive: true, force: true });
 }
@@ -255,7 +255,7 @@ function symlinkSync(workDir, targetPath, toPath)
 
   const relativePath = path.relative(path.dirname(toPath), targetPath);
 
-  const desc = '  ' + path.relative(workDir, toPath) + ' -* ' + path.relative(workDir, relativePath);
+  const desc = '  ' + path.relative(workDir, toPath) + ' -< ' + path.relative(workDir, relativePath);
   console.info(desc);
   fs.symlinkSync(relativePath, toPath, 'dir');
 }
@@ -286,7 +286,20 @@ function execCommand(cmdline, withOutput)
   }
 }
 
+function checkNodeVersion(minMajorVersion = 16)
+{
+  const versions = process.version.replace('v', '').split('.');
+  const [majorVersion, minorVersion, patchVersion] = versions;
+
+  console.log(`Node version: v${majorVersion}.${minorVersion}.${patchVersion}`);
+  if (majorVersion < minMajorVersion) {
+    console.error('JsView Error: Node version is too low! Please upgrade your Node.js first.');
+    process.exit(1);
+  }
+}
+
 module.exports = {
+  checkNodeVersion,
   cpSync,
   execCommand,
   getOptions,

package/tools/jsview-post-build.js

@@ -4,7 +4,10 @@
 const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
-const { getOptions } = require('./jsview-common');
+const {
+  checkNodeVersion,
+  getOptions,
+} = require('./jsview-common');
 
 // main.js处理AppData信息
 async function prepareMainAppData(options, fileMd5)
@@ -175,6 +178,8 @@ function makeDebugMap(options)
 
 async function main()
 {
+  checkNodeVersion();
+
   const options = getOptions();
 
   const vueConfigFile = path.resolve(options.projectDir, 'vue.config.js');

package/tools/jsview-post-install.js

@@ -5,6 +5,7 @@ const fs = require('fs');
 const path = require('path');
 const url = require('url');
 const {
+  checkNodeVersion,
   cpSync,
   execCommand,
   getOptions,
@@ -33,9 +34,16 @@ function checkNpmCommand()
 
 function checkNpmLinkForDebug(options, linkablePkgNames)
 {
+  const pkgObj = getPackageObject(options.projectDir);
+
   // node 16 不会安装本地包的二次依赖, 需要手动安装。
   let missingDepPkgs = '';
   for (const linkableName of linkablePkgNames) {
+    let linkableTarget = pkgObj.dependencies?.[linkableName];
+    if (!linkableTarget || !linkableTarget.startsWith('file:')) {
+      continue;
+    }
+
     const linkablePath = path.resolve(options.modulesDir, linkableName);
     const linkablePkgObj = getPackageObject(linkablePath);
 
@@ -59,11 +67,12 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
       missingDepPkgs += ' ' + devDepPkg;
     }
   }
-  console.log('Install missing dependencies')
-  execCommand('npm install --no-save ' + missingDepPkgs);
+  if (missingDepPkgs !== '') {
+    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:')) {
@@ -119,7 +128,7 @@ function installPatches(options, pkgNeedPatch)
 
 async function printRevision(options)
 {
-  const jsviewVersionURL = url.pathToFileURL(options.jsviewRevisionFile);
+  const jsviewVersionURL = url.pathToFileURL(options.jsviewDomRevisionFile);
   const { default: jsviewTargetVersion } = await import(jsviewVersionURL);
 
   console.log('**************************************************');
@@ -161,24 +170,11 @@ 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();
 
@@ -193,6 +189,8 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
 
 function main(argv)
 {
+  checkNodeVersion();
+
   let pkgNeedPatch;
 
   switch (argv.framework) {

package/tools/jsview-run-android.js

@@ -5,6 +5,7 @@ const childProcess = require('child_process');
 const path = require('path');
 const url = require('url');
 const {
+    checkNodeVersion,
     getOptions,
     parseArguments
 } = require('./jsview-common');
@@ -21,8 +22,8 @@ async function getExtraOptions(argv)
         options.androidPackage = argv.unparsed[0];
     }
 
-    const jsviewRevisionFile = url.pathToFileURL(options.jsviewRevisionFile);
-    const { default: jsviewTargetRevision } = await import(jsviewRevisionFile);
+    const jsviewDomRevisionFile = url.pathToFileURL(options.jsviewDomRevisionFile);
+    const { default: jsviewTargetRevision } = await import(jsviewDomRevisionFile);
     options.jsviewCoreRevision = jsviewTargetRevision.CoreRevision;
     options.jsviewEngineUrl = jsviewTargetRevision.JseUrl;
 
@@ -65,6 +66,8 @@ function androidStartActivity(options)
 
 async function main(argv)
 {
+    checkNodeVersion();
+
     const options = await getExtraOptions(argv);
 
     printRevision(options);