diff --git a/README.md b/README.md index 8106313..be25b28 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ class App extends Component { } ``` -## Doc +## Documentation #### Properties @@ -140,6 +140,14 @@ class App extends Component { ## ChangeLog: +### 1.11.1 + +- Bump dependencies version + +### 1.11.0 + +- Bump dependencies version + ### 1.10.0 - Bump dependencies version @@ -191,7 +199,9 @@ class App extends Component { - Adding the key `REACT_APP_MAPBOX_GL_TOKEN` into the `.env` file - Starting the server by: `yarn start` -## Upgrading dependencies +## Upgrading dependencies checklist +- Pull the latest code +- Create a new branch - Upgrading the dependencies ``` yarn upgrade-interactive --latest @@ -199,5 +209,6 @@ yarn upgrade-interactive --latest - Test if the app works after upgrading: `yarn start` - Build the package: `yarn build` - Increasing the package version in the `package.json` +- Adding the release note in the `README` - Push the change into Github - Publish the package into npmjs: `npm publish` diff --git a/dist/common/utils/event.js b/dist/common/utils/event.js index 409ad52..fbc71a7 100644 --- a/dist/common/utils/event.js +++ b/dist/common/utils/event.js @@ -1,6 +1,6 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true @@ -9,16 +9,14 @@ exports.getExactEventHandlerName = exports.extractEventHandlers = void 0; var _lodash = _interopRequireDefault(require("lodash")); -var EVENT_PREFIX = /^on(.+)$/i; +const EVENT_PREFIX = /^on(.+)$/i; -var extractEventHandlers = function extractEventHandlers(props) { - return _lodash.default.reduce(Object.keys(props), function (res, prop) { - var cb = props[prop]; +const extractEventHandlers = props => { + return _lodash.default.reduce(Object.keys(props), (res, prop) => { + const cb = props[prop]; if (EVENT_PREFIX.test(prop) && _lodash.default.isFunction(cb)) { - var key = prop.replace(EVENT_PREFIX, function (match, p) { - return "on".concat(p); - }); + const key = prop.replace(EVENT_PREFIX, (match, p) => "on".concat(p)); res[key] = cb; } @@ -28,7 +26,7 @@ var extractEventHandlers = function extractEventHandlers(props) { exports.extractEventHandlers = extractEventHandlers; -var getExactEventHandlerName = function getExactEventHandlerName(event) { +const getExactEventHandlerName = event => { if (!_lodash.default.isString(event)) { return event; } diff --git a/dist/common/utils/index.js b/dist/common/utils/index.js index 3784d00..47da3b0 100644 --- a/dist/common/utils/index.js +++ b/dist/common/utils/index.js @@ -3,27 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true }); +Object.defineProperty(exports, "checkPropsChange", { + enumerable: true, + get: function () { + return _props.checkPropsChange; + } +}); Object.defineProperty(exports, "extractEventHandlers", { enumerable: true, - get: function get() { + get: function () { return _event.extractEventHandlers; } }); Object.defineProperty(exports, "getExactEventHandlerName", { enumerable: true, - get: function get() { + get: function () { return _event.getExactEventHandlerName; } }); -Object.defineProperty(exports, "checkPropsChange", { - enumerable: true, - get: function get() { - return _props.checkPropsChange; - } -}); Object.defineProperty(exports, "isReactComponent", { enumerable: true, - get: function get() { + get: function () { return _react.isReactComponent; } }); diff --git a/dist/common/utils/props.js b/dist/common/utils/props.js index 8087114..0131942 100644 --- a/dist/common/utils/props.js +++ b/dist/common/utils/props.js @@ -1,6 +1,6 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true @@ -9,12 +9,12 @@ exports.checkPropsChange = void 0; var _lodash = _interopRequireDefault(require("lodash")); -var checkPropsChange = function checkPropsChange(props, nextProps, keys) { - var equalityChecker = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _lodash.default.isEqual; +const checkPropsChange = function (props, nextProps, keys) { + let equalityChecker = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _lodash.default.isEqual; - var propsToCheck = _lodash.default.pick(props, keys); + const propsToCheck = _lodash.default.pick(props, keys); - var nextPropsToCheck = _lodash.default.pick(nextProps, keys); + const nextPropsToCheck = _lodash.default.pick(nextProps, keys); if (_lodash.default.isFunction(equalityChecker)) { return equalityChecker(propsToCheck, nextPropsToCheck); diff --git a/dist/common/utils/react.js b/dist/common/utils/react.js index dd18779..b561e7f 100644 --- a/dist/common/utils/react.js +++ b/dist/common/utils/react.js @@ -1,6 +1,6 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true @@ -11,9 +11,7 @@ var _react = _interopRequireDefault(require("react")); var _lodash = _interopRequireDefault(require("lodash")); -var isFunctionComponent = function isFunctionComponent(component) { - return component && _lodash.default.isFunction(component.type) && String(component.type).includes("createElement"); -}; +const isFunctionComponent = component => component && _lodash.default.isFunction(component.type) && String(component.type).includes("createElement"); /** * Check if a component is a custom class React component or native DOM elements (e.g. div, span) * @param {*} component @@ -21,14 +19,14 @@ var isFunctionComponent = function isFunctionComponent(component) { */ -var isReactComponent = function isReactComponent(component) { - var isReactComponent = _lodash.default.get(component, "type.prototype.isReactComponent"); +const isReactComponent = component => { + const isReactComponent = _lodash.default.get(component, "type.prototype.isReactComponent"); - var isPureReactComponent = _lodash.default.get(component, "type.prototype.isPureReactComponent"); + const isPureReactComponent = _lodash.default.get(component, "type.prototype.isPureReactComponent"); - var isFunctionalComponent = isFunctionComponent(component); - var isFragmentComponent = _lodash.default.toString(_lodash.default.get(component, "type")) === "Symbol(react.fragment)"; - var isReactMemoComponent = _lodash.default.toString(_lodash.default.get(component, "$$typeof")) === "Symbol(react.memo)"; + const isFunctionalComponent = isFunctionComponent(component); + const isFragmentComponent = _lodash.default.toString(_lodash.default.get(component, "type")) === "Symbol(react.fragment)"; + const isReactMemoComponent = _lodash.default.toString(_lodash.default.get(component, "$$typeof")) === "Symbol(react.memo)"; return isReactMemoComponent || /*#__PURE__*/_react.default.isValidElement(component) && (isReactComponent || isPureReactComponent || isFunctionalComponent || isFragmentComponent); }; diff --git a/dist/components/MappedComponent.js b/dist/components/MappedComponent.js index 829472a..8517ada 100644 --- a/dist/components/MappedComponent.js +++ b/dist/components/MappedComponent.js @@ -1,42 +1,20 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); - Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; -var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck")); - -var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass")); - -var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits")); - -var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper")); - var _react = require("react"); var _reactMapboxGl = require("react-mapbox-gl"); -var MappedComponent = /*#__PURE__*/function (_Component) { - (0, _inherits2.default)(MappedComponent, _Component); - - var _super = (0, _createSuper2.default)(MappedComponent); - - function MappedComponent() { - (0, _classCallCheck2.default)(this, MappedComponent); - return _super.apply(this, arguments); +class MappedComponent extends _react.Component { + getMapInstance() { + return this.context; } - (0, _createClass2.default)(MappedComponent, [{ - key: "getMapInstance", - value: function getMapInstance() { - return this.context; - } - }]); - return MappedComponent; -}(_react.Component); +} MappedComponent.contextType = _reactMapboxGl.MapContext; var _default = MappedComponent; diff --git a/dist/components/MarkerLayer/Component.js b/dist/components/MarkerLayer/Component.js index a243728..73e83d2 100644 --- a/dist/components/MarkerLayer/Component.js +++ b/dist/components/MarkerLayer/Component.js @@ -1,20 +1,12 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; -var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck")); - -var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass")); - -var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits")); - -var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper")); - var _react = _interopRequireDefault(require("react")); var _reactDom = _interopRequireDefault(require("react-dom")); @@ -27,186 +19,152 @@ var _mapboxGl = _interopRequireDefault(require("mapbox-gl")); var _utils = require("../../common/utils"); -var _MappedComponent2 = _interopRequireDefault(require("../MappedComponent")); - -var MarkerLayer = /*#__PURE__*/function (_MappedComponent) { - (0, _inherits2.default)(MarkerLayer, _MappedComponent); - - var _super = (0, _createSuper2.default)(MarkerLayer); +var _MappedComponent = _interopRequireDefault(require("../MappedComponent")); - function MarkerLayer() { - var _this; +class MarkerLayer extends _MappedComponent.default { + constructor() { + super(...arguments); - (0, _classCallCheck2.default)(this, MarkerLayer); - - for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { - args[_key] = arguments[_key]; - } - - _this = _super.call.apply(_super, [this].concat(args)); - - _this._disableMapDragPan = function () { - var map = _this.getMapInstance(); + this._disableMapDragPan = () => { + const map = this.getMapInstance(); if (map) { map.dragPan.disable(); } }; - _this._enableMapDragPan = function () { - var map = _this.getMapInstance(); + this._enableMapDragPan = () => { + const map = this.getMapInstance(); if (map) { map.dragPan.enable(); } }; - _this._generateEventHander = function (eventName) { - return function (e) { - var handler = _this.props[eventName]; - - if (_lodash.default.isFunction(handler)) { - var coordinates = _this.props.coordinates; - - var properties = _this.getProperties(); + this._generateEventHander = eventName => e => { + const handler = this.props[eventName]; - handler(properties, coordinates, _this.getOffset(), e); - } - }; + if (_lodash.default.isFunction(handler)) { + const { + coordinates + } = this.props; + const properties = this.getProperties(); + handler(properties, coordinates, this.getOffset(), e); + } }; + } - return _this; + componentDidMount() { + const node = this.attachChildren(this.props); + this.layer = new _mapboxGl.default.Marker(node).setLngLat(this.props.coordinates).addTo(this.getMapInstance()); } - (0, _createClass2.default)(MarkerLayer, [{ - key: "componentDidMount", - value: function componentDidMount() { - var node = this.attachChildren(this.props); - this.layer = new _mapboxGl.default.Marker(node).setLngLat(this.props.coordinates).addTo(this.getMapInstance()); + componentDidUpdate(prevProps) { + if (prevProps.coordinates !== this.props.coordinates) { + this.layer.setLngLat(prevProps.coordinates); } - }, { - key: "componentDidUpdate", - value: function componentDidUpdate(prevProps) { - if (prevProps.coordinates !== this.props.coordinates) { - this.layer.setLngLat(prevProps.coordinates); - } - if (prevProps.children !== this.props.children || (0, _utils.checkPropsChange)(this.props, prevProps, ["style", "className"])) { - this.attachChildren(prevProps); - } + if (prevProps.children !== this.props.children || (0, _utils.checkPropsChange)(this.props, prevProps, ["style", "className"])) { + this.attachChildren(prevProps); } - }, { - key: "componentWillUnmount", - value: function componentWillUnmount() { - if (!this.layer) { - return; - } + } - this.layer.remove(); - delete this.layer; + componentWillUnmount() { + if (!this.layer) { + return; } - }, { - key: "attachChildren", - value: function attachChildren() { - var _this2 = this; - var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; - var children = props.children; - - if (children) { - if (!this.element) { - this.element = document.createElement("div"); - } else { - this._unbindEvents(); - } + this.layer.remove(); + delete this.layer; + } - var style = this.getStyle(this.props); - this.element.className = this.getContainerClassName(props); - Object.keys(style).forEach(function (s) { - _this2.element.style[s] = style[s]; - }); + attachChildren() { + let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; + const { + children + } = props; + + if (children) { + if (!this.element) { + this.element = document.createElement("div"); + } else { + this._unbindEvents(); + } - this._bindEvents(); + const style = this.getStyle(this.props); + this.element.className = this.getContainerClassName(props); + Object.keys(style).forEach(s => { + this.element.style[s] = style[s]; + }); - var content = this.getContent(props); + this._bindEvents(); - _reactDom.default.render(content, this.element); - } + const content = this.getContent(props); - return this.element; - } - }, { - key: "getContainerClassName", - value: function getContainerClassName(props) { - return "mapboxgl-marker ".concat(props.className); + _reactDom.default.render(content, this.element); } - }, { - key: "getContent", - value: function getContent(props) { - var children = props.children; - return /*#__PURE__*/_react.default.createElement("div", { - className: "marker-content f-width f-height" - }, children); - } - }, { - key: "getProperties", - value: function getProperties() { - return this.props.properties; - } - }, { - key: "getOffset", - value: function getOffset() { - return [0, 0]; - } - }, { - key: "getStyle", - value: function getStyle(props) { - return _lodash.default.clone(props.style) || {}; - } - }, { - key: "_bindEvents", - value: function _bindEvents() { - var _this3 = this; - var events = (0, _utils.extractEventHandlers)(this.props); - this.realHandlers = {}; + return this.element; + } + + getContainerClassName(props) { + return "mapboxgl-marker ".concat(props.className); + } - _lodash.default.forEach(events, function (handler, name) { - var realHandler = _this3._generateEventHander(name); + getContent(props) { + const { + children + } = props; + return /*#__PURE__*/_react.default.createElement("div", { + className: "marker-content f-width f-height" + }, children); + } - _this3.element.addEventListener((0, _utils.getExactEventHandlerName)(name), realHandler); + getProperties() { + return this.props.properties; + } - _this3.realHandlers[name] = realHandler; - }); + getOffset() { + return [0, 0]; + } - this.element.addEventListener("mousedown", this._disableMapDragPan); - this.element.addEventListener("mouseup", this._enableMapDragPan); - } - }, { - key: "_unbindEvents", - value: function _unbindEvents() { - var _this4 = this; + getStyle(props) { + return _lodash.default.clone(props.style) || {}; + } - var events = (0, _utils.extractEventHandlers)(this.props); - this.element.removeEventListener("mousedown", this._disableMapDragPan); - this.element.removeEventListener("mouseup", this._enableMapDragPan); + _bindEvents() { + const events = (0, _utils.extractEventHandlers)(this.props); + this.realHandlers = {}; - _lodash.default.forEach(events, function (handler, name) { - var realHandler = _this4.realHandlers[name]; + _lodash.default.forEach(events, (handler, name) => { + const realHandler = this._generateEventHander(name); - _this4.element.removeEventListener((0, _utils.getExactEventHandlerName)(name), realHandler); - }); + this.element.addEventListener((0, _utils.getExactEventHandlerName)(name), realHandler); + this.realHandlers[name] = realHandler; + }); - delete this.realHandlers; - } - }, { - key: "render", - value: function render() { - return null; - } - }]); - return MarkerLayer; -}(_MappedComponent2.default); + this.element.addEventListener("mousedown", this._disableMapDragPan); + this.element.addEventListener("mouseup", this._enableMapDragPan); + } + + _unbindEvents() { + const events = (0, _utils.extractEventHandlers)(this.props); + this.element.removeEventListener("mousedown", this._disableMapDragPan); + this.element.removeEventListener("mouseup", this._enableMapDragPan); + + _lodash.default.forEach(events, (handler, name) => { + const realHandler = this.realHandlers[name]; + this.element.removeEventListener((0, _utils.getExactEventHandlerName)(name), realHandler); + }); + + delete this.realHandlers; + } + + render() { + return null; + } + +} MarkerLayer.displayName = "MarkerLayer"; MarkerLayer.propTypes = { diff --git a/dist/components/MarkerLayer/index.js b/dist/components/MarkerLayer/index.js index a923f6f..7e2d74a 100644 --- a/dist/components/MarkerLayer/index.js +++ b/dist/components/MarkerLayer/index.js @@ -1,13 +1,13 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "MarkerLayer", { enumerable: true, - get: function get() { + get: function () { return _Component.default; } }); diff --git a/dist/components/ReactMapboxGlSpiderifier/MapboxGlSpiderifier.js b/dist/components/ReactMapboxGlSpiderifier/MapboxGlSpiderifier.js index 71c4162..0c8c43b 100644 --- a/dist/components/ReactMapboxGlSpiderifier/MapboxGlSpiderifier.js +++ b/dist/components/ReactMapboxGlSpiderifier/MapboxGlSpiderifier.js @@ -1,24 +1,14 @@ "use strict"; -var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; -var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2")); - -var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck")); - -var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass")); - -var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits")); - -var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper")); - var _react = _interopRequireWildcard(require("react")); var _lodash = _interopRequireDefault(require("lodash")); @@ -31,175 +21,164 @@ var _constants = require("./constants"); require("./MapboxGlSpiderifier.css"); -var MapboxGlSpiderifier = /*#__PURE__*/function (_Component) { - (0, _inherits2.default)(MapboxGlSpiderifier, _Component); - - var _super = (0, _createSuper2.default)(MapboxGlSpiderifier); +class MapboxGlSpiderifier extends _react.Component { + constructor(props) { + super(props); + this.state = { + spiderParams: this._generateSpiderParams(props) + }; + } - function MapboxGlSpiderifier(props) { - var _this; + componentDidUpdate(prevProps) { + this._updateSpiderParams(prevProps); + } - (0, _classCallCheck2.default)(this, MapboxGlSpiderifier); - _this = _super.call(this, props); - _this.state = { - spiderParams: _this._generateSpiderParams(props) - }; - return _this; + _generateCircleParams(props) { + const count = this._getMarkersCount(props); + + const { + circleFootSeparation + } = props; + let circumference = circleFootSeparation * (2 + count); + let legLength = circumference / _constants.TwoPi; // = radius from circumference + + let angleStep = _constants.TwoPi / count; + return _lodash.default.times(count, index => { + const angle = index * angleStep; + return { ...this._getSpiderPosition(props, legLength, angle), + index, + transitionDelay: this._getTransitionDelay(props, index) + }; + }); } - (0, _createClass2.default)(MapboxGlSpiderifier, [{ - key: "componentDidUpdate", - value: function componentDidUpdate(prevProps) { - this._updateSpiderParams(prevProps); - } - }, { - key: "_generateCircleParams", - value: function _generateCircleParams(props) { - var _this2 = this; - - var count = this._getMarkersCount(props); - - var circleFootSeparation = props.circleFootSeparation; - var circumference = circleFootSeparation * (2 + count); - var legLength = circumference / _constants.TwoPi; // = radius from circumference - - var angleStep = _constants.TwoPi / count; - return _lodash.default.times(count, function (index) { - var angle = index * angleStep; - return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _this2._getSpiderPosition(props, legLength, angle)), {}, { - index: index, - transitionDelay: _this2._getTransitionDelay(props, index) - }); - }); - } - }, { - key: "_generateSpiderParams", - value: function _generateSpiderParams() { - var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; - var circleSpiralSwitchover = props.circleSpiralSwitchover, - animate = props.animate, - animationSpeed = props.animationSpeed, - showingLegs = props.showingLegs; - - var count = this._getMarkersCount(props); - - if (!count) { - return null; - } + _generateSpiderParams() { + let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; + const { + circleSpiralSwitchover, + animate, + animationSpeed, + showingLegs + } = props; - var shouldRenderLeg = count > 1 || showingLegs; - var markersProps = count >= circleSpiralSwitchover ? this._generateSpiralParams(props) : this._generateCircleParams(props); - return markersProps.map(function (markerProp) { - return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, markerProp), {}, { - animate: animate, - animationSpeed: animationSpeed, - shouldRenderLeg: shouldRenderLeg - }); - }); - } - }, { - key: "_generateSpiralParams", - value: function _generateSpiralParams(props) { - var _this3 = this; - - var count = this._getMarkersCount(props); - - var spiralFootSeparation = props.spiralFootSeparation, - spiralLengthFactor = props.spiralLengthFactor, - spiralLengthStart = props.spiralLengthStart; - var angle = 0; - var legLength = spiralLengthStart; - return _lodash.default.times(count, function (index) { - angle = angle + (spiralFootSeparation / legLength + index * 0.0005); - legLength = legLength + _constants.TwoPi * spiralLengthFactor / angle; - return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _this3._getSpiderPosition(props, legLength, angle)), {}, { - index: index, - transitionDelay: _this3._getTransitionDelay(props, index), - style: { - zIndex: count - index - } - }); - }); - } - }, { - key: "_getNotNullChildren", - value: function _getNotNullChildren() { - var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; - var children = props.children; - return _react.Children.toArray(children).filter(function (child) { - return child !== null; - }); - } - }, { - key: "_getMarkersCount", - value: function _getMarkersCount(props) { - var children = this._getNotNullChildren(props); + const count = this._getMarkersCount(props); - return children.length; + if (!count) { + return null; } - }, { - key: "_getSpiderifierMarkers", - value: function _getSpiderifierMarkers() { - var spiderParams = this.state.spiderParams; - if (!spiderParams) { - return null; - } + const shouldRenderLeg = count > 1 || showingLegs; + const markersProps = count >= circleSpiralSwitchover ? this._generateSpiralParams(props) : this._generateCircleParams(props); + return markersProps.map(markerProp => ({ ...markerProp, + animate, + animationSpeed, + shouldRenderLeg + })); + } - var coordinates = this.props.coordinates; - var eventHanders = (0, _utils.extractEventHandlers)(this.props); - return this._getNotNullChildren().map(function (child, index) { - var params = spiderParams[index]; - var legStyles = child.props.legStyles; - - if (params) { - return /*#__PURE__*/_react.default.createElement(_SpiderifierElement.default, Object.assign({ - key: index, - coordinates: coordinates, - legStyles: legStyles - }, params, eventHanders), child); + _generateSpiralParams(props) { + const count = this._getMarkersCount(props); + + const { + spiralFootSeparation, + spiralLengthFactor, + spiralLengthStart + } = props; + let angle = 0; + let legLength = spiralLengthStart; + return _lodash.default.times(count, index => { + angle = angle + (spiralFootSeparation / legLength + index * 0.0005); + legLength = legLength + _constants.TwoPi * spiralLengthFactor / angle; + return { ...this._getSpiderPosition(props, legLength, angle), + index, + transitionDelay: this._getTransitionDelay(props, index), + style: { + zIndex: count - index } - - return null; - }); - } - }, { - key: "_getSpiderPosition", - value: function _getSpiderPosition(props, legLength, angle) { - var transformSpiderLeft = props.transformSpiderLeft, - transformSpiderTop = props.transformSpiderTop; - return { - angle: angle, - legLength: legLength - transformSpiderLeft, - x: legLength * Math.cos(angle) + transformSpiderLeft, - y: legLength * Math.sin(angle) + transformSpiderTop }; - } - }, { - key: "_getTransitionDelay", - value: function _getTransitionDelay(props, index) { - var markersCount = this._getMarkersCount(props); + }); + } - var animationSpeed = props.animationSpeed; - return animationSpeed / 1000 / markersCount * index; + _getNotNullChildren() { + let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; + const { + children + } = props; + return _react.Children.toArray(children).filter(child => child !== null); + } + + _getMarkersCount(props) { + const children = this._getNotNullChildren(props); + + return children.length; + } + + _getSpiderifierMarkers() { + const { + spiderParams + } = this.state; + + if (!spiderParams) { + return null; } - }, { - key: "_updateSpiderParams", - value: function _updateSpiderParams(prevProps) { - if ((0, _utils.checkPropsChange)(this.props, prevProps, ["children", "circleFootSeparation", "circleSpiralSwitchover", "spiralFootSeparation", "spiralLengthStart", "spiralLengthFactor", "transformSpiderLeft", "showingLegs"], _lodash.default.isEqual)) { - this.setState({ - spiderParams: this._generateSpiderParams(this.props) - }); + + const { + coordinates + } = this.props; + const eventHanders = (0, _utils.extractEventHandlers)(this.props); + return this._getNotNullChildren().map((child, index) => { + const params = spiderParams[index]; + const { + legStyles + } = child.props; + + if (params) { + return /*#__PURE__*/_react.default.createElement(_SpiderifierElement.default, Object.assign({ + key: index, + coordinates: coordinates, + legStyles: legStyles + }, params, eventHanders), child); } + + return null; + }); + } + + _getSpiderPosition(props, legLength, angle) { + const { + transformSpiderLeft, + transformSpiderTop + } = props; + return { + angle, + legLength: legLength - transformSpiderLeft, + x: legLength * Math.cos(angle) + transformSpiderLeft, + y: legLength * Math.sin(angle) + transformSpiderTop + }; + } + + _getTransitionDelay(props, index) { + const markersCount = this._getMarkersCount(props); + + const { + animationSpeed + } = props; + return animationSpeed / 1000 / markersCount * index; + } + + _updateSpiderParams(prevProps) { + if ((0, _utils.checkPropsChange)(this.props, prevProps, ["children", "circleFootSeparation", "circleSpiralSwitchover", "spiralFootSeparation", "spiralLengthStart", "spiralLengthFactor", "transformSpiderLeft", "showingLegs"], _lodash.default.isEqual)) { + this.setState({ + spiderParams: this._generateSpiderParams(this.props) + }); } - }, { - key: "render", - value: function render() { - return this._getSpiderifierMarkers(); - } - }]); - return MapboxGlSpiderifier; -}(_react.Component); + } + + render() { + return this._getSpiderifierMarkers(); + } + +} MapboxGlSpiderifier.displayName = "MapboxGlSpiderifier"; MapboxGlSpiderifier.defaultProps = { diff --git a/dist/components/ReactMapboxGlSpiderifier/SpiderifierElement.js b/dist/components/ReactMapboxGlSpiderifier/SpiderifierElement.js index 04df3c9..bb86b5a 100644 --- a/dist/components/ReactMapboxGlSpiderifier/SpiderifierElement.js +++ b/dist/components/ReactMapboxGlSpiderifier/SpiderifierElement.js @@ -1,26 +1,12 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; -var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2")); - -var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck")); - -var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass")); - -var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/get")); - -var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/getPrototypeOf")); - -var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits")); - -var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createSuper")); - var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); @@ -31,172 +17,161 @@ var _lodash = _interopRequireDefault(require("lodash")); var _utils = require("../../common/utils"); -var _MarkerLayer2 = require("../MarkerLayer"); +var _MarkerLayer = require("../MarkerLayer"); -var SpiderifierElement = /*#__PURE__*/function (_MarkerLayer) { - (0, _inherits2.default)(SpiderifierElement, _MarkerLayer); +class SpiderifierElement extends _MarkerLayer.MarkerLayer { + constructor(props) { + super(props); - var _super = (0, _createSuper2.default)(SpiderifierElement); + this.setChildRef = childRef => this.childRef = this.childRef || childRef; - function SpiderifierElement(props) { - var _this; - - (0, _classCallCheck2.default)(this, SpiderifierElement); - _this = _super.call(this, props); - - _this.setChildRef = function (childRef) { - return _this.childRef = _this.childRef || childRef; - }; - - var animate = props.animate; - _this.state = { + const { + animate + } = props; + this.state = { animateClass: (0, _classnames.default)({ "animate initial": animate }) }; - return _this; } - (0, _createClass2.default)(SpiderifierElement, [{ - key: "shouldComponentUpdate", - value: function shouldComponentUpdate(nextProps, nextState) { - return !_lodash.default.isEqual(this.props, nextProps) || !_lodash.default.isEqual(this.state, nextState); - } - }, { - key: "componentDidMount", - value: function componentDidMount() { - var _this2 = this; - - (0, _get2.default)((0, _getPrototypeOf2.default)(SpiderifierElement.prototype), "componentDidMount", this).call(this); - - if (this._animationEnabled()) { - _lodash.default.delay(function () { - return _this2.setState({ - animateClass: "animate" - }); - }, 0); - } - } - }, { - key: "componentDidUpdate", - value: function componentDidUpdate() { - this.attachChildren(); - } - }, { - key: "getStyle", - value: function getStyle(props) { - var shouldRenderLeg = props.shouldRenderLeg, - x = props.x, - y = props.y, - style = props.style; - var marginLeft = ""; - var marginTop = ""; - var transitionDelay = ""; - - if (shouldRenderLeg) { - marginLeft = "".concat(x, "px"); - marginTop = "".concat(y, "px"); - transitionDelay = this._getTransitionDelay(props); - } + shouldComponentUpdate(nextProps, nextState) { + return !_lodash.default.isEqual(this.props, nextProps) || !_lodash.default.isEqual(this.state, nextState); + } - return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, style), {}, { - marginLeft: marginLeft, - marginTop: marginTop, - transitionDelay: transitionDelay - }); - } - }, { - key: "getContainerClassName", - value: function getContainerClassName(props) { - var animateClass = this.state.animateClass; - var className = props.className, - y = props.y; - return (0, _classnames.default)("spidered-marker", className, animateClass, { - top: y <= 0, - bottom: y > 0 - }); + componentDidMount() { + super.componentDidMount(); + + if (this._animationEnabled()) { + _lodash.default.delay(() => this.setState({ + animateClass: "animate" + }), 0); } - }, { - key: "getContent", - value: function getContent(props) { - var shouldRenderLeg = props.shouldRenderLeg; - return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", { - className: "icon-div" - }, this._getDecorateChildren(props)), shouldRenderLeg && /*#__PURE__*/_react.default.createElement("div", { - className: "line-div", - style: this._getLegStyles(props) - })); + } + + componentDidUpdate() { + this.attachChildren(); + } + + getStyle(props) { + const { + shouldRenderLeg, + x, + y, + style + } = props; + let marginLeft = ""; + let marginTop = ""; + let transitionDelay = ""; + + if (shouldRenderLeg) { + marginLeft = "".concat(x, "px"); + marginTop = "".concat(y, "px"); + transitionDelay = this._getTransitionDelay(props); } - }, { - key: "getOffset", - value: function getOffset() { - var _this$props = this.props, - shouldRenderLeg = _this$props.shouldRenderLeg, - x = _this$props.x, - y = _this$props.y; - return shouldRenderLeg ? [x, y] : [0, 0]; + + return { ...style, + marginLeft, + marginTop, + transitionDelay + }; + } + + getContainerClassName(props) { + const { + animateClass + } = this.state; + const { + className, + y + } = props; + return (0, _classnames.default)("spidered-marker", className, animateClass, { + top: y <= 0, + bottom: y > 0 + }); + } + + getContent(props) { + const { + shouldRenderLeg + } = props; + return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", { + className: "icon-div" + }, this._getDecorateChildren(props)), shouldRenderLeg && /*#__PURE__*/_react.default.createElement("div", { + className: "line-div", + style: this._getLegStyles(props) + })); + } + + getOffset() { + const { + shouldRenderLeg, + x, + y + } = this.props; + return shouldRenderLeg ? [x, y] : [0, 0]; + } + + getProperties() { + if (this.props.children) { + return this.props.children.props.properties; } - }, { - key: "getProperties", - value: function getProperties() { - if (this.props.children) { - return this.props.children.props.properties; + + return {}; + } + + _animationEnabled() { + let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; + const { + animate + } = props; + return animate; + } + + _getDecorateChildren(props) { + const { + children, + coordinates + } = props; + return _react.default.Children.map(children, child => { + if ((0, _utils.isReactComponent)(child)) { + return /*#__PURE__*/_react.default.cloneElement(child, { + coordinates, + offset: this.getOffset(), + ref: this.setChildRef, + mapBox: this.getMapInstance() + }); } - return {}; - } - }, { - key: "_animationEnabled", - value: function _animationEnabled() { - var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props; - var animate = props.animate; - return animate; - } - }, { - key: "_getDecorateChildren", - value: function _getDecorateChildren(props) { - var _this3 = this; - - var children = props.children, - coordinates = props.coordinates; - return _react.default.Children.map(children, function (child) { - if ((0, _utils.isReactComponent)(child)) { - return /*#__PURE__*/_react.default.cloneElement(child, { - coordinates: coordinates, - offset: _this3.getOffset(), - ref: _this3.setChildRef, - mapBox: _this3.getMapInstance() - }); - } - - return child; - }); - } - }, { - key: "_getLegStyles", - value: function _getLegStyles(props) { - var legLength = props.legLength, - angle = props.angle, - legStyles = props.legStyles; - return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, legStyles), {}, { - height: legLength, - transform: "rotate(".concat(angle - Math.PI / 2, "rad)"), - transitionDelay: this._getTransitionDelay(props) - }); - } - }, { - key: "_getTransitionDelay", - value: function _getTransitionDelay(props) { - var animate = props.animate, - transitionDelay = props.transitionDelay; - return animate ? "".concat(transitionDelay, "s") : ""; - } - }]); - return SpiderifierElement; -}(_MarkerLayer2.MarkerLayer); + return child; + }); + } + + _getLegStyles(props) { + const { + legLength, + angle, + legStyles + } = props; + return { ...legStyles, + height: legLength, + transform: "rotate(".concat(angle - Math.PI / 2, "rad)"), + transitionDelay: this._getTransitionDelay(props) + }; + } + + _getTransitionDelay(props) { + const { + animate, + transitionDelay + } = props; + return animate ? "".concat(transitionDelay, "s") : ""; + } + +} SpiderifierElement.displayName = "SpiderifierElement"; -SpiderifierElement.propTypes = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _MarkerLayer2.MarkerLayer.propTypes), {}, { +SpiderifierElement.propTypes = { ..._MarkerLayer.MarkerLayer.propTypes, angle: _propTypes.default.number, animate: _propTypes.default.bool, legLength: _propTypes.default.number, @@ -206,7 +181,7 @@ SpiderifierElement.propTypes = (0, _objectSpread2.default)((0, _objectSpread2.de transitionDelay: _propTypes.default.number, x: _propTypes.default.number, y: _propTypes.default.number -}); +}; SpiderifierElement.defaultProps = { animate: true, transitionDelay: 200 diff --git a/dist/components/ReactMapboxGlSpiderifier/constants.js b/dist/components/ReactMapboxGlSpiderifier/constants.js index 3e1c26e..f48af44 100644 --- a/dist/components/ReactMapboxGlSpiderifier/constants.js +++ b/dist/components/ReactMapboxGlSpiderifier/constants.js @@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.DefaultCircleRadius = exports.TwoPi = void 0; -var TwoPi = Math.PI * 2; +exports.TwoPi = exports.DefaultCircleRadius = void 0; +const TwoPi = Math.PI * 2; exports.TwoPi = TwoPi; -var DefaultCircleRadius = 10; +const DefaultCircleRadius = 10; exports.DefaultCircleRadius = DefaultCircleRadius; \ No newline at end of file diff --git a/dist/components/ReactMapboxGlSpiderifier/index.js b/dist/components/ReactMapboxGlSpiderifier/index.js index 50bdaf8..3d82cd7 100644 --- a/dist/components/ReactMapboxGlSpiderifier/index.js +++ b/dist/components/ReactMapboxGlSpiderifier/index.js @@ -1,6 +1,6 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true diff --git a/dist/index.js b/dist/index.js index 6b6f989..634ae4b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,13 +1,13 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default; Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "ReactMapboxGlSpiderifier", { enumerable: true, - get: function get() { + get: function () { return _ReactMapboxGlSpiderifier.default; } }); diff --git a/package.json b/package.json index 1e0a8cc..94ec744 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-mapbox-gl-spiderifier", - "version": "1.11.0", + "version": "1.11.1", "main": "dist/index.js", "module": "dist/index.js", "files": [ @@ -12,10 +12,10 @@ "url": "https://github.com/thuanmb/react-mapbox-gl-spiderifier" }, "dependencies": { - "classnames": "2.3.1", + "classnames": "2.3.2", "lodash": "4.17.21", - "mapbox-gl": "2.9.2", - "node-sass": "7.0.1", + "mapbox-gl": "2.12.1", + "node-sass": "8.0.0", "prop-types": "15.8.1", "react-mapbox-gl": "5.1.1" }, @@ -33,7 +33,7 @@ "not ie 11" ], "devDependencies": { - "@babel/cli": "7.18.10", + "@babel/cli": "7.20.7", "babel-preset-react-app": "10.0.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index 491c770..87c58df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,10 +19,10 @@ jsonpointer "^5.0.0" leven "^3.1.0" -"@babel/cli@7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.18.10.tgz#4211adfc45ffa7d4f3cee6b60bb92e9fe68fe56a" - integrity sha512-dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw== +"@babel/cli@7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz#8fc12e85c744a1a617680eacb488fab1fcd35b7c" + integrity sha512-WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ== dependencies: "@jridgewell/trace-mapping" "^0.3.8" commander "^4.0.1" @@ -2208,7 +2208,7 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@gar/promisify@^1.0.1": +"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== @@ -2511,7 +2511,7 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== -"@mapbox/geojson-rewind@^0.5.1": +"@mapbox/geojson-rewind@^0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA== @@ -2519,11 +2519,6 @@ get-stream "^6.0.1" minimist "^1.2.6" -"@mapbox/geojson-types@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz#9aecf642cb00eab1080a57c4f949a65b4a5846d6" - integrity sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw== - "@mapbox/jsonlint-lines-primitives@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" @@ -2539,15 +2534,15 @@ resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2" integrity sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI= -"@mapbox/tiny-sdf@^2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz#cdba698d3d65087643130f9af43a2b622ce0b372" - integrity sha512-OhXt2lS//WpLdkqrzo/KwB7SRD8AiNTFFzuo9n14IBupzIMa67yGItcK7I2W9D8Ghpa4T04Sw9FWsKCJG50Bxw== +"@mapbox/tiny-sdf@^2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz#9a1d33e5018093e88f6a4df2343e886056287282" + integrity sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA== -"@mapbox/unitbezier@^0.0.0": - version "0.0.0" - resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e" - integrity sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4= +"@mapbox/unitbezier@^0.0.1": + version "0.0.1" + resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz#d32deb66c7177e9e9dfc3bbd697083e2e657ff01" + integrity sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw== "@mapbox/vector-tile@^1.3.1": version "1.3.1" @@ -2595,6 +2590,14 @@ "@gar/promisify" "^1.0.1" semver "^7.3.5" +"@npmcli/fs@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" + integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== + dependencies: + "@gar/promisify" "^1.1.3" + semver "^7.3.5" + "@npmcli/move-file@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" @@ -2602,6 +2605,14 @@ dependencies: mkdirp "^1.0.4" +"@npmcli/move-file@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" + integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== + dependencies: + mkdirp "^1.0.4" + rimraf "^3.0.2" + "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": version "0.5.7" resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz#58f8217ba70069cc6a73f5d7e05e85b458c150e2" @@ -2796,6 +2807,11 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + "@trysound/sax@0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" @@ -3438,7 +3454,7 @@ agent-base@6, agent-base@^6.0.2: dependencies: debug "4" -agentkeepalive@^4.1.3: +agentkeepalive@^4.1.3, agentkeepalive@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== @@ -3474,7 +3490,7 @@ ajv-keywords@^5.0.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -3556,14 +3572,6 @@ anymatch@~3.1.2: resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -are-we-there-yet@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" - integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - are-we-there-yet@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" @@ -3662,18 +3670,6 @@ asap@~2.0.6: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - ast-types-flow@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" @@ -3711,16 +3707,6 @@ autoprefixer@^10.4.7: picocolors "^1.0.0" postcss-value-parser "^4.2.0" -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== - axe-core@^4.4.3: version "4.4.3" resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f" @@ -3908,13 +3894,6 @@ batch@0.6.1: resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - bfj@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2" @@ -4083,6 +4062,30 @@ cacache@^15.2.0: tar "^6.0.2" unique-filename "^1.1.1" +cacache@^16.1.0: + version "16.1.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" + integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== + dependencies: + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" + chownr "^2.0.0" + fs-minipass "^2.1.0" + glob "^8.0.1" + infer-owner "^1.0.4" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^9.0.0" + tar "^6.1.11" + unique-filename "^2.0.0" + call-bind@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" @@ -4166,11 +4169,6 @@ case-sensitive-paths-webpack-plugin@^2.4.0: resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -4255,10 +4253,10 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== -classnames@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" - integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== +classnames@2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" + integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== clean-css@^5.2.2: version "5.3.1" @@ -4324,7 +4322,7 @@ color-name@^1.1.4, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-support@^1.1.2, color-support@^1.1.3: +color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== @@ -4344,7 +4342,7 @@ colorette@^2.0.10: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== -combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: +combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -4421,7 +4419,7 @@ connect-history-api-fallback@^2.0.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== -console-control-strings@^1.0.0, console-control-strings@^1.1.0: +console-control-strings@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= @@ -4486,7 +4484,7 @@ core-js@^3.19.2: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.24.1.tgz#cf7724d41724154010a6576b7b57d94c5d66e64f" integrity sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -4737,13 +4735,6 @@ damerau-levenshtein@^1.0.8: resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - data-urls@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" @@ -5049,19 +5040,11 @@ duplexer@^0.1.2: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -earcut@^2.2.3: +earcut@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -5119,7 +5102,7 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.12: +encoding@^0.1.12, encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -5635,21 +5618,6 @@ express@^4.17.3: utils-merge "1.0.1" vary "~1.1.2" -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -5801,11 +5769,6 @@ follow-redirects@^1.0.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - fork-ts-checker-webpack-plugin@^6.5.0: version "6.5.2" resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz#4f67183f2f9eb8ba7df7177ce3cf3e75cdafb340" @@ -5834,15 +5797,6 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -5887,7 +5841,7 @@ fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^1.0.0" -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -5944,21 +5898,6 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -gauge@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" - integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.2" - console-control-strings "^1.0.0" - has-unicode "^2.0.1" - object-assign "^4.1.1" - signal-exit "^3.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.2" - gauge@^4.0.3: version "4.0.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" @@ -6041,19 +5980,12 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - gl-matrix@^3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9" integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA== -glob-parent@^5.1.2, glob-parent@~5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -6067,13 +5999,6 @@ glob-parent@^6.0.1, glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob-parent@~5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== - dependencies: - is-glob "^4.0.1" - glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" @@ -6103,6 +6028,17 @@ glob@^7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-modules@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" @@ -6188,19 +6124,6 @@ handle-thing@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - hard-rejection@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" @@ -6390,6 +6313,15 @@ http-proxy-agent@^4.0.1: agent-base "6" debug "4" +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + http-proxy-middleware@^2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" @@ -6410,15 +6342,6 @@ http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" @@ -6638,7 +6561,7 @@ is-docker@^2.0.0, is-docker@^2.1.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -6650,14 +6573,7 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-glob@^4.0.0, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-glob@^4.0.1, is-glob@^4.0.3: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -6779,7 +6695,7 @@ is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typedarray@^1.0.0, is-typedarray@~1.0.0: +is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -6808,11 +6724,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - istanbul-lib-coverage@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" @@ -7352,7 +7263,7 @@ jest@^27.4.3: import-local "^3.0.2" jest-cli "^27.5.1" -js-base64@^2.4.3: +js-base64@^2.4.9: version "2.6.4" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== @@ -7377,11 +7288,6 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - jsdom@^16.6.0: version "16.7.0" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" @@ -7440,11 +7346,6 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - json-schema@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" @@ -7455,26 +7356,14 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" -json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - -json5@^2.2.0, json5@^2.2.1: +json5@^2.1.2, json5@^2.2.0, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== @@ -7493,16 +7382,6 @@ jsonpointer@^5.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - "jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.1.0" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz#642f1d7b88aa6d7eb9d8f2210e166478444fa891" @@ -7682,6 +7561,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.7.1: + version "7.16.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.16.1.tgz#7acea16fecd9ed11430e78443c2bb81a06d3dea9" + integrity sha512-9kkuMZHnLH/8qXARvYSjNvq8S1GYFFzynQTAfKeaJ0sIrR3PUPuu37Z+EiIANiZBvpfTf2B5y8ecDLSMWlLv+w== + magic-string@^0.25.0, magic-string@^0.25.7: version "0.25.7" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" @@ -7704,6 +7588,28 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" +make-fetch-happen@^10.0.4: + version "10.2.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" + integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== + dependencies: + agentkeepalive "^4.2.1" + cacache "^16.1.0" + http-cache-semantics "^4.1.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-lambda "^1.0.1" + lru-cache "^7.7.1" + minipass "^3.1.6" + minipass-collect "^1.0.2" + minipass-fetch "^2.0.3" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.4" + negotiator "^0.6.3" + promise-retry "^2.0.1" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" + make-fetch-happen@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" @@ -7743,31 +7649,30 @@ map-obj@^4.0.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -mapbox-gl@2.9.2: - version "2.9.2" - resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-2.9.2.tgz#c35f9fa2b2fd4feae6e8ed0d9f5c8264e2c33908" - integrity sha512-RQOUB+l8p5sUyR+vRdd4aRY1/nwOhyYxSWThr2bjXW8u8QtN4cjrb/R7W+CkLyoscISjkSvCS22nDAO69s5T4Q== +mapbox-gl@2.12.1: + version "2.12.1" + resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-2.12.1.tgz#ab382c7dcd5c5d993bbf56f877ae8e9d9f85741c" + integrity sha512-45LVQauimFGX/fkCJzK3O2KpQQrIB0fGlg8sERu4NH0xWiBw9JsLOLYD2xAgD5SPramQvsjzM7vYWIkGxpGYNQ== dependencies: - "@mapbox/geojson-rewind" "^0.5.1" - "@mapbox/geojson-types" "^1.0.2" + "@mapbox/geojson-rewind" "^0.5.2" "@mapbox/jsonlint-lines-primitives" "^2.0.2" "@mapbox/mapbox-gl-supported" "^2.0.1" "@mapbox/point-geometry" "^0.1.0" - "@mapbox/tiny-sdf" "^2.0.5" - "@mapbox/unitbezier" "^0.0.0" + "@mapbox/tiny-sdf" "^2.0.6" + "@mapbox/unitbezier" "^0.0.1" "@mapbox/vector-tile" "^1.3.1" "@mapbox/whoots-js" "^3.1.0" csscolorparser "~1.0.3" - earcut "^2.2.3" + earcut "^2.2.4" geojson-vt "^3.2.1" gl-matrix "^3.4.3" grid-index "^1.1.0" murmurhash-js "^1.0.0" pbf "^3.2.1" - potpack "^1.0.2" + potpack "^2.0.0" quickselect "^2.0.0" rw "^1.3.3" - supercluster "^7.1.4" + supercluster "^7.1.5" tinyqueue "^2.0.3" vt-pbf "^3.1.3" @@ -7877,7 +7782,7 @@ mime-types@^2.1.12, mime-types@^2.1.31, mime-types@~2.1.34: dependencies: mime-db "1.52.0" -mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: +mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.27" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== @@ -7942,9 +7847,9 @@ minimist-options@4.1.0: kind-of "^6.0.3" minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass-collect@^1.0.2: version "1.0.2" @@ -7964,6 +7869,17 @@ minipass-fetch@^1.3.2: optionalDependencies: encoding "^0.1.12" +minipass-fetch@^2.0.3: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" + integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== + dependencies: + minipass "^3.1.6" + minipass-sized "^1.0.3" + minizlib "^2.1.2" + optionalDependencies: + encoding "^0.1.13" + minipass-flush@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" @@ -7985,21 +7901,19 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== dependencies: yallist "^4.0.0" -minipass@^3.1.0, minipass@^3.1.3: - version "3.3.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" - integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== - dependencies: - yallist "^4.0.0" +minipass@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72" + integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw== -minizlib@^2.0.0, minizlib@^2.1.1: +minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -8047,10 +7961,10 @@ murmurhash-js@^1.0.0: resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51" integrity sha1-sGJ44h/Gw3+lMTcysEEry2rhX1E= -nan@^2.13.2: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== +nan@^2.17.0: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== nanoid@^3.3.4: version "3.3.4" @@ -8067,7 +7981,7 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -negotiator@0.6.3, negotiator@^0.6.2: +negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -8126,10 +8040,10 @@ node-releases@^2.0.6: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== -node-sass@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-7.0.1.tgz#ad4f6bc663de8acc0a9360db39165a1e2620aa72" - integrity sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ== +node-sass@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-8.0.0.tgz#c80d52148db0ce88610bcf1e1d112027393c13e1" + integrity sha512-jPzqCF2/e6JXw6r3VxfIqYc8tKQdkj5Z/BDATYyG6FL6b/LuYBNFGFVhus0mthcWifHm/JzBpKAd+3eXsWeK/A== dependencies: async-foreach "^0.1.3" chalk "^4.1.2" @@ -8138,14 +8052,13 @@ node-sass@7.0.1: get-stdin "^4.0.1" glob "^7.0.3" lodash "^4.17.15" + make-fetch-happen "^10.0.4" meow "^9.0.0" - nan "^2.13.2" + nan "^2.17.0" node-gyp "^8.4.1" - npmlog "^5.0.0" - request "^2.88.0" - sass-graph "4.0.0" + sass-graph "^4.0.1" stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" + "true-case-path" "^2.2.1" nopt@^5.0.0: version "5.0.0" @@ -8196,16 +8109,6 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npmlog@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" - integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== - dependencies: - are-we-there-yet "^2.0.0" - console-control-strings "^1.1.0" - gauge "^3.0.0" - set-blocking "^2.0.0" - npmlog@^6.0.0: version "6.0.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" @@ -8235,11 +8138,6 @@ nwsapi@^2.2.0: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -9186,10 +9084,10 @@ postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.4, postcss@^8.4.7: picocolors "^1.0.0" source-map-js "^1.0.2" -potpack@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14" - integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ== +potpack@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/potpack/-/potpack-2.0.0.tgz#61f4dd2dc4b3d5e996e3698c0ec9426d0e169104" + integrity sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw== prelude-ls@^1.2.1: version "1.2.1" @@ -9301,7 +9199,7 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" -psl@^1.1.28, psl@^1.1.33: +psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -9323,11 +9221,6 @@ qs@6.10.3: dependencies: side-channel "^1.0.4" -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -9728,32 +9621,6 @@ renderkid@^3.0.0: lodash "^4.17.21" strip-ansi "^6.0.1" -request@^2.88.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -9891,12 +9758,12 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -9906,14 +9773,14 @@ sanitize.css@*: resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-13.0.0.tgz#2675553974b27964c75562ade3bd85d79879f173" integrity sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA== -sass-graph@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.0.tgz#fff8359efc77b31213056dfd251d05dadc74c613" - integrity sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ== +sass-graph@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e" + integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA== dependencies: glob "^7.0.0" lodash "^4.17.11" - scss-tokenizer "^0.3.0" + scss-tokenizer "^0.4.3" yargs "^17.2.1" sass-loader@^12.3.0: @@ -9989,13 +9856,13 @@ schema-utils@^4.0.0: ajv-formats "^2.1.1" ajv-keywords "^5.0.0" -scss-tokenizer@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz#ef7edc3bc438b25cd6ffacf1aa5b9ad5813bf260" - integrity sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ== +scss-tokenizer@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c" + integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw== dependencies: - js-base64 "^2.4.3" - source-map "^0.7.1" + js-base64 "^2.4.9" + source-map "^0.7.3" select-hose@^2.0.0: version "2.0.0" @@ -10142,7 +10009,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2: +signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== @@ -10195,6 +10062,15 @@ socks-proxy-agent@^6.0.0: debug "^4.3.3" socks "^2.6.2" +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== + dependencies: + agent-base "^6.0.2" + debug "^4.3.3" + socks "^2.6.2" + socks@^2.6.2: version "2.7.0" resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" @@ -10240,11 +10116,6 @@ source-map@^0.5.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= -source-map@^0.7.1: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - source-map@^0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" @@ -10316,35 +10187,20 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -ssri@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" - integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== - dependencies: - minipass "^3.1.1" - -ssri@^8.0.1: +ssri@^8.0.0, ssri@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== dependencies: minipass "^3.1.1" +ssri@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== + dependencies: + minipass "^3.1.1" + stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -10562,7 +10418,7 @@ supercluster@^7.0.0: dependencies: kdbush "^3.0.0" -supercluster@^7.1.4: +supercluster@^7.1.5: version "7.1.5" resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3" integrity sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg== @@ -10695,6 +10551,18 @@ tar@^6.0.2, tar@^6.1.2: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^6.1.11: + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^4.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + temp-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" @@ -10799,14 +10667,6 @@ tough-cookie@^4.0.0: punycode "^2.1.1" universalify "^0.1.2" -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -10826,12 +10686,10 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -"true-case-path@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" - integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== - dependencies: - glob "^7.1.2" +"true-case-path@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf" + integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q== tryer@^1.0.1: version "1.0.1" @@ -10865,18 +10723,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -11009,6 +10855,13 @@ unique-filename@^1.1.1: dependencies: unique-slug "^2.0.0" +unique-filename@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" + integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== + dependencies: + unique-slug "^3.0.0" + unique-slug@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" @@ -11016,6 +10869,13 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" +unique-slug@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" + integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== + dependencies: + imurmurhash "^0.1.4" + unique-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" @@ -11093,11 +10953,6 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" @@ -11130,15 +10985,6 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - vt-pbf@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac" @@ -11378,7 +11224,7 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -wide-align@^1.1.2, wide-align@^1.1.5: +wide-align@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==