@modern-js/dependence-generator 3.0.4 → 3.0.5

package/dist/index.js

@@ -35750,7 +35750,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 });
@@ -35760,7 +35760,7 @@ var require_nodeEnv = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -44398,7 +44398,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* () {
@@ -44425,7 +44425,7 @@ var require_env = __commonJS({
         }
       });
     }
-    function canUseYarn3() {
+    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 = 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"], {
@@ -45515,7 +45515,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}`);
@@ -134808,6 +134808,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) {
@@ -135382,7 +135402,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";
@@ -135873,7 +135893,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 });
@@ -135883,7 +135903,7 @@ var require_nodeEnv2 = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -136962,6 +136982,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,11 +27,11 @@
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-common": "3.0.4",
-    "@modern-js/plugin-i18n": "2.2.0",
-    "@scripts/build": "2.2.0",
-    "@scripts/jest-config": "2.2.0",
-    "@modern-js/generator-utils": "3.0.4"
+    "@modern-js/plugin-i18n": "2.3.0",
+    "@modern-js/generator-common": "3.0.5",
+    "@modern-js/generator-utils": "3.0.5",
+    "@scripts/jest-config": "2.3.0",
+    "@scripts/build": "2.3.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -0,0 +1,113 @@
+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 { i18n as commonI18n } from '@modern-js/generator-common';
+import { fs, getModernConfigFile } from '@modern-js/generator-utils';
+import { i18n, localeKeys } from './locale';
+
+export const handleTemplateFile = async (
+  context: GeneratorContext,
+  generator: GeneratorCore,
+) => {
+  const jsonAPI = new JsonAPI(generator);
+  const {
+    devDependencies,
+    dependencies,
+    peerDependencies,
+    appendTypeContent,
+    sourceTypeFile,
+    projectPath,
+  } = context.config;
+
+  const setJSON: Record<string, Record<string, string>> = {};
+  Object.keys(devDependencies || {}).forEach(key => {
+    setJSON[`devDependencies.${key}`] = devDependencies[key];
+  });
+  Object.keys(dependencies || {}).forEach(key => {
+    setJSON[`dependencies.${key}`] = dependencies[key];
+  });
+  Object.keys(peerDependencies || {}).forEach(key => {
+    setJSON[`peerDependencies.${key}`] = peerDependencies[key];
+  });
+  if (Object.keys(setJSON).length > 0) {
+    await jsonAPI.update(
+      context.materials.default.get(
+        path.join(projectPath || '', 'package.json'),
+      ),
+      {
+        query: {},
+        update: { $set: setJSON },
+      },
+    );
+  }
+
+  const appDir = context.materials.default.basePath;
+  const isTs = fs.existsSync(
+    path.join(appDir, projectPath || '', 'tsconfig.json'),
+  );
+  if (appendTypeContent && isTs) {
+    const typePath = path.join(
+      appDir,
+      projectPath || '',
+      'src',
+      sourceTypeFile || 'modern-app-env.d.ts',
+    );
+    if (fs.existsSync(typePath)) {
+      const npmrc = fs.readFileSync(typePath, 'utf-8');
+      if (!npmrc.includes(appendTypeContent)) {
+        fs.writeFileSync(typePath, `${appendTypeContent}\n${npmrc}`, 'utf-8');
+      }
+    } else {
+      fs.ensureFileSync(typePath);
+      fs.writeFileSync(typePath, appendTypeContent, 'utf-8');
+    }
+  }
+};
+
+export default async (context: GeneratorContext, generator: GeneratorCore) => {
+  const appApi = new AppAPI(context, generator);
+
+  // when use new command, listeners will create more than 10
+  process.setMaxListeners(20);
+
+  const { locale } = context.config;
+  commonI18n.changeLanguage({ locale });
+  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/dependence-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  await handleTemplateFile(context, generator);
+
+  if (!context.config.isSubGenerator) {
+    await appApi.runInstall(undefined, { ignoreScripts: true });
+    if (!context.config.pluginName) {
+      appApi.showSuccessInfo();
+    } else {
+      const appDir = context.materials.default.basePath;
+      const configFile = await getModernConfigFile(appDir);
+      appApi.showSuccessInfo(
+        i18n.t(
+          configFile.endsWith('ts')
+            ? localeKeys.successTs
+            : localeKeys.successJS,
+          {
+            configFile,
+            pluginName: context.config.pluginName,
+            pluginDependence: context.config.pluginDependence,
+          },
+        ),
+      );
+    }
+  }
+
+  generator.logger.debug(`forge @modern-js/dependence-generator succeed `);
+};