@umijs/preset-umi 4.7.16 → 4.7.18

package/dist/commands/lint/utlint.d.ts

@@ -0,0 +1 @@
+export declare function runUtlint(cwd: string, args: string[]): Promise<void>;

package/dist/commands/lint/utlint.js

@@ -0,0 +1,64 @@
+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/commands/lint/utlint.ts
+var utlint_exports = {};
+__export(utlint_exports, {
+  runUtlint: () => runUtlint
+});
+module.exports = __toCommonJS(utlint_exports);
+var import_child_process = require("child_process");
+var import_path = require("path");
+async function runUtlint(cwd, args) {
+  let binPath;
+  try {
+    const pkgPath = require.resolve("@utoo/lint/package.json", {
+      paths: [cwd]
+    });
+    binPath = (0, import_path.resolve)((0, import_path.dirname)(pkgPath), require(pkgPath).bin["utoo-lint"]);
+  } catch (err) {
+    throw new Error(
+      "@utoo/lint is required for umi lint --utlint. Please install it in your project with npm install -D @utoo/lint (Node.js >=20).",
+      { cause: err }
+    );
+  }
+  await new Promise((resolve2, reject) => {
+    (0, import_child_process.fork)(binPath, args, {
+      cwd,
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        // The migration tool reads rule configs without loading ESLint plugins.
+        // Umi's ESLint resolution patch requires a real ESLint caller instead.
+        UMI_UTLINT_MIGRATE: args[0] === "migrate" && args[1] === "eslint" ? "1" : "0"
+      }
+    }).once("error", reject).once("exit", (code, signal) => {
+      if (signal) {
+        reject(new Error(`utoo-lint was terminated by ${signal}.`));
+      } else {
+        if (code)
+          process.exitCode = code;
+        resolve2();
+      }
+    });
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  runUtlint
+});

package/dist/commands/lint.js

@@ -36,7 +36,7 @@ var import_utils = require("@umijs/utils");
 var lint_default = (api) => {
   api.registerCommand({
     name: "lint",
-    description: "lint source code using eslint and stylelint",
+    description: "lint source code using eslint and stylelint, or utoo-lint",
     configResolveMode: "loose",
     details: `
 umi lint
@@ -48,6 +48,11 @@ umi lint "**/*.{ts,scss}"
 umi lint --eslint-only
 umi lint --stylelint-only
 
+# opt in to standalone utoo-lint (requires @utoo/lint)
+umi lint --utlint
+umi lint --utlint --fix src
+umi lint --utlint migrate eslint --from .eslintrc.js
+
 # automatically fix, where possible
 umi lint --fix
 
@@ -55,9 +60,28 @@ umi lint --fix
 umi lint --quiet
 `,
     fn: async function() {
-      const args = (0, import_utils.yParser)(process.argv.slice(3), {
-        boolean: ["quiet", "fix", "eslint-only", "stylelint-only"]
+      const rawArgs = process.argv.slice(3);
+      const args = (0, import_utils.yParser)(rawArgs, {
+        boolean: ["quiet", "fix", "eslint-only", "stylelint-only", "utlint"]
       });
+      if (args.utlint) {
+        if (args.eslintOnly || args.stylelintOnly || args.cssinjs) {
+          throw new Error(
+            "--utlint cannot be combined with --eslint-only, --stylelint-only or --cssinjs. Run stylelint separately with umi lint --stylelint-only."
+          );
+        }
+        const forwardedArgs = [...rawArgs];
+        for (let i = 0; i < forwardedArgs.length; i++) {
+          if (forwardedArgs[i] === "--")
+            break;
+          if (/^--(?:no-)?utlint(?:=.*)?$/.test(forwardedArgs[i])) {
+            const count = forwardedArgs[i] === "--utlint" && /^(true|false)$/.test(forwardedArgs[i + 1] || "") ? 2 : 1;
+            forwardedArgs.splice(i, count);
+            i--;
+          }
+        }
+        return require("./lint/utlint").runUtlint(api.cwd, forwardedArgs);
+      }
       try {
         require.resolve("@umijs/lint/package.json");
       } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.7.16",
+  "version": "4.7.18",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -43,21 +43,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.7.16",
-    "@umijs/bundler-esbuild": "4.7.16",
-    "@umijs/babel-preset-umi": "4.7.16",
-    "@umijs/bundler-utoopack": "4.7.16",
-    "@umijs/bundler-vite": "4.7.16",
-    "@umijs/bundler-utils": "4.7.16",
-    "@umijs/bundler-webpack": "4.7.16",
-    "@umijs/core": "4.7.16",
-    "@umijs/mfsu": "4.7.16",
-    "@umijs/renderer-react": "4.7.16",
-    "@umijs/server": "4.7.16",
-    "@umijs/utils": "4.7.16",
-    "@umijs/plugin-run": "4.7.16",
-    "@umijs/zod2ts": "4.7.16",
-    "@umijs/ui": "3.0.1"
+    "@umijs/ast": "4.7.18",
+    "@umijs/babel-preset-umi": "4.7.18",
+    "@umijs/bundler-esbuild": "4.7.18",
+    "@umijs/bundler-utils": "4.7.18",
+    "@umijs/bundler-utoopack": "4.7.18",
+    "@umijs/bundler-vite": "4.7.18",
+    "@umijs/bundler-webpack": "4.7.18",
+    "@umijs/mfsu": "4.7.18",
+    "@umijs/core": "4.7.18",
+    "@umijs/plugin-run": "4.7.18",
+    "@umijs/renderer-react": "4.7.18",
+    "@umijs/server": "4.7.18",
+    "@umijs/ui": "3.0.1",
+    "@umijs/utils": "4.7.18",
+    "@umijs/zod2ts": "4.7.18"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",