@modern-js/new-action 2.60.3 → 2.60.4

package/dist/cjs/module.js

@@ -23,13 +23,14 @@ __export(module_exports, {
 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_lodash = require("@modern-js/utils/lodash");
 var import_constants = require("./constants");
 var import_utils = require("./utils");
 const ModuleNewAction = async (options) => {
-  const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = 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);
@@ -42,11 +43,18 @@ const ModuleNewAction = async (options) => {
   });
   const smith = new import_codesmith.CodeSmith({
     debug,
-    registryUrl: registry
+    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: {},
@@ -121,6 +129,10 @@ const ModuleNewAction = async (options) => {
       config: finalConfig
     }
   ];
+  await Promise.all([
+    prepareGlobalPromise,
+    prepareGeneratorPromise
+  ]);
   await smith.forge({
     tasks: task.map((runner) => ({
       generator: runner.name,
@@ -128,6 +140,7 @@ const ModuleNewAction = async (options) => {
     })),
     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 = {

package/dist/cjs/mwa.js

@@ -23,13 +23,14 @@ __export(mwa_exports, {
 module.exports = __toCommonJS(mwa_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_lodash = require("@modern-js/utils/lodash");
 var import_constants = require("./constants");
 var import_utils = require("./utils");
 const MWANewAction = async (options) => {
-  const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = 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);
@@ -47,6 +48,17 @@ const MWANewAction = async (options) => {
   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 MWA New Tools");
+  const prepareGlobalPromise = smith.prepareGlobal();
+  const prepareGeneratorPromise = smith.prepareGenerators([
+    `@modern-js/dependence-generator@${distTag || "latest"}`,
+    `@modern-js/bff-generator@${distTag || "latest"}`,
+    `@modern-js/server-generator@${distTag || "latest"}`,
+    `@modern-js/entry-generator@${distTag || "latest"}`,
+    `@modern-js/ssg-generator@${distTag || "latest"}`,
+    `@modern-js/storybook-next-generator@${distTag || "latest"}`,
+    `@modern-js/tailwindcss-generator@${distTag || "latest"}`
+  ]);
   const formilyAPI = new import_codesmith_formily.FormilyAPI({
     materials: {},
     config: {},
@@ -114,6 +126,10 @@ const MWANewAction = async (options) => {
       config: finalConfig
     }
   ];
+  await Promise.all([
+    prepareGlobalPromise,
+    prepareGeneratorPromise
+  ]);
   await smith.forge({
     tasks: task.map((runner) => ({
       generator: runner.name,
@@ -121,6 +137,7 @@ const MWANewAction = async (options) => {
     })),
     pwd: cwd
   });
+  (_smith_logger1 = smith.logger) === null || _smith_logger1 === void 0 ? void 0 : _smith_logger1.timing("🕒 Run MWA New Tools", true);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/run.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 "use strict";
-var import_commander = require("@modern-js/utils/commander");
+var import_commander = require("commander");
 var import_module = require("./module");
 var import_mwa = require("./mwa");
 var import_utils = require("./utils");
 const main = async () => {
   const program = new import_commander.Command();
-  program.option("--solution <solution>", "solution", "").option("--config <config>", "config", "{}").option("--root-path <rootPath>", "project root path", "").action(async (params) => {
+  program.option("--solution <solution>", "solution", "").option("--config <config>", "config", "{}").option("--root-path <rootPath>", "project root path", "").option("--debug", "using debug mode to log something", false).option("--time", "show run generator time log", false).action(async (params) => {
     if (!params.solution) {
       params.solution = (0, import_utils.getSolutionByDependance)();
     }

package/dist/cjs/utils/index.js

@@ -37,9 +37,10 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_path = __toESM(require("path"));
+var import_codesmith_utils = require("@modern-js/codesmith-utils");
 var import_generator_common = require("@modern-js/generator-common");
 var import_generator_utils = require("@modern-js/generator-utils");
-var import_utils = require("@modern-js/utils");
+var import_json5 = __toESM(require("json5"));
 const swap = (obj) => {
   return Object.keys(obj).reduce((acc, key) => {
     acc[obj[key]] = key;
@@ -62,7 +63,7 @@ const readJson = (jsonPath) => {
     encoding: "utf8"
   });
   try {
-    return import_utils.json5.parse(jsonStr);
+    return import_json5.default.parse(jsonStr);
   } catch (error) {
     throw Error(`${jsonPath} is not a valid json, please check and try again.`);
   }
@@ -97,8 +98,8 @@ function getGeneratorPath(generator, distTag) {
 }
 async function usePluginNameExport(solution, options) {
   const solutionVersion = await (0, import_generator_utils.getModernPluginVersion)(solution, import_generator_common.SolutionToolsMap[import_generator_common.Solution.MWA], options);
-  if (import_utils.semver.valid(solutionVersion) && import_utils.semver.gte(solutionVersion, "2.0.0")) {
-    return import_utils.semver.gt(solutionVersion, "2.24.0");
+  if (import_codesmith_utils.semver.valid(solutionVersion) && import_codesmith_utils.semver.gte(solutionVersion, "2.0.0")) {
+    return import_codesmith_utils.semver.gt(solutionVersion, "2.24.0");
   }
   return true;
 }

package/dist/esm/module.js

@@ -1,12 +1,13 @@
 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 { merge } from "@modern-js/utils/lodash";
 import { enableAlreadyText } from "./constants";
 import { alreadyRepo, getGeneratorPath, hasEnabledFunction, usePluginNameExport } from "./utils";
 const ModuleNewAction = async (options) => {
-  const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = 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);
@@ -19,11 +20,18 @@ const ModuleNewAction = async (options) => {
   });
   const smith = new CodeSmith({
     debug,
-    registryUrl: registry
+    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: {},
@@ -98,6 +106,10 @@ const ModuleNewAction = async (options) => {
       config: finalConfig
     }
   ];
+  await Promise.all([
+    prepareGlobalPromise,
+    prepareGeneratorPromise
+  ]);
   await smith.forge({
     tasks: task.map((runner) => ({
       generator: runner.name,
@@ -105,6 +117,7 @@ const ModuleNewAction = async (options) => {
     })),
     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/esm/mwa.js

@@ -1,12 +1,13 @@
 import { CodeSmith } from "@modern-js/codesmith";
 import { FormilyAPI } from "@modern-js/codesmith-formily";
+import { merge } from "@modern-js/codesmith-utils/lodash";
 import { ActionType, MWAActionFunctions, MWAActionFunctionsAppendTypeContent, MWAActionFunctionsDependencies, MWAActionFunctionsDevDependencies, MWAActionReactorAppendTypeContent, MWAActionReactors, MWAActionRefactorDependencies, MWANewActionGenerators, MWANewActionPluginDependence, MWANewActionPluginName, Solution, getMWANewActionSchema, i18n } from "@modern-js/generator-common";
 import { getModernPluginVersion, getPackageManager } from "@modern-js/generator-utils";
-import { merge } from "@modern-js/utils/lodash";
 import { enableAlreadyText } from "./constants";
 import { alreadyRepo, getGeneratorPath, hasEnabledFunction, usePluginNameExport } from "./utils";
 const MWANewAction = async (options) => {
-  const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = 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);
@@ -24,6 +25,17 @@ const MWANewAction = async (options) => {
   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 MWA New Tools");
+  const prepareGlobalPromise = smith.prepareGlobal();
+  const prepareGeneratorPromise = smith.prepareGenerators([
+    `@modern-js/dependence-generator@${distTag || "latest"}`,
+    `@modern-js/bff-generator@${distTag || "latest"}`,
+    `@modern-js/server-generator@${distTag || "latest"}`,
+    `@modern-js/entry-generator@${distTag || "latest"}`,
+    `@modern-js/ssg-generator@${distTag || "latest"}`,
+    `@modern-js/storybook-next-generator@${distTag || "latest"}`,
+    `@modern-js/tailwindcss-generator@${distTag || "latest"}`
+  ]);
   const formilyAPI = new FormilyAPI({
     materials: {},
     config: {},
@@ -91,6 +103,10 @@ const MWANewAction = async (options) => {
       config: finalConfig
     }
   ];
+  await Promise.all([
+    prepareGlobalPromise,
+    prepareGeneratorPromise
+  ]);
   await smith.forge({
     tasks: task.map((runner) => ({
       generator: runner.name,
@@ -98,6 +114,7 @@ const MWANewAction = async (options) => {
     })),
     pwd: cwd
   });
+  (_smith_logger1 = smith.logger) === null || _smith_logger1 === void 0 ? void 0 : _smith_logger1.timing("🕒 Run MWA New Tools", true);
 };
 export {
   MWANewAction

package/dist/esm/run.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { Command } from "@modern-js/utils/commander";
+import { Command } from "commander";
 import { ModuleNewAction } from "./module";
 import { MWANewAction } from "./mwa";
 import { getSolutionByDependance } from "./utils";
 const main = async () => {
   const program = new Command();
-  program.option("--solution <solution>", "solution", "").option("--config <config>", "config", "{}").option("--root-path <rootPath>", "project root path", "").action(async (params) => {
+  program.option("--solution <solution>", "solution", "").option("--config <config>", "config", "{}").option("--root-path <rootPath>", "project root path", "").option("--debug", "using debug mode to log something", false).option("--time", "show run generator time log", false).action(async (params) => {
     if (!params.solution) {
       params.solution = getSolutionByDependance();
     }

package/dist/esm/utils/index.js

@@ -1,7 +1,8 @@
 import path from "path";
+import { semver } from "@modern-js/codesmith-utils";
 import { Solution, SolutionToolsMap } from "@modern-js/generator-common";
 import { fs, getModernPluginVersion } from "@modern-js/generator-utils";
-import { json5, semver } from "@modern-js/utils";
+import json5 from "json5";
 const swap = (obj) => {
   return Object.keys(obj).reduce((acc, key) => {
     acc[obj[key]] = key;

package/dist/types/utils/index.d.ts

@@ -3,5 +3,5 @@ export declare function alreadyRepo(cwd?: string): boolean;
 export declare const readJson: (jsonPath: string) => any;
 export declare function hasEnabledFunction(action: ActionFunction | ActionRefactor, dependencies: Record<string, string>, devDependencies: Record<string, string>, peerDependencies: Record<string, string>, cwd: string): any;
 export declare function getGeneratorPath(generator: string, distTag: string): string;
-export declare function usePluginNameExport(solution: Solution, options: Record<string, string>): Promise<boolean>;
+export declare function usePluginNameExport(solution: Solution, options: Record<string, string | undefined>): Promise<boolean>;
 export declare const getSolutionByDependance: (jsonPath?: string) => string | undefined;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.3",
+  "version": "2.60.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -33,12 +33,14 @@
     }
   },
   "dependencies": {
-    "@modern-js/codesmith": "2.5.2",
-    "@modern-js/codesmith-formily": "2.5.2",
     "@swc/helpers": "0.5.13",
-    "@modern-js/generator-common": "3.6.3",
-    "@modern-js/utils": "2.60.3",
-    "@modern-js/generator-utils": "3.6.3"
+    "json5": "2.2.3",
+    "commander": "10.0.1",
+    "@modern-js/codesmith": "2.6.4",
+    "@modern-js/codesmith-formily": "2.6.4",
+    "@modern-js/codesmith-utils": "2.6.4",
+    "@modern-js/generator-utils": "3.7.0",
+    "@modern-js/generator-common": "3.7.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -46,8 +48,8 @@
     "jest": "^29",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "@scripts/jest-config": "2.60.3",
-    "@scripts/build": "2.60.3"
+    "@scripts/build": "2.60.4",
+    "@scripts/jest-config": "2.60.4"
   },
   "sideEffects": false,
   "publishConfig": {