@modern-js/generator-utils 3.1.16 → 3.1.18

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @modern-js/generator-utils
 
+## 3.1.18
+
+### Patch Changes
+
+- a9839b4: fix: generator get modern plugin version error
+
+  fix: 修复生成器获取插件版本错误
+
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- de8f73f: feat: update codesmith version
+
+  feat: 更新 codesmith 版本
+
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [056627f]
+- Updated dependencies [de8f73f]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/utils@2.21.0
+  - @modern-js/generator-common@3.1.18
+  - @modern-js/plugin-i18n@2.21.0
+
+## 3.1.17
+
+### Patch Changes
+
+- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config.
+  chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置
+- Updated dependencies [3c4e0a5]
+- Updated dependencies [6b9d90a]
+  - @modern-js/utils@2.20.0
+  - @modern-js/generator-common@3.1.17
+  - @modern-js/plugin-i18n@2.20.0
+
 ## 3.1.16
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -36,32 +36,16 @@ _export(exports, {
   getDocProjectPath: () => getDocProjectPath,
   getModernConfigFile: () => getModernConfigFile
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _export_star = require("@swc/helpers/_/_export_star");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _generatorcommon = require("@modern-js/generator-common");
 const _stripAnsi = require("./utils/stripAnsi");
 const _locale = require("./locale");
 const _package = require("./utils/package");
 const _fsExist = require("./utils/fsExist");
-_export_star(require("./utils"), exports);
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+_export_star._(require("./utils"), exports);
 async function getPackageVersion(packageName, registry) {
   const spinner = (0, _utils.ora)({
     text: "Load Generator...",
@@ -112,11 +96,18 @@ async function getModernPluginVersion(solution, packageName, options = {
   if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck")) {
     return getLatetPluginVersion("latest");
   }
-  const pkgPath = _path.default.join(require.resolve(_generatorcommon.SolutionToolsMap[solution], {
+  let pkgPath = _path.default.join(require.resolve(_generatorcommon.SolutionToolsMap[solution], {
     paths: [
       cwd
     ]
-  }), "../../../../", "package.json");
+  }), "../../..", "package.json");
+  if (solution === _generatorcommon.Solution.Module) {
+    pkgPath = _path.default.join(require.resolve(_generatorcommon.SolutionToolsMap[solution], {
+      paths: [
+        cwd
+      ]
+    }), "../..", "package.json");
+  }
   if (_utils.fs.existsSync(pkgPath)) {
     const pkgInfo = _utils.fs.readJSONSync(pkgPath);
     const modernVersion = pkgInfo.version;

package/dist/cjs/utils/index.js

@@ -2,18 +2,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-_export_star(require("./stripAnsi"), exports);
-_export_star(require("./package"), exports);
-function _export_star(from, to) {
-  Object.keys(from).forEach(function(k) {
-    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-      Object.defineProperty(to, k, {
-        enumerable: true,
-        get: function() {
-          return from[k];
-        }
-      });
-    }
-  });
-  return from;
-}
+const _export_star = require("@swc/helpers/_/_export_star");
+_export_star._(require("./stripAnsi"), exports);
+_export_star._(require("./package"), exports);

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { fs, ora, execa, getMonorepoPackages, canUseNpm, canUsePnpm } from "@modern-js/utils";
-import { SolutionToolsMap } from "@modern-js/generator-common";
+import { Solution, SolutionToolsMap } from "@modern-js/generator-common";
 import { stripAnsi } from "./utils/stripAnsi";
 import { i18n, localeKeys } from "./locale";
 import { getAvailableVersion } from "./utils/package";
@@ -58,11 +58,18 @@ export async function getModernPluginVersion(solution, packageName, options = {
   if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck")) {
     return getLatetPluginVersion("latest");
   }
-  const pkgPath = path.join(require.resolve(SolutionToolsMap[solution], {
+  let pkgPath = path.join(require.resolve(SolutionToolsMap[solution], {
     paths: [
       cwd
     ]
-  }), "../../../../", "package.json");
+  }), "../../..", "package.json");
+  if (solution === Solution.Module) {
+    pkgPath = path.join(require.resolve(SolutionToolsMap[solution], {
+      paths: [
+        cwd
+      ]
+    }), "../..", "package.json");
+  }
   if (fs.existsSync(pkgPath)) {
     const pkgInfo = fs.readJSONSync(pkgPath);
     const modernVersion = pkgInfo.version;

package/dist/types/utils/package.d.ts

@@ -6,5 +6,4 @@ export declare function semverDecrease(version: string): string;
  * tools 存在 hotfix 版本，从 tools 版本号向下找当前插件版本号
  * 限制只在当前小版本号范围内寻找
  */
-
 export declare function getAvailableVersion(packageName: string, currentVersion: string, registry?: string): Promise<string>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.16",
+  "version": "3.1.18",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -30,19 +30,19 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
-    "@modern-js/plugin-i18n": "2.19.1",
-    "@modern-js/generator-common": "3.1.16",
-    "@modern-js/utils": "2.19.1"
+    "@swc/helpers": "0.5.1",
+    "@modern-js/plugin-i18n": "2.21.0",
+    "@modern-js/generator-common": "3.1.18",
+    "@modern-js/utils": "2.21.0"
   },
   "devDependencies": {
-    "@modern-js/codesmith": "2.2.0",
+    "@modern-js/codesmith": "2.2.3",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "typescript": "^4",
-    "@scripts/build": "2.19.1",
-    "@scripts/jest-config": "2.19.1"
+    "typescript": "^5",
+    "@scripts/jest-config": "2.21.0",
+    "@scripts/build": "2.21.0"
   },
   "sideEffects": false,
   "modernConfig": {