@umijs/plugins 4.0.0-canary.20220429.1 → 4.0.0-canary.20220429.4

package/dist/dva.js

@@ -180,6 +180,7 @@ function getModelUtil(api) {
 exports.getModelUtil = getModelUtil;
 function getAllModels(api) {
     return getModelUtil(api).getAllModels({
+        extraModelsPre: [],
         extraModels: [...(api.config.dva.extraModels || [])],
     });
 }

package/dist/initial-state.js

@@ -13,7 +13,7 @@ exports.default = (api) => {
         enableBy: api.EnableBy.config,
     });
     api.register({
-        key: 'addExtraModels',
+        key: 'addExtraModelsPre',
         fn: () => [(0, withTmpPath_1.withTmpPath)({ api, path: '@@initialState.ts' })],
     });
     api.addRuntimePluginKey(() => ['getInitialState']);

package/dist/layout.js

@@ -39,7 +39,7 @@ exports.default = (api) => {
             schema(joi) {
                 return joi.object();
             },
-            // onChange: api.ConfigChangeType.regenerateTmpFiles,
+            onChange: api.ConfigChangeType.regenerateTmpFiles,
         },
         enableBy: api.EnableBy.config,
     });

package/dist/model.js

@@ -104,6 +104,11 @@ export function dataflowProvider(container, opts) {
 };
 function getAllModels(api) {
     return __awaiter(this, void 0, void 0, function* () {
+        const extraModelsPre = yield api.applyPlugins({
+            key: 'addExtraModelsPre',
+            type: api.ApplyPluginsType.add,
+            initialValue: [],
+        });
         const extraModels = yield api.applyPlugins({
             key: 'addExtraModels',
             type: api.ApplyPluginsType.add,
@@ -114,6 +119,10 @@ function getAllModels(api) {
                 return t.isArrowFunctionExpression(node) || t.isFunctionDeclaration(node);
             },
         }).getAllModels({
+            extraModelsPre: [
+                ...extraModelsPre,
+                ...(api.config.model.extraModelsPre || []),
+            ],
             extraModels: [...extraModels, ...(api.config.model.extraModels || [])],
         });
     });

package/dist/utils/modelUtils.d.ts

@@ -20,6 +20,7 @@ export declare class ModelUtils {
     count: number;
     constructor(api: IApi | null, opts: IOpts);
     getAllModels(opts: {
+        extraModelsPre: string[];
         extraModels: string[];
     }): Model[];
     getModels(opts: {

package/dist/utils/modelUtils.js

@@ -62,6 +62,7 @@ class ModelUtils {
         // reset count
         this.count = 1;
         return [
+            ...opts.extraModelsPre,
             ...this.getModels({
                 base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
                 pattern: '**/*.{ts,tsx,js,jsx}',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220429.1",
+  "version": "4.0.0-canary.20220429.4",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,7 +25,7 @@
     "@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.20220429.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220429.4",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220429.1"
+    "umi": "4.0.0-canary.20220429.4"
   },
   "publishConfig": {
     "access": "public"