@umijs/plugins 4.0.7 → 4.0.10

package/dist/dva.js

@@ -1,84 +1,103 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (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 __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-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");
-exports.default = (api) => {
-    const pkgPath = (0, path_1.join)(__dirname, '../libs/dva.ts');
-    api.describe({
-        config: {
-            schema(Joi) {
-                return Joi.object({
-                    extraModels: Joi.array().items(Joi.string()),
-                    immer: Joi.object(),
-                });
-            },
-        },
-        enableBy: api.EnableBy.config,
-    });
-    api.modifyAppData((memo) => {
-        const models = getAllModels(api);
-        memo.pluginDva = {
-            pkgPath,
-            models,
-        };
-        return memo;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/dva.ts
+var dva_exports = {};
+__export(dva_exports, {
+  default: () => dva_default,
+  getAllModels: () => getAllModels,
+  getModelUtil: () => getModelUtil
+});
+module.exports = __toCommonJS(dva_exports);
+var t = __toESM(require("@umijs/bundler-utils/compiled/babel/types"));
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+var import_umi = require("umi");
+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");
+  api.describe({
+    config: {
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object({
+          extraModels: Joi.array().items(Joi.string()),
+          immer: Joi.object()
+        }), Joi.boolean().invalid(true));
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.modifyAppData((memo) => {
+    const models = getAllModels(api);
+    memo.pluginDva = {
+      pkgPath,
+      models
+    };
+    return memo;
+  });
+  api.modifyConfig((memo) => {
+    memo.alias["dva$"] = pkgPath;
+    return memo;
+  });
+  api.onGenerateFiles((args) => {
+    var _a, _b, _c, _d, _e, _f;
+    const models = args.isFirstTime ? api.appData.pluginDva.models : getAllModels(api);
+    api.writeTmpFile({
+      path: "models.ts",
+      content: import_modelUtils.ModelUtils.getModelsContent(models)
     });
-    api.modifyConfig((memo) => {
-        // import from dva
-        memo.alias['dva$'] = pkgPath;
-        return memo;
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+export interface IRuntimeConfig {
+  dva?: {
+    config?: {
+        initialState?: Record<string, any>;
+        onError?: any;
+        onStateChange?: any;
+        onAction?: any;
+        onHmr?: any;
+        onReducer?: any;
+        onEffect?: any;
+        extraReducers?: any;
+        extraEnhancers?: any;
+        [key: string]: any;
+    },
+    plugins?: string[];
+  }
+}
+      `
     });
-    api.onGenerateFiles((args) => {
-        var _a, _b, _c, _d, _e, _f;
-        const models = args.isFirstTime
-            ? api.appData.pluginDva.models
-            : getAllModels(api);
-        // models.ts
-        api.writeTmpFile({
-            path: 'models.ts',
-            content: modelUtils_1.ModelUtils.getModelsContent(models),
-        });
-        // dva.tsx
-        api.writeTmpFile({
-            path: 'dva.tsx',
-            tpl: `
+    api.writeTmpFile({
+      path: "dva.tsx",
+      tpl: `
 // It's faked dva
 // aliased to @umijs/plugins/templates/dva
 import { create, Provider } from 'dva';
-import createLoading from '${(0, utils_1.winPath)(require.resolve('dva-loading'))}';
-${((_a = api.config.dva) === null || _a === void 0 ? void 0 : _a.immer)
-                ? `
-import dvaImmer, { enableES5, enableAllPlugins } from '${(0, utils_1.winPath)(require.resolve('dva-immer'))}';
-`
-                : ''}
+import createLoading from '${(0, import_utils.winPath)(require.resolve("dva-loading"))}';
+${((_a = api.config.dva) == null ? void 0 : _a.immer) ? `
+import dvaImmer, { enableES5, enableAllPlugins } from '${(0, import_utils.winPath)(require.resolve("dva-immer"))}';
+` : ""}
 import React, { useRef } from 'react';
 import { history, ApplyPluginsType, useAppData } from 'umi';
 import { models } from './models';
@@ -111,9 +130,9 @@ export function RootContainer(props: any) {
     );
     dvaApp = app.current;
     app.current.use(createLoading());
-    ${((_b = api.config.dva) === null || _b === void 0 ? void 0 : _b.immer) ? `app.current.use(dvaImmer());` : ''}
-    ${((_d = (_c = api.config.dva) === null || _c === void 0 ? void 0 : _c.immer) === null || _d === void 0 ? void 0 : _d.enableES5) ? `enableES5();` : ''}
-    ${((_f = (_e = api.config.dva) === null || _e === void 0 ? void 0 : _e.immer) === null || _f === void 0 ? void 0 : _f.enableAllPlugins) ? `enableAllPlugins();` : ''}
+    ${((_b = api.config.dva) == null ? void 0 : _b.immer) ? `app.current.use(dvaImmer());` : ""}
+    ${((_d = (_c = api.config.dva) == null ? void 0 : _c.immer) == null ? void 0 : _d.enableES5) ? `enableES5();` : ""}
+    ${((_f = (_e = api.config.dva) == null ? void 0 : _e.immer) == null ? void 0 : _f.enableAllPlugins) ? `enableAllPlugins();` : ""}
     (runtimeDva.plugins || []).forEach((p) => {
       app.current.use(p);
     });
@@ -132,82 +151,77 @@ export function getDvaApp() {
   return dvaApp;
 }
       `,
-            context: {},
-        });
-        // runtime.tsx
-        api.writeTmpFile({
-            path: 'runtime.tsx',
-            content: `
+      context: {}
+    });
+    api.writeTmpFile({
+      path: "runtime.tsx",
+      content: `
 import React from 'react';
 import { RootContainer } from './dva';
 
 export function dataflowProvider(container, opts) {
   return React.createElement(RootContainer, opts, container);
 }
-      `,
-        });
-        // index.ts for export
-        api.writeTmpFile({
-            path: 'index.ts',
-            content: `
+      `
+    });
+    api.writeTmpFile({
+      path: "index.ts",
+      content: `
 export { connect, useDispatch, useStore, useSelector } from 'dva';
 export { getDvaApp } from './dva';
-`,
-        });
-    });
-    api.addTmpGenerateWatcherPaths(() => {
-        return [(0, path_1.join)(api.paths.absSrcPath, 'models')];
-    });
-    api.addRuntimePlugin(() => {
-        return [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })];
-    });
-    api.addRuntimePluginKey(() => ['dva']);
-    // dva list model
-    api.registerCommand({
-        name: 'dva',
-        fn() {
-            api.logger.info(plugin_utils_1.chalk.green.bold('dva models'));
-            api.appData.pluginDva.models.forEach((model) => {
-                api.logger.info(`  - ${(0, path_1.relative)(api.cwd, model.file)}`);
-            });
-        },
+`
     });
+  });
+  api.addTmpGenerateWatcherPaths(() => {
+    return [(0, import_path.join)(api.paths.absSrcPath, "models")];
+  });
+  api.addRuntimePlugin(() => {
+    return [(0, import_withTmpPath.withTmpPath)({ api, path: "runtime.tsx" })];
+  });
+  api.addRuntimePluginKey(() => ["dva"]);
+  api.registerCommand({
+    name: "dva",
+    fn() {
+      api.logger.info(import_plugin_utils.chalk.green.bold("dva models"));
+      api.appData.pluginDva.models.forEach((model) => {
+        api.logger.info(`  - ${(0, import_path.relative)(api.cwd, model.file)}`);
+      });
+    }
+  });
 };
 function getModelUtil(api) {
-    return new modelUtils_1.ModelUtils(api, {
-        contentTest(content) {
-            return content.startsWith('// @dva-model');
-        },
-        astTest({ node, content }) {
-            if (isModelObject(node)) {
-                return true;
-            }
-            else if (content.includes('dva-model-extend') &&
-                t.isCallExpression(node) &&
-                node.arguments.length === 2 &&
-                isModelObject(node.arguments[1])) {
-                return true;
-            }
-            return false;
-        },
-    });
+  return new import_modelUtils.ModelUtils(api, {
+    contentTest(content) {
+      return content.startsWith("// @dva-model");
+    },
+    astTest({ node, content }) {
+      if (isModelObject(node)) {
+        return true;
+      } else if (content.includes("dva-model-extend") && t.isCallExpression(node) && node.arguments.length === 2 && isModelObject(node.arguments[1])) {
+        return true;
+      }
+      return false;
+    }
+  });
 }
-exports.getModelUtil = getModelUtil;
 function getAllModels(api) {
-    return getModelUtil(api).getAllModels({
-        extraModels: [...(api.config.dva.extraModels || [])],
-    });
+  return getModelUtil(api).getAllModels({
+    extraModels: [...api.config.dva.extraModels || []]
+  });
 }
-exports.getAllModels = getAllModels;
 function isModelObject(node) {
-    return (t.isObjectExpression(node) &&
-        node.properties.some((property) => {
-            return [
-                'state',
-                'reducers',
-                'subscriptions',
-                'effects',
-                'namespace',
-            ].includes(property.key.name);
-        }));
+  return t.isObjectExpression(node) && node.properties.some((property) => {
+    return [
+      "state",
+      "reducers",
+      "subscriptions",
+      "effects",
+      "namespace"
+    ].includes(property.key.name);
+  });
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getAllModels,
+  getModelUtil
+});

package/dist/icons.js

@@ -1,5 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (api) => {
-    api;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/icons.ts
+var icons_exports = {};
+__export(icons_exports, {
+  default: () => icons_default
+});
+module.exports = __toCommonJS(icons_exports);
+var icons_default = (api) => {
+  api;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/initial-state.js

@@ -1,42 +1,62 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const withTmpPath_1 = require("./utils/withTmpPath");
-exports.default = (api) => {
-    api.describe({
-        config: {
-            schema(Joi) {
-                return Joi.object({
-                    loading: Joi.string(),
-                });
-            },
-        },
-        enableBy: api.EnableBy.config,
-    });
-    api.register({
-        key: 'addExtraModels',
-        fn: () => [
-            (0, withTmpPath_1.withTmpPath)({
-                api,
-                path: '@@initialState.ts#{"namespace":"@@initialState"}',
-            }),
-        ],
-    });
-    api.addRuntimePluginKey(() => ['getInitialState']);
-    api.addRuntimePlugin(() => {
-        return [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })];
-    });
-    api.onGenerateFiles(() => {
-        var _a;
-        const { loading } = api.config.initialState;
-        // Provider.tsx
-        api.writeTmpFile({
-            path: 'Provider.tsx',
-            content: `
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/initial-state.ts
+var initial_state_exports = {};
+__export(initial_state_exports, {
+  default: () => initial_state_default
+});
+module.exports = __toCommonJS(initial_state_exports);
+var import_umi = require("umi");
+var import_withTmpPath = require("./utils/withTmpPath");
+var initial_state_default = (api) => {
+  api.describe({
+    config: {
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object({
+          loading: Joi.string()
+        }), Joi.boolean().invalid(true));
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.register({
+    key: "addExtraModels",
+    fn: () => [
+      (0, import_withTmpPath.withTmpPath)({
+        api,
+        path: '@@initialState.ts#{"namespace":"@@initialState"}'
+      })
+    ]
+  });
+  api.addRuntimePluginKey(() => ["getInitialState"]);
+  api.addRuntimePlugin(() => {
+    return [(0, import_withTmpPath.withTmpPath)({ api, path: "runtime.tsx" })];
+  });
+  api.onGenerateFiles(() => {
+    var _a;
+    const { loading } = api.config.initialState;
+    api.writeTmpFile({
+      path: "Provider.tsx",
+      content: `
 import React from 'react';
 import { useModel } from '@@/plugin-model';
-${loading
-                ? `import Loading from '${loading}'`
-                : `function Loading() { return <div />; }`}
+${loading ? `import Loading from '${loading}'` : `function Loading() { return <div />; }`}
 export default function InitialStateProvider(props: any) {
   const appLoaded = React.useRef(false);
   const { loading = false } = useModel("@@initialState") || {};
@@ -50,13 +70,11 @@ export default function InitialStateProvider(props: any) {
   }
   return props.children;
 }
-      `,
-        });
-        // @@initialState.ts
-        api.writeTmpFile({
-            path: '@@initialState.ts',
-            content: ((_a = api.appData.appJS) === null || _a === void 0 ? void 0 : _a.exports.includes('getInitialState'))
-                ? `
+      `
+    });
+    api.writeTmpFile({
+      path: "@@initialState.ts",
+      content: ((_a = api.appData.appJS) == null ? void 0 : _a.exports.includes("getInitialState")) ? `
 import { useState, useEffect, useCallback } from 'react';
 import { getInitialState } from '@/app';
 
@@ -104,21 +122,29 @@ export default () => {
     setInitialState,
   };
 }
-        `
-                : `
+        ` : `
 export default () => ({ loading: false, refresh: () => {} })
-      `,
-        });
-        // runtime.tsx
-        api.writeTmpFile({
-            path: 'runtime.tsx',
-            content: `
+      `
+    });
+    api.writeTmpFile({
+      path: "runtime.tsx",
+      content: `
 import React from 'react';
 import Provider from './Provider';
 export function dataflowProvider(container) {
   return <Provider>{ container }</Provider>;
 }
-      `,
-        });
+      `
+    });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+export interface IRuntimeConfig {
+  getInitialState?: () => Promise<Record<string, any>>
+}
+      `
     });
+  });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});