xhs-mp-compiler-cli 1.4.0-beta.1 → 1.4.0-beta.4

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.4.0-beta.1",
+  "version": "1.4.0-beta.4",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -94,12 +94,12 @@
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
-    "xhs-mp-compiler-ml-loader": "1.4.0-beta.1",
-    "xhs-mp-compiler-utils": "1.3.0-beta.1",
-    "xhs-mp-pack": "^1.3.0-beta.1",
-    "xhs-mp-project": "^1.3.0-beta.1",
-    "xhs-mp-utils": "^1.4.0-beta.1",
-    "xhs-mp-shared-fs": "^1.1.0-beta.1",
+    "xhs-mp-compiler-ml-loader": "1.4.0-beta.4",
+    "xhs-mp-compiler-utils": "1.3.0-beta.4",
+    "xhs-mp-pack": "^1.3.0-beta.4",
+    "xhs-mp-project": "^1.3.0-beta.4",
+    "xhs-mp-utils": "^1.4.0-beta.4",
+    "xhs-mp-shared-fs": "^1.1.0-beta.4",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {

package/dist/packs/webpack/dev-server/lib/openChrome.applescript

@@ -1,78 +0,0 @@
-property targetTab: null
-property targetTabIndex: -1
-property targetWindow: null
-
-on run argv
-  set theURL to item 1 of argv
-
-  with timeout of 2 seconds
-    tell application "Chrome"
-
-      if (count every window) = 0 then
-        make new window
-      end if
-
-      -- 1: Looking for tab running debugger
-      -- then, Reload debugging tab if found
-      -- then return
-      set found to my lookupTabWithUrl(theURL)
-      if found then
-        set targetWindow's active tab index to targetTabIndex
-        tell targetTab to reload
-        tell targetWindow to activate
-        set index of targetWindow to 1
-        return
-      end if
-
-      -- 2: Looking for Empty tab
-      -- In case debugging tab was not found
-      -- We try to find an empty tab instead
-      set found to my lookupTabWithUrl("chrome://newtab/")
-      if found then
-        set targetWindow's active tab index to targetTabIndex
-        set URL of targetTab to theURL
-        tell targetWindow to activate
-        return
-      end if
-
-      -- 3: Create new tab
-      -- both debugging and empty tab were not found
-      -- make a new tab with url
-      tell window 1
-        activate
-        make new tab with properties {URL:theURL}
-      end tell
-    end tell
-  end timeout
-end run
-
--- Function:
--- Lookup tab with given url
--- if found, store tab, index, and window in properties
--- (properties were declared on top of file)
-on lookupTabWithUrl(lookupUrl)
-  tell application "Chrome"
-    -- Find a tab with the given url
-    set found to false
-    set theTabIndex to -1
-    repeat with theWindow in every window
-      set theTabIndex to 0
-      repeat with theTab in every tab of theWindow
-        set theTabIndex to theTabIndex + 1
-        if (theTab's URL as string) contains lookupUrl then
-          -- assign tab, tab index, and window to properties
-          set targetTab to theTab
-          set targetTabIndex to theTabIndex
-          set targetWindow to theWindow
-          set found to true
-          exit repeat
-        end if
-      end repeat
-
-      if found then
-        exit repeat
-      end if
-    end repeat
-  end tell
-  return found
-end lookupTabWithUrl