@umijs/plugins 4.6.1 → 4.6.2

package/dist/dva.js

@@ -266,7 +266,8 @@ export interface DvaModel<T, E = EffectsMapObject, R = ReducersMapObject<T>> {
 function getModelUtil(api) {
   return new import_modelUtils.ModelUtils(api, {
     contentTest(content) {
-      if (api == null ? void 0 : api.config.dva.skipModelValidate) return true;
+      if (api == null ? void 0 : api.config.dva.skipModelValidate)
+        return true;
       return content.startsWith("// @dva-model");
     },
     astTest({ node, content }) {

package/dist/layout.js

@@ -66,8 +66,13 @@ var layout_default = (api) => {
   } catch (e) {
   }
   const packageName = api.pkg.name || "plugin-layout";
-  const isAntd5 = antdVersion.startsWith("5");
-  const layoutFile = isAntd5 ? "Layout.css" : "Layout.less";
+  const isModern = import_plugin_utils.semver.satisfies(
+    antdVersion,
+    "^5.0.0 || ^6.0.0",
+    // 两者都还在维护周期中，允许使用预发布版本. eg. 6.1.0-alpha.0
+    { includePrerelease: true }
+  );
+  const layoutFile = isModern ? "Layout.css" : "Layout.less";
   api.describe({
     key: "layout",
     config: {
@@ -547,8 +552,8 @@ export function getRightRenderContent (opts: {
     api.writeTmpFile({
       path: layoutFile,
       content: `
-${// antd@5里面没有这个样式了
-      isAntd5 ? "" : "@import '~antd/es/style/themes/default.less';"}
+${// antd@5、@6 里面没有这个样式了
+      isModern ? "" : "@import '~antd/es/style/themes/default.less';"}
 @media screen and (max-width: 480px) {
   /* 在小屏幕的时候可以有更好的体验 */
   .umi-plugin-layout-container {

package/dist/mf.js

@@ -141,14 +141,14 @@ function mf(api) {
         (0, import_path.join)(api.paths.absTmpPath, "umi.ts"),
         "utf-8"
       );
-      const [_imports, exports2] = await (0, import_bundler_utils.parseModule)({ content, path: entry });
+      const [_imports, exports] = await (0, import_bundler_utils.parseModule)({ content, path: entry });
       const mfEntryContent = [];
       let hasDefaultExport = false;
-      if (exports2.length) {
+      if (exports.length) {
         mfEntryContent.push(
           `const umiExports = await import('${(0, import_plugin_utils.winPath)(entry)}')`
         );
-        for (const exportName of exports2) {
+        for (const exportName of exports) {
           if (exportName === "default") {
             hasDefaultExport = true;
             mfEntryContent.push(`export default umiExports.${exportName}`);

package/dist/qiankun/master.js

@@ -101,8 +101,8 @@ var master_default = (api) => {
   api.register({
     key: "addExtraModels",
     fn() {
-      const { path, exports: exports2 } = api.appData.appJS || {};
-      return path && exports2.includes(import_constants.MODEL_EXPORT_NAME) ? [
+      const { path, exports } = api.appData.appJS || {};
+      return path && exports.includes(import_constants.MODEL_EXPORT_NAME) ? [
         `${path}#{"namespace":"${import_constants.qiankunStateForSlaveModelNamespace}","exportName":"${import_constants.MODEL_EXPORT_NAME}"}`
       ] : [];
     }

package/dist/request.js

@@ -326,7 +326,8 @@ export type {
     );
     const axiosPath = (0, import_plugin_utils.winPath)((0, import_path.dirname)(require.resolve("axios/package.json")));
     let dataField = (_a = api.config.request) == null ? void 0 : _a.dataField;
-    if (dataField === void 0) dataField = "data";
+    if (dataField === void 0)
+      dataField = "data";
     const isEmpty = dataField === "";
     const formatResult = isEmpty ? `result => result` : `result => result?.${dataField}`;
     const resultDataType = isEmpty ? dataField : `${dataField}?: T;`;

package/dist/unocss.js

@@ -40,7 +40,8 @@ var unocss_default = (api) => {
   });
   const outputPath = "uno.css";
   api.onBeforeCompiler(async () => {
-    if (process.env.IS_UMI_BUILD_WORKER) return;
+    if (process.env.IS_UMI_BUILD_WORKER)
+      return;
     if (!(0, import_fs.existsSync)((0, import_path.join)(api.paths.cwd, "unocss.config.ts")))
       api.logger.warn(
         "请在项目目录中添加 unocss.config.ts 文件，并配置需要的 unocss presets，否则插件将没有效果！"

package/dist/utils/modelUtils.js

@@ -66,11 +66,6 @@ function getNamespace(absFilePath, absSrcPath) {
   return [...validDirs, normalizedFile].join(".");
 }
 var Model = class {
-  file;
-  namespace;
-  id;
-  exportName;
-  deps;
   constructor(file, absSrcPath, sort, id) {
     let namespace;
     let exportName;
@@ -111,11 +106,10 @@ var Model = class {
     return [...deps];
   }
 };
-var ModelUtils = class _ModelUtils {
-  api;
-  opts = {};
-  count = 1;
+var _ModelUtils = class {
   constructor(api, opts) {
+    this.opts = {};
+    this.count = 1;
     this.api = api;
     this.opts = opts;
   }
@@ -162,8 +156,10 @@ var ModelUtils = class _ModelUtils {
       cwd: opts.base,
       absolute: true
     }).map(import_plugin_utils.winPath).filter((file) => {
-      if (/\.d.ts$/.test(file)) return false;
-      if (/\.(test|e2e|spec).([jt])sx?$/.test(file)) return false;
+      if (/\.d.ts$/.test(file))
+        return false;
+      if (/\.(test|e2e|spec).([jt])sx?$/.test(file))
+        return false;
       const content = (0, import_fs.readFileSync)(file, "utf-8");
       return this.isModelValid({ content, file });
     });
@@ -208,57 +204,6 @@ var ModelUtils = class _ModelUtils {
     });
     return ret;
   }
-  // https://github.com/umijs/umi/issues/9837
-  static topologicalSort = (models) => {
-    const graph = [];
-    const namespaceToNode = {};
-    models.forEach((model, index) => {
-      const node = {
-        namespace: model.namespace,
-        deps: model.deps,
-        index,
-        in: 0,
-        childs: []
-      };
-      if (namespaceToNode[model.namespace]) {
-        throw new Error(`Duplicate namespace in models: ${model.namespace}`);
-      }
-      namespaceToNode[model.namespace] = node;
-      graph.push(node);
-    });
-    graph.forEach((node) => {
-      node.deps.forEach((dep) => {
-        const depNode = namespaceToNode[dep];
-        if (!depNode) {
-          throw new Error(`Model namespace not found: ${dep}`);
-        }
-        depNode.childs.push(node);
-        node.in++;
-      });
-    });
-    const queue = [];
-    while (true) {
-      const zeronode = graph.find((n) => {
-        return n && n.in === 0;
-      });
-      if (!zeronode) {
-        break;
-      }
-      queue.push(zeronode.namespace);
-      zeronode.childs.forEach((child) => {
-        child.in--;
-      });
-      zeronode.childs = [];
-      delete graph[zeronode.index];
-    }
-    const leftNodes = graph.filter(Boolean);
-    if (leftNodes.length > 0) {
-      throw new Error(
-        `Circle dependency detected in models: ${leftNodes.map((m) => import_plugin_utils.chalk.red(m.namespace)).join(", ")}`
-      );
-    }
-    return queue;
-  };
   static getModelsContent(models) {
     const imports = [];
     const modelProps = [];
@@ -288,6 +233,58 @@ ${modelProps.join("\n")}
 } as const`;
   }
 };
+var ModelUtils = _ModelUtils;
+// https://github.com/umijs/umi/issues/9837
+ModelUtils.topologicalSort = (models) => {
+  const graph = [];
+  const namespaceToNode = {};
+  models.forEach((model, index) => {
+    const node = {
+      namespace: model.namespace,
+      deps: model.deps,
+      index,
+      in: 0,
+      childs: []
+    };
+    if (namespaceToNode[model.namespace]) {
+      throw new Error(`Duplicate namespace in models: ${model.namespace}`);
+    }
+    namespaceToNode[model.namespace] = node;
+    graph.push(node);
+  });
+  graph.forEach((node) => {
+    node.deps.forEach((dep) => {
+      const depNode = namespaceToNode[dep];
+      if (!depNode) {
+        throw new Error(`Model namespace not found: ${dep}`);
+      }
+      depNode.childs.push(node);
+      node.in++;
+    });
+  });
+  const queue = [];
+  while (true) {
+    const zeronode = graph.find((n) => {
+      return n && n.in === 0;
+    });
+    if (!zeronode) {
+      break;
+    }
+    queue.push(zeronode.namespace);
+    zeronode.childs.forEach((child) => {
+      child.in--;
+    });
+    zeronode.childs = [];
+    delete graph[zeronode.index];
+  }
+  const leftNodes = graph.filter(Boolean);
+  if (leftNodes.length > 0) {
+    throw new Error(
+      `Circle dependency detected in models: ${leftNodes.map((m) => import_plugin_utils.chalk.red(m.namespace)).join(", ")}`
+    );
+  }
+  return queue;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Model,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -45,12 +45,12 @@
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/valtio": "1.0.4",
-    "@umijs/bundler-utils": "4.6.1"
+    "@umijs/bundler-utils": "4.6.2",
+    "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.6.1"
+    "umi": "4.6.2"
   },
   "publishConfig": {
     "access": "public"