@modern-js/generator-utils 3.0.7-beta.0 → 3.0.8

package/CHANGELOG.md

@@ -1,13 +1,39 @@
 # @modern-js/generator-utils
 
-## 3.0.7-beta.0
+## 3.0.8
 
 ### Patch Changes
 
+- Updated dependencies [e1f799e]
+- Updated dependencies [b2ea17b]
+- Updated dependencies [7915ab3]
+- Updated dependencies [0fe658a]
+  - @modern-js/utils@2.6.0
+  - @modern-js/generator-common@3.0.8
+  - @modern-js/plugin-i18n@2.6.0
+
+## 3.0.7
+
+### Patch Changes
+
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- 577084d: feat: update codesmith version
+
+  feat: 更新 codesmith 版本
+
+- Updated dependencies [89ca6cc]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/utils@2.4.1-beta.0
-  - @modern-js/plugin-i18n@2.4.1-beta.0
-  - @modern-js/generator-common@3.0.7-beta.0
+- Updated dependencies [577084d]
+  - @modern-js/plugin-i18n@2.5.0
+  - @modern-js/generator-common@3.0.7
+  - @modern-js/utils@2.5.0
 
 ## 3.0.6
 

package/dist/{js/node → cjs}/index.js

@@ -18,30 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var src_exports = {};
 __export(src_exports, {
   canUseNpm: () => import_utils2.canUseNpm,
@@ -80,71 +64,65 @@ var import_fs_exist = require("./utils/fs-exist");
 __reExport(src_exports, require("./utils"), module.exports);
 var import_utils2 = require("@modern-js/utils");
 var import_locale2 = require("./locale");
-function getPackageVersion(packageName, registry) {
-  return __async(this, null, function* () {
-    const spinner = (0, import_utils.ora)({
-      text: "Load Generator...",
-      spinner: "runner"
-    }).start();
-    if (yield (0, import_utils.canUsePnpm)()) {
-      const args = ["info", packageName, "version"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield (0, import_utils.execa)("pnpm", args);
-      spinner.stop();
-      return (0, import_strip_ansi.stripAnsi)(result.stdout);
+async function getPackageVersion(packageName, registry) {
+  const spinner = (0, import_utils.ora)({
+    text: "Load Generator...",
+    spinner: "runner"
+  }).start();
+  if (await (0, import_utils.canUsePnpm)()) {
+    const args = ["info", packageName, "version"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
     }
-    if (yield (0, import_utils.canUseNpm)()) {
-      const args = ["view", packageName, "version"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield (0, import_utils.execa)("npm", args);
-      spinner.stop();
-      return (0, import_strip_ansi.stripAnsi)(result.stdout);
+    const result = await (0, import_utils.execa)("pnpm", args);
+    spinner.stop();
+    return (0, import_strip_ansi.stripAnsi)(result.stdout);
+  }
+  if (await (0, import_utils.canUseNpm)()) {
+    const args = ["view", packageName, "version"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
     }
+    const result = await (0, import_utils.execa)("npm", args);
     spinner.stop();
-    throw new Error("not found npm, please install npm before");
-  });
+    return (0, import_strip_ansi.stripAnsi)(result.stdout);
+  }
+  spinner.stop();
+  throw new Error("not found npm, please install npm before");
 }
-function getModernVersion(solution, registry, distTag = "latest") {
-  return __async(this, null, function* () {
-    const dep = import_generator_common.SolutionToolsMap[solution];
-    const modernVersion = yield getPackageVersion(`${dep}@${distTag}`, registry);
-    return modernVersion;
-  });
+async function getModernVersion(solution, registry, distTag = "latest") {
+  const dep = import_generator_common.SolutionToolsMap[solution];
+  const modernVersion = await getPackageVersion(`${dep}@${distTag}`, registry);
+  return modernVersion;
 }
-function getModernPluginVersion(_0, _1) {
-  return __async(this, arguments, function* (solution, packageName, options = {
-    distTag: "latest"
-  }) {
-    const { cwd = process.cwd(), registry, distTag } = options;
-    const getLatetPluginVersion = (tag) => __async(this, null, function* () {
-      const version = yield getPackageVersion(
-        `${packageName}@${tag || distTag || "latest"}`,
-        registry
-      );
-      return version;
-    });
-    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 = import_path.default.join(
-      require.resolve(import_generator_common.SolutionToolsMap[solution], { paths: [cwd] }),
-      "../../../../",
-      "package.json"
+async function getModernPluginVersion(solution, packageName, options = {
+  distTag: "latest"
+}) {
+  const { cwd = process.cwd(), registry, distTag } = options;
+  const getLatetPluginVersion = async (tag) => {
+    const version = await getPackageVersion(
+      `${packageName}@${tag || distTag || "latest"}`,
+      registry
     );
-    if (import_utils.fs.existsSync(pkgPath)) {
-      const pkgInfo = import_utils.fs.readJSONSync(pkgPath);
-      const modernVersion = pkgInfo.version;
-      if (typeof modernVersion !== "string") {
-        return getLatetPluginVersion();
-      }
-      return (0, import_package.getAvailableVersion)(packageName, modernVersion, registry);
+    return version;
+  };
+  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 = import_path.default.join(
+    require.resolve(import_generator_common.SolutionToolsMap[solution], { paths: [cwd] }),
+    "../../../../",
+    "package.json"
+  );
+  if (import_utils.fs.existsSync(pkgPath)) {
+    const pkgInfo = import_utils.fs.readJSONSync(pkgPath);
+    const modernVersion = pkgInfo.version;
+    if (typeof modernVersion !== "string") {
+      return getLatetPluginVersion();
     }
-    return getLatetPluginVersion();
-  });
+    return (0, import_package.getAvailableVersion)(packageName, modernVersion, registry);
+  }
+  return getLatetPluginVersion();
 }
 function getPackageManagerText(packageManager) {
   return packageManager === "yarn" ? "yarn" : `${packageManager} run`;
@@ -152,11 +130,9 @@ function getPackageManagerText(packageManager) {
 function isTsProject(appDir) {
   return import_utils.fs.existsSync(import_path.default.join(appDir, "tsconfig.json"));
 }
-function getPackageObj(context) {
-  return __async(this, null, function* () {
-    const pkgStr = (yield context.materials.default.get(`package.json`).value()).content;
-    return JSON.parse(pkgStr);
-  });
+async function getPackageObj(context) {
+  const pkgStr = (await context.materials.default.get(`package.json`).value()).content;
+  return JSON.parse(pkgStr);
 }
 function getAllPackages(appDir) {
   const packages = (0, import_utils.getMonorepoPackages)(appDir);
@@ -204,18 +180,16 @@ function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
   }
   return "";
 }
-function getModernConfigFile(appDir) {
-  return __async(this, null, function* () {
-    let exist = yield (0, import_fs_exist.fileExist)(import_path.default.join(appDir, "modern.config.ts"));
-    if (exist) {
-      return "modern.config.ts";
-    }
-    exist = yield (0, import_fs_exist.fileExist)(import_path.default.join(appDir, "modern.config.js"));
-    if (exist) {
-      return "modern.config.js";
-    }
-    return isTsProject(appDir) ? "modern.config.ts" : "modern.config.js";
-  });
+async function getModernConfigFile(appDir) {
+  let exist = await (0, import_fs_exist.fileExist)(import_path.default.join(appDir, "modern.config.ts"));
+  if (exist) {
+    return "modern.config.ts";
+  }
+  exist = await (0, import_fs_exist.fileExist)(import_path.default.join(appDir, "modern.config.js"));
+  if (exist) {
+    return "modern.config.js";
+  }
+  return isTsProject(appDir) ? "modern.config.ts" : "modern.config.js";
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/utils/fs-exist.js

@@ -0,0 +1,38 @@
+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);
+var fs_exist_exports = {};
+__export(fs_exist_exports, {
+  fileExist: () => fileExist
+});
+module.exports = __toCommonJS(fs_exist_exports);
+var import_utils = require("@modern-js/utils");
+async function fileExist(filePath) {
+  try {
+    const stat = await import_utils.fs.stat(filePath);
+    if (stat.isFile()) {
+      return true;
+    }
+    return false;
+  } catch (e) {
+    return false;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fileExist
+});

package/dist/cjs/utils/package.js

@@ -0,0 +1,92 @@
+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);
+var package_exports = {};
+__export(package_exports, {
+  getAvailableVersion: () => getAvailableVersion,
+  isPackageDeprecated: () => isPackageDeprecated,
+  isPackageExist: () => isPackageExist,
+  semverDecrease: () => semverDecrease
+});
+module.exports = __toCommonJS(package_exports);
+var import_utils = require("@modern-js/utils");
+async function isPackageExist(packageName, registry) {
+  if (await (0, import_utils.canUseNpm)()) {
+    const args = ["view", packageName, "version"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+    const result = await (0, import_utils.execa)("npm", args);
+    return (0, import_utils.stripAnsi)(result.stdout);
+  }
+  throw new Error("not found npm, please install npm before");
+}
+async function isPackageDeprecated(packageName, registry) {
+  if (await (0, import_utils.canUseNpm)()) {
+    const args = ["view", packageName, "deprecated"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+    const result = await (0, import_utils.execa)("npm", args);
+    return (0, import_utils.stripAnsi)(result.stdout);
+  }
+  throw new Error("not found npm, please install npm before");
+}
+function semverDecrease(version) {
+  const versionObj = import_utils.semver.parse(version, { loose: true });
+  if (!versionObj) {
+    throw new Error(`Version ${version} is not valid semver`);
+  }
+  versionObj.build = [];
+  versionObj.prerelease = [];
+  versionObj.patch--;
+  const result = versionObj.format();
+  if (!import_utils.semver.valid(result)) {
+    import_utils.logger.debug(`Version ${result} is not valid semver`);
+    return version;
+  }
+  return result;
+}
+async function getAvailableVersion(packageName, currentVersion, registry) {
+  let times = 5;
+  let version = currentVersion;
+  while (times) {
+    if (!await isPackageExist(`${packageName}@${version}`, registry) || await isPackageDeprecated(`${packageName}@${version}`, registry)) {
+      version = import_utils.semver.inc(version, "patch");
+      times--;
+      continue;
+    }
+    return version;
+  }
+  times = 5;
+  while (times) {
+    version = semverDecrease(version);
+    if (!await isPackageExist(`${packageName}@${version}`, registry) || await isPackageDeprecated(`${packageName}@${version}`, registry)) {
+      times--;
+      continue;
+    }
+    return version;
+  }
+  return currentVersion;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getAvailableVersion,
+  isPackageDeprecated,
+  isPackageExist,
+  semverDecrease
+});

package/dist/esm/index.js

@@ -0,0 +1,182 @@
+import path from "path";
+import {
+  fs,
+  ora,
+  execa,
+  getMonorepoPackages,
+  canUseNpm,
+  canUsePnpm
+} from "@modern-js/utils";
+import { SolutionToolsMap } from "@modern-js/generator-common";
+import { stripAnsi } from "./utils/strip-ansi";
+import { i18n, localeKeys } from "./locale";
+import { getAvailableVersion } from "./utils/package";
+import { fileExist } from "./utils/fs-exist";
+export * from "./utils";
+import {
+  ora as ora2,
+  fs as fs2,
+  semver,
+  execa as execa2,
+  chalk,
+  readTsConfigByFile,
+  getPackageManager,
+  canUseNpm as canUseNpm2,
+  canUsePnpm as canUsePnpm2,
+  canUseYarn,
+  isReact18
+} from "@modern-js/utils";
+import { i18n as i18n2 } from "./locale";
+async function getPackageVersion(packageName, registry) {
+  const spinner = ora({
+    text: "Load Generator...",
+    spinner: "runner"
+  }).start();
+  if (await canUsePnpm()) {
+    const args = ["info", packageName, "version"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+    const result = await execa("pnpm", args);
+    spinner.stop();
+    return stripAnsi(result.stdout);
+  }
+  if (await canUseNpm()) {
+    const args = ["view", packageName, "version"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+    const result = await execa("npm", args);
+    spinner.stop();
+    return stripAnsi(result.stdout);
+  }
+  spinner.stop();
+  throw new Error("not found npm, please install npm before");
+}
+async function getModernVersion(solution, registry, distTag = "latest") {
+  const dep = SolutionToolsMap[solution];
+  const modernVersion = await getPackageVersion(`${dep}@${distTag}`, registry);
+  return modernVersion;
+}
+async function getModernPluginVersion(solution, packageName, options = {
+  distTag: "latest"
+}) {
+  const { cwd = process.cwd(), registry, distTag } = options;
+  const getLatetPluginVersion = async (tag) => {
+    const version = await getPackageVersion(
+      `${packageName}@${tag || distTag || "latest"}`,
+      registry
+    );
+    return version;
+  };
+  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], { paths: [cwd] }),
+    "../../../../",
+    "package.json"
+  );
+  if (fs.existsSync(pkgPath)) {
+    const pkgInfo = fs.readJSONSync(pkgPath);
+    const modernVersion = pkgInfo.version;
+    if (typeof modernVersion !== "string") {
+      return getLatetPluginVersion();
+    }
+    return getAvailableVersion(packageName, modernVersion, registry);
+  }
+  return getLatetPluginVersion();
+}
+function getPackageManagerText(packageManager) {
+  return packageManager === "yarn" ? "yarn" : `${packageManager} run`;
+}
+function isTsProject(appDir) {
+  return fs.existsSync(path.join(appDir, "tsconfig.json"));
+}
+async function getPackageObj(context) {
+  const pkgStr = (await context.materials.default.get(`package.json`).value()).content;
+  return JSON.parse(pkgStr);
+}
+function getAllPackages(appDir) {
+  const packages = getMonorepoPackages(appDir);
+  return packages.map((pkg) => pkg.name);
+}
+function validatePackageName(value, packages, options) {
+  const { isMonorepoSubProject } = options;
+  if (isMonorepoSubProject && packages.includes(value)) {
+    return {
+      success: false,
+      error: i18n.t(localeKeys.packageName.exit, { value })
+    };
+  }
+  return { success: true };
+}
+function validatePackagePath(value, projectDir, options) {
+  const { isMwa, isPublic, isTest } = options || {};
+  let dir = "apps";
+  if (isMwa && isTest) {
+    dir = "examples";
+  } else {
+    dir = isPublic ? "packages" : "features";
+  }
+  const packageDir = path.resolve(projectDir || "", dir, value);
+  if (fs.existsSync(packageDir)) {
+    return {
+      success: false,
+      error: i18n.t(localeKeys.packagePath.exit, { value })
+    };
+  }
+  return { success: true };
+}
+function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic, isLocalPackages) {
+  if (isLocalPackages && packagePath) {
+    return `${packagePath}/`;
+  }
+  if (isMonorepoSubProject && packagePath) {
+    return `${isPublic ? "packages" : "features"}/${packagePath}/`;
+  }
+  return "";
+}
+function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
+  if (isMonorepoSubProject && packagePath) {
+    return `${isTest ? "examples" : "apps"}/${packagePath}/`;
+  }
+  return "";
+}
+async function getModernConfigFile(appDir) {
+  let exist = await fileExist(path.join(appDir, "modern.config.ts"));
+  if (exist) {
+    return "modern.config.ts";
+  }
+  exist = await fileExist(path.join(appDir, "modern.config.js"));
+  if (exist) {
+    return "modern.config.js";
+  }
+  return isTsProject(appDir) ? "modern.config.ts" : "modern.config.js";
+}
+export {
+  canUseNpm2 as canUseNpm,
+  canUsePnpm2 as canUsePnpm,
+  canUseYarn,
+  chalk,
+  execa2 as execa,
+  fs2 as fs,
+  getAllPackages,
+  getMWAProjectPath,
+  getModernConfigFile,
+  getModernPluginVersion,
+  getModernVersion,
+  getModuleProjectPath,
+  getPackageManager,
+  getPackageManagerText,
+  getPackageObj,
+  getPackageVersion,
+  i18n2 as i18n,
+  isReact18,
+  isTsProject,
+  ora2 as ora,
+  readTsConfigByFile,
+  semver,
+  validatePackageName,
+  validatePackagePath
+};

package/dist/esm/utils/fs-exist.js

@@ -0,0 +1,15 @@
+import { fs } from "@modern-js/utils";
+async function fileExist(filePath) {
+  try {
+    const stat = await fs.stat(filePath);
+    if (stat.isFile()) {
+      return true;
+    }
+    return false;
+  } catch (e) {
+    return false;
+  }
+}
+export {
+  fileExist
+};

package/dist/esm/utils/package.js

@@ -0,0 +1,66 @@
+import { canUseNpm, execa, logger, semver, stripAnsi } from "@modern-js/utils";
+async function isPackageExist(packageName, registry) {
+  if (await canUseNpm()) {
+    const args = ["view", packageName, "version"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+    const result = await execa("npm", args);
+    return stripAnsi(result.stdout);
+  }
+  throw new Error("not found npm, please install npm before");
+}
+async function isPackageDeprecated(packageName, registry) {
+  if (await canUseNpm()) {
+    const args = ["view", packageName, "deprecated"];
+    if (registry) {
+      args.push(`--registry=${registry}`);
+    }
+    const result = await execa("npm", args);
+    return stripAnsi(result.stdout);
+  }
+  throw new Error("not found npm, please install npm before");
+}
+function semverDecrease(version) {
+  const versionObj = semver.parse(version, { loose: true });
+  if (!versionObj) {
+    throw new Error(`Version ${version} is not valid semver`);
+  }
+  versionObj.build = [];
+  versionObj.prerelease = [];
+  versionObj.patch--;
+  const result = versionObj.format();
+  if (!semver.valid(result)) {
+    logger.debug(`Version ${result} is not valid semver`);
+    return version;
+  }
+  return result;
+}
+async function getAvailableVersion(packageName, currentVersion, registry) {
+  let times = 5;
+  let version = currentVersion;
+  while (times) {
+    if (!await isPackageExist(`${packageName}@${version}`, registry) || await isPackageDeprecated(`${packageName}@${version}`, registry)) {
+      version = semver.inc(version, "patch");
+      times--;
+      continue;
+    }
+    return version;
+  }
+  times = 5;
+  while (times) {
+    version = semverDecrease(version);
+    if (!await isPackageExist(`${packageName}@${version}`, registry) || await isPackageDeprecated(`${packageName}@${version}`, registry)) {
+      times--;
+      continue;
+    }
+    return version;
+  }
+  return currentVersion;
+}
+export {
+  getAvailableVersion,
+  isPackageDeprecated,
+  isPackageExist,
+  semverDecrease
+};

package/package.json

@@ -11,35 +11,34 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.7-beta.0",
+  "version": "3.0.8",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     }
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/plugin-i18n": "2.4.1-beta.0",
-    "@modern-js/generator-common": "3.0.7-beta.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/plugin-i18n": "2.6.0",
+    "@modern-js/generator-common": "3.0.8",
+    "@modern-js/utils": "2.6.0"
   },
   "devDependencies": {
-    "@modern-js/codesmith": "2.0.3",
+    "@modern-js/codesmith": "2.0.4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "@scripts/build": "2.6.0",
+    "@scripts/jest-config": "2.6.0"
   },
   "sideEffects": false,
   "modernConfig": {

package/dist/js/modern/index.js

@@ -1,212 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import path from "path";
-import {
-  fs,
-  ora,
-  execa,
-  getMonorepoPackages,
-  canUseNpm,
-  canUsePnpm
-} from "@modern-js/utils";
-import { SolutionToolsMap } from "@modern-js/generator-common";
-import { stripAnsi } from "./utils/strip-ansi";
-import { i18n, localeKeys } from "./locale";
-import { getAvailableVersion } from "./utils/package";
-import { fileExist } from "./utils/fs-exist";
-export * from "./utils";
-import {
-  ora as ora2,
-  fs as fs2,
-  semver,
-  execa as execa2,
-  chalk,
-  readTsConfigByFile,
-  getPackageManager,
-  canUseNpm as canUseNpm2,
-  canUsePnpm as canUsePnpm2,
-  canUseYarn,
-  isReact18
-} from "@modern-js/utils";
-import { i18n as i18n2 } from "./locale";
-function getPackageVersion(packageName, registry) {
-  return __async(this, null, function* () {
-    const spinner = ora({
-      text: "Load Generator...",
-      spinner: "runner"
-    }).start();
-    if (yield canUsePnpm()) {
-      const args = ["info", packageName, "version"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield execa("pnpm", args);
-      spinner.stop();
-      return stripAnsi(result.stdout);
-    }
-    if (yield canUseNpm()) {
-      const args = ["view", packageName, "version"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield execa("npm", args);
-      spinner.stop();
-      return stripAnsi(result.stdout);
-    }
-    spinner.stop();
-    throw new Error("not found npm, please install npm before");
-  });
-}
-function getModernVersion(solution, registry, distTag = "latest") {
-  return __async(this, null, function* () {
-    const dep = SolutionToolsMap[solution];
-    const modernVersion = yield getPackageVersion(`${dep}@${distTag}`, registry);
-    return modernVersion;
-  });
-}
-function getModernPluginVersion(_0, _1) {
-  return __async(this, arguments, function* (solution, packageName, options = {
-    distTag: "latest"
-  }) {
-    const { cwd = process.cwd(), registry, distTag } = options;
-    const getLatetPluginVersion = (tag) => __async(this, null, function* () {
-      const version = yield getPackageVersion(
-        `${packageName}@${tag || distTag || "latest"}`,
-        registry
-      );
-      return version;
-    });
-    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], { paths: [cwd] }),
-      "../../../../",
-      "package.json"
-    );
-    if (fs.existsSync(pkgPath)) {
-      const pkgInfo = fs.readJSONSync(pkgPath);
-      const modernVersion = pkgInfo.version;
-      if (typeof modernVersion !== "string") {
-        return getLatetPluginVersion();
-      }
-      return getAvailableVersion(packageName, modernVersion, registry);
-    }
-    return getLatetPluginVersion();
-  });
-}
-function getPackageManagerText(packageManager) {
-  return packageManager === "yarn" ? "yarn" : `${packageManager} run`;
-}
-function isTsProject(appDir) {
-  return fs.existsSync(path.join(appDir, "tsconfig.json"));
-}
-function getPackageObj(context) {
-  return __async(this, null, function* () {
-    const pkgStr = (yield context.materials.default.get(`package.json`).value()).content;
-    return JSON.parse(pkgStr);
-  });
-}
-function getAllPackages(appDir) {
-  const packages = getMonorepoPackages(appDir);
-  return packages.map((pkg) => pkg.name);
-}
-function validatePackageName(value, packages, options) {
-  const { isMonorepoSubProject } = options;
-  if (isMonorepoSubProject && packages.includes(value)) {
-    return {
-      success: false,
-      error: i18n.t(localeKeys.packageName.exit, { value })
-    };
-  }
-  return { success: true };
-}
-function validatePackagePath(value, projectDir, options) {
-  const { isMwa, isPublic, isTest } = options || {};
-  let dir = "apps";
-  if (isMwa && isTest) {
-    dir = "examples";
-  } else {
-    dir = isPublic ? "packages" : "features";
-  }
-  const packageDir = path.resolve(projectDir || "", dir, value);
-  if (fs.existsSync(packageDir)) {
-    return {
-      success: false,
-      error: i18n.t(localeKeys.packagePath.exit, { value })
-    };
-  }
-  return { success: true };
-}
-function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic, isLocalPackages) {
-  if (isLocalPackages && packagePath) {
-    return `${packagePath}/`;
-  }
-  if (isMonorepoSubProject && packagePath) {
-    return `${isPublic ? "packages" : "features"}/${packagePath}/`;
-  }
-  return "";
-}
-function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
-  if (isMonorepoSubProject && packagePath) {
-    return `${isTest ? "examples" : "apps"}/${packagePath}/`;
-  }
-  return "";
-}
-function getModernConfigFile(appDir) {
-  return __async(this, null, function* () {
-    let exist = yield fileExist(path.join(appDir, "modern.config.ts"));
-    if (exist) {
-      return "modern.config.ts";
-    }
-    exist = yield fileExist(path.join(appDir, "modern.config.js"));
-    if (exist) {
-      return "modern.config.js";
-    }
-    return isTsProject(appDir) ? "modern.config.ts" : "modern.config.js";
-  });
-}
-export {
-  canUseNpm2 as canUseNpm,
-  canUsePnpm2 as canUsePnpm,
-  canUseYarn,
-  chalk,
-  execa2 as execa,
-  fs2 as fs,
-  getAllPackages,
-  getMWAProjectPath,
-  getModernConfigFile,
-  getModernPluginVersion,
-  getModernVersion,
-  getModuleProjectPath,
-  getPackageManager,
-  getPackageManagerText,
-  getPackageObj,
-  getPackageVersion,
-  i18n2 as i18n,
-  isReact18,
-  isTsProject,
-  ora2 as ora,
-  readTsConfigByFile,
-  semver,
-  validatePackageName,
-  validatePackagePath
-};

package/dist/js/modern/utils/fs-exist.js

@@ -1,37 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { fs } from "@modern-js/utils";
-function fileExist(filePath) {
-  return __async(this, null, function* () {
-    try {
-      const stat = yield fs.stat(filePath);
-      if (stat.isFile()) {
-        return true;
-      }
-      return false;
-    } catch (e) {
-      return false;
-    }
-  });
-}
-export {
-  fileExist
-};

package/dist/js/modern/utils/package.js

@@ -1,92 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { canUseNpm, execa, logger, semver, stripAnsi } from "@modern-js/utils";
-function isPackageExist(packageName, registry) {
-  return __async(this, null, function* () {
-    if (yield canUseNpm()) {
-      const args = ["view", packageName, "version"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield execa("npm", args);
-      return stripAnsi(result.stdout);
-    }
-    throw new Error("not found npm, please install npm before");
-  });
-}
-function isPackageDeprecated(packageName, registry) {
-  return __async(this, null, function* () {
-    if (yield canUseNpm()) {
-      const args = ["view", packageName, "deprecated"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield execa("npm", args);
-      return stripAnsi(result.stdout);
-    }
-    throw new Error("not found npm, please install npm before");
-  });
-}
-function semverDecrease(version) {
-  const versionObj = semver.parse(version, { loose: true });
-  if (!versionObj) {
-    throw new Error(`Version ${version} is not valid semver`);
-  }
-  versionObj.build = [];
-  versionObj.prerelease = [];
-  versionObj.patch--;
-  const result = versionObj.format();
-  if (!semver.valid(result)) {
-    logger.debug(`Version ${result} is not valid semver`);
-    return version;
-  }
-  return result;
-}
-function getAvailableVersion(packageName, currentVersion, registry) {
-  return __async(this, null, function* () {
-    let times = 5;
-    let version = currentVersion;
-    while (times) {
-      if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
-        version = semver.inc(version, "patch");
-        times--;
-        continue;
-      }
-      return version;
-    }
-    times = 5;
-    while (times) {
-      version = semverDecrease(version);
-      if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
-        times--;
-        continue;
-      }
-      return version;
-    }
-    return currentVersion;
-  });
-}
-export {
-  getAvailableVersion,
-  isPackageDeprecated,
-  isPackageExist,
-  semverDecrease
-};

package/dist/js/node/utils/fs-exist.js

@@ -1,60 +0,0 @@
-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);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-var fs_exist_exports = {};
-__export(fs_exist_exports, {
-  fileExist: () => fileExist
-});
-module.exports = __toCommonJS(fs_exist_exports);
-var import_utils = require("@modern-js/utils");
-function fileExist(filePath) {
-  return __async(this, null, function* () {
-    try {
-      const stat = yield import_utils.fs.stat(filePath);
-      if (stat.isFile()) {
-        return true;
-      }
-      return false;
-    } catch (e) {
-      return false;
-    }
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  fileExist
-});

package/dist/js/node/utils/package.js

@@ -1,118 +0,0 @@
-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);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-var package_exports = {};
-__export(package_exports, {
-  getAvailableVersion: () => getAvailableVersion,
-  isPackageDeprecated: () => isPackageDeprecated,
-  isPackageExist: () => isPackageExist,
-  semverDecrease: () => semverDecrease
-});
-module.exports = __toCommonJS(package_exports);
-var import_utils = require("@modern-js/utils");
-function isPackageExist(packageName, registry) {
-  return __async(this, null, function* () {
-    if (yield (0, import_utils.canUseNpm)()) {
-      const args = ["view", packageName, "version"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield (0, import_utils.execa)("npm", args);
-      return (0, import_utils.stripAnsi)(result.stdout);
-    }
-    throw new Error("not found npm, please install npm before");
-  });
-}
-function isPackageDeprecated(packageName, registry) {
-  return __async(this, null, function* () {
-    if (yield (0, import_utils.canUseNpm)()) {
-      const args = ["view", packageName, "deprecated"];
-      if (registry) {
-        args.push(`--registry=${registry}`);
-      }
-      const result = yield (0, import_utils.execa)("npm", args);
-      return (0, import_utils.stripAnsi)(result.stdout);
-    }
-    throw new Error("not found npm, please install npm before");
-  });
-}
-function semverDecrease(version) {
-  const versionObj = import_utils.semver.parse(version, { loose: true });
-  if (!versionObj) {
-    throw new Error(`Version ${version} is not valid semver`);
-  }
-  versionObj.build = [];
-  versionObj.prerelease = [];
-  versionObj.patch--;
-  const result = versionObj.format();
-  if (!import_utils.semver.valid(result)) {
-    import_utils.logger.debug(`Version ${result} is not valid semver`);
-    return version;
-  }
-  return result;
-}
-function getAvailableVersion(packageName, currentVersion, registry) {
-  return __async(this, null, function* () {
-    let times = 5;
-    let version = currentVersion;
-    while (times) {
-      if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
-        version = import_utils.semver.inc(version, "patch");
-        times--;
-        continue;
-      }
-      return version;
-    }
-    times = 5;
-    while (times) {
-      version = semverDecrease(version);
-      if (!(yield isPackageExist(`${packageName}@${version}`, registry)) || (yield isPackageDeprecated(`${packageName}@${version}`, registry))) {
-        times--;
-        continue;
-      }
-      return version;
-    }
-    return currentVersion;
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getAvailableVersion,
-  isPackageDeprecated,
-  isPackageExist,
-  semverDecrease
-});