@next-core/brick-kit 2.194.1 → 2.195.0

package/dist/index.esm.js

@@ -10,7 +10,7 @@ import { pipes } from '@next-core/pipes';
 import i18next, { getFixedT } from 'i18next';
 import React, { useState, useEffect, useMemo, useContext, createContext, useRef, useReducer, useCallback } from 'react';
 import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
-import { userAnalytics, apiAnalyzer } from '@next-core/easyops-analytics';
+import { userAnalytics, apiAnalyzer, SkywalkingAnalysis } from '@next-core/easyops-analytics';
 import { Modal, message, Empty, ConfigProvider } from 'antd';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import yaml from 'js-yaml';
@@ -6106,11 +6106,11 @@ function getApiArgsFromApiProfile(_ref, originalArgs, method) {
   }, ...args];
 }
 function getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version) {
-  var prefix = version ? serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
+  var prefix = version ? serviceName === "logic.api.gateway" ? "" : serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
   var restArgs = originalArgs.slice();
   var transformedUri = uri.replace(/:([^/]+)/g, () => restArgs.shift());
   return {
-    url: prefix + transformedUri,
+    url: prefix ? prefix + transformedUri : transformedUri.replace(/^\//, ""),
     args: restArgs
   };
 }
@@ -9121,9 +9121,12 @@ class Kernel {
     var bricksMap = new Map();
 
     // bootstrapData 数据和 pubDeps 中可能同时存在同一个包名，需要过滤去重， 以 pubDeps 中的包为准
-    [...brickPackages, ...pubDeps].forEach(pkg => {
+    [...pubDeps, ...brickPackages].forEach(pkg => {
       var pkgName = pkg.filePath.split("/")[1];
-      bricksMap.set(pkgName, pkg);
+      // 始终将 pubDeps 放在前面
+      if (!bricksMap.has(pkgName)) {
+        bricksMap.set(pkgName, pkg);
+      }
     });
     return Array.from(bricksMap.values());
   }
@@ -12027,6 +12030,9 @@ class Router {
       // Create the page tracker before page load.
       // And the API Analyzer maybe disabled.
       var tracePageEnd = (_apiAnalyzer$getInsta = apiAnalyzer.getInstance()) === null || _apiAnalyzer$getInsta === void 0 ? void 0 : _apiAnalyzer$getInsta.tracePage();
+      SkywalkingAnalysis.setPerformance({
+        pagePath: "".concat(location.pathname).concat(location.search)
+      });
       var locationContext = _this3.locationContext = new LocationContext(_this3.kernel, location, renderId);
       if (window.DEVELOPER_PREVIEW) {
         return;
@@ -12585,12 +12591,9 @@ class LegacyErrorBoundary extends React.Component {
       error
     };
   }
-
-  /* componentDidCatch(error, info) {
-    // You can also log the error to an error reporting service
-    logErrorToMyService(error, info);
-  } */
-
+  componentDidCatch(error) {
+    SkywalkingAnalysis.reportFrameErrors(error);
+  }
   render() {
     if (this.state.error) {
       // You can render any custom fallback UI