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

package/package.json

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

package/tools/jsview-build-minmap.mjs

@@ -21,7 +21,11 @@ async function main(argv)
   const filter = argv.filter ?? '^jsview-';
   const regex = new RegExp(filter);
 
-  execCommand('JSVIEW_KEEP_CHUNKNAME=true npm run build');
+  var exportPrefix = 'export';
+  if(process.platform == 'win32') {
+      exportPrefix = 'set'
+  }
+  execCommand(exportPrefix + ' JSVIEW_KEEP_CHUNKNAME=true && npm run build');
 
   const srcmapFileNames = fs.readdirSync(options.distDebugMapDir);
   const needlessFileNames = srcmapFileNames.filter(it => !it.match(regex));

package/tools/jsview-common.mjs

@@ -444,7 +444,7 @@ function unzipFile(zipFilePath, toDir, workDir)
   }
   Logger.Info('Unzipping ' + zipFilePath + ' => ' + relativePath);
 
-  const cmdline = 'npx extract-zip ' + zipFilePath + ' ' + toDir;
+  const cmdline = 'npx -y extract-zip ' + zipFilePath + ' ' + toDir;
   execCommand(cmdline);
 }
 

package/tools/jsview-module-federation.mjs

@@ -137,7 +137,7 @@ function getChunkFileName(chunkInfo) {
   if(chunkInfo.name == '__federation_expose_JsViewLoader') {
     return 'js/JsViewLoader.js'
   }
-  return 'js/chunk.jsv.[hash].js'
+  return (process.env['JSVIEW_KEEP_CHUNKNAME'] ? 'js/[name].[hash].js' : 'js/chunk.jsv.[hash].js')
 }`;
     }
   }
@@ -150,36 +150,37 @@ function genFederationConfigFunction(options)
   var content = '';
   if(options.mode == 'remote') {
     content += `
-function setFederationRemoteConfig(config) {`;
+function setFederationRemoteConfig(config, federation) {`;
   } else  if(options.mode == 'host') {
     content += `
-function setFederationHostConfig(config) {`;
+function setFederationHostConfig(config, federation) {`;
   }
 
-  if(options.mode == 'remote') {
-    if(options.jsviewMode == 'expose') {
-      content += `
+  content += `
   config.build = (config.build || {})
   config.build.rollupOptions = (config.build.rollupOptions || {})
   config.build.rollupOptions.output = (config.build.rollupOptions.output || {})
   config.build.rollupOptions.output.manualChunks = (config.build.rollupOptions.output.manualChunks || {})
-
-  config.build.rollupOptions.output.chunkFileNames = getChunkFileName
   config.build.rollupOptions.output.manualChunks["__federation_fn_import"] = ["__federation_fn_import"]`;
+
+  if(options.mode == 'remote') {
+    if(options.jsviewMode == 'expose') {
+      content += `
+  config.build.rollupOptions.output.chunkFileNames = getChunkFileName`;
     }
   }
 
   content += '\n'
   if(options.mode == 'remote') {
     content += `
-  const config = getRemoteConfig()`;
+  const federationConfig = getRemoteConfig()`;
   } else  if(options.mode == 'host') {
     content += `
-  const config = getHostConfig()`;
+  const federationConfig = getHostConfig()`;
   }
 
   content += `
-  config.plugins.push(federation(config))
+  config.plugins.push(federation(federationConfig))
 
 }`;
 
@@ -204,7 +205,7 @@ import federation from '@originjs/vite-plugin-federation'`;
 
   federationConfigContent += `
 export {
-  setFederationHostConfig,
+  setFederationRemoteConfig,
 }`;
   
   fs.writeFileSync(path.resolve(options.projectDir, federationConfigName),
@@ -217,8 +218,7 @@ function createFederationHostConfigFile(options)
   const federationConfigName = 'federation.host.config.ts';
   Logger.Info('Creating ' + federationConfigName + ' ...');
 
-  var federationConfigContent = `
-import federation from '@originjs/vite-plugin-federation'`;
+  var federationConfigContent = '';
 
   federationConfigContent += '\n';
   federationConfigContent += genFederationUrl(options);
@@ -256,6 +256,7 @@ async function updateViteConfigFile(options)
     viteConfigContent = viteConfigContent.replace(regex, 'const viteConfig = ');
 
     // 开头添加
+    viteConfigContent = "import federation from '@originjs/vite-plugin-federation'\n" + viteConfigContent;
     if(options.mode == 'remote') {
       viteConfigContent = "import { setFederationRemoteConfig } from './federation.remote.config'\n" + viteConfigContent;
     } else if(options.mode == 'host') {
@@ -265,9 +266,9 @@ async function updateViteConfigFile(options)
     // 末尾添加
     viteConfigContent += '\n';
     if(options.mode == 'remote') {
-      viteConfigContent += 'setFederationRemoteConfig(viteConfig)\n';
+      viteConfigContent += 'setFederationRemoteConfig(viteConfig, federation)\n';
     } else if(options.mode == 'host') {
-      viteConfigContent += 'setFederationHostConfig(viteConfig)\n';
+      viteConfigContent += 'setFederationHostConfig(viteConfig, federation)\n';
     }
     viteConfigContent += '\n';
     viteConfigContent += 'export default defineConfig(viteConfig)\n';
@@ -295,6 +296,24 @@ function updateJsviewConfigFile(options)
   }
 }
 
+function updateTsConfigFile(options)
+{
+  const tsConfigName = 'tsconfig.json';
+  Logger.Info('Updating ' + tsConfigName + ' ...');
+
+  if(options.mode == 'host') {
+    if(options.jsviewMode == 'expose') {
+      const tsConfigPath = path.resolve(options.projectDir, tsConfigName);
+      var tsConfigContent = fs.readFileSync(tsConfigPath, 'utf-8');
+      const regex = /RemoteEntry/;
+      if(regex.test(tsConfigContent) == false) {
+        tsConfigContent = tsConfigContent.replace(/"jsview"/, '"RemoteEntry/JsViewVue": [ "./node_modules/@shijiu/jsview-vue" ],\n    $&');
+      }
+      fs.writeFileSync(tsConfigPath, tsConfigContent, 'utf-8');
+    }
+  }
+}
+
 function updateToFederationRemote(options)
 {
   createFederationRemoteConfigFile(options);
@@ -309,6 +328,8 @@ function updateToFederationHost(options)
   updateViteConfigFile(options);
 
   updateJsviewConfigFile(options);
+
+  updateTsConfigFile(options);
 }
 
 
@@ -346,8 +367,8 @@ async function main(argv)
   }
   Logger.Info('Success to update project to module federation.');
   Logger.Info('Module federation info:');
-  Logger.Info('  mode:             ' + options.mode);
-  Logger.Info('  jsview:           ' + options.jsviewMode);
+  Logger.Info('  Mode:             ' + options.mode);
+  Logger.Info('  JsView:           ' + options.jsviewMode);
   if(options.mode == 'host') {
     Logger.Info('  remote entry url: ' + options.remoteDomain + '/js/remoteEntry.js');
   }