@shijiu/jsview 3.0.1-test.0 → 3.0.2-test.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "3.0.1-test.0",
+  "version": "3.0.2-test.0",
   "type": "module",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.mjs",

package/tools/jsview-module-federation.mjs

@@ -18,8 +18,8 @@ async function updateToFederationBase(options)
 
   const devDeps = '@originjs/vite-plugin-federation@1.3.4'
   Logger.Info('Installing ' + devDeps + ' ...');
-  execCommand('npm install --save-dev ' + devDeps);
-  execCommand('npm ci');
+  execCommand('npm install --force --save-dev ' + devDeps);
+  execCommand('npm ci --force');
 }
 
 function genFederationUrl(options)

package/tools/jsview-post-install.mjs

@@ -170,11 +170,23 @@ function getPatchListRecursive(patchDir)
   return patchList;
 }
 
-function autoPatchPackages(options, pkgNeedPatchModules)
+function autoPatchPackages(options, pkgNeedPatch)
 {
   const patchCacheDir = path.resolve(options.cacheJsViewDir, 'patches');
   fs.mkdirSync(patchCacheDir, { recursive: true, force: true });
-  for (const file of pkgNeedPatchModules) {
+
+  const patchList = [...pkgNeedPatch.required];
+  console.log('pkgNeedPatch.optional', pkgNeedPatch.optional);
+  for (const [pkgName, file] of Object.entries(pkgNeedPatch.optional)) {
+    const pkgPath = path.resolve(options.modulesDir, pkgName);
+    console.log('pkgPath', pkgPath);
+    if(!fs.existsSync(pkgPath)) {
+      continue;
+    }
+    patchList.push(file);
+  }
+
+  for (const file of patchList) {
     if(file.endsWith('.patch') == false) {
       continue;
     }
@@ -231,7 +243,7 @@ async function printRevision(options)
   Logger.Info('**************************************************');
 }
 
-function doPostInstall(framework, pkgNeedPatches, skipCheckVersion, skipCheckNpmcmd)
+function doPostInstall(framework, pkgNeedPatch, skipCheckVersion, skipCheckNpmcmd)
 {
   const options = getOptions(framework);
   options.projectDir = process.cwd();
@@ -259,7 +271,7 @@ function doPostInstall(framework, pkgNeedPatches, skipCheckVersion, skipCheckNpm
   checkNpmLinkForDebug(options, linkablePkgNames);
 
   Logger.Tip('Stage 2: Auto patching packages...');
-  autoPatchPackages(options, pkgNeedPatches);
+  autoPatchPackages(options, pkgNeedPatch);
 
   printRevision(options);
 }
@@ -268,23 +280,28 @@ function main(argv)
 {
   checkNodeVersion();
 
-  let pkgNeedPatches;
+  let pkgNeedPatch;
 
   switch (argv.framework) {
     case 'vue':
-      pkgNeedPatches = [
-        '@vitejs+plugin-vue+6.0.6.patch',
-        '@vue+compiler-dom+3.6.0-beta.10.patch',
-        '@vue+compiler-sfc+3.6.0-beta.10.patch',
-        '@vue+runtime-core+3.6.0-beta.10.patch',
-        '@vue+runtime-dom+3.6.0-beta.10.patch',
-        'postcss-js+5.1.0.patch',
-        'vite+8.0.9.patch',
-        'vue-router+5.0.6.patch',
-      ]
+      pkgNeedPatch = {
+        required: [
+          '@vitejs+plugin-vue+6.0.6.patch',
+          '@vue+compiler-dom+3.6.0-beta.10.patch',
+          '@vue+compiler-sfc+3.6.0-beta.10.patch',
+          '@vue+runtime-core+3.6.0-beta.10.patch',
+          '@vue+runtime-dom+3.6.0-beta.10.patch',
+          'postcss-js+5.1.0.patch',
+          'vite+8.0.9.patch',
+          'vue-router+5.0.6.patch',
+        ],
+        optional: {
+          '@originjs/vite-plugin-federation': '@originjs+vite-plugin-federation+1.3.4.patch',
+        }
+      }
       break;
     // case 'react':
-    //   pkgNeedPatches = [
+    //   pkgNeedPatch = [
     //     'react-dev-utils',
     //     'react-dom',
     //     'react-scripts',
@@ -299,7 +316,7 @@ function main(argv)
     argv.skipCheckVersion = true;
   }
 
-  doPostInstall(argv.framework, pkgNeedPatches, argv.skipCheckVersion, argv.skipCheckNpmcmd);
+  doPostInstall(argv.framework, pkgNeedPatch, argv.skipCheckVersion, argv.skipCheckNpmcmd);
 }
 
 const requiredUsages = {