xhs-mp-compiler-cli 1.9.9 → 1.9.10

package/dist/presets/configs/miniprogram/render/renderChunkPlugin.js

@@ -10,17 +10,43 @@
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     const packs_1 = require("../../../../packs");
-    const injectCSS = `
-globalThis.__XHS_IS_WEBVIEW = (globalThis.localStorage && globalThis.document && globalThis.document.querySelectorAll)
-globalThis.__XHS_APPEND_CSS = function(cssText, src){
-    if (!globalThis.__XHS_IS_WEBVIEW) return;
-    var headTags = document.getElementsByTagName('head')
-    var head = document.head || (headTags && headTags[0])
-    var cssTextNode = document.createTextNode(String(cssText))
-    var styleNode = document.createElement('style')
-    styleNode.setAttribute('xhs:path', src)
+    /**
+     * 注入变量不可以使用 let const var 变量形式
+     * 因为2.0 架构下 render.js 和 component.js 运行在逻辑层（只有一个环境） 会导致变量冲突
+     */
+    const common = `
+globalThis.__XHS_WEBVIEW = (globalThis.localStorage && globalThis.document && globalThis.document.querySelectorAll);
+`;
+    const injectLink = `
+${common}
+globalThis.__XHS_ADD_LINK = function(src){
+    if (!globalThis.__XHS_WEBVIEW) return;
+    const host = globalThis.SmallApp && globalThis.SmallApp.__BOOTSTRAP_HOST__
+    const link = document.createElement('link')
+    link.href = host + "/" + src
+    link.type = 'text/css'
+    link.rel = 'stylesheet'
+    link.setAttribute('xhs-p', src)
+    document.head.appendChild(link);
+};
+`;
+    /**
+     * 2.0模式下 render.js 和 component.js 运行在逻辑层
+     * 目前 2.0 各项功能已经稳定 降级可能性不大
+     * 2.0中原先css打包了两份 一份是 .css 文件 一份是 在render.js中注入的style标签
+     * 现在2.0 打包 render.js 中改为使用link标签注入，这样降级到 1.0 时仍然正常运行
+     * 且不会使得包体积变大
+     * 2.0 后面量起来后，可全部采用加载link方式打包，不必区分1.0 2.0
+     */
+    const injectStyle = `
+${common}
+globalThis.__XHS_ADD_STYLE = function(style, src){
+    if (!globalThis.__XHS_WEBVIEW) return;
+    const cssTextNode = document.createTextNode(String(style))
+    const styleNode = document.createElement('style')
+    styleNode.setAttribute('xhs-p', src)
     styleNode.appendChild(cssTextNode)
-    head.appendChild(styleNode)
+    document.head.appendChild(styleNode)
 };
 `;
     // 注入css跟webpack runtime
@@ -35,9 +61,9 @@ globalThis.__XHS_APPEND_CSS = function(cssText, src){
                     stage: packs_1.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
                 }, assets => {
                     var _a, _b;
-                    const { project } = this.options;
+                    const { project, packSetting } = this.options;
                     // 注入css逻辑
-                    const injectCode = injectCSS;
+                    const injectCode = packSetting.enableVDom ? injectLink : injectStyle;
                     const appJSON = project.appJSON;
                     const pathMap = [
                         (_a = appJSON.pages) === null || _a === void 0 ? void 0 : _a.map(({ path }) => path),

package/dist/presets/loaders/mini-style-loader.js

@@ -67,8 +67,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 return `export default void 0;`;
             }
             // 判断浏览器环境，注入css添加逻辑
-            return new packs_1.RawSource(`globalThis.__XHS_IS_WEBVIEW && globalThis.__XHS_APPEND_CSS(${JSON.stringify(code)}, '${shortPath}');` +
-                `export default ${JSON.stringify(shortPath)};`).source();
+            if (enableVDom) {
+                return new packs_1.RawSource(`globalThis.__XHS_ADD_LINK(${JSON.stringify(shortPath)});` +
+                    `export default ${JSON.stringify(shortPath)};`).source();
+            }
+            else {
+                return new packs_1.RawSource(`globalThis.__XHS_ADD_STYLE(${JSON.stringify(code)}, ${JSON.stringify(shortPath)});` +
+                    `export default ${JSON.stringify(shortPath)};`).source();
+            }
         };
         if (packSetting.compressCss) {
             // 压缩css

package/dist/presets/loaders/mp-entry-loader.js

@@ -131,7 +131,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
         const addAppJs = () => {
             if (fs_extra_1.default.existsSync(`${projectMiniprogramPath}/app.js`) ||
                 fs_extra_1.default.existsSync(`${projectMiniprogramPath}/app.ts`)) {
-                modules.unshift(`;globalThis['${name}'].default['app'] = require('${(0, loader_utils_1.formatPath)(`${projectMiniprogramPath}/app`)}')`);
+                modules.unshift(`const loadAppJs = () => require('${(0, loader_utils_1.formatPath)(`${projectMiniprogramPath}/app`)}');` +
+                    `globalThis['${name}'].default['app'] = globalThis.xhsLazyAppJs ? loadAppJs : loadAppJs()`);
             }
         };
         if (pkg === xhs_mp_pack_1.CONSTANTS.FULL_PKG) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -94,13 +94,13 @@
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
     "xhs-mp-workerpool": "^9.1.3",
-    "xhs-mp-compiler-ml-loader": "3.0.9",
-    "xhs-mp-compiler-utils": "1.9.9",
-    "xhs-mp-pack": "1.9.9",
-    "xhs-mp-project": "1.9.9",
-    "xhs-mp-utils": "1.9.9",
-    "xhs-mp-shared-fs": "1.4.9",
-    "xhs-mp-compiler-sjs-loader": "1.9.9",
+    "xhs-mp-compiler-ml-loader": "3.0.10",
+    "xhs-mp-compiler-utils": "1.9.10",
+    "xhs-mp-pack": "1.9.10",
+    "xhs-mp-project": "1.9.10",
+    "xhs-mp-utils": "1.9.10",
+    "xhs-mp-shared-fs": "1.4.10",
+    "xhs-mp-compiler-sjs-loader": "1.9.10",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {