@shijiu/jsview 1.9.760 → 1.9.779

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

@@ -0,0 +1,155 @@
+import { defineConfig } from 'vite'
+import fs from 'fs'
+import path from 'path'
+import fullReload from 'vite-plugin-full-reload';
+
+// https://vitejs.dev/config/
+const jsviewConfig = defineConfig({
+  assetsInclude: ['**/*.bmp'],
+  build: {
+    assetsInlineLimit: 0,
+    //cssTarget: 'css/', // 未生效
+    commonjsOptions: {
+      include: [
+        /js-binary-schema-parser/,
+        /gifuct-js/,
+        /qr.js/
+      ],
+    },
+    emptyOutDir: true,
+    minify: true,
+    modulePreload: {
+      polyfill: false
+    },
+    rollupOptions: {
+      output: {
+        format: 'esm',
+        entryFileNames: 'js/main.jsv.[hash].js',
+        //chunkFileNames: 'js/[name].[hash].js',
+        chunkFileNames: 'js/chunk.jsv.[hash].js',
+        assetFileNames: (chunkInfo) => chunkInfo.name.endsWith('.css')
+          ? 'css/[name].[hash].css' : 'assets/[name].[hash].[ext]'
+      },
+    },
+    sourcemap: true,
+    target: 'es2022', // 不转译async/await
+  },
+  isCustomElement: (tag) => {
+    return tag == 'fdiv' || tag.startsWith('jsv-')
+  },
+  optimizeDeps: {
+    include: [
+      'gifuct-js',
+      'qr.js'
+    ],
+    exclude: [
+      '@shijiu/jsview/loader/jsview-main.js', // 解决windows上出现解析异常的问题。
+      'jsview',
+      'jsview-vue',
+      'jsview-vue-samples',
+      'jsview-react-samples',
+      'jsview-vue-samples',
+      'node_modules/@shijiu',
+    ],
+  },
+  plugins: [
+    fullReload('node_modules/@shijiu/**/*'),
+  ],
+  resolve: {
+    alias: {
+      // 'jsview': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview'),
+      'jsview-vue': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview-vue'),
+      'jsview-vue-samples': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview-vue-samples'),
+      'jsview-react': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview-react'),
+      'jsview-react-samples': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview-react-samples'),
+      '/js/main.jsv.js': path.resolve(process.cwd(), 'node_modules/@shijiu/jsview/loader/jsview-main.js'),
+    },
+    preserveSymlinks: true
+  },
+  server: {
+    host: true,
+    open: process.platform === "darwin",
+    watch: {
+      ignored: [
+        '!**/node_modules/@shijiu/**',
+      ],
+    }
+  },
+});
+
+function getModuleDir() {
+  const moduleDir = path.resolve(process.cwd(), 'node_modules');
+  return moduleDir;
+}
+
+function ensureFramework(originConfig) {
+  const checkFramework = function (name) {
+    if (name.indexOf('vue') >= 0) {
+      return 'vue';
+    } else if (name.indexOf('react') >= 0) {
+      return 'react';
+    }
+
+    return null;
+
+  };
+
+  let framework = 'unknown';
+  for (const plugins of originConfig.plugins) {
+    if (Array.isArray(plugins)) {
+      for (const plugin of plugins) {
+        framework = checkFramework(plugin.name);
+        if (framework) {
+          break;
+        }
+      }
+    } else {
+      const plugin = plugins;
+      framework = checkFramework(plugin.name);
+    }
+    if (framework) {
+      break;
+    }
+  }
+
+  return framework;
+}
+
+function jsvCreateJsViewViteConfig(originConfig) {
+  let aliasJsView;
+
+  const moduleDir = getModuleDir();
+  const framework = ensureFramework(originConfig);
+  switch (framework) {
+    case 'vue':
+      aliasJsView = path.resolve(moduleDir, '@shijiu/jsview-vue');
+      break;
+    case 'react':
+      aliasJsView = path.resolve(moduleDir, '@shijiu/jsview-react');
+      break;
+    default:
+      throw new Error('JsView Error: Failed to support framework: ' + framework);
+  }
+
+  jsviewConfig.resolve.alias['jsview'] = aliasJsView;
+
+  return jsviewConfig;
+}
+
+function jsvSaveUrlToCache(urls) {
+  if ((urls?.network?.length ?? -1 )<= 0) {
+    console.error("JsView Error: Failed to find network info.");
+    return;
+  }
+
+  const moduleDir = getModuleDir();
+  const urlCacheDir = path.resolve(moduleDir, '.vite', 'jsview')
+  const urlCacheFilePath = path.resolve(urlCacheDir, 'network.mjs')
+  fs.mkdirSync(urlCacheDir, { recursive: true });
+  fs.writeFileSync(urlCacheFilePath, `export default "${urls.network[0]}"`)
+}
+
+export {
+  jsvCreateJsViewViteConfig,
+  jsvSaveUrlToCache,
+}

package/patches/node_modules/vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.9",
+  "version": "4.0.0",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -28,7 +28,6 @@
     "dist",
     "client.d.ts",
     "index.cjs",
-    "src/client",
     "types"
   ],
   "engines": {
@@ -47,87 +46,94 @@
     "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-temp-types patch-types roll-types check-dist-types",
-    "build-temp-types": "tsc --emitDeclarationOnly --outDir temp/node -p src/node",
-    "patch-types": "tsx scripts/patchTypes.ts",
-    "roll-types": "api-extractor run && rimraf temp",
-    "check-dist-types": "tsc --project tsconfig.check.json",
+    "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.14.47",
-    "postcss": "^8.4.16",
+    "esbuild": "^0.16.3",
+    "postcss": "^8.4.19",
     "resolve": "^1.22.1",
-    "rollup": ">=2.75.6 <2.77.0 || ~2.77.0"
+    "rollup": "^3.7.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.0",
-    "@babel/parser": "^7.18.11",
-    "@babel/types": "^7.18.10",
-    "@jridgewell/trace-mapping": "^0.3.15",
-    "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-dynamic-import-vars": "^1.4.4",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "13.3.0",
-    "@rollup/plugin-typescript": "^8.3.4",
-    "@rollup/pluginutils": "^4.2.1",
-    "@vue/compiler-dom": "^3.2.37",
-    "acorn": "^8.8.0",
-    "cac": "^6.7.12",
+    "@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",
     "connect-history-api-fallback": "^2.0.0",
-    "convert-source-map": "^1.8.0",
+    "convert-source-map": "^1.9.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
-    "dotenv": "^14.3.2",
-    "dotenv-expand": "^5.1.0",
-    "es-module-lexer": "^1.0.3",
+    "dep-types": "link:./src/types",
+    "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.2.11",
+    "fast-glob": "^3.2.12",
     "http-proxy": "^1.18.1",
-    "json5": "^2.2.1",
-    "launch-editor-middleware": "^2.5.0",
-    "magic-string": "^0.26.2",
+    "launch-editor-middleware": "^2.6.0",
+    "magic-string": "^0.27.0",
     "micromatch": "^4.0.5",
-    "mlly": "^0.5.12",
+    "mlly": "^0.5.17",
     "mrmime": "^1.0.1",
     "okie": "^1.0.1",
     "open": "^8.4.0",
+    "parse5": "^7.1.2",
     "periscopic": "^3.0.4",
     "picocolors": "^1.0.0",
-    "postcss-import": "^14.1.0",
+    "picomatch": "^2.3.1",
+    "postcss-import": "^15.0.1",
     "postcss-load-config": "^4.0.1",
-    "postcss-modules": "^4.3.1",
+    "postcss-modules": "^6.0.0",
     "resolve.exports": "^1.1.0",
-    "rollup-plugin-license": "^2.8.1",
     "sirv": "^2.0.2",
     "source-map-js": "^1.0.2",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.0.1",
-    "strip-literal": "^0.4.0",
+    "strip-literal": "^0.4.2",
     "tsconfck": "^2.0.1",
-    "tslib": "^2.4.0",
+    "tslib": "^2.4.1",
     "types": "link:./types",
-    "ufo": "^0.8.5",
-    "ws": "^8.8.1"
+    "ufo": "^0.8.6",
+    "ws": "^8.11.0"
   },
   "peerDependencies": {
+    "@types/node": ">= 14",
     "less": "*",
     "sass": "*",
     "stylus": "*",
+    "sugarss": "*",
     "terser": "^5.4.0"
   },
   "peerDependenciesMeta": {
+    "@types/node": {
+      "optional": true
+    },
     "sass": {
       "optional": true
     },
@@ -137,6 +143,9 @@
     "less": {
       "optional": true
     },
+    "sugarss": {
+      "optional": true
+    },
     "terser": {
       "optional": true
     }

package/patches/node_modules/vue-router/dist/vue-router.mjs

@@ -1,5 +1,5 @@
 /*!
-  * vue-router v4.1.4
+  * vue-router v4.1.6
   * (c) 2022 Eduardo San Martin Morote
   * @license MIT
   */
@@ -1349,7 +1349,14 @@ function createRouterMatcher(routes, globalOptions) {
             // if (parent && isAliasRecord(originalRecord)) {
             //   parent.children.push(originalRecord)
             // }
-            insertMatcher(matcher);
+            // Avoid adding a record that doesn't display anything. This allows passing through records without a component to
+            // not be reached and pass through the catch all route
+            if ((matcher.record.components &&
+                Object.keys(matcher.record.components).length) ||
+                matcher.record.name ||
+                matcher.record.redirect) {
+                insertMatcher(matcher);
+            }
         }
         return originalMatcher
             ? () => {
@@ -1407,6 +1414,13 @@ function createRouterMatcher(routes, globalOptions) {
                 throw createRouterError(1 /* ErrorTypes.MATCHER_NOT_FOUND */, {
                     location,
                 });
+            // warn if the user is passing invalid params so they can debug it better when they get removed
+            if ((process.env.NODE_ENV !== 'production')) {
+                const invalidParams = Object.keys(location.params || {}).filter(paramName => !matcher.keys.find(k => k.name === paramName));
+                if (invalidParams.length) {
+                    warn(`Discarded invalid param(s) "${invalidParams.join('", "')}" when navigating. See https://github.com/vuejs/router/blob/main/packages/router/CHANGELOG.md#414-2022-08-22 for more details.`);
+                }
+            }
             name = matcher.record.name;
             params = assign(
             // paramsFromLocation is a new object
@@ -1566,11 +1580,11 @@ function isSameParam(a, b) {
 function checkSameParams(a, b) {
     for (const key of a.keys) {
         if (!key.optional && !b.keys.find(isSameParam.bind(null, key)))
-            return warn(`Alias "${b.record.path}" and the original record: "${a.record.path}" should have the exact same param named "${key.name}"`);
+            return warn(`Alias "${b.record.path}" and the original record: "${a.record.path}" must have the exact same param named "${key.name}"`);
     }
     for (const key of b.keys) {
         if (!key.optional && !a.keys.find(isSameParam.bind(null, key)))
-            return warn(`Alias "${b.record.path}" and the original record: "${a.record.path}" should have the exact same param named "${key.name}"`);
+            return warn(`Alias "${b.record.path}" and the original record: "${a.record.path}" must have the exact same param named "${key.name}"`);
     }
 }
 /**
@@ -1590,7 +1604,7 @@ function checkChildMissingNameWithEmptyPath(mainNormalizedRecord, parent) {
 function checkMissingParamsInAbsolutePath(record, parent) {
     for (const key of parent.keys) {
         if (!record.keys.find(isSameParam.bind(null, key)))
-            return warn(`Absolute path "${record.record.path}" should have the exact same param named "${key.name}" as its parent "${parent.record.path}".`);
+            return warn(`Absolute path "${record.record.path}" must have the exact same param named "${key.name}" as its parent "${parent.record.path}".`);
     }
 }
 function isRecordChildOf(record, parent) {
@@ -2198,6 +2212,9 @@ function useLink(props) {
             }, { flush: 'post' });
         }
     }
+    /**
+     * NOTE: update {@link _RouterLinkI}'s `$slots` type when updating this
+     */
     return {
         route,
         href: computed(() => route.value.href),

package/patches/node_modules/vue-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-router",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "main": "index.js",
   "unpkg": "dist/vue-router.global.js",
   "jsdelivr": "dist/vue-router.global.js",
@@ -55,7 +55,7 @@
     "attributes": "vetur/attributes.json"
   },
   "dependencies": {
-    "@vue/devtools-api": "^6.1.4"
+    "@vue/devtools-api": "^6.4.5"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.29.2",
@@ -66,21 +66,21 @@
     "@sucrase/jest-plugin": "^2.1.1",
     "@types/jest": "^27.4.1",
     "@types/jsdom": "^16.2.13",
-    "@types/nightwatch": "^2.3.3",
+    "@types/nightwatch": "^2.3.12",
     "@vitejs/plugin-vue": "^2.3.3",
-    "@vue/compiler-sfc": "^3.2.31",
-    "@vue/server-renderer": "^3.2.37",
-    "@vue/test-utils": "^2.0.2",
+    "@vue/compiler-sfc": "^3.2.41",
+    "@vue/server-renderer": "^3.2.41",
+    "@vue/test-utils": "^2.2.0",
     "browserstack-local": "^1.4.5",
-    "chromedriver": "^102.0.0",
+    "chromedriver": "^106.0.1",
     "connect-history-api-fallback": "^1.6.0",
     "conventional-changelog-cli": "^2.1.1",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.0.3",
     "faked-promise": "^2.2.2",
-    "geckodriver": "^3.0.2",
+    "geckodriver": "^3.2.0",
     "jest": "^27.5.1",
     "jest-mock-warn": "^1.1.0",
-    "nightwatch": "^2.3.0",
+    "nightwatch": "^2.4.1",
     "nightwatch-helpers": "^1.2.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.78.0",
@@ -88,8 +88,8 @@
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.32.1",
     "typescript": "~4.7.4",
-    "vite": "^2.9.9",
-    "vue": "^3.2.37"
+    "vite": "^3.1.8",
+    "vue": "^3.2.41"
   },
   "scripts": {
     "dev": "jest --watch",

package/tools/jsview-common.js

@@ -0,0 +1,169 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+function parseArguments(beginWithHyphen = true)
+{
+  let options = {
+    unparsed: []
+  };
+
+  // arg0: node
+  // arg1: script.js
+  const arguList = process.argv.slice(2);
+  for (const argu of arguList) {
+    let [key, value] = argu.split('=');
+    if (argu.includes('=') == false) {
+      value = true;
+    }
+    if (key.startsWith('-') == false) {
+      if (beginWithHyphen) {
+        console.error('Failed to parse argument: ' + argu);
+        process.exit(1);
+      } else {
+        options.unparsed.push(key);
+        continue;
+      }
+    }
+
+    let formattedKey = key.replace(/^-*/, '');
+    formattedKey = formattedKey.replace(/-(.)/g, (x) => x[1].toUpperCase())
+ 
+    let formattedValue = value;
+    if (value === undefined
+    || value === null
+    || value === 'undefined'
+    || value === 'null'
+    || value === '') {
+      formattedValue = null;
+    }
+
+    options[formattedKey] = formattedValue;
+  }
+
+  return options;
+}
+
+/**************************************************
+ * jsview-test-project
+ * ├── dist
+ * │   ├── debug
+ * │   │   └── map
+ * │   └── js
+ * ├── node_modules
+ * │   ├── .vite
+ * │   │   └── jsview
+ * │   ├── @shijiu
+ * │   │   ├── jsview -> ../../../../@shijiu/jsview
+ * │   │   │   ├── dom
+ * │   │   │   │   ├── bin
+ * │   │   │   │   ├── code
+ * │   │   │   ├── loader
+ * │   │   │   ├── patches
+ * │   │   │   │   └── node_modules
+ * │   │   │   ├── tools
+ * │   │   ├── jsview-vue -> ../../../../@shijiu/jsview-vue
+ * │   │   │   └── utils
+ * │   │   └── jsview-vue-samples -> ../../../../@shijiu/jsview-vue-samples
+ * └── src
+ *     └── appConfig
+**************************************************/
+function getOptions(framework)
+{
+  const options = {};
+
+  options.projectDir = process.cwd();
+
+  options.modulesDir = path.resolve(options.projectDir, 'node_modules');
+  options.jsviewDir = path.resolve(options.modulesDir, '@shijiu', 'jsview');
+  options.jsviewPatchesDir = path.resolve(options.jsviewDir, 'patches');
+  options.jsviewPatchModulesDir = path.resolve(options.jsviewPatchesDir, 'node_modules');
+  options.jsviewToolsDir = path.resolve(options.jsviewDir, 'tools');
+  options.jsviewRevisionFile = path.resolve(options.jsviewDir, 'dom', 'target_core_revision.mjs');
+
+  options.jsviewVueDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-vue');
+  options.jsviewReactDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-react');
+  if (framework) {
+    options.jsviewFrameworkDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-' + framework);
+  }
+
+  options.appConfigDir = path.resolve(options.projectDir, 'src', 'appConfig');
+
+  options.distDir = path.resolve(options.projectDir, 'dist');
+  options.distJsDir = path.resolve(options.distDir, 'js');
+  options.distDebugDir = path.resolve(options.distDir, 'debug');
+  options.distDebugMapDir = path.resolve(options.distDebugDir, 'map');
+
+  const cacheName = (framework == 'vue' ? '.vite' : '.cache');
+  options.cacheDir = path.resolve(options.modulesDir, cacheName);
+  options.baseUrlFile = path.resolve(options.cacheDir, 'jsview', 'network.mjs');
+
+  return options;
+}
+
+function getPackageObject(modulePath)
+{
+  const pkgFullFile = path.resolve(modulePath, 'package.json');
+  if (!fs.existsSync(pkgFullFile)) {
+    console.error('Error: Failed to get ' + modulePath + ', file is not exists.');
+    process.exit(1);
+  }
+  const pkgObj = require(pkgFullFile);
+
+  return pkgObj;
+}
+
+function cpSync(workDir, src, dest, ignore=[])
+{
+  const exists = fs.existsSync(src);
+  const stats = exists && fs.statSync(src);
+  const isDirectory = exists && stats.isDirectory();
+  if (isDirectory) {
+    if (fs.existsSync(dest) == false) {
+      fs.mkdirSync(dest);
+    }
+    const childFileNames = fs.readdirSync(src);
+    for (const childName of childFileNames) {
+      cpSync(
+        workDir,
+        path.join(src, childName),
+        path.join(dest, childName),
+        ignore
+      );
+    };
+  } else {
+    const filename = path.basename(src);
+    if (ignore && ignore.includes(filename)) {
+      return;
+    }
+    console.info(
+      '  ' + path.relative(workDir, src) + ' -> ' + path.relative(workDir, dest)
+    );
+    fs.copyFileSync(src, dest);
+  }
+}
+
+function rmSync(path)
+{
+  fs.rmSync(path, { recursive: true, force: true });
+}
+
+function symlinkSync(target, to)
+{
+  rmSync(to);
+
+  const targetPath = path.relative(path.dirname(to), target);
+
+  fs.symlinkSync(targetPath, to, 'dir');
+}
+
+module.exports = {
+  cpSync,
+  getOptions,
+  getPackageObject,
+  parseArguments,
+  rmSync,
+  symlinkSync,
+}