@umijs/plugins 4.0.0-beta.12 → 4.0.0-beta.13

package/dist/moment2dayjs.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@umijs/utils");
+const path_1 = require("path");
+/*
+   As long as moment2dayjs is registered, moment will be replaced by dayjs.
+   The presets that can adapt to antd is registered by default.
+   When the user configures preset and plugins at the same time, we will merge them.
+*/
+exports.default = (api) => {
+    api.describe({
+        key: 'moment2dayjs',
+        config: {
+            schema(joi) {
+                return joi.object({
+                    preset: joi.string(),
+                    plugins: joi.array(),
+                });
+            },
+        },
+        enableBy: api.EnableBy.config,
+    });
+    const presets = {
+        antd: [
+            'isSameOrBefore',
+            'isSameOrAfter',
+            'advancedFormat',
+            'customParseFormat',
+            'weekday',
+            'weekYear',
+            'weekOfYear',
+            'isMoment',
+            'localeData',
+            'localizedFormat',
+        ],
+        antdv3: [
+            'isSameOrBefore',
+            'isSameOrAfter',
+            'advancedFormat',
+            'customParseFormat',
+            'weekday',
+            'weekYear',
+            'weekOfYear',
+            'isMoment',
+            'localeData',
+            'localizedFormat',
+            'badMutable',
+        ],
+    };
+    const getDayjsPlugins = (api) => {
+        let { preset = 'antd', plugins = [] } = api.config.moment2dayjs || {};
+        switch (preset) {
+            case 'antd':
+                return Array.from(new Set(presets['antd'].concat(plugins)));
+            case 'antdv3':
+                return Array.from(new Set(presets['antdv3'].concat(plugins)));
+            case 'none':
+                return [].concat(plugins);
+            default:
+                return [];
+        }
+    };
+    // replace moment
+    api.modifyConfig((memo) => {
+        memo.alias.moment = (0, path_1.dirname)(require.resolve('dayjs/package.json'));
+        return memo;
+    });
+    api.onGenerateFiles(() => {
+        const plugins = getDayjsPlugins(api);
+        const runtimeTpl = `
+import dayjs from '{{{dayjsPath}}}';
+import antdPlugin from '{{{dayjsAntdPluginPath}}}';
+
+{{#plugins}}
+import {{.}} from '{{{dayjsPath}}}/plugin/{{.}}';
+{{/plugins}}
+
+{{#plugins}}
+dayjs.extend({{.}});
+{{/plugins}}
+
+dayjs.extend(antdPlugin);
+    `;
+        const dayjsAntdPluginPath = require.resolve('antd-dayjs-webpack-plugin/src/antd-plugin');
+        const dayjsPath = (0, path_1.dirname)(require.resolve('dayjs/package.json'));
+        api.writeTmpFile({
+            path: 'runtime.tsx',
+            content: utils_1.Mustache.render(runtimeTpl, {
+                plugins,
+                dayjsPath,
+                dayjsAntdPluginPath,
+            }),
+        });
+    });
+    api.addEntryCodeAhead(() => [`import './plugin-moment2dayjs/runtime.tsx'`]);
+};

package/dist/utils/modelUtils.d.ts

@@ -0,0 +1,34 @@
+import * as t from '@umijs/bundler-utils/compiled/babel/types';
+import { IApi } from 'umi';
+interface IOpts {
+    contentTest?: (content: string) => Boolean;
+    astTest?: (opts: {
+        node: t.Node;
+        content: string;
+    }) => Boolean;
+}
+export declare class Model {
+    file: string;
+    namespace: string;
+    id: string;
+    constructor(file: string, id: number);
+}
+export declare class ModelUtils {
+    api: IApi;
+    opts: IOpts;
+    count: number;
+    constructor(api: IApi | null, opts: IOpts);
+    getAllModels(opts: {
+        extraModels: string[];
+    }): Model[];
+    getModels(opts: {
+        base: string;
+        pattern?: string;
+    }): string[];
+    isModelValid(opts: {
+        content: string;
+        file: string;
+    }): boolean;
+    static getModelsContent(models: Model[]): string;
+}
+export {};

package/dist/utils/modelUtils.js

@@ -0,0 +1,131 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelUtils = exports.Model = void 0;
+const parser = __importStar(require("@umijs/bundler-utils/compiled/babel/parser"));
+const traverse_1 = __importDefault(require("@umijs/bundler-utils/compiled/babel/traverse"));
+const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
+const utils_1 = require("@umijs/utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const astUtils_1 = require("./astUtils");
+class Model {
+    constructor(file, id) {
+        this.file = file;
+        this.namespace = (0, path_1.basename)(file, (0, path_1.extname)(file));
+        this.id = `model_${id}`;
+    }
+}
+exports.Model = Model;
+class ModelUtils {
+    constructor(api, opts) {
+        this.opts = {};
+        this.count = 1;
+        this.api = api;
+        this.opts = opts;
+    }
+    getAllModels(opts) {
+        // reset count
+        this.count = 1;
+        return [
+            ...this.getModels({
+                base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
+                pattern: '**/*.{ts,tsx,js,jsx}',
+            }),
+            ...this.getModels({
+                base: (0, path_1.join)(this.api.paths.absPagesPath),
+                pattern: '**/models/**/*.{ts,tsx,js,jsx}',
+            }),
+            ...this.getModels({
+                base: (0, path_1.join)(this.api.paths.absPagesPath),
+                pattern: '**/model.{ts,tsx,js,jsx}',
+            }),
+            ...opts.extraModels,
+        ].map((file) => {
+            return new Model(file, this.count++);
+        });
+    }
+    getModels(opts) {
+        return utils_1.glob
+            .sync(opts.pattern || '**/*.{ts,js}', {
+            cwd: opts.base,
+            absolute: true,
+        })
+            .map(utils_1.winPath)
+            .filter((file) => {
+            if (/\.d.ts$/.test(file))
+                return false;
+            if (/\.(test|e2e|spec).([jt])sx?$/.test(file))
+                return false;
+            const content = (0, fs_1.readFileSync)(file, 'utf-8');
+            return this.isModelValid({ content, file });
+        });
+    }
+    isModelValid(opts) {
+        const { file, content } = opts;
+        if (this.opts.contentTest && this.opts.contentTest(content)) {
+            return true;
+        }
+        // transform with esbuild first
+        // to reduce unexpected ast problem
+        const loader = (0, path_1.extname)(file).slice(1);
+        const result = (0, esbuild_1.transformSync)(content, {
+            loader,
+            sourcemap: false,
+            minify: false,
+        });
+        // transform with babel
+        let ret = false;
+        const ast = parser.parse(result.code, {
+            sourceType: 'module',
+            sourceFilename: file,
+            plugins: [],
+        });
+        (0, traverse_1.default)(ast, {
+            ExportDefaultDeclaration: (path) => {
+                let node = path.node.declaration;
+                node = (0, astUtils_1.getIdentifierDeclaration)(node, path);
+                if (this.opts.astTest && this.opts.astTest({ node, content })) {
+                    ret = true;
+                }
+            },
+        });
+        return ret;
+    }
+    static getModelsContent(models) {
+        const imports = [];
+        const modelProps = [];
+        models.forEach((model) => {
+            imports.push(`import ${model.id} from '${model.file}';`);
+            modelProps.push(`${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`);
+        });
+        return `
+${imports.join('\n')}
+
+export const models = {
+${modelProps.join('\n')}
+}`;
+    }
+}
+exports.ModelUtils = ModelUtils;

package/libs/dva.ts

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

package/libs/model.tsx

@@ -0,0 +1,140 @@
+// @ts-ignore
+import isEqual from 'fast-deep-equal';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
+
+// @ts-ignore
+const Context = React.createContext<{ dispatcher: Dispatcher }>(null);
+
+class Dispatcher {
+  callbacks: Record<string, Set<Function>> = {};
+  data: Record<string, unknown> = {};
+  update = (namespace: string) => {
+    if (this.callbacks[namespace]) {
+      this.callbacks[namespace].forEach((cb) => {
+        try {
+          const data = this.data[namespace];
+          cb(data);
+        } catch (e) {
+          cb(undefined);
+        }
+      });
+    }
+  };
+}
+
+interface ExecutorProps {
+  hook: () => any;
+  onUpdate: (val: any) => void;
+  namespace: string;
+}
+
+function Executor(props: ExecutorProps) {
+  const { hook, onUpdate, namespace } = props;
+
+  const updateRef = useRef(onUpdate);
+  const initialLoad = useRef(false);
+
+  let data: any;
+  try {
+    data = hook();
+  } catch (e) {
+    console.error(
+      `plugin-model: Invoking '${namespace || 'unknown'}' model failed:`,
+      e,
+    );
+  }
+
+  // 首次执行时立刻返回初始值
+  useMemo(() => {
+    updateRef.current(data);
+  }, []);
+
+  // React 16.13 后 update 函数用 useEffect 包裹
+  useEffect(() => {
+    if (initialLoad.current) {
+      updateRef.current(data);
+    } else {
+      initialLoad.current = true;
+    }
+  });
+
+  return null;
+}
+
+const dispatcher = new Dispatcher();
+
+export function Provider(props: {
+  models: Record<string, any>;
+  children: React.ReactNode;
+}) {
+  return (
+    <Context.Provider value={{ dispatcher }}>
+      {Object.keys(props.models).map((namespace) => {
+        return (
+          <Executor
+            key={namespace}
+            hook={props.models[namespace]}
+            namespace={namespace}
+            onUpdate={(val) => {
+              dispatcher.data[namespace] = val;
+              dispatcher.update(namespace);
+            }}
+          />
+        );
+      })}
+      {props.children}
+    </Context.Provider>
+  );
+}
+
+export function useModel(namespace: string, selector?: any) {
+  const { dispatcher } = useContext<{ dispatcher: Dispatcher }>(Context);
+  const selectorRef = useRef(selector);
+  selectorRef.current = selector;
+  const [state, setState] = useState(() =>
+    selectorRef.current
+      ? selectorRef.current(dispatcher.data[namespace])
+      : dispatcher.data[namespace],
+  );
+  const stateRef = useRef<any>(state);
+  stateRef.current = state;
+
+  const isMount = useRef(false);
+  useEffect(() => {
+    isMount.current = true;
+    return () => {
+      isMount.current = false;
+    };
+  }, []);
+
+  useEffect(() => {
+    const handler = (data: any) => {
+      if (!isMount.current) {
+        // 如果 handler 执行过程中，组件被卸载了，则强制更新全局 data
+        // TODO: 需要加个 example 测试
+        setTimeout(() => {
+          dispatcher.data[namespace] = data;
+          dispatcher.update(namespace);
+        });
+      } else {
+        const currentState = selectorRef.current
+          ? selectorRef.current(data)
+          : data;
+        const previousState = stateRef.current;
+        if (!isEqual(currentState, previousState)) {
+          setState(currentState);
+        }
+      }
+    };
+
+    dispatcher.callbacks[namespace] ||= new Set();
+    dispatcher.callbacks[namespace].add(handler);
+    dispatcher.update(namespace);
+
+    return () => {
+      dispatcher.callbacks[namespace].delete(handler);
+    };
+  }, [namespace]);
+
+  return state;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-beta.12",
+  "version": "4.0.0-beta.13",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -12,7 +12,8 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "libs"
   ],
   "scripts": {
     "build": "pnpm tsc",
@@ -20,15 +21,20 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-beta.12",
-    "antd": "^4.17.2",
+    "@ant-design/icons": "^4.7.0",
+    "@ant-design/pro-layout": "^6.31.7",
+    "@umijs/bundler-utils": "4.0.0-beta.13",
+    "antd": "^4.17.3",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "babel-plugin-import": "^1.13.3",
     "dayjs": "^1.10.7",
-    "dva": "^2.6.0-beta.22"
+    "dva-core": "^2.0.4",
+    "fast-deep-equal": "3.1.3",
+    "react-redux": "^7.2.6",
+    "redux": "^4.1.2"
   },
   "devDependencies": {
-    "umi": "4.0.0-beta.12"
+    "umi": "4.0.0-beta.13"
   },
   "publishConfig": {
     "access": "public"

package/dist/dayjs.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (api) => {
-    api;
-};