Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-frontend-base into dev

es/utils/socket.io/socket.io.mp.d.ts

@@ -0,0 +1,4 @@
+import { io } from './weapp.socket.io.wx.js';
+import { Socket } from "socket.io-client";
+export default io;
+export { Socket, };

es/utils/socket.io/socket.io.mp.js

@@ -1,8 +1,6 @@
-"use strict";
 // 这里要处理小程序环境下的socketIO，待定
-/* import { io } from 'weapp.socket.io';
+// @ts-ignore
+import { io } from './weapp.socket.io.wx.js';
 import { Socket } from "socket.io-client";
 export default io;
-export {
-    Socket,
-}; */ 
+export { Socket, };

lib/utils/socket.io/socket.io.mp.d.ts

@@ -0,0 +1,4 @@
+import { io } from './weapp.socket.io.wx.js';
+import { Socket } from "socket.io-client";
+export default io;
+export { Socket, };

lib/utils/socket.io/socket.io.mp.js

@@ -1,8 +1,9 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Socket = void 0;
 // 这里要处理小程序环境下的socketIO，待定
-/* import { io } from 'weapp.socket.io';
-import { Socket } from "socket.io-client";
-export default io;
-export {
-    Socket,
-}; */ 
+// @ts-ignore
+const weapp_socket_io_wx_js_1 = require("./weapp.socket.io.wx.js");
+const socket_io_client_1 = require("socket.io-client");
+Object.defineProperty(exports, "Socket", { enumerable: true, get: function () { return socket_io_client_1.Socket; } });
+exports.default = weapp_socket_io_wx_js_1.io;

package.json

@@ -31,8 +31,7 @@
         "react-responsive": "^9.0.2",
         "rmc-pull-to-refresh": "^1.0.13",
         "socket.io-client": "^4.7.2",
-        "uuid": "^8.3.2",
-        "weapp.socket.io": "^2.2.1"
+        "uuid": "^8.3.2"
     },
     "peerDependencies": {
         "@ant-design/icons": ">=5.2.6",
@@ -94,4 +93,4 @@
     "module": "es/index",
     "types": "es/index.d.ts",
     "typings": "es/index.d.ts"
-}
+}

src/utils/socket.io/socket.io.mp.ts

@@ -1,7 +1,8 @@
 // 这里要处理小程序环境下的socketIO，待定
-/* import { io } from 'weapp.socket.io';
+// @ts-ignore
+import { io } from './weapp.socket.io.wx.js';
 import { Socket } from "socket.io-client";
 export default io;
 export {
     Socket,
-}; */
+};