fix mp plugin webpack mp sdk wrongly pack & fix react-native sdk upda…

…teRoomInfo without client info

packages/page-spy-mp-base/rollup.config.mjs

@@ -5,7 +5,6 @@ import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import json from '@rollup/plugin-json';
 import replace from '@rollup/plugin-replace';
-import terser from '@rollup/plugin-terser';
 import { DEFAULT_EXTENSIONS } from '@babel/core';
 import fs from 'fs';
 
@@ -21,7 +20,6 @@ const plugins = [
   replace({
     preventAssignment: true,
   }),
-  terser(),
 ];
 
 /**

packages/page-spy-mp-base/src/index.ts

@@ -111,6 +111,7 @@ class PageSpy {
       config,
       atom,
       client: PageSpy.client,
+      mp,
     });
 
     this.init();

packages/page-spy-mp-base/src/types.ts

@@ -1,3 +1,5 @@
+import { InitConfigBase, OnInitParams } from '@huolala-tech/page-spy-types';
+
 export type AsyncCallback<R = void, E = any> = {
   success?: (res: R) => void;
   fail?: (error: E) => void;
@@ -323,3 +325,8 @@ export type MPSDK = MPUIAPI &
   MPNetworkAPI &
   MPSystemAPI &
   MPRouterAPI;
+
+export interface MPPluginInitParams<T extends InitConfigBase>
+  extends OnInitParams<T> {
+  mp: MPSDK;
+}

packages/page-spy-plugin-mp-data-harbor/src/index.ts

@@ -16,6 +16,8 @@ import {
   type Client,
   type SocketStoreBase,
   psLog,
+  MPPluginInitParams,
+  setMPSDK,
 } from '@huolala-tech/page-spy-mp-base';
 
 interface DataHarborConfig {
@@ -75,10 +77,11 @@ export default class MPDataHarborPlugin implements PageSpyPlugin {
     socketStore,
     config,
     client,
-  }: OnInitParams<InitConfigBase>) {
+    mp,
+  }: MPPluginInitParams<InitConfigBase>) {
     if (MPDataHarborPlugin.hasInited) return;
     MPDataHarborPlugin.hasInited = true;
-
+    setMPSDK(mp);
     this.$pageSpyConfig = config;
     this.$socketStore = socketStore;
     this.client = client;

packages/page-spy-react-native/package.json

@@ -3,8 +3,7 @@
   "version": "2.0.0-beta.1",
   "description": "An SDK of PageSpy for debugging react native app",
   "license": "MIT",
-  "main": "dist/cjs/index.min.js",
-  "module": "dist/esm/index.min.js",
+  "main": "dist/esm/index.min.js",
   "types": "dist/types/index.d.ts",
   "files": [
     "dist"
@@ -29,7 +28,6 @@
     "watch": "rollup -c -w"
   },
   "dependencies": {
-    "@huolala-tech/page-spy-base": "^2.0.0-beta.1",
     "@huolala-tech/page-spy-types": "^2.0.0-beta.1",
     "promise": "^8.3.0"
   },
@@ -39,6 +37,7 @@
     "@babel/preset-env": "^7.14.1",
     "@babel/preset-typescript": "^7.13.0",
     "@babel/runtime": "^7.13.0",
+    "@huolala-tech/page-spy-base": "^2.0.0-beta.1",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-node-resolve": "^15.0.1",

packages/page-spy-react-native/rollup.config.mjs

@@ -47,11 +47,6 @@ export default {
   output: [
     {
       file: pkg.main,
-      format: 'cjs',
-      sourcemap: true,
-    },
-    {
-      file: pkg.module,
       format: 'esm',
       sourcemap: true,
     },

packages/page-spy-react-native/src/index.ts

@@ -3,7 +3,7 @@ import {
   isArray,
   isClass,
   psLog,
-} from '@huolala-tech/page-spy-base';
+} from '@huolala-tech/page-spy-base/dist/utils';
 import { Client } from '@huolala-tech/page-spy-base/dist/client';
 import type {
   PageSpyPlugin,
@@ -57,16 +57,7 @@ class PageSpy {
     ];
   }
 
-  static client: Client = new Client({
-    osType: osMap[Platform.OS] || 'unknown',
-    osVersion: String(Platform.Version),
-    browserType: 'react-native',
-    browserVersion: `${rnv.major}.${rnv.minor}.${rnv.patch}${
-      rnv.prerelease ? '-' + rnv.prerelease : ''
-    }`,
-    framework: 'react-native',
-    sdk: 'rn',
-  });
+  static client: Client;
 
   request: Request | null = null;
 
@@ -145,6 +136,7 @@ class PageSpy {
 
     socketStore.connectable = true;
     socketStore.getPageSpyConfig = () => this.config.get();
+    socketStore.getClient = () => PageSpy.client;
     socketStore.messageCapacity = messageCapacity;
   }
 
@@ -203,6 +195,17 @@ class PageSpy {
   }
 }
 
+PageSpy.client = new Client({
+  osType: osMap[Platform.OS] || 'unknown',
+  osVersion: String(Platform.Version),
+  browserType: 'react-native',
+  browserVersion: `${rnv.major}.${rnv.minor}.${rnv.patch}${
+    rnv.prerelease ? '-' + rnv.prerelease : ''
+  }`,
+  framework: 'react-native',
+  sdk: 'rn',
+});
+
 const INTERNAL_PLUGINS = [
   new ConsolePlugin(),
   new ErrorPlugin(),

packages/page-spy-react-native/src/plugins/console.ts

@@ -4,7 +4,9 @@ import type {
   OnInitParams,
   SpyBase,
 } from '@huolala-tech/page-spy-types';
-import { atom, getRandomId, makeMessage } from '@huolala-tech/page-spy-base';
+import { getRandomId } from '@huolala-tech/page-spy-base/dist/utils';
+import { atom } from '@huolala-tech/page-spy-base/dist/atom';
+import { makeMessage } from '@huolala-tech/page-spy-base/dist/message';
 import socketStore from '../helpers/socket';
 import type { InitConfig } from '../config';