@shijiu/jsview 2.0.999 → 2.0.1021

package/dom/target_core_revision.mjs

@@ -3,17 +3,15 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 1021328,
-  "CoreRevisionAndBranch": "1021328",
-  "JseRevision": "1.0.881",
+  "CoreRevision": 1021336,
+  "CoreRevisionAndBranch": "1021336",
+  "JseRevision": "1.0.882",
   "JseUrl":
-    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r881.jsv.bf42e49e.js"
+    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r882.jsv.1f7c4fd1.js"
 };
 
 // 版本是否存在测试方法
 // 启动参数的UpdateUrl + CoreRevisionAndBranch 
 // 例如: https://launcher.cluster.qcast.cn/jsview/version/1021047_release_build_js2c
 
-// 不要用export default，update-env脚本不能解析
-// module.exports = TargetRevision;
 export default TargetRevision;

package/loader/jsview-loader.js

@@ -83,7 +83,7 @@ export default class JsViewLoader {
       window.JsView.addKeysMap(this.#config.vendorConfig.bindKeys);
 
       // (可选配置)localStorage支持
-      window.JsView.setStorageDomain(appName); // Domain为app包名
+      window.JsView.setStorageDomain(this.#config.jsviewConfig.localStorage.domain??appName); // Domain为app包名
       
       const localStorageKeys = this.#config.jsviewConfig.localStorage.presetKeys;
       window.JsView.enableStorageNames(...localStorageKeys);

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.1021",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/tools/jsview-batch-upgrade.mjs

@@ -17,48 +17,43 @@ function main(argv)
     const options = getOptions(argv);
 
     // Stage 1
+    if (options.stages.includes(options.stageAppConfig)) {
+      upgradeStageAppConfig(options);
+    }
+
+    // Stage 2
     if (options.stages.includes(options.stageAlias)) {
       upgradeStageAlias(options);
     }
 
-    // Stage 2
+    // Stage 3
     if (options.stages.includes(options.stageImportPostfix)) {
       upgradeStageImportPostfix(options);
     }
 
-    // Stage 3
+    // Stage 4
     if (options.stages.includes(options.stageCommonJS)) {
       upgradeStageCommonJS(options);
     }
 
-    // Stage 4
+    // Stage 5
     if (options.stages.includes(options.stageHashHistory)) {
       upgradeStageHashHistory(options);
     }
 
-    // Stage 5
-    if (options.stages.includes(options.stagePixels)) {
-      upgradeStagePixel(options);
-    }
-
     // Stage 6
     if (options.stages.includes(options.stageAnimation)) {
       upgradeStageAnimation(options);
     }
 
     // Stage 7
-    if (options.stages.includes(options.stageAudiotrack)) {
-      upgradeStageAudiotrack(options);
+    if (options.stages.includes(options.stageJsvAudio)) {
+      upgradeStageJsvAudio(options);
     }
 
     // Stage 8
-    if (options.stages.includes(options.stageAppConfig)) {
-      upgradeStageAppConfig(options);
-    }
-
-    // Stage 9
-    if (options.stages.includes(options.stageMainEntry)) {
-      upgradeStageMainEntry(options);
+    if (options.stages.includes(options.stagePixels)) {
+      upgradeStagePixel(options);
     }
   } catch (ex) {
     console.error('JsView Error: Failed to update jsview source!');
@@ -72,15 +67,14 @@ function main(argv)
 function getOptions(argv)
 {
   const options = {
-    stageAlias: '1',
-    stageImportPostfix: '2',
-    stageCommonJS: '3',
-    stageHashHistory: '4',
-    stagePixels: '5',
+    stageAppConfig: '1',
+    stageAlias: '2',
+    stageImportPostfix: '3',
+    stageCommonJS: '4',
+    stageHashHistory: '5',
     stageAnimation: '6',
-    stageAudiotrack: '7',
-    stageAppConfig: '8',
-    stageMainEntry: '9',
+    stageJsvAudio: '7',
+    stagePixels: '8',
   };
 
   options.projectDir = process.cwd();
@@ -115,6 +109,29 @@ function getOptions(argv)
   return options;
 }
 
+function upgradeStageAppConfig(options)
+{
+  const msgPrefix = 'Stage ' + options.stageAppConfig;
+  console.info(msgPrefix + ': Upgrading appConfig...');
+
+
+  const appConfigDir = path.resolve(options.upgradeDir, 'appConfig');
+  if (fs.existsSync(appConfigDir) == false) {
+    console.error(msgPrefix + ': Failed to upgrading appConfig, appConfig folder is not found.');
+    process.exit(1);
+  }
+
+  const appConfigFilePath = path.resolve(appConfigDir, 'app_config.json');
+
+  renameStageFile(options, [ appConfigFilePath ], msgPrefix,
+                  [ 'app_config.json' ], 'app.config.mjs');
+
+  renameStageFile(options, [ appConfigFilePath ], msgPrefix,
+                  [ 'jsview.config.js' ], 'jsview.config.mjs');
+
+  return;
+}
+
 function upgradeStageAlias(options)
 {
   const msgPrefix = 'Stage ' + options.stageAlias;
@@ -126,11 +143,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 +176,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 +244,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...');
@@ -260,8 +288,6 @@ function upgradeStagePixel(options) {
     'top',
     'width',
 
-    'borderRadius',
-
     'fontSize',
     'lineHeight',
   ];
@@ -277,70 +303,19 @@ 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)
+function upgradeStageJsvAudio(options)
 {
-  const msgPrefix = 'Stage ' + options.stageAudiotrack;
-  console.info(msgPrefix + ': Upgrading audiotrack...');
-
-  replaceStageContent(options, options.sourcePathList, msgPrefix,
-                      '<audiotrack', '<jsv-audiotrack');
+  const msgPrefix = 'Stage ' + options.stageJsvAudio;
+  console.info(msgPrefix + ': Upgrading jsv audio...');
 
-  return;
-}
+  const amendJsvAudio = function(content) {
+    let fixedContent = content.replace('<audiotrack', '<jsv-audiotrack');
+    fixedContent = fixedContent.replace(/import *JsvAudio *from.*/, "import { JsvAudio } from 'jsview'");
 
-function upgradeStageAppConfig(options)
-{
-  const msgPrefix = 'Stage ' + options.stageAppConfig;
-  console.info(msgPrefix + ': Upgrading appConfig...');
-
-
-  const appConfigDir = path.resolve(options.upgradeDir, 'appConfig');
-  if (fs.existsSync(appConfigDir) == false) {
-    console.error(msgPrefix + ': Failed to upgrading appConfig, appConfig folder is not found.');
-    process.exit(1);
-  }
-
-  const appConfigFilePath = path.resolve(appConfigDir, 'app_config.json');
-
-  removeStageFile(options, [ appConfigFilePath ], msgPrefix,
-                  [ 'app_config.json' ], 'app.config.json');
-
-  const sourcePathList = getFilesRecursive(appConfigDir);
-
-  removeStageFile(options, sourcePathList, msgPrefix,
-                  [ '.js', '.json' ], '.mjs');
-
-  return;
-}
-
-function upgradeStageMainEntry(options)
-{
-  const msgPrefix = 'Stage ' + options.stageMainEntry;
-  console.info(msgPrefix + ': Upgrading main entry...');
-
-  const mainEntryFilePath = path.resolve(options.upgradeDir, 'main.ts');
-  const fixedMainEntryFilePath = path.resolve(options.upgradeDir, 'main.tsx');
-  if (fs.existsSync(mainEntryFilePath) == false) {
-    if (fs.existsSync(fixedMainEntryFilePath)) {
-      return 0;
-    }
-    console.error(msgPrefix + ': Failed to upgrading main entry, main.ts is not found.');
-    process.exit(1);
+    return fixedContent;
   }
 
-  removeStageFile(options, [ mainEntryFilePath ], msgPrefix,
-                  [ 'main.ts' ], 'main.tsx');
+  processSourceLineByLine(options, options.sourcePathList, msgPrefix, amendJsvAudio);
 
   return;
 }
@@ -426,7 +401,7 @@ function replaceStageContent(options, sourcePathList, msgPrefix,
   return;
 }
 
-function removeStageFile(options, sourcePathList, msgPrefix,
+function renameStageFile(options, sourcePathList, msgPrefix,
                          fromExtNameList, toExtName)
 {
   for (const filePath of sourcePathList) {
@@ -445,13 +420,13 @@ function removeStageFile(options, sourcePathList, msgPrefix,
     fs.renameSync(filePath, toFilePath)
 
     // json => mjs
-    if (fromExtName == '.json') {
+    if (fromExtName.endsWith('.json')) {
       const content = fs.readFileSync(toFilePath, 'utf8');
-      const fixedContent = 'export default ' + content;
+      const fixedContent = 'export default ' + content.replaceAll(/"([^"]+)":/g, '$1:');
       fs.writeFileSync(toFilePath, fixedContent, 'utf8');
     }
 
-    console.info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath));
+    console.info(msgPrefix + ': Upgraded ' + path.relative(options.projectDir, filePath) + ' => ' + path.relative(options.projectDir, toFilePath));
   }
 
   return;
@@ -512,38 +487,40 @@ function processSourceLineByLine(options, sourcePathList, msgPrefix, processor)
 const requiredUsages = {
   '--stages': `Upgrade stages, separate by comma(,). The value means the following:
 
-                            1. Fix alias: @.         * import App from '@/App'
-                                                          => import App from '/src/App'
-
-                            2. Fix import postfix.   * import somemodule from 'somemodule'
-                                                          => import somemodule from 'somemodule[.js|.vue|/index.js|/index.vue]',
-                                                     * import('somemodule')
-                                                          => import('somemodule[.js|.vue|/index.js|/index.vue]')
+                            1. Fix appConfig.       * app_config.json 
+                                                         => app.config.mjs
+                                                    * jsview.config.js
+                                                         => jsview.config.mjs
 
-                            3. Fix commonjs.         * const somemodule = require('somemodule')
-                                                          => import somemodule from 'somemodule',
-                                                     * module.exports = somemodule
-                                                          => export default somemodule
-                                                     * module.exports = {}
-                                                          => export {}
+                            2. Fix alias: @.        * import App from '@/App'
+                                                         => import App from '/src/App'
 
-                            4. Fix hash history.     * createJsvHashHistory
-                                                          => jsvCreateHashHistory
+                            3. Fix import postfix.  * import somemodule from 'somemodule'
+                                                         => import somemodule from 'somemodule[.js|.vue|/index.js|/index.vue]',
+                                                    * import('somemodule')
+                                                         => import('somemodule[.js|.vue|/index.js|/index.vue]')
 
-                            5. Fix pixels.           * [0-9]px
-                                                          => [0-9], delete (+ \`px\`),(+ 'px'),(+ "px")
+                            4. Fix commonjs.        * const somemodule = require('somemodule')
+                                                         => import somemodule from 'somemodule',
+                                                    * module.exports = somemodule
+                                                         => export default somemodule
+                                                    * module.exports = {}
+                                                         => export {}
 
-                            6. Fix animation.        * :onAnimationEnd
-                                                          => @animationend
+                            5. Fix hash history.    * createJsvHashHistory
+                                                         => jsvCreateHashHistory
 
-                            7. Fix audiotrack.       * <audiotrack
-                                                          => <jsv-audiotrack
+                            6. Fix animation.       * :onAnimationEnd
+                                                         => @animationend
 
-                            8. Fix appConfig.        * xxx.config.js
-                                                          => xxx.config.mjs
+                            7. Fix jsv-audio.       * <audiotrack>
+                                                         => <jsv-audiotrack>
+                                                    * import JsvPlayer from 'jsview'
+                                                         => import { JsvPlayer } from 'jsview'
 
-                            9. Fix main.ts.          * main.ts
-                                                          => main.tsx`,
+                            8. Fix pixels.          * [left, top, width, height, fontSize, lineHeight]="00px"
+                                                         => [left, top, width, height, fontSize, lineHeight]=00
+              `
 };
 const optionalUsages = {
   '--dir': 'Upgrade directory, default is [src].',

package/tools/jsview-common.mjs

@@ -331,6 +331,18 @@ function askAndAnswer(question)
   return answer;
 }
 
+function readJsonFile(filePath) {
+  try {
+    const pkgJsonContent = fs.readFileSync(filePath, 'utf8');
+    const pkgJsonObj = JSON.parse(pkgJsonContent);
+
+    return pkgJsonObj;
+  } catch (ex) {
+  }
+
+  return null;
+}
+
 export {
   askAndAnswer,
   checkNodeVersion,
@@ -340,6 +352,7 @@ export {
   getPackageObject,
   isSymlinkSync,
   parseArguments,
+  readJsonFile,
   rmSync,
   symlinkSync,
 }