makepack 1.4.0 → 1.5.1

package/src/actions/create/makeFiles.js

@@ -1,64 +1,64 @@
-// import makepack from "./files/makepack.js";
-import packageJson from "./files/package-json.js";
-import gitignore from "./files/gitignore.js";
-import serve from "./files/serve.js";
-import tsconfig from "./files/tsconfig.js";
-import projectJs from "./files/project-js.js";
-import projectJsx from "./files/project-jsx.js";
-import projectTs from "./files/project-ts.js";
-import projectTsx from "./files/project-tsx.js";
-
-import inquirer from 'inquirer'
-import fs from "fs-extra"
-import path from "path"
-import readmeMd from "./files/readme.md.js";
-
-export default async (args) => {
-   const files = [
-      packageJson(args),
-      gitignore(args),
-      serve(args),
-      readmeMd(args)
-   ];
-
-   switch (args.template) {
-      case "typescript":
-         files.push(projectTs(args))
-         break
-      case "react with typescript":
-         files.push(projectTsx(args))
-         break;
-      case "javascript":
-         files.push(projectJs(args))
-         break
-      case "react with javascript":
-         files.push(projectJsx(args))
-         break;
-   }
-
-   // push ts config
-   if (args.template.includes("typescript")) {
-      files.push(tsconfig(args))
-   }
-
-   for (let file of files) {
-      // check if the file exists
-      if (fs.existsSync(path.join(args.cwd, file.filename))) {
-         const { overwrite } = await inquirer.prompt([
-            {
-               type: "confirm",
-               name: 'overwrite',
-               message: `The file ${file.filename} already exists, do you want to overwrite it?`,
-               default: true
-            }
-         ])
-         if (!overwrite) {
-            continue
-         } else {
-            fs.removeSync(path.join(args.cwd, file.filename))
-         }
-      }
-
-      fs.writeFileSync(path.join(args.cwd, file.filename), file.content)
-   }
-}
+// import makepack from "./files/makepack.js";
+import packageJson from "./files/package-json.js";
+import gitignore from "./files/gitignore.js";
+import App from "./files/App.js";
+import tsconfig from "./files/tsconfig.js";
+import projectJs from "./files/project-js.js";
+import projectJsx from "./files/project-jsx.js";
+import projectTs from "./files/project-ts.js";
+import projectTsx from "./files/project-tsx.js";
+
+import inquirer from 'inquirer'
+import fs from "fs-extra"
+import path from "path"
+import readmeMd from "./files/readme.md.js";
+
+export default async (info) => {
+   const files = [
+      await packageJson(info),
+      await gitignore(info),
+      await App(info),
+      await readmeMd(info)
+   ];
+
+   switch (info.template) {
+      case "typescript":
+         files.push(await projectTs(info))
+         break
+      case "react with typescript":
+         files.push(await projectTsx(info))
+         break;
+      case "javascript":
+         files.push(await projectJs(info))
+         break
+      case "react with javascript":
+         files.push(await projectJsx(info))
+         break;
+   }
+
+   // push ts config
+   if (info.template.includes("typescript")) {
+      files.push(await tsconfig(info))
+   }
+
+   for (let file of files) {
+      // check if the file exists
+      if (fs.existsSync(path.join(info.cwd, file.filename))) {
+         const { overwrite } = await inquirer.prompt([
+            {
+               type: "confirm",
+               name: 'overwrite',
+               message: `The file ${file.filename} already exists, do you want to overwrite it?`,
+               default: true
+            }
+         ])
+         if (!overwrite) {
+            continue
+         } else {
+            fs.removeSync(path.join(info.cwd, file.filename))
+         }
+      }
+
+      fs.writeFileSync(path.join(info.cwd, file.filename), file.content)
+   }
+}

package/src/actions/publish/index.js

@@ -0,0 +1,19 @@
+import path from 'path'
+import { execSync, logger } from '../../helpers.js'
+import makepackConfig from '../../makepack-config.js'
+
+const publish = async () => {
+   const { build } = await makepackConfig()
+   const buildDir = path.join(process.cwd(), build.outdir)
+   const exists = fs.existsSync(buildDir)
+   if (!exists) {
+      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: path.join(process.cwd(), build.outdir)
+   })
+}
+
+export default publish

package/src/actions/{serve → start}/index.js

@@ -1,97 +1,92 @@
-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
+import fs from 'fs-extra'
+import path from 'path'
+import { createServer as createViteServer } from 'vite';
+import express from 'express';
+import react from '@vitejs/plugin-react'
+import { logger } from '../../helpers.js'
+import chalk from 'chalk';
+import figlet from 'figlet';
+import makepackConfig from '../../makepack-config.js';
+
+const app = express();
+
+const start = async (args) => {
+   const config = await makepackConfig()
+   const exists = fs.existsSync(path.join(process.cwd(), config.start.entry))
+   if (!exists) {
+      logger.error(`Entry file ${entry} does not exist. please check your config file`)
+      process.exit(1)
+   }
+
+   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="${config.start.entry}"></script>
+        </body>
+      </html>
+  `;
+
+   const viteConfig = {
+      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'
+   }
+
+   const vite = await createViteServer(viteConfig);
+   app.use(vite.middlewares);
+
+   if (config.start.express) {
+      config.start.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(config.start.port, () => {
+      figlet("Makepack", 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:${config.start.port}`))}`);
+      });
+   });
+
+   app.use((err, req, res) => {
+      logger.error(`Unhandled Error: ${err.message}`);
+      res.status(500).send('Internal Server Error');
+   });
+}
+
+export default start

package/src/helpers.js

@@ -1,122 +1,37 @@
-import child_process from 'child_process'
-import chalk from 'chalk';
-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 = "") => {
-   const spinner = ['|', '/', '-', '\\'];
-   let i = 0;
-   const interval = setInterval(() => {
-      process.stdout.write(`\r${message} ${spinner[i]}`);
-      i = (i + 1) % spinner.length;
-   }, 100);
-
-   return {
-      stop: (msg) => {
-         clearInterval(interval);
-         !!msg && console.log(`\r${msg}`);
-         process.stdout.write(`\r`);
-      }
-   }
-}
-
-export const execSync = (command, option = {}) => {
-   try {
-      const result = child_process.execSync(command, {
-         encoding: "utf-8",
-         stdio: 'inherit',
-         ...option
-      });
-      result && console.log(result);
-   } catch (error) {
-      console.error(`Command failed: ${error.message}`);
-      process.exit(1);
-   }
-};
-
-
-
-export const logger = {
-   info: (message, prefix = 'INFO', icon = true) => {
-      console.log(`${icon ? chalk.blue(figures.info) + " " : ""}${chalk.cyan.bold(prefix)} ${message}`);
-   },
-   success: (message, prefix = 'SUCCESS:', icon = true) => {
-      console.log(`${icon ? chalk.green(figures.tick) + " " : ""}${chalk.green.bold(prefix)} ${message}`);
-   },
-   warning: (message, prefix = 'WARNING:', icon = true) => {
-      console.log(`${icon ? chalk.yellow(figures.warning) + " " : ""}${chalk.yellow.bold(prefix)} ${message}`);
-   },
-   error: (message, prefix = 'ERROR:', icon = true) => {
-      console.log(`${icon ? chalk.red(figures.cross) + " " : ""}${chalk.red.bold(prefix)} ${message}`);
-   },
-   custom: (icon, color, label, message) => {
-      console.log(`${chalk[color](icon)} ${chalk[color].bold(`${label}:`)} ${message}`);
-   },
-};
-
-
-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(makepack).href)
-         const configFn = c.default
-         if (typeof configFn === 'function') {
-            return configFn(defaultConfig)
-         }
-      } catch (error) {
-         console.log(error);
-
-      }
-   }
-   return defaultConfig
-}
+import child_process from 'child_process'
+import chalk from 'chalk';
+import figures from 'figures';
+
+export const execSync = (command, option = {}) => {
+   try {
+      const result = child_process.execSync(command, {
+         encoding: "utf-8",
+         stdio: 'inherit',
+         ...option
+      });
+      result && console.log(result);
+   } catch (error) {
+      console.error(`Command failed: ${error.message}`);
+      process.exit(1);
+   }
+};
+
+
+
+export const logger = {
+   info: (message, prefix = 'INFO', icon = true) => {
+      console.log(`${icon ? chalk.blue(figures.info) + " " : ""}${chalk.cyan.bold(prefix)} ${message}`);
+   },
+   success: (message, prefix = 'SUCCESS:', icon = true) => {
+      console.log(`${icon ? chalk.green(figures.tick) + " " : ""}${chalk.green.bold(prefix)} ${message}`);
+   },
+   warning: (message, prefix = 'WARNING:', icon = true) => {
+      console.log(`${icon ? chalk.yellow(figures.warning) + " " : ""}${chalk.yellow.bold(prefix)} ${message}`);
+   },
+   error: (message, prefix = 'ERROR:', icon = true) => {
+      console.log(`${icon ? chalk.red(figures.cross) + " " : ""}${chalk.red.bold(prefix)} ${message}`);
+   },
+   custom: (icon, color, label, message) => {
+      console.log(`${chalk[color](icon)} ${chalk[color].bold(`${label}:`)} ${message}`);
+   },
+};

package/src/index.js

@@ -1,30 +1,33 @@
-#!/usr/bin/env node
-
-import { Command } from "commander";
-import serve from "./actions/serve/index.js";
-import pack from "./actions/pack/index.js";
-import create from "./actions/create/index.js";
-
-const program = new Command();
-
-program.name("Make Pack").description("Usages");
-
-program
-   .command("create")
-   .description("create a new project")
-   .action(create);
-
-program
-   .command("serve")
-   .option("-p, --port <number>", "Port number", "5000")
-   .option("-r, --root <file>", "root file")
-   .description("Start the server")
-   .action(serve);
-
-program
-   .command("pack")
-   .option("-e, --entry <file>", "Entry file or directory (you can use a glob pattern)", "src/**/*.{tsx,ts,js,jsx}")
-   .option("-p, --publish", "Publish the project to the npm repository", false)
-   .description("Build the project and optionally publish it to the npm repository")
-   .action(pack);
-program.parse();
+#!/usr/bin/env node
+
+import { Command } from "commander";
+import start from "./actions/start/index.js";
+import build from "./actions/build/index.js";
+import create from "./actions/create/index.js";
+import publish from "./actions/publish/index.js";
+
+const program = new Command();
+
+program.name("Makepack").description("Usages");
+
+program
+   .command("create")
+   .description("create a new project")
+   .action(create);
+
+program
+   .command("start")
+   .description("Start the server")
+   .action(start);
+
+program
+   .command("build")
+   .description("Build the project")
+   .action(build);
+
+program
+   .command("publish")
+   .description("Publish it to the npm repository")
+   .action(publish);
+
+program.parse();

package/src/makepack-config.js

@@ -0,0 +1,66 @@
+import path from 'path'
+import fs from 'fs-extra'
+import { pathToFileURL } from 'url';
+
+const makepackConfig = async () => {
+   const makepack = path.resolve(process.cwd(), "makepack.js");
+
+   const defaultConfig = {
+      build: {
+         outdir: "build",
+         types: true,
+         formatPackageJson: (p) => p,
+         configs: [
+            {
+               entryPoints: "src/**/*.{tsx,ts,js,jsx}",
+               outdir: "",
+               format: "esm",
+               sourcemap: true,
+               minify: true,
+               jsx: 'automatic',
+               loader: {
+                  '.ts': 'ts',
+                  '.tsx': 'tsx'
+               },
+            },
+            {
+               entryPoints: "src/**/*.{tsx,ts,js,jsx}",
+               outdir: "cjs",
+               format: "cjs",
+               sourcemap: true,
+               minify: true,
+               jsx: 'automatic',
+               loader: {
+                  '.ts': 'ts',
+                  '.tsx': 'tsx'
+               },
+            }
+         ]
+      },
+      start: {
+         port: 5000,
+         entry: "App.tsx",
+         express: (_app) => { }
+      }
+   }
+
+   if (fs.existsSync(makepack)) {
+      try {
+         const c = await import(pathToFileURL(makepack).href)
+         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
+         }
+      } catch (error) {
+         console.log(error);
+      }
+   }
+   return defaultConfig
+}
+
+export default makepackConfig

package/src/actions/create/files/makepack.js

@@ -1,19 +0,0 @@
-export default (args) => {
-   const makepack = {
-      "template": `${args.template}`,
-      "serve": {
-         "port": 3000,
-         "entry": `${args.rootdir}/${args.entry}`
-      },
-      "build": {
-         "entry": `${args.rootdir}/**/*.{tsx,ts,js,jsx}`,
-         "outdir": `${args.outdir}`,
-         "esbuild": {
-         }
-      },
-   }
-   return {
-      content: `const makepack = ${JSON.stringify(makepack, null, 2)}\nexport default makepack\n`,
-      filename: "makepack.js"
-   }
-}