@modern-js/generator-utils 3.0.0-beta.4 → 3.0.0-beta.5

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/generator-utils
 
+## 3.0.0-beta.5
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [7879e8f711]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/plugin-i18n@2.0.0-beta.6
+  - @modern-js/generator-common@3.0.0-beta.5
+
 ## 3.0.0-beta.4
 
 ### Major Changes

package/dist/js/modern/index.js

@@ -32,6 +32,7 @@ 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,
@@ -179,6 +180,19 @@ function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
   }
   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,
@@ -187,6 +201,7 @@ export {
   fs2 as fs,
   getAllPackages,
   getMWAProjectPath,
+  getModernConfigFile,
   getModernPluginVersion,
   getModernVersion,
   getModuleProjectPath,

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

@@ -0,0 +1,37 @@
+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/node/index.js

@@ -22,8 +22,28 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+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,
   canUsePnpm: () => import_utils2.canUsePnpm,
   canUseYarn: () => import_utils2.canUseYarn,
@@ -31,6 +51,7 @@ __export(stdin_exports, {
   fs: () => import_utils2.fs,
   getAllPackages: () => getAllPackages,
   getMWAProjectPath: () => getMWAProjectPath,
+  getModernConfigFile: () => getModernConfigFile,
   getModernPluginVersion: () => getModernPluginVersion,
   getModernVersion: () => getModernVersion,
   getModuleProjectPath: () => getModuleProjectPath,
@@ -47,36 +68,17 @@ __export(stdin_exports, {
   validatePackageName: () => validatePackageName,
   validatePackagePath: () => validatePackagePath
 });
-module.exports = __toCommonJS(stdin_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_strip_ansi = require("./utils/strip-ansi");
 var import_locale = require("./locale");
 var import_package = require("./utils/package");
-__reExport(stdin_exports, require("./utils"), module.exports);
+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");
-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());
-  });
-};
 function getPackageVersion(packageName, registry) {
   return __async(this, null, function* () {
     const spinner = (0, import_utils.ora)({
@@ -210,3 +212,42 @@ 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";
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  canUseNpm,
+  canUsePnpm,
+  canUseYarn,
+  execa,
+  fs,
+  getAllPackages,
+  getMWAProjectPath,
+  getModernConfigFile,
+  getModernPluginVersion,
+  getModernVersion,
+  getModuleProjectPath,
+  getPackageManager,
+  getPackageManagerText,
+  getPackageObj,
+  getPackageVersion,
+  i18n,
+  isReact18,
+  isTsProject,
+  ora,
+  readTsConfigByFile,
+  semver,
+  validatePackageName,
+  validatePackagePath
+});

package/dist/js/node/locale/en.js

@@ -15,12 +15,16 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var en_exports = {};
+__export(en_exports, {
   EN_LOCALE: () => EN_LOCALE
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(en_exports);
 const EN_LOCALE = {
   packageName: { exit: "package name `{value}` is already exists" },
   packagePath: { exit: "package path {value} is already exists" }
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  EN_LOCALE
+});

package/dist/js/node/locale/index.js

@@ -15,14 +15,19 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var locale_exports = {};
+__export(locale_exports, {
   i18n: () => i18n,
   localeKeys: () => localeKeys
 });
-module.exports = __toCommonJS(stdin_exports);
+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("zh", { 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/js/node/locale/zh.js

@@ -15,12 +15,16 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var zh_exports = {};
+__export(zh_exports, {
   ZH_LOCALE: () => ZH_LOCALE
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(zh_exports);
 const ZH_LOCALE = {
   packageName: { exit: "项目名称 {value} 已存在" },
   packagePath: { exit: "目录 {value} 已存在" }
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ZH_LOCALE
+});

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

@@ -0,0 +1,60 @@
+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/index.js

@@ -12,7 +12,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-module.exports = __toCommonJS(stdin_exports);
-__reExport(stdin_exports, require("./strip-ansi"), module.exports);
-__reExport(stdin_exports, require("./package"), module.exports);
+var utils_exports = {};
+module.exports = __toCommonJS(utils_exports);
+__reExport(utils_exports, require("./strip-ansi"), module.exports);
+__reExport(utils_exports, require("./package"), module.exports);

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

@@ -15,15 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  getAvailableVersion: () => getAvailableVersion,
-  isPackageDeprecated: () => isPackageDeprecated,
-  isPackageExist: () => isPackageExist,
-  semverDecrease: () => semverDecrease
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_utils = require("@modern-js/utils");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -44,6 +35,15 @@ var __async = (__this, __arguments, generator) => {
     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)()) {
@@ -109,3 +109,10 @@ 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/js/node/utils/strip-ansi.js

@@ -15,11 +15,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var strip_ansi_exports = {};
+__export(strip_ansi_exports, {
   stripAnsi: () => stripAnsi
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(strip_ansi_exports);
 function ansiRegex({ onlyFirst = false } = {}) {
   const pattern = [
     "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
@@ -33,3 +33,7 @@ function stripAnsi(string) {
   }
   return string.replace(ansiRegex(), "");
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  stripAnsi
+});

package/dist/types/index.d.ts

@@ -35,4 +35,5 @@ export declare function validatePackagePath(value: string, projectDir: string, o
   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 getMWAProjectPath(packagePath: string, isMonorepoSubProject: boolean, isTest?: boolean): string;
+export declare function getModernConfigFile(appDir: string): Promise<"modern.config.ts" | "modern.config.js">;

package/dist/types/utils/fs-exist.d.ts

@@ -0,0 +1 @@
+export declare function fileExist(filePath: string): Promise<boolean>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,18 +28,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/plugin-i18n": "2.0.0-beta.4",
-    "@modern-js/generator-common": "3.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4"
+    "@modern-js/plugin-i18n": "2.0.0-beta.6",
+    "@modern-js/generator-common": "3.0.0-beta.5",
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "devDependencies": {
-    "@modern-js/codesmith": "2.0.2",
+    "@modern-js/codesmith": "2.0.3",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": false,
   "modernConfig": {