@modern-js/entry-generator 3.0.4 → 3.0.5

package/dist/index.js

@@ -34714,6 +34714,26 @@ var require_compiled = __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_format = __commonJS({
   "../../../toolkit/utils/dist/format.js"(exports) {
@@ -35288,7 +35308,7 @@ var require_constants = __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";
@@ -35779,7 +35799,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 });
@@ -35789,7 +35809,7 @@ var require_nodeEnv = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -36868,6 +36888,7 @@ var require_dist = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     __exportStar(require_compiled(), exports);
+    __exportStar(require_commands(), exports);
     __exportStar(require_format(), exports);
     __exportStar(require_FileSizeReporter(), exports);
     __exportStar(require_printBuildError(), exports);
@@ -66974,7 +66995,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 });
@@ -66984,7 +67005,7 @@ var require_nodeEnv2 = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -75622,7 +75643,7 @@ var require_env = __commonJS({
     exports.canUseNpm = canUseNpm3;
     exports.canUseNvm = canUseNvm;
     exports.canUsePnpm = canUsePnpm3;
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     var _utils = require_dist2();
     function canUseNvm() {
       return __async(this, null, function* () {
@@ -75649,7 +75670,7 @@ var require_env = __commonJS({
         }
       });
     }
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -76685,14 +76706,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_dist2();
     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"], {
@@ -76739,7 +76760,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}`);

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": [
@@ -27,12 +27,12 @@
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-utils": "3.0.4",
-    "@modern-js/utils": "2.2.0",
-    "@modern-js/plugin-i18n": "2.2.0",
-    "@modern-js/generator-common": "3.0.4",
-    "@scripts/build": "2.2.0",
-    "@scripts/jest-config": "2.2.0"
+    "@modern-js/generator-utils": "3.0.5",
+    "@modern-js/generator-common": "3.0.5",
+    "@modern-js/utils": "2.3.0",
+    "@modern-js/plugin-i18n": "2.3.0",
+    "@scripts/build": "2.3.0",
+    "@scripts/jest-config": "2.3.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -0,0 +1,136 @@
+import path from 'path';
+import { merge } from '@modern-js/utils/lodash';
+import { fs, getPackageObj, isTsProject } from '@modern-js/generator-utils';
+import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
+import { AppAPI } from '@modern-js/codesmith-api-app';
+import {
+  i18n as commonI18n,
+  getEntrySchema,
+} from '@modern-js/generator-common';
+import { isEmptySource, isSingleEntry } from './utils';
+import { i18n, localeKeys } from './locale';
+
+const handleInput = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+  appApi: AppAPI,
+) => {
+  const appDir = context.materials.default.basePath;
+
+  const { entriesDir } = context.config;
+
+  await fs.ensureDir(path.join(appDir, entriesDir));
+
+  const analysisInfo = {
+    isEmptySrc: isEmptySource(appDir, entriesDir),
+    isSingleEntry: isSingleEntry(appDir, entriesDir),
+    isTsProject: isTsProject(appDir),
+  };
+
+  generator.logger.debug('analysisInfo:', analysisInfo);
+
+  const config = { ...context.config, ...analysisInfo };
+  const ans = await appApi.getInputBySchemaFunc(getEntrySchema, config);
+
+  return ans;
+};
+
+const refactorSingleEntry = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+) => {
+  const pkgObj = await getPackageObj(context);
+  const pkgName = pkgObj.name;
+
+  const { entriesDir } = context.config;
+
+  const oldFilePath = path.join(context.materials.default.basePath, entriesDir);
+  const oldFiles = fs
+    .readdirSync(oldFilePath)
+    .filter(filePath => {
+      if (fs.statSync(path.join(oldFilePath, filePath)).isDirectory()) {
+        const files = fs.readdirSync(path.join(oldFilePath, filePath));
+        return files.length;
+      }
+      return (
+        filePath !== '.eslintrc.json' &&
+        filePath !== '.eslintrc.js' &&
+        filePath !== 'modern-app-env.d.ts'
+      );
+    })
+    .map(file =>
+      path.join(context.materials.default.basePath, entriesDir, file),
+    );
+
+  // create new dir in entriesDir and move code to that dir
+  fs.mkdirpSync(
+    path.join(context.materials.default.basePath, entriesDir, pkgName),
+  );
+  oldFiles.forEach(file => {
+    generator.logger.debug(
+      `rename ${file} to ${file.replace(
+        entriesDir,
+        path.join(entriesDir, pkgName),
+      )}`,
+    );
+    fs.renameSync(
+      file,
+      file.replace(entriesDir, path.join(entriesDir, pkgName)),
+    );
+  });
+};
+
+export const handleTemplateFile = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+  appApi: AppAPI,
+) => {
+  const ans = await handleInput(context, generator, appApi);
+
+  if (ans.isSingleEntry) {
+    generator.logger.debug(
+      'current is single entry, refactoring to multi entry',
+    );
+    await refactorSingleEntry(context, generator);
+  }
+
+  const entryName = (ans.name as string) || '';
+  const fileExtra = ans.isTsProject ? 'tsx' : 'jsx';
+  const targetPath = path.join(context.config.entriesDir, entryName);
+
+  await appApi.forgeTemplate(`templates/**/*`, undefined, resourceKey =>
+    resourceKey
+      .replace('templates', targetPath)
+      .replace('.handlebars', `.${fileExtra}`),
+  );
+};
+
+export default async (context: GeneratorContext, generator: GeneratorCore) => {
+  const appApi = new AppAPI(context, generator);
+
+  const { locale } = context.config;
+  commonI18n.changeLanguage({ locale });
+  appApi.i18n.changeLanguage({ locale });
+  i18n.changeLanguage({ locale });
+
+  if (!(await appApi.checkEnvironment())) {
+    // eslint-disable-next-line no-process-exit
+    process.exit(1);
+  }
+
+  generator.logger.debug(`start run @modern-js/entry-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  merge(context.config, { entriesDir: context.config.entriesDir || 'src' });
+
+  await handleTemplateFile(context, generator, appApi);
+
+  if (!context.config.isEmptySrc) {
+    appApi.showSuccessInfo(
+      i18n.t(localeKeys.success, { name: context.config.name }),
+    );
+  }
+
+  generator.logger.debug(`forge @modern-js/entry-generator succeed `);
+};