@shijiu/jsview 2.1.363-test.0 → 2.1.365-test.0

package/package.json

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

package/tools/jsview-module-federation.mjs

@@ -110,14 +110,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
@@ -150,22 +152,23 @@ 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`;
     }
   }
 
@@ -217,8 +220,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);
@@ -309,7 +311,7 @@ function updateTsConfigFile(options)
       if(regex.test(tsConfigContent) == false) {
         tsConfigContent = tsConfigContent.replace(/"jsview"/, '"RemoteEntry/JsViewVue": [ "./node_modules/@shijiu/jsview-vue" ],\n    $&');
       }
-      fs.writeFileSync(options.appJsviewConfigFile, tsConfigContent, 'utf-8');
+      fs.writeFileSync(tsConfigPath, tsConfigContent, 'utf-8');
     }
   }
 }
@@ -345,8 +347,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 +379,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.',