@shijiu/jsview 1.9.914 → 1.9.921

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,16 +166,27 @@ 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...');
 
-  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                                  /([0-9}])px/g, '$1');
-  return ret;
+  // 过滤 (+ 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');
+  // 过滤 ('${00}px'), ("${00}px"), (`${00}px`), ( ' ${00}px ') 等
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /['"`]*(\${.*?})px *['"`]*/g, '$1');
+
+  return;
 }
 
 function upgradeStageAnimation(options)
@@ -193,10 +205,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)
@@ -204,10 +216,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)
@@ -262,7 +274,7 @@ function upgradeStageImportPostfix(options)
     console.info(msgPrefix + ': Upgraded ' + path.relative(options.rootDir, filePath));
   }
 
-  return 0;
+  return;
 }
 
 function upgradeStageAppConfig(options)
@@ -279,19 +291,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)
@@ -309,10 +317,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)
@@ -367,7 +375,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}]"
+                            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"