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

package/patches/node_modules/vite/dist/node/constants.js

@@ -5,7 +5,6 @@ import { readFileSync } from 'node:fs';
 const { version } = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url)).toString());
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [
-    'browser',
     'module',
     'jsnext:main',
     'jsnext',
@@ -81,7 +80,6 @@ const CLIENT_DIR = path.dirname(CLIENT_ENTRY);
 //   looked up by mrmime.
 const KNOWN_ASSET_TYPES = [
     // images
-    'apng',
     'png',
     'jpe?g',
     'jfif',
@@ -100,8 +98,6 @@ const KNOWN_ASSET_TYPES = [
     'wav',
     'flac',
     'aac',
-    'opus',
-    'mov',
     // fonts
     'woff2?',
     'eot',
@@ -125,7 +121,5 @@ const wildcardHosts = new Set([
     '::',
     '0000:0000:0000:0000:0000:0000:0000:0000',
 ]);
-const DEFAULT_DEV_PORT = 5173;
-const DEFAULT_PREVIEW_PORT = 4173;
 
-export { CLIENT_DIR, CLIENT_ENTRY, CLIENT_PUBLIC_PATH, CSS_LANGS_RE, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES, DEFAULT_DEV_PORT, DEFAULT_EXTENSIONS, DEFAULT_MAIN_FIELDS, DEFAULT_PREVIEW_PORT, DEP_VERSION_RE, ENV_ENTRY, ENV_PUBLIC_PATH, ESBUILD_MODULES_TARGET, FS_PREFIX, JS_TYPES_RE, KNOWN_ASSET_TYPES, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, SPECIAL_QUERY_RE, VALID_ID_PREFIX, VERSION, VITE_PACKAGE_DIR, loopbackHosts, wildcardHosts };
+export { CLIENT_DIR, CLIENT_ENTRY, CLIENT_PUBLIC_PATH, CSS_LANGS_RE, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES, DEFAULT_EXTENSIONS, DEFAULT_MAIN_FIELDS, DEP_VERSION_RE, ENV_ENTRY, ENV_PUBLIC_PATH, ESBUILD_MODULES_TARGET, FS_PREFIX, JS_TYPES_RE, KNOWN_ASSET_TYPES, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, SPECIAL_QUERY_RE, VALID_ID_PREFIX, VERSION, VITE_PACKAGE_DIR, loopbackHosts, wildcardHosts };

package/patches/node_modules/vite/dist/node/jsview-vite-extension.js

@@ -17,7 +17,7 @@ const jsviewConfig = defineConfig({
       'qr.js': true,
     },
     emptyOutDir: true,
-    minify: false,
+    minify: process.env['JSVIEW_DISABLE_MINIFY'] ? false : true,
     modulePreload: {
       polyfill: false
     },
@@ -35,6 +35,7 @@ const jsviewConfig = defineConfig({
           'jsview-forge-define': ['@shijiu/jsview/dom/jsv-forge-define.mjs'],
           'jsview-dom-entry': ['@shijiu/jsview/dom/index.mjs'], 
           'jsview-vue-entry': ['@shijiu/jsview-vue/index.js'], 
+          'jsview-vue-common': ['@shijiu/jsview-vue/bin/jsview-vue-common.mjs'], 
           // 'jsview-vue-export-sfc': [],  // 将jsview-vue中的export-sfc，防止被集成在jsview-vue-entry中导致import deadloop.
         },
       },

package/patches/node_modules/vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.11",
+  "version": "4.0.0",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -8,34 +8,19 @@
   "bin": {
     "vite": "bin/vite.js"
   },
-  "keywords": [
-    "frontend",
-    "framework",
-    "hmr",
-    "dev-server",
-    "build-tool",
-    "vite"
-  ],
   "main": "./dist/node/index.js",
+  "module": "./dist/node/index.js",
   "types": "./dist/node/index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/node/index.d.ts",
-        "default": "./dist/node/index.js"
-      },
-      "require": {
-        "types": "./index.d.cts",
-        "default": "./index.cjs"
-      }
+      "types": "./dist/node/index.d.ts",
+      "import": "./dist/node/index.js",
+      "require": "./index.cjs"
     },
     "./client": {
       "types": "./client.d.ts"
     },
     "./dist/client/*": "./dist/client/*",
-    "./types/*": {
-      "types": "./types/*"
-    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -43,11 +28,10 @@
     "dist",
     "client.d.ts",
     "index.cjs",
-    "index.d.cts",
     "types"
   ],
   "engines": {
-    "node": "^18.0.0 || >=20.0.0"
+    "node": "^14.18.0 || >=16.0.0"
   },
   "repository": {
     "type": "git",
@@ -57,81 +41,90 @@
   "bugs": {
     "url": "https://github.com/vitejs/vite/issues"
   },
-  "homepage": "https://vitejs.dev",
-  "funding": "https://github.com/vitejs/vite?sponsor=1",
+  "homepage": "https://github.com/vitejs/vite/tree/main/#readme",
+  "scripts": {
+    "dev": "rimraf dist && pnpm run build-bundle -w",
+    "build": "rimraf dist && run-s build-bundle build-types",
+    "build-bundle": "rollup --config rollup.config.ts --configPlugin typescript",
+    "build-types": "run-s build-types-temp build-types-pre-patch build-types-roll build-types-post-patch build-types-check",
+    "build-types-temp": "tsc --emitDeclarationOnly --outDir temp/node -p src/node",
+    "build-types-pre-patch": "tsx scripts/prePatchTypes.ts",
+    "build-types-roll": "api-extractor run && rimraf temp",
+    "build-types-post-patch": "tsx scripts/postPatchTypes.ts",
+    "build-types-check": "tsx scripts/checkBuiltTypes.ts && tsc --project tsconfig.check.json",
+    "lint": "eslint --cache --ext .ts src/**",
+    "format": "prettier --write --cache --parser typescript \"src/**/*.ts\"",
+    "prepublishOnly": "npm run build"
+  },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.19.3",
-    "postcss": "^8.4.32",
-    "rollup": "^4.2.0"
+    "esbuild": "^0.16.3",
+    "postcss": "^8.4.19",
+    "resolve": "^1.22.1",
+    "rollup": "^3.7.0"
   },
   "optionalDependencies": {
-    "fsevents": "~2.3.3"
+    "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@ampproject/remapping": "^2.2.1",
-    "@babel/parser": "^7.23.6",
-    "@jridgewell/trace-mapping": "^0.3.20",
-    "@rollup/plugin-alias": "^5.1.0",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-dynamic-import-vars": "^2.1.2",
-    "@rollup/plugin-json": "^6.0.1",
-    "@rollup/plugin-node-resolve": "15.2.3",
-    "@rollup/plugin-typescript": "^11.1.5",
-    "@rollup/pluginutils": "^5.1.0",
-    "@types/escape-html": "^1.0.4",
-    "@types/pnpapi": "^0.0.5",
-    "acorn": "^8.11.2",
-    "acorn-walk": "^8.3.1",
+    "@ampproject/remapping": "^2.2.0",
+    "@babel/parser": "^7.20.5",
+    "@babel/types": "^7.20.5",
+    "@jridgewell/trace-mapping": "^0.3.17",
+    "@rollup/plugin-alias": "^4.0.2",
+    "@rollup/plugin-commonjs": "^23.0.3",
+    "@rollup/plugin-dynamic-import-vars": "^2.0.1",
+    "@rollup/plugin-json": "^5.0.2",
+    "@rollup/plugin-node-resolve": "15.0.1",
+    "@rollup/plugin-typescript": "^10.0.1",
+    "@rollup/pluginutils": "^5.0.2",
+    "acorn": "^8.8.1",
+    "acorn-walk": "^8.2.0",
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",
-    "convert-source-map": "^2.0.0",
+    "connect-history-api-fallback": "^2.0.0",
+    "convert-source-map": "^1.9.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
     "dep-types": "link:./src/types",
-    "dotenv": "^16.3.1",
-    "dotenv-expand": "^10.0.0",
-    "es-module-lexer": "^1.4.1",
-    "escape-html": "^1.0.3",
-    "estree-walker": "^3.0.3",
+    "dotenv": "^16.0.3",
+    "dotenv-expand": "^9.0.0",
+    "es-module-lexer": "^1.1.0",
+    "estree-walker": "^3.0.1",
     "etag": "^1.8.1",
-    "fast-glob": "^3.3.2",
+    "fast-glob": "^3.2.12",
     "http-proxy": "^1.18.1",
-    "json-stable-stringify": "^1.1.0",
-    "launch-editor-middleware": "^2.6.1",
-    "lightningcss": "^1.22.1",
-    "magic-string": "^0.30.5",
+    "launch-editor-middleware": "^2.6.0",
+    "magic-string": "^0.27.0",
     "micromatch": "^4.0.5",
-    "mlly": "^1.4.2",
+    "mlly": "^0.5.17",
     "mrmime": "^1.0.1",
     "okie": "^1.0.1",
-    "open": "^8.4.2",
+    "open": "^8.4.0",
     "parse5": "^7.1.2",
-    "periscopic": "^4.0.2",
+    "periscopic": "^3.0.4",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "postcss-import": "^15.1.0",
-    "postcss-load-config": "^4.0.2",
+    "postcss-import": "^15.0.1",
+    "postcss-load-config": "^4.0.1",
     "postcss-modules": "^6.0.0",
-    "resolve.exports": "^2.0.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-license": "^3.2.0",
-    "sirv": "^2.0.3",
+    "resolve.exports": "^1.1.0",
+    "sirv": "^2.0.2",
+    "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
-    "strip-ansi": "^7.1.0",
-    "strip-literal": "^2.0.0",
-    "tsconfck": "^3.0.0",
-    "tslib": "^2.6.2",
+    "strip-ansi": "^7.0.1",
+    "strip-literal": "^0.4.2",
+    "tsconfck": "^2.0.1",
+    "tslib": "^2.4.1",
     "types": "link:./types",
-    "ufo": "^1.3.2",
-    "ws": "^8.15.0"
+    "ufo": "^0.8.6",
+    "ws": "^8.11.0"
   },
   "peerDependencies": {
-    "@types/node": "^18.0.0 || >=20.0.0",
+    "@types/node": ">= 14",
     "less": "*",
-    "lightningcss": "^1.21.0",
     "sass": "*",
     "stylus": "*",
     "sugarss": "*",
@@ -153,23 +146,8 @@
     "sugarss": {
       "optional": true
     },
-    "lightningcss": {
-      "optional": true
-    },
     "terser": {
       "optional": true
     }
-  },
-  "scripts": {
-    "dev": "rimraf dist && pnpm run build-bundle -w",
-    "build": "rimraf dist && run-s build-bundle build-types",
-    "build-bundle": "rollup --config rollup.config.ts --configPlugin typescript",
-    "build-types": "run-s build-types-temp build-types-roll build-types-check",
-    "build-types-temp": "tsc --emitDeclarationOnly --outDir temp/node -p src/node",
-    "build-types-roll": "rollup --config rollup.dts.config.ts --configPlugin typescript && rimraf temp",
-    "build-types-check": "tsc --project tsconfig.check.json",
-    "typecheck": "tsc --noEmit",
-    "lint": "eslint --cache --ext .ts src/**",
-    "format": "prettier --write --cache --parser typescript \"src/**/*.ts\""
   }
-}
+}

package/tools/jsview-common.mjs

@@ -3,11 +3,18 @@
 
 import childProcess from 'node:child_process';
 import fs from 'node:fs';
+import https from 'node:https';
 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);
@@ -40,7 +47,9 @@ function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
 
 function parseArguments(requiredUsages = {},
                         optionalUsages = {},
-                        withoutUnparsed = true)
+                        withoutUnparsed = true,
+                        ignoreUnknown = false,
+                        ignoreHelpUsage = false)
 {
   const keySeparator = '|';
   const formatKey = (key) => {
@@ -109,7 +118,8 @@ function parseArguments(requiredUsages = {},
   }
 
   let options = {
-    unparsed: []
+    unparsed: [],
+    argumentsLine: '',
   };
 
   // arg0: node
@@ -129,7 +139,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);
@@ -138,11 +149,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);
     }
@@ -207,6 +220,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');
 
@@ -234,7 +249,7 @@ function getOptions(framework)
   return options;
 }
 
-function getPackageObject(modulePath)
+function loadPackageObject(modulePath)
 {
   const pkgFullFile = path.resolve(modulePath, 'package.json');
   if (!fs.existsSync(pkgFullFile)) {
@@ -246,6 +261,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);
@@ -383,18 +408,68 @@ function makeZip(zipFilePath, password, ...args)
   }
 }
 
+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 extract-zip ' + zipFilePath + ' ' + toDir;
+  execCommand(cmdline);
+}
+
+function getNpmRegistry()
+{
+  return 'https://nexus.cluster.qcast.cn/repository/npm-public';
+}
+
 export {
   askAndAnswer,
   checkNodeVersion,
   cpSync,
+  downloadFileAsync,
   execCommand,
   getOptions,
-  getPackageObject,
+  getNpmRegistry,
   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)