@umijs/plugins 4.0.0-canary.20230531.1 → 4.0.0-canary.20230531.2

package/dist/dva.js

@@ -42,7 +42,7 @@ var import_plugin_utils = require("umi/plugin-utils");
 var import_modelUtils = require("./utils/modelUtils");
 var import_withTmpPath = require("./utils/withTmpPath");
 var dva_default = (api) => {
-  const pkgPath = (0, import_path.join)(__dirname, "../libs/dva.ts");
+  const pkgPath = (0, import_path.join)(__dirname, "../libs/dva.tsx");
   api.describe({
     config: {
       schema({ zod }) {

package/libs/dva.tsx

@@ -0,0 +1,45 @@
+import React from 'react';
+// @ts-ignore
+import { create, saga, utils } from 'dva-core';
+import {
+  connect,
+  Provider,
+  useDispatch,
+  useSelector,
+  useStore,
+} from 'react-redux';
+export { bindActionCreators } from 'redux';
+export { create, saga, utils };
+export { connect, Provider, useDispatch, useSelector, useStore };
+
+export default function dva(opts: any) {
+  const app = create(opts, {
+    initialReducer: {},
+    setupApp() {},
+  });
+  const oldAppStart = app.start;
+  app.router = router;
+  app.start = start;
+  return app;
+
+  function router(router: any) {
+    app._router = router;
+  }
+
+  function start(elem: any) {
+    // old dva.start() supports passing arguments
+    if (typeof elem !== 'undefined') {
+      throw new Error('dva.start() should not be called with any arguments.');
+    }
+    if (!app._store) {
+      oldAppStart.call(app);
+    }
+    const store = app._store;
+    const router = app._router;
+    return (extraProps: any) => {
+      return (
+        <Provider store={store}>{router({ app, ...extraProps })}</Provider>
+      );
+    };
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230531.1",
+  "version": "4.0.0-canary.20230531.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -44,12 +44,12 @@
     "styled-components": "6.0.0-rc.0",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.0-canary.20230531.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230531.2",
     "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20230531.1"
+    "umi": "4.0.0-canary.20230531.2"
   },
   "publishConfig": {
     "access": "public"

package/libs/dva.ts

@@ -1,10 +0,0 @@
-// @ts-ignore
-export { create, saga, utils } from 'dva-core';
-export {
-  connect,
-  Provider,
-  useDispatch,
-  useSelector,
-  useStore,
-} from 'react-redux';
-export { bindActionCreators } from 'redux';