@umijs/preset-umi 4.6.50 → 4.6.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -36,8 +36,24 @@ module.exports = __toCommonJS(utoopack_exports);
36
36
  var import_utils = require("@umijs/utils");
37
37
  var import_path = require("path");
38
38
  var import_extractEntryAssets = require("../../utils/extractEntryAssets");
39
+ function cleanVersionRange(version) {
40
+ return version == null ? void 0 : version.replace(/^[^\d]*/, "");
41
+ }
39
42
  function getPackVersionFromBundler(bundlerEntry) {
40
- var _a, _b;
43
+ var _a;
44
+ const resolvePaths = [(0, import_path.dirname)(bundlerEntry), bundlerEntry];
45
+ for (const resolvePath of resolvePaths) {
46
+ try {
47
+ const pkgPath = require.resolve("@utoo/pack/package.json", {
48
+ paths: [resolvePath]
49
+ });
50
+ const pkg = require(pkgPath);
51
+ if (pkg.version) {
52
+ return pkg.version;
53
+ }
54
+ } catch {
55
+ }
56
+ }
41
57
  const packageJsonCandidates = [
42
58
  (0, import_path.join)((0, import_path.dirname)(bundlerEntry), "../package.json"),
43
59
  (0, import_path.join)(bundlerEntry, "../package.json"),
@@ -46,7 +62,7 @@ function getPackVersionFromBundler(bundlerEntry) {
46
62
  for (const packageJsonPath of packageJsonCandidates) {
47
63
  try {
48
64
  const pkg = require(packageJsonPath);
49
- return (_b = (_a = pkg.dependencies) == null ? void 0 : _a["@utoo/pack"]) == null ? void 0 : _b.replace(/^[^\d]*/, "");
65
+ return cleanVersionRange((_a = pkg.dependencies) == null ? void 0 : _a["@utoo/pack"]);
50
66
  } catch {
51
67
  }
52
68
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@umijs/preset-umi",
3
- "version": "4.6.50",
3
+ "version": "4.6.51",
4
4
  "description": "@umijs/preset-umi",
5
5
  "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
6
6
  "bugs": "https://github.com/umijs/umi/issues",
@@ -43,21 +43,21 @@
43
43
  "react-router": "6.3.0",
44
44
  "react-router-dom": "6.3.0",
45
45
  "regenerator-runtime": "0.13.11",
46
- "@umijs/ast": "4.6.50",
47
- "@umijs/bundler-vite": "4.6.50",
48
- "@umijs/babel-preset-umi": "4.6.50",
49
- "@umijs/bundler-utils": "4.6.50",
50
- "@umijs/bundler-webpack": "4.6.50",
51
- "@umijs/mfsu": "4.6.50",
52
- "@umijs/bundler-esbuild": "4.6.50",
53
- "@umijs/renderer-react": "4.6.50",
54
- "@umijs/core": "4.6.50",
55
- "@umijs/plugin-run": "4.6.50",
56
- "@umijs/bundler-utoopack": "4.6.50",
57
- "@umijs/zod2ts": "4.6.50",
58
- "@umijs/server": "4.6.50",
59
- "@umijs/utils": "4.6.50",
60
- "@umijs/ui": "3.0.1"
46
+ "@umijs/ast": "4.6.51",
47
+ "@umijs/babel-preset-umi": "4.6.51",
48
+ "@umijs/bundler-esbuild": "4.6.51",
49
+ "@umijs/bundler-utils": "4.6.51",
50
+ "@umijs/bundler-vite": "4.6.51",
51
+ "@umijs/bundler-webpack": "4.6.51",
52
+ "@umijs/mfsu": "4.6.51",
53
+ "@umijs/server": "4.6.51",
54
+ "@umijs/ui": "3.0.1",
55
+ "@umijs/renderer-react": "4.6.51",
56
+ "@umijs/utils": "4.6.51",
57
+ "@umijs/zod2ts": "4.6.51",
58
+ "@umijs/bundler-utoopack": "4.6.51",
59
+ "@umijs/core": "4.6.51",
60
+ "@umijs/plugin-run": "4.6.51"
61
61
  },
62
62
  "devDependencies": {
63
63
  "@manypkg/get-packages": "1.1.3",