makepack 1.3.7 → 1.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makepack",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "type": "module",
   "description": "A CLI tool to create, build, and manage JavaScript, TypeScript, React, and React-TypeScript libraries for npm projects.",
   "files": [

package/src/actions/create/files/package-json.js

@@ -34,6 +34,23 @@ export default (args) => {
       dependencies,
       devDependencies,
       keywords: [],
+      exports: {
+         ".": {
+            "types": "./types/index.d.ts",
+            "import": "./esm/index.js",
+            "require": "./cjs/index.js"
+         },
+         "./*": {
+            "types": "./types/*.d.ts",
+            "import": "./esm/*.js",
+            "require": "./cjs/*.js"
+         },
+         "./types/*": "./types/*.d.ts",
+         "./esm/*": "./esm/*.js",
+         "./esm/*.js": "./esm/*.js",
+         "./cjs/*": "./cjs/*.js",
+         "./cjs/*.js": "./cjs/*.js"
+      }
    }
 
    return {

package/src/actions/pack/index.js

@@ -15,60 +15,46 @@ const pack = async (args) => {
    const files = await glob('src/**/*.{tsx,ts,js,jsx}') || []
    const entryPoints = files.map(entry => path.join(process.cwd(), entry))
    let loader = logLoader("Generating a production build for the package...")
-   const esbuildConfig = await loadConfig('esbuild.config.js') || {}
+   const config = await loadConfig(args)
+   const packConfig = config.pack || {}
+   const esmConfig = packConfig?.esm
+   const cjsConfig = packConfig?.cjs
+   const tsConfig = packConfig?.tsconfig
 
    async function build(format) {
       return esbuild.buildSync({
-         // bundle: true,
-         // target: ['esnext'],
-         // splitting: format === 'esm', // Enable code splitting only for ESM
-         minify: true,
-         sourcemap: true,
-         jsx: 'automatic',
-         loader: {
-            '.ts': 'ts',
-            '.tsx': 'tsx'
-         },
-         ...esbuildConfig,
-         format: format, // 'esm' or 'cjs'
+         ...(format === 'esm' ? esmConfig : cjsConfig),
+         format: format,
          entryPoints,
          outdir: path.join(process.cwd(), args.outdir, format),
       });
    }
 
-   await build('esm')
-   await build('cjs')
+   esmConfig && await build('esm')
+   cjsConfig && await build('cjs')
 
    loader.stop()
-   loader = logLoader("🔄 Generating TypeScript declarations...")
-   const options = {
-      declaration: true,
-      emitDeclarationOnly: true,
-      outDir: path.join(process.cwd(), args.outdir, 'types'),
-      strict: true,
-      allowJs: true,
-      jsx: ts.JsxEmit.React,
-      esModuleInterop: true,
-   };
-
-   const program = ts.createProgram(files, options);
-   const emitResult = program.emit();
-   const diagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-
-   if (diagnostics.length > 0) {
-      diagnostics.forEach(diagnostic => {
-         const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-         if (diagnostic.file) {
-            const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
-            console.error(`Error at ${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
-         } else {
-            console.error(`Error: ${message}`);
-         }
-      });
-   } else {
-      console.log('✅ TypeScript declaration files generated successfully!');
+   if (tsConfig) {
+      loader = logLoader("🔄 Generating TypeScript declarations...")
+      const program = ts.createProgram(files, tsConfig);
+      const emitResult = program.emit();
+      const diagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+
+      if (diagnostics.length > 0) {
+         diagnostics.forEach(diagnostic => {
+            const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
+            if (diagnostic.file) {
+               const { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+               console.error(`Error at ${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
+            } else {
+               console.error(`Error: ${message}`);
+            }
+         });
+      } else {
+         console.log('✅ TypeScript declaration files generated successfully!');
+      }
+      loader.stop()
    }
-   loader.stop()
 
    let packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), '/package.json'), 'utf8'));
 
@@ -86,6 +72,23 @@ const pack = async (args) => {
       main: './cjs/index.js',
       module: './esm/index.js',
       types: './types/index.d.ts',
+      exports: {
+         ".": {
+            "types": "./types/index.d.ts",
+            "import": "./esm/index.js",
+            "require": "./cjs/index.js"
+         },
+         "./*": {
+            "types": "./types/*.d.ts",
+            "import": "./esm/*.js",
+            "require": "./cjs/*.js"
+         },
+         "./types/*": "./types/*.d.ts",
+         "./esm/*": "./esm/*.js",
+         "./esm/*.js": "./esm/*.js",
+         "./cjs/*": "./cjs/*.js",
+         "./cjs/*.js": "./cjs/*.js"
+      },
       ...packageJson,
    }
 
@@ -104,8 +107,6 @@ const pack = async (args) => {
    } else {
       console.log(`To publish your package:\n1. Navigate to the ${args.outdir} directory:\ncd ./${args.outdir}\n2. Publish the package to npm:\nnpm publish\nYour package is ready to share with the world! 🚀`);
    }
-
-
 }
 
 export default pack

package/src/actions/serve/index.js

@@ -7,7 +7,6 @@ import { glob } from 'glob'
 import { logger, loadConfig } from '../../helpers.js'
 import chalk from 'chalk';
 import figlet from 'figlet';
-import react from '@vitejs/plugin-react'
 
 const app = express();
 
@@ -34,6 +33,7 @@ const serve = async (args) => {
       }
    }
 
+
    let template = `
       <!doctype html>
       <html lang="en">
@@ -48,29 +48,19 @@ const serve = async (args) => {
       </html>
   `;
 
-   let viteConfig = await loadConfig('vite.config.js') || {}
-
-   const vite = await createViteServer({
-      ...viteConfig,
-      root: process.cwd(),
-      plugins: [react(), ...(viteConfig.plugins || [])],
-      server: {
-         middlewareMode: true,
-         ...(viteConfig.server || {})
-      },
-      customLogger: {
-         info: (msg) => {
-            logger.info(msg)
-         },
-         warn: (msg) => logger.warning(msg),
-         error: (msg) => logger.error(msg),
-         ...(viteConfig.customLogger || {})
-      },
-      appType: 'custom'
-   });
+   let config = await loadConfig(args)
+   let serveConfig = config.serve || {}
+   let viteConfig = serveConfig.vite || {}
+   let express = serveConfig.express
 
+   const vite = await createViteServer(viteConfig);
    app.use(vite.middlewares);
-   app.get('/', async (req, res, next) => {
+
+   if (express) {
+      express(app)
+   }
+
+   app.get('*', async (req, res, next) => {
       const url = req.originalUrl;
       try {
          template = await vite.transformIndexHtml(url, template);

package/src/helpers.js

@@ -4,6 +4,8 @@ import figures from 'figures';
 import { pathToFileURL } from 'url';
 import path from 'path';
 import fs from 'fs-extra';
+import react from '@vitejs/plugin-react'
+import ts from 'typescript'
 
 
 export const logLoader = (message = "") => {
@@ -58,13 +60,63 @@ export const logger = {
 };
 
 
-export const loadConfig = async (file) => {
-   const config = path.resolve(process.cwd(), file);
-   if (fs.existsSync(config)) {
+export const loadConfig = async (args) => {
+   const makepack = path.resolve(process.cwd(), "makepack.js");
+   let esbuild = {
+      minify: true,
+      sourcemap: true,
+      jsx: 'automatic',
+      loader: {
+         '.ts': 'ts',
+         '.tsx': 'tsx'
+      },
+   }
+
+   const defaultConfig = {
+      pack: {
+         tsconfig: {
+            declaration: true,
+            emitDeclarationOnly: true,
+            outDir: path.join(process.cwd(), args.outdir || "pack", 'types'),
+            strict: true,
+            allowJs: true,
+            jsx: ts.JsxEmit.React,
+            esModuleInterop: true,
+         },
+         esm: esbuild,
+         cjs: esbuild,
+      },
+      serve: {
+         express: () => { },
+         vite: {
+            root: process.cwd(),
+            plugins: [react()],
+            server: {
+               middlewareMode: true,
+            },
+            customLogger: {
+               info: (msg) => {
+                  logger.info(msg)
+               },
+               warn: (msg) => logger.warning(msg),
+               error: (msg) => logger.error(msg),
+            },
+            appType: 'custom'
+         }
+      }
+   }
+
+   if (fs.existsSync(makepack)) {
       try {
-         const c = await import(pathToFileURL(config).href)
-         return c.default || {}
+         const c = await import(pathToFileURL(makepack).href)
+         const configFn = c.default
+         if (typeof configFn === 'function') {
+            return configFn(defaultConfig)
+         }
       } catch (error) {
+         console.log(error);
+
       }
    }
+   return defaultConfig
 }