xhs-mp-compiler-cli 1.3.5 → 1.3.8

package/dist/compiler.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node/child_process" />
+/// <reference types=".pnpm/artifactory.devops.xiaohongshu.com+@types+node@20.12.2/node_modules/@types/node/child_process" />
 /// <reference types="node/stream" />
+/// <reference types=".pnpm/artifactory.devops.xiaohongshu.com+@types+node@20.12.2/node_modules/@types/node/stream" />
 /**
  * 在子进程执行编译
  */

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node/events" />
+/// <reference types=".pnpm/artifactory.devops.xiaohongshu.com+@types+node@20.12.2/node_modules/@types/node/events" />
 import { COMPILE_ENTRY } from './config/constant.config';
 import { Project } from 'xhs-mp-project';
 import EventEmitter from 'events';

package/dist/index.js

@@ -189,11 +189,10 @@ class Compiler extends events_1.default {
         const distDir = this.getDistDir(entryType);
         const cacheDir = this.getCacheDir(entryType);
         const compilerType = this.getCompilerType(entryType);
-        const packMode = compilerType === constant_config_1.COMPILER_TYPE.legacy_dev || compilerType === constant_config_1.COMPILER_TYPE.legacy_build
+        compilerType === constant_config_1.COMPILER_TYPE.legacy_dev || compilerType === constant_config_1.COMPILER_TYPE.legacy_build
             ? 'webpack'
             : 'mp-pack';
         const options = {
-            packMode,
             projectPath: this.project.projectPath,
             appMode: this.project.appMode,
             extJsonPath: this.project.extJsonDir,

package/dist/packs/mp-pack/index.js

@@ -8,12 +8,15 @@ const presets_1 = require("../../presets");
 const path_1 = __importDefault(require("path"));
 const xhs_mp_pack_1 = require("xhs-mp-pack");
 const apm_1 = require("../../utils/apm");
+const const_1 = __importDefault(require("../../utils/const"));
+const { PACK_MODE } = const_1.default;
 const createCompiler = (startConfig) => {
-    const { action, enableDevServer } = startConfig;
+    // const {action, enableDevServer} = startConfig
     const mppack = new xhs_mp_pack_1.MPPack(startConfig);
     const compilerOptions = {
         project: mppack.project,
         packSetting: mppack.packSetting,
+        packMode: PACK_MODE.MPPACK,
         // 注入apm模块
         reporter: (0, apm_1.createReporter)(mppack.project, startConfig.mpUploadOptions)
     };

package/dist/packs/webpack/dev-server/index.js

@@ -19,14 +19,14 @@ const openBrowser_1 = __importDefault(require("./lib/openBrowser"));
 const presets_1 = require("../../../presets");
 const devServer = (config) => __awaiter(void 0, void 0, void 0, function* () {
     const { packSetting } = config;
-    const { devServerPort, distDir } = packSetting;
+    const { distDir } = packSetting;
     const webpackConfigs = (0, presets_1.createConfigs)(config);
     const compiler = (0, webpack_1.default)(webpackConfigs);
     const host = 'localhost';
     const devServerConfig = {
         open: false,
         historyApiFallback: true,
-        port: devServerPort || 1388,
+        port: 1388,
         hot: false,
         static: [
             // emulator entry 地址

package/dist/packs/webpack/index.js

@@ -15,6 +15,8 @@ const xhs_mp_project_1 = require("xhs-mp-project");
 const xhs_mp_pack_1 = require("xhs-mp-pack");
 const webpack_1 = require("./webpack");
 const apm_1 = require("../../utils/apm");
+const const_1 = __importDefault(require("../../utils/const"));
+const { PACK_MODE } = const_1.default;
 // 防御编程
 const handleVersion = (startConfig) => {
     let { action, enableV1 = true, enableV2 = false, enableVDom = false } = startConfig;
@@ -77,6 +79,7 @@ const createCompiler = (startConfig) => {
     const compilerOptions = {
         project: project,
         packSetting: mppackSetting,
+        packMode: PACK_MODE.WEBPACK,
         // 注入apm模块
         reporter: (0, apm_1.createReporter)(project, startConfig.mpUploadOptions)
     };

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

@@ -87,7 +87,7 @@ class XhsAssetsPlugin {
         });
     }
     emitAppJson(compilation, appJSON) {
-        const { project, packSetting } = this.options;
+        const { project, packSetting, packMode } = this.options;
         const { compilePkgs = [const_1.default.MAIN_PKG] } = packSetting;
         // const { mainPkg, subPkgs } = packSetting.getCompilePkgsForEntries()
         // 先删除，用户配置的默认不生效
@@ -109,7 +109,7 @@ class XhsAssetsPlugin {
             this.emitJson(compilation, 'v1/app.json', appJsonSource);
         }
         // 独立分包的 app.json
-        const subPkgs = project.getSubPackages().filter(pkg => compilePkgs.includes(pkg.root));
+        const subPkgs = project.getSubPackages();
         subPkgs.forEach(subPkg => {
             if (subPkg === null || subPkg === void 0 ? void 0 : subPkg.independent) {
                 if (packSetting.enableV2) {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const packs_1 = require("../../../../packs");
 const injectCSS = `
-globalThis.__XHS_IS_WEBVIEW = (globalThis.localStorage && document && document.querySelectorAll)
+globalThis.__XHS_IS_WEBVIEW = (globalThis.localStorage && globalThis.document && globalThis.document.querySelectorAll)
 globalThis.__XHS_APPEND_CSS = function(cssText){
     if (!globalThis.__XHS_IS_WEBVIEW) return;
     var headTags = document.getElementsByTagName('head')

package/dist/types/index.d.ts

@@ -113,6 +113,7 @@ export interface IStart extends Pick<ICompilerConfig, CliPick> {
     devServerPort?: number;
 }
 export type IPresetOptions = {
+    packMode: string;
     project: Project;
     packSetting: MPPackSetting;
     otherSetting?: any;

package/dist/utils/apm/index.js

@@ -5,16 +5,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReporter = void 0;
+const path_1 = __importDefault(require("path"));
 const xhs_mp_utils_1 = require("xhs-mp-utils");
+const fs_extra_1 = require("fs-extra");
 const pkg = require('../../../package.json');
 function debug(...data) {
-    return;
     // return process.send?.(JSON.stringify({ method: 'debugger', data }))
 }
 const cacheMap = {};
-function once(target, key, descriptor) {
+function onceByParams(target, key, descriptor) {
     const originalMethod = descriptor.value;
     descriptor.value = function (...args) {
         try {
@@ -87,22 +91,22 @@ class Reporter {
     }
 }
 __decorate([
-    once
+    onceByParams
 ], Reporter.prototype, "reportThirdFramework", null);
 __decorate([
-    once
+    onceByParams
 ], Reporter.prototype, "reportMlFeature", null);
 __decorate([
-    once
+    onceByParams
 ], Reporter.prototype, "reportMlWebComponent", null);
 __decorate([
-    once
+    onceByParams
 ], Reporter.prototype, "reportJSONComponent", null);
 __decorate([
-    once
+    onceByParams
 ], Reporter.prototype, "reportStyleIsolation", null);
 __decorate([
-    once
+    onceByParams
 ], Reporter.prototype, "reportJSONApp", null);
 function isObject(t) {
     return t != null && typeof t === 'object';
@@ -120,18 +124,20 @@ function createReporter(project, option) {
     var _a, _b, _c;
     try {
         const app_id = option === null || option === void 0 ? void 0 : option.upload_app_id;
-        if (!app_id) {
+        // 上传时有version
+        const version = (_a = option === null || option === void 0 ? void 0 : option.pkgInfo) === null || _a === void 0 ? void 0 : _a.version;
+        if (!app_id || !version) {
             return;
         }
         const apm = new xhs_mp_utils_1.APM(`mp-compiler-${pkg.version}`);
-        (_a = apm === null || apm === void 0 ? void 0 : apm.setContext) === null || _a === void 0 ? void 0 : _a.call(apm, app_id, {
+        (_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,
             third_name: app_id,
             page_key: '0',
             app_env: 0,
             app_type: 0,
-            bundle_version: ((_b = option === null || option === void 0 ? void 0 : option.pkgInfo) === null || _b === void 0 ? void 0 : _b.version) || '',
+            bundle_version: version,
             base_version: ((_c = project.projectJsonContent) === null || _c === void 0 ? void 0 : _c.libVersion) || ''
         });
         const reporter = new Reporter(apm);
@@ -170,8 +176,19 @@ function createReporter(project, option) {
                 }
             }
         }
-        // 延时上报
-        setTimeout(reportJSON);
+        reportJSON();
+        // 统计taro版本
+        const vendor = path_1.default.join(project.miniprogramDir, 'vendors.js.LICENSE.txt');
+        const taro = path_1.default.join(project.miniprogramDir, 'taro.js');
+        if ((0, fs_extra_1.pathExistsSync)(taro) && (0, fs_extra_1.pathExistsSync)(vendor)) {
+            const txt = (0, fs_extra_1.readFileSync)(vendor, { encoding: 'utf-8' });
+            if (txt.includes('React') || txt.includes('react')) {
+                reporter.reportThirdFramework(xhs_mp_utils_1.FeatureReporter.ThirdFramework.taroReact);
+            }
+            else if (txt.includes('@vue') || txt.includes('Vue')) {
+                reporter.reportThirdFramework(xhs_mp_utils_1.FeatureReporter.ThirdFramework.taroVue);
+            }
+        }
         return reporter;
     }
     catch (error) {

package/dist/utils/tagTransformMap.d.ts

@@ -31,5 +31,6 @@ declare const tagTransformMap: {
     'movable-area': string;
     'movable-view': string;
     canvas: string;
+    camera: string;
 };
 export default tagTransformMap;

package/dist/utils/tagTransformMap.js

@@ -33,6 +33,7 @@ const tagTransformMap = {
     editor: 'xhs-vue-editor',
     'movable-area': 'xhs-vue-movable-area',
     'movable-view': 'xhs-vue-movable-view',
-    canvas: 'xhs-vue-canvas'
+    canvas: 'xhs-vue-canvas',
+    camera: 'xhs-vue-camera',
 };
 exports.default = tagTransformMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.3.5",
+  "version": "1.3.8",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -82,11 +82,11 @@
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
-    "xhs-mp-compiler-ml-loader": "1.3.5",
-    "xhs-mp-compiler-utils": "1.2.5",
-    "xhs-mp-pack": "^1.2.5",
-    "xhs-mp-project": "^1.2.5",
-    "xhs-mp-utils": "^1.3.5"
+    "xhs-mp-compiler-ml-loader": "^1.3.8",
+    "xhs-mp-compiler-utils": "^1.3.8",
+    "xhs-mp-pack": "^1.3.8",
+    "xhs-mp-project": "^1.3.8",
+    "xhs-mp-utils": "^1.3.8"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",