@shijiu/jsview 1.9.921 → 1.9.931

package/patches/node_modules/@vue/compiler-dom/package.json

@@ -0,0 +1,43 @@
+{
+  "name": "@vue/compiler-dom",
+  "version": "3.2.45",
+  "description": "@vue/compiler-dom",
+  "main": "index.js",
+  "module": "dist/compiler-dom.esm-bundler.js",
+  "types": "dist/compiler-dom.d.ts",
+  "unpkg": "dist/compiler-dom.global.js",
+  "jsdelivr": "dist/compiler-dom.global.js",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "sideEffects": false,
+  "buildOptions": {
+    "name": "VueCompilerDOM",
+    "compat": true,
+    "formats": [
+      "esm-bundler",
+      "esm-browser",
+      "cjs",
+      "global"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/core.git",
+    "directory": "packages/compiler-dom"
+  },
+  "keywords": [
+    "vue"
+  ],
+  "author": "Evan You",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vuejs/core/issues"
+  },
+  "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-dom#readme",
+  "dependencies": {
+    "@vue/shared": "3.2.45",
+    "@vue/compiler-core": "3.2.45"
+  }
+}

package/patches/node_modules/@vue/runtime-dom/dist/runtime-dom.esm-bundler.js

@@ -333,6 +333,23 @@ function parseName(name) {
             options[m[0].toLowerCase()] = true;
         }
     }
+// JsView Added >>>
+// 处理自定义的 addEventListener() options, 前缀为jsv
+// onJsvXxx留给自定义Event，这样判断防止出现下面写法
+// :jsvevent.jsvoption1.jsvoption2 => onJsvEventJsvOption1JsvOption2
+    if (name.lastIndexOf('Jsv') > 2) {
+        options = options ?? {};
+
+        const optNames = name.substring(3); // 过滤掉jsvEvent
+        const optArray = optNames.split('Jsv');
+        // optArray[0] 为EventName部分内容
+        for (let idx = optArray.length - 1; idx > 0; idx--) {
+            const optName = 'jsv' + optArray[idx];
+            options[optName] = true;
+            name = name.slice(0, name.length - optName.length);
+        }
+    }
+// JsView Added <<<
     const event = name[2] === ':' ? name.slice(3) : hyphenate(name.slice(2));
     return [event, options];
 }

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

@@ -34,8 +34,8 @@ const jsviewConfig = defineConfig({
           'export-sfc': ['\0plugin-vue:export-helper'], // 将_export_sfc独立出来，防止被集成在jsview-vue中导致import deadloop.
           'vue': ['vue'], // 将vue独立出来，防止被集成在main.js中导致import deadloop.
           // 将dom-entry和forge-define分割出来，防止被集成在main.js中导致import deadloop.
-          'forge-define': ['@shijiu/jsview/dom/jsv-forge-define.mjs'],
-          'jsivew-dom-entry': ['@shijiu/jsview/dom/index.mjs'], 
+          // 'forge-define': ['@shijiu/jsview/dom/jsv-forge-define.mjs'],
+          // 'jsivew-dom-entry': ['@shijiu/jsview/dom/index.mjs'], 
         },
       },
     },

package/tools/jsview-batch-upgrade.mjs

@@ -176,15 +176,45 @@ function upgradeStagePixel(options) {
   // 过滤 (+ px), (+ 'px'), (+ "px"), (+ `px`), ( + ' px ') 等
   replaceStageContent(options, options.sourcePathList, msgPrefix,
                       / *\+ ['"`]* *px *['"`]*/g, '');
-  // 过滤 (00px), ('00px'), ("00px"), (`00px`), ('00px') 等
-  replaceStageContent(options, options.sourcePathList, msgPrefix,
-                      /['"`]*([0-9]+)px['"`]*/g, '$1');
   // 过滤 (' 00px '), (" 00px "), (` 00px `), ('00px ') 等
   replaceStageContent(options, options.sourcePathList, msgPrefix,
-                      /['"`] *([0-9]+)px *['"`]/g, '$1');
+                      /' *([0-9]+)px *'/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /" *([0-9]+)px *"/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /` *([0-9]+)px *`/g, '$1');
   // 过滤 ('${00}px'), ("${00}px"), (`${00}px`), ( ' ${00}px ') 等
   replaceStageContent(options, options.sourcePathList, msgPrefix,
                       /['"`]*(\${.*?})px *['"`]*/g, '$1');
+  // 过滤 (00px), ('00px'), ("00px"), (`00px`), ('00px') 等
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /'([0-9]+)px'/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /"([0-9]+)px"/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /`([0-9]+)px`/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /([0-9]+)px/g, '$1');
+
+  const numberStyleList = [
+    'height',
+    'left',
+    'top',
+    'width',
+
+    'borderRadius',
+
+    'fontSize',
+    'lineHeight',
+  ];
+
+  for (const numberStyle of numberStyleList) {
+    const regExp = new RegExp(`:${numberStyle}=['"\`] *([0-9]+) *['"\`]`, 'g');
+    const toValue = `:${numberStyle}=$1`;
+
+    replaceStageContent(options, options.sourcePathList, msgPrefix,
+                        regExp, toValue);
+  }
 
   return;
 }
@@ -242,7 +272,12 @@ function upgradeStageImportPostfix(options)
 
     let fixedContent = content;
 
-    const importFilePath = path.resolve(currentDir, importFromFile);
+    let importFilePath = null;
+    if (importFromFile.startsWith('@')) {
+      importFilePath = path.resolve(options.rootDir, 'src', importFromFile.replace('@/', ''));
+    } else {
+      importFilePath = path.resolve(currentDir, importFromFile);
+    }
     if (fs.existsSync(importFilePath + '.js')) {
       // 执行到此处，则需要给给import的文件加上js尾缀。当同时存在.js和.vue时，.js优先。
       fixedContent = content.replace(importFromFile, importFromFile + '.js');

package/tools/jsview-post-install.mjs

@@ -197,6 +197,7 @@ function main(argv)
   switch (argv.framework) {
     case 'vue':
       pkgNeedPatch = [
+        '@vue/compiler-dom',
         '@vue/compiler-sfc',
         '@vue/runtime-core',
         '@vue/runtime-dom',