makepack 1.3.6 → 1.3.8

package/src/actions/create/makeProjectInformation.js

@@ -1,68 +1,68 @@
-import inquirer from "inquirer"
-import makeProjectDirectory from "./makeProjectDirectory.js"
-import fs from "fs-extra"
-import path from "path"
-const cwd = process.cwd()
-const cwdFolder = cwd.split(path.sep).pop()
-
-const makeProjectInformation = async () => {
-   const projectDir = await makeProjectDirectory()
-   const information = await inquirer.prompt([
-      {
-         type: 'list',
-         name: 'template',
-         message: 'Select a template',
-         choices: ['typescript', 'javascript', 'react with typescript', 'react with javascript'],
-         default: 'typeScript'
-      }
-   ])
-
-   if (projectDir.dirname !== cwdFolder) {
-      fs.removeSync(projectDir.cwd)
-      fs.mkdirSync(projectDir.cwd)
-   }
-   information.entry = "index"
-   information.rootdir = "src"
-
-   switch (information.template) {
-      case "typescript":
-         information.entry = information.entry + ".ts"
-         break;
-      case "javascript":
-         information.entry = information.entry + ".js"
-         break;
-      case "react with typescript":
-         information.entry = information.entry + ".tsx"
-         break;
-      case "react with javascript":
-         information.entry = information.entry + ".jsx"
-         break;
-   }
-
-   // check if the root directory exists
-   if (!fs.existsSync(path.join(projectDir.cwd, information.rootdir))) {
-      fs.mkdirSync(path.join(projectDir.cwd, information.rootdir))
-   }
-
-   /* 
-   {
-     port: 3000,
-     outdir: "pack",
-     cwd: 'C:\xampp\htdocs\makepack\asd',
-     dirname: 'asd',
-     isCurrentDir: false,
-     template: 'typescript',
-     rootdir: 'src',
-     entry: 'index'
-   }
-   */
-
-   return {
-      // port: 3000,
-      outdir: "pack",
-      ...projectDir,
-      ...information
-   }
-}
-
+import inquirer from "inquirer"
+import makeProjectDirectory from "./makeProjectDirectory.js"
+import fs from "fs-extra"
+import path from "path"
+const cwd = process.cwd()
+const cwdFolder = cwd.split(path.sep).pop()
+
+const makeProjectInformation = async () => {
+   const projectDir = await makeProjectDirectory()
+   const information = await inquirer.prompt([
+      {
+         type: 'list',
+         name: 'template',
+         message: 'Select a template',
+         choices: ['typescript', 'javascript', 'react with typescript', 'react with javascript'],
+         default: 'typeScript'
+      }
+   ])
+
+   if (projectDir.dirname !== cwdFolder) {
+      fs.removeSync(projectDir.cwd)
+      fs.mkdirSync(projectDir.cwd)
+   }
+   information.entry = "index"
+   information.rootdir = "src"
+
+   switch (information.template) {
+      case "typescript":
+         information.entry = information.entry + ".ts"
+         break;
+      case "javascript":
+         information.entry = information.entry + ".js"
+         break;
+      case "react with typescript":
+         information.entry = information.entry + ".tsx"
+         break;
+      case "react with javascript":
+         information.entry = information.entry + ".jsx"
+         break;
+   }
+
+   // check if the root directory exists
+   if (!fs.existsSync(path.join(projectDir.cwd, information.rootdir))) {
+      fs.mkdirSync(path.join(projectDir.cwd, information.rootdir))
+   }
+
+   /* 
+   {
+     port: 3000,
+     outdir: "pack",
+     cwd: 'C:\xampp\htdocs\makepack\asd',
+     dirname: 'asd',
+     isCurrentDir: false,
+     template: 'typescript',
+     rootdir: 'src',
+     entry: 'index'
+   }
+   */
+
+   return {
+      // port: 3000,
+      outdir: "pack",
+      ...projectDir,
+      ...information
+   }
+}
+
 export default makeProjectInformation

package/src/actions/pack/index.js

@@ -1,113 +1,95 @@
-import esbuild from 'esbuild';
-import fs from 'fs-extra';
-import path from 'path';
-import { glob } from 'glob'
-import ts from 'typescript'
-import { execSync, logLoader, loadConfig } from '../../helpers.js';
-
-const pack = async (args) => {
-   args.outdir = 'pack'
-   try {
-      fs.removeSync(path.join(process.cwd(), args.outdir));
-      fs.mkdirSync(path.join(process.cwd(), args.outdir));
-   } catch (err) { }
-
-   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') || {}
-
-   function build(format) {
-      return esbuild.build({
-         // 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'
-         entryPoints,
-         outdir: path.join(process.cwd(), args.outdir, format),
-      });
-   }
-
-   Promise.all([
-      build('esm'),
-      build('cjs'),
-   ]).catch(() => process.exit(1));
-
-   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!');
-   }
-   loader.stop()
-
-   let packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), '/package.json'), 'utf8'));
-
-   let name = packageJson.name
-   let version = packageJson.version
-   let description = packageJson.description
-   delete packageJson.name
-   delete packageJson.version
-   delete packageJson.description
-
-   packageJson = {
-      name,
-      version,
-      description,
-      main: './cjs/index.js',
-      module: './esm/index.js',
-      types: './types/index.d.ts',
-      ...packageJson,
-   }
-
-   delete packageJson.type
-
-   fs.writeFileSync(path.join(process.cwd(), args.outdir, '/package.json'), JSON.stringify(packageJson, null, 2));
-
-   fs.copyFileSync(path.join(process.cwd(), '/readme.md'), path.join(process.cwd(), args.outdir, `/readme.md`))
-   console.log('✅ Production build generated successfully! The package is ready for deployment.');
-
-   if (args.publish) {
-      console.log("Publishing the production build to the npm repository...")
-      execSync(`npm publish`, {
-         cwd: path.join(process.cwd(), args.outdir)
-      })
-   } 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! 🚀`);
-   }
-
-
-}
-
+import esbuild from 'esbuild';
+import fs from 'fs-extra';
+import path from 'path';
+import { glob } from 'glob'
+import ts from 'typescript'
+import { execSync, logLoader, loadConfig } from '../../helpers.js';
+
+const pack = async (args) => {
+   args.outdir = 'pack'
+   try {
+      fs.removeSync(path.join(process.cwd(), args.outdir));
+      fs.mkdirSync(path.join(process.cwd(), args.outdir));
+   } catch (err) { }
+
+   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 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({
+         ...(format === 'esm' ? esmConfig : cjsConfig),
+         format: format,
+         entryPoints,
+         outdir: path.join(process.cwd(), args.outdir, format),
+      });
+   }
+
+   esmConfig && await build('esm')
+   cjsConfig && await build('cjs')
+
+   loader.stop()
+   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()
+   }
+
+   let packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), '/package.json'), 'utf8'));
+
+   let name = packageJson.name
+   let version = packageJson.version
+   let description = packageJson.description
+   delete packageJson.name
+   delete packageJson.version
+   delete packageJson.description
+
+   packageJson = {
+      name,
+      version,
+      description,
+      main: './cjs/index.js',
+      module: './esm/index.js',
+      types: './types/index.d.ts',
+      ...packageJson,
+   }
+
+   delete packageJson.type
+
+   fs.writeFileSync(path.join(process.cwd(), args.outdir, '/package.json'), JSON.stringify(packageJson, null, 2));
+
+   fs.copyFileSync(path.join(process.cwd(), '/readme.md'), path.join(process.cwd(), args.outdir, `/readme.md`))
+   console.log('✅ Production build generated successfully! The package is ready for deployment.');
+
+   if (args.publish) {
+      console.log("Publishing the production build to the npm repository...")
+      execSync(`npm publish`, {
+         cwd: path.join(process.cwd(), args.outdir)
+      })
+   } 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

@@ -1,107 +1,97 @@
-import inquirer from 'inquirer'
-import fs from 'fs-extra'
-import path from 'path'
-import { createServer as createViteServer } from 'vite';
-import express from 'express';
-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();
-
-
-
-const serve = async (args) => {
-   if (args.root === undefined) {
-      const serveFile = await glob('serve.{ts,js,tsx,jsx}', {
-         cwd: process.cwd()
-      })
-      if (!serveFile.length) {
-         let { root } = await inquirer.prompt([{
-            type: 'input',
-            name: 'root',
-            message: 'Enter the root file',
-         }]);
-
-         if (!fs.existsSync(path.join(process.cwd(), root))) {
-            throw new Error(`invalid root: ${root}`);
-         }
-         args.root = root;
-      } else {
-         args.root = serveFile[0];
-      }
-   }
-
-   let template = `
-      <!doctype html>
-      <html lang="en">
-        <head>
-          <meta charset="UTF-8" />
-          <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        </head>
-        <body>
-          <div id="root"></div>
-          <script type="module" src="${args.root}"></script>
-        </body>
-      </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'
-   });
-
-   app.use(vite.middlewares);
-   app.get('/', async (req, res, next) => {
-      const url = req.originalUrl;
-      try {
-         template = await vite.transformIndexHtml(url, template);
-         res.status(200).set({
-            'Content-Type': 'text/html'
-         }).end(template);
-      } catch (e) {
-         vite.ssrFixStacktrace(e);
-         next(e);
-      }
-   });
-
-   let server = app.listen(args.port, () => {
-      figlet("Make Pack", function (err, data) {
-         if (err) {
-            console.log("Something went wrong...");
-            console.dir(err);
-            server.close(() => {
-               console.log('Server has been stopped.');
-            });
-            process.exit()
-         }
-         console.log(data);
-         logger.success(`Server is running on ${chalk.blue(chalk.underline(`http://localhost:${args.port}`))}`);
-      });
-   });
-
-   app.use((err, req, res, next) => {
-      logger.error(`Unhandled Error: ${err.message}`);
-      res.status(500).send('Internal Server Error');
-   });
-}
-
+import inquirer from 'inquirer'
+import fs from 'fs-extra'
+import path from 'path'
+import { createServer as createViteServer } from 'vite';
+import express from 'express';
+import { glob } from 'glob'
+import { logger, loadConfig } from '../../helpers.js'
+import chalk from 'chalk';
+import figlet from 'figlet';
+
+const app = express();
+
+
+
+const serve = async (args) => {
+   if (args.root === undefined) {
+      const serveFile = await glob('serve.{ts,js,tsx,jsx}', {
+         cwd: process.cwd()
+      })
+      if (!serveFile.length) {
+         let { root } = await inquirer.prompt([{
+            type: 'input',
+            name: 'root',
+            message: 'Enter the root file',
+         }]);
+
+         if (!fs.existsSync(path.join(process.cwd(), root))) {
+            throw new Error(`invalid root: ${root}`);
+         }
+         args.root = root;
+      } else {
+         args.root = serveFile[0];
+      }
+   }
+
+
+   let template = `
+      <!doctype html>
+      <html lang="en">
+        <head>
+          <meta charset="UTF-8" />
+          <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        </head>
+        <body>
+          <div id="root"></div>
+          <script type="module" src="${args.root}"></script>
+        </body>
+      </html>
+  `;
+
+   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);
+
+   if (express) {
+      express(app)
+   }
+
+   app.get('*', async (req, res, next) => {
+      const url = req.originalUrl;
+      try {
+         template = await vite.transformIndexHtml(url, template);
+         res.status(200).set({
+            'Content-Type': 'text/html'
+         }).end(template);
+      } catch (e) {
+         vite.ssrFixStacktrace(e);
+         next(e);
+      }
+   });
+
+   let server = app.listen(args.port, () => {
+      figlet("Make Pack", function (err, data) {
+         if (err) {
+            console.log("Something went wrong...");
+            console.dir(err);
+            server.close(() => {
+               console.log('Server has been stopped.');
+            });
+            process.exit()
+         }
+         console.log(data);
+         logger.success(`Server is running on ${chalk.blue(chalk.underline(`http://localhost:${args.port}`))}`);
+      });
+   });
+
+   app.use((err, req, res, next) => {
+      logger.error(`Unhandled Error: ${err.message}`);
+      res.status(500).send('Internal Server Error');
+   });
+}
+
 export default serve