@modern-js/server-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}`);
@@ -137434,15 +137455,6 @@ function getPackageVersion(packageName, registry2) {
       spinner.stop();
       return stripAnsi(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 stripAnsi(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",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -28,11 +28,11 @@
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-common": "3.0.4",
-    "@modern-js/generator-utils": "3.0.4",
-    "@modern-js/dependence-generator": "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",
+    "@scripts/jest-config": "2.3.0",
+    "@scripts/build": "2.3.0",
+    "@modern-js/dependence-generator": "3.0.5"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -0,0 +1,131 @@
+import path from 'path';
+import {
+  fs,
+  getModernPluginVersion,
+  isTsProject,
+  readTsConfigByFile,
+} from '@modern-js/generator-utils';
+import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
+import { AppAPI } from '@modern-js/codesmith-api-app';
+import { JsonAPI } from '@modern-js/codesmith-api-json';
+import {
+  DependenceGenerator,
+  i18n,
+  Language,
+  Solution,
+} from '@modern-js/generator-common';
+
+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;
+};
+
+function isEmptyServerDir(serverDir: string) {
+  const files = fs.readdirSync(serverDir);
+  if (files.length === 0) {
+    return true;
+  }
+  return files.every(file => {
+    if (fs.statSync(path.join(serverDir, file)).isDirectory()) {
+      const childFiles = fs.readdirSync(path.join(serverDir, file));
+      return childFiles.length === 0;
+    }
+    return false;
+  });
+}
+
+const handleTemplateFile = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+  appApi: AppAPI,
+) => {
+  const jsonAPI = new JsonAPI(generator);
+
+  const appDir = context.materials.default.basePath;
+  const serverDir = path.join(appDir, 'server');
+
+  if (fs.existsSync(serverDir) && !isEmptyServerDir(serverDir)) {
+    const files = fs.readdirSync('server');
+    if (files.length > 0) {
+      generator.logger.warn("'server' is already exist");
+      // eslint-disable-next-line no-process-exit
+      process.exit(1);
+    }
+  }
+
+  const language = isTsProject(appDir) ? Language.TS : Language.JS;
+  const serverPlugin = '@modern-js/plugin-server';
+  await appApi.runSubGenerator(
+    getGeneratorPath(DependenceGenerator, context.config.distTag),
+    undefined,
+    {
+      ...context.config,
+      devDependencies: {
+        ...(context.config.devDependencies || {}),
+        [serverPlugin]: await getModernPluginVersion(
+          Solution.MWA,
+          serverPlugin,
+          {
+            registry: context.config.registry,
+            distTag: context.config.distTag,
+            cwd: context.materials.default.basePath,
+          },
+        ),
+        'ts-node': '~10.8.1',
+        'tsconfig-paths': '~3.14.1',
+      },
+    },
+  );
+
+  await appApi.forgeTemplate(
+    `templates/base-template/${language}/**/*`,
+    undefined,
+    resourceKey =>
+      resourceKey
+        .replace(`templates/base-template/${language}/`, '')
+        .replace('.handlebars', ''),
+  );
+
+  if (language === Language.TS) {
+    const tsconfigJSON = readTsConfigByFile(path.join(appDir, 'tsconfig.json'));
+
+    if (!(tsconfigJSON.include || []).includes('server')) {
+      await jsonAPI.update(
+        context.materials.default.get(path.join(appDir, 'tsconfig.json')),
+        {
+          query: {},
+          update: {
+            $set: {
+              include: [...(tsconfigJSON.include || []), 'server'],
+            },
+          },
+        },
+      );
+    }
+  }
+};
+
+export default async (context: GeneratorContext, generator: GeneratorCore) => {
+  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/server-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  await handleTemplateFile(context, generator, appApi);
+
+  generator.logger.debug(`forge @modern-js/server-generator succeed `);
+};