vite 2.8.0-beta.3 → 2.8.0-beta.4

package/dist/node/chunks/{dep-a5ab6d86.js → dep-7b4d034a.js}

@@ -5358,7 +5358,7 @@ var toRegexRange_1 = toRegexRange$1;
  * Licensed under the MIT License.
  */
 
-const util$9 = require$$0__default$1;
+const util$6 = require$$0__default$1;
 const toRegexRange = toRegexRange_1;
 
 const isObject$1 = val => val !== null && typeof val === 'object' && !Array.isArray(val);
@@ -5463,7 +5463,7 @@ const toRegex = (start, end, options) => {
 };
 
 const rangeError = (...args) => {
-  return new RangeError('Invalid range arguments: ' + util$9.inspect(...args));
+  return new RangeError('Invalid range arguments: ' + util$6.inspect(...args));
 };
 
 const invalidRange = (start, end, options) => {
@@ -8376,7 +8376,7 @@ var picomatch_1 = picomatch$4;
 
 var picomatch$3 = picomatch_1;
 
-const util$8 = require$$0__default$1;
+const util$5 = require$$0__default$1;
 const braces$1 = braces_1;
 const picomatch$2 = picomatch$3;
 const utils$b = utils$f;
@@ -8563,7 +8563,7 @@ micromatch$1.not = (list, patterns, options = {}) => {
 
 micromatch$1.contains = (str, pattern, options) => {
   if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util$8.inspect(str)}"`);
+    throw new TypeError(`Expected a string: "${util$5.inspect(str)}"`);
   }
 
   if (Array.isArray(pattern)) {
@@ -8709,7 +8709,7 @@ micromatch$1.every = (list, patterns, options) => {
 
 micromatch$1.all = (str, patterns, options) => {
   if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util$8.inspect(str)}"`);
+    throw new TypeError(`Expected a string: "${util$5.inspect(str)}"`);
   }
 
   return [].concat(patterns).every(p => picomatch$2(p, options)(str));
@@ -18679,6 +18679,10 @@ function cssPostPlugin(config) {
             return null;
         },
         async generateBundle(opts, bundle) {
+            // @ts-ignore asset emits are skipped in legacy bundle
+            if (opts.__vite_skip_asset_emit__) {
+                return;
+            }
             // remove empty css chunks and their imports
             if (pureCssChunks.size) {
                 const emptyChunkFiles = [...pureCssChunks]
@@ -18853,7 +18857,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-84e12b4e.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-4ef300ce.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -19313,7 +19317,7 @@ var unicode = {
 	ID_Continue: ID_Continue
 };
 
-var util$7 = {
+var util$4 = {
     isSpaceSeparator (c) {
         return typeof c === 'string' && unicode.Space_Separator.test(c)
     },
@@ -19480,7 +19484,7 @@ const lexStates = {
             return newToken('eof')
         }
 
-        if (util$7.isSpaceSeparator(c)) {
+        if (util$4.isSpaceSeparator(c)) {
             read();
             return
         }
@@ -19647,7 +19651,7 @@ const lexStates = {
             break
 
         default:
-            if (!util$7.isIdStartChar(u)) {
+            if (!util$4.isIdStartChar(u)) {
                 throw invalidIdentifier()
             }
 
@@ -19673,7 +19677,7 @@ const lexStates = {
             return
         }
 
-        if (util$7.isIdContinueChar(c)) {
+        if (util$4.isIdContinueChar(c)) {
             buffer += read();
             return
         }
@@ -19696,7 +19700,7 @@ const lexStates = {
             break
 
         default:
-            if (!util$7.isIdContinueChar(u)) {
+            if (!util$4.isIdContinueChar(u)) {
                 throw invalidIdentifier()
             }
 
@@ -19783,7 +19787,7 @@ const lexStates = {
             return
         }
 
-        if (util$7.isDigit(c)) {
+        if (util$4.isDigit(c)) {
             buffer += read();
             return
         }
@@ -19792,7 +19796,7 @@ const lexStates = {
     },
 
     decimalPointLeading () {
-        if (util$7.isDigit(c)) {
+        if (util$4.isDigit(c)) {
             buffer += read();
             lexState = 'decimalFraction';
             return
@@ -19810,7 +19814,7 @@ const lexStates = {
             return
         }
 
-        if (util$7.isDigit(c)) {
+        if (util$4.isDigit(c)) {
             buffer += read();
             lexState = 'decimalFraction';
             return
@@ -19828,7 +19832,7 @@ const lexStates = {
             return
         }
 
-        if (util$7.isDigit(c)) {
+        if (util$4.isDigit(c)) {
             buffer += read();
             return
         }
@@ -19845,7 +19849,7 @@ const lexStates = {
             return
         }
 
-        if (util$7.isDigit(c)) {
+        if (util$4.isDigit(c)) {
             buffer += read();
             lexState = 'decimalExponentInteger';
             return
@@ -19855,7 +19859,7 @@ const lexStates = {
     },
 
     decimalExponentSign () {
-        if (util$7.isDigit(c)) {
+        if (util$4.isDigit(c)) {
             buffer += read();
             lexState = 'decimalExponentInteger';
             return
@@ -19865,7 +19869,7 @@ const lexStates = {
     },
 
     decimalExponentInteger () {
-        if (util$7.isDigit(c)) {
+        if (util$4.isDigit(c)) {
             buffer += read();
             return
         }
@@ -19874,7 +19878,7 @@ const lexStates = {
     },
 
     hexadecimal () {
-        if (util$7.isHexDigit(c)) {
+        if (util$4.isHexDigit(c)) {
             buffer += read();
             lexState = 'hexadecimalInteger';
             return
@@ -19884,7 +19888,7 @@ const lexStates = {
     },
 
     hexadecimalInteger () {
-        if (util$7.isHexDigit(c)) {
+        if (util$4.isHexDigit(c)) {
             buffer += read();
             return
         }
@@ -19970,7 +19974,7 @@ const lexStates = {
             return
         }
 
-        if (util$7.isIdStartChar(c)) {
+        if (util$4.isIdStartChar(c)) {
             buffer += read();
             lexState = 'identifierName';
             return
@@ -20080,7 +20084,7 @@ function escape$1 () {
 
     case '0':
         read();
-        if (util$7.isDigit(peek())) {
+        if (util$4.isDigit(peek())) {
             throw invalidChar(read())
         }
 
@@ -20130,14 +20134,14 @@ function hexEscape () {
     let buffer = '';
     let c = peek();
 
-    if (!util$7.isHexDigit(c)) {
+    if (!util$4.isHexDigit(c)) {
         throw invalidChar(read())
     }
 
     buffer += read();
 
     c = peek();
-    if (!util$7.isHexDigit(c)) {
+    if (!util$4.isHexDigit(c)) {
         throw invalidChar(read())
     }
 
@@ -20152,7 +20156,7 @@ function unicodeEscape () {
 
     while (count-- > 0) {
         const c = peek();
-        if (!util$7.isHexDigit(c)) {
+        if (!util$4.isHexDigit(c)) {
             throw invalidChar(read())
         }
 
@@ -20567,7 +20571,7 @@ var stringify = function stringify (value, replacer, space) {
                 continue
 
             case '\0':
-                if (util$7.isDigit(value[i + 1])) {
+                if (util$4.isDigit(value[i + 1])) {
                     product += '\\x00';
                     continue
                 }
@@ -20644,12 +20648,12 @@ var stringify = function stringify (value, replacer, space) {
         }
 
         const firstChar = String.fromCodePoint(key.codePointAt(0));
-        if (!util$7.isIdStartChar(firstChar)) {
+        if (!util$4.isIdStartChar(firstChar)) {
             return quoteString(key)
         }
 
         for (let i = firstChar.length; i < key.length; i++) {
-            if (!util$7.isIdContinueChar(String.fromCodePoint(key.codePointAt(i)))) {
+            if (!util$4.isIdContinueChar(String.fromCodePoint(key.codePointAt(i)))) {
                 return quoteString(key)
             }
         }
@@ -21276,7 +21280,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-6f0b746c.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-2451c479.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -22484,7 +22488,7 @@ const buildEsbuildPlugin = (config) => {
             const minify = config.build.minify === 'esbuild' &&
                 // Do not minify ES lib output since that would remove pure annotations
                 // and break tree-shaking
-                // https://github.com/vuejs/vue-next/issues/2860#issuecomment-926882793
+                // https://github.com/vuejs/core/issues/2860#issuecomment-926882793
                 !(config.build.lib && opts.format === 'es');
             if ((!target || target === 'esnext') && !minify) {
                 return null;
@@ -24758,10 +24762,10 @@ if (typeof Object.create === 'function') {
 }
 
 try {
-  var util$6 = require('util');
+  var util$3 = require('util');
   /* istanbul ignore next */
-  if (typeof util$6.inherits !== 'function') throw '';
-  inherits$1.exports = util$6.inherits;
+  if (typeof util$3.inherits !== 'function') throw '';
+  inherits$1.exports = util$3.inherits;
 } catch (e) {
   /* istanbul ignore next */
   inherits$1.exports = inherits_browser.exports;
@@ -35563,224 +35567,7 @@ function errorMiddleware(server, allowNext = false) {
     };
 }
 
-var sourceMapGenerator = {};
-
-var base64Vlq = {};
-
-var base64$1 = {};
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var intToCharMap = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
-
-/**
- * Encode an integer in the range of 0 to 63 to a single base 64 digit.
- */
-base64$1.encode = function (number) {
-  if (0 <= number && number < intToCharMap.length) {
-    return intToCharMap[number];
-  }
-  throw new TypeError("Must be between 0 and 63: " + number);
-};
-
-/**
- * Decode a single base 64 character code digit to an integer. Returns -1 on
- * failure.
- */
-base64$1.decode = function (charCode) {
-  var bigA = 65;     // 'A'
-  var bigZ = 90;     // 'Z'
-
-  var littleA = 97;  // 'a'
-  var littleZ = 122; // 'z'
-
-  var zero = 48;     // '0'
-  var nine = 57;     // '9'
-
-  var plus = 43;     // '+'
-  var slash = 47;    // '/'
-
-  var littleOffset = 26;
-  var numberOffset = 52;
-
-  // 0 - 25: ABCDEFGHIJKLMNOPQRSTUVWXYZ
-  if (bigA <= charCode && charCode <= bigZ) {
-    return (charCode - bigA);
-  }
-
-  // 26 - 51: abcdefghijklmnopqrstuvwxyz
-  if (littleA <= charCode && charCode <= littleZ) {
-    return (charCode - littleA + littleOffset);
-  }
-
-  // 52 - 61: 0123456789
-  if (zero <= charCode && charCode <= nine) {
-    return (charCode - zero + numberOffset);
-  }
-
-  // 62: +
-  if (charCode == plus) {
-    return 62;
-  }
-
-  // 63: /
-  if (charCode == slash) {
-    return 63;
-  }
-
-  // Invalid base64 digit.
-  return -1;
-};
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Based on the Base 64 VLQ implementation in Closure Compiler:
- * https://code.google.com/p/closure-compiler/source/browse/trunk/src/com/google/debugging/sourcemap/Base64VLQ.java
- *
- * Copyright 2011 The Closure Compiler Authors. All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above
- *    copyright notice, this list of conditions and the following
- *    disclaimer in the documentation and/or other materials provided
- *    with the distribution.
- *  * Neither the name of Google Inc. nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-var base64 = base64$1;
-
-// A single base 64 digit can contain 6 bits of data. For the base 64 variable
-// length quantities we use in the source map spec, the first bit is the sign,
-// the next four bits are the actual value, and the 6th bit is the
-// continuation bit. The continuation bit tells us whether there are more
-// digits in this value following this digit.
-//
-//   Continuation
-//   |    Sign
-//   |    |
-//   V    V
-//   101011
-
-var VLQ_BASE_SHIFT = 5;
-
-// binary: 100000
-var VLQ_BASE = 1 << VLQ_BASE_SHIFT;
-
-// binary: 011111
-var VLQ_BASE_MASK = VLQ_BASE - 1;
-
-// binary: 100000
-var VLQ_CONTINUATION_BIT = VLQ_BASE;
-
-/**
- * Converts from a two-complement value to a value where the sign bit is
- * placed in the least significant bit.  For example, as decimals:
- *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
- *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
- */
-function toVLQSigned(aValue) {
-  return aValue < 0
-    ? ((-aValue) << 1) + 1
-    : (aValue << 1) + 0;
-}
-
-/**
- * Converts to a two-complement value from a value where the sign bit is
- * placed in the least significant bit.  For example, as decimals:
- *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
- *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
- */
-function fromVLQSigned(aValue) {
-  var isNegative = (aValue & 1) === 1;
-  var shifted = aValue >> 1;
-  return isNegative
-    ? -shifted
-    : shifted;
-}
-
-/**
- * Returns the base 64 VLQ encoded value.
- */
-base64Vlq.encode = function base64VLQ_encode(aValue) {
-  var encoded = "";
-  var digit;
-
-  var vlq = toVLQSigned(aValue);
-
-  do {
-    digit = vlq & VLQ_BASE_MASK;
-    vlq >>>= VLQ_BASE_SHIFT;
-    if (vlq > 0) {
-      // There are still more digits in this value, so we must make sure the
-      // continuation bit is marked.
-      digit |= VLQ_CONTINUATION_BIT;
-    }
-    encoded += base64.encode(digit);
-  } while (vlq > 0);
-
-  return encoded;
-};
-
-/**
- * Decodes the next base 64 VLQ value from the given string and returns the
- * value and the rest of the string via the out parameter.
- */
-base64Vlq.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
-  var strLen = aStr.length;
-  var result = 0;
-  var shift = 0;
-  var continuation, digit;
-
-  do {
-    if (aIndex >= strLen) {
-      throw new Error("Expected more digits in base 64 VLQ value.");
-    }
-
-    digit = base64.decode(aStr.charCodeAt(aIndex++));
-    if (digit === -1) {
-      throw new Error("Invalid base64 digit: " + aStr.charAt(aIndex - 1));
-    }
-
-    continuation = !!(digit & VLQ_CONTINUATION_BIT);
-    digit &= VLQ_BASE_MASK;
-    result = result + (digit << shift);
-    shift += VLQ_BASE_SHIFT;
-  } while (continuation);
-
-  aOutParam.value = fromVLQSigned(result);
-  aOutParam.rest = aIndex;
-};
-
-var util$5 = {};
+var util$2 = {};
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
 
@@ -35852,6 +35639,43 @@ function urlGenerate(aParsedUrl) {
 }
 exports.urlGenerate = urlGenerate;
 
+var MAX_CACHED_INPUTS = 32;
+
+/**
+ * Takes some function `f(input) -> result` and returns a memoized version of
+ * `f`.
+ *
+ * We keep at most `MAX_CACHED_INPUTS` memoized results of `f` alive. The
+ * memoization is a dumb-simple, linear least-recently-used cache.
+ */
+function lruMemoize(f) {
+  var cache = [];
+
+  return function(input) {
+    for (var i = 0; i < cache.length; i++) {
+      if (cache[i].input === input) {
+        var temp = cache[0];
+        cache[0] = cache[i];
+        cache[i] = temp;
+        return cache[0].result;
+      }
+    }
+
+    var result = f(input);
+
+    cache.unshift({
+      input,
+      result,
+    });
+
+    if (cache.length > MAX_CACHED_INPUTS) {
+      cache.pop();
+    }
+
+    return result;
+  };
+}
+
 /**
  * Normalizes a path, or the path portion of a URL:
  *
@@ -35863,7 +35687,7 @@ exports.urlGenerate = urlGenerate;
  *
  * @param aPath The path or url to normalize.
  */
-function normalize(aPath) {
+var normalize = lruMemoize(function normalize(aPath) {
   var path = aPath;
   var url = urlParse(aPath);
   if (url) {
@@ -35873,8 +35697,25 @@ function normalize(aPath) {
     path = url.path;
   }
   var isAbsolute = exports.isAbsolute(path);
+  // Split the path into parts between `/` characters. This is much faster than
+  // using `.split(/\/+/g)`.
+  var parts = [];
+  var start = 0;
+  var i = 0;
+  while (true) {
+    start = i;
+    i = path.indexOf("/", start);
+    if (i === -1) {
+      parts.push(path.slice(start));
+      break;
+    } else {
+      parts.push(path.slice(start, i));
+      while (i < path.length && path[i] === "/") {
+        i++;
+      }
+    }
+  }
 
-  var parts = path.split(/\/+/);
   for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
     part = parts[i];
     if (part === '.') {
@@ -35905,7 +35746,7 @@ function normalize(aPath) {
     return urlGenerate(url);
   }
   return path;
-}
+});
 exports.normalize = normalize;
 
 /**
@@ -36117,6 +35958,33 @@ function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) {
 }
 exports.compareByOriginalPositions = compareByOriginalPositions;
 
+function compareByOriginalPositionsNoSource(mappingA, mappingB, onlyCompareOriginal) {
+  var cmp;
+
+  cmp = mappingA.originalLine - mappingB.originalLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  cmp = mappingA.originalColumn - mappingB.originalColumn;
+  if (cmp !== 0 || onlyCompareOriginal) {
+    return cmp;
+  }
+
+  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  cmp = mappingA.generatedLine - mappingB.generatedLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  return strcmp(mappingA.name, mappingB.name);
+}
+exports.compareByOriginalPositionsNoSource = compareByOriginalPositionsNoSource;
+
 /**
  * Comparator between two mappings with deflated source and name indices where
  * the generated positions are compared.
@@ -36156,6 +36024,31 @@ function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGene
 }
 exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated;
 
+function compareByGeneratedPositionsDeflatedNoLine(mappingA, mappingB, onlyCompareGenerated) {
+  var cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+  if (cmp !== 0 || onlyCompareGenerated) {
+    return cmp;
+  }
+
+  cmp = strcmp(mappingA.source, mappingB.source);
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  cmp = mappingA.originalLine - mappingB.originalLine;
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  cmp = mappingA.originalColumn - mappingB.originalColumn;
+  if (cmp !== 0) {
+    return cmp;
+  }
+
+  return strcmp(mappingA.name, mappingB.name);
+}
+exports.compareByGeneratedPositionsDeflatedNoLine = compareByGeneratedPositionsDeflatedNoLine;
+
 function strcmp(aStr1, aStr2) {
   if (aStr1 === aStr2) {
     return 0;
@@ -36272,7 +36165,124 @@ function computeSourceURL(sourceRoot, sourceURL, sourceMapURL) {
   return normalize(sourceURL);
 }
 exports.computeSourceURL = computeSourceURL;
-}(util$5));
+}(util$2));
+
+var binarySearch$1 = {};
+
+/* -*- Mode: js; js-indent-level: 2; -*- */
+
+(function (exports) {
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+exports.GREATEST_LOWER_BOUND = 1;
+exports.LEAST_UPPER_BOUND = 2;
+
+/**
+ * Recursive implementation of binary search.
+ *
+ * @param aLow Indices here and lower do not contain the needle.
+ * @param aHigh Indices here and higher do not contain the needle.
+ * @param aNeedle The element being searched for.
+ * @param aHaystack The non-empty array being searched.
+ * @param aCompare Function which takes two elements and returns -1, 0, or 1.
+ * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
+ *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
+ *     closest element that is smaller than or greater than the one we are
+ *     searching for, respectively, if the exact element cannot be found.
+ */
+function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) {
+  // This function terminates when one of the following is true:
+  //
+  //   1. We find the exact element we are looking for.
+  //
+  //   2. We did not find the exact element, but we can return the index of
+  //      the next-closest element.
+  //
+  //   3. We did not find the exact element, and there is no next-closest
+  //      element than the one we are searching for, so we return -1.
+  var mid = Math.floor((aHigh - aLow) / 2) + aLow;
+  var cmp = aCompare(aNeedle, aHaystack[mid], true);
+  if (cmp === 0) {
+    // Found the element we are looking for.
+    return mid;
+  }
+  else if (cmp > 0) {
+    // Our needle is greater than aHaystack[mid].
+    if (aHigh - mid > 1) {
+      // The element is in the upper half.
+      return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias);
+    }
+
+    // The exact needle element was not found in this haystack. Determine if
+    // we are in termination case (3) or (2) and return the appropriate thing.
+    if (aBias == exports.LEAST_UPPER_BOUND) {
+      return aHigh < aHaystack.length ? aHigh : -1;
+    } else {
+      return mid;
+    }
+  }
+  else {
+    // Our needle is less than aHaystack[mid].
+    if (mid - aLow > 1) {
+      // The element is in the lower half.
+      return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias);
+    }
+
+    // we are in termination case (3) or (2) and return the appropriate thing.
+    if (aBias == exports.LEAST_UPPER_BOUND) {
+      return mid;
+    } else {
+      return aLow < 0 ? -1 : aLow;
+    }
+  }
+}
+
+/**
+ * This is an implementation of binary search which will always try and return
+ * the index of the closest element if there is no exact hit. This is because
+ * mappings between original and generated line/col pairs are single points,
+ * and there is an implicit region between each of them, so a miss just means
+ * that you aren't on the very start of a region.
+ *
+ * @param aNeedle The element you are looking for.
+ * @param aHaystack The array that is being searched.
+ * @param aCompare A function which takes the needle and an element in the
+ *     array and returns -1, 0, or 1 depending on whether the needle is less
+ *     than, equal to, or greater than the element, respectively.
+ * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
+ *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
+ *     closest element that is smaller than or greater than the one we are
+ *     searching for, respectively, if the exact element cannot be found.
+ *     Defaults to 'binarySearch.GREATEST_LOWER_BOUND'.
+ */
+exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
+  if (aHaystack.length === 0) {
+    return -1;
+  }
+
+  var index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack,
+                              aCompare, aBias || exports.GREATEST_LOWER_BOUND);
+  if (index < 0) {
+    return -1;
+  }
+
+  // We have found either the exact element, or the next-closest element than
+  // the one we are searching for. However, there may be more than one such
+  // element. Make sure we always return the smallest of these.
+  while (index - 1 >= 0) {
+    if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) {
+      break;
+    }
+    --index;
+  }
+
+  return index;
+};
+}(binarySearch$1));
 
 var arraySet = {};
 
@@ -36284,7 +36294,7 @@ var arraySet = {};
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util$4 = util$5;
+var util$1 = util$2;
 var has = Object.prototype.hasOwnProperty;
 var hasNativeMap = typeof Map !== "undefined";
 
@@ -36294,7 +36304,7 @@ var hasNativeMap = typeof Map !== "undefined";
  * element is O(1). Removing elements from the set is not supported. Only
  * strings are supported for membership.
  */
-function ArraySet$2() {
+function ArraySet$1() {
   this._array = [];
   this._set = hasNativeMap ? new Map() : Object.create(null);
 }
@@ -36302,8 +36312,8 @@ function ArraySet$2() {
 /**
  * Static method for creating ArraySet instances from an existing array.
  */
-ArraySet$2.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
-  var set = new ArraySet$2();
+ArraySet$1.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
+  var set = new ArraySet$1();
   for (var i = 0, len = aArray.length; i < len; i++) {
     set.add(aArray[i], aAllowDuplicates);
   }
@@ -36316,7 +36326,7 @@ ArraySet$2.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
  *
  * @returns Number
  */
-ArraySet$2.prototype.size = function ArraySet_size() {
+ArraySet$1.prototype.size = function ArraySet_size() {
   return hasNativeMap ? this._set.size : Object.getOwnPropertyNames(this._set).length;
 };
 
@@ -36325,8 +36335,8 @@ ArraySet$2.prototype.size = function ArraySet_size() {
  *
  * @param String aStr
  */
-ArraySet$2.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
-  var sStr = hasNativeMap ? aStr : util$4.toSetString(aStr);
+ArraySet$1.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
+  var sStr = hasNativeMap ? aStr : util$1.toSetString(aStr);
   var isDuplicate = hasNativeMap ? this.has(aStr) : has.call(this._set, sStr);
   var idx = this._array.length;
   if (!isDuplicate || aAllowDuplicates) {
@@ -36346,11 +36356,11 @@ ArraySet$2.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
  *
  * @param String aStr
  */
-ArraySet$2.prototype.has = function ArraySet_has(aStr) {
+ArraySet$1.prototype.has = function ArraySet_has(aStr) {
   if (hasNativeMap) {
     return this._set.has(aStr);
   } else {
-    var sStr = util$4.toSetString(aStr);
+    var sStr = util$1.toSetString(aStr);
     return has.call(this._set, sStr);
   }
 };
@@ -36360,14 +36370,14 @@ ArraySet$2.prototype.has = function ArraySet_has(aStr) {
  *
  * @param String aStr
  */
-ArraySet$2.prototype.indexOf = function ArraySet_indexOf(aStr) {
+ArraySet$1.prototype.indexOf = function ArraySet_indexOf(aStr) {
   if (hasNativeMap) {
     var idx = this._set.get(aStr);
     if (idx >= 0) {
         return idx;
     }
   } else {
-    var sStr = util$4.toSetString(aStr);
+    var sStr = util$1.toSetString(aStr);
     if (has.call(this._set, sStr)) {
       return this._set[sStr];
     }
@@ -36381,7 +36391,7 @@ ArraySet$2.prototype.indexOf = function ArraySet_indexOf(aStr) {
  *
  * @param Number aIdx
  */
-ArraySet$2.prototype.at = function ArraySet_at(aIdx) {
+ArraySet$1.prototype.at = function ArraySet_at(aIdx) {
   if (aIdx >= 0 && aIdx < this._array.length) {
     return this._array[aIdx];
   }
@@ -36393,640 +36403,226 @@ ArraySet$2.prototype.at = function ArraySet_at(aIdx) {
  * indicated by indexOf). Note that this is a copy of the internal array used
  * for storing the members so that no one can mess with internal state.
  */
-ArraySet$2.prototype.toArray = function ArraySet_toArray() {
+ArraySet$1.prototype.toArray = function ArraySet_toArray() {
   return this._array.slice();
 };
 
-arraySet.ArraySet = ArraySet$2;
+arraySet.ArraySet = ArraySet$1;
 
-var mappingList = {};
+var base64Vlq = {};
+
+var base64$1 = {};
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
 
 /*
- * Copyright 2014 Mozilla Foundation and contributors
+ * Copyright 2011 Mozilla Foundation and contributors
  * Licensed under the New BSD license. See LICENSE or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util$3 = util$5;
-
-/**
- * Determine whether mappingB is after mappingA with respect to generated
- * position.
- */
-function generatedPositionAfter(mappingA, mappingB) {
-  // Optimized for most common case
-  var lineA = mappingA.generatedLine;
-  var lineB = mappingB.generatedLine;
-  var columnA = mappingA.generatedColumn;
-  var columnB = mappingB.generatedColumn;
-  return lineB > lineA || lineB == lineA && columnB >= columnA ||
-         util$3.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0;
-}
-
-/**
- * A data structure to provide a sorted view of accumulated mappings in a
- * performance conscious manner. It trades a neglibable overhead in general
- * case for a large speedup in case of mappings being added in order.
- */
-function MappingList$1() {
-  this._array = [];
-  this._sorted = true;
-  // Serves as infimum
-  this._last = {generatedLine: -1, generatedColumn: 0};
-}
-
-/**
- * Iterate through internal items. This method takes the same arguments that
- * `Array.prototype.forEach` takes.
- *
- * NOTE: The order of the mappings is NOT guaranteed.
- */
-MappingList$1.prototype.unsortedForEach =
-  function MappingList_forEach(aCallback, aThisArg) {
-    this._array.forEach(aCallback, aThisArg);
-  };
+var intToCharMap = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
 
 /**
- * Add the given source mapping.
- *
- * @param Object aMapping
+ * Encode an integer in the range of 0 to 63 to a single base 64 digit.
  */
-MappingList$1.prototype.add = function MappingList_add(aMapping) {
-  if (generatedPositionAfter(this._last, aMapping)) {
-    this._last = aMapping;
-    this._array.push(aMapping);
-  } else {
-    this._sorted = false;
-    this._array.push(aMapping);
+base64$1.encode = function (number) {
+  if (0 <= number && number < intToCharMap.length) {
+    return intToCharMap[number];
   }
+  throw new TypeError("Must be between 0 and 63: " + number);
 };
 
 /**
- * Returns the flat, sorted array of mappings. The mappings are sorted by
- * generated position.
- *
- * WARNING: This method returns internal data without copying, for
- * performance. The return value must NOT be mutated, and should be treated as
- * an immutable borrow. If you want to take ownership, you must make your own
- * copy.
+ * Decode a single base 64 character code digit to an integer. Returns -1 on
+ * failure.
  */
-MappingList$1.prototype.toArray = function MappingList_toArray() {
-  if (!this._sorted) {
-    this._array.sort(util$3.compareByGeneratedPositionsInflated);
-    this._sorted = true;
-  }
-  return this._array;
-};
+base64$1.decode = function (charCode) {
+  var bigA = 65;     // 'A'
+  var bigZ = 90;     // 'Z'
 
-mappingList.MappingList = MappingList$1;
+  var littleA = 97;  // 'a'
+  var littleZ = 122; // 'z'
 
-/* -*- Mode: js; js-indent-level: 2; -*- */
+  var zero = 48;     // '0'
+  var nine = 57;     // '9'
 
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
+  var plus = 43;     // '+'
+  var slash = 47;    // '/'
 
-var base64VLQ$1 = base64Vlq;
-var util$2 = util$5;
-var ArraySet$1 = arraySet.ArraySet;
-var MappingList = mappingList.MappingList;
+  var littleOffset = 26;
+  var numberOffset = 52;
 
-/**
- * An instance of the SourceMapGenerator represents a source map which is
- * being built incrementally. You may pass an object with the following
- * properties:
- *
- *   - file: The filename of the generated source.
- *   - sourceRoot: A root for all relative URLs in this source map.
- */
-function SourceMapGenerator$1(aArgs) {
-  if (!aArgs) {
-    aArgs = {};
+  // 0 - 25: ABCDEFGHIJKLMNOPQRSTUVWXYZ
+  if (bigA <= charCode && charCode <= bigZ) {
+    return (charCode - bigA);
   }
-  this._file = util$2.getArg(aArgs, 'file', null);
-  this._sourceRoot = util$2.getArg(aArgs, 'sourceRoot', null);
-  this._skipValidation = util$2.getArg(aArgs, 'skipValidation', false);
-  this._sources = new ArraySet$1();
-  this._names = new ArraySet$1();
-  this._mappings = new MappingList();
-  this._sourcesContents = null;
-}
-
-SourceMapGenerator$1.prototype._version = 3;
-
-/**
- * Creates a new SourceMapGenerator based on a SourceMapConsumer
- *
- * @param aSourceMapConsumer The SourceMap.
- */
-SourceMapGenerator$1.fromSourceMap =
-  function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
-    var sourceRoot = aSourceMapConsumer.sourceRoot;
-    var generator = new SourceMapGenerator$1({
-      file: aSourceMapConsumer.file,
-      sourceRoot: sourceRoot
-    });
-    aSourceMapConsumer.eachMapping(function (mapping) {
-      var newMapping = {
-        generated: {
-          line: mapping.generatedLine,
-          column: mapping.generatedColumn
-        }
-      };
 
-      if (mapping.source != null) {
-        newMapping.source = mapping.source;
-        if (sourceRoot != null) {
-          newMapping.source = util$2.relative(sourceRoot, newMapping.source);
-        }
+  // 26 - 51: abcdefghijklmnopqrstuvwxyz
+  if (littleA <= charCode && charCode <= littleZ) {
+    return (charCode - littleA + littleOffset);
+  }
 
-        newMapping.original = {
-          line: mapping.originalLine,
-          column: mapping.originalColumn
-        };
+  // 52 - 61: 0123456789
+  if (zero <= charCode && charCode <= nine) {
+    return (charCode - zero + numberOffset);
+  }
 
-        if (mapping.name != null) {
-          newMapping.name = mapping.name;
-        }
-      }
+  // 62: +
+  if (charCode == plus) {
+    return 62;
+  }
 
-      generator.addMapping(newMapping);
-    });
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var sourceRelative = sourceFile;
-      if (sourceRoot !== null) {
-        sourceRelative = util$2.relative(sourceRoot, sourceFile);
-      }
+  // 63: /
+  if (charCode == slash) {
+    return 63;
+  }
 
-      if (!generator._sources.has(sourceRelative)) {
-        generator._sources.add(sourceRelative);
-      }
+  // Invalid base64 digit.
+  return -1;
+};
 
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        generator.setSourceContent(sourceFile, content);
-      }
-    });
-    return generator;
-  };
+/* -*- Mode: js; js-indent-level: 2; -*- */
 
-/**
- * Add a single mapping from original source line and column to the generated
- * source's line and column for this source map being created. The mapping
- * object should have the following properties:
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
  *
- *   - generated: An object with the generated line and column positions.
- *   - original: An object with the original line and column positions.
- *   - source: The original source file (relative to the sourceRoot).
- *   - name: An optional original token name for this mapping.
- */
-SourceMapGenerator$1.prototype.addMapping =
-  function SourceMapGenerator_addMapping(aArgs) {
-    var generated = util$2.getArg(aArgs, 'generated');
-    var original = util$2.getArg(aArgs, 'original', null);
-    var source = util$2.getArg(aArgs, 'source', null);
-    var name = util$2.getArg(aArgs, 'name', null);
-
-    if (!this._skipValidation) {
-      this._validateMapping(generated, original, source, name);
-    }
-
-    if (source != null) {
-      source = String(source);
-      if (!this._sources.has(source)) {
-        this._sources.add(source);
-      }
-    }
-
-    if (name != null) {
-      name = String(name);
-      if (!this._names.has(name)) {
-        this._names.add(name);
-      }
-    }
-
-    this._mappings.add({
-      generatedLine: generated.line,
-      generatedColumn: generated.column,
-      originalLine: original != null && original.line,
-      originalColumn: original != null && original.column,
-      source: source,
-      name: name
-    });
-  };
-
-/**
- * Set the source content for a source file.
- */
-SourceMapGenerator$1.prototype.setSourceContent =
-  function SourceMapGenerator_setSourceContent(aSourceFile, aSourceContent) {
-    var source = aSourceFile;
-    if (this._sourceRoot != null) {
-      source = util$2.relative(this._sourceRoot, source);
-    }
-
-    if (aSourceContent != null) {
-      // Add the source content to the _sourcesContents map.
-      // Create a new _sourcesContents map if the property is null.
-      if (!this._sourcesContents) {
-        this._sourcesContents = Object.create(null);
-      }
-      this._sourcesContents[util$2.toSetString(source)] = aSourceContent;
-    } else if (this._sourcesContents) {
-      // Remove the source file from the _sourcesContents map.
-      // If the _sourcesContents map is empty, set the property to null.
-      delete this._sourcesContents[util$2.toSetString(source)];
-      if (Object.keys(this._sourcesContents).length === 0) {
-        this._sourcesContents = null;
-      }
-    }
-  };
-
-/**
- * Applies the mappings of a sub-source-map for a specific source file to the
- * source map being generated. Each mapping to the supplied source file is
- * rewritten using the supplied source map. Note: The resolution for the
- * resulting mappings is the minimium of this map and the supplied map.
+ * Based on the Base 64 VLQ implementation in Closure Compiler:
+ * https://code.google.com/p/closure-compiler/source/browse/trunk/src/com/google/debugging/sourcemap/Base64VLQ.java
  *
- * @param aSourceMapConsumer The source map to be applied.
- * @param aSourceFile Optional. The filename of the source file.
- *        If omitted, SourceMapConsumer's file property will be used.
- * @param aSourceMapPath Optional. The dirname of the path to the source map
- *        to be applied. If relative, it is relative to the SourceMapConsumer.
- *        This parameter is needed when the two source maps aren't in the same
- *        directory, and the source map to be applied contains relative source
- *        paths. If so, those relative source paths need to be rewritten
- *        relative to the SourceMapGenerator.
- */
-SourceMapGenerator$1.prototype.applySourceMap =
-  function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile, aSourceMapPath) {
-    var sourceFile = aSourceFile;
-    // If aSourceFile is omitted, we will use the file property of the SourceMap
-    if (aSourceFile == null) {
-      if (aSourceMapConsumer.file == null) {
-        throw new Error(
-          'SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' +
-          'or the source map\'s "file" property. Both were omitted.'
-        );
-      }
-      sourceFile = aSourceMapConsumer.file;
-    }
-    var sourceRoot = this._sourceRoot;
-    // Make "sourceFile" relative if an absolute Url is passed.
-    if (sourceRoot != null) {
-      sourceFile = util$2.relative(sourceRoot, sourceFile);
-    }
-    // Applying the SourceMap can add and remove items from the sources and
-    // the names array.
-    var newSources = new ArraySet$1();
-    var newNames = new ArraySet$1();
-
-    // Find mappings for the "sourceFile"
-    this._mappings.unsortedForEach(function (mapping) {
-      if (mapping.source === sourceFile && mapping.originalLine != null) {
-        // Check if it can be mapped by the source map, then update the mapping.
-        var original = aSourceMapConsumer.originalPositionFor({
-          line: mapping.originalLine,
-          column: mapping.originalColumn
-        });
-        if (original.source != null) {
-          // Copy mapping
-          mapping.source = original.source;
-          if (aSourceMapPath != null) {
-            mapping.source = util$2.join(aSourceMapPath, mapping.source);
-          }
-          if (sourceRoot != null) {
-            mapping.source = util$2.relative(sourceRoot, mapping.source);
-          }
-          mapping.originalLine = original.line;
-          mapping.originalColumn = original.column;
-          if (original.name != null) {
-            mapping.name = original.name;
-          }
-        }
-      }
-
-      var source = mapping.source;
-      if (source != null && !newSources.has(source)) {
-        newSources.add(source);
-      }
-
-      var name = mapping.name;
-      if (name != null && !newNames.has(name)) {
-        newNames.add(name);
-      }
-
-    }, this);
-    this._sources = newSources;
-    this._names = newNames;
-
-    // Copy sourcesContents of applied map.
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        if (aSourceMapPath != null) {
-          sourceFile = util$2.join(aSourceMapPath, sourceFile);
-        }
-        if (sourceRoot != null) {
-          sourceFile = util$2.relative(sourceRoot, sourceFile);
-        }
-        this.setSourceContent(sourceFile, content);
-      }
-    }, this);
-  };
-
-/**
- * A mapping can have one of the three levels of data:
+ * Copyright 2011 The Closure Compiler Authors. All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- *   1. Just the generated position.
- *   2. The Generated position, original position, and original source.
- *   3. Generated and original position, original source, as well as a name
- *      token.
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials provided
+ *    with the distribution.
+ *  * Neither the name of Google Inc. nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
  *
- * To maintain consistency, we validate that any new mapping being added falls
- * in to one of these categories.
- */
-SourceMapGenerator$1.prototype._validateMapping =
-  function SourceMapGenerator_validateMapping(aGenerated, aOriginal, aSource,
-                                              aName) {
-    // When aOriginal is truthy but has empty values for .line and .column,
-    // it is most likely a programmer error. In this case we throw a very
-    // specific error message to try to guide them the right way.
-    // For example: https://github.com/Polymer/polymer-bundler/pull/519
-    if (aOriginal && typeof aOriginal.line !== 'number' && typeof aOriginal.column !== 'number') {
-        throw new Error(
-            'original.line and original.column are not numbers -- you probably meant to omit ' +
-            'the original mapping entirely and only map the generated position. If so, pass ' +
-            'null for the original mapping instead of an object with empty or null values.'
-        );
-    }
-
-    if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
-        && aGenerated.line > 0 && aGenerated.column >= 0
-        && !aOriginal && !aSource && !aName) {
-      // Case 1.
-      return;
-    }
-    else if (aGenerated && 'line' in aGenerated && 'column' in aGenerated
-             && aOriginal && 'line' in aOriginal && 'column' in aOriginal
-             && aGenerated.line > 0 && aGenerated.column >= 0
-             && aOriginal.line > 0 && aOriginal.column >= 0
-             && aSource) {
-      // Cases 2 and 3.
-      return;
-    }
-    else {
-      throw new Error('Invalid mapping: ' + JSON.stringify({
-        generated: aGenerated,
-        source: aSource,
-        original: aOriginal,
-        name: aName
-      }));
-    }
-  };
-
-/**
- * Serialize the accumulated mappings in to the stream of base 64 VLQs
- * specified by the source map format.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-SourceMapGenerator$1.prototype._serializeMappings =
-  function SourceMapGenerator_serializeMappings() {
-    var previousGeneratedColumn = 0;
-    var previousGeneratedLine = 1;
-    var previousOriginalColumn = 0;
-    var previousOriginalLine = 0;
-    var previousName = 0;
-    var previousSource = 0;
-    var result = '';
-    var next;
-    var mapping;
-    var nameIdx;
-    var sourceIdx;
-
-    var mappings = this._mappings.toArray();
-    for (var i = 0, len = mappings.length; i < len; i++) {
-      mapping = mappings[i];
-      next = '';
-
-      if (mapping.generatedLine !== previousGeneratedLine) {
-        previousGeneratedColumn = 0;
-        while (mapping.generatedLine !== previousGeneratedLine) {
-          next += ';';
-          previousGeneratedLine++;
-        }
-      }
-      else {
-        if (i > 0) {
-          if (!util$2.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) {
-            continue;
-          }
-          next += ',';
-        }
-      }
-
-      next += base64VLQ$1.encode(mapping.generatedColumn
-                                 - previousGeneratedColumn);
-      previousGeneratedColumn = mapping.generatedColumn;
 
-      if (mapping.source != null) {
-        sourceIdx = this._sources.indexOf(mapping.source);
-        next += base64VLQ$1.encode(sourceIdx - previousSource);
-        previousSource = sourceIdx;
-
-        // lines are stored 0-based in SourceMap spec version 3
-        next += base64VLQ$1.encode(mapping.originalLine - 1
-                                   - previousOriginalLine);
-        previousOriginalLine = mapping.originalLine - 1;
+var base64 = base64$1;
 
-        next += base64VLQ$1.encode(mapping.originalColumn
-                                   - previousOriginalColumn);
-        previousOriginalColumn = mapping.originalColumn;
+// A single base 64 digit can contain 6 bits of data. For the base 64 variable
+// length quantities we use in the source map spec, the first bit is the sign,
+// the next four bits are the actual value, and the 6th bit is the
+// continuation bit. The continuation bit tells us whether there are more
+// digits in this value following this digit.
+//
+//   Continuation
+//   |    Sign
+//   |    |
+//   V    V
+//   101011
 
-        if (mapping.name != null) {
-          nameIdx = this._names.indexOf(mapping.name);
-          next += base64VLQ$1.encode(nameIdx - previousName);
-          previousName = nameIdx;
-        }
-      }
+var VLQ_BASE_SHIFT = 5;
 
-      result += next;
-    }
+// binary: 100000
+var VLQ_BASE = 1 << VLQ_BASE_SHIFT;
 
-    return result;
-  };
+// binary: 011111
+var VLQ_BASE_MASK = VLQ_BASE - 1;
 
-SourceMapGenerator$1.prototype._generateSourcesContent =
-  function SourceMapGenerator_generateSourcesContent(aSources, aSourceRoot) {
-    return aSources.map(function (source) {
-      if (!this._sourcesContents) {
-        return null;
-      }
-      if (aSourceRoot != null) {
-        source = util$2.relative(aSourceRoot, source);
-      }
-      var key = util$2.toSetString(source);
-      return Object.prototype.hasOwnProperty.call(this._sourcesContents, key)
-        ? this._sourcesContents[key]
-        : null;
-    }, this);
-  };
+// binary: 100000
+var VLQ_CONTINUATION_BIT = VLQ_BASE;
 
 /**
- * Externalize the source map.
+ * Converts from a two-complement value to a value where the sign bit is
+ * placed in the least significant bit.  For example, as decimals:
+ *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
+ *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
  */
-SourceMapGenerator$1.prototype.toJSON =
-  function SourceMapGenerator_toJSON() {
-    var map = {
-      version: this._version,
-      sources: this._sources.toArray(),
-      names: this._names.toArray(),
-      mappings: this._serializeMappings()
-    };
-    if (this._file != null) {
-      map.file = this._file;
-    }
-    if (this._sourceRoot != null) {
-      map.sourceRoot = this._sourceRoot;
-    }
-    if (this._sourcesContents) {
-      map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot);
-    }
-
-    return map;
-  };
+function toVLQSigned(aValue) {
+  return aValue < 0
+    ? ((-aValue) << 1) + 1
+    : (aValue << 1) + 0;
+}
 
 /**
- * Render the source map being generated to a string.
- */
-SourceMapGenerator$1.prototype.toString =
-  function SourceMapGenerator_toString() {
-    return JSON.stringify(this.toJSON());
-  };
-
-sourceMapGenerator.SourceMapGenerator = SourceMapGenerator$1;
-
-var sourceMapConsumer = {};
-
-var binarySearch$1 = {};
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-
-(function (exports) {
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
+ * Converts to a two-complement value from a value where the sign bit is
+ * placed in the least significant bit.  For example, as decimals:
+ *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
+ *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
  */
-
-exports.GREATEST_LOWER_BOUND = 1;
-exports.LEAST_UPPER_BOUND = 2;
+function fromVLQSigned(aValue) {
+  var isNegative = (aValue & 1) === 1;
+  var shifted = aValue >> 1;
+  return isNegative
+    ? -shifted
+    : shifted;
+}
 
 /**
- * Recursive implementation of binary search.
- *
- * @param aLow Indices here and lower do not contain the needle.
- * @param aHigh Indices here and higher do not contain the needle.
- * @param aNeedle The element being searched for.
- * @param aHaystack The non-empty array being searched.
- * @param aCompare Function which takes two elements and returns -1, 0, or 1.
- * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
- *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
+ * Returns the base 64 VLQ encoded value.
  */
-function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) {
-  // This function terminates when one of the following is true:
-  //
-  //   1. We find the exact element we are looking for.
-  //
-  //   2. We did not find the exact element, but we can return the index of
-  //      the next-closest element.
-  //
-  //   3. We did not find the exact element, and there is no next-closest
-  //      element than the one we are searching for, so we return -1.
-  var mid = Math.floor((aHigh - aLow) / 2) + aLow;
-  var cmp = aCompare(aNeedle, aHaystack[mid], true);
-  if (cmp === 0) {
-    // Found the element we are looking for.
-    return mid;
-  }
-  else if (cmp > 0) {
-    // Our needle is greater than aHaystack[mid].
-    if (aHigh - mid > 1) {
-      // The element is in the upper half.
-      return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias);
-    }
+base64Vlq.encode = function base64VLQ_encode(aValue) {
+  var encoded = "";
+  var digit;
 
-    // The exact needle element was not found in this haystack. Determine if
-    // we are in termination case (3) or (2) and return the appropriate thing.
-    if (aBias == exports.LEAST_UPPER_BOUND) {
-      return aHigh < aHaystack.length ? aHigh : -1;
-    } else {
-      return mid;
-    }
-  }
-  else {
-    // Our needle is less than aHaystack[mid].
-    if (mid - aLow > 1) {
-      // The element is in the lower half.
-      return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias);
-    }
+  var vlq = toVLQSigned(aValue);
 
-    // we are in termination case (3) or (2) and return the appropriate thing.
-    if (aBias == exports.LEAST_UPPER_BOUND) {
-      return mid;
-    } else {
-      return aLow < 0 ? -1 : aLow;
+  do {
+    digit = vlq & VLQ_BASE_MASK;
+    vlq >>>= VLQ_BASE_SHIFT;
+    if (vlq > 0) {
+      // There are still more digits in this value, so we must make sure the
+      // continuation bit is marked.
+      digit |= VLQ_CONTINUATION_BIT;
     }
-  }
-}
+    encoded += base64.encode(digit);
+  } while (vlq > 0);
+
+  return encoded;
+};
 
 /**
- * This is an implementation of binary search which will always try and return
- * the index of the closest element if there is no exact hit. This is because
- * mappings between original and generated line/col pairs are single points,
- * and there is an implicit region between each of them, so a miss just means
- * that you aren't on the very start of a region.
- *
- * @param aNeedle The element you are looking for.
- * @param aHaystack The array that is being searched.
- * @param aCompare A function which takes the needle and an element in the
- *     array and returns -1, 0, or 1 depending on whether the needle is less
- *     than, equal to, or greater than the element, respectively.
- * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
- *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
- *     closest element that is smaller than or greater than the one we are
- *     searching for, respectively, if the exact element cannot be found.
- *     Defaults to 'binarySearch.GREATEST_LOWER_BOUND'.
+ * Decodes the next base 64 VLQ value from the given string and returns the
+ * value and the rest of the string via the out parameter.
  */
-exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
-  if (aHaystack.length === 0) {
-    return -1;
-  }
+base64Vlq.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
+  var strLen = aStr.length;
+  var result = 0;
+  var shift = 0;
+  var continuation, digit;
 
-  var index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack,
-                              aCompare, aBias || exports.GREATEST_LOWER_BOUND);
-  if (index < 0) {
-    return -1;
-  }
+  do {
+    if (aIndex >= strLen) {
+      throw new Error("Expected more digits in base 64 VLQ value.");
+    }
 
-  // We have found either the exact element, or the next-closest element than
-  // the one we are searching for. However, there may be more than one such
-  // element. Make sure we always return the smallest of these.
-  while (index - 1 >= 0) {
-    if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) {
-      break;
+    digit = base64.decode(aStr.charCodeAt(aIndex++));
+    if (digit === -1) {
+      throw new Error("Invalid base64 digit: " + aStr.charAt(aIndex - 1));
     }
-    --index;
-  }
 
-  return index;
+    continuation = !!(digit & VLQ_CONTINUATION_BIT);
+    digit &= VLQ_BASE_MASK;
+    result = result + (digit << shift);
+    shift += VLQ_BASE_SHIFT;
+  } while (continuation);
+
+  aOutParam.value = fromVLQSigned(result);
+  aOutParam.rest = aIndex;
 };
-}(binarySearch$1));
 
 var quickSort$1 = {};
 
@@ -37048,6 +36644,8 @@ var quickSort$1 = {};
 // sorting in C++. By using our own JS-implemented Quick Sort (below), we get
 // a ~3500ms mean speed-up in `bench/bench.html`.
 
+function SortTemplate(comparator) {
+
 /**
  * Swap the elements indexed by `x` and `y` in the array `ary`.
  *
@@ -37118,7 +36716,7 @@ function doQuickSort(ary, comparator, p, r) {
     //
     //   * Every element in `ary[i+1 .. j-1]` is greater than the pivot.
     for (var j = p; j < r; j++) {
-      if (comparator(ary[j], pivot) <= 0) {
+      if (comparator(ary[j], pivot, false) <= 0) {
         i += 1;
         swap(ary, i, j);
       }
@@ -37134,6 +36732,15 @@ function doQuickSort(ary, comparator, p, r) {
   }
 }
 
+  return doQuickSort;
+}
+
+function cloneSort(comparator) {
+  let template = SortTemplate.toString();
+  let templateFn = new Function(`return ${template}`)();
+  return templateFn(comparator);
+}
+
 /**
  * Sort the given array in-place with the given comparator function.
  *
@@ -37142,8 +36749,15 @@ function doQuickSort(ary, comparator, p, r) {
  * @param {function} comparator
  *        Function to use to compare two items.
  */
-quickSort$1.quickSort = function (ary, comparator) {
-  doQuickSort(ary, comparator, 0, ary.length - 1);
+
+let sortCache = new WeakMap();
+quickSort$1.quickSort = function (ary, comparator, start = 0) {
+  let doQuickSort = sortCache.get(comparator);
+  if (doQuickSort === void 0) {
+    doQuickSort = cloneSort(comparator);
+    sortCache.set(comparator, doQuickSort);
+  }
+  doQuickSort(ary, comparator, start, ary.length - 1);
 };
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -37154,16 +36768,16 @@ quickSort$1.quickSort = function (ary, comparator) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util$1 = util$5;
+var util = util$2;
 var binarySearch = binarySearch$1;
 var ArraySet = arraySet.ArraySet;
 var base64VLQ = base64Vlq;
 var quickSort = quickSort$1.quickSort;
 
-function SourceMapConsumer$1(aSourceMap, aSourceMapURL) {
+function SourceMapConsumer(aSourceMap, aSourceMapURL) {
   var sourceMap = aSourceMap;
   if (typeof aSourceMap === 'string') {
-    sourceMap = util$1.parseSourceMapInput(aSourceMap);
+    sourceMap = util.parseSourceMapInput(aSourceMap);
   }
 
   return sourceMap.sections != null
@@ -37171,14 +36785,14 @@ function SourceMapConsumer$1(aSourceMap, aSourceMapURL) {
     : new BasicSourceMapConsumer(sourceMap, aSourceMapURL);
 }
 
-SourceMapConsumer$1.fromSourceMap = function(aSourceMap, aSourceMapURL) {
+SourceMapConsumer.fromSourceMap = function(aSourceMap, aSourceMapURL) {
   return BasicSourceMapConsumer.fromSourceMap(aSourceMap, aSourceMapURL);
 };
 
 /**
  * The version of the source mapping spec that we are consuming.
  */
-SourceMapConsumer$1.prototype._version = 3;
+SourceMapConsumer.prototype._version = 3;
 
 // `__generatedMappings` and `__originalMappings` are arrays that hold the
 // parsed mapping coordinates from the source map's "mappings" attribute. They
@@ -37210,8 +36824,8 @@ SourceMapConsumer$1.prototype._version = 3;
 //
 // `_originalMappings` is ordered by the original positions.
 
-SourceMapConsumer$1.prototype.__generatedMappings = null;
-Object.defineProperty(SourceMapConsumer$1.prototype, '_generatedMappings', {
+SourceMapConsumer.prototype.__generatedMappings = null;
+Object.defineProperty(SourceMapConsumer.prototype, '_generatedMappings', {
   configurable: true,
   enumerable: true,
   get: function () {
@@ -37223,8 +36837,8 @@ Object.defineProperty(SourceMapConsumer$1.prototype, '_generatedMappings', {
   }
 });
 
-SourceMapConsumer$1.prototype.__originalMappings = null;
-Object.defineProperty(SourceMapConsumer$1.prototype, '_originalMappings', {
+SourceMapConsumer.prototype.__originalMappings = null;
+Object.defineProperty(SourceMapConsumer.prototype, '_originalMappings', {
   configurable: true,
   enumerable: true,
   get: function () {
@@ -37236,7 +36850,7 @@ Object.defineProperty(SourceMapConsumer$1.prototype, '_originalMappings', {
   }
 });
 
-SourceMapConsumer$1.prototype._charIsMappingSeparator =
+SourceMapConsumer.prototype._charIsMappingSeparator =
   function SourceMapConsumer_charIsMappingSeparator(aStr, index) {
     var c = aStr.charAt(index);
     return c === ";" || c === ",";
@@ -37247,16 +36861,16 @@ SourceMapConsumer$1.prototype._charIsMappingSeparator =
  * query (the ordered arrays in the `this.__generatedMappings` and
  * `this.__originalMappings` properties).
  */
-SourceMapConsumer$1.prototype._parseMappings =
+SourceMapConsumer.prototype._parseMappings =
   function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
     throw new Error("Subclasses must implement _parseMappings");
   };
 
-SourceMapConsumer$1.GENERATED_ORDER = 1;
-SourceMapConsumer$1.ORIGINAL_ORDER = 2;
+SourceMapConsumer.GENERATED_ORDER = 1;
+SourceMapConsumer.ORIGINAL_ORDER = 2;
 
-SourceMapConsumer$1.GREATEST_LOWER_BOUND = 1;
-SourceMapConsumer$1.LEAST_UPPER_BOUND = 2;
+SourceMapConsumer.GREATEST_LOWER_BOUND = 1;
+SourceMapConsumer.LEAST_UPPER_BOUND = 2;
 
 /**
  * Iterate over each mapping between an original source/line/column and a
@@ -37274,17 +36888,17 @@ SourceMapConsumer$1.LEAST_UPPER_BOUND = 2;
  *        order or the original's source/line/column order, respectively. Defaults to
  *        `SourceMapConsumer.GENERATED_ORDER`.
  */
-SourceMapConsumer$1.prototype.eachMapping =
+SourceMapConsumer.prototype.eachMapping =
   function SourceMapConsumer_eachMapping(aCallback, aContext, aOrder) {
     var context = aContext || null;
-    var order = aOrder || SourceMapConsumer$1.GENERATED_ORDER;
+    var order = aOrder || SourceMapConsumer.GENERATED_ORDER;
 
     var mappings;
     switch (order) {
-    case SourceMapConsumer$1.GENERATED_ORDER:
+    case SourceMapConsumer.GENERATED_ORDER:
       mappings = this._generatedMappings;
       break;
-    case SourceMapConsumer$1.ORIGINAL_ORDER:
+    case SourceMapConsumer.ORIGINAL_ORDER:
       mappings = this._originalMappings;
       break;
     default:
@@ -37292,18 +36906,24 @@ SourceMapConsumer$1.prototype.eachMapping =
     }
 
     var sourceRoot = this.sourceRoot;
-    mappings.map(function (mapping) {
-      var source = mapping.source === null ? null : this._sources.at(mapping.source);
-      source = util$1.computeSourceURL(sourceRoot, source, this._sourceMapURL);
-      return {
+    var boundCallback = aCallback.bind(context);
+    var names = this._names;
+    var sources = this._sources;
+    var sourceMapURL = this._sourceMapURL;
+
+    for (var i = 0, n = mappings.length; i < n; i++) {
+      var mapping = mappings[i];
+      var source = mapping.source === null ? null : sources.at(mapping.source);
+      source = util.computeSourceURL(sourceRoot, source, sourceMapURL);
+      boundCallback({
         source: source,
         generatedLine: mapping.generatedLine,
         generatedColumn: mapping.generatedColumn,
         originalLine: mapping.originalLine,
         originalColumn: mapping.originalColumn,
-        name: mapping.name === null ? null : this._names.at(mapping.name)
-      };
-    }, this).forEach(aCallback, context);
+        name: mapping.name === null ? null : names.at(mapping.name)
+      });
+    }
   };
 
 /**
@@ -37328,18 +36948,18 @@ SourceMapConsumer$1.prototype.eachMapping =
  *   - column: The column number in the generated source, or null.
  *    The column number is 0-based.
  */
-SourceMapConsumer$1.prototype.allGeneratedPositionsFor =
+SourceMapConsumer.prototype.allGeneratedPositionsFor =
   function SourceMapConsumer_allGeneratedPositionsFor(aArgs) {
-    var line = util$1.getArg(aArgs, 'line');
+    var line = util.getArg(aArgs, 'line');
 
     // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping
     // returns the index of the closest mapping less than the needle. By
     // setting needle.originalColumn to 0, we thus find the last mapping for
     // the given line, provided such a mapping exists.
     var needle = {
-      source: util$1.getArg(aArgs, 'source'),
+      source: util.getArg(aArgs, 'source'),
       originalLine: line,
-      originalColumn: util$1.getArg(aArgs, 'column', 0)
+      originalColumn: util.getArg(aArgs, 'column', 0)
     };
 
     needle.source = this._findSourceIndex(needle.source);
@@ -37353,7 +36973,7 @@ SourceMapConsumer$1.prototype.allGeneratedPositionsFor =
                                   this._originalMappings,
                                   "originalLine",
                                   "originalColumn",
-                                  util$1.compareByOriginalPositions,
+                                  util.compareByOriginalPositions,
                                   binarySearch.LEAST_UPPER_BOUND);
     if (index >= 0) {
       var mapping = this._originalMappings[index];
@@ -37367,9 +36987,9 @@ SourceMapConsumer$1.prototype.allGeneratedPositionsFor =
         // the line we found.
         while (mapping && mapping.originalLine === originalLine) {
           mappings.push({
-            line: util$1.getArg(mapping, 'generatedLine', null),
-            column: util$1.getArg(mapping, 'generatedColumn', null),
-            lastColumn: util$1.getArg(mapping, 'lastGeneratedColumn', null)
+            line: util.getArg(mapping, 'generatedLine', null),
+            column: util.getArg(mapping, 'generatedColumn', null),
+            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
           });
 
           mapping = this._originalMappings[++index];
@@ -37385,9 +37005,9 @@ SourceMapConsumer$1.prototype.allGeneratedPositionsFor =
                mapping.originalLine === line &&
                mapping.originalColumn == originalColumn) {
           mappings.push({
-            line: util$1.getArg(mapping, 'generatedLine', null),
-            column: util$1.getArg(mapping, 'generatedColumn', null),
-            lastColumn: util$1.getArg(mapping, 'lastGeneratedColumn', null)
+            line: util.getArg(mapping, 'generatedLine', null),
+            column: util.getArg(mapping, 'generatedColumn', null),
+            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
           });
 
           mapping = this._originalMappings[++index];
@@ -37398,7 +37018,7 @@ SourceMapConsumer$1.prototype.allGeneratedPositionsFor =
     return mappings;
   };
 
-sourceMapConsumer.SourceMapConsumer = SourceMapConsumer$1;
+var SourceMapConsumer_1 = SourceMapConsumer;
 
 /**
  * A BasicSourceMapConsumer instance represents a parsed source map which we can
@@ -37437,18 +37057,18 @@ sourceMapConsumer.SourceMapConsumer = SourceMapConsumer$1;
 function BasicSourceMapConsumer(aSourceMap, aSourceMapURL) {
   var sourceMap = aSourceMap;
   if (typeof aSourceMap === 'string') {
-    sourceMap = util$1.parseSourceMapInput(aSourceMap);
+    sourceMap = util.parseSourceMapInput(aSourceMap);
   }
 
-  var version = util$1.getArg(sourceMap, 'version');
-  var sources = util$1.getArg(sourceMap, 'sources');
+  var version = util.getArg(sourceMap, 'version');
+  var sources = util.getArg(sourceMap, 'sources');
   // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which
   // requires the array) to play nice here.
-  var names = util$1.getArg(sourceMap, 'names', []);
-  var sourceRoot = util$1.getArg(sourceMap, 'sourceRoot', null);
-  var sourcesContent = util$1.getArg(sourceMap, 'sourcesContent', null);
-  var mappings = util$1.getArg(sourceMap, 'mappings');
-  var file = util$1.getArg(sourceMap, 'file', null);
+  var names = util.getArg(sourceMap, 'names', []);
+  var sourceRoot = util.getArg(sourceMap, 'sourceRoot', null);
+  var sourcesContent = util.getArg(sourceMap, 'sourcesContent', null);
+  var mappings = util.getArg(sourceMap, 'mappings');
+  var file = util.getArg(sourceMap, 'file', null);
 
   // Once again, Sass deviates from the spec and supplies the version as a
   // string rather than a number, so we use loose equality checking here.
@@ -37457,7 +37077,7 @@ function BasicSourceMapConsumer(aSourceMap, aSourceMapURL) {
   }
 
   if (sourceRoot) {
-    sourceRoot = util$1.normalize(sourceRoot);
+    sourceRoot = util.normalize(sourceRoot);
   }
 
   sources = sources
@@ -37465,14 +37085,14 @@ function BasicSourceMapConsumer(aSourceMap, aSourceMapURL) {
     // Some source maps produce relative source paths like "./foo.js" instead of
     // "foo.js".  Normalize these first so that future comparisons will succeed.
     // See bugzil.la/1090768.
-    .map(util$1.normalize)
+    .map(util.normalize)
     // Always ensure that absolute sources are internally stored relative to
     // the source root, if the source root is absolute. Not doing this would
     // be particularly problematic when the source root is a prefix of the
     // source (valid, but why??). See github issue #199 and bugzil.la/1188982.
     .map(function (source) {
-      return sourceRoot && util$1.isAbsolute(sourceRoot) && util$1.isAbsolute(source)
-        ? util$1.relative(sourceRoot, source)
+      return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source)
+        ? util.relative(sourceRoot, source)
         : source;
     });
 
@@ -37484,7 +37104,7 @@ function BasicSourceMapConsumer(aSourceMap, aSourceMapURL) {
   this._sources = ArraySet.fromArray(sources, true);
 
   this._absoluteSources = this._sources.toArray().map(function (s) {
-    return util$1.computeSourceURL(sourceRoot, s, aSourceMapURL);
+    return util.computeSourceURL(sourceRoot, s, aSourceMapURL);
   });
 
   this.sourceRoot = sourceRoot;
@@ -37494,8 +37114,8 @@ function BasicSourceMapConsumer(aSourceMap, aSourceMapURL) {
   this.file = file;
 }
 
-BasicSourceMapConsumer.prototype = Object.create(SourceMapConsumer$1.prototype);
-BasicSourceMapConsumer.prototype.consumer = SourceMapConsumer$1;
+BasicSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
+BasicSourceMapConsumer.prototype.consumer = SourceMapConsumer;
 
 /**
  * Utility function to find the index of a source.  Returns -1 if not
@@ -37504,7 +37124,7 @@ BasicSourceMapConsumer.prototype.consumer = SourceMapConsumer$1;
 BasicSourceMapConsumer.prototype._findSourceIndex = function(aSource) {
   var relativeSource = aSource;
   if (this.sourceRoot != null) {
-    relativeSource = util$1.relative(this.sourceRoot, relativeSource);
+    relativeSource = util.relative(this.sourceRoot, relativeSource);
   }
 
   if (this._sources.has(relativeSource)) {
@@ -37544,7 +37164,7 @@ BasicSourceMapConsumer.fromSourceMap =
     smc.file = aSourceMap._file;
     smc._sourceMapURL = aSourceMapURL;
     smc._absoluteSources = smc._sources.toArray().map(function (s) {
-      return util$1.computeSourceURL(smc.sourceRoot, s, aSourceMapURL);
+      return util.computeSourceURL(smc.sourceRoot, s, aSourceMapURL);
     });
 
     // Because we are modifying the entries (by converting string sources and
@@ -37577,7 +37197,7 @@ BasicSourceMapConsumer.fromSourceMap =
       destGeneratedMappings.push(destMapping);
     }
 
-    quickSort(smc.__originalMappings, util$1.compareByOriginalPositions);
+    quickSort(smc.__originalMappings, util.compareByOriginalPositions);
 
     return smc;
   };
@@ -37613,6 +37233,36 @@ function Mapping() {
  * query (the ordered arrays in the `this.__generatedMappings` and
  * `this.__originalMappings` properties).
  */
+
+const compareGenerated = util.compareByGeneratedPositionsDeflatedNoLine;
+function sortGenerated(array, start) {
+  let l = array.length;
+  let n = array.length - start;
+  if (n <= 1) {
+    return;
+  } else if (n == 2) {
+    let a = array[start];
+    let b = array[start + 1];
+    if (compareGenerated(a, b) > 0) {
+      array[start] = b;
+      array[start + 1] = a;
+    }
+  } else if (n < 20) {
+    for (let i = start; i < l; i++) {
+      for (let j = i; j > start; j--) {
+        let a = array[j - 1];
+        let b = array[j];
+        if (compareGenerated(a, b) <= 0) {
+          break;
+        }
+        array[j - 1] = b;
+        array[j] = a;
+      }
+    }
+  } else {
+    quickSort(array, compareGenerated, start);
+  }
+}
 BasicSourceMapConsumer.prototype._parseMappings =
   function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
     var generatedLine = 1;
@@ -37623,17 +37273,20 @@ BasicSourceMapConsumer.prototype._parseMappings =
     var previousName = 0;
     var length = aStr.length;
     var index = 0;
-    var cachedSegments = {};
     var temp = {};
     var originalMappings = [];
     var generatedMappings = [];
-    var mapping, str, segment, end, value;
+    var mapping, segment, end, value;
 
+    let subarrayStart = 0;
     while (index < length) {
       if (aStr.charAt(index) === ';') {
         generatedLine++;
         index++;
         previousGeneratedColumn = 0;
+
+        sortGenerated(generatedMappings, subarrayStart);
+        subarrayStart = generatedMappings.length;
       }
       else if (aStr.charAt(index) === ',') {
         index++;
@@ -37642,39 +37295,27 @@ BasicSourceMapConsumer.prototype._parseMappings =
         mapping = new Mapping();
         mapping.generatedLine = generatedLine;
 
-        // Because each offset is encoded relative to the previous one,
-        // many segments often have the same encoding. We can exploit this
-        // fact by caching the parsed variable length fields of each segment,
-        // allowing us to avoid a second parse if we encounter the same
-        // segment again.
         for (end = index; end < length; end++) {
           if (this._charIsMappingSeparator(aStr, end)) {
             break;
           }
         }
-        str = aStr.slice(index, end);
-
-        segment = cachedSegments[str];
-        if (segment) {
-          index += str.length;
-        } else {
-          segment = [];
-          while (index < end) {
-            base64VLQ.decode(aStr, index, temp);
-            value = temp.value;
-            index = temp.rest;
-            segment.push(value);
-          }
+        aStr.slice(index, end);
 
-          if (segment.length === 2) {
-            throw new Error('Found a source, but no line and column');
-          }
+        segment = [];
+        while (index < end) {
+          base64VLQ.decode(aStr, index, temp);
+          value = temp.value;
+          index = temp.rest;
+          segment.push(value);
+        }
 
-          if (segment.length === 3) {
-            throw new Error('Found a source and line, but no column');
-          }
+        if (segment.length === 2) {
+          throw new Error('Found a source, but no line and column');
+        }
 
-          cachedSegments[str] = segment;
+        if (segment.length === 3) {
+          throw new Error('Found a source and line, but no column');
         }
 
         // Generated column.
@@ -37705,16 +37346,27 @@ BasicSourceMapConsumer.prototype._parseMappings =
 
         generatedMappings.push(mapping);
         if (typeof mapping.originalLine === 'number') {
-          originalMappings.push(mapping);
+          let currentSource = mapping.source;
+          while (originalMappings.length <= currentSource) {
+            originalMappings.push(null);
+          }
+          if (originalMappings[currentSource] === null) {
+            originalMappings[currentSource] = [];
+          }
+          originalMappings[currentSource].push(mapping);
         }
       }
     }
 
-    quickSort(generatedMappings, util$1.compareByGeneratedPositionsDeflated);
+    sortGenerated(generatedMappings, subarrayStart);
     this.__generatedMappings = generatedMappings;
 
-    quickSort(originalMappings, util$1.compareByOriginalPositions);
-    this.__originalMappings = originalMappings;
+    for (var i = 0; i < originalMappings.length; i++) {
+      if (originalMappings[i] != null) {
+        quickSort(originalMappings[i], util.compareByOriginalPositionsNoSource);
+      }
+    }
+    this.__originalMappings = [].concat(...originalMappings);
   };
 
 /**
@@ -37795,8 +37447,8 @@ BasicSourceMapConsumer.prototype.computeColumnSpans =
 BasicSourceMapConsumer.prototype.originalPositionFor =
   function SourceMapConsumer_originalPositionFor(aArgs) {
     var needle = {
-      generatedLine: util$1.getArg(aArgs, 'line'),
-      generatedColumn: util$1.getArg(aArgs, 'column')
+      generatedLine: util.getArg(aArgs, 'line'),
+      generatedColumn: util.getArg(aArgs, 'column')
     };
 
     var index = this._findMapping(
@@ -37804,27 +37456,27 @@ BasicSourceMapConsumer.prototype.originalPositionFor =
       this._generatedMappings,
       "generatedLine",
       "generatedColumn",
-      util$1.compareByGeneratedPositionsDeflated,
-      util$1.getArg(aArgs, 'bias', SourceMapConsumer$1.GREATEST_LOWER_BOUND)
+      util.compareByGeneratedPositionsDeflated,
+      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
     );
 
     if (index >= 0) {
       var mapping = this._generatedMappings[index];
 
       if (mapping.generatedLine === needle.generatedLine) {
-        var source = util$1.getArg(mapping, 'source', null);
+        var source = util.getArg(mapping, 'source', null);
         if (source !== null) {
           source = this._sources.at(source);
-          source = util$1.computeSourceURL(this.sourceRoot, source, this._sourceMapURL);
+          source = util.computeSourceURL(this.sourceRoot, source, this._sourceMapURL);
         }
-        var name = util$1.getArg(mapping, 'name', null);
+        var name = util.getArg(mapping, 'name', null);
         if (name !== null) {
           name = this._names.at(name);
         }
         return {
           source: source,
-          line: util$1.getArg(mapping, 'originalLine', null),
-          column: util$1.getArg(mapping, 'originalColumn', null),
+          line: util.getArg(mapping, 'originalLine', null),
+          column: util.getArg(mapping, 'originalColumn', null),
           name: name
         };
       }
@@ -37869,12 +37521,12 @@ BasicSourceMapConsumer.prototype.sourceContentFor =
 
     var relativeSource = aSource;
     if (this.sourceRoot != null) {
-      relativeSource = util$1.relative(this.sourceRoot, relativeSource);
+      relativeSource = util.relative(this.sourceRoot, relativeSource);
     }
 
     var url;
     if (this.sourceRoot != null
-        && (url = util$1.urlParse(this.sourceRoot))) {
+        && (url = util.urlParse(this.sourceRoot))) {
       // XXX: file:// URIs and absolute paths lead to unexpected behavior for
       // many users. We can help them out when they expect file:// URIs to
       // behave like it would if they were running a local HTTP server. See
@@ -37928,7 +37580,7 @@ BasicSourceMapConsumer.prototype.sourceContentFor =
  */
 BasicSourceMapConsumer.prototype.generatedPositionFor =
   function SourceMapConsumer_generatedPositionFor(aArgs) {
-    var source = util$1.getArg(aArgs, 'source');
+    var source = util.getArg(aArgs, 'source');
     source = this._findSourceIndex(source);
     if (source < 0) {
       return {
@@ -37940,8 +37592,8 @@ BasicSourceMapConsumer.prototype.generatedPositionFor =
 
     var needle = {
       source: source,
-      originalLine: util$1.getArg(aArgs, 'line'),
-      originalColumn: util$1.getArg(aArgs, 'column')
+      originalLine: util.getArg(aArgs, 'line'),
+      originalColumn: util.getArg(aArgs, 'column')
     };
 
     var index = this._findMapping(
@@ -37949,8 +37601,8 @@ BasicSourceMapConsumer.prototype.generatedPositionFor =
       this._originalMappings,
       "originalLine",
       "originalColumn",
-      util$1.compareByOriginalPositions,
-      util$1.getArg(aArgs, 'bias', SourceMapConsumer$1.GREATEST_LOWER_BOUND)
+      util.compareByOriginalPositions,
+      util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND)
     );
 
     if (index >= 0) {
@@ -37958,9 +37610,9 @@ BasicSourceMapConsumer.prototype.generatedPositionFor =
 
       if (mapping.source === needle.source) {
         return {
-          line: util$1.getArg(mapping, 'generatedLine', null),
-          column: util$1.getArg(mapping, 'generatedColumn', null),
-          lastColumn: util$1.getArg(mapping, 'lastGeneratedColumn', null)
+          line: util.getArg(mapping, 'generatedLine', null),
+          column: util.getArg(mapping, 'generatedColumn', null),
+          lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
         };
       }
     }
@@ -37972,8 +37624,6 @@ BasicSourceMapConsumer.prototype.generatedPositionFor =
     };
   };
 
-sourceMapConsumer.BasicSourceMapConsumer = BasicSourceMapConsumer;
-
 /**
  * An IndexedSourceMapConsumer instance represents a parsed source map which
  * we can query for information. It differs from BasicSourceMapConsumer in
@@ -38026,11 +37676,11 @@ sourceMapConsumer.BasicSourceMapConsumer = BasicSourceMapConsumer;
 function IndexedSourceMapConsumer(aSourceMap, aSourceMapURL) {
   var sourceMap = aSourceMap;
   if (typeof aSourceMap === 'string') {
-    sourceMap = util$1.parseSourceMapInput(aSourceMap);
+    sourceMap = util.parseSourceMapInput(aSourceMap);
   }
 
-  var version = util$1.getArg(sourceMap, 'version');
-  var sections = util$1.getArg(sourceMap, 'sections');
+  var version = util.getArg(sourceMap, 'version');
+  var sections = util.getArg(sourceMap, 'sections');
 
   if (version != this._version) {
     throw new Error('Unsupported version: ' + version);
@@ -38049,9 +37699,9 @@ function IndexedSourceMapConsumer(aSourceMap, aSourceMapURL) {
       // See https://github.com/mozilla/source-map/issues/16
       throw new Error('Support for url field in sections not implemented.');
     }
-    var offset = util$1.getArg(s, 'offset');
-    var offsetLine = util$1.getArg(offset, 'line');
-    var offsetColumn = util$1.getArg(offset, 'column');
+    var offset = util.getArg(s, 'offset');
+    var offsetLine = util.getArg(offset, 'line');
+    var offsetColumn = util.getArg(offset, 'column');
 
     if (offsetLine < lastOffset.line ||
         (offsetLine === lastOffset.line && offsetColumn < lastOffset.column)) {
@@ -38066,13 +37716,13 @@ function IndexedSourceMapConsumer(aSourceMap, aSourceMapURL) {
         generatedLine: offsetLine + 1,
         generatedColumn: offsetColumn + 1
       },
-      consumer: new SourceMapConsumer$1(util$1.getArg(s, 'map'), aSourceMapURL)
+      consumer: new SourceMapConsumer(util.getArg(s, 'map'), aSourceMapURL)
     }
   });
 }
 
-IndexedSourceMapConsumer.prototype = Object.create(SourceMapConsumer$1.prototype);
-IndexedSourceMapConsumer.prototype.constructor = SourceMapConsumer$1;
+IndexedSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
+IndexedSourceMapConsumer.prototype.constructor = SourceMapConsumer;
 
 /**
  * The version of the source mapping spec that we are consuming.
@@ -38116,8 +37766,8 @@ Object.defineProperty(IndexedSourceMapConsumer.prototype, 'sources', {
 IndexedSourceMapConsumer.prototype.originalPositionFor =
   function IndexedSourceMapConsumer_originalPositionFor(aArgs) {
     var needle = {
-      generatedLine: util$1.getArg(aArgs, 'line'),
-      generatedColumn: util$1.getArg(aArgs, 'column')
+      generatedLine: util.getArg(aArgs, 'line'),
+      generatedColumn: util.getArg(aArgs, 'column')
     };
 
     // Find the section containing the generated position we're trying to map
@@ -38213,7 +37863,7 @@ IndexedSourceMapConsumer.prototype.generatedPositionFor =
 
       // Only consider this section if the requested source is in the list of
       // sources of the consumer.
-      if (section.consumer._findSourceIndex(util$1.getArg(aArgs, 'source')) === -1) {
+      if (section.consumer._findSourceIndex(util.getArg(aArgs, 'source')) === -1) {
         continue;
       }
       var generatedPosition = section.consumer.generatedPositionFor(aArgs);
@@ -38252,7 +37902,7 @@ IndexedSourceMapConsumer.prototype._parseMappings =
         var mapping = sectionMappings[j];
 
         var source = section.consumer._sources.at(mapping.source);
-        source = util$1.computeSourceURL(section.consumer.sourceRoot, source, this._sourceMapURL);
+        source = util.computeSourceURL(section.consumer.sourceRoot, source, this._sourceMapURL);
         this._sources.add(source);
         source = this._sources.indexOf(source);
 
@@ -38287,432 +37937,10 @@ IndexedSourceMapConsumer.prototype._parseMappings =
       }
     }
 
-    quickSort(this.__generatedMappings, util$1.compareByGeneratedPositionsDeflated);
-    quickSort(this.__originalMappings, util$1.compareByOriginalPositions);
-  };
-
-sourceMapConsumer.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
-
-/* -*- Mode: js; js-indent-level: 2; -*- */
-
-/*
- * Copyright 2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-var SourceMapGenerator = sourceMapGenerator.SourceMapGenerator;
-var util = util$5;
-
-// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
-// operating systems these days (capturing the result).
-var REGEX_NEWLINE = /(\r?\n)/;
-
-// Newline character code for charCodeAt() comparisons
-var NEWLINE_CODE = 10;
-
-// Private symbol for identifying `SourceNode`s when multiple versions of
-// the source-map library are loaded. This MUST NOT CHANGE across
-// versions!
-var isSourceNode = "$$$isSourceNode$$$";
-
-/**
- * SourceNodes provide a way to abstract over interpolating/concatenating
- * snippets of generated JavaScript source code while maintaining the line and
- * column information associated with the original source code.
- *
- * @param aLine The original line number.
- * @param aColumn The original column number.
- * @param aSource The original source's filename.
- * @param aChunks Optional. An array of strings which are snippets of
- *        generated JS, or other SourceNodes.
- * @param aName The original identifier.
- */
-function SourceNode(aLine, aColumn, aSource, aChunks, aName) {
-  this.children = [];
-  this.sourceContents = {};
-  this.line = aLine == null ? null : aLine;
-  this.column = aColumn == null ? null : aColumn;
-  this.source = aSource == null ? null : aSource;
-  this.name = aName == null ? null : aName;
-  this[isSourceNode] = true;
-  if (aChunks != null) this.add(aChunks);
-}
-
-/**
- * Creates a SourceNode from generated code and a SourceMapConsumer.
- *
- * @param aGeneratedCode The generated code
- * @param aSourceMapConsumer The SourceMap for the generated code
- * @param aRelativePath Optional. The path that relative sources in the
- *        SourceMapConsumer should be relative to.
- */
-SourceNode.fromStringWithSourceMap =
-  function SourceNode_fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) {
-    // The SourceNode we want to fill with the generated code
-    // and the SourceMap
-    var node = new SourceNode();
-
-    // All even indices of this array are one line of the generated code,
-    // while all odd indices are the newlines between two adjacent lines
-    // (since `REGEX_NEWLINE` captures its match).
-    // Processed fragments are accessed by calling `shiftNextLine`.
-    var remainingLines = aGeneratedCode.split(REGEX_NEWLINE);
-    var remainingLinesIndex = 0;
-    var shiftNextLine = function() {
-      var lineContents = getNextLine();
-      // The last line of a file might not have a newline.
-      var newLine = getNextLine() || "";
-      return lineContents + newLine;
-
-      function getNextLine() {
-        return remainingLinesIndex < remainingLines.length ?
-            remainingLines[remainingLinesIndex++] : undefined;
-      }
-    };
-
-    // We need to remember the position of "remainingLines"
-    var lastGeneratedLine = 1, lastGeneratedColumn = 0;
-
-    // The generate SourceNodes we need a code range.
-    // To extract it current and last mapping is used.
-    // Here we store the last mapping.
-    var lastMapping = null;
-
-    aSourceMapConsumer.eachMapping(function (mapping) {
-      if (lastMapping !== null) {
-        // We add the code from "lastMapping" to "mapping":
-        // First check if there is a new line in between.
-        if (lastGeneratedLine < mapping.generatedLine) {
-          // Associate first line with "lastMapping"
-          addMappingWithCode(lastMapping, shiftNextLine());
-          lastGeneratedLine++;
-          lastGeneratedColumn = 0;
-          // The remaining code is added without mapping
-        } else {
-          // There is no new line in between.
-          // Associate the code between "lastGeneratedColumn" and
-          // "mapping.generatedColumn" with "lastMapping"
-          var nextLine = remainingLines[remainingLinesIndex] || '';
-          var code = nextLine.substr(0, mapping.generatedColumn -
-                                        lastGeneratedColumn);
-          remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn -
-                                              lastGeneratedColumn);
-          lastGeneratedColumn = mapping.generatedColumn;
-          addMappingWithCode(lastMapping, code);
-          // No more remaining code, continue
-          lastMapping = mapping;
-          return;
-        }
-      }
-      // We add the generated code until the first mapping
-      // to the SourceNode without any mapping.
-      // Each line is added as separate string.
-      while (lastGeneratedLine < mapping.generatedLine) {
-        node.add(shiftNextLine());
-        lastGeneratedLine++;
-      }
-      if (lastGeneratedColumn < mapping.generatedColumn) {
-        var nextLine = remainingLines[remainingLinesIndex] || '';
-        node.add(nextLine.substr(0, mapping.generatedColumn));
-        remainingLines[remainingLinesIndex] = nextLine.substr(mapping.generatedColumn);
-        lastGeneratedColumn = mapping.generatedColumn;
-      }
-      lastMapping = mapping;
-    }, this);
-    // We have processed all mappings.
-    if (remainingLinesIndex < remainingLines.length) {
-      if (lastMapping) {
-        // Associate the remaining code in the current line with "lastMapping"
-        addMappingWithCode(lastMapping, shiftNextLine());
-      }
-      // and add the remaining lines without any mapping
-      node.add(remainingLines.splice(remainingLinesIndex).join(""));
-    }
-
-    // Copy sourcesContent into SourceNode
-    aSourceMapConsumer.sources.forEach(function (sourceFile) {
-      var content = aSourceMapConsumer.sourceContentFor(sourceFile);
-      if (content != null) {
-        if (aRelativePath != null) {
-          sourceFile = util.join(aRelativePath, sourceFile);
-        }
-        node.setSourceContent(sourceFile, content);
-      }
-    });
-
-    return node;
-
-    function addMappingWithCode(mapping, code) {
-      if (mapping === null || mapping.source === undefined) {
-        node.add(code);
-      } else {
-        var source = aRelativePath
-          ? util.join(aRelativePath, mapping.source)
-          : mapping.source;
-        node.add(new SourceNode(mapping.originalLine,
-                                mapping.originalColumn,
-                                source,
-                                code,
-                                mapping.name));
-      }
-    }
-  };
-
-/**
- * Add a chunk of generated JS to this source node.
- *
- * @param aChunk A string snippet of generated JS code, another instance of
- *        SourceNode, or an array where each member is one of those things.
- */
-SourceNode.prototype.add = function SourceNode_add(aChunk) {
-  if (Array.isArray(aChunk)) {
-    aChunk.forEach(function (chunk) {
-      this.add(chunk);
-    }, this);
-  }
-  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
-    if (aChunk) {
-      this.children.push(aChunk);
-    }
-  }
-  else {
-    throw new TypeError(
-      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
-    );
-  }
-  return this;
-};
-
-/**
- * Add a chunk of generated JS to the beginning of this source node.
- *
- * @param aChunk A string snippet of generated JS code, another instance of
- *        SourceNode, or an array where each member is one of those things.
- */
-SourceNode.prototype.prepend = function SourceNode_prepend(aChunk) {
-  if (Array.isArray(aChunk)) {
-    for (var i = aChunk.length-1; i >= 0; i--) {
-      this.prepend(aChunk[i]);
-    }
-  }
-  else if (aChunk[isSourceNode] || typeof aChunk === "string") {
-    this.children.unshift(aChunk);
-  }
-  else {
-    throw new TypeError(
-      "Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk
-    );
-  }
-  return this;
-};
-
-/**
- * Walk over the tree of JS snippets in this node and its children. The
- * walking function is called once for each snippet of JS and is passed that
- * snippet and the its original associated source's line/column location.
- *
- * @param aFn The traversal function.
- */
-SourceNode.prototype.walk = function SourceNode_walk(aFn) {
-  var chunk;
-  for (var i = 0, len = this.children.length; i < len; i++) {
-    chunk = this.children[i];
-    if (chunk[isSourceNode]) {
-      chunk.walk(aFn);
-    }
-    else {
-      if (chunk !== '') {
-        aFn(chunk, { source: this.source,
-                     line: this.line,
-                     column: this.column,
-                     name: this.name });
-      }
-    }
-  }
-};
-
-/**
- * Like `String.prototype.join` except for SourceNodes. Inserts `aStr` between
- * each of `this.children`.
- *
- * @param aSep The separator.
- */
-SourceNode.prototype.join = function SourceNode_join(aSep) {
-  var newChildren;
-  var i;
-  var len = this.children.length;
-  if (len > 0) {
-    newChildren = [];
-    for (i = 0; i < len-1; i++) {
-      newChildren.push(this.children[i]);
-      newChildren.push(aSep);
-    }
-    newChildren.push(this.children[i]);
-    this.children = newChildren;
-  }
-  return this;
-};
-
-/**
- * Call String.prototype.replace on the very right-most source snippet. Useful
- * for trimming whitespace from the end of a source node, etc.
- *
- * @param aPattern The pattern to replace.
- * @param aReplacement The thing to replace the pattern with.
- */
-SourceNode.prototype.replaceRight = function SourceNode_replaceRight(aPattern, aReplacement) {
-  var lastChild = this.children[this.children.length - 1];
-  if (lastChild[isSourceNode]) {
-    lastChild.replaceRight(aPattern, aReplacement);
-  }
-  else if (typeof lastChild === 'string') {
-    this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement);
-  }
-  else {
-    this.children.push(''.replace(aPattern, aReplacement));
-  }
-  return this;
-};
-
-/**
- * Set the source content for a source file. This will be added to the SourceMapGenerator
- * in the sourcesContent field.
- *
- * @param aSourceFile The filename of the source file
- * @param aSourceContent The content of the source file
- */
-SourceNode.prototype.setSourceContent =
-  function SourceNode_setSourceContent(aSourceFile, aSourceContent) {
-    this.sourceContents[util.toSetString(aSourceFile)] = aSourceContent;
-  };
-
-/**
- * Walk over the tree of SourceNodes. The walking function is called for each
- * source file content and is passed the filename and source content.
- *
- * @param aFn The traversal function.
- */
-SourceNode.prototype.walkSourceContents =
-  function SourceNode_walkSourceContents(aFn) {
-    for (var i = 0, len = this.children.length; i < len; i++) {
-      if (this.children[i][isSourceNode]) {
-        this.children[i].walkSourceContents(aFn);
-      }
-    }
-
-    var sources = Object.keys(this.sourceContents);
-    for (var i = 0, len = sources.length; i < len; i++) {
-      aFn(util.fromSetString(sources[i]), this.sourceContents[sources[i]]);
-    }
+    quickSort(this.__generatedMappings, util.compareByGeneratedPositionsDeflated);
+    quickSort(this.__originalMappings, util.compareByOriginalPositions);
   };
 
-/**
- * Return the string representation of this source node. Walks over the tree
- * and concatenates all the various snippets together to one string.
- */
-SourceNode.prototype.toString = function SourceNode_toString() {
-  var str = "";
-  this.walk(function (chunk) {
-    str += chunk;
-  });
-  return str;
-};
-
-/**
- * Returns the string representation of this source node along with a source
- * map.
- */
-SourceNode.prototype.toStringWithSourceMap = function SourceNode_toStringWithSourceMap(aArgs) {
-  var generated = {
-    code: "",
-    line: 1,
-    column: 0
-  };
-  var map = new SourceMapGenerator(aArgs);
-  var sourceMappingActive = false;
-  var lastOriginalSource = null;
-  var lastOriginalLine = null;
-  var lastOriginalColumn = null;
-  var lastOriginalName = null;
-  this.walk(function (chunk, original) {
-    generated.code += chunk;
-    if (original.source !== null
-        && original.line !== null
-        && original.column !== null) {
-      if(lastOriginalSource !== original.source
-         || lastOriginalLine !== original.line
-         || lastOriginalColumn !== original.column
-         || lastOriginalName !== original.name) {
-        map.addMapping({
-          source: original.source,
-          original: {
-            line: original.line,
-            column: original.column
-          },
-          generated: {
-            line: generated.line,
-            column: generated.column
-          },
-          name: original.name
-        });
-      }
-      lastOriginalSource = original.source;
-      lastOriginalLine = original.line;
-      lastOriginalColumn = original.column;
-      lastOriginalName = original.name;
-      sourceMappingActive = true;
-    } else if (sourceMappingActive) {
-      map.addMapping({
-        generated: {
-          line: generated.line,
-          column: generated.column
-        }
-      });
-      lastOriginalSource = null;
-      sourceMappingActive = false;
-    }
-    for (var idx = 0, length = chunk.length; idx < length; idx++) {
-      if (chunk.charCodeAt(idx) === NEWLINE_CODE) {
-        generated.line++;
-        generated.column = 0;
-        // Mappings end at eol
-        if (idx + 1 === length) {
-          lastOriginalSource = null;
-          sourceMappingActive = false;
-        } else if (sourceMappingActive) {
-          map.addMapping({
-            source: original.source,
-            original: {
-              line: original.line,
-              column: original.column
-            },
-            generated: {
-              line: generated.line,
-              column: generated.column
-            },
-            name: original.name
-          });
-        }
-      } else {
-        generated.column++;
-      }
-    }
-  });
-  this.walkSourceContents(function (sourceFile, sourceContent) {
-    map.setSourceContent(sourceFile, sourceContent);
-  });
-
-  return { code: generated.code, map: map };
-};
-
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-var SourceMapConsumer = sourceMapConsumer.SourceMapConsumer;
-
 /**
  * This file is refactored into TypeScript based on
  * https://github.com/preactjs/wmr/blob/main/packages/wmr/src/lib/rollup-plugin-container.js
@@ -38908,11 +38136,11 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
             if (err.loc && ctx instanceof TransformContext) {
                 const rawSourceMap = ctx._getCombinedSourcemap();
                 if (rawSourceMap) {
-                    const consumer = new SourceMapConsumer(rawSourceMap);
+                    const consumer = new SourceMapConsumer_1(rawSourceMap);
                     const { source, line, column } = consumer.originalPositionFor({
                         line: Number(err.loc.line),
                         column: Number(err.loc.column),
-                        bias: SourceMapConsumer.GREATEST_LOWER_BOUND
+                        bias: SourceMapConsumer_1.GREATEST_LOWER_BOUND
                     });
                     if (source) {
                         err.loc = { file: source, line, column };
@@ -39605,8 +38833,7 @@ function loadFallbackPlugin() {
     };
 }
 
-function resolveBuildOptions(root, raw, isBuild) {
-    var _a;
+function resolveBuildOptions(raw) {
     const resolved = {
         target: 'modules',
         polyfillModulePreload: true,
@@ -39641,35 +38868,6 @@ function resolveBuildOptions(root, raw, isBuild) {
             ...raw === null || raw === void 0 ? void 0 : raw.dynamicImportVarsOptions
         }
     };
-    const resolve = (p) => p.startsWith('\0') ? p : path__default.resolve(root, p);
-    resolved.outDir = resolve(resolved.outDir);
-    let input;
-    if ((_a = raw === null || raw === void 0 ? void 0 : raw.rollupOptions) === null || _a === void 0 ? void 0 : _a.input) {
-        input = Array.isArray(raw.rollupOptions.input)
-            ? raw.rollupOptions.input.map((input) => resolve(input))
-            : typeof raw.rollupOptions.input === 'object'
-                ? Object.fromEntries(Object.entries(raw.rollupOptions.input).map(([key, value]) => [
-                    key,
-                    resolve(value)
-                ]))
-                : resolve(raw.rollupOptions.input);
-    }
-    else if ((raw === null || raw === void 0 ? void 0 : raw.lib) && isBuild) {
-        input = resolve(raw.lib.entry);
-    }
-    else if (typeof (raw === null || raw === void 0 ? void 0 : raw.ssr) === 'string') {
-        input = resolve(raw.ssr);
-    }
-    else if (isBuild) {
-        input = resolve('index.html');
-    }
-    if (!!(raw === null || raw === void 0 ? void 0 : raw.ssr) && typeof input === 'string' && input.endsWith('.html')) {
-        throw new Error(`rollupOptions.input should not be an html file when building for SSR. ` +
-            `Please specify a dedicated SSR entry.`);
-    }
-    if (input) {
-        resolved.rollupOptions.input = input;
-    }
     // handle special build targets
     if (resolved.target === 'modules') {
         // Support browserslist
@@ -39749,18 +38947,27 @@ async function build(inlineConfig = {}) {
     }
 }
 async function doBuild(inlineConfig = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const config = await resolveConfig(inlineConfig, 'build', 'production');
     const options = config.build;
-    const input = options.rollupOptions.input;
-    const outDir = options.outDir;
     const ssr = !!options.ssr;
     const libOptions = options.lib;
     config.logger.info(colors$1.cyan(`vite v${require('vite/package.json').version} ${colors$1.green(`building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`)}`));
+    const resolve = (p) => path__default.resolve(config.root, p);
+    const input = libOptions
+        ? resolve(libOptions.entry)
+        : typeof options.ssr === 'string'
+            ? resolve(options.ssr)
+            : ((_a = options.rollupOptions) === null || _a === void 0 ? void 0 : _a.input) || resolve('index.html');
+    if (ssr && typeof input === 'string' && input.endsWith('.html')) {
+        throw new Error(`rollupOptions.input should not be an html file when building for SSR. ` +
+            `Please specify a dedicated SSR entry.`);
+    }
+    const outDir = resolve(options.outDir);
     // inject ssr arg to plugin load/transform hooks
     const plugins = (ssr ? config.plugins.map((p) => injectSsrFlagToHooks(p)) : config.plugins);
     // inject ssrExternal if present
-    const userExternal = (_a = options.rollupOptions) === null || _a === void 0 ? void 0 : _a.external;
+    const userExternal = (_b = options.rollupOptions) === null || _b === void 0 ? void 0 : _b.external;
     let external = userExternal;
     if (ssr) {
         // see if we have cached deps data available
@@ -39779,6 +38986,7 @@ async function doBuild(inlineConfig = {}) {
     }
     const rollup = require('rollup');
     const rollupOptions = {
+        input,
         context: 'globalThis',
         preserveEntrySignatures: ssr
             ? 'allow-extension'
@@ -39841,7 +39049,7 @@ async function doBuild(inlineConfig = {}) {
             };
         };
         // resolve lib mode outputs
-        const outputs = resolveBuildOutputs((_b = options.rollupOptions) === null || _b === void 0 ? void 0 : _b.output, libOptions, config.logger);
+        const outputs = resolveBuildOutputs((_c = options.rollupOptions) === null || _c === void 0 ? void 0 : _c.output, libOptions, config.logger);
         // watch file changes with rollup
         if (config.build.watch) {
             config.logger.info(colors$1.cyan(`\nwatching for file changes...`));
@@ -39867,7 +39075,7 @@ async function doBuild(inlineConfig = {}) {
                         ignored: [
                             '**/node_modules/**',
                             '**/.git/**',
-                            ...(((_c = watcherOptions === null || watcherOptions === void 0 ? void 0 : watcherOptions.chokidar) === null || _c === void 0 ? void 0 : _c.ignored) || [])
+                            ...(((_d = watcherOptions === null || watcherOptions === void 0 ? void 0 : watcherOptions.chokidar) === null || _d === void 0 ? void 0 : _d.ignored) || [])
                         ]
                     }
                 }
@@ -45829,7 +45037,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await Promise.resolve().then(function () { return require('./dep-885d4c21.js'); })).createCertificate();
+        const content = (await Promise.resolve().then(function () { return require('./dep-778bed46.js'); })).createCertificate();
         fs$n.promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => fs$n.promises.writeFile(cachePath, content))
@@ -56689,13 +55897,11 @@ function ssrRewriteStacktrace(stack, moduleGraph) {
             if (!rawSourceMap) {
                 return input;
             }
-            // In `source-map:v0.7.0+` this constructor returns a Promise...
-            // How can we make this block async?
-            const consumer = new SourceMapConsumer(rawSourceMap);
+            const consumer = new SourceMapConsumer_1(rawSourceMap);
             const pos = consumer.originalPositionFor({
                 line: Number(line) - offset,
                 column: Number(column),
-                bias: SourceMapConsumer.LEAST_UPPER_BOUND
+                bias: SourceMapConsumer_1.LEAST_UPPER_BOUND
             });
             if (!pos.source) {
                 return input;
@@ -57026,7 +56232,9 @@ function createMissingImporterRegisterFn(server) {
             const newData = (server._optimizeDepsMetadata = await optimizeDeps(server.config, true, false, newDeps, ssr));
             knownOptimized = newData.optimized;
             // update ssr externals
-            server._ssrExternals = resolveSSRExternal(server.config, Object.keys(knownOptimized));
+            if (ssr) {
+                server._ssrExternals = resolveSSRExternal(server.config, Object.keys(knownOptimized));
+            }
             logger.info(colors$1.green(`✨ dependencies updated, reloading page...`), {
                 timestamp: true
             });
@@ -57073,12 +56281,14 @@ function createMissingImporterRegisterFn(server) {
 const ROOT_FILES = [
     // '.git',
     // https://pnpm.js.org/workspaces/
-    'pnpm-workspace.yaml'
+    'pnpm-workspace.yaml',
     // https://rushjs.io/pages/advanced/config_files/
     // 'rush.json',
     // https://nx.dev/latest/react/getting-started/nx-setup
     // 'workspace.json',
-    // 'nx.json'
+    // 'nx.json',
+    // https://github.com/lerna/lerna#lernajson
+    'lerna.json'
 ];
 // npm: https://docs.npmjs.com/cli/v7/using-npm/workspaces#installing-workspaces
 // yarn: https://classic.yarnpkg.com/en/docs/workspaces/#toc-how-to-use-it
@@ -71349,52 +70559,33 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
     ].filter(Boolean);
 }
 
-var main$1 = {};
-
-/* @flow */
-
-/*::
-
-type DotenvParseOptions = {
-  debug?: boolean
-}
-
-// keys and values from src
-type DotenvParseOutput = { [string]: string }
-
-type DotenvConfigOptions = {
-  path?: string, // path to .env file
-  encoding?: string, // encoding of .env file
-  debug?: string // turn on logging for debugging purposes
-}
-
-type DotenvConfigOutput = {
-  parsed?: DotenvParseOutput,
-  error?: Error
-}
-
-*/
+var main$1 = {exports: {}};
 
 const fs = fs__default;
 const path = path__default;
 const os = require$$1__default;
 
-function log (message /*: string */) {
+function log (message) {
   console.log(`[dotenv][DEBUG] ${message}`);
 }
 
 const NEWLINE = '\n';
-const RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*(.*)?\s*$/;
+const RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*("[^"]*"|'[^']*'|.*?)(\s+#.*)?$/;
 const RE_NEWLINES = /\\n/g;
 const NEWLINES_MATCH = /\r\n|\n|\r/;
 
 // Parses src into an Object
-function parse (src /*: string | Buffer */, options /*: ?DotenvParseOptions */) /*: DotenvParseOutput */ {
+function parse (src, options) {
   const debug = Boolean(options && options.debug);
+  const multiline = Boolean(options && options.multiline);
   const obj = {};
 
   // convert Buffers before splitting into lines and processing
-  src.toString().split(NEWLINES_MATCH).forEach(function (line, idx) {
+  const lines = src.toString().split(NEWLINES_MATCH);
+
+  for (let idx = 0; idx < lines.length; idx++) {
+    let line = lines[idx];
+
     // matching "KEY' and 'VAL' in 'KEY=VAL'
     const keyValueArr = line.match(RE_INI_KEY_VAL);
     // matched?
@@ -71402,12 +70593,30 @@ function parse (src /*: string | Buffer */, options /*: ?DotenvParseOptions */)
       const key = keyValueArr[1];
       // default undefined or missing values to empty string
       let val = (keyValueArr[2] || '');
-      const end = val.length - 1;
+      let end = val.length - 1;
       const isDoubleQuoted = val[0] === '"' && val[end] === '"';
       const isSingleQuoted = val[0] === "'" && val[end] === "'";
 
+      const isMultilineDoubleQuoted = val[0] === '"' && val[end] !== '"';
+      const isMultilineSingleQuoted = val[0] === "'" && val[end] !== "'";
+
+      // if parsing line breaks and the value starts with a quote
+      if (multiline && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
+        const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
+
+        val = val.substring(1);
+
+        while (idx++ < lines.length - 1) {
+          line = lines[idx];
+          end = line.length - 1;
+          if (line[end] === quoteChar) {
+            val += NEWLINE + line.substring(0, end);
+            break
+          }
+          val += NEWLINE + line;
+        }
       // if single or double quoted, remove quotes
-      if (isSingleQuoted || isDoubleQuoted) {
+      } else if (isSingleQuoted || isDoubleQuoted) {
         val = val.substring(1, end);
 
         // if double quoted, expand newlines
@@ -71421,9 +70630,14 @@ function parse (src /*: string | Buffer */, options /*: ?DotenvParseOptions */)
 
       obj[key] = val;
     } else if (debug) {
-      log(`did not match key and value when parsing line ${idx + 1}: ${line}`);
+      const trimmedLine = line.trim();
+
+      // ignore empty and commented lines
+      if (trimmedLine.length && trimmedLine[0] !== '#') {
+        log(`Failed to match key and value when parsing line ${idx + 1}: ${line}`);
+      }
     }
-  });
+  }
 
   return obj
 }
@@ -71433,10 +70647,12 @@ function resolveHome (envPath) {
 }
 
 // Populates process.env from .env file
-function config (options /*: ?DotenvConfigOptions */) /*: DotenvConfigOutput */ {
+function config (options) {
   let dotenvPath = path.resolve(process.cwd(), '.env');
-  let encoding /*: string */ = 'utf8';
-  let debug = false;
+  let encoding = 'utf8';
+  const debug = Boolean(options && options.debug);
+  const override = Boolean(options && options.override);
+  const multiline = Boolean(options && options.multiline);
 
   if (options) {
     if (options.path != null) {
@@ -71445,31 +70661,50 @@ function config (options /*: ?DotenvConfigOptions */) /*: DotenvConfigOutput */
     if (options.encoding != null) {
       encoding = options.encoding;
     }
-    if (options.debug != null) {
-      debug = true;
-    }
   }
 
   try {
     // specifying an encoding returns a string instead of a buffer
-    const parsed = parse(fs.readFileSync(dotenvPath, { encoding }), { debug });
+    const parsed = DotenvModule.parse(fs.readFileSync(dotenvPath, { encoding }), { debug, multiline });
 
     Object.keys(parsed).forEach(function (key) {
       if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
         process.env[key] = parsed[key];
-      } else if (debug) {
-        log(`"${key}" is already defined in \`process.env\` and will not be overwritten`);
+      } else {
+        if (override === true) {
+          process.env[key] = parsed[key];
+        }
+
+        if (debug) {
+          if (override === true) {
+            log(`"${key}" is already defined in \`process.env\` and WAS overwritten`);
+          } else {
+            log(`"${key}" is already defined in \`process.env\` and was NOT overwritten`);
+          }
+        }
       }
     });
 
     return { parsed }
   } catch (e) {
+    if (debug) {
+      log(`Failed to load ${dotenvPath} ${e.message}`);
+    }
+
     return { error: e }
   }
 }
 
-main$1.config = config;
-main$1.parse = parse;
+const DotenvModule = {
+  config,
+  parse
+};
+
+main$1.exports.config = DotenvModule.config;
+main$1.exports.parse = DotenvModule.parse;
+main$1.exports = DotenvModule;
+
+var dotenv = main$1.exports;
 
 var dotenvExpand = function (config) {
   // if ignoring process.env, use a blank object
@@ -71622,7 +70857,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     }
     // resolve public base url
     const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger);
-    const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build, command === 'build');
+    const resolvedBuildOptions = resolveBuildOptions(config.build);
     // resolve cache directory
     const pkgPath = lookupFile(resolvedRoot, [`package.json`], true /* pathOnly */);
     const cacheDir = config.cacheDir
@@ -72100,6 +71335,7 @@ async function loadConfigFromBundledFile(fileName, bundledCode) {
     return config;
 }
 function loadEnv(mode, envDir, prefixes = 'VITE_') {
+    var _a;
     if (mode === 'local') {
         throw new Error(`"local" cannot be used as a mode name because it conflicts with ` +
             `the .local postfix for .env files.`);
@@ -72123,8 +71359,8 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     for (const file of envFiles) {
         const path = lookupFile(envDir, [file], true);
         if (path) {
-            const parsed = main$1.parse(fs__default.readFileSync(path), {
-                debug: !!process.env.DEBUG || undefined
+            const parsed = dotenv.parse(fs__default.readFileSync(path), {
+                debug: ((_a = process.env.DEBUG) === null || _a === void 0 ? void 0 : _a.includes('vite:dotenv')) || undefined
             });
             // let environment variables use each other
             main({
@@ -72138,7 +71374,8 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
                     env[key] === undefined) {
                     env[key] = value;
                 }
-                else if (key === 'NODE_ENV') {
+                else if (key === 'NODE_ENV' &&
+                    process.env.VITE_USER_NODE_ENV === undefined) {
                     // NODE_ENV override in .env file
                     process.env.VITE_USER_NODE_ENV = value;
                 }