balm-core 3.26.2 → 3.27.0

package/lib/utilities/replacestream.js

@@ -1,66 +1,53 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _escapeStringRegexp = _interopRequireDefault(require("./escape-string-regexp"));
-
 function createReplaceFn(replace, isRegEx) {
   function regexReplaceFunction() {
-    var newReplace = replace; // ability to us $1 with captures
+    var newReplace = replace;
+
+    // ability to us $1 with captures
     // Start at 1 and end at length - 2 to avoid the match parameter and offset
     // And string parameters
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     var paramLength = [].concat(args).length - 2;
-
     for (var i = 1; i < paramLength; i++) {
       newReplace = newReplace.replace(new RegExp("\\$".concat(i), 'g'), [].concat(args)[i] || '');
     }
-
     return newReplace;
   }
-
   if (!(replace instanceof Function)) {
     return isRegEx ? regexReplaceFunction : function () {
       return replace;
     };
   }
-
   return replace;
 }
-
 function matchFromRegex(regex, options) {
   if (options.regExpFlags) {
     regex = new RegExp(regex.source, options.regExpFlags);
-  } // If there is no global flag then there can only be one match
-
+  }
 
+  // If there is no global flag then there can only be one match
   if (!regex.global) {
     options.limit = 1;
   }
-
   return regex;
 }
-
 function matchFromString(str, options) {
   if (options.regExpFlags) {
     return new RegExp((0, _escapeStringRegexp["default"])(str), options.regExpFlags);
   }
-
   return new RegExp((0, _escapeStringRegexp["default"])(str), options.ignoreCase ? 'gmi' : 'gm');
 }
-
 function replaceStream(search, replace, opts) {
   var readableStream = require('readable-stream');
-
   var options = Object.assign({
     limit: Infinity,
     encoding: 'utf8',
@@ -71,33 +58,27 @@ function replaceStream(search, replace, opts) {
   var isRegex = search instanceof RegExp;
   var replaceFn = createReplaceFn(replace, isRegex);
   var match;
-
   if (isRegex) {
     match = matchFromRegex(search, options);
   } else {
     match = matchFromString(search, options);
     options.maxMatchLen = search.length;
   }
-
   function getDataToAppend(before, match) {
     var dataToAppend = before;
     totalMatches++;
     dataToAppend += isRegex ? replaceFn.apply(this, match.concat([match.index.toString(), match.input])) : replaceFn(match[0]);
     return dataToAppend;
   }
-
   function getDataToQueue(matchCount, haystack, rewritten, lastPos) {
     if (matchCount > 0) {
       if (haystack.length > tail.length) {
         return rewritten + haystack.slice(lastPos, haystack.length - tail.length);
       }
-
       return rewritten;
     }
-
     return haystack.slice(0, haystack.length - tail.length);
   }
-
   function transform(chunk, encoding, callback) {
     var matches;
     var lastPos = 0;
@@ -105,13 +86,11 @@ function replaceStream(search, replace, opts) {
     var rewritten = '';
     var haystack = "".concat(tail).concat(chunk.toString(options.encoding));
     tail = '';
-
     while (totalMatches < options.limit && (matches = match.exec(haystack)) !== null) {
       matchCount++;
       var before = haystack.slice(lastPos, matches.index);
       var regexMatch = matches;
       lastPos = matches.index + regexMatch[0].length;
-
       if (lastPos > haystack.length && regexMatch[0].length < options.maxMatchLen) {
         tail = regexMatch[0];
       } else {
@@ -119,25 +98,20 @@ function replaceStream(search, replace, opts) {
         rewritten += dataToAppend;
       }
     }
-
     if (tail.length < 1) tail = haystack.slice(lastPos).length > options.maxMatchLen ? haystack.slice(lastPos).slice(0 - options.maxMatchLen) : haystack.slice(lastPos);
     var dataToQueue = getDataToQueue(matchCount, haystack, rewritten, lastPos);
     callback(null, dataToQueue);
   }
-
   function flush(callback) {
     if (tail) {
       this.push(tail);
     }
-
     callback();
   }
-
   return new readableStream.Transform({
     transform: transform,
     flush: flush
   });
 }
-
 var _default = replaceStream;
 exports["default"] = _default;

package/lib/utilities/typeof.js

@@ -5,10 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var reTypeOf = /(?:^\[object\s(.*?)\]$)/;
-
 function getType(obj) {
   return Object.prototype.toString.call(obj).replace(reTypeOf, '$1').toLowerCase();
 }
-
 var _default = getType;
 exports["default"] = _default;

package/lib/utilities/utils.js

@@ -1,34 +1,27 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _typeof = _interopRequireDefault(require("./typeof"));
-
 function isString(str) {
   return (0, _typeof["default"])(str) === 'string';
 }
-
 function isObject(obj) {
   return (0, _typeof["default"])(obj) === 'object';
 }
-
 function isArray(arr) {
   return Array.isArray(arr);
 }
-
 function isFunction(fn) {
   var type = (0, _typeof["default"])(fn);
   return type === 'function' || type === 'generatorfunction';
-} // Deep merge two objects
-
+}
 
+// Deep merge two objects
 function deepMerge(target, source) {
   if (isObject(target) && isObject(source)) {
     Object.keys(source).forEach(function (key) {
@@ -36,17 +29,14 @@ function deepMerge(target, source) {
         if (!target[key]) {
           Object.assign(target, (0, _defineProperty2["default"])({}, key, {}));
         }
-
         deepMerge(target[key], source[key]);
       } else {
         Object.assign(target, (0, _defineProperty2["default"])({}, key, source[key]));
       }
     });
   }
-
   return target;
 }
-
 var _default = {
   getType: _typeof["default"],
   isString: isString,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "3.26.2",
+  "version": "3.27.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -43,7 +43,7 @@
     "ansi-colors": "^4.1.3",
     "async": "^3.2.4",
     "autoprefixer": "9",
-    "babel-loader": "^8.2.5",
+    "babel-loader": "8",
     "browser-sync": "^2.27.10",
     "connect-history-api-fallback": "^2.0.0",
     "css-loader": "5",
@@ -54,7 +54,7 @@
     "file-loader": "^6.2.0",
     "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
-    "gulp-load-plugins": "^2.0.7",
+    "gulp-load-plugins": "^2.0.8",
     "gulp-rev-all": "^3.0.0",
     "gulp-rev-delete-original": "^0.2.3",
     "gulp-size": "3",
@@ -83,23 +83,23 @@
     "readable-stream": "3",
     "replace-ext": "^2.0.0",
     "require-dir": "^1.2.0",
-    "rollup": "^2.68.0",
+    "rollup": "2",
     "rollup-plugin-terser": "^7.0.2",
     "sass": "1.39.2",
     "ssh2": "0.8.9",
     "strip-ansi": "6",
     "style-loader": "2",
-    "terser": "^5.14.2",
+    "terser": "^5.15.1",
     "terser-webpack-plugin": "4",
     "through2": "^4.0.2",
     "through2-concurrent": "^2.0.0",
-    "tslib": "^2.4.0",
+    "tslib": "^2.4.1",
     "url-loader": "^4.1.1",
     "vinyl-sourcemaps-apply": "^0.2.1",
     "webpack": "4",
-    "webpack-bundle-analyzer": "^4.5.0",
+    "webpack-bundle-analyzer": "^4.7.0",
     "webpack-dev-middleware": "3",
-    "webpack-hot-middleware": "^2.25.2",
+    "webpack-hot-middleware": "^2.25.3",
     "webpack-merge": "^5.8.0",
     "workbox-build": "^6.5.4"
   },
@@ -117,5 +117,5 @@
   "engines": {
     "node": ">=10.13.0"
   },
-  "gitHead": "234b36e71614347fa6357dbd0c69b38a7823b0c7"
+  "gitHead": "3c686da4cd110e6984debbd6c1708a3d9de66d27"
 }

package/tslib/bundler/esbuild/transform.js

@@ -12,34 +12,41 @@ const esTransform = (entryPoints, output, customTransformOptions, callback) => {
         : {};
     const options = Object.assign(transformOptions, BalmJS.config.scripts.transformOptions, customTransformOptions);
     (async () => {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
         try {
             try {
-                for (var entryPoints_1 = tslib_1.__asyncValues(entryPoints), entryPoints_1_1; entryPoints_1_1 = await entryPoints_1.next(), !entryPoints_1_1.done;) {
-                    const entryPoint = entryPoints_1_1.value;
-                    build.input = BalmJS.file.absPath(entryPoint);
-                    BalmJS.logger.debug('esbuild bundler - transform', {
-                        input: build.input,
-                        output: build.output
-                    }, {
-                        pre: true
-                    });
-                    const filename = entryPoint.split('/').pop();
-                    if (filename && fs_1.default.existsSync(build.input)) {
-                        const inputCode = fs_1.default.readFileSync(build.input, 'utf8');
-                        const result = await require('esbuild').transform(inputCode, options);
-                        fs_1.default.mkdirSync(build.output, { recursive: true });
-                        fs_1.default.writeFileSync(path.join(build.output, filename), result.code);
+                for (var _d = true, entryPoints_1 = tslib_1.__asyncValues(entryPoints), entryPoints_1_1; entryPoints_1_1 = await entryPoints_1.next(), _a = entryPoints_1_1.done, !_a;) {
+                    _c = entryPoints_1_1.value;
+                    _d = false;
+                    try {
+                        const entryPoint = _c;
+                        build.input = BalmJS.file.absPath(entryPoint);
+                        BalmJS.logger.debug('esbuild bundler - transform', {
+                            input: build.input,
+                            output: build.output
+                        }, {
+                            pre: true
+                        });
+                        const filename = entryPoint.split('/').pop();
+                        if (filename && fs_1.default.existsSync(build.input)) {
+                            const inputCode = fs_1.default.readFileSync(build.input, 'utf8');
+                            const result = await require('esbuild').transform(inputCode, options);
+                            fs_1.default.mkdirSync(build.output, { recursive: true });
+                            fs_1.default.writeFileSync(path.join(build.output, filename), result.code);
+                        }
+                        else {
+                            BalmJS.logger.warn('esbuild', `Invalid entry point: ${entryPoint}`);
+                        }
                     }
-                    else {
-                        BalmJS.logger.warn('esbuild', `Invalid entry point: ${entryPoint}`);
+                    finally {
+                        _d = true;
                     }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (entryPoints_1_1 && !entryPoints_1_1.done && (_a = entryPoints_1.return)) await _a.call(entryPoints_1);
+                    if (!_d && !_a && (_b = entryPoints_1.return)) await _b.call(entryPoints_1);
                 }
                 finally { if (e_1) throw e_1.error; }
             }

package/tslib/bundler/rollup/index.js

@@ -5,7 +5,7 @@ const entry_1 = tslib_1.__importDefault(require("./entry"));
 const output_1 = tslib_1.__importDefault(require("./output"));
 const build_1 = tslib_1.__importDefault(require("./build"));
 const buildLibrary = async (inputOptions, outputOptions) => {
-    var e_1, _a;
+    var _a, e_1, _b, _c;
     const rollup = require('rollup');
     inputOptions = (0, entry_1.default)(inputOptions);
     outputOptions = (0, output_1.default)(outputOptions);
@@ -15,15 +15,22 @@ const buildLibrary = async (inputOptions, outputOptions) => {
     const bundle = await rollup.rollup(rollupOptions);
     if (Array.isArray(outputOptions)) {
         try {
-            for (var outputOptions_1 = tslib_1.__asyncValues(outputOptions), outputOptions_1_1; outputOptions_1_1 = await outputOptions_1.next(), !outputOptions_1_1.done;) {
-                const outputOption = outputOptions_1_1.value;
-                await (0, build_1.default)(bundle, outputOption);
+            for (var _d = true, outputOptions_1 = tslib_1.__asyncValues(outputOptions), outputOptions_1_1; outputOptions_1_1 = await outputOptions_1.next(), _a = outputOptions_1_1.done, !_a;) {
+                _c = outputOptions_1_1.value;
+                _d = false;
+                try {
+                    const outputOption = _c;
+                    await (0, build_1.default)(bundle, outputOption);
+                }
+                finally {
+                    _d = true;
+                }
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (outputOptions_1_1 && !outputOptions_1_1.done && (_a = outputOptions_1.return)) await _a.call(outputOptions_1);
+                if (!_d && !_a && (_b = outputOptions_1.return)) await _b.call(outputOptions_1);
             }
             finally { if (e_1) throw e_1.error; }
         }