makepack 1.5.7 → 1.5.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makepack",
-  "version": "1.5.7",
+  "version": "1.5.9",
   "type": "module",
   "description": "A CLI tool to create, build, and manage JavaScript, TypeScript, React, and React-TypeScript libraries for npm projects.",
   "files": [
@@ -33,6 +33,7 @@
     "@vitejs/plugin-react": "^4.3.4",
     "chalk": "^5.4.1",
     "commander": "^12.1.0",
+    "cosmiconfig": "^9.0.0",
     "esbuild": "^0.24.2",
     "express": "^4.21.1",
     "figlet": "^1.8.0",

package/src/actions/build/index.js

@@ -33,30 +33,30 @@ const build = async () => {
       }
 
       if (build.types) {
-         const rootDir = process.cwd(); // Get the project root directory
-         const tsconfigPath = path.join(rootDir, 'tsconfig.json');
-
+         const tsconfigPath = path.resolve(process.cwd(), "tsconfig.json");
          let tsconfig = {};
          if (fs.existsSync(tsconfigPath)) {
-            console.log("✅ Found tsconfig.json, loading...");
-            const rawConfig = fs.readFileSync(tsconfigPath, 'utf8');
-            const parsedConfig = ts.parseConfigFileTextToJson(tsconfigPath, rawConfig);
-            if (parsedConfig.error) {
-               console.error("❌ Error parsing tsconfig.json:", parsedConfig.error);
+            const parsedConfig = ts.getParsedCommandLineOfConfigFile(
+               tsconfigPath,
+               {},
+               ts.sys
+            );
+
+            if (!parsedConfig) {
+               console.error("❌ Error parsing tsconfig.json");
+               process.exit(1);
             } else {
-               tsconfig = parsedConfig.config.compilerOptions || {};
+               tsconfig = parsedConfig.options;
             }
-         } else {
-            console.log("⚠️ No tsconfig.json found, using default settings.");
          }
 
          tsconfig = {
             allowJs: true,
-            target: ts.ScriptTarget.ESNext,
+            target: ts.ScriptTarget.ESNext, // Ensure it's an enum
             skipLibCheck: true,
             moduleResolution: ts.ModuleResolutionKind.Node10,
-            ...tsconfig,
-            outDir: path.join(rootDir, 'types'),
+            ...tsconfig, // Preserve root tsconfig settings
+            outDir: path.join(outdir, "types"),
             declaration: true,
             emitDeclarationOnly: true,
             noEmit: false,

package/src/actions/publish/index.js

@@ -11,6 +11,7 @@ const publish = async () => {
       logger.error(`Build directory ${buildDir} does not exist. Please build the project first`)
       process.exit(1)
    }
+
    logger.info(`Publishing the production build to the npm repository...`)
    execSync(`npm publish`, {
       cwd: buildDir

package/src/makepack-config.js

@@ -1,7 +1,8 @@
-import path from 'path'
-import fs from 'fs-extra'
+import { cosmiconfig } from "cosmiconfig";
 
 const makepackConfig = async () => {
+   const explorer = cosmiconfig("makepack");
+   const configResult = await explorer.search();
 
    const defaultConfig = {
       build: {
@@ -41,22 +42,16 @@ const makepackConfig = async () => {
          express: (_app) => { }
       }
    }
-   const configPath = path.resolve(process.cwd(), "makepack.js");
 
-   if (fs.existsSync(configPath)) {
-      try {
-         const c = await import(`file://${configPath}`)
-         const configFn = c.default
-         if (typeof configFn === 'function') {
-            const nc = configFn(defaultConfig)
-            if (!nc) {
-               console.log("Config function must return a config object")
-               process.exit(1)
-            }
-            return nc
+   if (configResult && configResult.config) {
+      let fn = configResult.config;
+      if (typeof fn === 'function') {
+         const userConfig = fn(defaultConfig)
+         if (!userConfig) {
+            console.log("Config function must return a config object")
+            process.exit(1)
          }
-      } catch (error) {
-         console.log(error);
+         return userConfig
       }
    }
    return defaultConfig