@shijiu/jsview 1.9.915 → 1.9.931

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

@@ -33,6 +33,9 @@ const jsviewConfig = defineConfig({
         manualChunks: {
           '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'], 
         },
       },
     },

package/tools/jsview-batch-upgrade.mjs

@@ -25,6 +25,7 @@ function getOptions(argv)
 
   const scriptPath = path.resolve(process.cwd(), process.argv[1]);
   options.rootDir = scriptPath.replaceAll(/node_modules\/@shijiu\/jsview.*/g, '');
+  options.rootDir = options.rootDir.replaceAll(/node_modules\\@shijiu\\jsview.*/g, ''); // for windows
 
   options.stages = argv.stages?.split(',') ?? [];
 
@@ -134,7 +135,7 @@ function replaceStageContent(options, sourcePathList, msgPrefix,
     console.info(msgPrefix + ': Upgraded ' + path.relative(options.rootDir, filePath));
   }
 
-  return 0;
+  return;
 }
 
 function removeStageFile(options, sourcePathList, msgPrefix,
@@ -165,28 +166,57 @@ function removeStageFile(options, sourcePathList, msgPrefix,
     console.info(msgPrefix + ': Upgraded ' + path.relative(options.rootDir, filePath));
   }
 
-  return 0;
+  return;
 }
 
 function upgradeStagePixel(options) {
   const msgPrefix = 'Stage ' + options.stagePixels;
   console.info(msgPrefix + ': Upgrading pixels...');
 
-  let ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                                /([0-9}])px/g, '$1');
-  if (ret < 0) {
-    console.error(msgPrefix + ': Failed to upgrading pixels.');
-    process.exit(1);
-  }
+  // 过滤 (+ px), (+ 'px'), (+ "px"), (+ `px`), ( + ' px ') 等
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      / *\+ ['"`]* *px *['"`]*/g, '');
+  // 过滤 (' 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');
+  // 过滤 ('${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',
+  ];
 
-  ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                            '+ `px`', '');
-  ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                            '+ \'px\'', '');
-  ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                            '+ \"px\"', '');
+  for (const numberStyle of numberStyleList) {
+    const regExp = new RegExp(`:${numberStyle}=['"\`] *([0-9]+) *['"\`]`, 'g');
+    const toValue = `:${numberStyle}=$1`;
 
-  return ret;
+    replaceStageContent(options, options.sourcePathList, msgPrefix,
+                        regExp, toValue);
+  }
+
+  return;
 }
 
 function upgradeStageAnimation(options)
@@ -205,10 +235,10 @@ function upgradeStageHashHistory(options)
   const msgPrefix = 'Stage ' + options.stageHashHistory;
   console.info(msgPrefix + ': Upgrading hash history...');
 
-  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                                  'createJsvHashHistory', 'jsvCreateHashHistory');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      'createJsvHashHistory', 'jsvCreateHashHistory');
 
-  return ret;
+  return;
 }
 
 function upgradeStageAudiotrack(options)
@@ -216,10 +246,10 @@ function upgradeStageAudiotrack(options)
   const msgPrefix = 'Stage ' + options.stageAudiotrack;
   console.info(msgPrefix + ': Upgrading audiotrack...');
 
-  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                                  '<audiotrack', '<jsv-audiotrack');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      '<audiotrack', '<jsv-audiotrack');
 
-  return ret;
+  return;
 }
 
 function upgradeStageImportPostfix(options)
@@ -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');
@@ -274,7 +309,7 @@ function upgradeStageImportPostfix(options)
     console.info(msgPrefix + ': Upgraded ' + path.relative(options.rootDir, filePath));
   }
 
-  return 0;
+  return;
 }
 
 function upgradeStageAppConfig(options)
@@ -291,19 +326,15 @@ function upgradeStageAppConfig(options)
 
   const appConfigFilePath = path.resolve(appConfigDir, 'app_config.json');
 
-  let ret = removeStageFile(options, [ appConfigFilePath ], msgPrefix,
-                            [ 'app_config.json' ], 'app.config.json');
-  if (ret < 0) {
-    console.error(msgPrefix + ': Failed to upgrading app config file, is not found.');
-    process.exit(1);
-  }
+  removeStageFile(options, [ appConfigFilePath ], msgPrefix,
+                  [ 'app_config.json' ], 'app.config.json');
 
   const sourcePathList = getFilesRecursive(appConfigDir);
 
-  ret = removeStageFile(options, sourcePathList, msgPrefix,
-                              [ '.js', '.json' ], '.mjs');
+  removeStageFile(options, sourcePathList, msgPrefix,
+                  [ '.js', '.json' ], '.mjs');
 
-  return ret;
+  return;
 }
 
 function upgradeStageMainEntry(options)
@@ -321,10 +352,10 @@ function upgradeStageMainEntry(options)
     process.exit(1);
   }
 
-  const ret = removeStageFile(options, [ mainEntryFilePath ], msgPrefix,
-                              [ 'main.ts' ], 'main.tsx');
+  removeStageFile(options, [ mainEntryFilePath ], msgPrefix,
+                  [ 'main.ts' ], 'main.tsx');
 
-  return ret;
+  return;
 }
 
 function main(argv)
@@ -379,7 +410,7 @@ function main(argv)
 
 const requiredUsages = {
   '--stages': `Upgrade stages, separate by comma(,). The value means the following:
-                            1. Fix pixels.          "[0-9}]px => [0-9}]", "delete (+ \`px\`),(+ 'px'),(+ "px")"
+                            1. Fix pixels.          "[0-9]px => [0-9]", "delete (+ \`px\`),(+ 'px'),(+ "px")"
                             2. Fix animation.       ":onAnimationEnd => @animationend"
                             3. Fix hash history.    "createJsvHashHistory => jsvCreateHashHistory"
                             4. Fix audiotrack.      "<audiotrack => <jsv-audiotrack"

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',