makepack 1.5.20 → 1.5.22

package/src/actions/start/index.js

@@ -1,77 +1,77 @@
-import fs from 'fs-extra'
-import path from 'path'
-import { logger } from '../../helpers.js'
-import makepackConfig from '../../makepack-config.js';
-import esbuild from 'esbuild';
-import chokidar from 'chokidar';
-import { fileURLToPath } from 'url';
-import { spawn } from 'child_process';
-let __filename, __dirname;
-
-if (typeof import.meta.url !== 'undefined') {
-   __filename = fileURLToPath(import.meta.url);
-   __dirname = path.dirname(__filename);
-} else {
-   __filename = __filename;
-   __dirname = __dirname;
-}
-
-let server = null;
-function startServer() {
-   if (server) {
-      server.kill('SIGINT');
-      server = null;
-   }
-   server = spawn('node', [path.resolve(__dirname, 'express.js')], {});
-   server.stdout.on('data', (data) => {
-      console.log(data.toString().trim());
-   });
-   server.stderr.on('data', (data) => {
-      console.error(data.toString().trim());
-   });
-}
-
-const start = async () => {
-   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)
-   }
-
-   const expressjs = path.join(process.cwd(), 'express.js')
-   const expressts = path.join(process.cwd(), 'express.ts')
-
-   if (fs.existsSync(expressjs) || fs.existsSync(expressts)) {
-      let filename = fs.existsSync(expressjs) ? "express.js" : "express.ts";
-      let outfile = path.resolve(__dirname, 'user-express.js')
-
-      const ctx = await esbuild.context({
-         entryPoints: [filename],
-         outfile: path.resolve(__dirname, 'user-express.js'),
-         bundle: true,
-         format: 'esm',
-         platform: 'node',
-         external: ['*'],
-      })
-
-      ctx.watch()
-
-      const watcher = chokidar.watch(outfile, {
-         persistent: true,
-         ignoreInitial: true,
-      });
-
-      watcher.on('change', async () => {
-         startServer(config)
-      });
-
-      process.on('SIGINT', async () => {
-         watcher.close();
-         process.exit(0);
-      });
-   }
-   startServer(config)
-}
-
+import fs from 'fs-extra'
+import path from 'path'
+import { logger } from '../../helpers.js'
+import makepackConfig from '../../makepack-config.js';
+import esbuild from 'esbuild';
+import chokidar from 'chokidar';
+import { fileURLToPath } from 'url';
+import { spawn } from 'child_process';
+let __filename, __dirname;
+
+if (typeof import.meta.url !== 'undefined') {
+   __filename = fileURLToPath(import.meta.url);
+   __dirname = path.dirname(__filename);
+} else {
+   __filename = __filename;
+   __dirname = __dirname;
+}
+
+let server = null;
+function startServer() {
+   if (server) {
+      server.kill('SIGINT');
+      server = null;
+   }
+   server = spawn('node', [path.resolve(__dirname, 'express.js')], {});
+   server.stdout.on('data', (data) => {
+      console.log(data.toString().trim());
+   });
+   server.stderr.on('data', (data) => {
+      console.error(data.toString().trim());
+   });
+}
+
+const start = async () => {
+   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)
+   }
+
+   const expressjs = path.join(process.cwd(), 'express.js')
+   const expressts = path.join(process.cwd(), 'express.ts')
+
+   if (fs.existsSync(expressjs) || fs.existsSync(expressts)) {
+      let filename = fs.existsSync(expressjs) ? "express.js" : "express.ts";
+      let outfile = path.resolve(__dirname, 'user-express.js')
+
+      const ctx = await esbuild.context({
+         entryPoints: [filename],
+         outfile: path.resolve(__dirname, 'user-express.js'),
+         bundle: true,
+         format: 'esm',
+         platform: 'node',
+         packages: 'external',
+      })
+
+      ctx.watch()
+
+      const watcher = chokidar.watch(outfile, {
+         persistent: true,
+         ignoreInitial: true,
+      });
+
+      watcher.on('change', async () => {
+         startServer(config)
+      });
+
+      process.on('SIGINT', async () => {
+         watcher.close();
+         process.exit(0);
+      });
+   }
+   startServer(config)
+}
+
 export default start

package/src/actions/start/vite.js

@@ -1,57 +1,57 @@
-// import react from '@vitejs/plugin-react'
-import { createServer as createViteServer } from 'vite';
-import { logger } from '../../helpers.js'
-import makepackConfig from '../../makepack-config.js';
-
-const viteSetup = async (app) => {
-   const config = await makepackConfig()
-   const viteConfig = {
-      root: process.cwd(),
-      base: "/",
-      // 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);
-
-   app.get('*', async (req, res, next) => {
-      const url = req.originalUrl;
-
-      try {
-         let template = await vite.transformIndexHtml(url, `
-            <!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>
-        `);
-
-         res.status(200).set({
-            'Content-Type': 'text/html'
-         }).end(template);
-      } catch (e) {
-         vite.ssrFixStacktrace(e);
-         next(e);
-      }
-   });
-}
-
-
+// import react from '@vitejs/plugin-react'
+import { createServer as createViteServer } from 'vite';
+import { logger } from '../../helpers.js'
+import makepackConfig from '../../makepack-config.js';
+
+const viteSetup = async (app) => {
+   const config = await makepackConfig()
+   const viteConfig = {
+      root: process.cwd(),
+      base: "/",
+      // 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);
+
+   app.get('*', async (req, res, next) => {
+      const url = req.originalUrl;
+
+      try {
+         let template = await vite.transformIndexHtml(url, `
+            <!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>
+        `);
+
+         res.status(200).set({
+            'Content-Type': 'text/html'
+         }).end(template);
+      } catch (e) {
+         vite.ssrFixStacktrace(e);
+         next(e);
+      }
+   });
+}
+
+
 export default viteSetup

package/src/helpers.js

@@ -1,37 +1,37 @@
-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}`);
-   },
+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,33 +1,33 @@
-#!/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();
+#!/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

@@ -1,59 +1,59 @@
-import { cosmiconfig } from "cosmiconfig";
-
-const makepackConfig = async () => {
-   const explorer = cosmiconfig("makepack");
-   const configResult = await explorer.search();
-
-   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",
-      }
-   }
-
-   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)
-         }
-         return userConfig
-      }
-   }
-   return defaultConfig
-}
-
+import { cosmiconfig } from "cosmiconfig";
+
+const makepackConfig = async () => {
+   const explorer = cosmiconfig("makepack");
+   const configResult = await explorer.search();
+
+   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",
+      }
+   }
+
+   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)
+         }
+         return userConfig
+      }
+   }
+   return defaultConfig
+}
+
 export default makepackConfig