@shijiu/jsview 2.0.1021 → 2.0.1073

package/tools/jsview-post-install.mjs

@@ -13,8 +13,9 @@ import {
   isSymlinkSync,
   parseArguments,
   symlinkSync,
-  rmSync
-} from './jsview-common.mjs';
+  rmSync,
+  Logger,
+} from "./jsview-common.mjs";
 
 function checkNpmCommand()
 {
@@ -26,10 +27,8 @@ function checkNpmCommand()
     return;
   }
 
-  console.warn();
-  console.warn(`!!! Warn: Not recommended for use 'npm ${process.env.npm_command} '.`);
-  console.warn('Please use "npm ci" to install node modules.');
-  console.warn();
+  Logger.Warn(`!!! Not recommended for use 'npm ${process.env.npm_command} '.`);
+  Logger.Warn('Please use "npm ci" to install node modules.');
 }
 
 function checkNpmLinkForDebug(options, linkablePkgNames)
@@ -68,7 +67,7 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
     }
   }
   if (missingDepPkgs !== '') {
-    console.log('Install missing dependencies')
+    Logger.Info('Install missing dependencies')
     execCommand('npm install --no-save ' + missingDepPkgs);
   }
 
@@ -93,28 +92,27 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
 
 function checkPatches(options, pkgNeedPatch, skipCheckVersion)
 {
-  console.info('Checking package:');
+  Logger.Info('Checking package:');
   for (const pkgName of pkgNeedPatch) {
     if (skipCheckVersion !== true) {
       const patchPkgDir = path.resolve(options.jsviewPatchModulesDir, pkgName);
       const patchPkgObj = getPackageObject(patchPkgDir);
-      console.info('  ' + pkgName + ': ' + patchPkgObj.version);
+      Logger.Info('  ' + pkgName + ': ' + patchPkgObj.version);
 
       const modulePkgDir = path.resolve(options.modulesDir, pkgName);
       const modulePkgObj = getPackageObject(modulePkgDir);
       if (modulePkgObj.version != patchPkgObj.version) {
-        console.error('JsView Error: ' + pkgName + '@' + modulePkgObj.version + ' is not supported, required version is ' + patchPkgObj.version);
-        process.exit(1);
+        Logger.ErrorAndExit(pkgName + '@' + modulePkgObj.version + ' is not supported, required version is ' + patchPkgObj.version);
       }
     } else {
-      console.info('  Skip ', pkgName);
+      Logger.Info('  Skip ', pkgName);
     }
   }
 }
 
 function installPatches(options, pkgNeedPatch)
 {
-  console.info('\nPatching JsView:');
+  Logger.Info('Patching JsView:');
   for (const pkgName of pkgNeedPatch) {
     const patchSrc = path.resolve(options.jsviewPatchModulesDir, pkgName);
     const patchDest = path.resolve(options.modulesDir, pkgName);
@@ -122,7 +120,7 @@ function installPatches(options, pkgNeedPatch)
     cpSync(options.projectDir, patchSrc, patchDest, ['package.json']);
   }
 
-  console.info('\nCleanup node_modules cache... ');
+  Logger.Info('Cleanup node_modules cache... ');
   rmSync(options.projectDir, options.cacheDir);
 }
 
@@ -131,11 +129,11 @@ async function printRevision(options)
   const jsviewVersionURL = url.pathToFileURL(options.jsviewDomRevisionFile);
   const { default: jsviewTargetVersion } = await import(jsviewVersionURL);
 
-  console.log('**************************************************');
-  console.log('* Update revision to:');
-  console.log('* CORE: ' + jsviewTargetVersion.CoreRevisionAndBranch);
-  console.log('* ENGINE JS URL: ' + jsviewTargetVersion.JseUrl);
-  console.log('* PLUGIN LIST: ');
+  Logger.Info('**************************************************');
+  Logger.Info('* Update revision to:');
+  Logger.Info('* CORE: ' + jsviewTargetVersion.CoreRevisionAndBranch);
+  Logger.Info('* ENGINE JS URL: ' + jsviewTargetVersion.JseUrl);
+  Logger.Info('* PLUGIN LIST: ');
 
   // print plugin info
   let pluginCount = 0;
@@ -150,7 +148,7 @@ async function printRevision(options)
           if (fs.existsSync(versionFilePath)) {
             const versionFileURL = url.pathToFileURL(versionFilePath);
             const { default: targetVersion } = await import(versionFileURL);
-            console.log(`*    [${path.basename
+            Logger.Info(`*    [${path.basename
               (pathname)}] : ${targetVersion.packageName
               } : ${targetVersion.version}`);
             pluginCount++;
@@ -159,9 +157,9 @@ async function printRevision(options)
       }
     }
   }
-  console.log(`*    total:${pluginCount}`);
+  Logger.Info(`*    total:${pluginCount}`);
 
-  console.log('**************************************************');
+  Logger.Info('**************************************************');
 }
 
 function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
@@ -216,7 +214,7 @@ function main(argv)
       ];
       break;
     default:
-      throw new Error('JsView Error: Failed to support framework: ' + framework);
+      Logger.ErrorAndExit('Failed to support framework: ' + framework);
   }
 
   doPostInstall(argv.framework, pkgNeedPatch, argv.skipCheckVersion);

package/tools/jsview-run-android.mjs

@@ -6,7 +6,8 @@ import url from 'url';
 import {
     checkNodeVersion,
     getOptions,
-    parseArguments
+    parseArguments,
+    Logger,
 } from './jsview-common.mjs';
 
 function getDefaultApp() {
@@ -44,12 +45,12 @@ async function getExtraOptions(argv)
 
 function printRevision(options)
 {
-    console.log('**************************************************');
-    console.log('* Android Package: ' + options.androidPackage);
-    console.log('* Core:            ' + options.jsviewCoreRevision);
-    console.log('* Engine JS url:   ' + options.jsviewEngineUrl);
-    console.log('* Homepage url:    ' + options.entryUrl);
-    console.log('**************************************************');
+    Logger.Info('**************************************************');
+    Logger.Info('* Android Package: ' + options.androidPackage);
+    Logger.Info('* Core:            ' + options.jsviewCoreRevision);
+    Logger.Info('* Engine JS url:   ' + options.jsviewEngineUrl);
+    Logger.Info('* Homepage url:    ' + options.entryUrl);
+    Logger.Info('**************************************************');
 }
 
 function androidStartActivity(options)
@@ -59,11 +60,11 @@ function androidStartActivity(options)
     cmdline += ` --es COREVERSIONRANGE "${options.jsviewCoreRevision}"`;
     cmdline += ` --es ENGINE "${options.jsviewEngineUrl}"`;
     cmdline += ` --es URL "${options.entryUrl}"`;
-    console.log(`Run command: ${cmdline}\n`);
+    Logger.Info(`Run command: ${cmdline}\n`);
     try {
         childProcess.execSync(cmdline, {stdio: [0, 1, 2]});
     } catch (e) {
-        // console.log(e);
+        Logger.Error("Failed to exec command.");
     }
 }