@modern-js/repo-generator 3.0.4 → 3.0.5

package/dist/index.js

@@ -35757,7 +35757,7 @@ var require_nodeEnv = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm3;
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -35767,7 +35767,7 @@ var require_nodeEnv = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -44405,7 +44405,7 @@ var require_env = __commonJS({
     exports.canUseNpm = canUseNpm3;
     exports.canUseNvm = canUseNvm;
     exports.canUsePnpm = canUsePnpm3;
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     var _utils = require_dist();
     function canUseNvm() {
       return __async(this, null, function* () {
@@ -44432,7 +44432,7 @@ var require_env = __commonJS({
         }
       });
     }
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -45468,14 +45468,14 @@ var require_packageManager = __commonJS({
       value: true
     });
     exports.canUsePnpm = canUsePnpm3;
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     exports.runInstall = runInstall;
     var _path = _interopRequireDefault(require("path"));
     var _utils = require_dist();
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
     }
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -45522,7 +45522,7 @@ var require_packageManager = __commonJS({
             params.push(`--registry=${registryUrl}`);
           }
           yield (0, _utils.execa)("pnpm", params, options);
-        } else if (yield canUseYarn3()) {
+        } else if (yield canUseYarn2()) {
           const params = ["install", "--production", "--silent", "--ignore-scripts"];
           if (registryUrl) {
             params.push(`--registry=${registryUrl}`);
@@ -133817,6 +133817,26 @@ var require_compiled2 = __commonJS({
   }
 });
 
+// ../../../toolkit/utils/dist/commands.js
+var require_commands = __commonJS({
+  "../../../toolkit/utils/dist/commands.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isDevCommand = exports.getCommand = void 0;
+    var getCommand = () => {
+      const args = process.argv.slice(2);
+      const command = args[0];
+      return command;
+    };
+    exports.getCommand = getCommand;
+    var isDevCommand = () => {
+      const command = (0, exports.getCommand)();
+      return command === "dev" || command === "start";
+    };
+    exports.isDevCommand = isDevCommand;
+  }
+});
+
 // ../../../toolkit/utils/dist/format.js
 var require_format2 = __commonJS({
   "../../../toolkit/utils/dist/format.js"(exports) {
@@ -134391,7 +134411,7 @@ var require_constants6 = __commonJS({
     exports.SERVER_DIR = "server";
     exports.SHARED_DIR = "shared";
     exports.CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
-    exports.CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".ejs", ".mjs"];
+    exports.CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".mjs"];
     exports.OUTPUT_CONFIG_FILE = "modern.config.json";
     exports.DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
     exports.ROUTE_MINIFEST_FILE = "routes-manifest.json";
@@ -134882,7 +134902,7 @@ var require_nodeEnv2 = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm3;
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -134892,7 +134912,7 @@ var require_nodeEnv2 = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -135971,6 +135991,7 @@ var require_dist2 = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     __exportStar(require_compiled2(), exports);
+    __exportStar(require_commands(), exports);
     __exportStar(require_format2(), exports);
     __exportStar(require_FileSizeReporter2(), exports);
     __exportStar(require_printBuildError2(), exports);
@@ -138100,15 +138121,6 @@ function getPackageVersion(packageName, registry2) {
       spinner.stop();
       return stripAnsi2(result.stdout);
     }
-    if (yield (0, import_utils3.canUseYarn)()) {
-      const args = ["info", packageName, "version", "--silent"];
-      if (registry2) {
-        args.push(`--registry=${registry2}`);
-      }
-      const result = yield (0, import_utils3.execa)("yarn", args);
-      spinner.stop();
-      return stripAnsi2(result.stdout);
-    }
     if (yield (0, import_utils3.canUseNpm)()) {
       const args = ["view", packageName, "version"];
       if (registry2) {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.4",
+  "version": "3.0.5",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -26,16 +26,16 @@
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-common": "3.0.4",
-    "@modern-js/base-generator": "3.0.4",
-    "@modern-js/monorepo-generator": "3.0.4",
-    "@modern-js/module-generator": "3.0.4",
-    "@modern-js/mwa-generator": "3.0.4",
-    "@modern-js/utils": "2.2.0",
-    "@modern-js/generator-utils": "3.0.4",
-    "@modern-js/generator-plugin": "3.0.4",
-    "@scripts/jest-config": "2.2.0",
-    "@scripts/build": "2.2.0"
+    "@modern-js/generator-utils": "3.0.5",
+    "@modern-js/module-generator": "3.0.5",
+    "@modern-js/monorepo-generator": "3.0.5",
+    "@modern-js/generator-plugin": "3.0.5",
+    "@modern-js/generator-common": "3.0.5",
+    "@modern-js/base-generator": "3.0.5",
+    "@modern-js/mwa-generator": "3.0.5",
+    "@modern-js/utils": "2.3.0",
+    "@scripts/jest-config": "2.3.0",
+    "@scripts/build": "2.3.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -0,0 +1,156 @@
+import path from 'path';
+import { merge } from '@modern-js/utils/lodash';
+import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
+import { AppAPI } from '@modern-js/codesmith-api-app';
+import {
+  i18n,
+  getSolutionSchema,
+  SolutionGenerator,
+  Solution,
+  SolutionDefaultConfig,
+  BaseGenerator,
+  getMonorepoNewActionSchema,
+  SubSolution,
+  SubSolutionGenerator,
+  MonorepoNewActionConfig,
+  getSolutionNameFromSubSolution,
+  getScenesSchema,
+} from '@modern-js/generator-common';
+import { GeneratorPlugin } from '@modern-js/generator-plugin';
+
+const getGeneratorPath = (generator: string, distTag: string) => {
+  if (process.env.CODESMITH_ENV === 'development') {
+    return path.dirname(require.resolve(generator));
+  } else if (distTag) {
+    return `${generator}@${distTag}`;
+  }
+  return generator;
+};
+
+const mergeDefaultConfig = (context: GeneratorContext) => {
+  const { defaultSolution } = context.config;
+
+  if (defaultSolution) {
+    merge(
+      context.config,
+      { solution: defaultSolution },
+      SolutionDefaultConfig[defaultSolution as Solution],
+    );
+  }
+};
+
+const getNeedRunPlugin = (
+  context: GeneratorContext,
+  generatorPlugin?: GeneratorPlugin,
+): boolean => {
+  if (!generatorPlugin) {
+    return false;
+  }
+  const { extendPlugin, customPlugin } = generatorPlugin;
+  const { isMonorepo, solution, scenes } = context.config;
+  const pluginSolution = isMonorepo
+    ? getSolutionNameFromSubSolution(solution)
+    : solution;
+  if (!scenes || scenes === pluginSolution) {
+    return (
+      extendPlugin?.[pluginSolution] && extendPlugin[pluginSolution].length > 0
+    );
+  }
+  return Boolean(
+    customPlugin[pluginSolution]?.find(plugin => plugin.key === scenes),
+  );
+};
+
+const handleTemplateFile = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+  appApi: AppAPI,
+  generatorPlugin?: GeneratorPlugin,
+) => {
+  const { isMonorepo } = context.config;
+
+  const { solution } = await appApi.getInputBySchemaFunc(
+    isMonorepo ? getMonorepoNewActionSchema : getSolutionSchema,
+    {
+      ...context.config,
+      customPlugin: generatorPlugin?.customPlugin,
+    },
+  );
+
+  await appApi.getInputBySchemaFunc(getScenesSchema, context.config);
+
+  const solutionGenerator =
+    // eslint-disable-next-line no-nested-ternary
+    solution === 'custom'
+      ? BaseGenerator
+      : isMonorepo
+      ? SubSolutionGenerator[solution as SubSolution]
+      : SolutionGenerator[solution as Solution];
+
+  if (!solution || !solutionGenerator) {
+    generator.logger.error('solution is not valid ');
+  }
+
+  await appApi.runSubGenerator(
+    getGeneratorPath(solutionGenerator, context.config.distTag),
+    undefined,
+    {
+      ...(isMonorepo
+        ? MonorepoNewActionConfig[solution as SubSolution] || {}
+        : {}),
+      ...context.config,
+      hasPlugin: getNeedRunPlugin(context, generatorPlugin),
+      generatorPlugin,
+    },
+  );
+};
+
+const handlePlugin = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+) => {
+  const { plugins, registry, locale } = context.config;
+  const generatorPlugin = new GeneratorPlugin(
+    generator.logger,
+    generator.event,
+    locale,
+  );
+  await generatorPlugin.setupPlugin(plugins, registry);
+  return generatorPlugin;
+};
+
+export default async (context: GeneratorContext, generator: GeneratorCore) => {
+  process.setMaxListeners(20);
+
+  const appApi = new AppAPI(context, generator);
+
+  const { locale } = context.config;
+  i18n.changeLanguage({ locale });
+  appApi.i18n.changeLanguage({ locale });
+
+  if (!(await appApi.checkEnvironment())) {
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  generator.logger.debug(`start run @modern-js/repo-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  mergeDefaultConfig(context);
+
+  let generatorPlugin;
+  if (context.config.plugins?.length > 0) {
+    generatorPlugin = await handlePlugin(context, generator);
+  }
+
+  try {
+    await handleTemplateFile(context, generator, appApi, generatorPlugin);
+  } catch (e) {
+    generator.logger.error(e);
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  generator.logger.debug(`forge @modern-js/repo-generator succeed `);
+};