@modern-js/ssg-generator 3.3.10 → 3.3.11

package/dist/index.js

@@ -51054,7 +51054,6 @@ __export(src_exports, {
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
-var import_path6 = __toESM(require("path"));
 
 // ../../../../node_modules/.pnpm/@swc+helpers@0.5.1/node_modules/@swc/helpers/esm/_define_property.js
 function _define_property(obj, key, value) {
@@ -61749,7 +61748,7 @@ var AppAPI = class {
 };
 
 // ../../generator-utils/dist/esm/index.js
-var import_path5 = __toESM(require("path"));
+var import_path6 = __toESM(require("path"));
 var import_utils16 = require("@modern-js/utils");
 
 // ../../../../node_modules/.pnpm/@swc+helpers@0.5.3/node_modules/@swc/helpers/esm/_define_property.js
@@ -62054,17 +62053,32 @@ async function fileExist(filePath) {
   }
 }
 
+// ../../generator-utils/dist/esm/utils/getGeneratorPath.js
+var import_path5 = __toESM(require("path"));
+var getGeneratorPath = (generator, distTag, paths) => {
+  if (process.env.CODESMITH_ENV === "development") {
+    return import_path5.default.dirname(require.resolve(generator, {
+      paths: paths !== null && paths !== void 0 ? paths : [
+        process.cwd()
+      ]
+    }));
+  } else if (distTag) {
+    return `${generator}@${distTag}`;
+  }
+  return generator;
+};
+
 // ../../generator-utils/dist/esm/index.js
 var import_utils17 = require("@modern-js/utils");
 function isTsProject(appDir) {
-  return import_utils16.fs.existsSync(import_path5.default.join(appDir, "tsconfig.json"));
+  return import_utils16.fs.existsSync(import_path6.default.join(appDir, "tsconfig.json"));
 }
 async function getModernConfigFile(appDir) {
-  let exist = await fileExist(import_path5.default.join(appDir, "modern.config.ts"));
+  let exist = await fileExist(import_path6.default.join(appDir, "modern.config.ts"));
   if (exist) {
     return "modern.config.ts";
   }
-  exist = await fileExist(import_path5.default.join(appDir, "modern.config.js"));
+  exist = await fileExist(import_path6.default.join(appDir, "modern.config.js"));
   if (exist) {
     return "modern.config.js";
   }
@@ -62086,17 +62100,9 @@ var i18n3 = new I18n2();
 var localeKeys3 = i18n3.init("en", { zh: ZH_LOCALE3, en: EN_LOCALE3 });
 
 // src/index.ts
-var getGeneratorPath = (generator, distTag) => {
-  if (process.env.CODESMITH_ENV === "development") {
-    return import_path6.default.dirname(require.resolve(generator));
-  } else if (distTag) {
-    return `${generator}@${distTag}`;
-  }
-  return generator;
-};
 var handleTemplateFile = async (context, _generator, appApi) => {
   await appApi.runSubGenerator(
-    getGeneratorPath(DependenceGenerator, context.config.distTag),
+    getGeneratorPath(DependenceGenerator, context.config.distTag, [__dirname]),
     void 0,
     {
       ...context.config,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.3.10",
+  "version": "3.3.11",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "/dist/index.js"
   ],
   "dependencies": {
-    "@modern-js/utils": "2.47.1"
+    "@modern-js/utils": "2.48.0"
   },
   "devDependencies": {
     "@modern-js/codesmith": "2.3.5",
@@ -32,12 +32,12 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/dependence-generator": "3.3.10",
-    "@modern-js/generator-utils": "3.3.10",
-    "@modern-js/generator-common": "3.3.10",
-    "@modern-js/plugin-i18n": "2.47.1",
-    "@scripts/jest-config": "2.47.1",
-    "@scripts/build": "2.47.1"
+    "@modern-js/dependence-generator": "3.3.11",
+    "@modern-js/generator-common": "3.3.11",
+    "@modern-js/generator-utils": "3.3.11",
+    "@modern-js/plugin-i18n": "2.48.0",
+    "@scripts/build": "2.48.0",
+    "@scripts/jest-config": "2.48.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -1,29 +1,23 @@
-import path from 'path';
 import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
 import { AppAPI } from '@modern-js/codesmith-api-app';
-import { chalk, getModernConfigFile } from '@modern-js/generator-utils';
+import {
+  chalk,
+  getModernConfigFile,
+  getGeneratorPath,
+} from '@modern-js/generator-utils';
 import {
   DependenceGenerator,
   i18n as commonI18n,
 } from '@modern-js/generator-common';
 import { i18n, localeKeys } from './locale';
 
-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;
-};
-
 const handleTemplateFile = async (
   context: GeneratorContext,
   _generator: GeneratorCore,
   appApi: AppAPI,
 ) => {
   await appApi.runSubGenerator(
-    getGeneratorPath(DependenceGenerator, context.config.distTag),
+    getGeneratorPath(DependenceGenerator, context.config.distTag, [__dirname]),
     undefined,
     {
       ...context.config,