- Revert prefer-named-capture-group due to apparently problematic Babel plugin

.eslintrc.js

@@ -140,7 +140,6 @@ module.exports = {
         root: "off"
       },
       rules: {
-        "node/no-unsupported-features/es-syntax": "off",
         "node/no-unsupported-features/node-builtins": "off"
       }
     },
@@ -188,6 +187,8 @@ module.exports = {
     }
   ],
   rules: {
+    // The Babel transform seems to have a problem converting these
+    "prefer-named-capture-group": "off",
     // Override these `ash-nazg/sauron` rules which are difficult for us
     //   to apply at this time
     "unicorn/prefer-string-slice": "off",

dist/canvg.js

@@ -98,44 +98,6 @@ var canvg = (function (exports) {
     return _construct.apply(null, arguments);
   }
 
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -244,71 +206,6 @@ var canvg = (function (exports) {
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * For parsing color values
    * @module RGBColor
@@ -463,11 +360,8 @@ var canvg = (function (exports) {
   }; // array of color definition objects
 
   var colorDefs = [{
-    re: _wrapRegExp(/^rgb\(([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3})\)$/, {
+    re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
-      r: 1,
+    // re: /^rgb\((?<r>\d{1,3}),\s*(?<g>\d{1,3}),\s*(?<b>\d{1,3})\)$/,
-      g: 2,
-      b: 3
-    }),
     example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
     process: function process(_) {
       for (var _len = arguments.length, bits = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -479,11 +373,8 @@ var canvg = (function (exports) {
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})$/, {
+    re: /^(\w{2})(\w{2})(\w{2})$/,
-      r: 1,
+    // re: /^(?<r>\w{2})(?<g>\w{2})(?<b>\w{2})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#00ff00', '336699'],
     process: function process(_) {
       for (var _len2 = arguments.length, bits = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
@@ -495,11 +386,8 @@ var canvg = (function (exports) {
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})$/, {
+    re: /^(\w{1})(\w{1})(\w{1})$/,
-      r: 1,
+    // re: /^(?<r>\w{1})(?<g>\w{1})(?<b>\w{1})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#fb0', 'f0f'],
     process: function process(_) {
       for (var _len3 = arguments.length, bits = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {

dist/extensions/ext-arrows.js

@@ -1,170 +1,6 @@
 var svgEditorExtension_arrows = (function () {
   'use strict';
 
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-
-    return _setPrototypeOf(o, p);
-  }
-
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * ext-arrows.js
    *
@@ -362,15 +198,14 @@ var svgEditorExtension_arrows = (function () {
                   return null;
                 }
 
-                var m = str.match(_wrapRegExp(/\(#(.+)\)/, {
+                var m = str.match(/\(#(.*)\)/); // const m = str.match(/\(#(?<id>.+)\)/);
-                  id: 1
+                // if (!m || !m.groups.id) {
-                }));
 
-                if (!m || !m.groups.id) {
+                if (!m || m.length !== 2) {
                   return null;
                 }
 
-                return svgCanvas.getElem(m.groups.id);
+                return svgCanvas.getElem(m[1]); // return svgCanvas.getElem(m.groups.id);
               };
 
               unsetArrowNonce = function _ref4(win) {

dist/extensions/ext-markers.js

@@ -1,170 +1,6 @@
 var svgEditorExtension_markers = (function () {
   'use strict';
 
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-
-    return _setPrototypeOf(o, p);
-  }
-
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * ext-markers.js
    *
@@ -641,15 +477,14 @@ var svgEditorExtension_markers = (function () {
                   return null;
                 }
 
-                var m = str.match(_wrapRegExp(/\(#(.+)\)/, {
+                var m = str.match(/\(#(.*)\)/); // const m = str.match(/\(#(?<id>.+)\)/);
-                  id: 1
+                // if (!m || !m.groups.id) {
-                }));
 
-                if (!m || !m.groups.id) {
+                if (!m || m.length !== 2) {
                   return null;
                 }
 
-                return svgCanvas.getElem(m.groups.id);
+                return svgCanvas.getElem(m[1]); // return svgCanvas.getElem(m.groups.id);
               };
 
               _context3.next = 15;

dist/extensions/ext-placemark.js

@@ -1,105 +1,6 @@
 var svgEditorExtension_placemark = (function () {
   'use strict';
 
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-
-    return _setPrototypeOf(o, p);
-  }
-
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _slicedToArray(arr, i) {
     return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
   }
@@ -142,71 +43,6 @@ var svgEditorExtension_placemark = (function () {
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * ext-placemark.js
    *
@@ -448,17 +284,17 @@ var svgEditorExtension_placemark = (function () {
 
                 if (!str) {
                   return null;
-                }
+                } // const m = str.match(/\(#(?<id>.+)\)/);
+                // if (!m || !m.groups.id) {
 
-                var m = str.match(_wrapRegExp(/\(#(.+)\)/, {
-                  id: 1
-                }));
 
-                if (!m || !m.groups.id) {
+                var m = str.match(/\(#(.*)\)/);
+
+                if (!m || m.length !== 2) {
                   return null;
                 }
 
-                return svgCanvas.getElem(m.groups.id);
+                return svgCanvas.getElem(m[1]); // return svgCanvas.getElem(m.groups.id);
               };
 
               showPanel = function _ref(on) {

dist/extensions/ext-server_moinsave.js

@@ -98,44 +98,6 @@ var svgEditorExtension_server_moinsave = (function () {
     return _construct.apply(null, arguments);
   }
 
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -244,71 +206,6 @@ var svgEditorExtension_server_moinsave = (function () {
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * For parsing color values
    * @module RGBColor
@@ -463,11 +360,8 @@ var svgEditorExtension_server_moinsave = (function () {
   }; // array of color definition objects
 
   var colorDefs = [{
-    re: _wrapRegExp(/^rgb\(([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3})\)$/, {
+    re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
-      r: 1,
+    // re: /^rgb\((?<r>\d{1,3}),\s*(?<g>\d{1,3}),\s*(?<b>\d{1,3})\)$/,
-      g: 2,
-      b: 3
-    }),
     example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
     process: function process(_) {
       for (var _len = arguments.length, bits = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -479,11 +373,8 @@ var svgEditorExtension_server_moinsave = (function () {
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})$/, {
+    re: /^(\w{2})(\w{2})(\w{2})$/,
-      r: 1,
+    // re: /^(?<r>\w{2})(?<g>\w{2})(?<b>\w{2})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#00ff00', '336699'],
     process: function process(_) {
       for (var _len2 = arguments.length, bits = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
@@ -495,11 +386,8 @@ var svgEditorExtension_server_moinsave = (function () {
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})$/, {
+    re: /^(\w{1})(\w{1})(\w{1})$/,
-      r: 1,
+    // re: /^(?<r>\w{1})(?<g>\w{1})(?<b>\w{1})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#fb0', 'f0f'],
     process: function process(_) {
       for (var _len3 = arguments.length, bits = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {

dist/extensions/ext-server_opensave.js

@@ -98,44 +98,6 @@ var svgEditorExtension_server_opensave = (function () {
     return _construct.apply(null, arguments);
   }
 
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -244,71 +206,6 @@ var svgEditorExtension_server_opensave = (function () {
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * For parsing color values
    * @module RGBColor
@@ -463,11 +360,8 @@ var svgEditorExtension_server_opensave = (function () {
   }; // array of color definition objects
 
   var colorDefs = [{
-    re: _wrapRegExp(/^rgb\(([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3})\)$/, {
+    re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
-      r: 1,
+    // re: /^rgb\((?<r>\d{1,3}),\s*(?<g>\d{1,3}),\s*(?<b>\d{1,3})\)$/,
-      g: 2,
-      b: 3
-    }),
     example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
     process: function process(_) {
       for (var _len = arguments.length, bits = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -479,11 +373,8 @@ var svgEditorExtension_server_opensave = (function () {
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})$/, {
+    re: /^(\w{2})(\w{2})(\w{2})$/,
-      r: 1,
+    // re: /^(?<r>\w{2})(?<g>\w{2})(?<b>\w{2})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#00ff00', '336699'],
     process: function process(_) {
       for (var _len2 = arguments.length, bits = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
@@ -495,11 +386,8 @@ var svgEditorExtension_server_opensave = (function () {
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})$/, {
+    re: /^(\w{1})(\w{1})(\w{1})$/,
-      r: 1,
+    // re: /^(?<r>\w{1})(?<g>\w{1})(?<b>\w{1})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#fb0', 'f0f'],
     process: function process(_) {
       for (var _len3 = arguments.length, bits = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {

dist/extensions/ext-storage.js

@@ -1,105 +1,6 @@
 var svgEditorExtension_storage = (function () {
   'use strict';
 
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-
-    return _setPrototypeOf(o, p);
-  }
-
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _slicedToArray(arr, i) {
     return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
   }
@@ -142,71 +43,6 @@ var svgEditorExtension_storage = (function () {
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * ext-storage.js
    *
@@ -257,11 +93,13 @@ var svgEditorExtension_storage = (function () {
         var loc = top.location; // Allow this to work with the embedded editor as well
 
         if (loc.href.includes('storagePrompt=')) {
-          loc.href = loc.href.replace(_wrapRegExp(/([&\?])storagePrompt=[\0-%'-\uFFFF]*(&?)/, {
+          /*
-            sep: 1,
+          loc.href = loc.href.replace(/(?<sep>[&?])storagePrompt=[^&]*(?<amp>&?)/, function (n0, sep, amp) {
-            amp: 2
+            return (val ? sep : '') + val + (!val && amp ? sep : (amp || ''));
-          }), function (n0, sep, amp) {
+          });
-            return (val ? sep : '') + val + (!val && amp ? sep : amp || '');
+          */
+          loc.href = loc.href.replace(/([&?])storagePrompt=[^&]*(&?)/, function (n0, n1, amp) {
+            return (val ? n1 : '') + val + (!val && amp ? n1 : amp || '');
           });
         } else {
           loc.href += (loc.href.includes('?') ? '&' : '?') + val;

dist/index-es.js

@@ -83,74 +83,6 @@ function _setPrototypeOf(o, p) {
   return _setPrototypeOf(o, p);
 }
 
-function isNativeReflectConstruct() {
-  if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-  if (Reflect.construct.sham) return false;
-  if (typeof Proxy === "function") return true;
-
-  try {
-    Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-function _construct(Parent, args, Class) {
-  if (isNativeReflectConstruct()) {
-    _construct = Reflect.construct;
-  } else {
-    _construct = function _construct(Parent, args, Class) {
-      var a = [null];
-      a.push.apply(a, args);
-      var Constructor = Function.bind.apply(Parent, a);
-      var instance = new Constructor();
-      if (Class) _setPrototypeOf(instance, Class.prototype);
-      return instance;
-    };
-  }
-
-  return _construct.apply(null, arguments);
-}
-
-function _isNativeFunction(fn) {
-  return Function.toString.call(fn).indexOf("[native code]") !== -1;
-}
-
-function _wrapNativeSuper(Class) {
-  var _cache = typeof Map === "function" ? new Map() : undefined;
-
-  _wrapNativeSuper = function _wrapNativeSuper(Class) {
-    if (Class === null || !_isNativeFunction(Class)) return Class;
-
-    if (typeof Class !== "function") {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-
-    if (typeof _cache !== "undefined") {
-      if (_cache.has(Class)) return _cache.get(Class);
-
-      _cache.set(Class, Wrapper);
-    }
-
-    function Wrapper() {
-      return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-    }
-
-    Wrapper.prototype = Object.create(Class.prototype, {
-      constructor: {
-        value: Wrapper,
-        enumerable: false,
-        writable: true,
-        configurable: true
-      }
-    });
-    return _setPrototypeOf(Wrapper, Class);
-  };
-
-  return _wrapNativeSuper(Class);
-}
-
 function _assertThisInitialized(self) {
   if (self === void 0) {
     throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -229,71 +161,6 @@ function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance");
 }
 
-function _wrapRegExp(re, groups) {
-  _wrapRegExp = function (re, groups) {
-    return new BabelRegExp(re, undefined, groups);
-  };
-
-  var _RegExp = _wrapNativeSuper(RegExp);
-
-  var _super = RegExp.prototype;
-
-  var _groups = new WeakMap();
-
-  function BabelRegExp(re, flags, groups) {
-    var _this = _RegExp.call(this, re, flags);
-
-    _groups.set(_this, groups || _groups.get(re));
-
-    return _this;
-  }
-
-  _inherits(BabelRegExp, _RegExp);
-
-  BabelRegExp.prototype.exec = function (str) {
-    var result = _super.exec.call(this, str);
-
-    if (result) result.groups = buildGroups(result, this);
-    return result;
-  };
-
-  BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-    if (typeof substitution === "string") {
-      var groups = _groups.get(this);
-
-      return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-        return "$" + groups[name];
-      }));
-    } else if (typeof substitution === "function") {
-      var _this = this;
-
-      return _super[Symbol.replace].call(this, str, function () {
-        var args = [];
-        args.push.apply(args, arguments);
-
-        if (typeof args[args.length - 1] !== "object") {
-          args.push(buildGroups(args, _this));
-        }
-
-        return substitution.apply(this, args);
-      });
-    } else {
-      return _super[Symbol.replace].call(this, str, substitution);
-    }
-  };
-
-  function buildGroups(result, re) {
-    var g = _groups.get(re);
-
-    return Object.keys(g).reduce(function (groups, name) {
-      groups[name] = result[g[name]];
-      return groups;
-    }, Object.create(null));
-  }
-
-  return _wrapRegExp.apply(this, arguments);
-}
-
 // http://ross.posterous.com/2008/08/19/iphone-touch-events-in-javascript/
 
 /**
@@ -3268,9 +3135,7 @@ function () {
       } // TODO: Add skew support in future
 
 
-      var re = _wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*((?:scale|matrix|rotate|translate)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\(.*?\))[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*,?[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*/, {
+      var re = /\s*((scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/; // const re = /\s*(?<xform>(?:scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
-        xform: 1
-      });
 
       var m = true;
 
@@ -3278,24 +3143,26 @@ function () {
         m = str.match(re);
         str = str.replace(re, '');
 
-        if (m && m.groups.xform) {
+        if (m && m[1]) {
           (function () {
-            var x = m.groups.xform;
+            var x = m[1];
-
+            var bits = x.split(/\s*\(/);
-            var _x$split = x.split(/\s*\(/),
+            var name = bits[0];
-                _x$split2 = _slicedToArray(_x$split, 2),
+            var valBits = bits[1].match(/\s*(.*?)\s*\)/);
-                name = _x$split2[0],
+            valBits[1] = valBits[1].replace(/(\d)-/g, '$1 -');
-                bits = _x$split2[1];
+            var valArr = valBits[1].split(/[, ]+/);
-
+            var letters = 'abcdef'.split('');
-            var valBits = bits.match(_wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*(.*?)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\)/, {
+            /*
-              nonWhitespace: 1
+            if (m && m.groups.xform) {
-            }));
+            const x = m.groups.xform;
-            valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(_wrapRegExp(/([0-9])\x2D/g, {
+            const [name, bits] = x.split(/\s*\(/);
-              digit: 1
+            const valBits = bits.match(/\s*(?<nonWhitespace>.*?)\s*\)/);
-            }), '$<digit> -');
+            valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(
-            var valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+              /(?<digit>\d)-/g, '$<digit> -'
-
+            );
-            var letters = _toConsumableArray('abcdef');
+            const valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+            const letters = [...'abcdef'];
+            */
 
             var mtx = svgroot.createSVGMatrix();
             Object.values(valArr).forEach(function (item, i) {
@@ -8067,10 +7934,7 @@ var init$2 = function init(editorContext) {
  */
 
 var dropXMLInteralSubset = function dropXMLInteralSubset(str) {
-  return str.replace(_wrapRegExp(/(<!DOCTYPE[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]+[0-9A-Z_a-z]*[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\[).*(\?\]>)/, {
+  return str.replace(/(<!DOCTYPE\s+\w*\s*\[).*(\?\]>)/, '$1$2'); // return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
-    doctypeOpen: 1,
-    doctypeClose: 2
-  }), '$<doctypeOpen>$<doctypeClose>');
 };
 /**
 * Converts characters in a string to XML-friendly entities.
@@ -8210,15 +8074,14 @@ var dataURLToObjectURL = function dataURLToObjectURL(dataurl) {
     return '';
   }
 
-  var _dataurl$split = dataurl.split(','),
+  var arr = dataurl.split(','),
-      _dataurl$split2 = _slicedToArray(_dataurl$split, 2),
+      mime = arr[0].match(/:(.*?);/)[1],
-      prefix = _dataurl$split2[0],
+      bstr = atob(arr[1]);
-      suffix = _dataurl$split2[1],
+  /*
-      _prefix$match = prefix.match(_wrapRegExp(/:(.*?);/, {
+  const [prefix, suffix] = dataurl.split(','),
-    mime: 1
+    {groups: {mime}} = prefix.match(/:(?<mime>.*?);/),
-  })),
+    bstr = atob(suffix);
-      mime = _prefix$match.groups.mime,
+  */
-      bstr = atob(suffix);
 
   var n = bstr.length;
   var u8arr = new Uint8Array(n);
@@ -8271,7 +8134,6 @@ var blankPageObjectURL = function () {
 
 var text2xml = function text2xml(sXML) {
   if (sXML.includes('<svg:svg')) {
-    // eslint-disable-next-line prefer-named-capture-group
     sXML = sXML.replace(/<(\/?)svg:/g, '<$1').replace('xmlns:svg', 'xmlns');
   }
 
@@ -11695,9 +11557,8 @@ var sanitizeSvg = function sanitizeSvg(node) {
           case 'gradientTransform':
           case 'patternTransform':
             {
-              var val = attr.value.replace(_wrapRegExp(/([0-9])\x2D/g, {
+              var val = attr.value.replace(/(\d)-/g, '$1 -'); // const val = attr.value.replace(/(?<digit>\d)-/g, '$<digit> -');
-                digit: 1
+
-              }), '$<digit> -');
               node.setAttribute(attrName, val);
               break;
             }
@@ -18663,12 +18524,11 @@ function SvgCanvas(container, config) {
         if (val) {
           if (val.startsWith('data:')) {
             // Check if an SVG-edit data URI
-            var m = val.match(_wrapRegExp(/svgedit_url=(.*?);/, {
+            var m = val.match(/svgedit_url=(.*?);/); // const m = val.match(/svgedit_url=(?<url>.*?);/);
-              url: 1
-            }));
 
             if (m) {
-              var url = decodeURIComponent(m.groups.url);
+              var url = decodeURIComponent(m[1]); // const url = decodeURIComponent(m.groups.url);
+
               $$9(new Image()).load(function () {
                 image.setAttributeNS(NS.XLINK, 'xlink:href', url);
               }).attr('src', url);
@@ -29663,9 +29523,7 @@ editor.init = function () {
         if (!src) {
           // urldata.source may have been null if it ended with '='
           if (qstr.includes('source=data:')) {
-            src = qstr.match(_wrapRegExp(/source=(data:[\0-%'-\uFFFF]*)/, {
+            src = qstr.match(/source=(data:[^&]*)/)[1]; // ({src} = qstr.match(/source=(?<src>data:[^&]*)/).groups);
-              src: 1
-            })).groups.src;
           }
         }
 
@@ -29759,9 +29617,7 @@ editor.init = function () {
                 while (1) {
                   switch (_context3.prev = _context3.next) {
                     case 0:
-                      extName = extname.match(_wrapRegExp(/^ext\x2D(.+)\.js/, {
+                      extName = extname.match(/^ext-(.+)\.js/); // const {extName} = extname.match(/^ext-(?<extName>.+)\.js/).groups;
-                        extName: 1
-                      })).groups.extName;
 
                       if (extName) {
                         _context3.next = 3;
@@ -29784,12 +29640,14 @@ editor.init = function () {
                       _context3.prev = 4;
                       _context3.next = 7;
                       return regeneratorRuntime.awrap(importSetGlobalDefault(url, {
-                        global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+                        global: 'svgEditorExtension_' + extName[1].replace(/-/g, '_') // global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+
                       }));
 
                     case 7:
                       imported = _context3.sent;
-                      _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName : _imported$name, init = imported.init;
+                      _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName[1] : _imported$name, init = imported.init; // const {name = extName, init} = imported;
+
                       importLocale = getImportLocale({
                         defaultLang: langParam,
                         defaultName: _name2

dist/index-umd.js

@@ -89,74 +89,6 @@
     return _setPrototypeOf(o, p);
   }
 
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -235,71 +167,6 @@
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   // http://ross.posterous.com/2008/08/19/iphone-touch-events-in-javascript/
 
   /**
@@ -3274,9 +3141,7 @@
         } // TODO: Add skew support in future
 
 
-        var re = _wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*((?:scale|matrix|rotate|translate)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\(.*?\))[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*,?[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*/, {
+        var re = /\s*((scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/; // const re = /\s*(?<xform>(?:scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
-          xform: 1
-        });
 
         var m = true;
 
@@ -3284,24 +3149,26 @@
           m = str.match(re);
           str = str.replace(re, '');
 
-          if (m && m.groups.xform) {
+          if (m && m[1]) {
             (function () {
-              var x = m.groups.xform;
+              var x = m[1];
-
+              var bits = x.split(/\s*\(/);
-              var _x$split = x.split(/\s*\(/),
+              var name = bits[0];
-                  _x$split2 = _slicedToArray(_x$split, 2),
+              var valBits = bits[1].match(/\s*(.*?)\s*\)/);
-                  name = _x$split2[0],
+              valBits[1] = valBits[1].replace(/(\d)-/g, '$1 -');
-                  bits = _x$split2[1];
+              var valArr = valBits[1].split(/[, ]+/);
-
+              var letters = 'abcdef'.split('');
-              var valBits = bits.match(_wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*(.*?)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\)/, {
+              /*
-                nonWhitespace: 1
+              if (m && m.groups.xform) {
-              }));
+              const x = m.groups.xform;
-              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(_wrapRegExp(/([0-9])\x2D/g, {
+              const [name, bits] = x.split(/\s*\(/);
-                digit: 1
+              const valBits = bits.match(/\s*(?<nonWhitespace>.*?)\s*\)/);
-              }), '$<digit> -');
+              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(
-              var valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+                /(?<digit>\d)-/g, '$<digit> -'
-
+              );
-              var letters = _toConsumableArray('abcdef');
+              const valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+              const letters = [...'abcdef'];
+              */
 
               var mtx = svgroot.createSVGMatrix();
               Object.values(valArr).forEach(function (item, i) {
@@ -8073,10 +7940,7 @@
    */
 
   var dropXMLInteralSubset = function dropXMLInteralSubset(str) {
-    return str.replace(_wrapRegExp(/(<!DOCTYPE[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]+[0-9A-Z_a-z]*[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\[).*(\?\]>)/, {
+    return str.replace(/(<!DOCTYPE\s+\w*\s*\[).*(\?\]>)/, '$1$2'); // return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
-      doctypeOpen: 1,
-      doctypeClose: 2
-    }), '$<doctypeOpen>$<doctypeClose>');
   };
   /**
   * Converts characters in a string to XML-friendly entities.
@@ -8216,15 +8080,14 @@
       return '';
     }
 
-    var _dataurl$split = dataurl.split(','),
+    var arr = dataurl.split(','),
-        _dataurl$split2 = _slicedToArray(_dataurl$split, 2),
+        mime = arr[0].match(/:(.*?);/)[1],
-        prefix = _dataurl$split2[0],
+        bstr = atob(arr[1]);
-        suffix = _dataurl$split2[1],
+    /*
-        _prefix$match = prefix.match(_wrapRegExp(/:(.*?);/, {
+    const [prefix, suffix] = dataurl.split(','),
-      mime: 1
+      {groups: {mime}} = prefix.match(/:(?<mime>.*?);/),
-    })),
+      bstr = atob(suffix);
-        mime = _prefix$match.groups.mime,
+    */
-        bstr = atob(suffix);
 
     var n = bstr.length;
     var u8arr = new Uint8Array(n);
@@ -8277,7 +8140,6 @@
 
   var text2xml = function text2xml(sXML) {
     if (sXML.includes('<svg:svg')) {
-      // eslint-disable-next-line prefer-named-capture-group
       sXML = sXML.replace(/<(\/?)svg:/g, '<$1').replace('xmlns:svg', 'xmlns');
     }
 
@@ -11701,9 +11563,8 @@
             case 'gradientTransform':
             case 'patternTransform':
               {
-                var val = attr.value.replace(_wrapRegExp(/([0-9])\x2D/g, {
+                var val = attr.value.replace(/(\d)-/g, '$1 -'); // const val = attr.value.replace(/(?<digit>\d)-/g, '$<digit> -');
-                  digit: 1
+
-                }), '$<digit> -');
                 node.setAttribute(attrName, val);
                 break;
               }
@@ -18669,12 +18530,11 @@
           if (val) {
             if (val.startsWith('data:')) {
               // Check if an SVG-edit data URI
-              var m = val.match(_wrapRegExp(/svgedit_url=(.*?);/, {
+              var m = val.match(/svgedit_url=(.*?);/); // const m = val.match(/svgedit_url=(?<url>.*?);/);
-                url: 1
-              }));
 
               if (m) {
-                var url = decodeURIComponent(m.groups.url);
+                var url = decodeURIComponent(m[1]); // const url = decodeURIComponent(m.groups.url);
+
                 $$9(new Image()).load(function () {
                   image.setAttributeNS(NS.XLINK, 'xlink:href', url);
                 }).attr('src', url);
@@ -29669,9 +29529,7 @@
           if (!src) {
             // urldata.source may have been null if it ended with '='
             if (qstr.includes('source=data:')) {
-              src = qstr.match(_wrapRegExp(/source=(data:[\0-%'-\uFFFF]*)/, {
+              src = qstr.match(/source=(data:[^&]*)/)[1]; // ({src} = qstr.match(/source=(?<src>data:[^&]*)/).groups);
-                src: 1
-              })).groups.src;
             }
           }
 
@@ -29765,9 +29623,7 @@
                   while (1) {
                     switch (_context3.prev = _context3.next) {
                       case 0:
-                        extName = extname.match(_wrapRegExp(/^ext\x2D(.+)\.js/, {
+                        extName = extname.match(/^ext-(.+)\.js/); // const {extName} = extname.match(/^ext-(?<extName>.+)\.js/).groups;
-                          extName: 1
-                        })).groups.extName;
 
                         if (extName) {
                           _context3.next = 3;
@@ -29790,12 +29646,14 @@
                         _context3.prev = 4;
                         _context3.next = 7;
                         return regeneratorRuntime.awrap(importSetGlobalDefault(url, {
-                          global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+                          global: 'svgEditorExtension_' + extName[1].replace(/-/g, '_') // global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+
                         }));
 
                       case 7:
                         imported = _context3.sent;
-                        _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName : _imported$name, init = imported.init;
+                        _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName[1] : _imported$name, init = imported.init; // const {name = extName, init} = imported;
+
                         importLocale = getImportLocale({
                           defaultLang: langParam,
                           defaultName: _name2

dist/jspdf.plugin.svgToPdf.js

@@ -23,105 +23,6 @@
     return Constructor;
   }
 
-  function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
-  }
-
-  function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-      return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
-  }
-
-  function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-      o.__proto__ = p;
-      return o;
-    };
-
-    return _setPrototypeOf(o, p);
-  }
-
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _slicedToArray(arr, i) {
     return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
   }
@@ -184,71 +85,6 @@
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /**
    * For parsing color values
    * @module RGBColor
@@ -403,11 +239,8 @@
   }; // array of color definition objects
 
   var colorDefs = [{
-    re: _wrapRegExp(/^rgb\(([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3}),[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*([0-9]{1,3})\)$/, {
+    re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
-      r: 1,
+    // re: /^rgb\((?<r>\d{1,3}),\s*(?<g>\d{1,3}),\s*(?<b>\d{1,3})\)$/,
-      g: 2,
-      b: 3
-    }),
     example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
     process: function process(_) {
       for (var _len = arguments.length, bits = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -419,11 +252,8 @@
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})([0-9A-Z_a-z]{2})$/, {
+    re: /^(\w{2})(\w{2})(\w{2})$/,
-      r: 1,
+    // re: /^(?<r>\w{2})(?<g>\w{2})(?<b>\w{2})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#00ff00', '336699'],
     process: function process(_) {
       for (var _len2 = arguments.length, bits = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
@@ -435,11 +265,8 @@
       });
     }
   }, {
-    re: _wrapRegExp(/^([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})([0-9A-Z_a-z]{1})$/, {
+    re: /^(\w{1})(\w{1})(\w{1})$/,
-      r: 1,
+    // re: /^(?<r>\w{1})(?<g>\w{1})(?<b>\w{1})$/,
-      g: 2,
-      b: 3
-    }),
     example: ['#fb0', 'f0f'],
     process: function process(_) {
       for (var _len3 = arguments.length, bits = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {

dist/svgcanvas-iife.js

@@ -68,74 +68,6 @@ var SvgCanvas = (function () {
     return _setPrototypeOf(o, p);
   }
 
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -214,71 +146,6 @@ var SvgCanvas = (function () {
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   /* globals SVGPathSeg, SVGPathSegMovetoRel, SVGPathSegMovetoAbs,
       SVGPathSegMovetoRel, SVGPathSegLinetoRel, SVGPathSegLinetoAbs,
       SVGPathSegLinetoHorizontalRel, SVGPathSegLinetoHorizontalAbs,
@@ -3383,9 +3250,7 @@ var SvgCanvas = (function () {
         } // TODO: Add skew support in future
 
 
-        var re = _wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*((?:scale|matrix|rotate|translate)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\(.*?\))[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*,?[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*/, {
+        var re = /\s*((scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/; // const re = /\s*(?<xform>(?:scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
-          xform: 1
-        });
 
         var m = true;
 
@@ -3393,24 +3258,26 @@ var SvgCanvas = (function () {
           m = str.match(re);
           str = str.replace(re, '');
 
-          if (m && m.groups.xform) {
+          if (m && m[1]) {
             (function () {
-              var x = m.groups.xform;
+              var x = m[1];
-
+              var bits = x.split(/\s*\(/);
-              var _x$split = x.split(/\s*\(/),
+              var name = bits[0];
-                  _x$split2 = _slicedToArray(_x$split, 2),
+              var valBits = bits[1].match(/\s*(.*?)\s*\)/);
-                  name = _x$split2[0],
+              valBits[1] = valBits[1].replace(/(\d)-/g, '$1 -');
-                  bits = _x$split2[1];
+              var valArr = valBits[1].split(/[, ]+/);
-
+              var letters = 'abcdef'.split('');
-              var valBits = bits.match(_wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*(.*?)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\)/, {
+              /*
-                nonWhitespace: 1
+              if (m && m.groups.xform) {
-              }));
+              const x = m.groups.xform;
-              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(_wrapRegExp(/([0-9])\x2D/g, {
+              const [name, bits] = x.split(/\s*\(/);
-                digit: 1
+              const valBits = bits.match(/\s*(?<nonWhitespace>.*?)\s*\)/);
-              }), '$<digit> -');
+              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(
-              var valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+                /(?<digit>\d)-/g, '$<digit> -'
-
+              );
-              var letters = _toConsumableArray('abcdef');
+              const valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+              const letters = [...'abcdef'];
+              */
 
               var mtx = svgroot.createSVGMatrix();
               Object.values(valArr).forEach(function (item, i) {
@@ -8139,10 +8006,7 @@ var SvgCanvas = (function () {
    */
 
   var dropXMLInteralSubset = function dropXMLInteralSubset(str) {
-    return str.replace(_wrapRegExp(/(<!DOCTYPE[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]+[0-9A-Z_a-z]*[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\[).*(\?\]>)/, {
+    return str.replace(/(<!DOCTYPE\s+\w*\s*\[).*(\?\]>)/, '$1$2'); // return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
-      doctypeOpen: 1,
-      doctypeClose: 2
-    }), '$<doctypeOpen>$<doctypeClose>');
   };
   /**
   * Converts characters in a string to XML-friendly entities.
@@ -8282,15 +8146,14 @@ var SvgCanvas = (function () {
       return '';
     }
 
-    var _dataurl$split = dataurl.split(','),
+    var arr = dataurl.split(','),
-        _dataurl$split2 = _slicedToArray(_dataurl$split, 2),
+        mime = arr[0].match(/:(.*?);/)[1],
-        prefix = _dataurl$split2[0],
+        bstr = atob(arr[1]);
-        suffix = _dataurl$split2[1],
+    /*
-        _prefix$match = prefix.match(_wrapRegExp(/:(.*?);/, {
+    const [prefix, suffix] = dataurl.split(','),
-      mime: 1
+      {groups: {mime}} = prefix.match(/:(?<mime>.*?);/),
-    })),
+      bstr = atob(suffix);
-        mime = _prefix$match.groups.mime,
+    */
-        bstr = atob(suffix);
 
     var n = bstr.length;
     var u8arr = new Uint8Array(n);
@@ -8343,7 +8206,6 @@ var SvgCanvas = (function () {
 
   var text2xml = function text2xml(sXML) {
     if (sXML.includes('<svg:svg')) {
-      // eslint-disable-next-line prefer-named-capture-group
       sXML = sXML.replace(/<(\/?)svg:/g, '<$1').replace('xmlns:svg', 'xmlns');
     }
 
@@ -11271,9 +11133,8 @@ var SvgCanvas = (function () {
             case 'gradientTransform':
             case 'patternTransform':
               {
-                var val = attr.value.replace(_wrapRegExp(/([0-9])\x2D/g, {
+                var val = attr.value.replace(/(\d)-/g, '$1 -'); // const val = attr.value.replace(/(?<digit>\d)-/g, '$<digit> -');
-                  digit: 1
+
-                }), '$<digit> -');
                 node.setAttribute(attrName, val);
                 break;
               }
@@ -18441,12 +18302,11 @@ var SvgCanvas = (function () {
           if (val) {
             if (val.startsWith('data:')) {
               // Check if an SVG-edit data URI
-              var m = val.match(_wrapRegExp(/svgedit_url=(.*?);/, {
+              var m = val.match(/svgedit_url=(.*?);/); // const m = val.match(/svgedit_url=(?<url>.*?);/);
-                url: 1
-              }));
 
               if (m) {
-                var url = decodeURIComponent(m.groups.url);
+                var url = decodeURIComponent(m[1]); // const url = decodeURIComponent(m.groups.url);
+
                 $$8(new Image()).load(function () {
                   image.setAttributeNS(NS.XLINK, 'xlink:href', url);
                 }).attr('src', url);

editor/canvg/canvg.js

@@ -1,4 +1,4 @@
-/* eslint-disable new-cap, class-methods-use-this, prefer-named-capture-group */
+/* eslint-disable new-cap, class-methods-use-this */
 // Todo: Compare with latest canvg (add any improvements of ours) and add full JSDocs (denoting links to standard APIs and which are custom): https://github.com/canvg/canvg
 /**
  * canvg.js - Javascript SVG parser and renderer on Canvas

editor/canvg/rgbcolor.js

@@ -154,21 +154,24 @@ const simpleColors = {
 // array of color definition objects
 const colorDefs = [
   {
-    re: /^rgb\((?<r>\d{1,3}),\s*(?<g>\d{1,3}),\s*(?<b>\d{1,3})\)$/,
+    re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
+    // re: /^rgb\((?<r>\d{1,3}),\s*(?<g>\d{1,3}),\s*(?<b>\d{1,3})\)$/,
     example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
     process (_, ...bits) {
       return bits.map((b) => parseInt(b));
     }
   },
   {
-    re: /^(?<r>\w{2})(?<g>\w{2})(?<b>\w{2})$/,
+    re: /^(\w{2})(\w{2})(\w{2})$/,
+    // re: /^(?<r>\w{2})(?<g>\w{2})(?<b>\w{2})$/,
     example: ['#00ff00', '336699'],
     process (_, ...bits) {
       return bits.map((b) => parseInt(b, 16));
     }
   },
   {
-    re: /^(?<r>\w{1})(?<g>\w{1})(?<b>\w{1})$/,
+    re: /^(\w{1})(\w{1})(\w{1})$/,
+    // re: /^(?<r>\w{1})(?<g>\w{1})(?<b>\w{1})$/,
     example: ['#fb0', 'f0f'],
     process (_, ...bits) {
       return bits.map((b) => parseInt(b + b, 16));

editor/embedapi-dom.js

@@ -97,7 +97,6 @@ const iframe = $('<iframe width="900px" height="600px" id="svgedit"></iframe>');
 iframe[0].src = frameBase + framePath +
   (location.href.includes('?')
     // ? location.href.replace(/\?(?<search>.*)$/, '&$<search>')
-    // eslint-disable-next-line prefer-named-capture-group
     ? location.href.replace(/\?(.*)$/, '&$1')
     : ''); // Append arguments to this file onto the iframe
 

editor/extensions/ext-arrows.js

@@ -65,11 +65,14 @@ export default {
     function getLinked (elem, attr) {
       const str = elem.getAttribute(attr);
       if (!str) { return null; }
-      const m = str.match(/\(#(?<id>.+)\)/);
+      const m = str.match(/\(#(.*)\)/);
-      if (!m || !m.groups.id) {
+      // const m = str.match(/\(#(?<id>.+)\)/);
+      // if (!m || !m.groups.id) {
+      if (!m || m.length !== 2) {
         return null;
       }
-      return svgCanvas.getElem(m.groups.id);
+      return svgCanvas.getElem(m[1]);
+      // return svgCanvas.getElem(m.groups.id);
     }
 
     /**

editor/extensions/ext-markers.js

@@ -86,11 +86,14 @@ export default {
     function getLinked (elem, attr) {
       const str = elem.getAttribute(attr);
       if (!str) { return null; }
-      const m = str.match(/\(#(?<id>.+)\)/);
+      const m = str.match(/\(#(.*)\)/);
-      if (!m || !m.groups.id) {
+      // const m = str.match(/\(#(?<id>.+)\)/);
+      // if (!m || !m.groups.id) {
+      if (!m || m.length !== 2) {
         return null;
       }
-      return svgCanvas.getElem(m.groups.id);
+      return svgCanvas.getElem(m[1]);
+      // return svgCanvas.getElem(m.groups.id);
     }
 
     /**

editor/extensions/ext-placemark.js

@@ -70,11 +70,15 @@ export default {
       if (!elem) { return null; }
       const str = elem.getAttribute(attr);
       if (!str) { return null; }
-      const m = str.match(/\(#(?<id>.+)\)/);
+
-      if (!m || !m.groups.id) {
+      // const m = str.match(/\(#(?<id>.+)\)/);
+      // if (!m || !m.groups.id) {
+      const m = str.match(/\(#(.*)\)/);
+      if (!m || m.length !== 2) {
         return null;
       }
-      return svgCanvas.getElem(m.groups.id);
+      return svgCanvas.getElem(m[1]);
+      // return svgCanvas.getElem(m.groups.id);
     }
 
     /**

editor/extensions/ext-storage.js

@@ -56,9 +56,14 @@ export default {
       val = val ? 'storagePrompt=' + val : '';
       const loc = top.location; // Allow this to work with the embedded editor as well
       if (loc.href.includes('storagePrompt=')) {
+        /*
         loc.href = loc.href.replace(/(?<sep>[&?])storagePrompt=[^&]*(?<amp>&?)/, function (n0, sep, amp) {
           return (val ? sep : '') + val + (!val && amp ? sep : (amp || ''));
         });
+        */
+        loc.href = loc.href.replace(/([&?])storagePrompt=[^&]*(&?)/, function (n0, n1, amp) {
+          return (val ? n1 : '') + val + (!val && amp ? n1 : (amp || ''));
+        });
       } else {
         loc.href += (loc.href.includes('?') ? '&' : '?') + val;
       }

editor/sanitize.js

@@ -166,7 +166,8 @@ export const sanitizeSvg = function (node) {
         case 'transform':
         case 'gradientTransform':
         case 'patternTransform': {
-          const val = attr.value.replace(/(?<digit>\d)-/g, '$<digit> -');
+          const val = attr.value.replace(/(\d)-/g, '$1 -');
+          // const val = attr.value.replace(/(?<digit>\d)-/g, '$<digit> -');
           node.setAttribute(attrName, val);
           break;
         }

editor/svg-editor.js

@@ -757,7 +757,8 @@ editor.init = function () {
         qstr = $.param.querystring();
         if (!src) { // urldata.source may have been null if it ended with '='
           if (qstr.includes('source=data:')) {
-            ({src} = qstr.match(/source=(?<src>data:[^&]*)/).groups);
+            src = qstr.match(/source=(data:[^&]*)/)[1];
+            // ({src} = qstr.match(/source=(?<src>data:[^&]*)/).groups);
           }
         }
         if (src) {
@@ -820,7 +821,8 @@ editor.init = function () {
     try {
       await Promise.all(
         curConfig.extensions.map(async (extname) => {
-          const {extName} = extname.match(/^ext-(?<extName>.+)\.js/).groups;
+          const extName = extname.match(/^ext-(.+)\.js/);
+          // const {extName} = extname.match(/^ext-(?<extName>.+)\.js/).groups;
           if (!extName) { // Ensure URL cannot specify some other unintended file in the extPath
             return undefined;
           }
@@ -838,9 +840,11 @@ editor.init = function () {
              * @type {module:SVGEditor.ExtensionObject}
              */
             const imported = await importSetGlobalDefault(url, {
-              global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+              global: 'svgEditorExtension_' + extName[1].replace(/-/g, '_')
+              // global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
             });
-            const {name = extName, init} = imported;
+            const {name = extName[1], init} = imported;
+            // const {name = extName, init} = imported;
             const importLocale = getImportLocale({defaultLang: langParam, defaultName: name});
             return editor.addExtension(name, (init && init.bind(editor)), {$, importLocale});
           } catch (err) {

editor/svgcanvas.js

@@ -4532,9 +4532,11 @@ this.setSvgString = function (xmlString, preventUndo) {
       if (val) {
         if (val.startsWith('data:')) {
           // Check if an SVG-edit data URI
-          const m = val.match(/svgedit_url=(?<url>.*?);/);
+          const m = val.match(/svgedit_url=(.*?);/);
+          // const m = val.match(/svgedit_url=(?<url>.*?);/);
           if (m) {
-            const url = decodeURIComponent(m.groups.url);
+            const url = decodeURIComponent(m[1]);
+            // const url = decodeURIComponent(m.groups.url);
             $(new Image()).load(function () {
               image.setAttributeNS(NS.XLINK, 'xlink:href', url);
             }).attr('src', url);

editor/svgtransformlist.js

@@ -145,11 +145,21 @@ export class SVGTransformList { // eslint-disable-line no-shadow
       if (!str) { return; }
 
       // TODO: Add skew support in future
-      const re = /\s*(?<xform>(?:scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
+      const re = /\s*((scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
+      // const re = /\s*(?<xform>(?:scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
       let m = true;
       while (m) {
         m = str.match(re);
         str = str.replace(re, '');
+        if (m && m[1]) {
+          const x = m[1];
+          const bits = x.split(/\s*\(/);
+          const name = bits[0];
+          const valBits = bits[1].match(/\s*(.*?)\s*\)/);
+          valBits[1] = valBits[1].replace(/(\d)-/g, '$1 -');
+          const valArr = valBits[1].split(/[, ]+/);
+          const letters = 'abcdef'.split('');
+          /*
         if (m && m.groups.xform) {
           const x = m.groups.xform;
           const [name, bits] = x.split(/\s*\(/);
@@ -159,6 +169,7 @@ export class SVGTransformList { // eslint-disable-line no-shadow
           );
           const valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
           const letters = [...'abcdef'];
+          */
           const mtx = svgroot.createSVGMatrix();
           Object.values(valArr).forEach(function (item, i) {
             valArr[i] = parseFloat(item);

editor/utilities.js

@@ -110,7 +110,8 @@ export const init = function (editorContext) {
  * @todo This might be needed in other places `parseFromString` is used even without LGTM flagging
  */
 export const dropXMLInteralSubset = (str) => {
-  return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
+  return str.replace(/(<!DOCTYPE\s+\w*\s*\[).*(\?\]>)/, '$1$2');
+  // return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
 };
 
 /**
@@ -265,9 +266,14 @@ export const dataURLToObjectURL = function (dataurl) {
   if (typeof Uint8Array === 'undefined' || typeof Blob === 'undefined' || typeof URL === 'undefined' || !URL.createObjectURL) {
     return '';
   }
+  const arr = dataurl.split(','),
+    mime = arr[0].match(/:(.*?);/)[1],
+    bstr = atob(arr[1]);
+  /*
   const [prefix, suffix] = dataurl.split(','),
     {groups: {mime}} = prefix.match(/:(?<mime>.*?);/),
     bstr = atob(suffix);
+  */
   let n = bstr.length;
   const u8arr = new Uint8Array(n);
   while (n--) {
@@ -330,7 +336,6 @@ export const convertToXMLReferences = function (input) {
 */
 export const text2xml = function (sXML) {
   if (sXML.includes('<svg:svg')) {
-    // eslint-disable-next-line prefer-named-capture-group
     sXML = sXML.replace(/<(\/?)svg:/g, '<$1').replace('xmlns:svg', 'xmlns');
   }
 

editor/xdomain-svgedit-config-iife.js

@@ -86,74 +86,6 @@
     return _setPrototypeOf(o, p);
   }
 
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -232,71 +164,6 @@
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   // http://ross.posterous.com/2008/08/19/iphone-touch-events-in-javascript/
 
   /**
@@ -3271,9 +3138,7 @@
         } // TODO: Add skew support in future
 
 
-        var re = _wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*((?:scale|matrix|rotate|translate)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\(.*?\))[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*,?[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*/, {
+        var re = /\s*((scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/; // const re = /\s*(?<xform>(?:scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
-          xform: 1
-        });
 
         var m = true;
 
@@ -3281,24 +3146,26 @@
           m = str.match(re);
           str = str.replace(re, '');
 
-          if (m && m.groups.xform) {
+          if (m && m[1]) {
             (function () {
-              var x = m.groups.xform;
+              var x = m[1];
-
+              var bits = x.split(/\s*\(/);
-              var _x$split = x.split(/\s*\(/),
+              var name = bits[0];
-                  _x$split2 = _slicedToArray(_x$split, 2),
+              var valBits = bits[1].match(/\s*(.*?)\s*\)/);
-                  name = _x$split2[0],
+              valBits[1] = valBits[1].replace(/(\d)-/g, '$1 -');
-                  bits = _x$split2[1];
+              var valArr = valBits[1].split(/[, ]+/);
-
+              var letters = 'abcdef'.split('');
-              var valBits = bits.match(_wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*(.*?)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\)/, {
+              /*
-                nonWhitespace: 1
+              if (m && m.groups.xform) {
-              }));
+              const x = m.groups.xform;
-              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(_wrapRegExp(/([0-9])\x2D/g, {
+              const [name, bits] = x.split(/\s*\(/);
-                digit: 1
+              const valBits = bits.match(/\s*(?<nonWhitespace>.*?)\s*\)/);
-              }), '$<digit> -');
+              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(
-              var valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+                /(?<digit>\d)-/g, '$<digit> -'
-
+              );
-              var letters = _toConsumableArray('abcdef');
+              const valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+              const letters = [...'abcdef'];
+              */
 
               var mtx = svgroot.createSVGMatrix();
               Object.values(valArr).forEach(function (item, i) {
@@ -8070,10 +7937,7 @@
    */
 
   var dropXMLInteralSubset = function dropXMLInteralSubset(str) {
-    return str.replace(_wrapRegExp(/(<!DOCTYPE[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]+[0-9A-Z_a-z]*[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\[).*(\?\]>)/, {
+    return str.replace(/(<!DOCTYPE\s+\w*\s*\[).*(\?\]>)/, '$1$2'); // return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
-      doctypeOpen: 1,
-      doctypeClose: 2
-    }), '$<doctypeOpen>$<doctypeClose>');
   };
   /**
   * Converts characters in a string to XML-friendly entities.
@@ -8213,15 +8077,14 @@
       return '';
     }
 
-    var _dataurl$split = dataurl.split(','),
+    var arr = dataurl.split(','),
-        _dataurl$split2 = _slicedToArray(_dataurl$split, 2),
+        mime = arr[0].match(/:(.*?);/)[1],
-        prefix = _dataurl$split2[0],
+        bstr = atob(arr[1]);
-        suffix = _dataurl$split2[1],
+    /*
-        _prefix$match = prefix.match(_wrapRegExp(/:(.*?);/, {
+    const [prefix, suffix] = dataurl.split(','),
-      mime: 1
+      {groups: {mime}} = prefix.match(/:(?<mime>.*?);/),
-    })),
+      bstr = atob(suffix);
-        mime = _prefix$match.groups.mime,
+    */
-        bstr = atob(suffix);
 
     var n = bstr.length;
     var u8arr = new Uint8Array(n);
@@ -8274,7 +8137,6 @@
 
   var text2xml = function text2xml(sXML) {
     if (sXML.includes('<svg:svg')) {
-      // eslint-disable-next-line prefer-named-capture-group
       sXML = sXML.replace(/<(\/?)svg:/g, '<$1').replace('xmlns:svg', 'xmlns');
     }
 
@@ -11698,9 +11560,8 @@
             case 'gradientTransform':
             case 'patternTransform':
               {
-                var val = attr.value.replace(_wrapRegExp(/([0-9])\x2D/g, {
+                var val = attr.value.replace(/(\d)-/g, '$1 -'); // const val = attr.value.replace(/(?<digit>\d)-/g, '$<digit> -');
-                  digit: 1
+
-                }), '$<digit> -');
                 node.setAttribute(attrName, val);
                 break;
               }
@@ -18666,12 +18527,11 @@
           if (val) {
             if (val.startsWith('data:')) {
               // Check if an SVG-edit data URI
-              var m = val.match(_wrapRegExp(/svgedit_url=(.*?);/, {
+              var m = val.match(/svgedit_url=(.*?);/); // const m = val.match(/svgedit_url=(?<url>.*?);/);
-                url: 1
-              }));
 
               if (m) {
-                var url = decodeURIComponent(m.groups.url);
+                var url = decodeURIComponent(m[1]); // const url = decodeURIComponent(m.groups.url);
+
                 $$9(new Image()).load(function () {
                   image.setAttributeNS(NS.XLINK, 'xlink:href', url);
                 }).attr('src', url);
@@ -29666,9 +29526,7 @@
           if (!src) {
             // urldata.source may have been null if it ended with '='
             if (qstr.includes('source=data:')) {
-              src = qstr.match(_wrapRegExp(/source=(data:[\0-%'-\uFFFF]*)/, {
+              src = qstr.match(/source=(data:[^&]*)/)[1]; // ({src} = qstr.match(/source=(?<src>data:[^&]*)/).groups);
-                src: 1
-              })).groups.src;
             }
           }
 
@@ -29762,9 +29620,7 @@
                   while (1) {
                     switch (_context3.prev = _context3.next) {
                       case 0:
-                        extName = extname.match(_wrapRegExp(/^ext\x2D(.+)\.js/, {
+                        extName = extname.match(/^ext-(.+)\.js/); // const {extName} = extname.match(/^ext-(?<extName>.+)\.js/).groups;
-                          extName: 1
-                        })).groups.extName;
 
                         if (extName) {
                           _context3.next = 3;
@@ -29787,12 +29643,14 @@
                         _context3.prev = 4;
                         _context3.next = 7;
                         return regeneratorRuntime.awrap(importSetGlobalDefault(url, {
-                          global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+                          global: 'svgEditorExtension_' + extName[1].replace(/-/g, '_') // global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+
                         }));
 
                       case 7:
                         imported = _context3.sent;
-                        _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName : _imported$name, init = imported.init;
+                        _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName[1] : _imported$name, init = imported.init; // const {name = extName, init} = imported;
+
                         importLocale = getImportLocale({
                           defaultLang: langParam,
                           defaultName: _name2

rollup.config.js

@@ -1,6 +1,4 @@
 /* eslint-env node */
-// Wait until Node 10 to enable
-/* eslint-disable prefer-named-capture-group */
 
 // NOTE:
 // See rollup-config.config.js instead for building the main (configurable)
@@ -52,7 +50,10 @@ function getRollupObject ({minifying, format = 'umd'} = {}) {
     },
     plugins: [
       babel({
-        plugins: ['transform-object-rest-spread']
+        plugins: [
+          'transform-object-rest-spread',
+          '@babel/plugin-transform-named-capturing-groups-regex'
+        ]
       })
     ]
   };

svgedit-config-iife.js

@@ -86,74 +86,6 @@
     return _setPrototypeOf(o, p);
   }
 
-  function isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-
-    try {
-      Date.prototype.toString.call(Reflect.construct(Date, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  function _construct(Parent, args, Class) {
-    if (isNativeReflectConstruct()) {
-      _construct = Reflect.construct;
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-
-    return _construct.apply(null, arguments);
-  }
-
-  function _isNativeFunction(fn) {
-    return Function.toString.call(fn).indexOf("[native code]") !== -1;
-  }
-
-  function _wrapNativeSuper(Class) {
-    var _cache = typeof Map === "function" ? new Map() : undefined;
-
-    _wrapNativeSuper = function _wrapNativeSuper(Class) {
-      if (Class === null || !_isNativeFunction(Class)) return Class;
-
-      if (typeof Class !== "function") {
-        throw new TypeError("Super expression must either be null or a function");
-      }
-
-      if (typeof _cache !== "undefined") {
-        if (_cache.has(Class)) return _cache.get(Class);
-
-        _cache.set(Class, Wrapper);
-      }
-
-      function Wrapper() {
-        return _construct(Class, arguments, _getPrototypeOf(this).constructor);
-      }
-
-      Wrapper.prototype = Object.create(Class.prototype, {
-        constructor: {
-          value: Wrapper,
-          enumerable: false,
-          writable: true,
-          configurable: true
-        }
-      });
-      return _setPrototypeOf(Wrapper, Class);
-    };
-
-    return _wrapNativeSuper(Class);
-  }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -232,71 +164,6 @@
     throw new TypeError("Invalid attempt to destructure non-iterable instance");
   }
 
-  function _wrapRegExp(re, groups) {
-    _wrapRegExp = function (re, groups) {
-      return new BabelRegExp(re, undefined, groups);
-    };
-
-    var _RegExp = _wrapNativeSuper(RegExp);
-
-    var _super = RegExp.prototype;
-
-    var _groups = new WeakMap();
-
-    function BabelRegExp(re, flags, groups) {
-      var _this = _RegExp.call(this, re, flags);
-
-      _groups.set(_this, groups || _groups.get(re));
-
-      return _this;
-    }
-
-    _inherits(BabelRegExp, _RegExp);
-
-    BabelRegExp.prototype.exec = function (str) {
-      var result = _super.exec.call(this, str);
-
-      if (result) result.groups = buildGroups(result, this);
-      return result;
-    };
-
-    BabelRegExp.prototype[Symbol.replace] = function (str, substitution) {
-      if (typeof substitution === "string") {
-        var groups = _groups.get(this);
-
-        return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) {
-          return "$" + groups[name];
-        }));
-      } else if (typeof substitution === "function") {
-        var _this = this;
-
-        return _super[Symbol.replace].call(this, str, function () {
-          var args = [];
-          args.push.apply(args, arguments);
-
-          if (typeof args[args.length - 1] !== "object") {
-            args.push(buildGroups(args, _this));
-          }
-
-          return substitution.apply(this, args);
-        });
-      } else {
-        return _super[Symbol.replace].call(this, str, substitution);
-      }
-    };
-
-    function buildGroups(result, re) {
-      var g = _groups.get(re);
-
-      return Object.keys(g).reduce(function (groups, name) {
-        groups[name] = result[g[name]];
-        return groups;
-      }, Object.create(null));
-    }
-
-    return _wrapRegExp.apply(this, arguments);
-  }
-
   // http://ross.posterous.com/2008/08/19/iphone-touch-events-in-javascript/
 
   /**
@@ -3271,9 +3138,7 @@
         } // TODO: Add skew support in future
 
 
-        var re = _wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*((?:scale|matrix|rotate|translate)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\(.*?\))[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*,?[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*/, {
+        var re = /\s*((scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/; // const re = /\s*(?<xform>(?:scale|matrix|rotate|translate)\s*\(.*?\))\s*,?\s*/;
-          xform: 1
-        });
 
         var m = true;
 
@@ -3281,24 +3146,26 @@
           m = str.match(re);
           str = str.replace(re, '');
 
-          if (m && m.groups.xform) {
+          if (m && m[1]) {
             (function () {
-              var x = m.groups.xform;
+              var x = m[1];
-
+              var bits = x.split(/\s*\(/);
-              var _x$split = x.split(/\s*\(/),
+              var name = bits[0];
-                  _x$split2 = _slicedToArray(_x$split, 2),
+              var valBits = bits[1].match(/\s*(.*?)\s*\)/);
-                  name = _x$split2[0],
+              valBits[1] = valBits[1].replace(/(\d)-/g, '$1 -');
-                  bits = _x$split2[1];
+              var valArr = valBits[1].split(/[, ]+/);
-
+              var letters = 'abcdef'.split('');
-              var valBits = bits.match(_wrapRegExp(/[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*(.*?)[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\)/, {
+              /*
-                nonWhitespace: 1
+              if (m && m.groups.xform) {
-              }));
+              const x = m.groups.xform;
-              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(_wrapRegExp(/([0-9])\x2D/g, {
+              const [name, bits] = x.split(/\s*\(/);
-                digit: 1
+              const valBits = bits.match(/\s*(?<nonWhitespace>.*?)\s*\)/);
-              }), '$<digit> -');
+              valBits.groups.nonWhitespace = valBits.groups.nonWhitespace.replace(
-              var valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+                /(?<digit>\d)-/g, '$<digit> -'
-
+              );
-              var letters = _toConsumableArray('abcdef');
+              const valArr = valBits.groups.nonWhitespace.split(/[, ]+/);
+              const letters = [...'abcdef'];
+              */
 
               var mtx = svgroot.createSVGMatrix();
               Object.values(valArr).forEach(function (item, i) {
@@ -8070,10 +7937,7 @@
    */
 
   var dropXMLInteralSubset = function dropXMLInteralSubset(str) {
-    return str.replace(_wrapRegExp(/(<!DOCTYPE[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]+[0-9A-Z_a-z]*[\t-\r \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]*\[).*(\?\]>)/, {
+    return str.replace(/(<!DOCTYPE\s+\w*\s*\[).*(\?\]>)/, '$1$2'); // return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
-      doctypeOpen: 1,
-      doctypeClose: 2
-    }), '$<doctypeOpen>$<doctypeClose>');
   };
   /**
   * Converts characters in a string to XML-friendly entities.
@@ -8213,15 +8077,14 @@
       return '';
     }
 
-    var _dataurl$split = dataurl.split(','),
+    var arr = dataurl.split(','),
-        _dataurl$split2 = _slicedToArray(_dataurl$split, 2),
+        mime = arr[0].match(/:(.*?);/)[1],
-        prefix = _dataurl$split2[0],
+        bstr = atob(arr[1]);
-        suffix = _dataurl$split2[1],
+    /*
-        _prefix$match = prefix.match(_wrapRegExp(/:(.*?);/, {
+    const [prefix, suffix] = dataurl.split(','),
-      mime: 1
+      {groups: {mime}} = prefix.match(/:(?<mime>.*?);/),
-    })),
+      bstr = atob(suffix);
-        mime = _prefix$match.groups.mime,
+    */
-        bstr = atob(suffix);
 
     var n = bstr.length;
     var u8arr = new Uint8Array(n);
@@ -8274,7 +8137,6 @@
 
   var text2xml = function text2xml(sXML) {
     if (sXML.includes('<svg:svg')) {
-      // eslint-disable-next-line prefer-named-capture-group
       sXML = sXML.replace(/<(\/?)svg:/g, '<$1').replace('xmlns:svg', 'xmlns');
     }
 
@@ -11698,9 +11560,8 @@
             case 'gradientTransform':
             case 'patternTransform':
               {
-                var val = attr.value.replace(_wrapRegExp(/([0-9])\x2D/g, {
+                var val = attr.value.replace(/(\d)-/g, '$1 -'); // const val = attr.value.replace(/(?<digit>\d)-/g, '$<digit> -');
-                  digit: 1
+
-                }), '$<digit> -');
                 node.setAttribute(attrName, val);
                 break;
               }
@@ -18666,12 +18527,11 @@
           if (val) {
             if (val.startsWith('data:')) {
               // Check if an SVG-edit data URI
-              var m = val.match(_wrapRegExp(/svgedit_url=(.*?);/, {
+              var m = val.match(/svgedit_url=(.*?);/); // const m = val.match(/svgedit_url=(?<url>.*?);/);
-                url: 1
-              }));
 
               if (m) {
-                var url = decodeURIComponent(m.groups.url);
+                var url = decodeURIComponent(m[1]); // const url = decodeURIComponent(m.groups.url);
+
                 $$9(new Image()).load(function () {
                   image.setAttributeNS(NS.XLINK, 'xlink:href', url);
                 }).attr('src', url);
@@ -29666,9 +29526,7 @@
           if (!src) {
             // urldata.source may have been null if it ended with '='
             if (qstr.includes('source=data:')) {
-              src = qstr.match(_wrapRegExp(/source=(data:[\0-%'-\uFFFF]*)/, {
+              src = qstr.match(/source=(data:[^&]*)/)[1]; // ({src} = qstr.match(/source=(?<src>data:[^&]*)/).groups);
-                src: 1
-              })).groups.src;
             }
           }
 
@@ -29762,9 +29620,7 @@
                   while (1) {
                     switch (_context3.prev = _context3.next) {
                       case 0:
-                        extName = extname.match(_wrapRegExp(/^ext\x2D(.+)\.js/, {
+                        extName = extname.match(/^ext-(.+)\.js/); // const {extName} = extname.match(/^ext-(?<extName>.+)\.js/).groups;
-                          extName: 1
-                        })).groups.extName;
 
                         if (extName) {
                           _context3.next = 3;
@@ -29787,12 +29643,14 @@
                         _context3.prev = 4;
                         _context3.next = 7;
                         return regeneratorRuntime.awrap(importSetGlobalDefault(url, {
-                          global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+                          global: 'svgEditorExtension_' + extName[1].replace(/-/g, '_') // global: 'svgEditorExtension_' + extName.replace(/-/g, '_')
+
                         }));
 
                       case 7:
                         imported = _context3.sent;
-                        _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName : _imported$name, init = imported.init;
+                        _imported$name = imported.name, _name2 = _imported$name === void 0 ? extName[1] : _imported$name, init = imported.init; // const {name = extName, init} = imported;
+
                         importLocale = getImportLocale({
                           defaultLang: langParam,
                           defaultName: _name2