@modern-js/generator-utils 3.2.2 → 3.2.4

package/dist/cjs/index.js

@@ -1,104 +1,76 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  ora: function() {
-    return _utils.ora;
-  },
-  fs: function() {
-    return _utils.fs;
-  },
-  semver: function() {
-    return _utils.semver;
-  },
-  execa: function() {
-    return _utils.execa;
-  },
-  chalk: function() {
-    return _utils.chalk;
-  },
-  readTsConfigByFile: function() {
-    return _utils.readTsConfigByFile;
-  },
-  getPackageManager: function() {
-    return _utils.getPackageManager;
-  },
-  canUseNpm: function() {
-    return _utils.canUseNpm;
-  },
-  canUsePnpm: function() {
-    return _utils.canUsePnpm;
-  },
-  canUseYarn: function() {
-    return _utils.canUseYarn;
-  },
-  isReact18: function() {
-    return _utils.isReact18;
-  },
-  i18n: function() {
-    return _locale.i18n;
-  },
-  getPackageVersion: function() {
-    return getPackageVersion;
-  },
-  getModernVersion: function() {
-    return getModernVersion;
-  },
-  getModernPluginVersion: function() {
-    return getModernPluginVersion;
-  },
-  getPackageManagerText: function() {
-    return getPackageManagerText;
-  },
-  isTsProject: function() {
-    return isTsProject;
-  },
-  getPackageObj: function() {
-    return getPackageObj;
-  },
-  getAllPackages: function() {
-    return getAllPackages;
-  },
-  validatePackageName: function() {
-    return validatePackageName;
-  },
-  validatePackagePath: function() {
-    return validatePackagePath;
-  },
-  getModuleProjectPath: function() {
-    return getModuleProjectPath;
-  },
-  getMWAProjectPath: function() {
-    return getMWAProjectPath;
-  },
-  getModernConfigFile: function() {
-    return getModernConfigFile;
+    __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 __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 src_exports = {};
+__export(src_exports, {
+  canUseNpm: () => import_utils2.canUseNpm,
+  canUsePnpm: () => import_utils2.canUsePnpm,
+  canUseYarn: () => import_utils2.canUseYarn,
+  chalk: () => import_utils2.chalk,
+  execa: () => import_utils2.execa,
+  fs: () => import_utils2.fs,
+  getAllPackages: () => getAllPackages,
+  getMWAProjectPath: () => getMWAProjectPath,
+  getModernConfigFile: () => getModernConfigFile,
+  getModernPluginVersion: () => getModernPluginVersion,
+  getModernVersion: () => getModernVersion,
+  getModuleProjectPath: () => getModuleProjectPath,
+  getPackageManager: () => import_utils2.getPackageManager,
+  getPackageManagerText: () => getPackageManagerText,
+  getPackageObj: () => getPackageObj,
+  getPackageVersion: () => getPackageVersion,
+  i18n: () => import_locale2.i18n,
+  isReact18: () => import_utils2.isReact18,
+  isTsProject: () => isTsProject,
+  ora: () => import_utils2.ora,
+  readTsConfigByFile: () => import_utils2.readTsConfigByFile,
+  semver: () => import_utils2.semver,
+  validatePackageName: () => validatePackageName,
+  validatePackagePath: () => validatePackagePath
 });
-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);
+module.exports = __toCommonJS(src_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_generator_common = require("@modern-js/generator-common");
+var import_stripAnsi = require("./utils/stripAnsi");
+var import_locale = require("./locale");
+var import_package = require("./utils/package");
+var import_fsExist = require("./utils/fsExist");
+__reExport(src_exports, require("./utils"), module.exports);
+var import_utils2 = require("@modern-js/utils");
+var import_locale2 = require("./locale");
 async function getPackageVersion(packageName, registry) {
-  const spinner = (0, _utils.ora)({
+  const spinner = (0, import_utils.ora)({
     text: "Load Generator...",
     spinner: "runner"
   }).start();
-  if (await (0, _utils.canUsePnpm)()) {
+  if (await (0, import_utils.canUsePnpm)()) {
     const args = [
       "info",
       packageName,
@@ -107,11 +79,11 @@ async function getPackageVersion(packageName, registry) {
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-    const result = await (0, _utils.execa)("pnpm", args);
+    const result = await (0, import_utils.execa)("pnpm", args);
     spinner.stop();
-    return (0, _stripAnsi.stripAnsi)(result.stdout);
+    return (0, import_stripAnsi.stripAnsi)(result.stdout);
   }
-  if (await (0, _utils.canUseNpm)()) {
+  if (await (0, import_utils.canUseNpm)()) {
     const args = [
       "view",
       packageName,
@@ -120,15 +92,15 @@ async function getPackageVersion(packageName, registry) {
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-    const result = await (0, _utils.execa)("npm", args);
+    const result = await (0, import_utils.execa)("npm", args);
     spinner.stop();
-    return (0, _stripAnsi.stripAnsi)(result.stdout);
+    return (0, import_stripAnsi.stripAnsi)(result.stdout);
   }
   spinner.stop();
   throw new Error("not found npm, please install npm before");
 }
 async function getModernVersion(solution, registry, distTag = "latest") {
-  const dep = _generatorcommon.SolutionToolsMap[solution];
+  const dep = import_generator_common.SolutionToolsMap[solution];
   const modernVersion = await getPackageVersion(`${dep}@${distTag}`, registry);
   return modernVersion;
 }
@@ -143,25 +115,25 @@ 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");
   }
-  let pkgPath = _path.default.join(require.resolve(_generatorcommon.SolutionToolsMap[solution], {
+  let pkgPath = import_path.default.join(require.resolve(import_generator_common.SolutionToolsMap[solution], {
     paths: [
       cwd
     ]
   }), "../../..", "package.json");
-  if (solution === _generatorcommon.Solution.Module) {
-    pkgPath = _path.default.join(require.resolve(_generatorcommon.SolutionToolsMap[solution], {
+  if (solution === import_generator_common.Solution.Module) {
+    pkgPath = import_path.default.join(require.resolve(import_generator_common.SolutionToolsMap[solution], {
       paths: [
         cwd
       ]
     }), "../..", "package.json");
   }
-  if (_utils.fs.existsSync(pkgPath)) {
-    const pkgInfo = _utils.fs.readJSONSync(pkgPath);
+  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, _package.getAvailableVersion)(packageName, modernVersion, registry);
+    return (0, import_package.getAvailableVersion)(packageName, modernVersion, registry);
   }
   return getLatetPluginVersion();
 }
@@ -169,14 +141,14 @@ function getPackageManagerText(packageManager) {
   return packageManager === "yarn" ? "yarn" : `${packageManager} run`;
 }
 function isTsProject(appDir) {
-  return _utils.fs.existsSync(_path.default.join(appDir, "tsconfig.json"));
+  return import_utils.fs.existsSync(import_path.default.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 = (0, _utils.getMonorepoPackages)(appDir);
+  const packages = (0, import_utils.getMonorepoPackages)(appDir);
   return packages.map((pkg) => pkg.name);
 }
 function validatePackageName(value, packages, options) {
@@ -184,7 +156,7 @@ function validatePackageName(value, packages, options) {
   if (isMonorepoSubProject && packages.includes(value)) {
     return {
       success: false,
-      error: _locale.i18n.t(_locale.localeKeys.packageName.exit, {
+      error: import_locale.i18n.t(import_locale.localeKeys.packageName.exit, {
         value
       })
     };
@@ -194,18 +166,13 @@ function validatePackageName(value, packages, options) {
   };
 }
 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.default.resolve(projectDir || "", dir, value);
-  if (_utils.fs.existsSync(packageDir)) {
+  const { isMwa } = options || {};
+  const dir = isMwa ? "apps" : "packages";
+  const packageDir = import_path.default.resolve(projectDir || "", dir, value);
+  if (import_utils.fs.existsSync(packageDir)) {
     return {
       success: false,
-      error: _locale.i18n.t(_locale.localeKeys.packagePath.exit, {
+      error: import_locale.i18n.t(import_locale.localeKeys.packagePath.exit, {
         value
       })
     };
@@ -214,29 +181,57 @@ function validatePackagePath(value, projectDir, options) {
     success: true
   };
 }
-function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic, isLocalPackages) {
+function getModuleProjectPath(packagePath, isMonorepoSubProject, isLocalPackages) {
   if (isLocalPackages && packagePath) {
     return `${packagePath}/`;
   }
   if (isMonorepoSubProject && packagePath) {
-    return `${isPublic ? "packages" : "features"}/${packagePath}/`;
+    return `packages/${packagePath}/`;
   }
   return "";
 }
-function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
+function getMWAProjectPath(packagePath, isMonorepoSubProject) {
   if (isMonorepoSubProject && packagePath) {
-    return `${isTest ? "examples" : "apps"}/${packagePath}/`;
+    return `apps/${packagePath}/`;
   }
   return "";
 }
 async function getModernConfigFile(appDir) {
-  let exist = await (0, _fsExist.fileExist)(_path.default.join(appDir, "modern.config.ts"));
+  let exist = await (0, import_fsExist.fileExist)(import_path.default.join(appDir, "modern.config.ts"));
   if (exist) {
     return "modern.config.ts";
   }
-  exist = await (0, _fsExist.fileExist)(_path.default.join(appDir, "modern.config.js"));
+  exist = await (0, import_fsExist.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 = {
+  canUseNpm,
+  canUsePnpm,
+  canUseYarn,
+  chalk,
+  execa,
+  fs,
+  getAllPackages,
+  getMWAProjectPath,
+  getModernConfigFile,
+  getModernPluginVersion,
+  getModernVersion,
+  getModuleProjectPath,
+  getPackageManager,
+  getPackageManagerText,
+  getPackageObj,
+  getPackageVersion,
+  i18n,
+  isReact18,
+  isTsProject,
+  ora,
+  readTsConfigByFile,
+  semver,
+  validatePackageName,
+  validatePackagePath,
+  ...require("./utils")
+});

package/dist/cjs/locale/en.js

@@ -1,13 +1,26 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "EN_LOCALE", {
-  enumerable: true,
-  get: function() {
-    return EN_LOCALE;
+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 en_exports = {};
+__export(en_exports, {
+  EN_LOCALE: () => EN_LOCALE
 });
+module.exports = __toCommonJS(en_exports);
 const EN_LOCALE = {
   packageName: {
     exit: "package name `{value}` is already exists"
@@ -16,3 +29,7 @@ const EN_LOCALE = {
     exit: "package path {value} is already exists"
   }
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  EN_LOCALE
+});

package/dist/cjs/locale/index.js

@@ -1,27 +1,37 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+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)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  i18n: function() {
-    return i18n;
-  },
-  localeKeys: function() {
-    return localeKeys;
+    __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 locale_exports = {};
+__export(locale_exports, {
+  i18n: () => i18n,
+  localeKeys: () => localeKeys
 });
-const _plugini18n = require("@modern-js/plugin-i18n");
-const _zh = require("./zh");
-const _en = require("./en");
-const i18n = new _plugini18n.I18n();
+module.exports = __toCommonJS(locale_exports);
+var import_plugin_i18n = require("@modern-js/plugin-i18n");
+var import_zh = require("./zh");
+var import_en = require("./en");
+const i18n = new import_plugin_i18n.I18n();
 const localeKeys = i18n.init("en", {
-  zh: _zh.ZH_LOCALE,
-  en: _en.EN_LOCALE
+  zh: import_zh.ZH_LOCALE,
+  en: import_en.EN_LOCALE
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  i18n,
+  localeKeys
 });

package/dist/cjs/locale/zh.js

@@ -1,13 +1,26 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "ZH_LOCALE", {
-  enumerable: true,
-  get: function() {
-    return ZH_LOCALE;
+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 zh_exports = {};
+__export(zh_exports, {
+  ZH_LOCALE: () => ZH_LOCALE
 });
+module.exports = __toCommonJS(zh_exports);
 const ZH_LOCALE = {
   packageName: {
     exit: "项目名称 {value} 已存在"
@@ -16,3 +29,7 @@ const ZH_LOCALE = {
     exit: "目录 {value} 已存在"
   }
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ZH_LOCALE
+});

package/dist/cjs/utils/fsExist.js

@@ -1,17 +1,30 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "fileExist", {
-  enumerable: true,
-  get: function() {
-    return fileExist;
+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 fsExist_exports = {};
+__export(fsExist_exports, {
+  fileExist: () => fileExist
 });
-const _utils = require("@modern-js/utils");
+module.exports = __toCommonJS(fsExist_exports);
+var import_utils = require("@modern-js/utils");
 async function fileExist(filePath) {
   try {
-    const stat = await _utils.fs.stat(filePath);
+    const stat = await import_utils.fs.stat(filePath);
     if (stat.isFile()) {
       return true;
     }
@@ -20,3 +33,7 @@ async function fileExist(filePath) {
     return false;
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fileExist
+});

package/dist/cjs/utils/index.js

@@ -1,7 +1,24 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+module.exports = __toCommonJS(utils_exports);
+__reExport(utils_exports, require("./stripAnsi"), module.exports);
+__reExport(utils_exports, require("./package"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./stripAnsi"),
+  ...require("./package")
 });
-const _export_star = require("@swc/helpers/_/_export_star");
-_export_star._(require("./stripAnsi"), exports);
-_export_star._(require("./package"), exports);

package/dist/cjs/utils/package.js

@@ -1,31 +1,32 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+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)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  isPackageExist: function() {
-    return isPackageExist;
-  },
-  isPackageDeprecated: function() {
-    return isPackageDeprecated;
-  },
-  semverDecrease: function() {
-    return semverDecrease;
-  },
-  getAvailableVersion: function() {
-    return getAvailableVersion;
+    __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
 });
-const _utils = require("@modern-js/utils");
+module.exports = __toCommonJS(package_exports);
+var import_utils = require("@modern-js/utils");
 async function isPackageExist(packageName, registry) {
-  if (await (0, _utils.canUseNpm)()) {
+  if (await (0, import_utils.canUseNpm)()) {
     try {
       const args = [
         "view",
@@ -35,8 +36,8 @@ async function isPackageExist(packageName, registry) {
       if (registry) {
         args.push(`--registry=${registry}`);
       }
-      const result = await (0, _utils.execa)("npm", args);
-      return (0, _utils.stripAnsi)(result.stdout);
+      const result = await (0, import_utils.execa)("npm", args);
+      return (0, import_utils.stripAnsi)(result.stdout);
     } catch (e) {
       return false;
     }
@@ -44,7 +45,7 @@ async function isPackageExist(packageName, registry) {
   throw new Error("not found npm, please install npm before");
 }
 async function isPackageDeprecated(packageName, registry) {
-  if (await (0, _utils.canUseNpm)()) {
+  if (await (0, import_utils.canUseNpm)()) {
     const args = [
       "view",
       packageName,
@@ -53,13 +54,13 @@ async function isPackageDeprecated(packageName, registry) {
     if (registry) {
       args.push(`--registry=${registry}`);
     }
-    const result = await (0, _utils.execa)("npm", args);
-    return (0, _utils.stripAnsi)(result.stdout);
+    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 = _utils.semver.parse(version, {
+  const versionObj = import_utils.semver.parse(version, {
     loose: true
   });
   if (!versionObj) {
@@ -69,8 +70,8 @@ function semverDecrease(version) {
   versionObj.prerelease = [];
   versionObj.patch--;
   const result = versionObj.format();
-  if (!_utils.semver.valid(result)) {
-    _utils.logger.debug(`Version ${result} is not valid semver`);
+  if (!import_utils.semver.valid(result)) {
+    import_utils.logger.debug(`Version ${result} is not valid semver`);
     return version;
   }
   return result;
@@ -80,7 +81,7 @@ async function getAvailableVersion(packageName, currentVersion, registry) {
   let version = currentVersion;
   while (times) {
     if (!await isPackageExist(`${packageName}@${version}`, registry) || await isPackageDeprecated(`${packageName}@${version}`, registry)) {
-      version = _utils.semver.inc(version, "patch");
+      version = import_utils.semver.inc(version, "patch");
       times--;
       continue;
     }
@@ -97,3 +98,10 @@ async function getAvailableVersion(packageName, currentVersion, registry) {
   }
   return currentVersion;
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getAvailableVersion,
+  isPackageDeprecated,
+  isPackageExist,
+  semverDecrease
+});

package/dist/cjs/utils/stripAnsi.js

@@ -1,13 +1,26 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "stripAnsi", {
-  enumerable: true,
-  get: function() {
-    return stripAnsi;
+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 stripAnsi_exports = {};
+__export(stripAnsi_exports, {
+  stripAnsi: () => stripAnsi
 });
+module.exports = __toCommonJS(stripAnsi_exports);
 function ansiRegex({ onlyFirst = false } = {}) {
   const pattern = [
     "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
@@ -21,3 +34,7 @@ function stripAnsi(string) {
   }
   return string.replace(ansiRegex(), "");
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  stripAnsi
+});

package/dist/esm/index.js

@@ -6,9 +6,9 @@ import { i18n, localeKeys } from "./locale";
 import { getAvailableVersion } from "./utils/package";
 import { fileExist } from "./utils/fsExist";
 export * from "./utils";
-export { ora, fs, semver, execa, chalk, readTsConfigByFile, getPackageManager, canUseNpm, canUsePnpm, canUseYarn, isReact18 } from "@modern-js/utils";
-export { i18n } from "./locale";
-export async function getPackageVersion(packageName, registry) {
+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"
@@ -42,12 +42,12 @@ export async function getPackageVersion(packageName, registry) {
   spinner.stop();
   throw new Error("not found npm, please install npm before");
 }
-export async function getModernVersion(solution, registry, distTag = "latest") {
+async function getModernVersion(solution, registry, distTag = "latest") {
   const dep = SolutionToolsMap[solution];
   const modernVersion = await getPackageVersion(`${dep}@${distTag}`, registry);
   return modernVersion;
 }
-export async function getModernPluginVersion(solution, packageName, options = {
+async function getModernPluginVersion(solution, packageName, options = {
   distTag: "latest"
 }) {
   const { cwd = process.cwd(), registry, distTag } = options;
@@ -80,21 +80,21 @@ export async function getModernPluginVersion(solution, packageName, options = {
   }
   return getLatetPluginVersion();
 }
-export function getPackageManagerText(packageManager) {
+function getPackageManagerText(packageManager) {
   return packageManager === "yarn" ? "yarn" : `${packageManager} run`;
 }
-export function isTsProject(appDir) {
+function isTsProject(appDir) {
   return fs.existsSync(path.join(appDir, "tsconfig.json"));
 }
-export async function getPackageObj(context) {
+async function getPackageObj(context) {
   const pkgStr = (await context.materials.default.get(`package.json`).value()).content;
   return JSON.parse(pkgStr);
 }
-export function getAllPackages(appDir) {
+function getAllPackages(appDir) {
   const packages = getMonorepoPackages(appDir);
   return packages.map((pkg) => pkg.name);
 }
-export function validatePackageName(value, packages, options) {
+function validatePackageName(value, packages, options) {
   const { isMonorepoSubProject } = options;
   if (isMonorepoSubProject && packages.includes(value)) {
     return {
@@ -108,14 +108,9 @@ export function validatePackageName(value, packages, options) {
     success: true
   };
 }
-export function validatePackagePath(value, projectDir, options) {
-  const { isMwa, isPublic, isTest } = options || {};
-  let dir = "apps";
-  if (isMwa && isTest) {
-    dir = "examples";
-  } else {
-    dir = isPublic ? "packages" : "features";
-  }
+function validatePackagePath(value, projectDir, options) {
+  const { isMwa } = options || {};
+  const dir = isMwa ? "apps" : "packages";
   const packageDir = path.resolve(projectDir || "", dir, value);
   if (fs.existsSync(packageDir)) {
     return {
@@ -129,22 +124,22 @@ export function validatePackagePath(value, projectDir, options) {
     success: true
   };
 }
-export function getModuleProjectPath(packagePath, isMonorepoSubProject, isPublic, isLocalPackages) {
+function getModuleProjectPath(packagePath, isMonorepoSubProject, isLocalPackages) {
   if (isLocalPackages && packagePath) {
     return `${packagePath}/`;
   }
   if (isMonorepoSubProject && packagePath) {
-    return `${isPublic ? "packages" : "features"}/${packagePath}/`;
+    return `packages/${packagePath}/`;
   }
   return "";
 }
-export function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
+function getMWAProjectPath(packagePath, isMonorepoSubProject) {
   if (isMonorepoSubProject && packagePath) {
-    return `${isTest ? "examples" : "apps"}/${packagePath}/`;
+    return `apps/${packagePath}/`;
   }
   return "";
 }
-export async function getModernConfigFile(appDir) {
+async function getModernConfigFile(appDir) {
   let exist = await fileExist(path.join(appDir, "modern.config.ts"));
   if (exist) {
     return "modern.config.ts";
@@ -155,3 +150,29 @@ export async function getModernConfigFile(appDir) {
   }
   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/locale/en.js

@@ -1,4 +1,4 @@
-export const EN_LOCALE = {
+const EN_LOCALE = {
   packageName: {
     exit: "package name `{value}` is already exists"
   },
@@ -6,3 +6,6 @@ export const EN_LOCALE = {
     exit: "package path {value} is already exists"
   }
 };
+export {
+  EN_LOCALE
+};

package/dist/esm/locale/index.js

@@ -6,4 +6,7 @@ const localeKeys = i18n.init("en", {
   zh: ZH_LOCALE,
   en: EN_LOCALE
 });
-export { i18n, localeKeys };
+export {
+  i18n,
+  localeKeys
+};

package/dist/esm/locale/zh.js

@@ -1,4 +1,4 @@
-export const ZH_LOCALE = {
+const ZH_LOCALE = {
   packageName: {
     exit: "项目名称 {value} 已存在"
   },
@@ -6,3 +6,6 @@ export const ZH_LOCALE = {
     exit: "目录 {value} 已存在"
   }
 };
+export {
+  ZH_LOCALE
+};

package/dist/esm/utils/fsExist.js

@@ -1,5 +1,5 @@
 import { fs } from "@modern-js/utils";
-export async function fileExist(filePath) {
+async function fileExist(filePath) {
   try {
     const stat = await fs.stat(filePath);
     if (stat.isFile()) {
@@ -10,3 +10,6 @@ export async function fileExist(filePath) {
     return false;
   }
 }
+export {
+  fileExist
+};

package/dist/esm/utils/package.js

@@ -1,5 +1,5 @@
 import { canUseNpm, execa, logger, semver, stripAnsi } from "@modern-js/utils";
-export async function isPackageExist(packageName, registry) {
+async function isPackageExist(packageName, registry) {
   if (await canUseNpm()) {
     try {
       const args = [
@@ -18,7 +18,7 @@ export async function isPackageExist(packageName, registry) {
   }
   throw new Error("not found npm, please install npm before");
 }
-export async function isPackageDeprecated(packageName, registry) {
+async function isPackageDeprecated(packageName, registry) {
   if (await canUseNpm()) {
     const args = [
       "view",
@@ -33,7 +33,7 @@ export async function isPackageDeprecated(packageName, registry) {
   }
   throw new Error("not found npm, please install npm before");
 }
-export function semverDecrease(version) {
+function semverDecrease(version) {
   const versionObj = semver.parse(version, {
     loose: true
   });
@@ -50,7 +50,7 @@ export function semverDecrease(version) {
   }
   return result;
 }
-export async function getAvailableVersion(packageName, currentVersion, registry) {
+async function getAvailableVersion(packageName, currentVersion, registry) {
   let times = 5;
   let version = currentVersion;
   while (times) {
@@ -72,3 +72,9 @@ export async function getAvailableVersion(packageName, currentVersion, registry)
   }
   return currentVersion;
 }
+export {
+  getAvailableVersion,
+  isPackageDeprecated,
+  isPackageExist,
+  semverDecrease
+};

package/dist/esm/utils/stripAnsi.js

@@ -5,9 +5,12 @@ function ansiRegex({ onlyFirst = false } = {}) {
   ].join("|");
   return new RegExp(pattern, onlyFirst ? void 0 : "g");
 }
-export function stripAnsi(string) {
+function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
   }
   return string.replace(ansiRegex(), "");
 }
+export {
+  stripAnsi
+};

package/dist/types/index.d.ts

@@ -25,8 +25,6 @@ export declare function validatePackageName(value: string, packages: string[], o
 };
 export declare function validatePackagePath(value: string, projectDir: string, options?: {
   isMwa?: boolean;
-  isPublic?: boolean;
-  isTest?: boolean;
 }): {
   success: boolean;
   error: string;
@@ -34,6 +32,6 @@ export declare function validatePackagePath(value: string, projectDir: string, o
   success: boolean;
   error?: undefined;
 };
-export declare function getModuleProjectPath(packagePath: string, isMonorepoSubProject: boolean, isPublic: boolean, isLocalPackages: boolean): string;
-export declare function getMWAProjectPath(packagePath: string, isMonorepoSubProject: boolean, isTest?: boolean): string;
+export declare function getModuleProjectPath(packagePath: string, isMonorepoSubProject: boolean, isLocalPackages: boolean): string;
+export declare function getMWAProjectPath(packagePath: string, isMonorepoSubProject: boolean): string;
 export declare function getModernConfigFile(appDir: string): Promise<"modern.config.ts" | "modern.config.js">;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.2",
+  "version": "3.2.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin-i18n": "2.35.1",
-    "@modern-js/generator-common": "3.2.2",
-    "@modern-js/utils": "2.35.1"
+    "@modern-js/plugin-i18n": "2.37.0",
+    "@modern-js/generator-common": "3.2.4",
+    "@modern-js/utils": "2.37.0"
   },
   "devDependencies": {
     "@modern-js/codesmith": "2.2.5",
@@ -41,8 +41,8 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@scripts/build": "2.35.1",
-    "@scripts/jest-config": "2.35.1"
+    "@scripts/build": "2.37.0",
+    "@scripts/jest-config": "2.37.0"
   },
   "sideEffects": false,
   "publishConfig": {