xhs-mp-compiler-cli 2.0.10 → 2.0.12

package/dist/config/constant.config.d.ts

@@ -48,7 +48,3 @@ export declare const PACK_MODE: {
     MPPACK: string;
     WEBPACK: string;
 };
-export declare const CSS_REG: RegExp;
-export declare const SKETCH_CSS_REG: RegExp;
-export declare const ML_REG: RegExp;
-export declare const SKETCH_ML_REG: RegExp;

package/dist/config/constant.config.js

@@ -9,7 +9,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.SKETCH_ML_REG = exports.ML_REG = exports.SKETCH_CSS_REG = exports.CSS_REG = exports.PACK_MODE = exports.ASSETS_EXTS = exports.BUILD_REASON = exports.SUB_PKG = exports.MAIN_PKG = exports.ENTRY_CSS_NAME = exports.PROD_TARGETS = exports.DEV_TARGETS = exports.DEV_BROWSERSLIST = exports.PROD_BROWSERSLIST = exports.COMPILE_SUB_PKG = exports.COMPILE_MAIN_PKG = exports.COMPILE_FULL_PKG = exports.PKG_ROOT_SEP = exports.MiniMode = exports.COMPILE_ENTRY = exports.COMPILE_TYPE = exports.COMPILER_TYPE = exports.MAIN_PKG_ROOT = void 0;
+    exports.PACK_MODE = exports.ASSETS_EXTS = exports.BUILD_REASON = exports.SUB_PKG = exports.MAIN_PKG = exports.ENTRY_CSS_NAME = exports.PROD_TARGETS = exports.DEV_TARGETS = exports.DEV_BROWSERSLIST = exports.PROD_BROWSERSLIST = exports.COMPILE_SUB_PKG = exports.COMPILE_MAIN_PKG = exports.COMPILE_FULL_PKG = exports.PKG_ROOT_SEP = exports.MiniMode = exports.COMPILE_ENTRY = exports.COMPILE_TYPE = exports.COMPILER_TYPE = exports.MAIN_PKG_ROOT = void 0;
     exports.MAIN_PKG_ROOT = 'xhs-main';
     exports.COMPILER_TYPE = {
         dev: 'dev',
@@ -78,9 +78,4 @@
         MPPACK: 'mp-pack',
         WEBPACK: 'webpack'
     };
-    // loader 规则使用下面变量
-    exports.CSS_REG = /(?<!\.skeleton)\.(wxss|css)$/;
-    exports.SKETCH_CSS_REG = /\.skeleton\.(wxss|css)$/;
-    exports.ML_REG = /(?<!\.skeleton)\.(wx|xhs)ml$/;
-    exports.SKETCH_ML_REG = /\.skeleton\.(wx|xhs)ml$/;
 });

package/dist/presets/configs/minigame/service/index.js

@@ -46,6 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             name: 'runtime'
         })
             .splitChunks({
+            // TODO chunk 合并策略
             chunks: chunk => !chunk.name.startsWith('v0/'),
             minSize: 0,
             name: 'service-common'

package/dist/presets/configs/miniprogram/assets/index.js

@@ -7,13 +7,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "xhs-mp-compiler-utils", "./assetsEntryPlugin", "../../../../config/constant.config", "../../../plugins/InjectorPlugin", "path", "../../../../utils/cache"], factory);
+        define(["require", "exports", "xhs-mp-compiler-utils", "xhs-mp-shared", "./assetsEntryPlugin", "../../../../config/constant.config", "../../../plugins/InjectorPlugin", "path", "../../../../utils/cache"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.presetAssets = exports.getAssetsEntry = void 0;
     const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
+    const xhs_mp_shared_1 = require("xhs-mp-shared");
     const assetsEntryPlugin_1 = __importDefault(require("./assetsEntryPlugin"));
     const constant_config_1 = require("../../../../config/constant.config");
     const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
@@ -35,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             } }, (0, cache_1.getCacheConfig)(absCacheDirectory, options)), { module: {
                 rule: {
                     style: {
-                        test: constant_config_1.CSS_REG,
+                        test: xhs_mp_shared_1.CSS_REG,
                         use: {
                             "mini-style-loader": {
                                 loader: "mini-style-loader",

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

@@ -7,13 +7,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "path", "./sjsEntryPlugin", "./render", "./component", "./sketch", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../../utils/cache", "../../../../config/constant.config"], factory);
+        define(["require", "exports", "path", "xhs-mp-shared", "./sjsEntryPlugin", "./render", "./component", "./sketch", "./renderChunkPlugin", "../../../../types", "../../../plugins/InjectorPlugin", "../../../../utils/cache"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.presetRender = exports.getRenderEntry = void 0;
     const path_1 = __importDefault(require("path"));
+    const xhs_mp_shared_1 = require("xhs-mp-shared");
     const sjsEntryPlugin_1 = __importDefault(require("./sjsEntryPlugin"));
     const render_1 = require("./render");
     const component_1 = require("./component");
@@ -22,7 +23,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const types_1 = require("../../../../types");
     const InjectorPlugin_1 = require("../../../plugins/InjectorPlugin");
     const cache_1 = require("../../../../utils/cache");
-    const constant_config_1 = require("../../../../config/constant.config");
     const getRenderEntry = (options) => () => {
         const entries = Object.assign(Object.assign(Object.assign({}, (0, render_1.getRenderEntry)(options)), (0, component_1.getComponentEntry)(options)), (0, sketch_1.getSketchEntry)(options));
         return entries;
@@ -54,7 +54,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             } }, (0, cache_1.getCacheConfig)(absCacheDirectory, options)), { module: {
                 rule: {
                     ml: {
-                        test: constant_config_1.ML_REG,
+                        test: xhs_mp_shared_1.ML_REG,
                         use: Object.assign(Object.assign({}, transfomLoader), { 'ml-loader': {
                                 loader: require.resolve('xhs-mp-ml-loader'),
                                 options: {
@@ -63,7 +63,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                             } }),
                     },
                     sketchMl: {
-                        test: constant_config_1.SKETCH_ML_REG,
+                        test: xhs_mp_shared_1.SKETCH_ML_REG,
                         use: Object.assign(Object.assign({}, transfomLoader), { 'sketch-loader': {
                                 loader: require.resolve('xhs-mp-sketch-loader'),
                                 options: {
@@ -72,7 +72,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                             } }),
                     },
                     style: {
-                        test: constant_config_1.CSS_REG,
+                        test: xhs_mp_shared_1.CSS_REG,
                         use: {
                             "mini-style-loader": {
                                 loader: "mini-style-loader",
@@ -91,7 +91,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         }
                     },
                     sketchStyle: {
-                        test: constant_config_1.SKETCH_CSS_REG,
+                        test: xhs_mp_shared_1.SKETCH_CSS_REG,
                         use: {
                             "string-loader": {
                                 loader: "string-loader"

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

@@ -21,12 +21,12 @@ globalThis.__XHS_WEBVIEW = (globalThis.localStorage && globalThis.document && gl
 ${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)
+    const host = globalThis.SmallApp && globalThis.SmallApp.__BOOTSTRAP_HOST__;
+    const link = document.createElement('link');
+    link.href = host ? (host + '/' + src) : src;
+    link.type = 'text/css';
+    link.rel = 'stylesheet';
+    link.setAttribute('xhs-p', src);
     document.head.appendChild(link);
 };
 `;
@@ -42,11 +42,11 @@ globalThis.__XHS_ADD_LINK = function(src){
 ${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)
-    document.head.appendChild(styleNode)
+    const cssTextNode = document.createTextNode(String(style));
+    const styleNode = document.createElement('style');
+    styleNode.setAttribute('xhs-p', src);
+    styleNode.appendChild(cssTextNode);
+    document.head.appendChild(styleNode);
 };
 `;
     // 注入css跟webpack runtime

package/dist/presets/configs/miniprogram/service/index.js

@@ -80,6 +80,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         // dev模式下开启懒编译，不能抽离common chunk
         if (env !== xhs_mp_pack_1.ENV.development) {
             chain.optimization.splitChunks({
+                // TODO chunk 合并策略
                 chunks: chunk => !chunk.name.startsWith('v0/'),
                 minSize: 0,
                 name: 'service-common'

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

@@ -4,14 +4,14 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "xhs-mp-compiler-utils", "../../packs", "../../config/constant.config"], factory);
+        define(["require", "exports", "xhs-mp-compiler-utils", "../../packs", "xhs-mp-shared"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     const packs_1 = require("../../packs");
-    const constant_config_1 = require("../../config/constant.config");
+    const xhs_mp_shared_1 = require("xhs-mp-shared");
     function miniStyleLoader(source) {
         var _a;
         const callback = this.async();
@@ -20,7 +20,7 @@
         const { project } = this._compiler;
         const { independentFile, emitDirs = [] } = this.getOptions();
         const { miniprogramDir } = project;
-        const shortPath = (0, xhs_mp_compiler_utils_1.getShortPath)(miniprogramDir, resourcePath).replace(constant_config_1.CSS_REG, '.css');
+        const shortPath = (0, xhs_mp_compiler_utils_1.getShortPath)(miniprogramDir, resourcePath).replace(xhs_mp_shared_1.CSS_REG, '.css');
         source = (_a = source === null || source === void 0 ? void 0 : source.trim) === null || _a === void 0 ? void 0 : _a.call(source);
         const emitFiles = (code) => {
             if ((independentFile) && code) {
@@ -33,14 +33,17 @@
             if (!code) {
                 return `export default void 0;`;
             }
+            const injectCssPath = `const cssPath = ${JSON.stringify(shortPath)};`;
             // 判断浏览器环境，注入css添加逻辑
             if (independentFile) {
-                return new packs_1.RawSource(`globalThis.__XHS_ADD_LINK(${JSON.stringify(shortPath)});` +
-                    `export default ${JSON.stringify(shortPath)};`).source();
+                return new packs_1.RawSource(injectCssPath +
+                    `globalThis.__XHS_ADD_LINK(cssPath);` +
+                    `export default cssPath;`).source();
             }
             else {
-                return new packs_1.RawSource(`globalThis.__XHS_ADD_STYLE(${JSON.stringify(code)}, ${JSON.stringify(shortPath)});` +
-                    `export default ${JSON.stringify(shortPath)};`).source();
+                return new packs_1.RawSource(injectCssPath +
+                    `globalThis.__XHS_ADD_STYLE(${JSON.stringify(code)}, cssPath);` +
+                    `export default cssPath;`).source();
             }
         };
         emitFiles(source);

package/dist/presets/loaders/wxss-loader.js

@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "postcss", "postcss-import", "postcss-prefix-selector", "postcss-preset-env", "cssnano", "css-loader/dist/CssSyntaxError", "xhs-mp-ml-parser", "xhs-mp-compiler-utils", "../../utils/postcssRpx2Vw", "../../types", "../../config/constant.config"], factory);
+        define(["require", "exports", "postcss", "postcss-import", "postcss-prefix-selector", "postcss-preset-env", "cssnano", "css-loader/dist/CssSyntaxError", "xhs-mp-ml-parser", "xhs-mp-shared", "xhs-mp-compiler-utils", "../../utils/postcssRpx2Vw", "../../types", "../../config/constant.config"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const cssnano_1 = __importDefault(require("cssnano"));
     const CssSyntaxError_1 = __importDefault(require("css-loader/dist/CssSyntaxError"));
     const xhs_mp_ml_parser_1 = require("xhs-mp-ml-parser");
+    const xhs_mp_shared_1 = require("xhs-mp-shared");
     const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
     const postcssRpx2Vw_1 = __importDefault(require("../../utils/postcssRpx2Vw"));
     const types_1 = require("../../types");
@@ -49,15 +50,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             const isProd = packSetting.env === types_1.ENV.production;
             const browsers = isDev ? constant_config_1.DEV_BROWSERSLIST : constant_config_1.PROD_BROWSERSLIST;
             const { appJSON = {}, miniprogramDir = '' } = project || {};
-            const shortPath = (0, xhs_mp_compiler_utils_1.getShortPath)(miniprogramDir, this.resourcePath).replace(constant_config_1.CSS_REG, '');
+            const shortPath = (0, xhs_mp_compiler_utils_1.getShortPath)(miniprogramDir, this.resourcePath).replace(xhs_mp_shared_1.CSS_REG, '');
             const index = (_c = (_b = (_a = appJSON === null || appJSON === void 0 ? void 0 : appJSON.componentsMap) === null || _a === void 0 ? void 0 : _a[shortPath]) === null || _b === void 0 ? void 0 : _b.index) !== null && _c !== void 0 ? _c : null;
             const styleIsolation = (_e = (_d = appJSON === null || appJSON === void 0 ? void 0 : appJSON.componentsMap) === null || _d === void 0 ? void 0 : _d[shortPath]) === null || _e === void 0 ? void 0 : _e.styleIsolation;
             const selectorIndex = styleIsolation === 'shared' ? 0 : index || 0;
-            const isSketchCss = this.resourcePath.match(constant_config_1.SKETCH_CSS_REG);
+            const isSketchCss = this.resourcePath.match(xhs_mp_shared_1.SKETCH_CSS_REG);
             if (!isSketchCss) {
                 // js / json 的配置会影响 page 或者 component 样式
-                this.addDependency(this.resourcePath.replace(constant_config_1.CSS_REG, '.js'));
-                this.addDependency(this.resourcePath.replace(constant_config_1.CSS_REG, '.json'));
+                this.addDependency(this.resourcePath.replace(xhs_mp_shared_1.CSS_REG, '.js'));
+                this.addDependency(this.resourcePath.replace(xhs_mp_shared_1.CSS_REG, '.json'));
             }
             const plugins = [
                 // 1. 处理 @import

package/dist/utils/apm.js

@@ -23,7 +23,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const lodash_1 = require("lodash");
     const xhs_mp_shared_1 = require("xhs-mp-shared");
     const fs_extra_1 = require("fs-extra");
-    const pkg = require('../../package.json');
     function debug(...data) {
         // return process.send?.(JSON.stringify({ method: 'debugger', data }))
     }
@@ -147,7 +146,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             if (!app_id || !version) {
                 return;
             }
-            const apm = new xhs_mp_shared_1.APM(`mp-compiler-${pkg.version}`);
+            const apm = new xhs_mp_shared_1.APM();
             (_b = apm === null || apm === void 0 ? void 0 : apm.setContext) === null || _b === void 0 ? void 0 : _b.call(apm, app_id, {
                 app_id,
                 app_name: app_id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -88,18 +88,18 @@
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
     "xhs-mp-workerpool": "^9.2.0",
-    "xhs-mp-ml-loader": "2.0.10",
-    "xhs-mp-compiler-utils": "2.0.10",
-    "xhs-mp-pack": "2.0.10",
-    "xhs-mp-project": "2.0.10",
-    "xhs-mp-shared": "2.0.10",
-    "xhs-mp-shared-fs": "2.0.10",
-    "xhs-mp-sjs-loader": "2.0.10",
-    "xhs-mp-sketch-loader": "2.0.10",
+    "xhs-mp-ml-loader": "2.0.12",
+    "xhs-mp-compiler-utils": "2.0.12",
+    "xhs-mp-pack": "2.0.12",
+    "xhs-mp-project": "2.0.12",
+    "xhs-mp-shared": "2.0.12",
+    "xhs-mp-shared-fs": "2.0.12",
+    "xhs-mp-sjs-loader": "2.0.12",
+    "xhs-mp-sketch-loader": "2.0.12",
     "yauzl": "^2.10.0"
   },
   "peerDependencies": {
-    "xhs-mp-ml-parser": "2.0.10"
+    "xhs-mp-ml-parser": "2.0.12"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",
@@ -123,7 +123,7 @@
     "typescript": "5.1.6",
     "vue3-jest": "27.0.0-alpha.2",
     "webpack-dev-server": "4.0.0-beta.3",
-    "xhs-mp-ml-parser": "2.0.10"
+    "xhs-mp-ml-parser": "2.0.12"
   },
   "scripts": {
     "version": "formula changelog && git add .",