Merge branch 'master' into dev

clouDr-f2e · Dec 17, 2021 · 424231a · 424231a
2 parents ac95256 + b4e951e
commit 424231a
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 46 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.47",
+  "version": "2.1.48",
   "private": true,
   "license": "MIT",
   "author": "cjinhuo",

diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-browser",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "A SDK For Monitoring Browser Errors",
   "author": "cjinhuo",
   "license": "MIT",
@@ -11,10 +11,10 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-utils": "2.1.47",
-    "@zyf2e/monitor-core": "2.1.47",
-    "@zyf2e/monitor-shared": "2.1.47",
-    "@zyf2e/monitor-types": "2.1.47"
+    "@zyf2e/monitor-utils": "2.1.48",
+    "@zyf2e/monitor-core": "2.1.48",
+    "@zyf2e/monitor-shared": "2.1.48",
+    "@zyf2e/monitor-types": "2.1.48"
   },
   "buildOptions": {
     "formats": [

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-core",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "@zyf2e/monitor-core",
   "author": "cjinhuo",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-core": "2.1.47",
-    "@zyf2e/monitor-types": "2.1.47",
-    "@zyf2e/monitor-utils": "2.1.47",
-    "@zyf2e/monitor-shared": "2.1.47"
+    "@zyf2e/monitor-core": "2.1.48",
+    "@zyf2e/monitor-types": "2.1.48",
+    "@zyf2e/monitor-utils": "2.1.48",
+    "@zyf2e/monitor-shared": "2.1.48"
   }
 }
diff --git a/packages/core/src/external.ts b/packages/core/src/external.ts
@@ -18,6 +18,7 @@ interface LogTypes {
   tag?: TNumStrObj
   level?: Severity
   ex?: Error | any
+  type?: string
 }
 
 /**
@@ -26,13 +27,13 @@ interface LogTypes {
  * @export
  * @param {LogTypes} { message = 'emptyMsg', tag = '', level = Severity.Critical, ex = '' }
  */
-export function log({ message = 'emptyMsg', tag = '', level = Severity.Critical, ex = '' }: LogTypes): void {
+export function log({ message = 'emptyMsg', tag = '', level = Severity.Critical, ex = '', type = ERRORTYPES.LOG_ERROR }: LogTypes): void {
   let errorInfo = {}
   if (isError(ex)) {
     errorInfo = extractErrorStack(ex, level)
   }
   const error = {
-    type: ERRORTYPES.LOG_ERROR,
+    type,
     level,
     message: unknownToString(message),
     name: 'MITO.log',
@@ -47,5 +48,5 @@ export function log({ message = 'emptyMsg', tag = '', level = Severity.Critical,
     data: message,
     level: Severity.fromString(level.toString())
   })
-  transportData.send(error)
+  transportData.send(error);
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-react",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "A SDK For Report React ErrorBoundary",
   "author": "cjinhuo",
   "license": "MIT",
@@ -11,8 +11,8 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-core": "2.1.47",
-    "@zyf2e/monitor-utils": "2.1.47",
-    "@zyf2e/monitor-shared": "2.1.47"
+    "@zyf2e/monitor-core": "2.1.48",
+    "@zyf2e/monitor-utils": "2.1.48",
+    "@zyf2e/monitor-shared": "2.1.48"
   }
 }
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-shared",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "@zyf2e/monitor-shared",
   "author": "cjinhuo",
   "license": "MIT",

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-types",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "@zyf2e/monitor-types",
   "author": "cjinhuo",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-core": "2.1.47",
-    "@zyf2e/monitor-utils": "2.1.47",
-    "@zyf2e/monitor-browser": "2.1.47",
-    "@zyf2e/monitor-shared": "2.1.47"
+    "@zyf2e/monitor-core": "2.1.48",
+    "@zyf2e/monitor-utils": "2.1.48",
+    "@zyf2e/monitor-browser": "2.1.48",
+    "@zyf2e/monitor-shared": "2.1.48"
   }
 }
diff --git a/packages/types/src/transportData.ts b/packages/types/src/transportData.ts
@@ -26,7 +26,7 @@ interface ICommonDataType {
 }
 
 export interface ReportDataType extends ICommonDataType {
-  type?: ERRORTYPES
+  type?: string
   message?: string
   url: string
   name?: string

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-utils",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "@zyf2e/monitor-utils",
   "author": "cjinhuo",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-core": "2.1.47",
-    "@zyf2e/monitor-browser": "2.1.47",
-    "@zyf2e/monitor-shared": "2.1.47",
-    "@zyf2e/monitor-types": "2.1.47"
+    "@zyf2e/monitor-core": "2.1.48",
+    "@zyf2e/monitor-browser": "2.1.48",
+    "@zyf2e/monitor-shared": "2.1.48",
+    "@zyf2e/monitor-types": "2.1.48"
   }
 }
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-vue",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "A SDK for monitoring Vue errors",
   "author": "cjinhuo",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-core": "2.1.47",
-    "@zyf2e/monitor-utils": "2.1.47",
-    "@zyf2e/monitor-shared": "2.1.47",
-    "@zyf2e/monitor-types": "2.1.47"
+    "@zyf2e/monitor-core": "2.1.48",
+    "@zyf2e/monitor-utils": "2.1.48",
+    "@zyf2e/monitor-shared": "2.1.48",
+    "@zyf2e/monitor-types": "2.1.48"
   }
 }
diff --git a/packages/web-performance/package.json b/packages/web-performance/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-web-performance",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "A SDK For Report Web Performance",
   "author": "allen(https://github.com/Chryseis)",
   "license": "MIT",

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-web",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "A SDK For Monitoring Web(React、Vue) Errors",
   "author": "cjinhuo(https://github.com/cjinhuo)",
   "license": "MIT",
@@ -11,8 +11,8 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-browser": "2.1.47",
-    "@zyf2e/monitor-react": "2.1.47",
-    "@zyf2e/monitor-vue": "2.1.47"
+    "@zyf2e/monitor-browser": "2.1.48",
+    "@zyf2e/monitor-react": "2.1.48",
+    "@zyf2e/monitor-vue": "2.1.48"
   }
 }
diff --git a/packages/wx-mini-performance/package.json b/packages/wx-mini-performance/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-wx-mini-performance",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "A SDK For Report Wx Mini Performance",
   "main": "dist/wx-mini-performance.js",
   "module": "dist/wx-mini-performance.js",

diff --git a/packages/wx-mini/package.json b/packages/wx-mini/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zyf2e/monitor-wx-mini",
-  "version": "2.1.47",
+  "version": "2.1.48",
   "description": "A SDK For Monitoring wx-mini Errors",
   "author": "cjinhuo",
   "license": "MIT",
@@ -11,10 +11,10 @@
     "dist"
   ],
   "dependencies": {
-    "@zyf2e/monitor-core": "2.1.47",
-    "@zyf2e/monitor-utils": "2.1.47",
-    "@zyf2e/monitor-shared": "2.1.47",
-    "@zyf2e/monitor-types": "2.1.47",
+    "@zyf2e/monitor-core": "2.1.48",
+    "@zyf2e/monitor-utils": "2.1.48",
+    "@zyf2e/monitor-shared": "2.1.48",
+    "@zyf2e/monitor-types": "2.1.48",
     "@types/wechat-miniprogram": "^3.1.0"
   }
 }