@shijiu/jsview 2.0.1021 → 2.0.1073

package/patches/node_modules/vite/dist/node/chunks/dep-ed9cb113.js

@@ -39471,6 +39471,12 @@ function normalizeHmrUrl(url) {
     if (!url.startsWith('.') && !url.startsWith('/')) {
         url = wrapId(url);
     }
+// JsView Added >>>
+// 解决@import的css文件没有被热更新问题。
+    if (url.includes('type=style')) {
+       url = url.substr(0, url.indexOf('?'))
+    }
+// JsView Added <<<
     return url;
 }
 function error$1(pos) {

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

@@ -11,11 +11,10 @@ const jsviewConfig = defineConfig({
     assetsInlineLimit: 0,
     //cssTarget: 'css/', // 未生效
     commonjsOptions: {
-      include: [
-        /js-binary-schema-parser/,
-        /gifuct-js/,
-        /qr.js/
-      ],
+      'gifuct-js': true,
+      'js-binary-schema-parser': true,
+      'mockjs': true,
+      'qr.js': true,
     },
     emptyOutDir: true,
     minify: true,
@@ -48,6 +47,7 @@ const jsviewConfig = defineConfig({
   optimizeDeps: {
     include: [
       'gifuct-js',
+      'mockjs',
       'qr.js'
     ],
     exclude: [

package/tools/jsview-batch-upgrade.mjs

@@ -6,7 +6,8 @@ import path from 'path';
 import {
   askAndAnswer,
   checkNodeVersion,
-  parseArguments
+  parseArguments,
+  Logger,
 } from './jsview-common.mjs';
 
 function main(argv)
@@ -56,12 +57,10 @@ function main(argv)
       upgradeStagePixel(options);
     }
   } catch (ex) {
-    console.error('JsView Error: Failed to update jsview source!');
-    console.error(ex);
-    process.exit(1);
+    Logger.ErrorAndExit("Failed to update jsview source!", ex);
   }
 
-  console.error('JsView Info: Done!');
+  Logger.Info('Done!');
 }
 
 function getOptions(argv)
@@ -84,23 +83,22 @@ function getOptions(argv)
   const defaultUpgradeDir = 'src';
   options.upgradeDir = path.resolve(options.projectDir, argv.dir ?? defaultUpgradeDir);
   if (fs.existsSync(options.upgradeDir) == false) {
-    console.error('JsView Error: Upgrade dir [' + options.upgradeDir + '] is not exists.');
-    process.exit(1);
+    Logger.ErrorAndExit('Upgrade dir [' + options.upgradeDir + '] is not exists.');
   }
 
-  console.info();
-  console.info('Upgrade JsView source: ');
-  console.info('  Project folder: ' + options.projectDir);
-  console.info('=====================================');
-  console.info('  Upgrade folder: ' + path.relative(options.projectDir, options.upgradeDir));
-  console.info('  Stages:         [ ' + options.stages.join(', ') + ' ]');
-  console.info('=====================================');
+  Logger.Info();
+  Logger.Info('Upgrade JsView source: ');
+  Logger.Info('  Project folder: ' + options.projectDir);
+  Logger.Info('=====================================');
+  Logger.Info('  Upgrade folder: ' + path.relative(options.projectDir, options.upgradeDir));
+  Logger.Info('  Stages:         [ ' + options.stages.join(', ') + ' ]');
+  Logger.Info('=====================================');
 
-  console.info();
-  console.info('Are you sure to upgrade it?');
+  Logger.Info();
+  Logger.Info('Are you sure to upgrade it?');
   const answer = askAndAnswer('(y/N) ');
   if (answer.substring(0, 1) != 'y' && answer.substring(0, 3) != 'yes') {
-    console.error('JsView Info: User cancelled.')
+    Logger.Warn('User cancelled.')
     process.exit(1);
   }
 
@@ -112,13 +110,12 @@ function getOptions(argv)
 function upgradeStageAppConfig(options)
 {
   const msgPrefix = 'Stage ' + options.stageAppConfig;
-  console.info(msgPrefix + ': Upgrading appConfig...');
+  Logger.Info(msgPrefix + ': Upgrading appConfig...');
 
 
   const appConfigDir = path.resolve(options.upgradeDir, 'appConfig');
   if (fs.existsSync(appConfigDir) == false) {
-    console.error(msgPrefix + ': Failed to upgrading appConfig, appConfig folder is not found.');
-    process.exit(1);
+    Logger.ErrorAndExit(msgPrefix + ': Failed to upgrading appConfig, appConfig folder is not found.');
   }
 
   const appConfigFilePath = path.resolve(appConfigDir, 'app_config.json');
@@ -135,7 +132,7 @@ function upgradeStageAppConfig(options)
 function upgradeStageAlias(options)
 {
   const msgPrefix = 'Stage ' + options.stageAlias;
-  console.info(msgPrefix + ': upgrading alias @ => /src ...');
+  Logger.Info(msgPrefix + ': upgrading alias @ => /src ...');
 
   const amendImportAlias = function(content) {
     if (isImportSyntax(content) == false) {
@@ -161,7 +158,7 @@ function upgradeStageAlias(options)
 function upgradeStageImportPostfix(options)
 {
   const msgPrefix = 'Stage ' + options.stageImportPostfix;
-  console.info(msgPrefix + ': upgrading import postfix...');
+  Logger.Info(msgPrefix + ': upgrading import postfix...');
 
   const amendImportPostfix = function (content, sourceDir) {
     if (isImportSyntax(content) == false) {
@@ -206,7 +203,7 @@ function upgradeStageImportPostfix(options)
 function upgradeStageCommonJS(options)
 {
   const msgPrefix = 'Stage ' + options.stageCommonJS;
-  console.info(msgPrefix + ': upgrading commonjs ...');
+  Logger.Info(msgPrefix + ': upgrading commonjs ...');
 
   const amendCommonJS = function(content) {
     let fixedContent = content;
@@ -236,7 +233,7 @@ function upgradeStageCommonJS(options)
 function upgradeStageHashHistory(options)
 {
   const msgPrefix = 'Stage ' + options.stageHashHistory;
-  console.info(msgPrefix + ': Upgrading hash history...');
+  Logger.Info(msgPrefix + ': Upgrading hash history...');
 
   replaceStageContent(options, options.sourcePathList, msgPrefix,
                       'createJsvHashHistory', 'jsvCreateHashHistory');
@@ -247,7 +244,7 @@ function upgradeStageHashHistory(options)
 function upgradeStageAnimation(options)
 {
   const msgPrefix = 'Stage ' + options.stageAnimation;
-  console.info(msgPrefix + ': Upgrading animation...');
+  Logger.Info(msgPrefix + ': Upgrading animation...');
 
   const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
                                   ':onAnimationEnd', '@animationend');
@@ -257,7 +254,7 @@ function upgradeStageAnimation(options)
 
 function upgradeStagePixel(options) {
   const msgPrefix = 'Stage ' + options.stagePixels;
-  console.info(msgPrefix + ': Upgrading pixels...');
+  Logger.Info(msgPrefix + ': Upgrading pixels...');
 
   // 过滤 (+ px), (+ 'px'), (+ "px"), (+ `px`), ( + ' px ') 等
   replaceStageContent(options, options.sourcePathList, msgPrefix,
@@ -306,7 +303,7 @@ function upgradeStagePixel(options) {
 function upgradeStageJsvAudio(options)
 {
   const msgPrefix = 'Stage ' + options.stageJsvAudio;
-  console.info(msgPrefix + ': Upgrading jsv audio...');
+  Logger.Info(msgPrefix + ': Upgrading jsv audio...');
 
   const amendJsvAudio = function(content) {
     let fixedContent = content.replace('<audiotrack', '<jsv-audiotrack');
@@ -395,7 +392,7 @@ function replaceStageContent(options, sourcePathList, msgPrefix,
     }
 
     fs.writeFileSync(filePath, fixedContent, 'utf8');
-    console.info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath));
+    Logger.Info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath));
   }
 
   return;
@@ -426,7 +423,7 @@ function renameStageFile(options, sourcePathList, msgPrefix,
       fs.writeFileSync(toFilePath, fixedContent, 'utf8');
     }
 
-    console.info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath) + ' => ' + path.relative(options.projectDir, toFilePath));
+    Logger.Info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath) + ' => ' + path.relative(options.projectDir, toFilePath));
   }
 
   return;
@@ -479,7 +476,7 @@ function processSourceLineByLine(options, sourcePathList, msgPrefix, processor)
     }
 
     fs.writeFileSync(filePath, fixedContent, 'utf8');
-    console.info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath));
+    Logger.Info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath));
   }
 }
 

package/tools/jsview-common.mjs

@@ -4,6 +4,7 @@
 import childProcess from 'child_process';
 import fs from 'fs';
 import path from 'path';
+import Logger from "./jsview-logger.js";
 
 function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
 {
@@ -18,23 +19,23 @@ function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
     maxLength = (maxLength > usage.length ? maxLength : usage.length);
   }
 
-  console.log('Usages:');
+  Logger.Info('Usages:');
   for (const usage in requiredUsages) {
     const spaceLength = maxLength - usage.length;
-    console.log();
-    console.log('  ' + usage + ':  ' + ' '.repeat(spaceLength) + '[Required] ' + requiredUsages[usage]);
+    Logger.Info();
+    Logger.Info('  ' + usage + ':  ' + ' '.repeat(spaceLength) + '[Required] ' + requiredUsages[usage]);
   }
   for (const usage in optionalUsages) {
     const spaceLength = maxLength - usage.length;
-    console.log();
-    console.log('  ' + usage + ':  ' + ' '.repeat(spaceLength) + '[Optional] ' + optionalUsages[usage]);
+    Logger.Info();
+    Logger.Info('  ' + usage + ':  ' + ' '.repeat(spaceLength) + '[Optional] ' + optionalUsages[usage]);
   }
   for (const usage in helpUsages) {
     const spaceLength = maxLength - usage.length;
-    console.log();
-    console.log('  ' + usage + ':  ' + ' '.repeat(spaceLength) + helpUsages[usage]);
+    Logger.Info();
+    Logger.Info('  ' + usage + ':  ' + ' '.repeat(spaceLength) + helpUsages[usage]);
   }
-  console.log();
+  Logger.Info();
 }
 
 function parseArguments(requiredUsages = {},
@@ -121,8 +122,7 @@ function parseArguments(requiredUsages = {},
     }
     if (key.startsWith('-') == false) {
       if (withoutUnparsed) {
-        console.error('JsView Error: Failed to parse argument: ' + argu);
-        process.exit(1);
+        Logger.ErrorAndExit('Failed to parse argument: ' + argu);
       } else {
         options.unparsed.push(key);
         continue;
@@ -132,8 +132,7 @@ function parseArguments(requiredUsages = {},
     if (hasKey(helpUsages, key) == false
     && hasKey(requiredUsages, key) == false
     && hasKey(optionalUsages, key) == false) {
-        console.error('JsView Error: Failed to parse usage: ' + argu);
-        process.exit(1);
+        Logger.ErrorAndExit('Failed to parse usage: ' + argu);
     }
 
     let formattedKey = formatKey(key);
@@ -151,8 +150,7 @@ function parseArguments(requiredUsages = {},
   for (const checker in requiredUsages) {
     const aliasedOptions = checkAliases(checker, options);
     if (!aliasedOptions) {
-      console.log('JsView Error: Failed to find required option: ' + checker);
-      process.exit(-1);
+      Logger.ErrorAndExit('Failed to find required option: ' + checker);
     }
     options = { ...options, ...aliasedOptions };
   }
@@ -227,8 +225,7 @@ function getPackageObject(modulePath)
 {
   const pkgFullFile = path.resolve(modulePath, 'package.json');
   if (!fs.existsSync(pkgFullFile)) {
-    console.error('JsView Error: Failed to get ' + modulePath + ', file is not exists.');
-    process.exit(1);
+    Logger.ErrorAndExit('Failed to get ' + modulePath + ', file is not exists.');
   }
   let pkgContent = fs.readFileSync(pkgFullFile, 'utf8');
   const pkgObj = JSON.parse(pkgContent);
@@ -260,7 +257,7 @@ function cpSync(workDir, srcPath, destPath, ignore=[])
       return;
     }
     const desc = '  ' + path.relative(workDir, srcPath) + ' -> ' + path.relative(workDir, destPath);
-    console.info(desc);
+    Logger.Info(desc);
     fs.copyFileSync(srcPath, destPath);
   }
 }
@@ -268,7 +265,7 @@ function cpSync(workDir, srcPath, destPath, ignore=[])
 function rmSync(workDir, filePath)
 {
   const desc = '  -* ' + path.relative(workDir, filePath);
-  console.info(desc);
+  Logger.Info(desc);
   fs.rmSync(filePath, { recursive: true, force: true });
 }
 
@@ -279,7 +276,7 @@ function symlinkSync(workDir, targetPath, toPath)
   const relativePath = path.relative(path.dirname(toPath), targetPath);
 
   const desc = '  ' + path.relative(workDir, toPath) + ' -< ' + path.relative(workDir, relativePath);
-  console.info(desc);
+  Logger.Info(desc);
   fs.symlinkSync(relativePath, toPath, 'junction');
 }
 
@@ -292,7 +289,7 @@ function isSymlinkSync(filePath)
 
 function execCommand(cmdline, withOutput)
 {
-  console.info('Run [' + cmdline + ']... ');
+  Logger.Info('Run [' + cmdline + ']... ');
   try {
     const ret = childProcess.execSync(cmdline, { stdio: withOutput ? 'pipe' : 'inherit' });
     if (ret) {
@@ -303,8 +300,7 @@ function execCommand(cmdline, withOutput)
     if (withOutput) {
       return err.stderr?.toString()
     } else {
-      console.log(err)
-      process.exit(err.status);
+      Logger.ErrorAndExit(err)
     }
   }
 }
@@ -314,10 +310,9 @@ function checkNodeVersion(minMajorVersion = 16)
   const versions = process.version.replace('v', '').split('.');
   const [majorVersion, minorVersion, patchVersion] = versions;
 
-  console.log(`Node version: v${majorVersion}.${minorVersion}.${patchVersion}`);
+  Logger.Info(`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);
+    Logger.ErrorAndExit('Node version is too low! Please upgrade your Node.js first.');
   }
 }
 
@@ -355,4 +350,5 @@ export {
   readJsonFile,
   rmSync,
   symlinkSync,
+  Logger,
 }

package/tools/jsview-jsmap-serve.mjs

@@ -7,6 +7,9 @@ import os from 'os';
 import path from 'path';
 import url from 'url';
 
+// 此文件打包在dist中，所以不能用Logger
+// import { Logger } from './jsview-common.mjs';
+
 const context = {
   scriptDir: path.dirname(url.fileURLToPath(import.meta.url)),
   baseUrl: null,

package/tools/jsview-logger.js

@@ -0,0 +1,58 @@
+'use strict';
+
+const path = require('path');
+
+class Logger {
+  static ErrorAndExit(...args) {
+    Logger.Error(...args);
+    process.exit(1);
+  }
+
+  static ErrorAndThrow(...args) {
+    Logger.Error(...args);
+    throw new Error();
+  }
+
+  static Error(...args) {
+    console.error();
+    console.error(Logger.Red("JsView Error:"), ...args, new Error());
+  }
+
+  static Warn(...args) {
+    console.error();
+    console.warn(Logger.Yellow("JsView Warning:"), ...args);
+  }
+
+  static Info(...args) {
+    console.info(Logger.Green("JsView Info:"), ...args);
+  }
+
+  static Debug(...args) {
+    const stack = new Error().stack;
+    const caller = stack.split("\n")[2].trim().split(" ")[1] + "()";
+    console.debug("JsView Debug:", caller, ...args);
+  }
+
+  static GetFileTag(filePath) {
+    const fileTag = Logger.Blue('[' + path.basename(filePath) + ']');
+    return fileTag;
+  }
+
+  static Red(log) {
+    return '\x1b[31m' + log + '\x1b[39m';
+  }
+
+  static Green(log) {
+    return '\x1b[32m' + log + '\x1b[39m';
+  }
+
+  static Yellow(log) {
+    return '\x1b[33m' + log + '\x1b[39m';
+  }
+
+  static Blue(log) {
+    return '\x1b[34m' + log + '\x1b[39m';
+  }
+}
+
+module.exports = Logger;

package/tools/jsview-post-build.mjs

@@ -9,6 +9,7 @@ import {
   checkNodeVersion,
   getOptions,
   parseArguments,
+  Logger,
 } from './jsview-common.mjs';
 
 // npm run build 时检查jsview-dom是否处于Debug模式。
@@ -18,10 +19,7 @@ async function checkDomDebugDisabled(options) {
   const { getCodeDebugConfig } = await import(jsviewDomUrl);
   const domCodeDebug = getCodeDebugConfig();
   if (domCodeDebug.enableDebug !== false) {
-    console.error();
-    console.error('JsView Error: Dom code debug MUST be disabled, please check it in ' + jsviewDomFilePath);
-    console.error();
-    process.exit(1)
+    Logger.ErrorAndExit('Dom code debug MUST be disabled, please check it in ' + jsviewDomFilePath);
   }
 }
 
@@ -31,25 +29,21 @@ async function prepareMainAppData(options, fileMd5)
   // 加载私钥文件
   const privateKeyFile = path.resolve(options.appConfigDir, 'app_sign_private_key.crt');
   if (!fs.existsSync(privateKeyFile)) {
-    console.error('JsView Error: Failed to open private key file from ' + privateKeyFile);
-    process.exit(1);
+    Logger.ErrorAndExit('Failed to open private key file from ' + privateKeyFile);
   }
   const privateKeyText = fs.readFileSync(privateKeyFile);
   if (privateKeyText.indexOf('-----BEGIN PRIVATE KEY-----') < 0) {
-    console.error('JsView Error: Get private from src/appConfig/app_sign_private_key.crt failed.');
-    process.exit(1);
+    Logger.ErrorAndExit('Get private from src/appConfig/app_sign_private_key.crt failed.');
   }
 
   // 加载公钥文件
   const publicKeyFile = path.resolve(options.appConfigDir, 'app_sign_public_key.pem');
   if (!fs.existsSync(publicKeyFile)) {
-    console.error('JsView Error: Failed to open public key file from ' + publicKeyFile);
-    process.exit(1);
+    Logger.ErrorAndExit('Failed to open public key file from ' + publicKeyFile);
   }
   const publicKeyText = fs.readFileSync(publicKeyFile);
   if (publicKeyText.indexOf('-----BEGIN PUBLIC KEY-----') < 0) {
-    console.error('JsView Error: Get private from src/appConfig/app_sign_public_key.pem failed.');
-    process.exit(1);
+    Logger.ErrorAndExit('Get private from src/appConfig/app_sign_public_key.pem failed.');
   }
   // 公钥格式转化pem -> der，因为java中的解码处理只识别der格式
   let publicKeyDerText = publicKeyText.toString();
@@ -78,15 +72,13 @@ async function prepareMainAppData(options, fileMd5)
     Buffer.from(encryptCodeBase64, 'base64')
   ).toString();
   if (decryptCode !== fileMd5) {
-    console.error('JsView Error: public key dismath to private key!');
-    process.exit(1);
+    Logger.ErrorAndExit('public key dismath to private key!');
   }
 
   // 获取AppData信息
   const appConfigFilePath = path.resolve(options.appConfigDir, 'app.config.mjs');
   if (!fs.existsSync(appConfigFilePath)) {
-    console.error('JsView Error: Failed to open app config file from ' + appConfigFilePath);
-    process.exit(1);
+    Logger.ErrorAndExit('Failed to open app config file from ' + appConfigFilePath);
   }
   // const appConfigText = fs.readFileSync(appConfigFile);
   // const appDataOriginJson = JSON.parse(appConfigText);
@@ -111,7 +103,7 @@ async function signApp(options)
     }
 
     const filePath = path.resolve(options.distJsDir, fileName);
-    // console.log(' -> ' + path.relative(options.projectDir, filePath));
+    // Logger.Info(' -> ' + path.relative(options.projectDir, filePath));
 
     var sourceContent = fs.readFileSync(filePath, 'utf8');
 
@@ -142,7 +134,7 @@ function redirectSourceMappingURL(options)
     }
 
     const filePath = path.resolve(options.distJsDir, fileName);
-    // console.log(' -> ' + path.relative(options.projectDir, filePath));
+    // Logger.Info(' -> ' + path.relative(options.projectDir, filePath));
 
     let sourceContent = fs.readFileSync(filePath, 'utf8');
 
@@ -171,7 +163,7 @@ function makeMainJsvMjs(options, framework)
   };
 
   const to = jsEntryFilePath.replace(/.js$/, '.mjs');
-  console.log(' -> ' + path.relative(options.projectDir, to));
+  Logger.Info(' -> ' + path.relative(options.projectDir, to));
   fs.copyFileSync(jsEntryFilePath, to);
 }
 
@@ -191,7 +183,7 @@ function makeDebugMap(options, framework)
 
     const from = path.resolve(options.distJsDir, fileName);
     const to = path.resolve(options.distDebugMapDir, fileName);
-    // console.log(' -> ' + path.relative(options.projectDir, to));
+    // Logger.Info(' -> ' + path.relative(options.projectDir, to));
     fs.renameSync(from, to);
   };
 
@@ -201,19 +193,18 @@ function makeDebugMap(options, framework)
       extName = '.mjs'
     }
     const to = path.resolve(options.distJsDir, 'main.jsv' + extName);
-    console.log(' -> ' + path.relative(options.projectDir, to));
+    Logger.Info(' -> ' + path.relative(options.projectDir, to));
     fs.copyFileSync(jsEntryFilePath, to);
   }
 
   const jsmapServeName = 'jsview-jsmap-serve.mjs';
   const jsmapServePath = path.resolve(options.jsviewToolsDir, jsmapServeName);
   if (!fs.existsSync(jsmapServePath)) {
-    console.error('JsView Error: Failed to copy ' + jsmapServePath  + ', file not exists.');
-    process.exit(1);
+    Logger.ErrorAndExit('Failed to copy ' + jsmapServePath  + ', file not exists.');
   }
 
   const to = path.resolve(options.distDebugDir, jsmapServeName);
-  console.log(' -> ' + path.relative(options.projectDir, to));
+  Logger.Info(' -> ' + path.relative(options.projectDir, to));
   fs.copyFileSync(jsmapServePath, to);
 }
 
@@ -269,26 +260,28 @@ async function main(argv)
     }
   }
 
-  console.info();
-  console.info('Redirecting JsView source map...');
+  Logger.Info();
+  Logger.Info('Redirecting JsView source map...');
   redirectSourceMappingURL(options)
-  console.info('Redirected JsView source map...');
+  Logger.Info('Redirected JsView source map...');
 
-  console.info('Signing JsView App...');
+  Logger.Info('Signing JsView App...');
   await signApp(options);
-  console.info('Signed JsView App.');
+  Logger.Info('Signed JsView App.');
 
-  console.info('Making JsView main.jsv.mjs...');
+  Logger.Info('Making JsView main.jsv.mjs...');
   makeMainJsvMjs(options, argv.framework);
-  console.info('Made JsView main.jsv.mjs...');
+  Logger.Info('Made JsView main.jsv.mjs...');
 
-  console.info('Making JsView Debug map...');
+  Logger.Info('Making JsView Debug map...');
   makeDebugMap(options, argv.framework);
-  console.info('Made JsView Debug map.');
+  Logger.Info('Made JsView Debug map.');
 
-  console.info('Making JsView list...');
+  Logger.Info('Making JsView list...');
   makeJsvList(options);
-  console.info('Made JsView list...');
+  Logger.Info('Made JsView list...');
+
+  Logger.Info('Done...');
 }
 
 const requiredUsages = {