@hyext/builder-revues 0.0.1-beta.16 → 0.0.1-beta.19

package/dist/index.js

@@ -15,6 +15,7 @@ var chalk = require('chalk');
 var util = require('util');
 var glob = require('glob');
 var handlebars = require('handlebars');
+var tapable = require('tapable');
 var liveServer = require('live-server');
 var archiver = require('archiver');
 var R = require('ramda');
@@ -36,10 +37,18 @@ var EDeployMode;
     EDeployMode[EDeployMode["Separate"] = 1] = "Separate";
 })(EDeployMode || (EDeployMode = {}));
 
-const cacheDir = path__default["default"].join(os__default["default"].tmpdir(), '.revue_cache');
+const tempDir = os__default["default"].tmpdir();
+const cacheDir = path__default["default"].join(tempDir, '.revue_cache');
 // 根据环境变量判断 要不要把运行框架代码留在项目内 还是 CDN
 const deployMode = EDeployMode.Integration;
-const staticPath = path__default["default"].resolve(__dirname, '../static' );
+const staticPath = path__default["default"].resolve(__dirname, '../static' );
+var COMPILE_TYPE;
+(function (COMPILE_TYPE) {
+    COMPILE_TYPE["miniProgram"] = "miniProgram";
+    COMPILE_TYPE["miniProgramPlugin"] = "miniProgramPlugin";
+    COMPILE_TYPE["miniGame"] = "miniGame";
+    COMPILE_TYPE["miniGamePlugin"] = "miniGamePlugin";
+})(COMPILE_TYPE || (COMPILE_TYPE = {}));
 
 const filename = 'project.config.json';
 function copyProjectConfigJSON(srcDir, destDir) {
@@ -144,6 +153,45 @@ function renderTemplate(input, output, data) {
     fs__default["default"].outputFileSync(output, render(content, data));
 }
 
+const PluginDriver = {
+    context: { deviceOrientation: 'portrait', },
+    hooks: {
+        onMergedMainPackge: new tapable.SyncHook(['IOnMergedMainPackge'])
+    }
+};
+
+class InjectWebviewUrlParamsPlugin {
+    apply(pluginDriver) {
+        pluginDriver.hooks.onMergedMainPackge.tap('InjectWebviewUrlParamsPlugin', opts => {
+            const { compileType, mainPath } = opts;
+            let isLandscape = 0;
+            const isGame = compileType === COMPILE_TYPE.miniGame;
+            if (isGame) {
+                const gameJson = fs__default["default"].readJsonSync(path__default["default"].join(mainPath, 'game.json'));
+                if (typeof gameJson.deviceOrientation === 'string' &&
+                    gameJson.deviceOrientation.includes('landscape')) {
+                    isLandscape = 1;
+                }
+            }
+            pluginDriver.context.webviewUrlParams = {
+                isLandscape,
+                disablePopGesture: 1,
+                hideStatusBar: isGame ? 1 : 0,
+                hideBar: 1,
+                bounces: 0
+            };
+        });
+    }
+}
+function makeWebviewUrlParamsStr() {
+    const params = PluginDriver.context.webviewUrlParams;
+    return params ? Object.keys(params).reduce((str, key) => {
+        // @ts-ignore
+        str += `&${key}=${encodeURIComponent(params[key])}`;
+        return str;
+    }, '') : '';
+}
+
 function isMainPackage(config) {
     return config.name === codeCompiler.pkgFileType.MainPkg && config.root === '.';
 }
@@ -234,7 +282,7 @@ function mergeGamePackage(releasePath, opts) {
     const { mainPakConf, packagePath } = mergeMainPackage(watch, releasePath);
     const templatePath = path__default["default"].join(staticPath, 'template');
     const mainPath = path__default["default"].join(packagePath, mainPakConf.name);
-    const entrys = builderConfig.supportExtTypes.map((extType) => {
+    const entrys = builderConfig.supportExtTypes.map(extType => {
         const entryFilename = `index_${extType}.html`;
         return {
             extType,
@@ -247,6 +295,11 @@ function mergeGamePackage(releasePath, opts) {
             entryFilename
         };
     });
+    PluginDriver.hooks.onMergedMainPackge.call({
+        mainConf: mainPakConf,
+        mainPath,
+        compileType: COMPILE_TYPE.miniGame
+    });
     if (!watch) {
         // 渲染模版
         renderGameTemplate({
@@ -256,23 +309,40 @@ function mergeGamePackage(releasePath, opts) {
                 : publicPath,
             templatePath,
             mainPath,
+            extUuid,
             ...opts.template
         });
         // wasn文件 会被 cocos 同步请求，由于二进制文件同步请求失败 所以改为 base64 文本
         transformWasnFileToBase64File(mainPath);
     }
-    return entrys;
+    return {
+        entrys,
+        mainPublicPath: 'package/' + mainPakConf.name
+    };
 }
+// mark 热更新 整个函数不会重渲染。
 function renderGameTemplate(opts) {
-    const { mainPath, sourcePathPrefix, templatePath, entrys, debug } = opts;
-    const gameFrameRenderItem = {
-        input: path__default["default"].join(templatePath, 'game-frame.hbs'),
-        output: path__default["default"].join(mainPath, 'game-frame.html'),
-        data: {
-            sourcePathPrefix,
+    const { mainPath, sourcePathPrefix, templatePath, entrys, debug, dev, extUuid } = opts;
+    const renderConfigList = [
+        {
+            input: path__default["default"].join(templatePath, 'game-frame.hbs'),
+            output: path__default["default"].join(mainPath, 'game-frame.html'),
+            data: {
+                sourcePathPrefix
+            }
         }
-    };
-    const entryRenderConfList = entrys.map((info) => {
+    ];
+    if (dev) {
+        renderConfigList.push({
+            input: path__default["default"].join(templatePath, 'remote-debugger.hbs'),
+            output: path__default["default"].join(mainPath, 'remote-debugger.html'),
+            data: {
+                extUuid,
+                paramsStr: makeWebviewUrlParamsStr()
+            }
+        });
+    }
+    const entryRenderConfList = entrys.map(info => {
         return {
             input: path__default["default"].join(templatePath, 'minigame-page-manager.hbs'),
             output: path__default["default"].join(mainPath, info.entryFilename),
@@ -283,8 +353,7 @@ function renderGameTemplate(opts) {
             }
         };
     });
-    // @ts-ignore
-    entryRenderConfList.concat(gameFrameRenderItem).forEach(config => {
+    entryRenderConfList.concat(renderConfigList).forEach(config => {
         renderTemplate(config.input, config.output, config.data);
     });
 }
@@ -305,7 +374,7 @@ function transformWasnFileToBase64File(mainPath) {
         nodir: true,
         absolute: false
     });
-    console.log('transform wasm to base64 files: \n', files);
+    files.length && console.log('transform wasm to base64 files: \n', files);
     files.forEach(file => {
         const abs = path__default["default"].join(mainPath, file);
         const text = fs__default["default"].readFileSync(abs).toString('base64');
@@ -334,7 +403,7 @@ function mergeMiniprogramPackage(releasePath, opts) {
     const extConfig = getPackageExtConfig(packagePath);
     const templatePath = path__default["default"].join(staticPath, 'template');
     const mainPath = path__default["default"].join(packagePath, mainPakConf.name);
-    const entrys = builderConfig.supportExtTypes.map((extType) => {
+    const entrys = builderConfig.supportExtTypes.map(extType => {
         const entryFilename = `index_${extType}.html`;
         return {
             extType,
@@ -347,6 +416,11 @@ function mergeMiniprogramPackage(releasePath, opts) {
             entryFilename
         };
     });
+    PluginDriver.hooks.onMergedMainPackge.call({
+        mainConf: mainPakConf,
+        mainPath,
+        compileType: COMPILE_TYPE.miniProgram
+    });
     if (!watch) {
         // 渲染模版
         renderMiniprogramTemplate({
@@ -357,22 +431,35 @@ function mergeMiniprogramPackage(releasePath, opts) {
             packageExtConfig: extConfig,
             templatePath,
             mainPath,
+            extUuid,
             ...opts.template
         });
     }
-    return entrys;
+    return { entrys, mainPublicPath: 'package/' + mainPakConf.name };
 }
 function renderMiniprogramTemplate(opts) {
-    const { mainPath, sourcePathPrefix, templatePath, entrys, packageExtConfig, debug } = opts;
+    const { mainPath, sourcePathPrefix, templatePath, entrys, packageExtConfig, debug, dev, extUuid } = opts;
     const packageExtConfigStr = JSON.stringify(packageExtConfig);
-    const serviceRenderItem = {
-        input: path__default["default"].join(templatePath, 'service.hbs'),
-        output: path__default["default"].join(mainPath, 'service.html'),
-        data: {
-            sourcePathPrefix,
+    const renderConfigList = [
+        {
+            input: path__default["default"].join(templatePath, 'service.hbs'),
+            output: path__default["default"].join(mainPath, 'service.html'),
+            data: {
+                sourcePathPrefix
+            }
         }
-    };
-    const entryRenderConfList = entrys.map((info) => {
+    ];
+    if (dev) {
+        renderConfigList.push({
+            input: path__default["default"].join(templatePath, 'remote-debugger.hbs'),
+            output: path__default["default"].join(mainPath, 'remote-debugger.html'),
+            data: {
+                extUuid,
+                paramsStr: makeWebviewUrlParamsStr()
+            }
+        });
+    }
+    const entryRenderConfList = entrys.map(info => {
         return {
             input: path__default["default"].join(templatePath, 'miniapp-page-manager.hbs'),
             output: path__default["default"].join(mainPath, info.entryFilename),
@@ -384,12 +471,15 @@ function renderMiniprogramTemplate(opts) {
             }
         };
     });
-    // @ts-ignore
-    entryRenderConfList.concat(serviceRenderItem).forEach(config => {
+    entryRenderConfList.concat(renderConfigList).forEach(config => {
         renderTemplate(config.input, config.output, config.data);
     });
 }
 
+function initPlugins(pluginDriver) {
+    new InjectWebviewUrlParamsPlugin().apply(pluginDriver);
+}
+
 var httpsConf = {
     cert: fs__default["default"].readFileSync(path__default["default"].join(staticPath, "./certs/cert.pem")),
     key: fs__default["default"].readFileSync(path__default["default"].join(staticPath, "./certs/key.pem")),
@@ -434,17 +524,19 @@ function compress(output) {
     });
 }
 
+// 36PX
 async function makeBuildResults(mode, opts) {
     const { baseURI, entrys, outputPath } = opts;
     const releasePath = path__default["default"].join(outputPath, 'build-result');
     const buildResultMap = {};
+    const paramsStr = makeWebviewUrlParamsStr();
     const buildResultList = entrys.map(info => {
         const result = {
             type: 'HTML',
             content: {
                 pages: [
                     {
-                        path: getPagePath(info)
+                        path: getPagePath(info, paramsStr)
                     }
                 ],
                 baseURI
@@ -466,12 +558,12 @@ async function makeBuildResults(mode, opts) {
     }
     return buildResultMap;
 }
-function getPagePath(entryInfo) {
+function getPagePath(entryInfo, extraParams) {
     const extType = entryInfo.extType;
     let entry = entryInfo.entryPath;
     // 移动端需要补 __module_busi__
     if (extType.endsWith('_h5')) {
-        entry += '?__module_busi__=kiwi-ExtSDK';
+        entry += '?__module_busi__=kiwi-ExtSDK' + extraParams;
     }
     return entry;
 }
@@ -502,6 +594,7 @@ const getPublicIP = (config) => {
 };
 
 const supportedExtTypeSet = new Set([
+    "app_inner_h5",
     'web_video_com',
     'app_panel_h5',
     'zs_anchor_panel_h5',
@@ -553,6 +646,17 @@ function getDevBaseURI(config) {
     return `${protocol}://${config.host}:${config.port}/`;
 }
 
+function checkAppId(project) {
+    const appId = project.appId || project.appid;
+    if (appId == null || appId === '') {
+        logger.fatal('请填写正确的appid');
+    }
+    else if (appId.length > 10) {
+        logger.fatal('appid错误，请登录 https://ext.huya.com/ 在您的小程序概要中查看小程序ID');
+    }
+    return appId;
+}
+
 function mergePackage(projectConfig, outputPath, opts) {
     logger.log('正在合并分包...');
     const mergeMethod = projectConfig.compileType == 'game'
@@ -562,7 +666,14 @@ function mergePackage(projectConfig, outputPath, opts) {
     logger.success('合并分包完成');
     return entryInfo;
 }
+function getTempProjectDir(projectDir) {
+    return path__default["default"].join(tempDir, '.revues-projects', path__default["default"].basename(projectDir));
+}
 class RevueBuilder {
+    constructor() {
+        // 单例 PluginDriver 更加灵活
+        initPlugins(PluginDriver);
+    }
     // 这里拿到打包好的代码 原样输出  + build result
     async build(opts) {
         const { inputPath, outputPath, publicPath, projectConfig, config, extUuid } = opts;
@@ -570,8 +681,9 @@ class RevueBuilder {
         fs__default["default"].existsSync(outputPath) && fs__default["default"].removeSync(outputPath);
         // 把 inputPath 的文件 迁移到 outputPath
         await fs__default["default"].copy(inputPath, outputPath, { overwrite: true });
-        const entrys = mergePackage(projectConfig, outputPath, {
-            builderConfig: processedConfig
+        const { entrys } = mergePackage(projectConfig, outputPath, {
+            builderConfig: processedConfig,
+            extUuid
         });
         return await makeBuildResults('production', {
             entrys: entrys,
@@ -581,41 +693,46 @@ class RevueBuilder {
     }
     async start(opts) {
         const { debug, inputPath, projectConfig, outputPath: outputPath$1, config } = opts;
-        const outputPath = outputPath$1 || path__default["default"].join(inputPath, 'node_modules', '.revues-project');
+        const outputPath = getTempProjectDir(path__default["default"].dirname(inputPath))
+            ;
+        const appId = checkAppId(projectConfig);
         const processedConfig = processBuilderConfigJSON('development', config);
         if (projectConfig.compileType == 'game') {
             await watchGame(inputPath, outputPath, () => {
                 mergePackage(projectConfig, outputPath, {
-                    watch: true,
-                    builderConfig: processedConfig
+                    builderConfig: processedConfig,
+                    watch: true
                 });
             });
         }
         else {
             await watch(inputPath, outputPath, () => {
                 mergePackage(projectConfig, outputPath, {
-                    watch: true,
-                    builderConfig: processedConfig
+                    builderConfig: processedConfig,
+                    watch: true
                 });
             });
         }
-        const entrys = mergePackage(projectConfig, outputPath, {
+        const { entrys, mainPublicPath } = mergePackage(projectConfig, outputPath, {
             builderConfig: processedConfig,
+            extUuid: appId,
             template: {
-                debug
+                debug,
+                dev: true
             }
         });
         logger.log('启动 live server 服务...');
-        logger.success('本地访问地址：', getDevBaseURI(processedConfig) +
-            entrys[0]?.entryPath);
+        logger.success('本地访问地址：', getDevBaseURI(processedConfig) + entrys[0]?.entryPath);
+        logger.success('扫码预览地址：', getDevBaseURI(processedConfig) + mainPublicPath + '/remote-debugger.html');
         startLiveServer({
             ...processedConfig,
-            root: outputPath
+            root: outputPath,
+            ignore: 'node_modules'
         });
         return await makeBuildResults('development', {
             entrys,
             baseURI: getDevBaseURI(processedConfig),
-            outputPath
+            outputPath: outputPath$1
         });
     }
     // 这里仅仅在 client 打包 小程序/小游戏

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyext/builder-revues",
-  "version": "0.0.1-beta.16",
+  "version": "0.0.1-beta.19",
   "description": "> TODO: description",
   "author": "diamondloler <857276958@qq.com>",
   "homepage": "",
@@ -22,11 +22,11 @@
   },
   "scripts": {},
   "dependencies": {
-    "@revues/cocos-web-adapter": "0.0.1-beta.16",
-    "@revues/code-compiler": "0.0.1-beta.16",
-    "@revues/hyext-adapter": "0.0.1-beta.16",
-    "@revues/web-frame": "0.0.1-beta.16",
-    "@revues/web-sdk-core": "0.0.1-beta.16",
+    "@revues/cocos-web-adapter": "0.0.1-beta.19",
+    "@revues/code-compiler": "0.0.1-beta.19",
+    "@revues/hyext-adapter": "0.0.1-beta.19",
+    "@revues/web-frame": "0.0.1-beta.19",
+    "@revues/web-sdk-core": "0.0.1-beta.19",
     "archiver": "^7.0.1",
     "chalk": "^2.4.2",
     "fs-extra": "8.1.0",
@@ -34,6 +34,7 @@
     "handlebars": "^4.7.8",
     "live-server": "^1.2.2",
     "ramda": "^0.29.1",
+    "tapable": "^2.2.1",
     "util": "^0.12.5"
   },
   "devDependencies": {
@@ -41,5 +42,5 @@
     "@types/live-server": "^1.2.3",
     "@types/ramda": "^0.29.11"
   },
-  "gitHead": "92e10b5b5955c896cb0e8cd509459a2f6978ccbf"
+  "gitHead": "467b64993d87fa2aa48440c32a3760a1617a8952"
 }

package/static/template/remote-debugger.hbs

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en"><head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>扫码预览</title>
+  <script charset="UTF-8" src="https://cdnjs.cloudflare.com/ajax/libs/qrcode/1.5.1/qrcode.min.js"></script>
+  <style>
+    * {
+      box-sizing: border-box;
+    }
+    a {
+      color: blue;
+    }
+    body,html {
+      height: 100%;
+      width: 100%;
+
+      font-size: 16px;
+      color: #333;
+    }
+    body {
+      display:  flex;
+      flex-direction: column;
+      flex: 1;
+      margin: 0;
+      position: relative;
+    }
+    .container {
+      display:  flex;
+      flex-direction: column;
+      flex: 1;
+      justify-content: center;
+      align-items: center;
+    }
+    .title {
+      font-weight: bold;
+    }
+    .tip {
+      font-size: 14px;
+      line-height: 26px;
+    }
+  </style>
+</head>
+
+<body>
+  <div class="container">
+    <canvas id="canvas"></canvas>
+    <span class="title">扫码调试</span>
+    <span class="tip">如未绑定全局小程序下发，请先<a href="">绑定</a></span>
+    <span class="tip">如需查看 vconsole, 可在 project.config.json 把 debug 字段设置为 true 或在 cocos ide 打包时勾上调试选项</a></span>
+  </div>
+  <script>
+    var url = 'https://m.huya.com?hyaction=hyminiprogram&extuuid={{ extUuid }}{{paramsStr}}'
+    var canvas = document.getElementById('canvas')
+    QRCode.toCanvas(canvas, url,  {width: 200}, function (error) {
+      if (error) console.error(error)
+      console.log('success!');
+    })
+  </script>
+</body>
+</html>