@shijiu/jsview 2.1.367-test.0 → 2.1.435

package/tools/jsview-run-tool.mjs

@@ -8,43 +8,31 @@ 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. config-app',
-            ' 3. gen-keypair',
-            ' 4. build-minmap',
-            ' 5. build-offline',
-            ' 6. module-federation',
+            ' 2. gen-keypair',
+            ' 3. build-minmap',
+            ' 4. build-offline',
         ];
 
         Logger.Info();
         Logger.Info('Please choice a command:');
-        for(const key of commandPrompt) {
+        for(const key in commandPrompt) {
             Logger.Info(key);
         }
         const answer = askAndAnswer('Command Index: ');
@@ -53,30 +41,22 @@ async function getExtraOptions(argv)
             options.runonAndroid = true; 
             break;
         case '2':
-            options.configApp = true; 
-            break;
-        case '3':
             options.genKeypair = true; 
             break;
-        case '4':
+        case '3':
             options.buildMinmap = true; 
             break;
-        case '5':
+        case '4':
             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.");
     }
@@ -88,17 +68,6 @@ 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) {
@@ -117,11 +86,6 @@ 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);
@@ -141,11 +105,9 @@ 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, true, true, true);
+const argv = parseArguments(requiredUsages, optionalUsages, false);
 main(argv)

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

@@ -1,70 +0,0 @@
-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-config-app.mjs

@@ -1,47 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-import fs from 'node:fs';
-import path from 'node:path';
-import {
-  checkNodeVersion,
-  getOptions,
-  parseArguments,
-  Logger,
-} from './jsview-common.mjs';
-
-function setAppConfig(options)
-{
-  let appConfigContent = fs.readFileSync(options.appConfigFile, 'utf8');
-
-  appConfigContent = appConfigContent.replace(/AppName: .*,/, 'AppName: "' + options.appName + '",');
-  appConfigContent = appConfigContent.replace(/AppTitle: .*,/, 'AppTitle: "' + options.appTitle + '",');
-
-  console.log(appConfigContent)
-
-  fs.writeFileSync(options.appConfigFile, appConfigContent, 'utf8');
-}
-
-async function main(argv) {
-  checkNodeVersion();
-
-  const options = getOptions();
-
-  options.appName = argv.appName ?? 'JsViewDemo';
-  options.appTitle = argv.appTitle ?? 'JsView Demo';
-
-  Logger.Info();
-  Logger.Info('Setting config to app.config.mjs ...');
-  setAppConfig(options);
-  Logger.Info('Set config finish.');
-}
-
-
-const requiredUsages = {
-};
-const optionalUsages = {
-  '--app-name': 'App name. default is: "JsViewDemo".',
-  '--app-title': 'App title. default is: "JsView Demo".',
-};
-const argv = parseArguments(requiredUsages, optionalUsages, false);
-main(argv)

package/tools/jsview-module-federation.mjs

@@ -1,354 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-import fs from 'node:fs';
-import path from 'node:path';
-import {
-  checkNodeVersion,
-  execCommand,
-  getOptions,
-  parseArguments,
-  Logger,
-} from './jsview-common.mjs';
-import { assert } from 'node:console';
-
-async function updateToFederationBase(options)
-{
-  Logger.Info('Updating package.json...');
-
-  const devDeps = '@originjs/vite-plugin-federation@1.3.4'
-  Logger.Info('Installing ' + devDeps + ' ...');
-  execCommand('npm install --save-dev ' + devDeps);
-  execCommand('npm ci');
-}
-
-function genFederationUrl(options)
-{
-  var content = '';
-
-  if(options.mode == 'host') {
-    content = `
-const remoteDomain = '${options.remoteDomain}' // 替换成你的 Remote 端 base url 或 ip:port;
-const remoteEntryUrl = remoteDomain + '/js/remoteEntry.js'`;
-
-    if(options.jsviewMode == 'expose') {
-      content += `
-const jsviewLoaderUrl = remoteDomain + '/js/JsViewLoader.js'`
-    }
-  }
-
-  return content;
-}
-
-function genConfigFunction(options)
-{
-  var content = '';
-
-  if(options.mode == 'remote') {
-    content = `
-function getRemoteConfig() {
-  const config = {
-    name: 'remote-lib',
-    filename: 'remoteEntry.js',
-    // 需要暴露的模块
-    exposes: {`;
-
-    if(options.jsviewMode == 'expose') {
-      content += `
-      // 必须模块，JsView 编译需要
-      './JsViewLoader': 'node_modules/@shijiu/jsview/loader/jsview-loader.js',
-      './JsViewVue': '/node_modules/@shijiu/jsview-vue/index.js',`;
-      content += '\n'
-    }
-
-    content += `
-      // 自定义模块，根据需要自行配置
-      './App.vue': './src/App.vue',
-    },`;
-  } else  if(options.mode == 'host') {
-    content = `
-function getHostConfig() {
-  const config = {
-    name: 'host-app',
-    remotes: {
-      'RemoteEntry': remoteEntryUrl,
-    },`;
-  }
-
-  content += `
-    shared: {`;
-  if(options.jsviewMode == 'shared') {
-    content += `
-      '@shijiu/jsview-vue': {},
-      jsview:  { packagePath: '@shijiu/jsview-vue' },`;
-  }
-  content += `
-      vue: {},
-      'vue-router': {},
-    },
-  }
-
-  return config
-}`;
-
-  return content;
-}
-
-function genChunkFileNameFunction(options)
-{
-  var content = '';
-
-  if(options.mode == 'remote') {
-    if(options.jsviewMode == 'expose') {
-      content = `
-function getChunkFileName(chunkInfo) {
-  if(chunkInfo.name == '__federation_expose_JsViewLoader') {
-    return 'js/JsViewLoader.js'
-  }
-  return (process.env['JSVIEW_KEEP_CHUNKNAME'] ? 'js/[name].[hash].js' : 'js/chunk.jsv.[hash].js')
-}`;
-    }
-  }
-
-  return content;
-}
-
-function genFederationConfigFunction(options)
-{
-  var content = '';
-  if(options.mode == 'remote') {
-    content += `
-function setFederationRemoteConfig(config, federation) {`;
-  } else  if(options.mode == 'host') {
-    content += `
-function setFederationHostConfig(config, federation) {`;
-  }
-
-  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.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 federationConfig = getRemoteConfig()`;
-  } else  if(options.mode == 'host') {
-    content += `
-  const federationConfig = getHostConfig()`;
-  }
-
-  content += `
-  config.plugins.push(federation(federationConfig))
-
-}`;
-
-  return content;
-}
-
-function createFederationRemoteConfigFile(options)
-{
-  const federationConfigName = 'federation.remote.config.ts';
-  Logger.Info('Creating ' + federationConfigName + ' ...');
-
-  var federationConfigContent = `
-import federation from '@originjs/vite-plugin-federation'`;
-
-  federationConfigContent += '\n';
-  federationConfigContent += genConfigFunction(options);
-  federationConfigContent += '\n';
-  federationConfigContent += genChunkFileNameFunction(options);
-  federationConfigContent += '\n';
-  federationConfigContent += genFederationConfigFunction(options);
-  federationConfigContent += '\n';
-
-  federationConfigContent += `
-export {
-  setFederationRemoteConfig,
-}`;
-  
-  fs.writeFileSync(path.resolve(options.projectDir, federationConfigName),
-                   federationConfigContent,
-                   'utf-8');
-}
-
-function createFederationHostConfigFile(options)
-{
-  const federationConfigName = 'federation.host.config.ts';
-  Logger.Info('Creating ' + federationConfigName + ' ...');
-
-  var federationConfigContent = '';
-
-  federationConfigContent += '\n';
-  federationConfigContent += genFederationUrl(options);
-  federationConfigContent += '\n';
-  federationConfigContent += genConfigFunction(options);
-  federationConfigContent += '\n';
-  federationConfigContent += genFederationConfigFunction(options);
-  federationConfigContent += '\n';
-
-  federationConfigContent += `
-export {
-  setFederationHostConfig,`;
-  if(options.jsviewMode == 'expose') {
-    federationConfigContent += `
-  jsviewLoaderUrl,`;
-  }
-  federationConfigContent += `
-}`;
-  
-  fs.writeFileSync(path.resolve(options.projectDir, federationConfigName),
-                   federationConfigContent,
-                   'utf-8');
-}
-
-async function updateViteConfigFile(options)
-{
-  const viteConfigName = 'vite.config.ts';
-  Logger.Info('Updating ' + viteConfigName + ' ...');
-
-  const viteConfigPath = path.resolve(options.projectDir, viteConfigName);
-  var viteConfigContent = fs.readFileSync(viteConfigPath, 'utf-8');
-
-  const regex = /export default defineConfig(?!\(viteConfig\))/;
-  if(regex.test(viteConfigContent)) {
-    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') {
-      viteConfigContent = "import { setFederationHostConfig } from './federation.host.config'\n" + viteConfigContent;
-    }
-
-    // 末尾添加
-    viteConfigContent += '\n';
-    if(options.mode == 'remote') {
-      viteConfigContent += 'setFederationRemoteConfig(viteConfig, federation)\n';
-    } else if(options.mode == 'host') {
-      viteConfigContent += 'setFederationHostConfig(viteConfig, federation)\n';
-    }
-    viteConfigContent += '\n';
-    viteConfigContent += 'export default defineConfig(viteConfig)\n';
-  }
-
-  fs.writeFileSync(viteConfigPath, viteConfigContent, 'utf-8');
-
-}
-
-function updateJsviewConfigFile(options)
-{
-  const jsviewConfigName = path.basename(options.appJsviewConfigFile);
-  Logger.Info('Updating ' + jsviewConfigName + ' ...');
-
-  if(options.mode == 'host') {
-    if(options.jsviewMode == 'expose') {
-      var jsviewConfigContent = fs.readFileSync(options.appJsviewConfigFile, 'utf-8');
-      const regex = /jsviewLoaderUrl/;
-      if(regex.test(jsviewConfigContent) == false) {
-        jsviewConfigContent = "import { jsviewLoaderUrl } from '../../federation.host.config'\n" + jsviewConfigContent;
-        jsviewConfigContent = jsviewConfigContent.replace(/remoteLoader.*?,/, 'remoteLoader: jsviewLoaderUrl,');
-      }
-      fs.writeFileSync(options.appJsviewConfigFile, jsviewConfigContent, 'utf-8');
-    }
-  }
-}
-
-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);
-
-  updateViteConfigFile(options);
-}
-
-function updateToFederationHost(options)
-{
-  createFederationHostConfigFile(options);
-
-  updateViteConfigFile(options);
-
-  updateJsviewConfigFile(options);
-
-  updateTsConfigFile(options);
-}
-
-
-async function main(argv)
-{
-  checkNodeVersion();
-
-
-  const options = getOptions();
-
-  if(argv.mode != 'remote' && argv.mode != 'host') {
-    Logger.ErrorAndExit('Invalid --mode, its value can only be "remote" or "host".');
-  }
-  options.mode = argv.mode;
-
-  if(argv.jsview != 'shared' && argv.jsview != 'expose') {
-    Logger.ErrorAndExit('Invalid --jsview, its value can only be "shared" or "expose".');
-  }
-  options.jsviewMode = argv.jsview;
-
-  if(argv.mode == 'host' && !argv.remoteDomain) {
-    Logger.ErrorAndExit('--remote-domain is required for host mode.');
-  }
-  options.remoteDomain = argv.remoteDomain;
-
-  Logger.Info();
-  Logger.Info('Updating to module federation ' + options.mode + ' ...');
-  await updateToFederationBase(options);
-  if(options.mode == 'remote') {
-    await updateToFederationRemote(options);
-  } else if(options.mode == 'host') {
-    await updateToFederationHost(options);
-  } else {
-    assert(0);
-  }
-  Logger.Info('Success to update project to module federation.');
-  Logger.Info('Module federation info:');
-  Logger.Info('  Mode:             ' + options.mode);
-  Logger.Info('  JsView:           ' + options.jsviewMode);
-  if(options.mode == 'host') {
-    Logger.Info('  remote entry url: ' + options.remoteDomain + '/js/remoteEntry.js');
-  }
-}
-
-
-const requiredUsages = {
-  '--mode': 'Project mode. the value is "remote" or "host"',
-  '--jsview': 'jsview mode. the value is "shared" or "expose"',
-};
-const optionalUsages = {
-  '--remote-domain': 'remote domain. Host use this domain to access remote module.',
-};
-const argv = parseArguments(requiredUsages, optionalUsages);
-main(argv)