@modern-js/new-action 2.60.6 → 2.61.0

package/dist/cjs/index.js

@@ -17,10 +17,8 @@ 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);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./utils"),
-  ...require("./mwa"),
-  ...require("./module")
+  ...require("./mwa")
 });

package/dist/cjs/run.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 "use strict";
 var import_commander = require("commander");
-var import_module = require("./module");
 var import_mwa = require("./mwa");
 var import_utils = require("./utils");
 const main = async () => {
@@ -20,7 +19,7 @@ const main = async () => {
         (0, import_mwa.MWANewAction)(config);
         break;
       case "module":
-        (0, import_module.ModuleNewAction)(config);
+        console.error("Modern.js not support module new command yet, Please use Rslib");
         break;
       default:
         break;

package/dist/esm/index.js

@@ -1,3 +1,2 @@
 export * from "./utils";
 export * from "./mwa";
-export * from "./module";

package/dist/esm/run.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import { Command } from "commander";
-import { ModuleNewAction } from "./module";
 import { MWANewAction } from "./mwa";
 import { getSolutionByDependance } from "./utils";
 const main = async () => {
@@ -19,7 +18,7 @@ const main = async () => {
         MWANewAction(config);
         break;
       case "module":
-        ModuleNewAction(config);
+        console.error("Modern.js not support module new command yet, Please use Rslib");
         break;
       default:
         break;

package/dist/types/index.d.ts

@@ -1,3 +1,2 @@
 export * from './utils';
 export * from './mwa';
-export * from './module';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.6",
+  "version": "2.61.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -39,8 +39,8 @@
     "@modern-js/codesmith": "2.6.5",
     "@modern-js/codesmith-formily": "2.6.5",
     "@modern-js/codesmith-utils": "2.6.5",
-    "@modern-js/generator-common": "3.7.2",
-    "@modern-js/generator-utils": "3.7.2"
+    "@modern-js/generator-common": "3.7.3",
+    "@modern-js/generator-utils": "3.7.3"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -48,8 +48,8 @@
     "jest": "^29",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "@scripts/build": "2.60.6",
-    "@scripts/jest-config": "2.60.6"
+    "@scripts/build": "2.61.0",
+    "@scripts/jest-config": "2.61.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/module.js

@@ -1,148 +0,0 @@
-"use strict";
-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 module_exports = {};
-__export(module_exports, {
-  ModuleNewAction: () => ModuleNewAction
-});
-module.exports = __toCommonJS(module_exports);
-var import_codesmith = require("@modern-js/codesmith");
-var import_codesmith_formily = require("@modern-js/codesmith-formily");
-var import_lodash = require("@modern-js/codesmith-utils/lodash");
-var import_generator_common = require("@modern-js/generator-common");
-var import_generator_utils = require("@modern-js/generator-utils");
-var import_constants = require("./constants");
-var import_utils = require("./utils");
-const ModuleNewAction = async (options) => {
-  var _smith_logger, _smith_logger1;
-  const { locale = "zh", distTag = "", debug = false, registry, config = "{}", cwd = process.cwd(), needInstall = true } = options;
-  let UserConfig = {};
-  try {
-    UserConfig = JSON.parse(config);
-  } catch (e) {
-    throw new Error("config is not a valid json");
-  }
-  const language = UserConfig.locale || locale;
-  import_generator_common.i18n.changeLanguage({
-    locale: language
-  });
-  const smith = new import_codesmith.CodeSmith({
-    debug,
-    registryUrl: registry === "" ? void 0 : registry
-  });
-  if (!(0, import_utils.alreadyRepo)(cwd)) {
-    smith.logger.warn("not valid modern.js repo");
-  }
-  (_smith_logger = smith.logger) === null || _smith_logger === void 0 ? void 0 : _smith_logger.timing("🕒 Run Module New Tools");
-  const prepareGlobalPromise = smith.prepareGlobal();
-  const prepareGeneratorPromise = smith.prepareGenerators([
-    `@modern-js/dependence-generator@${distTag || "latest"}`,
-    `@modern-js/module-doc-generator@${distTag || "latest"}`,
-    `@modern-js/storybook-next-generator@${distTag || "latest"}`
-  ]);
-  const formilyAPI = new import_codesmith_formily.FormilyAPI({
-    materials: {},
-    config: {},
-    data: {},
-    current: null
-  });
-  let hasOption = false;
-  const funcMap = {};
-  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, exit 1.", funcMap);
-    process.exit(1);
-  }
-  const ans = await formilyAPI.getInputBySchemaFunc(import_generator_common.getModuleNewActionSchema, {
-    ...UserConfig
-  });
-  const actionType = ans.actionType;
-  const action = ans[actionType];
-  if (actionType === import_generator_common.ActionType.Function && funcMap[action]) {
-    smith.logger.error(import_constants.enableAlreadyText[language]);
-    return;
-  }
-  const generator = (0, import_utils.getGeneratorPath)(import_generator_common.ModuleNewActionGenerators[actionType][action], distTag);
-  if (!generator) {
-    throw new Error(`no valid option`);
-  }
-  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 shouldUsePluginNameExport = await (0, import_utils.usePluginNameExport)(import_generator_common.Solution.Module, {
-    registry,
-    distTag,
-    cwd
-  });
-  const finalConfig = (0, import_lodash.merge)(UserConfig, {
-    noNeedInstall: !needInstall
-  }, ans, {
-    locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || await (0, import_generator_utils.getPackageManager)(cwd),
-    distTag
-  }, {
-    devDependencies: devDependency ? {
-      [devDependency]: `${await getModulePluginVersion(devDependency)}`
-    } : {},
-    dependencies: dependency ? {
-      [dependency]: `${await getModulePluginVersion(dependency)}`
-    } : {},
-    peerDependencies: peerDependency ? {
-      [peerDependency]: `${await getModulePluginVersion(peerDependency)}`
-    } : {},
-    pluginName: import_generator_common.ModuleNewActionPluginName[actionType][action],
-    pluginDependence: import_generator_common.ModuleNewActionPluginDependence[actionType][action],
-    shouldUsePluginNameExport,
-    isModuleProject: true
-  });
-  const task = [
-    {
-      name: generator,
-      config: finalConfig
-    }
-  ];
-  await Promise.all([
-    prepareGlobalPromise,
-    prepareGeneratorPromise
-  ]);
-  await smith.forge({
-    tasks: task.map((runner) => ({
-      generator: runner.name,
-      config: runner.config
-    })),
-    pwd: cwd
-  });
-  (_smith_logger1 = smith.logger) === null || _smith_logger1 === void 0 ? void 0 : _smith_logger1.timing("🕒 Run Module New Tools", true);
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ModuleNewAction
-});

package/dist/esm/module.js

@@ -1,124 +0,0 @@
-import { CodeSmith } from "@modern-js/codesmith";
-import { FormilyAPI } from "@modern-js/codesmith-formily";
-import { merge } from "@modern-js/codesmith-utils/lodash";
-import { ActionType, ModuleActionFunctions, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, ModuleNewActionGenerators, ModuleNewActionPluginDependence, ModuleNewActionPluginName, Solution, getModuleNewActionSchema, i18n } from "@modern-js/generator-common";
-import { getModernPluginVersion, getPackageManager } from "@modern-js/generator-utils";
-import { enableAlreadyText } from "./constants";
-import { alreadyRepo, getGeneratorPath, hasEnabledFunction, usePluginNameExport } from "./utils";
-const ModuleNewAction = async (options) => {
-  var _smith_logger, _smith_logger1;
-  const { locale = "zh", distTag = "", debug = false, registry, config = "{}", cwd = process.cwd(), needInstall = true } = options;
-  let UserConfig = {};
-  try {
-    UserConfig = JSON.parse(config);
-  } catch (e) {
-    throw new Error("config is not a valid json");
-  }
-  const language = UserConfig.locale || locale;
-  i18n.changeLanguage({
-    locale: language
-  });
-  const smith = new CodeSmith({
-    debug,
-    registryUrl: registry === "" ? void 0 : registry
-  });
-  if (!alreadyRepo(cwd)) {
-    smith.logger.warn("not valid modern.js repo");
-  }
-  (_smith_logger = smith.logger) === null || _smith_logger === void 0 ? void 0 : _smith_logger.timing("🕒 Run Module New Tools");
-  const prepareGlobalPromise = smith.prepareGlobal();
-  const prepareGeneratorPromise = smith.prepareGenerators([
-    `@modern-js/dependence-generator@${distTag || "latest"}`,
-    `@modern-js/module-doc-generator@${distTag || "latest"}`,
-    `@modern-js/storybook-next-generator@${distTag || "latest"}`
-  ]);
-  const formilyAPI = new FormilyAPI({
-    materials: {},
-    config: {},
-    data: {},
-    current: null
-  });
-  let hasOption = false;
-  const funcMap = {};
-  ModuleActionFunctions.forEach((func) => {
-    const enable = hasEnabledFunction(func, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, cwd);
-    funcMap[func] = enable;
-    if (!enable) {
-      hasOption = true;
-    }
-  });
-  if (!hasOption) {
-    smith.logger.warn("No option can be enabled, exit 1.", funcMap);
-    process.exit(1);
-  }
-  const ans = await formilyAPI.getInputBySchemaFunc(getModuleNewActionSchema, {
-    ...UserConfig
-  });
-  const actionType = ans.actionType;
-  const action = ans[actionType];
-  if (actionType === ActionType.Function && funcMap[action]) {
-    smith.logger.error(enableAlreadyText[language]);
-    return;
-  }
-  const generator = getGeneratorPath(ModuleNewActionGenerators[actionType][action], distTag);
-  if (!generator) {
-    throw new Error(`no valid option`);
-  }
-  const devDependency = ModuleActionFunctionsDevDependencies[action];
-  const dependency = ModuleActionFunctionsDependencies[action];
-  const peerDependency = ModuleActionFunctionsPeerDependencies[action];
-  const getModulePluginVersion = (packageName) => {
-    return getModernPluginVersion(Solution.Module, packageName, {
-      registry,
-      distTag,
-      cwd
-    });
-  };
-  const shouldUsePluginNameExport = await usePluginNameExport(Solution.Module, {
-    registry,
-    distTag,
-    cwd
-  });
-  const finalConfig = merge(UserConfig, {
-    noNeedInstall: !needInstall
-  }, ans, {
-    locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || await getPackageManager(cwd),
-    distTag
-  }, {
-    devDependencies: devDependency ? {
-      [devDependency]: `${await getModulePluginVersion(devDependency)}`
-    } : {},
-    dependencies: dependency ? {
-      [dependency]: `${await getModulePluginVersion(dependency)}`
-    } : {},
-    peerDependencies: peerDependency ? {
-      [peerDependency]: `${await getModulePluginVersion(peerDependency)}`
-    } : {},
-    pluginName: ModuleNewActionPluginName[actionType][action],
-    pluginDependence: ModuleNewActionPluginDependence[actionType][action],
-    shouldUsePluginNameExport,
-    isModuleProject: true
-  });
-  const task = [
-    {
-      name: generator,
-      config: finalConfig
-    }
-  ];
-  await Promise.all([
-    prepareGlobalPromise,
-    prepareGeneratorPromise
-  ]);
-  await smith.forge({
-    tasks: task.map((runner) => ({
-      generator: runner.name,
-      config: runner.config
-    })),
-    pwd: cwd
-  });
-  (_smith_logger1 = smith.logger) === null || _smith_logger1 === void 0 ? void 0 : _smith_logger1.timing("🕒 Run Module New Tools", true);
-};
-export {
-  ModuleNewAction
-};

package/dist/types/module.d.ts

@@ -1,11 +0,0 @@
-interface IModuleNewActionOption {
-    locale?: string;
-    distTag?: string;
-    debug?: boolean;
-    registry?: string;
-    config?: string;
-    cwd?: string;
-    needInstall?: boolean;
-}
-export declare const ModuleNewAction: (options: IModuleNewActionOption) => Promise<void>;
-export {};