@shijiu/jsview 2.0.999 → 2.0.1002

package/dom/target_core_revision.mjs

@@ -3,8 +3,8 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 1021328,
-  "CoreRevisionAndBranch": "1021328",
+  "CoreRevision": 1021330,
+  "CoreRevisionAndBranch": "1021330",
   "JseRevision": "1.0.881",
   "JseUrl":
     "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r881.jsv.bf42e49e.js"

package/loader/jsview-main.mjs

@@ -1,5 +1,5 @@
-import AppData from '/src/appConfig/app.config'
-import JsViewVendorConfig from "/src/appConfig/jsview.config"
+import AppData from '/src/appConfig/app.config.mjs'
+import JsViewVendorConfig from "/src/appConfig/jsview.config.mjs"
 
 async function main() {
   let JsViewLoader = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.0.999",
+  "version": "2.0.1002",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/tools/jsview-batch-upgrade.mjs

@@ -37,13 +37,13 @@ function main(argv)
     }
 
     // Stage 5
-    if (options.stages.includes(options.stagePixels)) {
-      upgradeStagePixel(options);
+    if (options.stages.includes(options.stageAnimation)) {
+      upgradeStageAnimation(options);
     }
 
     // Stage 6
-    if (options.stages.includes(options.stageAnimation)) {
-      upgradeStageAnimation(options);
+    if (options.stages.includes(options.stagePixels)) {
+      upgradeStagePixel(options);
     }
 
     // Stage 7
@@ -76,8 +76,8 @@ function getOptions(argv)
     stageImportPostfix: '2',
     stageCommonJS: '3',
     stageHashHistory: '4',
-    stagePixels: '5',
-    stageAnimation: '6',
+    stageAnimation: '5',
+    stagePixels: '6',
     stageAudiotrack: '7',
     stageAppConfig: '8',
     stageMainEntry: '9',
@@ -126,11 +126,11 @@ function upgradeStageAlias(options)
     }
 
     let filePath = getImportFilePath(content);
-    if (!filePath || filePath.startsWith('@') == false) {
+    if (!filePath || filePath.startsWith('@/') == false) {
       return content;
     }
 
-    let fixedFilePath = filePath.replace(/^@/, '/src');
+    let fixedFilePath = filePath.replace(/^@\//, '/src/');
     const fixedContent = content.replace(filePath, fixedFilePath);
 
     return fixedContent;
@@ -159,7 +159,7 @@ function upgradeStageImportPostfix(options)
     let fixedFilePath = null;
     if (filePath.startsWith('/')) {
       fixedFilePath = path.resolve(options.projectDir, filePath.replace('/', ''));
-    } else if (filePath.startsWith('@')) {
+    } else if (filePath.startsWith('@/')) {
       fixedFilePath = path.resolve(options.projectDir, 'src', filePath.replace('@/', ''));
     } else {
       fixedFilePath = path.resolve(sourceDir, filePath);
@@ -227,6 +227,17 @@ function upgradeStageHashHistory(options)
   return;
 }
 
+function upgradeStageAnimation(options)
+{
+  const msgPrefix = 'Stage ' + options.stageAnimation;
+  console.info(msgPrefix + ': Upgrading animation...');
+
+  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
+                                  ':onAnimationEnd', '@animationend');
+
+  return ret;
+}
+
 function upgradeStagePixel(options) {
   const msgPrefix = 'Stage ' + options.stagePixels;
   console.info(msgPrefix + ': Upgrading pixels...');
@@ -277,17 +288,6 @@ function upgradeStagePixel(options) {
   return;
 }
 
-function upgradeStageAnimation(options)
-{
-  const msgPrefix = 'Stage ' + options.stageAnimation;
-  console.info(msgPrefix + ': Upgrading animation...');
-
-  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
-                                  ':onAnimationEnd', '@animationend');
-
-  return ret;
-}
-
 function upgradeStageAudiotrack(options)
 {
   const msgPrefix = 'Stage ' + options.stageAudiotrack;
@@ -530,12 +530,12 @@ const requiredUsages = {
                             4. Fix hash history.     * createJsvHashHistory
                                                           => jsvCreateHashHistory
 
-                            5. Fix pixels.           * [0-9]px
-                                                          => [0-9], delete (+ \`px\`),(+ 'px'),(+ "px")
-
-                            6. Fix animation.        * :onAnimationEnd
+                            5. Fix animation.        * :onAnimationEnd
                                                           => @animationend
 
+                            6. Fix pixels.           * [0-9]px
+                                                          => [0-9], delete (+ \`px\`),(+ 'px'),(+ "px")
+
                             7. Fix audiotrack.       * <audiotrack
                                                           => <jsv-audiotrack