@hyext/builder-revues 1.3.3 → 1.4.0

package/dist/index.js

@@ -19,6 +19,7 @@ var glob = require('glob');
 var handlebars = require('handlebars');
 var tapable = require('tapable');
 var axios = require('axios');
+var preload = require('@hyext/preload');
 var liveServer = require('live-server');
 var archiver = require('archiver');
 var R = require('ramda');
@@ -625,6 +626,21 @@ const HOST = {
 // $1是动态的extType
 function getSDKUrlTemplate(opts) {
     return `${opts.isTestEnv ? HOST.test : HOST.prod}/sdk/${opts.extType}/${opts.hostId}/${opts.extUuid || 0}/sdk.js`;
+}
+function tryGetDirectSDKUrl(sdkConfig, extType) {
+    var _a, _b, _c, _d, _e;
+    if (sdkConfig.directSdkUrl && !((_a = sdkConfig.bindSdkInfo) === null || _a === void 0 ? void 0 : _a.existDeliveryRule)) {
+        const diliverSdkUrl = (_e = (_d = (_c = (_b = sdkConfig.bindSdkInfo) === null || _b === void 0 ? void 0 : _b.sdkDetail) === null || _c === void 0 ? void 0 : _c.find) === null || _d === void 0 ? void 0 : _d.call(_c, (xs) => xs.extTypeList.includes(extType))) === null || _e === void 0 ? void 0 : _e.sdkUrl;
+        if (diliverSdkUrl)
+            return diliverSdkUrl;
+    }
+    return null;
+}
+function getSDKUrl(opts) {
+    if (opts.sdkConfig) {
+        return tryGetDirectSDKUrl(opts.sdkConfig, opts.extType) || getSDKUrlTemplate(opts);
+    }
+    return getSDKUrlTemplate(opts);
 }
 
 function isMainPackage(config) {
@@ -693,24 +709,25 @@ function injectNpm(dest, packageName) {
     }
 }
 function genEntrys(props) {
-    const { builderConfig, mainPakConf, extUuid } = props;
+    const { builderConfig, mainPakConf, extUuid, sdkConfig } = props;
     return builderConfig.supportExtTypes.map(extType => {
         const entryFilename = `index_${extType}.html`;
         return {
             extType,
             entryPath: 'package/' + mainPakConf.name + '/' + entryFilename,
-            sdkUrl: getSDKUrlTemplate({
+            sdkUrl: getSDKUrl({
                 extType,
                 extUuid,
                 hostId: builderConfig.hostId,
-                isTestEnv: builderConfig.isTestEnv
+                isTestEnv: builderConfig.isTestEnv,
+                sdkConfig
             }),
             entryFilename
         };
     });
 }
 
-const libVersion = "1.2.0" ;
+const libVersion = "1.3.0" ;
 const libCdn = '//a.msstatic.com/huya/hd/h5/static-source/revue/lib';
 
 function getLibVersion(builderConfig) {
@@ -748,6 +765,21 @@ function checkCdnSourceExist(baseUrl) {
     });
 }
 
+const defualtPreloadConf = {
+    firstScreen: {
+        mode: 'loading',
+    }
+};
+function resolvePreloadCodeByProject(opts) {
+    const staticPath = path__default["default"].join(opts.projectPath, 'static');
+    return preload.resolvePreloadCodeByExtType({
+        // @ts-ignore
+        extInfo: opts.extInfo,
+        preloadEntry: opts.builderConfig.preload || defualtPreloadConf,
+        staticDir: fs__default["default"].existsSync(staticPath) ? staticPath : undefined
+    });
+}
+
 // TODO: 改异步
 // 合并游戏分包到主包
 function mergeGamePackage(releasePath, opts) {
@@ -757,7 +789,8 @@ function mergeGamePackage(releasePath, opts) {
     const entrys = genEntrys({
         builderConfig,
         mainPakConf,
-        extUuid: opts.extInfo.extUuid
+        extUuid: opts.extInfo.extUuid,
+        sdkConfig: opts.sdkConfig
     });
     PluginDriver.hooks.onMergedMainPackge.call({
         mainConf: mainPakConf,
@@ -783,7 +816,7 @@ function renderGame(opts) {
 // mark 热更新 整个函数不会重渲染。
 function renderGameTemplate(opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { releasePath, mainPath, entrys, debug, dev, extInfo, builderConfig } = opts;
+        const { releasePath, mainPath, entrys, debug, dev, extInfo, builderConfig, inputPath } = opts;
         const templatePath = path__default["default"].join(staticPath, 'template');
         const sourcePathPrefix = yield getLibUrl(builderConfig, path__default["default"].relative(mainPath, releasePath));
         const renderConfigList = [
@@ -806,19 +839,15 @@ function renderGameTemplate(opts) {
             });
         }
         const entryRenderConfList = entrys.map(info => {
+            const finalExtInfo = Object.assign(Object.assign({}, extInfo), { envVersion: dev ? 'develop' : 'release', extType: info.extType });
             return {
                 input: path__default["default"].join(templatePath, 'minigame-page-manager.hbs'),
                 output: path__default["default"].join(mainPath, info.entryFilename),
-                data: {
-                    sourcePathPrefix,
-                    hyextSDKUrl: info.sdkUrl,
-                    debug,
-                    sentryScript: dev ? undefined : sentryScriptUrl,
-                    buildEnv: buildEnv,
-                    extInfo: Object.assign(Object.assign({}, extInfo), { envVersion: dev ? 'develop' : 'release', extType: info.extType }),
-                    deviceOrientation: PluginDriver.context.deviceOrientation,
-                    builderConfig: builderConfig
-                }
+                data: Object.assign({ sourcePathPrefix, hyextSDKUrl: info.sdkUrl, debug, sentryScript: dev ? undefined : sentryScriptUrl, buildEnv: buildEnv, extInfo: finalExtInfo, deviceOrientation: PluginDriver.context.deviceOrientation, builderConfig: builderConfig }, resolvePreloadCodeByProject({
+                    builderConfig,
+                    extInfo: finalExtInfo,
+                    projectPath: inputPath
+                }))
             };
         });
         entryRenderConfList.concat(renderConfigList).forEach(config => {
@@ -870,7 +899,8 @@ function mergeMiniprogramPackage(releasePath, opts) {
     const entrys = genEntrys({
         builderConfig,
         mainPakConf,
-        extUuid: opts.extInfo.extUuid
+        extUuid: opts.extInfo.extUuid,
+        sdkConfig: opts.sdkConfig
     });
     PluginDriver.hooks.onMergedMainPackge.call({
         mainConf: mainPakConf,
@@ -878,7 +908,12 @@ function mergeMiniprogramPackage(releasePath, opts) {
         compileType: COMPILE_TYPE.miniProgram,
         extInfo: opts.extInfo
     });
-    return { entrys, mainPublicPath: 'package/' + mainPakConf.name, mainPath, packagePath };
+    return {
+        entrys,
+        mainPublicPath: 'package/' + mainPakConf.name,
+        mainPath,
+        packagePath
+    };
 }
 function renderMiniProgram(opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -892,7 +927,7 @@ function rerenderHTML(opts) {
 }
 function renderMiniprogramTemplate(opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { packagePath, releasePath, mainPath, entrys, debug, dev, extInfo, builderConfig } = opts;
+        const { packagePath, releasePath, inputPath, mainPath, entrys, debug, dev, extInfo, builderConfig } = opts;
         const extConfig = getPackageExtConfig(packagePath);
         const sourcePathPrefix = yield getLibUrl(builderConfig, path__default["default"].relative(mainPath, releasePath));
         const packageExtConfigStr = JSON.stringify(extConfig);
@@ -912,9 +947,7 @@ function renderMiniprogramTemplate(opts) {
                 }
             }
         ];
-        const renderConfigList = [
-            ...htmlRenderConfigList
-        ];
+        const renderConfigList = [...htmlRenderConfigList];
         if (dev) {
             renderConfigList.push({
                 input: path__default["default"].join(templatePath, 'remote-debugger.hbs'),
@@ -926,21 +959,17 @@ function renderMiniprogramTemplate(opts) {
             });
         }
         const entryRenderConfList = entrys.map(info => {
+            const finalExtInfo = Object.assign(Object.assign({}, extInfo), { envVersion: dev ? 'develop' : 'release', version: '', extType: info.extType });
             return {
                 input: path__default["default"].join(templatePath, 'miniapp-page-manager.hbs'),
                 output: path__default["default"].join(mainPath, info.entryFilename),
-                data: {
-                    sourcePathPrefix,
-                    packageExtConfig: packageExtConfigStr,
-                    hyextSDKUrl: info.sdkUrl,
-                    debug,
-                    buildEnv: buildEnv,
-                    isProd: buildEnv != 'dev',
+                data: Object.assign({ sourcePathPrefix, packageExtConfig: packageExtConfigStr, hyextSDKUrl: info.sdkUrl, debug, buildEnv: buildEnv, isProd: buildEnv != 'dev', 
                     // sentryScript: dev ? undefined : sentryScriptUrl,
-                    sentryScript: sentryScriptUrl,
-                    extInfo: Object.assign(Object.assign({}, extInfo), { envVersion: dev ? 'develop' : 'release', version: '', extType: info.extType }),
-                    builderConfig
-                }
+                    sentryScript: sentryScriptUrl, extInfo: finalExtInfo, builderConfig }, resolvePreloadCodeByProject({
+                    builderConfig,
+                    extInfo: finalExtInfo,
+                    projectPath: inputPath
+                }))
             };
         });
         entryRenderConfList.concat(renderConfigList).forEach(config => {
@@ -952,12 +981,13 @@ function renderMiniprogramTemplate(opts) {
     });
 }
 
-function mergePackages(projectConfig, outputPath, opts) {
+function mergePackages(projectConfig, inputPath, outputPath, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const baseRenderOpts = {
             packagePath: '',
             mainPath: '',
             releasePath: outputPath,
+            inputPath,
             entrys: [],
             extInfo: opts.extInfo,
             debug: opts.debug,
@@ -996,7 +1026,6 @@ function injectRuntimeLib(releasePath) {
     const releaseFrameworkPath = path__default["default"].join(releasePath, 'framework');
     fs__default["default"].copySync(frameworkPath, releaseFrameworkPath);
     injectNpm(path__default["default"].join(releaseFrameworkPath, 'script'), '@revues/web-sdk-core');
-    injectNpm(path__default["default"].join(releaseFrameworkPath, 'script'), '@revues/web-frame');
     // TODO: 这段代码是测试 @revues/js-sdk 增加构建变量去决定执行
     // injectNpm(sdkPath, '@revues/js-sdk')
 }
@@ -1067,33 +1096,6 @@ function compress(output) {
     });
 }
 
-function urlToBase64(url) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const res = yield axios__default["default"].get(url, { responseType: 'arraybuffer' });
-            const buffer = Buffer.from(res.data);
-            const info = getFileInfoByUrl(url);
-            return `data:image/${info.ext};base64,` + `${buffer.toString('base64')}`;
-        }
-        catch (e) {
-            throw new Error(`urlToBase64 failed, url is "${url}", error msg is ${e.message}`);
-        }
-    });
-}
-function getFileInfoByUrl(url) {
-    var _a;
-    const main = url.split('?')[0];
-    const arr = main.split('/');
-    const [filename, ext] = (_a = arr[arr.length - 1]) === null || _a === void 0 ? void 0 : _a.split('.');
-    if (ext == null || ext == '') {
-        throw new Error(`url:${url}格式错误，无法获取文件信息`);
-    }
-    return {
-        filename,
-        ext
-    };
-}
-
 // 36PX
 function makeBuildResults(mode, opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -1269,12 +1271,13 @@ class RevueBuilder {
     // 这里拿到打包好的代码 原样输出  + build result
     build(opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { inputPath, outputPath, publicPath, projectConfig, config, extUuid, extName, extVersion, extVersionId, extLogo } = opts;
+            const { inputPath, outputPath, publicPath, projectConfig, config, extUuid, extName, extVersion, extVersionId, extLogo, directSdkUrl, bindSdkInfo } = opts;
+            const hasDirectSDKConfig = bindSdkInfo && directSdkUrl;
             const processedConfig = processBuilderConfigJSON('production', config);
             fs__default["default"].existsSync(outputPath) && fs__default["default"].removeSync(outputPath);
             // 把 inputPath 的文件 迁移到 outputPath
             yield fs__default["default"].copy(inputPath, outputPath, { overwrite: true });
-            const { entrys } = yield mergePackages(projectConfig, outputPath, {
+            const { entrys } = yield mergePackages(projectConfig, inputPath, outputPath, {
                 builderConfig: processedConfig,
                 extInfo: {
                     forceUsePatchApi: projectConfig.forceUsePatchApi,
@@ -1284,8 +1287,12 @@ class RevueBuilder {
                     extName,
                     extVersion,
                     extVersionId,
-                    extLogo: yield urlToBase64(extLogo)
-                }
+                    extLogo: extLogo
+                },
+                sdkConfig: hasDirectSDKConfig ? {
+                    bindSdkInfo,
+                    directSdkUrl
+                } : undefined
             });
             return yield makeBuildResults('production', {
                 entrys: entrys,
@@ -1324,7 +1331,7 @@ class RevueBuilder {
                     retryRef(true);
                 }
             });
-            const { entrys, mainPublicPath, retry } = yield mergePackages(projectConfig, outputPath, {
+            const { entrys, mainPublicPath, retry } = yield mergePackages(projectConfig, inputPath, outputPath, {
                 builderConfig: processedConfig,
                 extInfo,
                 debug: debugWsc,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hyext/builder-revues",
-	"version": "1.3.3",
+	"version": "1.4.0",
 	"description": "> TODO: description",
 	"author": "loler",
 	"homepage": "",
@@ -24,10 +24,10 @@
 		"url": "https://git.huya.com/exc/web/revue.git"
 	},
 	"dependencies": {
-		"@revues/cocos-web-adapter": "1.3.3",
-		"@revues/code-compiler": "1.3.3",
-		"@revues/web-frame": "1.3.3",
-		"@revues/web-sdk-core": "1.3.3",
+		"@hyext/preload": "^1.1.3",
+		"@revues/cocos-web-adapter": "1.4.0",
+		"@revues/code-compiler": "1.4.0",
+		"@revues/web-sdk-core": "1.4.0",
 		"archiver": "^7.0.1",
 		"axios": "^1.7.3",
 		"chalk": "^2.4.2",
@@ -47,5 +47,5 @@
 		"@types/ramda": "^0.29.11",
 		"terser": "^5.31.0"
 	},
-	"gitHead": "c3a925d35fe691af5bcd01e35985e17d7878abd8"
+	"gitHead": "1d19521460b8377316d5e179c6d889ca85a65fbe"
 }

package/static/template/miniapp-page-manager.hbs

@@ -16,8 +16,7 @@
   <meta name="ext-busi-type" content="ext">
   <meta name="ext-build-env" content="{{buildEnv}}">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="stylesheet" href="{{sourcePathPrefix}}/framework/script/web-frame.css"></link>
-  <script charset="utf-8" src="{{sourcePathPrefix}}/framework/script/web-frame.js"></script>
+  {{headerContent}}
   <style>
     html,
     body {
@@ -66,6 +65,11 @@
       box-sizing: border-box;
     }
   </style>
+  <link rel="preload" href="{{sourcePathPrefix}}/framework/script/service.js" as="script" onload="__handleLinkLoad()">
+  <link rel="preload" href="{{sourcePathPrefix}}/framework/script/view.js" as="script" onload="__handleLinkLoad()">
+  <link rel="preload" href="{{sourcePathPrefix}}/framework/css/index.css" as="style" onload="__handleLinkLoad()">
+  <link rel="preload" href="./__APP__.js" as="script" onload="__handleLinkLoad()">
+  <link rel="preload" href="./pageframe.js" as="script" onload="__handleLinkLoad()">
   <script charset="utf-8">
     (function () {
       window.__extInfo = {{ toJSON extInfo }}
@@ -92,24 +96,20 @@
     window.__debug = true
   </script>
   {{/if}}
-  {{#if isProd}}
-   <script src="https://fedlib.msstatic.com/fedbasic/hyext-inner/hyext-performance/performance.global.js"></script>
-   <script src="https://a.msstatic.com/huya/hd/cdn_libs/performance_report-min.js"></script>
-  {{/if}}
-  <script charset="utf-8" src="{{hyextSDKUrl}}"></script>
-  <script charset="utf-8" src="{{sourcePathPrefix}}/framework/script/web-sdk-core.js"></script>
 </head>
 
 <body>
+  {{bodyContent}}
   <div class="views" id="webview-container">
     <iframe class="service" id="webview-service"></iframe>
     <iframe class="webview" frameborder="0" id="webview-first-view"></iframe>
   </div>
-  <link rel="preload" href="{{sourcePathPrefix}}/framework/script/service.js" as="script" onload="__handleLinkLoad()">
-  <link rel="preload" href="{{sourcePathPrefix}}/framework/script/view.js" as="script" onload="__handleLinkLoad()">
-  <link rel="preload" href="{{sourcePathPrefix}}/framework/css/index.css" as="style" onload="__handleLinkLoad()">
-  <link rel="preload" href="./__APP__.js" as="script" onload="__handleLinkLoad()">
-  <link rel="preload" href="./pageframe.js" as="script" onload="__handleLinkLoad()">
+  {{#if isProd}}
+   <script src="https://fedlib.msstatic.com/fedbasic/hyext-inner/hyext-performance/performance.global.js"></script>
+   <script src="https://a.msstatic.com/huya/hd/cdn_libs/performance_report-min.js"></script>
+  {{/if}}
+  <script charset="utf-8" src="{{hyextSDKUrl}}"></script>
+  <script charset="utf-8" src="{{sourcePathPrefix}}/framework/script/web-sdk-core.js"></script>
   {{#if sentryScript}}
   <script charset="utf-8" src="{{sentryScript}}" defer></script>
   {{/if}}

package/static/template/minigame-page-manager.hbs

@@ -17,6 +17,7 @@
   {{/if}}
   <meta name="ext-busi-type" content="game">
   <meta name="ext-build-env" content="{{buildEnv}}">
+  {{headerContent}}
   <style>
     .service,
     .service-preload,
@@ -74,13 +75,12 @@
     window.__debug = true
   </script>
   {{/if}}
-  <link rel="stylesheet" href="{{sourcePathPrefix}}/framework/script/web-frame.css"></link>
-  <script charset="utf-8" src="{{sourcePathPrefix}}/framework/script/web-frame.js"></script>
   <script charset="utf-8" src="{{hyextSDKUrl}}"></script>
   <script charset="utf-8" src="{{sourcePathPrefix}}/framework/script/web-sdk-core.js"></script>
 </head>
 
 <body>
+  {{bodyContent}}
   <div class="views" id="webview-container">
     <iframe class="service service-view" id="webview-service" src="./game-frame.html"></iframe>
   </div>