@shijiu/jsview 2.0.1192-next-vue.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.0.1192-next-vue.0",
+  "version": "2.1.2",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

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

@@ -47,7 +47,7 @@ const jsviewConfig = defineConfig({
   optimizeDeps: {
     include: [
       'gifuct-js',
-      'mockjs',
+      // 'mockjs',
       'qr.js'
     ],
     exclude: [
@@ -138,9 +138,14 @@ function jsvCreateJsViewViteConfig(originConfig) {
     default:
       throw new Error('JsView Error: Failed to support framework: ' + framework);
   }
-
   jsviewConfig.resolve.alias['jsview'] = aliasJsView;
 
+  // 解决templete工程中没有mockjs导致的报错。
+  const mockjs = path.resolve(moduleDir, 'mockjs');
+  if(fs.existsSync(mockjs)) {
+    jsviewConfig.optimizeDeps.include.push('mockjs');
+  }
+
   return jsviewConfig;
 }
 

package/tools/jsview-batch-upgrade.mjs

@@ -98,8 +98,7 @@ function getOptions(argv)
   Logger.Info('Are you sure to upgrade it?');
   const answer = askAndAnswer('(y/N) ');
   if (answer.substring(0, 1) != 'y' && answer.substring(0, 3) != 'yes') {
-    Logger.Warn('User cancelled.')
-    process.exit(1);
+    Logger.ErrorAndExitNoException('User cancelled.')
   }
 
   options.sourcePathList = getFilesRecursive(options.upgradeDir);

package/tools/jsview-logger.js

@@ -20,28 +20,43 @@ class Logger {
   }
 
   static ErrorNoException(...args) {
-    console.error();
-    console.error(Logger.Red("JsView Error:"), ...args);
+    console.log();
+
+    const size = args?.length ?? 0;
+    for(let idx = 0; idx < size; idx++) {
+      args[idx] = Logger.Red(Logger.Bold(args[idx]));
+    }
+    console.error(Logger.Red(Logger.Bold('JsView Error:')), ...args);
   }
 
   static Error(...args) {
-    console.error();
-    console.error(Logger.Red("JsView Error:"), ...args, new Error());
+    console.log();
+
+    const size = args?.length ?? 0;
+    for(let idx = 0; idx < size; idx++) {
+      args[idx] = Logger.Red(Logger.Bold(args[idx]));
+    }
+    console.error(Logger.Red(Logger.Bold('JsView Error:')), ...args, '\n', new Error());
   }
 
   static Warn(...args) {
-    console.error();
-    console.warn(Logger.Yellow("JsView Warning:"), ...args);
+    console.log();
+
+    const size = args?.length ?? 0;
+    for(let idx = 0; idx < size; idx++) {
+      args[idx] = Logger.Yellow(Logger.Bold(args[idx]));
+    }
+    console.warn(Logger.Yellow(Logger.Bold('JsView Warning:')), ...args);
   }
 
   static Info(...args) {
-    console.info(Logger.Green("JsView 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);
+    const caller = stack.split('\n')[2].trim().split(' ')[1] + '()';
+    console.debug('JsView Debug:', caller, ...args);
   }
 
   static GetFileTag(filePath) {
@@ -64,6 +79,10 @@ class Logger {
   static Blue(log) {
     return '\x1b[34m' + log + '\x1b[39m';
   }
+
+  static Bold(log) {
+    return '\x1B[1m' + log + '\x1B[22m';
+  }
 }
 
 module.exports = {

package/tools/jsview-post-install.mjs

@@ -171,8 +171,10 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
     '@shijiu/jsview',
     '@shijiu/jsview-vue',
     '@shijiu/jsview-vue-samples',
+    '@shijiu/jsview-vue-extra-samples',
     '@shijiu/jsview-react',
     '@shijiu/jsview-react-samples',
+    '@shijiu/jsview-react-extra-samples',
   ];
 
   checkNpmCommand();