@shijiu/jsview 1.9.829 → 1.9.839

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

@@ -1,6 +1,6 @@
 import './browser-root-style.css'
 
-import JsvCodeDebug from './jsv-code-debug'
+import JsvCodeDebug from './jsv-code-debug.mjs'
 
 let domBrowser;
 

package/dom/jsv-dom.js

@@ -1,4 +1,4 @@
-import JsvCodeDebug from './jsv-code-debug'
+import JsvCodeDebug from './jsv-code-debug.mjs'
 
 let domNative;
 

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

@@ -1,4 +1,4 @@
-import JsvCodeDebug from "./jsv-code-debug"
+import JsvCodeDebug from "./jsv-code-debug.mjs"
 
 let engineBrowser;
 

package/dom/jsv-forge-define.js

@@ -1,4 +1,4 @@
-import JsvCodeDebug from './jsv-code-debug'
+import JsvCodeDebug from './jsv-code-debug.mjs'
 
 let forgeDefine;
 

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.829",
+  "version": "1.9.839",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/patches/node_modules/vite/dist/node/constants.js

@@ -0,0 +1,125 @@
+import path, { resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { readFileSync } from 'node:fs';
+
+const { version } = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url)).toString());
+const VERSION = version;
+const DEFAULT_MAIN_FIELDS = [
+    'module',
+    'jsnext:main',
+    'jsnext',
+];
+// Baseline support browserslist
+// "defaults and supports es6-module and supports es6-module-dynamic-import"
+// Higher browser versions may be needed for extra features.
+const ESBUILD_MODULES_TARGET = [
+// JsView Modified >>>
+// 解决对top-level-await的原生支持问题。
+    //'es2020',
+    //'edge88',
+    //'firefox78',
+    //'chrome87',
+    //'safari14',
+    'es2022',
+// JsView Modified <<<
+];
+const DEFAULT_EXTENSIONS = [
+    '.mjs',
+    '.js',
+    '.mts',
+    '.ts',
+    '.jsx',
+    '.tsx',
+    '.json',
+];
+const DEFAULT_CONFIG_FILES = [
+    'vite.config.js',
+    'vite.config.mjs',
+    'vite.config.ts',
+    'vite.config.cjs',
+    'vite.config.mts',
+    'vite.config.cts',
+];
+const JS_TYPES_RE = /\.(?:j|t)sx?$|\.mjs$/;
+const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
+const OPTIMIZABLE_ENTRY_RE = /\.[cm]?[jt]s$/;
+const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/;
+/**
+ * Prefix for resolved fs paths, since windows paths may not be valid as URLs.
+ */
+const FS_PREFIX = `/@fs/`;
+/**
+ * Prefix for resolved Ids that are not valid browser import specifiers
+ */
+const VALID_ID_PREFIX = `/@id/`;
+/**
+ * Plugins that use 'virtual modules' (e.g. for helper functions), prefix the
+ * module ID with `\0`, a convention from the rollup ecosystem.
+ * This prevents other plugins from trying to process the id (like node resolution),
+ * and core features like sourcemaps can use this info to differentiate between
+ * virtual modules and regular files.
+ * `\0` is not a permitted char in import URLs so we have to replace them during
+ * import analysis. The id will be decoded back before entering the plugins pipeline.
+ * These encoded virtual ids are also prefixed by the VALID_ID_PREFIX, so virtual
+ * modules in the browser end up encoded as `/@id/__x00__{id}`
+ */
+const NULL_BYTE_PLACEHOLDER = `__x00__`;
+const CLIENT_PUBLIC_PATH = `/@vite/client`;
+const ENV_PUBLIC_PATH = `/@vite/env`;
+const VITE_PACKAGE_DIR = resolve(
+// import.meta.url is `dist/node/constants.js` after bundle
+fileURLToPath(import.meta.url), '../../..');
+const CLIENT_ENTRY = resolve(VITE_PACKAGE_DIR, 'dist/client/client.mjs');
+const ENV_ENTRY = resolve(VITE_PACKAGE_DIR, 'dist/client/env.mjs');
+const CLIENT_DIR = path.dirname(CLIENT_ENTRY);
+// ** READ THIS ** before editing `KNOWN_ASSET_TYPES`.
+//   If you add an asset to `KNOWN_ASSET_TYPES`, make sure to also add it
+//   to the TypeScript declaration file `packages/vite/client.d.ts` and
+//   add a mime type to the `registerCustomMime` in
+//   `packages/vite/src/node/plugin/assets.ts` if mime type cannot be
+//   looked up by mrmime.
+const KNOWN_ASSET_TYPES = [
+    // images
+    'png',
+    'jpe?g',
+    'jfif',
+    'pjpeg',
+    'pjp',
+    'gif',
+    'svg',
+    'ico',
+    'webp',
+    'avif',
+    // media
+    'mp4',
+    'webm',
+    'ogg',
+    'mp3',
+    'wav',
+    'flac',
+    'aac',
+    // fonts
+    'woff2?',
+    'eot',
+    'ttf',
+    'otf',
+    // other
+    'webmanifest',
+    'pdf',
+    'txt',
+];
+const DEFAULT_ASSETS_RE = new RegExp(`\\.(` + KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`);
+const DEP_VERSION_RE = /[?&](v=[\w.-]+)\b/;
+const loopbackHosts = new Set([
+    'localhost',
+    '127.0.0.1',
+    '::1',
+    '0000:0000:0000:0000:0000:0000:0000:0001',
+]);
+const wildcardHosts = new Set([
+    '0.0.0.0',
+    '::',
+    '0000:0000:0000:0000:0000:0000:0000:0000',
+]);
+
+export { CLIENT_DIR, CLIENT_ENTRY, CLIENT_PUBLIC_PATH, CSS_LANGS_RE, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES, DEFAULT_EXTENSIONS, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, ENV_ENTRY, ENV_PUBLIC_PATH, ESBUILD_MODULES_TARGET, FS_PREFIX, JS_TYPES_RE, KNOWN_ASSET_TYPES, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, SPECIAL_QUERY_RE, VALID_ID_PREFIX, VERSION, VITE_PACKAGE_DIR, loopbackHosts, wildcardHosts };

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

@@ -24,12 +24,16 @@ 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: {
+          'export-sfc': ['\0plugin-vue:export-helper'], // 将_export_sfc独立出来，防止被集成在jsview-vue中导致import deadloop.
+          'vue': ['vue'], // 将vue独立出来，防止被集成在main.js中导致import deadloop.
+        },
       },
     },
     sourcemap: true,

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');
@@ -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,
@@ -127,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('**************************************************');
@@ -188,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);