@umijs/preset-umi 4.0.43 → 4.0.45

package/dist/commands/generators/jest.js

@@ -50,17 +50,22 @@ var jest_default = (api) => {
       });
       const hasSrc = api.paths.absSrcPath.endsWith("src");
       const importSource = api.appData.umi.importSource;
+      const jestMajorVersion = `^${getJestVersion()}`;
       const basicDeps = {
-        jest: "^27",
-        "@types/jest": "^27",
+        jest: jestMajorVersion,
+        "@types/jest": jestMajorVersion,
         typescript: "^4",
         "ts-node": "^10",
         "cross-env": "^7"
       };
+      const reactTestingDeps = {
+        "jest-environment-jsdom": jestMajorVersion,
+        "@testing-library/jest-dom": "^5",
+        "@testing-library/react": "^13"
+      };
       const packageToInstall = res.willUseTLR ? {
         ...basicDeps,
-        "@testing-library/react": "^13",
-        "@testing-library/jest-dom": "^5.16.4",
+        ...reactTestingDeps,
         "@types/testing-library__jest-dom": "^5.14.5"
       } : basicDeps;
       h.addDevDeps(packageToInstall);
@@ -106,15 +111,15 @@ export default async () => {
         // config opts for esbuild , it will pass to esbuild directly
         jsTransformerOpts: { jsx: 'automatic' },
       }),
-    
+
       ${res.willUseTLR ? `setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],` : ""}
       collectCoverageFrom: [
-  ${collectCoverageFrom.map((v) => `      '${v}'`).join(",\n")}
+${collectCoverageFrom.map((v) => `        '${v}'`).join(",\n")}
       ],
       // if you require some es-module npm package, please uncomment below line and insert your package name
       // transformIgnorePatterns: ['node_modules/(?!.*(lodash-es|your-es-pkg-name)/)']
     })) as Config.InitialOptions;
-  }catch(e){
+  } catch (e) {
     console.log(e);
     throw e;
   }
@@ -126,5 +131,19 @@ export default async () => {
     }
   });
 };
+function getJestVersion() {
+  try {
+    const umiPkg = require.resolve("umi/package.json", {
+      paths: [process.cwd()]
+    });
+    const testPkg = require.resolve("@umijs/test/package.json", {
+      paths: [umiPkg]
+    });
+    const version = require(testPkg).devDependencies.jest;
+    return import_utils.semver.minVersion(version).version.split(".")[0];
+  } catch {
+    return 29;
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/icons/build.js

@@ -29,11 +29,11 @@ __export(build_exports, {
 });
 module.exports = __toCommonJS(build_exports);
 var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
-var import_esbuildExternalPlugin = require("./esbuildPlugins/esbuildExternalPlugin");
+var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
 var import_esbuildAliasPlugin = require("./esbuildPlugins/esbuildAliasPlugin");
 var import_esbuildCollectIconPlugin = require("./esbuildPlugins/esbuildCollectIconPlugin");
-var import_utils = require("@umijs/utils");
+var import_esbuildExternalPlugin = require("./esbuildPlugins/esbuildExternalPlugin");
 async function build(opts) {
   var _a, _b;
   const icons = opts.icons || /* @__PURE__ */ new Set();
@@ -64,8 +64,8 @@ async function build(opts) {
     write: false,
     outdir: import_path.default.join(import_path.default.dirname(opts.entryPoints[0]), "out"),
     plugins: [
-      (0, import_esbuildAliasPlugin.esbuildAliasPlugin)({ alias: ((_a = opts.config) == null ? void 0 : _a.alias) || {} }),
       (0, import_esbuildExternalPlugin.esbuildExternalPlugin)(),
+      (0, import_esbuildAliasPlugin.esbuildAliasPlugin)({ alias: ((_a = opts.config) == null ? void 0 : _a.alias) || {} }),
       (0, import_esbuildCollectIconPlugin.esbuildCollectIconPlugin)({
         icons,
         alias: ((_b = opts.options) == null ? void 0 : _b.alias) || {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.43",
+  "version": "4.0.45",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,19 +27,19 @@
   "dependencies": {
     "@iconify/utils": "2.0.9",
     "@svgr/core": "6.2.1",
-    "@umijs/ast": "4.0.43",
-    "@umijs/babel-preset-umi": "4.0.43",
-    "@umijs/bundler-utils": "4.0.43",
-    "@umijs/bundler-vite": "4.0.43",
-    "@umijs/bundler-webpack": "4.0.43",
-    "@umijs/core": "4.0.43",
+    "@umijs/ast": "4.0.45",
+    "@umijs/babel-preset-umi": "4.0.45",
+    "@umijs/bundler-utils": "4.0.45",
+    "@umijs/bundler-vite": "4.0.45",
+    "@umijs/bundler-webpack": "4.0.45",
+    "@umijs/core": "4.0.45",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.43",
-    "@umijs/plugin-run": "4.0.43",
-    "@umijs/renderer-react": "4.0.43",
-    "@umijs/server": "4.0.43",
-    "@umijs/utils": "4.0.43",
+    "@umijs/mfsu": "4.0.45",
+    "@umijs/plugin-run": "4.0.45",
+    "@umijs/renderer-react": "4.0.45",
+    "@umijs/server": "4.0.45",
+    "@umijs/utils": "4.0.45",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.27.1",