@umijs/plugins 4.0.0-canary.20220422.3 → 4.0.0-canary.20220425.2

package/dist/access.js

@@ -8,7 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const withTmpPath_1 = require("./utils/withTmpPath");
 exports.default = (api) => {
@@ -21,18 +25,28 @@ exports.default = (api) => {
         enableBy: api.EnableBy.config,
     });
     api.onGenerateFiles(() => __awaiter(void 0, void 0, void 0, function* () {
+        // allow enable access without access file
+        const hasAccessFile = ['js', 'jsx', 'ts', 'tsx'].some((ext) => fs_1.default.existsSync((0, path_1.join)(api.paths.absSrcPath, `access.${ext}`)));
         // runtime.tsx
         api.writeTmpFile({
             path: 'runtime.tsx',
             content: `
-import React from 'react';
-import accessFactory from '@/access';
+import React from 'react';${hasAccessFile
+                ? `
+import accessFactory from '@/access'
 import { useModel } from '@@/plugin-model';
+`
+                : ''}
 import { AccessContext } from './context';
 
-function Provider(props) {
+function Provider(props) {${hasAccessFile
+                ? `
   const { initialState } = useModel('@@initialState');
   const access = React.useMemo(() => accessFactory(initialState), [initialState]);
+`
+                : `
+  const access = {};
+`}
   return (
     <AccessContext.Provider value={access}>
       { props.children }

package/dist/antd.js

@@ -49,7 +49,8 @@ exports.default = (api) => {
     api.modifyConfig((memo) => {
         checkPkgPath();
         // antd import
-        memo.alias.antd = pkgPath;
+        // alias 会导致 antd 不能多实例，故删除
+        // memo.alias.antd = pkgPath;
         // moment > dayjs
         if (memo.antd.dayjs) {
             memo.alias.moment = (0, path_1.dirname)(require.resolve('dayjs/package.json'));
@@ -79,6 +80,15 @@ exports.default = (api) => {
                     },
                     'antd',
                 ],
+                [
+                    require.resolve('babel-plugin-import'),
+                    {
+                        libraryName: 'antd-4',
+                        libraryDirectory: 'es',
+                        style: style === 'less' ? true : 'css',
+                    },
+                    'antd-4',
+                ],
             ]
             : [];
     });

package/dist/dva.js

@@ -25,11 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllModels = exports.getModelUtil = void 0;
 const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
+const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
 const modelUtils_1 = require("./utils/modelUtils");
 const withTmpPath_1 = require("./utils/withTmpPath");
-const utils_1 = require("@umijs/utils");
 exports.default = (api) => {
     const pkgPath = (0, path_1.join)(__dirname, '../libs/dva.ts');
     api.describe({
@@ -80,15 +80,22 @@ import dvaImmer, { enableES5, enableAllPlugins } from '${(0, utils_1.winPath)(re
 `
                 : ''}
 import React, { useRef } from 'react';
-import { history } from 'umi';
+import { history, ApplyPluginsType, useAppData } from 'umi';
 import { models } from './models';
 
 export function RootContainer(props: any) {
+  const { pluginManager } = useAppData();
   const app = useRef<any>();
+  const runtimeDva = pluginManager.applyPlugins({
+    key: 'dva',
+    type: ApplyPluginsType.modify,
+    initialValue: {},
+  });
   if (!app.current) {
     app.current = create(
       {
         history,
+        ...(runtimeDva.config || {}),
       },
       {
         initialReducer: {},
@@ -139,6 +146,7 @@ export { connect, useDispatch, useStore, useSelector } from 'dva';`,
     api.addRuntimePlugin(() => {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })];
     });
+    api.addRuntimePluginKey(() => ['dva']);
     // dva list model
     api.registerCommand({
         name: 'dva',

package/dist/initial-state.js

@@ -107,7 +107,7 @@ export default () => ({ loading: false, refresh: () => {} })
             content: `
 import React from 'react';
 import Provider from './Provider';
-export function innerProvider(container) {
+export function dataflowProvider(container) {
   return <Provider>{ container }</Provider>;
 }
       `,

package/dist/layout.js

@@ -48,6 +48,7 @@ exports.default = (api) => {
         cwd: api.cwd,
         dep: '@ant-design/pro-layout',
     }) || (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
+    const antdPkgPath = (0, path_1.dirname)(require.resolve('antd/package.json'));
     api.modifyAppData((memo) => {
         const version = require(`${pkgPath}/package.json`).version;
         memo.pluginLayout = {
@@ -59,6 +60,7 @@ exports.default = (api) => {
     api.modifyConfig((memo) => {
         // import from @ant-design/pro-layout
         memo.alias['@ant-design/pro-layout'] = pkgPath;
+        memo.alias['antd-4'] = antdPkgPath;
         return memo;
     });
     api.onGenerateFiles(() => {
@@ -245,7 +247,7 @@ export function patchRoutes({ routes }) {
         });
         const rightRenderContent = `
 import React from 'react';
-import { Avatar, Dropdown, Menu, Spin } from 'antd';
+import { Avatar, Dropdown, Menu, Spin } from 'antd-4';
 import { LogoutOutlined } from '@ant-design/icons';
 {{#Locale}}
 import { SelectLang } from '@@/plugin-locale';
@@ -487,7 +489,7 @@ export default LogoIcon;
             content: `
 import React from 'react';
 import { history, type IRoute } from 'umi';
-import { Result, Button } from 'antd';
+import { Result, Button } from 'antd-4';
 
 const Exception: React.FC<{
   children: React.ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220422.3",
+  "version": "4.0.0-canary.20220425.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -17,15 +17,16 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.35.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220422.3",
+    "@umijs/bundler-utils": "4.0.0-canary.20220425.2",
+    "antd": "^4.20.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
@@ -44,7 +45,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220422.3"
+    "umi": "4.0.0-canary.20220425.2"
   },
   "publishConfig": {
     "access": "public"