@modern-js/packages-generator 3.0.4 → 3.0.5

package/dist/index.js

@@ -35750,7 +35750,7 @@ var require_nodeEnv = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm;
-    function canUseYarn() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -35760,7 +35760,7 @@ var require_nodeEnv = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm() {
       return __async(this, null, function* () {
         try {
@@ -44398,7 +44398,7 @@ var require_env = __commonJS({
     exports.canUseNpm = canUseNpm;
     exports.canUseNvm = canUseNvm;
     exports.canUsePnpm = canUsePnpm;
-    exports.canUseYarn = canUseYarn;
+    exports.canUseYarn = canUseYarn2;
     var _utils = require_dist();
     function canUseNvm() {
       return __async(this, null, function* () {
@@ -44425,7 +44425,7 @@ var require_env = __commonJS({
         }
       });
     }
-    function canUseYarn() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -45461,14 +45461,14 @@ var require_packageManager = __commonJS({
       value: true
     });
     exports.canUsePnpm = canUsePnpm;
-    exports.canUseYarn = canUseYarn;
+    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 canUseYarn() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -45515,7 +45515,7 @@ var require_packageManager = __commonJS({
             params.push(`--registry=${registryUrl}`);
           }
           yield (0, _utils.execa)("pnpm", params, options);
-        } else if (yield canUseYarn()) {
+        } else if (yield canUseYarn2()) {
           const params = ["install", "--production", "--silent", "--ignore-scripts"];
           if (registryUrl) {
             params.push(`--registry=${registryUrl}`);
@@ -136245,6 +136245,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) {
@@ -136819,7 +136839,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";
@@ -137310,7 +137330,7 @@ var require_nodeEnv2 = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm;
-    function canUseYarn() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -137320,7 +137340,7 @@ var require_nodeEnv2 = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm() {
       return __async(this, null, function* () {
         try {
@@ -138399,6 +138419,7 @@ var require_dist3 = __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);

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

package/src/index.ts

@@ -0,0 +1,68 @@
+import path from 'path';
+import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
+import { AppAPI } from '@modern-js/codesmith-api-app';
+import { JsonAPI } from '@modern-js/codesmith-api-json';
+import { PackageManager } from '@modern-js/generator-common';
+import { fs } from '@modern-js/generator-utils';
+
+const handleTemplateFile = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+) => {
+  const { packageManager, packagesInfo } = context.config;
+  const jsonAPI = new JsonAPI(generator);
+  if (packageManager === PackageManager.Pnpm) {
+    const update: Record<string, string> = {};
+    Object.entries(packagesInfo || {}).forEach(([name, version]) => {
+      update[`pnpm.overrides.${name}`] = version as string;
+    });
+    await jsonAPI.update(context.materials.default.get('package.json'), {
+      query: {},
+      update: {
+        $set: update,
+      },
+    });
+  } else {
+    const pkgInfo = fs.readJSONSync(
+      path.join(context.materials.default.basePath, 'package.json'),
+      'utf-8',
+    );
+    const { dependencies = {}, devDependencies = {} } = pkgInfo;
+
+    const update: Record<string, string> = {};
+    Object.entries(packagesInfo || {}).forEach(([name, version]) => {
+      update[`resolutions.${name}`] = version as string;
+      if (dependencies[name]) {
+        update[`dependencies.${name}`] = version as string;
+      }
+      if (devDependencies[name]) {
+        update[`devDependencies.${name}`] = version as string;
+      }
+    });
+    await jsonAPI.update(context.materials.default.get('package.json'), {
+      query: {},
+      update: {
+        $set: update,
+      },
+    });
+  }
+};
+
+export default async (context: GeneratorContext, generator: GeneratorCore) => {
+  const appApi = new AppAPI(context, generator);
+  const { locale } = context.config;
+  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/packages-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  await handleTemplateFile(context, generator);
+
+  generator.logger.debug(`forge @modern-js/packages-generator succeed `);
+};