@modern-js/entry-generator 2.4.16 → 2.4.18

package/dist/index.js

@@ -85066,7 +85066,6 @@ var require_downloadPackage = __commonJSMin((exports) => {
     if (response.status !== 200) {
       throw new Error(`download tar package get bad status code: ${response.status}`);
     }
-    const contentLength = Number(response.headers["content-length"]);
     const randomId = Math.floor(Math.random() * 1e4);
     const tempTgzFilePath = `${_os.default.tmpdir()}/temp-${randomId}.tgz`;
     const dest = _utils.fs.createWriteStream(tempTgzFilePath);
@@ -85079,9 +85078,6 @@ var require_downloadPackage = __commonJSMin((exports) => {
         resolve();
       });
     });
-    if ((await _utils.fs.stat(tempTgzFilePath)).size !== contentLength) {
-      throw new Error("download tar package get bad content length");
-    }
     await new Promise((resolve, reject) => {
       _utils.fs.createReadStream(tempTgzFilePath).pipe(_tar.default.x({
         strip: 1,

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.16",
+  "version": "2.4.18",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -20,19 +20,19 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "1.6.3",
-    "@modern-js/codesmith-api-app": "1.6.3",
-    "@modern-js/codesmith-api-handlebars": "1.6.3",
+    "@modern-js/codesmith": "1.6.4",
+    "@modern-js/codesmith-api-app": "1.6.4",
+    "@modern-js/codesmith-api-handlebars": "1.6.4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-common": "2.4.16",
-    "@modern-js/generator-utils": "2.4.16",
-    "@modern-js/plugin-i18n": "1.22.5",
-    "@modern-js/utils": "1.22.5",
-    "@scripts/build": "1.22.5",
-    "@scripts/jest-config": "1.22.5"
+    "@modern-js/generator-utils": "2.4.18",
+    "@modern-js/generator-common": "2.4.18",
+    "@modern-js/plugin-i18n": "1.22.7",
+    "@modern-js/utils": "1.22.7",
+    "@scripts/build": "1.22.7",
+    "@scripts/jest-config": "1.22.7"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/index.ts

@@ -0,0 +1,217 @@
+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 { renderString } from '@modern-js/codesmith-api-handlebars';
+import {
+  i18n as commonI18n,
+  EntrySchema,
+  ClientRoute,
+} 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 ans = await appApi.getInputBySchema(EntrySchema, {
+    ...context.config,
+    ...analysisInfo,
+  });
+
+  if (ans.needModifyMWAConfig === 'no') {
+    ans.clientRoute = ClientRoute.SelfControlRoute;
+  }
+  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)),
+    );
+  });
+};
+
+const getTplInfo = (clientRoute: ClientRoute, isTs: boolean) => {
+  const fileExtra = isTs ? 'tsx' : 'jsx';
+  if (clientRoute === ClientRoute.ConventionalRoute) {
+    return {
+      name: 'pages-router',
+      space: '  ',
+      fileExtra,
+      entry: `Index.${fileExtra}`,
+      css: 'index.css',
+    };
+  } else if (clientRoute === ClientRoute.SelfControlRoute) {
+    return {
+      name: 'router',
+      space: '      ',
+      fileExtra,
+      entry: `App.${fileExtra}`,
+      css: 'App.css',
+    };
+  }
+  return {
+    name: 'base',
+    space: '  ',
+    fileExtra,
+    entry: `App.${fileExtra}`,
+    css: 'App.css',
+  };
+};
+
+const getTargetFolder = (
+  clientRoute: ClientRoute,
+  entriesDir: string,
+  entryName: string,
+) => {
+  let targetPath = path.join(entriesDir, entryName);
+  if (clientRoute === ClientRoute.ConventionalRoute) {
+    targetPath = path.join(targetPath, 'pages');
+  }
+  return targetPath;
+};
+
+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 { name, space, fileExtra, entry, css } = getTplInfo(
+    ans.clientRoute as ClientRoute,
+    ans.isTsProject as boolean,
+  );
+  const targetFolder = getTargetFolder(
+    ans.clientRoute as ClientRoute,
+    context.config.entriesDir,
+    entryName,
+  );
+  const sourceFolder = `templates/${name}`;
+
+  const mainTpl = await context.current?.material
+    .get('templates/main.handlebars')
+    .value();
+  const main = renderString((mainTpl?.content as string | undefined) || '', {
+    space,
+    entry,
+  });
+
+  await appApi.forgeTemplate(
+    `${sourceFolder}/*`,
+    undefined,
+    resourceKey =>
+      resourceKey
+        .replace(sourceFolder, targetFolder)
+        .replace('.handlebars', `.${fileExtra}`),
+    {
+      main,
+    },
+  );
+
+  await appApi.forgeTemplate(
+    `templates/main.css`,
+    undefined,
+    resourceKey =>
+      resourceKey
+        .replace('templates/main.css', `${targetFolder}/${css}`)
+        .replace('.handlebars', ''),
+    {
+      main,
+    },
+  );
+};
+
+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 `);
+};