@tmbr/bundler 1.1.0 → 1.2.0

package/cli.js

@@ -3,8 +3,8 @@ const esbuild = require('esbuild');
 const path = require('path');
 const exec = require('child_process').execSync;
 const styles = require('esbuild-sass-plugin').sassPlugin;
-const qrcode = require('qrcode-terminal');
 const chalk = require('chalk');
+const qr = require('qrcode-terminal');
 const bs = require('browser-sync').create();
 const renderError = require('./error');
 
@@ -20,6 +20,50 @@ if (!['build', 'watch'].includes(command)) {
 
 exec(`rm -rf ${cwd}/build/*`);
 
+/* const logger = (options = {}) => ({
+  name: 'logger',
+  setup(build) {
+
+    let info;
+    // const cache = new Map;
+
+    function reset() {
+      console.clear();
+      info.external && console.log(info.qrcode);
+      console.log(`Proxying: ${chalk.green(info.proxying)}`);
+      console.log(`External: ${chalk.cyan(info.external || 'offline')}`);
+    }
+
+    build.onEnd(() => {
+
+      if (typeof info === 'undefined') {
+
+        const host = bs.getOption('proxy').get('target');
+        const port = bs.getOption('port');
+
+        info = {};
+        info.proxying = `${host}:${port}`;
+        info.external = bs.getOption('urls').get('external');
+
+        info.external && qr.generate(info.external, {small: true}, qrcode => {
+          info.qrcode = qrcode;
+          reset();
+        });
+
+        return;
+      }
+
+      error = result.errors[0];
+
+      if (error) {
+        bs.reload();
+      } else {
+        reset();
+      }
+    });
+  }
+}); */
+
 const assets = (options = {}) => ({
   name: 'assets',
   setup(build) {
@@ -33,6 +77,7 @@ const assets = (options = {}) => ({
 const errors = (options = {}) => ({
   name: 'errors',
   setup(build) {
+
     build.onEnd(result => {
       error = result.errors[0];
       error && bs.reload();
@@ -42,7 +87,7 @@ const errors = (options = {}) => ({
 
 function entryPoints(suffix = '') {
 
-  if (!suffix.startsWith('.')) {
+  if (suffix.length && !suffix.startsWith('.')) {
     suffix = `.${suffix}`;
   }
 
@@ -126,9 +171,13 @@ if (command === 'watch') {
     const port = bs.getOption('port');
     const proxying = `${host}:${port}`;
     const external = bs.getOption('urls').get('external');
+    external && qr.generate(external, {small: true}, console.log);
 
-    external && qrcode.generate(external, {small: true}, console.log);
     console.log(`Proxying: ${chalk.green(proxying)}`);
     console.log(`External: ${chalk.cyan(external || 'offline')}`);
   });
 }
+
+process.on('SIGINT', () => {
+  process.exit();
+})

package/error.js

@@ -7,18 +7,21 @@ module.exports = error => {
 
     const lines = fs.readFileSync(file, 'UTF-8').split(/\r?\n/);
     const index = line - 1;
-    const space = ' ';
-
     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.repeat(2 + inset)}| </span>${space.repeat(column ? column - 1 : 0)}<span class="c-red fw-700">^</span>`,
+        ` <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');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tmbr/bundler",
   "author": "TMBR (https://wearetmbr.com/)",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "MIT",
   "repository": "https://github.com/TMBR/tmbr-bundler",
   "description": "WordPress development toolkit built on esbuild and browser-sync",
@@ -11,8 +11,8 @@
   "dependencies": {
     "browser-sync": "^2.27.5",
     "chalk": "^4.1.2",
-    "esbuild": "^0.13.12",
-    "esbuild-sass-plugin": "^1.5.2",
+    "esbuild": "^0.14.14",
+    "esbuild-sass-plugin": "^2.2.1",
     "html-entities": "^2.3.2",
     "qrcode-terminal": "^0.12.0"
   }