@shijiu/jsview 2.1.428 → 2.1.448-test.0

package/tools/jsview-post-build.mjs

@@ -8,7 +8,7 @@ import url from 'node:url'
 import {
   checkNodeVersion,
   getOptions,
-  getPackageObject,
+  loadPackageObject,
   parseArguments,
   Logger,
 } from './jsview-common.mjs';
@@ -183,8 +183,8 @@ function makeMainJsvMjs(options, framework)
 
   const sourceContent = fs.readFileSync(jsEntryFilePath, 'utf8');
   const hash = sourceContent.replace(/\n/g, '').replace(/.*\/\*jsvmd5:([a-fA-F0-9]{8})[a-fA-F0-9]*\*\/.*/, '$1');
-  const newEntryFileName = `main.jsv.${hash}.mjs`;
-  const newEntryFilePath = path.resolve(path.dirname(jsEntryFilePath), `main.jsv.${hash}.mjs`);
+  const newEntryFileName = `main.jsv.${hash}.js`;
+  const newEntryFilePath = path.resolve(path.dirname(jsEntryFilePath), newEntryFileName);
   Logger.Info(' -> ' + path.relative(options.projectDir, newEntryFilePath));
   fs.renameSync(jsEntryFilePath, newEntryFilePath);
 
@@ -192,6 +192,9 @@ function makeMainJsvMjs(options, framework)
   indexContent = indexContent.replace(path.basename(jsEntryFilePath), newEntryFileName);
   Logger.Info(' -> ' + path.relative(options.projectDir, options.distJsIndexFile));
   fs.writeFileSync(options.distJsIndexFile, indexContent, 'utf8');
+
+  const moduleEntryFilePath = newEntryFilePath.replace(/\.js$/, '.mjs');
+  fs.copyFileSync(newEntryFilePath, moduleEntryFilePath);
 }
 
 function makeDebugMap(options, framework)
@@ -249,7 +252,7 @@ function makeJsvList(options)
 
 async function makeJsvInfo(options)
 {
-  const jsviewPkgJson = getPackageObject(options.jsviewDir);
+  const jsviewPkgJson = loadPackageObject(options.jsviewDir);
 
   const jsviewVersionURL = url.pathToFileURL(options.jsviewDomRevisionFile);
   const { default: jsviewTargetVersion } = await import(jsviewVersionURL);

package/tools/jsview-post-install.mjs

@@ -9,7 +9,7 @@ import {
   cpSync,
   execCommand,
   getOptions,
-  getPackageObject,
+  loadPackageObject,
   isSymlinkSync,
   parseArguments,
   symlinkSync,
@@ -33,7 +33,7 @@ function checkNpmCommand()
 
 function checkNpmLinkForDebug(options, linkablePkgNames)
 {
-  const pkgObj = getPackageObject(options.projectDir);
+  const pkgObj = loadPackageObject(options.projectDir);
 
   // node 16 不会安装本地包的二次依赖, 需要手动安装。
   let missingDepPkgs = '';
@@ -46,7 +46,7 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
     }
 
     const linkablePath = path.resolve(options.modulesDir, linkableName);
-    const linkablePkgObj = getPackageObject(linkablePath);
+    const linkablePkgObj = loadPackageObject(linkablePath);
 
     for (const dep in linkablePkgObj.dependencies ?? {}) {
       const depPath = path.resolve(options.modulesDir, dep);
@@ -98,11 +98,11 @@ function checkPatches(options, pkgNeedPatch, skipCheckVersion)
   for (const pkgName of pkgNeedPatch) {
     if (skipCheckVersion !== true) {
       const patchPkgDir = path.resolve(options.jsviewPatchModulesDir, pkgName);
-      const patchPkgObj = getPackageObject(patchPkgDir);
+      const patchPkgObj = loadPackageObject(patchPkgDir);
       Logger.Info('  ' + pkgName + ': ' + patchPkgObj.version);
 
       const modulePkgDir = path.resolve(options.modulesDir, pkgName);
-      const modulePkgObj = getPackageObject(modulePkgDir);
+      const modulePkgObj = loadPackageObject(modulePkgDir);
       if (modulePkgObj.version != patchPkgObj.version) {
         Logger.ErrorAndExit(pkgName + '@' + modulePkgObj.version + ' is not supported, required version is ' + patchPkgObj.version);
       }
@@ -114,7 +114,7 @@ function checkPatches(options, pkgNeedPatch, skipCheckVersion)
 
 function installPatches(options, pkgNeedPatch)
 {
-  Logger.Info('Patching JsView:');
+  Logger.Info('Stage 1: Installing patches for JsView:');
   for (const pkgName of pkgNeedPatch) {
     const patchSrc = path.resolve(options.jsviewPatchModulesDir, pkgName);
     const patchDest = path.resolve(options.modulesDir, pkgName);
@@ -126,6 +126,86 @@ function installPatches(options, pkgNeedPatch)
   rmSync(options.projectDir, options.cacheDir);
 }
 
+function getPatchListRecursive(patchDir)
+{
+  var patchList = [];
+
+  const pkgNameArray = fs.readdirSync(patchDir);
+  for (const pkgName of pkgNameArray) {
+    const pkgFullPath = path.resolve(patchDir, pkgName);
+
+    const isDirectory = fs.statSync(pkgFullPath).isDirectory();
+    if(isDirectory) {
+      const subPatchList = getPatchListRecursive(pkgFullPath);
+      patchList = [...patchList, ...subPatchList];
+    } else {
+      if(pkgFullPath.endsWith('.patch') == false) {
+        continue;
+      }
+
+      patchList.push(pkgFullPath);
+    }
+  }
+
+  return patchList;
+}
+
+function autoPatchPackages(options)
+{
+  Logger.Info('Stage 2: Auto patching packages:');
+
+  const patchCacheDir = path.resolve(options.cacheJsViewDir, 'patches');
+  fs.mkdirSync(patchCacheDir, { recursive: true, force: true });
+
+  const patchInfo = {};
+  const patchList = getPatchListRecursive(options.jsviewPatchModulesDir);
+  for (const patchFullPath of patchList) {
+    const patchRelativePath = path.relative(options.jsviewPatchModulesDir, patchFullPath);
+    const patchNameAndVersion = path.dirname(patchRelativePath);
+    const patchVersion = path.basename(patchNameAndVersion);
+    const patchName = path.dirname(patchNameAndVersion);
+
+    if(!patchInfo[patchName]) {
+      patchInfo[patchName] = [];
+    }
+    patchInfo[patchName].push(patchVersion);
+  }
+
+  for(const [patchName, patchVersions] of Object.entries(patchInfo)) {
+    const pkgFullDir = path.resolve(options.modulesDir, patchName);
+    const pkgJsonFullPath = path.resolve(pkgFullDir, 'package.json');
+    if(fs.existsSync(pkgJsonFullPath) == false) {
+      continue;
+    }
+
+    const pkgObj = loadPackageObject(pkgFullDir);
+    const pkgVersion = pkgObj.version;
+    if(patchVersions.includes(pkgVersion) == false) {
+      Logger.Warn('  Patch file for ' + patchName + '@' + pkgVersion + ' is not found.');
+      continue;
+    }
+
+    const patchFullDir = path.resolve(options.jsviewPatchModulesDir, patchName, pkgVersion);
+    const patchFiles = fs.readdirSync(patchFullDir);
+    for (const file of patchFiles) {
+      if(file.endsWith('.patch') == false) {
+        continue;
+      }
+
+      const copyFromPath = path.resolve(patchFullDir, file);
+      const copyToPath = path.resolve(patchCacheDir, file);
+      cpSync(options.projectDir, copyFromPath, copyToPath);
+    }
+  }
+
+  const hasPatches = fs.readdirSync(patchCacheDir);
+  if(hasPatches && hasPatches.length > 0) {
+    execCommand('npx patch-package --patch-dir ' + path.relative(options.projectDir, patchCacheDir));
+  } else {
+    Logger.Info('  No patch files found.');
+  }
+}
+
 async function printRevision(options)
 {
   const jsviewVersionURL = url.pathToFileURL(options.jsviewDomRevisionFile);
@@ -188,6 +268,8 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
 
   installPatches(options, pkgNeedPatch);
 
+  autoPatchPackages(options);
+
   printRevision(options);
 }
 

package/tools/jsview-run-tool.mjs

@@ -8,31 +8,43 @@ import {
     parseArguments,
     Logger,
     execCommand,
+    printArgumentsUsages,
 } from './jsview-common.mjs';
 
 async function getExtraOptions(argv)
 {
     const options = getOptions(argv.framework);
+    options.argumentsLine = argv.argumentsLine;
+    options.help = argv.help;
     options.jsviewCoreRevision = null;
     options.jsviewEngineUrl = null;
     options.entryUrl = argv.url;
 
     let commandCount = 0;
+    commandCount += (argv.configApp ? 1 : 0);
     commandCount += (argv.genKeypair ? 1 : 0);
     commandCount += (argv.runonAndroid ? 1 : 0);
     commandCount += (argv.buildMinmap ? 1 : 0);
     commandCount += (argv.buildZip ? 1 : 0);
+    commandCount += (argv.moduleFederation ? 1 : 0);
     if(commandCount == 0) {
+        if(argv.help || argv.h) {
+            printArgumentsUsages(requiredUsages, optionalUsages);
+            process.exit(0);
+        }
+
         const commandPrompt = [
             ' 1. runon-android',
-            ' 2. gen-keypair',
-            ' 3. build-minmap',
-            ' 4. build-offline',
+            ' 2. config-app',
+            ' 3. gen-keypair',
+            ' 4. build-minmap',
+            ' 5. build-offline',
+            ' 6. module-federation',
         ];
 
         Logger.Info();
         Logger.Info('Please choice a command:');
-        for(const key in commandPrompt) {
+        for(const key of commandPrompt) {
             Logger.Info(key);
         }
         const answer = askAndAnswer('Command Index: ');
@@ -41,22 +53,30 @@ async function getExtraOptions(argv)
             options.runonAndroid = true; 
             break;
         case '2':
-            options.genKeypair = true; 
+            options.configApp = true; 
             break;
         case '3':
-            options.buildMinmap = true; 
+            options.genKeypair = true; 
             break;
         case '4':
+            options.buildMinmap = true; 
+            break;
+        case '5':
             options.buildZip = true; 
             break;
+        case '6':
+            options.moduleFederation = true; 
+            break;
         default:
             Logger.ErrorAndExitNoException("Unknown input: " + answer);
         }
     } else if(commandCount == 1) {
         options.runonAndroid = argv.runonAndroid; 
+        options.configApp = argv.configApp; 
         options.genKeypair = argv.genKeypair; 
         options.buildMinmap = argv.buildMinmap;
         options.buildZip = argv.buildZip; 
+        options.moduleFederation = argv.moduleFederation; 
     } else if(commandCount > 1) {
         Logger.ErrorAndExitNoException("Only one command can be executed.");
     }
@@ -68,6 +88,17 @@ function doCommand(options) {
     let command;
     if(options.runonAndroid) {
         command = 'node node_modules/@shijiu/jsview/tools/jsview-run-android.mjs --framework=vue';
+    } else if(options.configApp) {
+        const defaultConfig = 'JsViewDemo:JsView示例';
+        const config = (typeof(options.configApp) === 'string' ? options.configApp : defaultConfig);
+        if(config !== options.configApp) {
+            Logger.Warn('App config is not set, use default value: ' + defaultConfig);
+        }
+
+        const configArray = config.split(':');
+        const appName = configArray[0];
+        const appTitle = configArray[1] ?? appName;
+        command = 'node node_modules/@shijiu/jsview/tools/jsview-config-app.mjs --app-name=' + appName + ' --app-title=' + appTitle;
     } else if(options.genKeypair) {
         command = 'node node_modules/@shijiu/jsview/tools/jsview-generate-keypair.mjs';
     } else if(options.buildMinmap) {
@@ -86,6 +117,11 @@ function doCommand(options) {
         }
 
         command = 'node node_modules/@shijiu/jsview/tools/jsview-build-zip.mjs --password=' + password;
+    } else if(options.moduleFederation) {
+        var argumentsLine = options.argumentsLine.replace(/ --framework.*? /, ' ');
+        argumentsLine = argumentsLine.replace(' -f ', ' ').replace(' --module-federation ', ' ');
+
+        command = 'node node_modules/@shijiu/jsview/tools/jsview-module-federation.mjs' + argumentsLine;
     }
 
     execCommand(command);
@@ -105,9 +141,11 @@ const requiredUsages = {
 };
 const optionalUsages = {
   '-a | --runon-android': 'Run app on android devices.',
+  '-c | --config-app': 'Config app, like: -c or --config-app=[AppName:AppTitle].',
   '-g | --gen-keypair': 'Generate sign keypair.',
   '-m | --build-minmap': 'Build target with filter map, like: -m or --build-minmap=[filter].',
   '-z | --build-zip': 'Build target to offline zip package, like: -z or --build-zip=[password].',
+  '-f | --module-federation': 'Make project to module federation, use --module-federation --help for details.',
 };
-const argv = parseArguments(requiredUsages, optionalUsages, false);
+const argv = parseArguments(requiredUsages, optionalUsages, true, true, true);
 main(argv)