@shijiu/jsview 2.1.435 → 2.1.476-test.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.1.435",
+  "version": "2.1.476-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,114 @@
+diff --git a/node_modules/@originjs/vite-plugin-federation/dist/index.js b/node_modules/@originjs/vite-plugin-federation/dist/index.js
+index 980b8e3..534e796 100644
+--- a/node_modules/@originjs/vite-plugin-federation/dist/index.js
++++ b/node_modules/@originjs/vite-plugin-federation/dist/index.js
+@@ -301,11 +301,20 @@ function createRemotesMap(remotes) {
+       return `'${external}'`;
+     }
+   };
++// JsView Modified >>>
++//   return `const remotesMap = {
++// ${remotes.map(
++//     (remote) => `'${remote.id}':{url:${createUrl(remote)},format:'${remote.config.format}',from:'${remote.config.from}'}`
++//   ).join(",\n  ")}
++// };`;
+   return `const remotesMap = {
+ ${remotes.map(
+     (remote) => `'${remote.id}':{url:${createUrl(remote)},format:'${remote.config.format}',from:'${remote.config.from}'}`
+   ).join(",\n  ")}
+-};`;
++};;
++window.JsvCode.Federation = { remotesMap };
++`;
++// JsView Modified <<<
+ }
+ function getFileExtname(url) {
+   const fileNameAndParamArr = normalizePath(url).split("/");
+@@ -970,8 +979,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 +1493,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..3b3c2c1 100644
+--- a/node_modules/@originjs/vite-plugin-federation/dist/index.mjs
++++ b/node_modules/@originjs/vite-plugin-federation/dist/index.mjs
+@@ -284,11 +284,20 @@ function createRemotesMap(remotes) {
+       return `'${external}'`;
+     }
+   };
++// JsView Modified >>>
++//   return `const remotesMap = {
++// ${remotes.map(
++//     (remote) => `'${remote.id}':{url:${createUrl(remote)},format:'${remote.config.format}',from:'${remote.config.from}'}`
++//   ).join(",\n  ")}
++// };`;
+   return `const remotesMap = {
+ ${remotes.map(
+     (remote) => `'${remote.id}':{url:${createUrl(remote)},format:'${remote.config.format}',from:'${remote.config.from}'}`
+   ).join(",\n  ")}
+-};`;
++};;
++window.JsvCode.Federation = { remotesMap };
++`;
++// JsView Modified <<<
+ }
+ function getFileExtname(url) {
+   const fileNameAndParamArr = normalizePath(url).split("/");
+@@ -953,8 +962,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 +1476,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/patches/node_modules/vite/dist/node/jsview-vite-extension.js

@@ -87,7 +87,7 @@ const jsviewConfig = defineConfig({
   },
   server: {
     host: true,
-    open: process.platform === "darwin",
+    open: !process.env['JSVIEW_DISABLE_OPEN_BROWSER'] && process.platform === "darwin",
     watch: {
       ignored: [
         '!**/node_modules/@shijiu/**',

package/tools/jsview-common.mjs

@@ -3,12 +3,19 @@
 
 import childProcess from 'node:child_process';
 import fs from 'node:fs';
+import https from 'node:https';
 import os from 'node:os';
 import path from 'node:path';
 import { Logger } from "./jsview-logger.js";
 
 function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
 {
+  if(!helpUsages) {
+    helpUsages = {
+      '-h | --help': 'Print help usages.',
+    }
+  }
+
   let maxLength = 0;
   for (const usage in requiredUsages) {
     maxLength = (maxLength > usage.length ? maxLength : usage.length);
@@ -41,7 +48,9 @@ function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
 
 function parseArguments(requiredUsages = {},
                         optionalUsages = {},
-                        withoutUnparsed = true)
+                        withoutUnparsed = true,
+                        ignoreUnknown = false,
+                        ignoreHelpUsage = false)
 {
   const keySeparator = '|';
   const formatKey = (key) => {
@@ -110,7 +119,8 @@ function parseArguments(requiredUsages = {},
   }
 
   let options = {
-    unparsed: []
+    unparsed: [],
+    argumentsLine: '',
   };
 
   // arg0: node
@@ -130,7 +140,8 @@ function parseArguments(requiredUsages = {},
       }
     }
 
-    if (hasKey(helpUsages, key) == false
+    if (ignoreUnknown == false
+    && hasKey(helpUsages, key) == false
     && hasKey(requiredUsages, key) == false
     && hasKey(optionalUsages, key) == false) {
         Logger.ErrorAndExitNoException('Failed to parse usage: ' + argu);
@@ -139,11 +150,13 @@ function parseArguments(requiredUsages = {},
     let formattedKey = formatKey(key);
     let formattedValue = formatValue(value);
     options[formattedKey] = formattedValue;
+
+    options.argumentsLine += ' ' + argu;
   }
 
   for (const checker in helpUsages) {
     const aliasedOptions = checkAliases(checker, options);
-    if (aliasedOptions) {
+    if (aliasedOptions && ignoreHelpUsage == false) {
       printArgumentsUsages(requiredUsages, optionalUsages, helpUsages);
       process.exit(0);
     }
@@ -208,6 +221,8 @@ function getOptions(framework)
   }
 
   options.appConfigDir = path.resolve(options.projectDir, 'src', 'appConfig');
+  options.appConfigFile = path.resolve(options.appConfigDir, 'app.config.mjs');
+  options.appJsviewConfigFile = path.resolve(options.appConfigDir, 'jsview.config.mjs');
   options.appPrivKeyFile = path.resolve(options.appConfigDir, 'app_sign_private_key.crt');
   options.appPubKeyFile = path.resolve(options.appConfigDir, 'app_sign_public_key.pem');
 
@@ -231,12 +246,13 @@ 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;
 }
 
-function getPackageObject(modulePath)
+function loadPackageObject(modulePath)
 {
   const pkgFullFile = path.resolve(modulePath, 'package.json');
   if (!fs.existsSync(pkgFullFile)) {
@@ -248,6 +264,16 @@ function getPackageObject(modulePath)
   return pkgObj;
 }
 
+function savePackageObject(modulePath, pkgObj)
+{
+  const pkgFullFile = path.resolve(modulePath, 'package.json');
+  const pkgContent = JSON.stringify(pkgObj, null, 2);
+
+  fs.writeFileSync(pkgFullFile, pkgContent, 'utf8');
+
+  return pkgObj;
+}
+
 function cpSync(workDir, srcPath, destPath, ignore=[])
 {
   const exists = fs.existsSync(srcPath);
@@ -324,6 +350,18 @@ function execCommand(cmdline, withOutput)
   }
 }
 
+function execCommandAsync(cmdline)
+{
+  Logger.Info('Run [' + cmdline + ']... ');
+  const child = childProcess.exec(cmdline);
+  child.stdout.on('data', (data) => {
+    console.log(data);
+  });
+  child.stderr.on('data', (data) => {
+    Logger.ErrorAndExit(data)
+  });
+}
+
 function checkNodeVersion(minMajorVersion = 16)
 {
   const versions = process.version.replace('v', '').split('.');
@@ -395,25 +433,88 @@ function convertHomeDirectory(filePath)
   return filePath.replace(/^~\//, homeDir + '/');
 }
 
+function downloadFileAsync(url, localPath, workDir)
+{
+  const relativePath = path.relative(workDir, localPath);
+  Logger.Info('Downloading ' + url + ' => ' + relativePath);
+
+  const file = fs.createWriteStream(localPath);
+
+  return new Promise((resolve, reject) => {
+    const request = https.get(url, (response) => {
+      response.pipe(file);
+
+      file.on('finish', () => {
+        file.close(() => {
+          Logger.Info('Success to download file to ' + relativePath);
+          resolve();
+        });
+      });
+    });
+
+    request.on('error', (err) => {
+      fs.unlink(localPath, () => {
+        Logger.ErrorAndExit('Failed to download file from ' + url);
+        reject(err);
+      });
+    });
+  });
+}
+
+function unzipFile(zipFilePath, toDir, workDir)
+{
+  var relativePath = path.relative(workDir, toDir);
+  if(!relativePath) {
+    relativePath = './'
+  }
+  Logger.Info('Unzipping ' + zipFilePath + ' => ' + relativePath);
+
+  const cmdline = 'npx -y extract-zip ' + zipFilePath + ' ' + toDir;
+  execCommand(cmdline);
+}
+
 function getNpmRegistry()
 {
   return 'https://nexus.cluster.qcast.cn/repository/npm-public';
 }
 
+function getNetworkIpv4Addresses() {
+  const addresses = [];
+  const interfaces = os.networkInterfaces();
+  for (const devName in interfaces) {
+    const iface = interfaces[devName];
+
+    for (var idx = 0; idx < iface.length; idx++) {
+      var alias = iface[idx];
+      if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal) {
+        addresses.push(alias.address);
+      }
+    }
+  }
+
+  return addresses;
+}
+
 export {
   askAndAnswer,
   checkNodeVersion,
   convertHomeDirectory,
   cpSync,
+  downloadFileAsync,
   execCommand,
-  getOptions,
-  getPackageObject,
+  execCommandAsync,
+  getNetworkIpv4Addresses,
   getNpmRegistry,
+  getOptions,
   isSymlinkSync,
+  loadPackageObject,
   makeZip,
   parseArguments,
+  printArgumentsUsages,
   readJsonFile,
   rmSync,
+  savePackageObject,
   symlinkSync,
+  unzipFile,
   Logger,
-}
+}

package/tools/jsview-config-app.mjs

@@ -0,0 +1,47 @@
+#!/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-logger.js

@@ -13,6 +13,10 @@ class Logger {
     process.exit(1);
   }
 
+  static ErrorAndExitNoSilent(...args) {
+    Logger.ErrorNoException(...args);
+    process.exit(0);
+  }
 
   static ErrorAndThrow(...args) {
     Logger.Error(...args);
@@ -49,6 +53,14 @@ class Logger {
     console.warn(Logger.Yellow(Logger.Bold('JsView Warning:')), ...args);
   }
 
+  static Tip(...args) {
+    const size = args?.length ?? 0;
+    for(let idx = 0; idx < size; idx++) {
+      args[idx] = Logger.Blue(Logger.Bold(args[idx]));
+    }
+    console.info(...args);
+  }
+
   static Info(...args) {
     console.info(Logger.Green('JsView Info:'), ...args);
   }