@modern-js/new-action 2.0.0-beta.3 → 2.0.0-beta.6

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

@@ -1,51 +1,53 @@
-import path from 'path';
-import { json5 } from '@modern-js/utils';
-import { fs } from '@modern-js/generator-utils';
-export function alreadyRepo(cwd = process.cwd()) {
+import path from "path";
+import { json5 } from "@modern-js/utils";
+import { fs } from "@modern-js/generator-utils";
+function alreadyRepo(cwd = process.cwd()) {
   try {
-    return fs.existsSync(path.resolve(cwd, 'package.json'));
+    return fs.existsSync(path.resolve(cwd, "package.json"));
   } catch (e) {
     return false;
   }
 }
-export const readJson = jsonPath => {
+const readJson = (jsonPath) => {
   if (!fs.existsSync(jsonPath)) {
     return {};
   }
-  const jsonStr = fs.readFileSync(jsonPath, {
-    encoding: 'utf8'
-  });
+  const jsonStr = fs.readFileSync(jsonPath, { encoding: "utf8" });
   try {
     return json5.parse(jsonStr);
   } catch (error) {
     throw Error(`${jsonPath} is not a valid json, please check and try again.`);
   }
 };
-export function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
+function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
+  var _a, _b, _c;
   const packageJsonPath = path.normalize(`${cwd}/package.json`);
   const packageJson = readJson(packageJsonPath);
   if (!dependencies[action] && !devDependencies[action]) {
     return false;
   }
   if (dependencies[action]) {
-    var _packageJson$dependen;
-    return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
+    return (_a = packageJson.dependencies) == null ? void 0 : _a[dependencies[action]];
   }
   if (peerDependencies[action]) {
-    var _packageJson$peerDepe;
-    return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
+    return (_b = packageJson.peerDependencies) == null ? void 0 : _b[peerDependencies[action]];
   }
   if (!peerDependencies[action] && devDependencies[action]) {
-    var _packageJson$devDepen;
-    return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
+    return (_c = packageJson.devDependencies) == null ? void 0 : _c[devDependencies[action]];
   }
   return false;
 }
-export function getGeneratorPath(generator, distTag) {
-  if (process.env.CODESMITH_ENV === 'development') {
+function getGeneratorPath(generator, distTag) {
+  if (process.env.CODESMITH_ENV === "development") {
     return path.dirname(require.resolve(generator));
   } else if (distTag) {
     return `${generator}@${distTag}`;
   }
   return generator;
-}
+}
+export {
+  alreadyRepo,
+  getGeneratorPath,
+  hasEnabledFunction,
+  readJson
+};

package/dist/js/node/index.js

@@ -1,49 +1,20 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _utils = require("./utils");
-Object.keys(_utils).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _utils[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _utils[key];
-    }
-  });
-});
-var _mwa = require("./mwa");
-Object.keys(_mwa).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _mwa[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _mwa[key];
-    }
-  });
-});
-var _module = require("./module");
-Object.keys(_module).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _module[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _module[key];
-    }
-  });
-});
-var _monorepo = require("./monorepo");
-Object.keys(_monorepo).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _monorepo[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _monorepo[key];
-    }
-  });
-});
+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 src_exports = {};
+module.exports = __toCommonJS(src_exports);
+__reExport(src_exports, require("./utils"), module.exports);
+__reExport(src_exports, require("./mwa"), module.exports);
+__reExport(src_exports, require("./module"), module.exports);
+__reExport(src_exports, require("./monorepo"), module.exports);

package/dist/js/node/module.js

@@ -1,44 +1,92 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+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 module_exports = {};
+__export(module_exports, {
+  ModuleNewAction: () => ModuleNewAction
 });
-exports.ModuleNewAction = void 0;
-var _lodash = require("@modern-js/utils/lodash");
-var _codesmith = require("@modern-js/codesmith");
-var _codesmithFormily = require("@modern-js/codesmith-formily");
-var _generatorCommon = require("@modern-js/generator-common");
-var _generatorUtils = require("@modern-js/generator-utils");
-var _utils = require("./utils");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-const ModuleNewAction = async options => {
+module.exports = __toCommonJS(module_exports);
+var import_lodash = require("@modern-js/utils/lodash");
+var import_codesmith = require("@modern-js/codesmith");
+var import_codesmith_formily = require("@modern-js/codesmith-formily");
+var import_generator_common = require("@modern-js/generator-common");
+var import_generator_utils = require("@modern-js/generator-utils");
+var import_utils = require("./utils");
+const ModuleNewAction = (options) => __async(void 0, null, function* () {
   const {
-    locale = 'zh',
-    distTag = '',
+    locale = "zh",
+    distTag = "",
     debug = false,
-    registry = '',
-    config = '{}',
+    registry = "",
+    config = "{}",
     cwd = process.cwd()
   } = options;
   let UserConfig = {};
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
-    throw new Error('config is not a valid json');
+    throw new Error("config is not a valid json");
   }
-  _generatorCommon.i18n.changeLanguage({
-    locale: UserConfig.locale || locale
-  });
-  const smith = new _codesmith.CodeSmith({
+  import_generator_common.i18n.changeLanguage({ locale: UserConfig.locale || locale });
+  const smith = new import_codesmith.CodeSmith({
     debug,
     registryUrl: registry
   });
-  if (!(0, _utils.alreadyRepo)(cwd)) {
-    smith.logger.warn('not valid modern.js repo');
+  if (!(0, import_utils.alreadyRepo)(cwd)) {
+    smith.logger.warn("not valid modern.js repo");
   }
-  const formilyAPI = new _codesmithFormily.FormilyAPI({
+  const formilyAPI = new import_codesmith_formily.FormilyAPI({
     materials: {},
     config: {},
     data: {},
@@ -46,62 +94,78 @@ const ModuleNewAction = async options => {
   });
   let hasOption = false;
   const funcMap = {};
-  _generatorCommon.ModuleActionFunctions.forEach(func => {
-    const enable = (0, _utils.hasEnabledFunction)(func, _generatorCommon.ModuleActionFunctionsDependencies, _generatorCommon.ModuleActionFunctionsDevDependencies, _generatorCommon.ModuleActionFunctionsPeerDependencies, cwd);
+  import_generator_common.ModuleActionFunctions.forEach((func) => {
+    const enable = (0, import_utils.hasEnabledFunction)(
+      func,
+      import_generator_common.ModuleActionFunctionsDependencies,
+      import_generator_common.ModuleActionFunctionsDevDependencies,
+      import_generator_common.ModuleActionFunctionsPeerDependencies,
+      cwd
+    );
     funcMap[func] = enable;
     if (!enable) {
       hasOption = true;
     }
   });
   if (!hasOption) {
-    smith.logger.warn('no option can be enabled');
-    // eslint-disable-next-line no-process-exit
+    smith.logger.warn("no option can be enabled");
     process.exit(1);
   }
-  const ans = await formilyAPI.getInputBySchemaFunc(_generatorCommon.getModuleNewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
+  const ans = yield formilyAPI.getInputBySchemaFunc(import_generator_common.getModuleNewActionSchema, __spreadProps(__spreadValues({}, UserConfig), {
     funcMap
   }));
   const actionType = ans.actionType;
   const action = ans[actionType];
-  const generator = (0, _utils.getGeneratorPath)(_generatorCommon.ModuleNewActionGenerators[actionType][action], distTag);
+  const generator = (0, import_utils.getGeneratorPath)(
+    import_generator_common.ModuleNewActionGenerators[actionType][action],
+    distTag
+  );
   if (!generator) {
     throw new Error(`no valid option`);
   }
-  const devDependency = _generatorCommon.ModuleActionFunctionsDevDependencies[action];
-  const dependency = _generatorCommon.ModuleActionFunctionsDependencies[action];
-  const peerDependency = _generatorCommon.ModuleActionFunctionsPeerDependencies[action];
-  const getModulePluginVersion = packageName => {
-    return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.Module, packageName, {
+  const devDependency = import_generator_common.ModuleActionFunctionsDevDependencies[action];
+  const dependency = import_generator_common.ModuleActionFunctionsDependencies[action];
+  const peerDependency = import_generator_common.ModuleActionFunctionsPeerDependencies[action];
+  const getModulePluginVersion = (packageName) => {
+    return (0, import_generator_utils.getModernPluginVersion)(import_generator_common.Solution.Module, packageName, {
       registry,
       distTag,
       cwd
     });
   };
-  const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
-    locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd)),
-    distTag
-  }, {
-    devDependencies: devDependency ? {
-      [devDependency]: `${await getModulePluginVersion(devDependency)}`
-    } : {},
-    dependencies: dependency ? {
-      [dependency]: `${await getModulePluginVersion(dependency)}`
-    } : {},
-    peerDependencies: peerDependency ? {
-      [peerDependency]: `${await getModulePluginVersion(peerDependency)}`
-    } : {}
-  });
-  const task = [{
-    name: generator,
-    config: finalConfig
-  }];
-  await smith.forge({
-    tasks: task.map(runner => ({
+  const finalConfig = (0, import_lodash.merge)(
+    UserConfig,
+    ans,
+    {
+      locale: UserConfig.locale || locale,
+      packageManager: UserConfig.packageManager || (yield (0, import_generator_utils.getPackageManager)(cwd)),
+      distTag
+    },
+    {
+      devDependencies: devDependency ? { [devDependency]: `${yield getModulePluginVersion(devDependency)}` } : {},
+      dependencies: dependency ? { [dependency]: `${yield getModulePluginVersion(dependency)}` } : {},
+      peerDependencies: peerDependency ? {
+        [peerDependency]: `${yield getModulePluginVersion(peerDependency)}`
+      } : {},
+      pluginName: import_generator_common.ModuleNewActionPluginName[actionType][action],
+      pluginDependence: import_generator_common.ModuleNewActionPluginDependence[actionType][action]
+    }
+  );
+  const task = [
+    {
+      name: generator,
+      config: finalConfig
+    }
+  ];
+  yield smith.forge({
+    tasks: task.map((runner) => ({
       generator: runner.name,
       config: runner.config
     })),
     pwd: cwd
   });
-};
-exports.ModuleNewAction = ModuleNewAction;
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ModuleNewAction
+});

package/dist/js/node/monorepo.js

@@ -1,24 +1,65 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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)
+    __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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  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 monorepo_exports = {};
+__export(monorepo_exports, {
+  MonorepoNewAction: () => MonorepoNewAction
 });
-exports.MonorepoNewAction = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _lodash = require("@modern-js/utils/lodash");
-var _codesmith = require("@modern-js/codesmith");
-var _generatorCommon = require("@modern-js/generator-common");
-var _generatorUtils = require("@modern-js/generator-utils");
-var _utils = require("./utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const REPO_GENERATOR = '@modern-js/repo-generator';
-const MonorepoNewAction = async options => {
+module.exports = __toCommonJS(monorepo_exports);
+var import_path = __toESM(require("path"));
+var import_lodash = require("@modern-js/utils/lodash");
+var import_codesmith = require("@modern-js/codesmith");
+var import_generator_common = require("@modern-js/generator-common");
+var import_generator_utils = require("@modern-js/generator-utils");
+var import_utils = require("./utils");
+const REPO_GENERATOR = "@modern-js/repo-generator";
+const MonorepoNewAction = (options) => __async(void 0, null, function* () {
   const {
-    locale = 'zh',
-    distTag = '',
+    locale = "zh",
+    distTag = "",
     debug = false,
-    registry = '',
-    config = '{}',
+    registry = "",
+    config = "{}",
     plugin = [],
     cwd = process.cwd()
   } = options;
@@ -26,55 +67,55 @@ const MonorepoNewAction = async options => {
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
-    throw new Error('config is not a valid json');
+    throw new Error("config is not a valid json");
   }
-  _generatorCommon.i18n.changeLanguage({
-    locale: UserConfig.locale || locale
-  });
-  const smith = new _codesmith.CodeSmith({
+  import_generator_common.i18n.changeLanguage({ locale: UserConfig.locale || locale });
+  const smith = new import_codesmith.CodeSmith({
     debug,
     registryUrl: registry
   });
-  if (!(0, _utils.alreadyRepo)(cwd)) {
-    smith.logger.warn('not valid modern.js repo');
+  if (!(0, import_utils.alreadyRepo)(cwd)) {
+    smith.logger.warn("not valid modern.js repo");
   }
-
-  // Determine if the plugin is a Monorepo dependency
-  const plugins = plugin.map(plugin => {
+  const plugins = plugin.map((plugin2) => {
     try {
-      return _path.default.join(require.resolve(plugin), '../../');
+      return import_path.default.join(require.resolve(plugin2), "../../");
     } catch (e) {
       try {
-        // 兼容旧版打包路径
-        return _path.default.join(require.resolve(plugin), '../../../../');
-      } catch (e) {
-        return plugin;
+        return import_path.default.join(require.resolve(plugin2), "../../../../");
+      } catch (e2) {
+        return plugin2;
       }
     }
   });
-  const finalConfig = (0, _lodash.merge)(UserConfig, {
+  const finalConfig = (0, import_lodash.merge)(UserConfig, {
     locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd)),
+    packageManager: UserConfig.packageManager || (yield (0, import_generator_utils.getPackageManager)(cwd)),
     isMonorepo: true,
     distTag,
     plugins
   });
   let generator = REPO_GENERATOR;
-  if (process.env.CODESMITH_ENV === 'development') {
+  if (process.env.CODESMITH_ENV === "development") {
     generator = require.resolve(generator);
   } else if (distTag) {
     generator = `${generator}@${distTag}`;
   }
-  const task = [{
-    name: generator,
-    config: finalConfig
-  }];
-  await smith.forge({
-    tasks: task.map(runner => ({
+  const task = [
+    {
+      name: generator,
+      config: finalConfig
+    }
+  ];
+  yield smith.forge({
+    tasks: task.map((runner) => ({
       generator: runner.name,
       config: runner.config
     })),
     pwd: cwd
   });
-};
-exports.MonorepoNewAction = MonorepoNewAction;
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MonorepoNewAction
+});