@modern-js/tailwindcss-generator 3.3.10 → 3.3.11

package/dist/index.js

@@ -51055,7 +51055,6 @@ __export(src_exports, {
   handleTemplateFile: () => handleTemplateFile
 });
 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) {
@@ -62045,22 +62044,31 @@ var Language;
 })(Language || (Language = {}));
 
 // ../../generator-utils/dist/esm/index.js
-var import_path5 = __toESM(require("path"));
+var import_path6 = __toESM(require("path"));
 var import_utils15 = require("@modern-js/utils");
-var import_utils16 = require("@modern-js/utils");
-function isTsProject(appDir) {
-  return import_utils15.fs.existsSync(import_path5.default.join(appDir, "tsconfig.json"));
-}
 
-// src/index.ts
-var getGeneratorPath = (generator, distTag) => {
+// ../../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_path6.default.dirname(require.resolve(generator));
+    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_utils16 = require("@modern-js/utils");
+function isTsProject(appDir) {
+  return import_utils15.fs.existsSync(import_path6.default.join(appDir, "tsconfig.json"));
+}
+
+// src/index.ts
 var handleTemplateFile = async (context, generator, appApi) => {
   const appDir = context.materials.default.basePath;
   const language = isTsProject(appDir) ? Language.TS : Language.JS;
@@ -62089,7 +62097,7 @@ var handleTemplateFile = async (context, generator, appApi) => {
     devDependencies.tailwindcss = tailwindVersion;
   }
   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,11 +32,11 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/dependence-generator": "3.3.10",
-    "@modern-js/generator-utils": "3.3.10",
-    "@scripts/build": "2.47.1",
-    "@scripts/jest-config": "2.47.1",
-    "@modern-js/generator-common": "3.3.10"
+    "@modern-js/dependence-generator": "3.3.11",
+    "@modern-js/generator-common": "3.3.11",
+    "@modern-js/generator-utils": "3.3.11",
+    "@scripts/jest-config": "2.48.0",
+    "@scripts/build": "2.48.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -1,4 +1,3 @@
-import path from 'path';
 import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
 import { AppAPI } from '@modern-js/codesmith-api-app';
 import {
@@ -6,16 +5,7 @@ import {
   Language,
   DependenceGenerator,
 } from '@modern-js/generator-common';
-import { isTsProject } from '@modern-js/generator-utils';
-
-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;
-};
+import { isTsProject, getGeneratorPath } from '@modern-js/generator-utils';
 
 export const handleTemplateFile = async (
   context: GeneratorContext,
@@ -49,7 +39,7 @@ export const handleTemplateFile = async (
     devDependencies.tailwindcss = tailwindVersion;
   }
   await appApi.runSubGenerator(
-    getGeneratorPath(DependenceGenerator, context.config.distTag),
+    getGeneratorPath(DependenceGenerator, context.config.distTag, [__dirname]),
     undefined,
     {
       ...context.config,