diff --git a/.umirc.js b/.umirc.js index fd50fe80..a87a52b9 100755 --- a/.umirc.js +++ b/.umirc.js @@ -28,6 +28,7 @@ export default defineConfig({ core: resolve(__dirname, './src/core'), theme: resolve(__dirname, './src/theme'), config: resolve(__dirname, './config'), + pages: resolve(__dirname, './src/pages'), components: resolve(__dirname, './src/components'), models: resolve(__dirname, './src/models'), node_modules: resolve(__dirname, './node_modules') diff --git a/package-lock.json b/package-lock.json index cc7f5d2a..02a901b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4986,6 +4986,7 @@ "version": "0.9.1", "resolved": "https://registry.npmjs.org/@umijs/plugin-dva/-/plugin-dva-0.9.1.tgz", "integrity": "sha512-ZaaZnrqFu9fRtyl7Ah8WN3RJHpJb4PM2ZH7BC0+BqMbEVOyUQkBgf4cy/ddkJ1skbKQVlHN1ZQIiaB6q1nxJww==", + "dev": true, "requires": { "babel-plugin-dva-hmr": "^0.4.2", "dva": "^2.6.0-beta.20", @@ -5115,6 +5116,95 @@ "@umijs/test": "^3.0.7" } }, + "@umijs/plugin-webpack-5": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@umijs/plugin-webpack-5/-/plugin-webpack-5-0.1.3.tgz", + "integrity": "sha512-L/6fGe8BTetUb59KYrV7Pg9wmHpfFCzDIoFN+pvEVfujByxH8aXuSuYnf6A0fHAU3iWv65GqpOsFysJjoxiqrA==", + "requires": { + "mini-css-extract-plugin": "0.9.0", + "tty-browserify": "0.0.1", + "url": "0.11.0", + "webpack": "5.0.0-beta.12" + }, + "dependencies": { + "enhanced-resolve": { + "version": "5.0.0-beta.4", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.0.0-beta.4.tgz", + "integrity": "sha512-5/C1ZLbPbiFKM9WnF2LKvwresdLoKb0Py6r9XAt9gojZ6wnJb1ay2OzLY+T0DX5KSrimvTufAGISysArUlRpdQ==", + "requires": { + "graceful-fs": "^4.2.0", + "tapable": "^2.0.0-beta.8" + } + }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, + "loader-runner": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-3.1.0.tgz", + "integrity": "sha512-wE/bOCdTKMR2rm7Xxh+eirDOmN7Vx7hntWgiTayuFPtF8MgsFDo49SP8kkYz8IVlEBTOtR7P+XI7bE1xjo/IkA==" + }, + "tapable": { + "version": "2.0.0-beta.9", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.0.0-beta.9.tgz", + "integrity": "sha512-+VBUuZXh+WIHnKOeo+A27SB/1sHTVWozcKweDIAhB/XOGnr8cy6ULZjU+qpGxO/G4xEyWCCaWTX/HPEkGg3Xrg==" + }, + "tty-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==" + }, + "watchpack": { + "version": "2.0.0-beta.12", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.0.0-beta.12.tgz", + "integrity": "sha512-vUJN6XQCBqrUkyX74WNopUvASMLqgicYGA5nO/FwSfdmLQgrfy44Z+Jl2YHHHXy/gDO6RlbArR26YQGeIWfoAg==", + "requires": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + } + }, + "webpack": { + "version": "5.0.0-beta.12", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.0.0-beta.12.tgz", + "integrity": "sha512-a6YqL0l1xQ/B2GcIF1jS6AMlCK7VFoy0O+/2uBK6LjrNX8d85snl0nmEWkBzy9Zwm+orrOZs6deBfkSe6UkHnw==", + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/wasm-edit": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "acorn": "^7.0.0", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "5.0.0-beta.4", + "eslint-scope": "^5.0.0", + "events": "^3.0.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.15", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^3.1.0", + "loader-utils": "^1.2.3", + "mime": "^2.4.4", + "neo-async": "^2.6.1", + "pkg-dir": "^4.2.0", + "schema-utils": "^2.5.0", + "tapable": "2.0.0-beta.9", + "terser-webpack-plugin": "^2.3.1", + "watchpack": "2.0.0-beta.12", + "webpack-sources": "2.0.0-beta.8" + } + }, + "webpack-sources": { + "version": "2.0.0-beta.8", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.0.0-beta.8.tgz", + "integrity": "sha512-RUaCJu7HYNeuzlY4WYcArcnOzMIj7kHndQ4pBdgP3iiMpG3Ke0BWY5wvb/VEFgsIXp3ZzPGRECwX+4fgpcKFYw==", + "requires": { + "source-list-map": "^2.0.1", + "source-map": "~0.6.1" + } + } + } + }, "@umijs/preset-built-in": { "version": "3.2.23", "resolved": "https://registry.npmjs.org/@umijs/preset-built-in/-/preset-built-in-3.2.23.tgz", @@ -8046,7 +8136,8 @@ "babel-plugin-dva-hmr": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/babel-plugin-dva-hmr/-/babel-plugin-dva-hmr-0.4.2.tgz", - "integrity": "sha512-QP5W0IT9LDFgoqkXD0g7wn/FMn7zO562P8qys23twXri4i3E1SGOQ3z7jqcPrqzfTZHx+Ufr+cXy9oI6OLMYZg==" + "integrity": "sha512-QP5W0IT9LDFgoqkXD0g7wn/FMn7zO562P8qys23twXri4i3E1SGOQ3z7jqcPrqzfTZHx+Ufr+cXy9oI6OLMYZg==", + "dev": true }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", @@ -11620,6 +11711,7 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/dva-immer/-/dva-immer-0.5.0.tgz", "integrity": "sha512-pyKL35pxO6xXYzMtkXc9z4F2BmMbx6dyoEQxuXcxAVoOJMRTjt04RVoCxv/uwuYs8CBVdsj73P7gGCzV5i5cRg==", + "dev": true, "requires": { "@babel/runtime": "^7.0.0", "immer": "^7.0.5" @@ -11628,7 +11720,8 @@ "immer": { "version": "7.0.9", "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz", - "integrity": "sha512-Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A==" + "integrity": "sha512-Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A==", + "dev": true } } }, @@ -11636,6 +11729,7 @@ "version": "3.0.21", "resolved": "https://registry.npmjs.org/dva-loading/-/dva-loading-3.0.21.tgz", "integrity": "sha512-kDmQ5c2tcWJZqujrrEQyokE2nWZFh3BHFQVjQquLatwFZFr1jPwUkpBi85prZPofV4x0WOUJxXKteJq+O/kNnQ==", + "dev": true, "requires": { "@babel/runtime": "^7.0.0" } diff --git a/src/models/socket.ts b/src/models/socket.ts index 4cbb9eb5..3f48c6b6 100644 --- a/src/models/socket.ts +++ b/src/models/socket.ts @@ -42,7 +42,6 @@ export default { }, reducers: { updateState(state, { payload }) { - console.log(payload) return { ...state, ...payload,