@tmbr/bundler 1.4.1 → 1.5.1

package/cli.js

@@ -2,43 +2,33 @@
 const esbuild = require('esbuild');
 const path = require('path');
 const exec = require('child_process').execSync;
+const chalk = require('chalk');
 const styles = require('esbuild-sass-plugin').sassPlugin;
 const qrcode = require('qrcode-terminal');
-const chalk = require('chalk');
-const bs = require('browser-sync').create();
-const renderError = require('./error');
+const server = require('browser-sync').create();
 
-const cwd = process.cwd();
-const package = require(`${cwd}/package.json`);
+const dir = process.cwd();
+const package = require(`${dir}/package.json`);
 const command = process.argv[2];
-let error;
 
 if (!['build', 'watch'].includes(command)) {
   console.log(`Invalid command: ${chalk.red(command)}\n`);
   process.exit();
 }
 
-exec(`rm -rf ${cwd}/build/*`);
+exec(`rm -rf ${dir}/build/*`);
 
-const assets = (options = {}) => ({
-  name: 'assets',
-  setup(build) {
-    build.onResolve({filter: /..\/(fonts|images)\//}, args => ({
-      path: args.path,
-      external: true
-    }))
-  },
-});
+function ok() {
+  const host = server.getOption('proxy').get('target');
+  const port = server.getOption('port');
+  const proxying = `${host}:${port}`;
+  const external = server.getOption('urls').get('external');
 
-const errors = (options = {}) => ({
-  name: 'errors',
-  setup(build) {
-    build.onEnd(result => {
-      error = result.errors[0];
-      error && bs.reload();
-    });
-  },
-});
+  console.clear();
+  external && qrcode.generate(external, {small: true}, console.log);
+  console.log(`Proxying: ${chalk.green(proxying)}`);
+  console.log(`External: ${chalk.cyan(external || 'offline')}\n`);
+}
 
 function entryPoints(suffix = '') {
 
@@ -47,8 +37,8 @@ function entryPoints(suffix = '') {
   }
 
   const entries = Object.entries({
-    admin: path.resolve(cwd, './src/admin'),
-    main: path.resolve(cwd, './src'),
+    admin: path.resolve(dir, './src/admin'),
+    main: path.resolve(dir, './src'),
   });
 
   return entries.reduce((result, [name, path]) => {
@@ -57,9 +47,28 @@ function entryPoints(suffix = '') {
   }, {});
 }
 
+const assets = (options = {}) => ({
+  name: 'assets',
+  setup(build) {
+    build.onResolve({filter: /..\/(assets|fonts|images)\//}, args => ({
+      path: args.path,
+      external: true
+    }))
+  },
+});
+
+const errors = (options = {}) => ({
+  name: 'errors',
+  setup(build) {
+    build.onEnd(({warnings, errors}) => {
+      (warnings.length || errors.length) ? console.log('\007') : ok();
+    });
+  },
+});
+
 const defaults = {
   watch: command === 'watch',
-  outdir: path.resolve(cwd, 'build'),
+  outdir: path.resolve(dir, 'build'),
   bundle: true,
   minify: true,
   sourcemap: false,
@@ -88,8 +97,9 @@ const buildConfig = Object.assign({}, defaults, {
   entryPoints: entryPoints('min'),
 });
 
-esbuild.build(watchConfig);
-esbuild.build(buildConfig);
+const noop = fn => fn;
+esbuild.build(watchConfig).catch(noop);
+esbuild.build(buildConfig).catch(noop);
 
 if (command === 'watch') {
 
@@ -103,15 +113,8 @@ if (command === 'watch') {
     '**/*.php'
   ];
 
-  const middleware = (proxyRes, req, res) => {
-    error && res.end(renderError(error));
-  };
-
   const options = {
-    proxy: {
-      target: `${package.name}.test`,
-      proxyRes: [middleware]
-    },
+    proxy: `${package.name}.test`,
     host: 'localhost',
     open: false,
     notify: false,
@@ -120,15 +123,5 @@ if (command === 'watch') {
     files
   };
 
-  bs.init(options, () => {
-
-    const host = bs.getOption('proxy').get('target');
-    const port = bs.getOption('port');
-    const proxying = `${host}:${port}`;
-    const external = bs.getOption('urls').get('external');
-
-    external && qrcode.generate(external, {small: true}, console.log);
-    console.log(`Proxying: ${chalk.green(proxying)}`);
-    console.log(`External: ${chalk.cyan(external || 'offline')}`);
-  });
+  server.init(options, ok);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tmbr/bundler",
   "author": "TMBR (https://wearetmbr.com/)",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "license": "MIT",
   "repository": "https://github.com/TMBR/tmbr-bundler",
   "description": "WordPress development toolkit built on esbuild and browser-sync",
@@ -13,7 +13,6 @@
     "chalk": "^4.1.2",
     "esbuild": "^0.15.5",
     "esbuild-sass-plugin": "^2.3.2",
-    "html-entities": "^2.3.3",
     "qrcode-terminal": "^0.12.0"
   }
 }

package/error.js

@@ -1,107 +0,0 @@
-const fs = require('fs');
-const encode = require('html-entities').encode;
-
-module.exports = error => {
-
-    const { file, line, column } = error.location;
-
-    const lines = fs.readFileSync(file, 'UTF-8').split(/\r?\n/);
-    const index = line - 1;
-    const inset = String((lines[index + 2] && line + 2) || (lines[index + 1] && line + 1) || line).split('').length;
-
-    const print = offset => (
-        `<span class="c-gray">${String(line + offset).padStart(2 + inset, ' ')} | </span>` + encode(lines[index + offset])
-    );
-
-    const space = length => {
-        return ' '.repeat(length);
-    };
-
-    const output = [
-        (index - 2) >= 0 && print(-2),
-        (index - 1) >= 0 && print(-1),
-        `<span class="c-red fw-700">&gt;</span><span class="c-gray"> ${line} | </span>${encode(lines[index])}`,
-        ` <span class="c-gray">${space(2 + inset)}| </span>${space(column ? column - 1 : 0)}<span class="c-red fw-700">^</span>`,
-        (index + 1) <= lines.length - 1 && print(1),
-        (index + 2) <= lines.length - 1 && print(2),
-    ].filter(Boolean).join('\n');
-
-    return /* html */`
-<!DOCTYPE html>
-<html>
-<head>
-
-    <meta charset="UTF-8">
-    <meta content="width=device-width, initial-scale=1.0" name="viewport">
-
-    <title>Build Error: ${file}</title>
-
-    <style>
-
-    * {
-        margin: 0;
-        padding: 0;
-        box-sizing: border-box;
-    }
-
-    .c-red    { color: #ff5555; }
-    .c-cyan   { color: #88ddff; }
-    .c-gray   { color: #666666; }
-    .fw-700   { font-weight: 700; }
-
-    ::selection {
-        background-color: rgba(95, 126, 151, 0.48);
-    }
-
-    html {
-        font: 1rem / 1.5 sans-serif;
-        color: #FFF;
-        background-color: #151515;
-    }
-    main {
-        max-width: 1280px;
-        margin: 3em auto;
-        padding: 1rem;
-    }
-    h1 {
-        font-size: 1.5rem;
-        line-height: 1.5;
-        margin-bottom: 0.25em;
-    }
-
-    .terminal {
-        color: #CCC;
-        border-radius: 0.25rem;
-    }
-    .terminal pre {
-        font-family: Menlo, Monaco, monospace;
-        overflow: scroll;
-    }
-    .terminal > * {
-        padding: 1rem 0;
-    }
-
-    </style>
-
-</head>
-<body>
-
-<main>
-
-    <h1>Build Error</h1>
-
-    <div class="terminal">
-
-<pre>
-<span class="c-cyan">${file}</span><span class="c-gray">:</span>${line}<span class="c-gray">:</span>${column}
-<span class="c-red fw-700">${error.text}</span>
-
-${output}
-</pre>
-
-    </div>
-
-</main>
-
-</body>
-</html>`};