@shijiu/jsview 2.1.364-test.0 → 2.1.366-test.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.1.364-test.0",
+  "version": "2.1.366-test.0",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/patches/node_modules/@originjs/vite-plugin-federation/1.3.4/@originjs+vite-plugin-federation+1.3.4.patch

@@ -0,0 +1,70 @@
+diff --git a/node_modules/@originjs/vite-plugin-federation/dist/index.js b/node_modules/@originjs/vite-plugin-federation/dist/index.js
+index 980b8e3..48baae5 100644
+--- a/node_modules/@originjs/vite-plugin-federation/dist/index.js
++++ b/node_modules/@originjs/vite-plugin-federation/dist/index.js
+@@ -970,8 +970,11 @@ function prodExposePlugin(options) {
+         const filepathMap = /* @__PURE__ */ new Map();
+         const getFilename = (name) => path.parse(path.parse(name).name).name;
+         const cssBundlesMap = Object.keys(bundle).filter((name) => path.extname(name) === ".css").reduce((res, name) => {
+-          const filename = getFilename(name);
+-          res.set(filename, bundle[name]);
++// JsView Removed >>>
++// JsView js代码中已内嵌css
++          //const filename = getFilename(name);
++          //res.set(filename, bundle[name]);
++// JsView Removed <<<                 
+           return res;
+         }, /* @__PURE__ */ new Map());
+         remoteEntryChunk.code = remoteEntryChunk.code.replace(
+@@ -1481,6 +1484,16 @@ function federation(options) {
+       }
+       builderInfo.builder = "vite";
+       builderInfo.assetsDir = ((_b = config == null ? void 0 : config.build) == null ? void 0 : _b.assetsDir) ?? "assets";
++// JsView Added >>>
++// 根据chunkFile路径设置assetsDir
++      let chunkFileNames = config.build.rollupOptions.output.chunkFileNames;
++      if (typeof (chunkFileNames) === 'function') {
++        chunkFileNames = chunkFileNames({name: 'test.js'})
++      }
++      const jsDir = path.dirname(chunkFileNames);
++      builderInfo.assetsDir = jsDir;
++      console.log("builderInfo",builderInfo);
++// JsView Added <<<
+     },
+     configureServer(server) {
+       var _a;
+diff --git a/node_modules/@originjs/vite-plugin-federation/dist/index.mjs b/node_modules/@originjs/vite-plugin-federation/dist/index.mjs
+index 57bae8f..9320e8d 100644
+--- a/node_modules/@originjs/vite-plugin-federation/dist/index.mjs
++++ b/node_modules/@originjs/vite-plugin-federation/dist/index.mjs
+@@ -953,8 +953,11 @@ function prodExposePlugin(options) {
+         const filepathMap = /* @__PURE__ */ new Map();
+         const getFilename = (name) => parse(parse(name).name).name;
+         const cssBundlesMap = Object.keys(bundle).filter((name) => extname(name) === ".css").reduce((res, name) => {
+-          const filename = getFilename(name);
+-          res.set(filename, bundle[name]);
++// JsView Removed >>>
++// JsView js代码中已内嵌css
++          //const filename = getFilename(name);
++          //res.set(filename, bundle[name]);
++// JsView Removed <<<
+           return res;
+         }, /* @__PURE__ */ new Map());
+         remoteEntryChunk.code = remoteEntryChunk.code.replace(
+@@ -1464,6 +1467,16 @@ function federation(options) {
+       }
+       builderInfo.builder = "vite";
+       builderInfo.assetsDir = ((_b = config == null ? void 0 : config.build) == null ? void 0 : _b.assetsDir) ?? "assets";
++// JsView Added >>>
++// 根据chunkFile路径设置assetsDir
++      let chunkFileNames = config.build.rollupOptions.output.chunkFileNames;
++      if (typeof (chunkFileNames) === 'function') {
++        chunkFileNames = chunkFileNames({name: 'test.js'})
++      }
++      const jsDir = path.dirname(chunkFileNames);
++      builderInfo.assetsDir = jsDir;
++      console.log("builderInfo",builderInfo);
++// JsView Added <<<
+     },
+     configureServer(server) {
+       var _a;

package/tools/jsview-common.mjs

@@ -244,7 +244,8 @@ function getOptions(framework)
 
   const cacheName = (framework == 'vue' ? '.vite' : '.cache');
   options.cacheDir = path.resolve(options.modulesDir, cacheName);
-  options.baseUrlFile = path.resolve(options.cacheDir, 'jsview', 'network.mjs');
+  options.cacheJsViewDir = path.resolve(options.cacheDir, 'jsview');
+  options.baseUrlFile = path.resolve(options.cacheJsViewDir, 'network.mjs');
 
   return options;
 }

package/tools/jsview-module-federation.mjs

@@ -5,44 +5,16 @@ import fs from 'node:fs';
 import path from 'node:path';
 import {
   checkNodeVersion,
-  downloadFileAsync,
   execCommand,
   getOptions,
-  loadPackageObject,
   parseArguments,
-  savePackageObject,
   Logger,
-  unzipFile,
 } from './jsview-common.mjs';
 import { assert } from 'node:console';
 
 async function updateToFederationBase(options)
 {
   Logger.Info('Updating package.json...');
-  const pkgObj = loadPackageObject(options.projectDir);
-  if(!pkgObj.scripts) {
-    pkgObj.scripts = {};
-  }
-
-  var postInstall = pkgObj.scripts.postinstall ?? '';
-  if(postInstall.includes('npx patch-package') == false) {
-    if(postInstall) {
-      postInstall += ' && '
-    }
-
-    postInstall += 'npx patch-package'
-  }
-
-  pkgObj.scripts.postinstall = postInstall;
-
-  savePackageObject(options.projectDir, pkgObj);
-
-  Logger.Info('Downloading patches ...');
-  const url = 'https://gitlab.cluster.qcast.cn/mirror/jsview-module-federation-demo/-/raw/main/patches.zip';
-  const filePath = path.resolve(options.projectDir, 'patches.zip');
-  await downloadFileAsync(url, filePath, options.projectDir)
-
-  unzipFile(filePath, options.projectDir, options.projectDir);
 
   const devDeps = '@originjs/vite-plugin-federation@1.3.4'
   Logger.Info('Installing ' + devDeps + ' ...');
@@ -50,10 +22,6 @@ async function updateToFederationBase(options)
   execCommand('npm ci');
 }
 
-function getRemoteEntryUrl(options)
-{
-}
-
 function genFederationUrl(options)
 {
   var content = '';
@@ -69,7 +37,7 @@ const jsviewLoaderUrl = remoteDomain + '/js/JsViewLoader.js'`
     }
   }
 
-  return content
+  return content;
 }
 
 function genConfigFunction(options)
@@ -110,14 +78,16 @@ function getHostConfig()
   }
 
   content += `
-    shared: [`;
-  if(options.jsviewMode == 'share') {
+    shared: {`;
+  if(options.jsviewMode == 'shared') {
     content += `
-      'jsview',`;
+      '@shijiu/jsview-vue': {},
+      jsview:  { packagePath: '@shijiu/jsview-vue' },`;
   }
   content += `
-      'vue',
-    ]
+      vue: {},
+      'vue-router': {},
+    },
   }
 
   return config
@@ -345,8 +315,8 @@ async function main(argv)
   }
   options.mode = argv.mode;
 
-  if(argv.jsview != 'share' && argv.jsview != 'expose') {
-    Logger.ErrorAndExit('Invalid --jsview, its value can only be "share" or "expose".');
+  if(argv.jsview != 'shared' && argv.jsview != 'expose') {
+    Logger.ErrorAndExit('Invalid --jsview, its value can only be "shared" or "expose".');
   }
   options.jsviewMode = argv.jsview;
 
@@ -377,7 +347,7 @@ async function main(argv)
 
 const requiredUsages = {
   '--mode': 'Project mode. the value is "remote" or "host"',
-  '--jsview': 'jsview mode. the value is "share" or "expose"',
+  '--jsview': 'jsview mode. the value is "shared" or "expose"',
 };
 const optionalUsages = {
   '--remote-domain': 'remote domain. Host use this domain to access remote module.',

package/tools/jsview-post-install.mjs

@@ -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);
 }