From bec3c7d1347e7b6251eb1393fc64c839a451ce9f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 18 Jan 2020 11:36:16 +0100 Subject: [PATCH] v2.1.9 --- CHANGELOG.md | 15 + config/changelog.yaml | 10 + config/dependencies.yaml | 2 +- lerna.json | 2 +- package.json | 1 + packages/aaron/CHANGELOG.md | 5 + packages/aaron/package.json | 24 +- packages/benjamin/CHANGELOG.md | 5 + packages/benjamin/package.json | 22 +- packages/bent/CHANGELOG.md | 5 + packages/bent/package.json | 24 +- packages/brian/CHANGELOG.md | 5 + packages/brian/package.json | 22 +- packages/bruce/CHANGELOG.md | 5 + packages/bruce/package.json | 22 +- packages/carlita/CHANGELOG.md | 5 + packages/carlita/package.json | 30 +- packages/carlton/CHANGELOG.md | 5 + packages/carlton/package.json | 26 +- packages/cathrin/CHANGELOG.md | 5 + packages/cathrin/package.json | 22 +- packages/components/CHANGELOG.md | 5 + packages/components/package-lock.json | 2 +- packages/components/package.json | 24 +- packages/core/CHANGELOG.md | 5 + packages/core/package-lock.json | 2 +- packages/core/package.json | 4 +- .../create-freesewing-pattern/CHANGELOG.md | 5 + .../create-freesewing-pattern/package.json | 6 +- packages/css-theme/CHANGELOG.md | 5 + packages/css-theme/package-lock.json | 2 +- packages/css-theme/package.json | 2 +- packages/examples/CHANGELOG.md | 5 + packages/examples/package.json | 22 +- packages/florent/CHANGELOG.md | 5 + packages/florent/package.json | 22 +- packages/gatsby-remark-jargon/CHANGELOG.md | 5 + packages/gatsby-remark-jargon/package.json | 4 +- packages/huey/CHANGELOG.md | 5 + packages/huey/package.json | 22 +- packages/hugo/CHANGELOG.md | 5 + packages/hugo/package.json | 24 +- packages/i18n/CHANGELOG.md | 5 + packages/i18n/package.json | 4 +- packages/jaeger/CHANGELOG.md | 5 + packages/jaeger/package.json | 26 +- packages/models/CHANGELOG.md | 5 + packages/models/package.json | 4 +- packages/mui-theme/CHANGELOG.md | 5 + packages/mui-theme/package.json | 2 +- packages/pattern-info/CHANGELOG.md | 5 + packages/pattern-info/package.json | 2 +- packages/penelope/CHANGELOG.md | 5 + packages/penelope/package.json | 22 +- packages/plugin-banner/CHANGELOG.md | 5 + packages/plugin-banner/package.json | 4 +- packages/plugin-bundle/CHANGELOG.md | 5 + packages/plugin-bundle/package.json | 20 +- packages/plugin-bust/CHANGELOG.md | 5 + packages/plugin-bust/package.json | 4 +- packages/plugin-buttons/CHANGELOG.md | 5 + packages/plugin-buttons/package.json | 4 +- packages/plugin-cutonfold/CHANGELOG.md | 5 + packages/plugin-cutonfold/package.json | 4 +- packages/plugin-debug/CHANGELOG.md | 5 + packages/plugin-debug/package.json | 4 +- packages/plugin-designer/CHANGELOG.md | 5 + packages/plugin-designer/package.json | 4 +- packages/plugin-dimension/CHANGELOG.md | 5 + packages/plugin-dimension/package.json | 4 +- packages/plugin-flip/CHANGELOG.md | 5 + packages/plugin-flip/package.json | 4 +- packages/plugin-grainline/CHANGELOG.md | 5 + packages/plugin-grainline/package.json | 4 +- packages/plugin-i18n/CHANGELOG.md | 5 + packages/plugin-i18n/package.json | 4 +- packages/plugin-logo/CHANGELOG.md | 5 + packages/plugin-logo/package.json | 4 +- packages/plugin-round/CHANGELOG.md | 5 + packages/plugin-round/package.json | 4 +- packages/plugin-scalebox/CHANGELOG.md | 5 + packages/plugin-scalebox/package.json | 4 +- packages/plugin-sprinkle/CHANGELOG.md | 5 + packages/plugin-sprinkle/package.json | 4 +- packages/plugin-svgattr/CHANGELOG.md | 5 + packages/plugin-svgattr/package.json | 4 +- packages/plugin-theme/CHANGELOG.md | 5 + packages/plugin-theme/package.json | 4 +- packages/plugin-title/CHANGELOG.md | 5 + packages/plugin-title/package.json | 4 +- packages/plugin-validate/CHANGELOG.md | 5 + packages/plugin-validate/package.json | 4 +- packages/prettier-config/CHANGELOG.md | 5 + packages/prettier-config/package.json | 2 +- packages/remark-jargon/CHANGELOG.md | 5 + packages/remark-jargon/package.json | 2 +- packages/rendertest/CHANGELOG.md | 5 + packages/rendertest/package.json | 22 +- packages/sandy/CHANGELOG.md | 5 + packages/sandy/package.json | 22 +- packages/shin/CHANGELOG.md | 5 + packages/shin/package.json | 22 +- packages/simon/CHANGELOG.md | 5 + packages/simon/package.json | 28 +- packages/simone/CHANGELOG.md | 5 + packages/simone/package.json | 32 +- packages/sven/CHANGELOG.md | 5 + packages/sven/package.json | 22 +- packages/tamiko/CHANGELOG.md | 5 + packages/tamiko/package.json | 22 +- packages/theo/CHANGELOG.md | 5 + packages/theo/package.json | 22 +- packages/trayvon/CHANGELOG.md | 5 + packages/trayvon/package.json | 22 +- packages/tutorial/CHANGELOG.md | 5 + packages/tutorial/package.json | 22 +- packages/utils/CHANGELOG.md | 5 + packages/utils/package.json | 2 +- packages/wahid/CHANGELOG.md | 5 + packages/wahid/package.json | 28 +- packages/waralee/CHANGELOG.md | 5 + packages/waralee/package.json | 22 +- yarn.lock | 2612 +++-------------- 123 files changed, 1052 insertions(+), 2647 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 895be5931c7..ce6c231e6f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,21 @@ ## Unreleased +## 2.1.9 (2020-01-18) + +### core + +#### Fixed + + - [#19](https://github.com/freesewing/freesewing/issues/19): Path offset issue is now fixed in upstream bezier-js@2.4.6 + +### simon + +#### Fixed + + - [#253](https://github.com/freesewing/freesewing/issues/253): Fixed type in simon sleeve causing incorrect cuff issue + + ## 2.1.8 (2019-12-16) ### simon diff --git a/config/changelog.yaml b/config/changelog.yaml index 4ed3bdb8e11..0d19c031eb1 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -7,6 +7,16 @@ Unreleased: Fixed: Security: +2.1.9: + date: 2020-01-18 + Fixed: + simon: + - "[#253](https://github.com/freesewing/freesewing/issues/253): + Fixed type in simon sleeve causing incorrect cuff issue" + core: + - "[#19](https://github.com/freesewing/freesewing/issues/19): + Path offset issue is now fixed in upstream bezier-js@2.4.6" + 2.1.8: date: 2019-12-16 Fixed: diff --git a/config/dependencies.yaml b/config/dependencies.yaml index eaa961df37a..4bde04ce31e 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -84,7 +84,7 @@ components: "file-saver": "^2.0.2" core: _: - "bezier-js": "^2.2.13" + "bezier-js": "^2.4.6" "bin-pack": "1.0.2" "hooks": "^0.3.2" create-freesewing-pattern: diff --git a/lerna.json b/lerna.json index cefe1a9167e..1a34a831f15 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.8", + "version": "2.1.9", "npmClient": "yarn", "command": { "publish": { diff --git a/package.json b/package.json index b0165a3bfc9..8ff7ec9ffcc 100644 --- a/package.json +++ b/package.json @@ -164,6 +164,7 @@ "@freesewing/tamiko": "file:packages/tamiko", "@freesewing/trayvon": "file:packages/trayvon", "@freesewing/wahid": "file:packages/wahid", + "bezier-js": "2.4.6", "create-freesewing-pattern": "file:packages/create-freesewing-pattern", "file-saver": "2.0.2", "tlds": "^1.203.1" diff --git a/packages/aaron/CHANGELOG.md b/packages/aaron/CHANGELOG.md index d36f7f814ff..d8085291e8e 100644 --- a/packages/aaron/CHANGELOG.md +++ b/packages/aaron/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package aaron +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package aaron + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package aaron diff --git a/packages/aaron/package.json b/packages/aaron/package.json index 57520073567..8950e9f4b75 100644 --- a/packages/aaron/package.json +++ b/packages/aaron/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/aaron", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a A-shirt or tank top", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,9 +33,9 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/brian": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/brian": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -46,14 +46,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/benjamin/CHANGELOG.md b/packages/benjamin/CHANGELOG.md index fe45e312526..e0c5563096d 100644 --- a/packages/benjamin/CHANGELOG.md +++ b/packages/benjamin/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package benjamin +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package benjamin + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package benjamin diff --git a/packages/benjamin/package.json b/packages/benjamin/package.json index 57821832049..fec1c1f8ca7 100644 --- a/packages/benjamin/package.json +++ b/packages/benjamin/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/benjamin", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a bow tie", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/bent/CHANGELOG.md b/packages/bent/CHANGELOG.md index d9f2b8a75bd..d01169c0a39 100644 --- a/packages/bent/CHANGELOG.md +++ b/packages/bent/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package bent +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package bent + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package bent diff --git a/packages/bent/package.json b/packages/bent/package.json index c52e1c1411f..5015631b0e7 100644 --- a/packages/bent/package.json +++ b/packages/bent/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/bent", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a menswear body block with a two-part sleeve", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,9 +33,9 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/brian": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/brian": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -46,14 +46,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/brian/CHANGELOG.md b/packages/brian/CHANGELOG.md index 07ce3178c4d..5d70bc53854 100644 --- a/packages/brian/CHANGELOG.md +++ b/packages/brian/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package brian +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package brian + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package brian diff --git a/packages/brian/package.json b/packages/brian/package.json index 2e82e182069..6683b983e76 100644 --- a/packages/brian/package.json +++ b/packages/brian/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/brian", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a basic body block for menswear", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/bruce/CHANGELOG.md b/packages/bruce/CHANGELOG.md index 80e01afd1c1..c3600b232da 100644 --- a/packages/bruce/CHANGELOG.md +++ b/packages/bruce/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package bruce +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package bruce + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package bruce diff --git a/packages/bruce/package.json b/packages/bruce/package.json index a4fc37c5367..4261e9ff5c2 100644 --- a/packages/bruce/package.json +++ b/packages/bruce/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/bruce", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for boxer briefs", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/carlita/CHANGELOG.md b/packages/carlita/CHANGELOG.md index 9b61b8e7737..f94eaf27663 100644 --- a/packages/carlita/CHANGELOG.md +++ b/packages/carlita/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package carlita +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package carlita + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package carlita diff --git a/packages/carlita/package.json b/packages/carlita/package.json index fcf1a11b9c5..ef6bda86954 100644 --- a/packages/carlita/package.json +++ b/packages/carlita/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/carlita", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for Sherlock Holmes cosplay; Or just a nice long coat", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,12 +33,12 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/bent": "^2.1.8", - "@freesewing/carlton": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/bent": "^2.1.9", + "@freesewing/carlton": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -49,14 +49,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/carlton/CHANGELOG.md b/packages/carlton/CHANGELOG.md index e58c99e5c1c..e21050063a4 100644 --- a/packages/carlton/CHANGELOG.md +++ b/packages/carlton/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package carlton +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package carlton + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package carlton diff --git a/packages/carlton/package.json b/packages/carlton/package.json index dc5c324c8dd..a2a7c2dd9ee 100644 --- a/packages/carlton/package.json +++ b/packages/carlton/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/carlton", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for Sherlock Holmes cosplay; Or just a nice long coat", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,10 +33,10 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/bent": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/bent": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -47,14 +47,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/cathrin/CHANGELOG.md b/packages/cathrin/CHANGELOG.md index ecdd267ec37..5be3c555d7c 100644 --- a/packages/cathrin/CHANGELOG.md +++ b/packages/cathrin/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package cathrin +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package cathrin + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package cathrin diff --git a/packages/cathrin/package.json b/packages/cathrin/package.json index a43cde6d026..806b02d6e88 100644 --- a/packages/cathrin/package.json +++ b/packages/cathrin/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/cathrin", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a underbust corset / waist trainer", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index c152cff6889..fc6dfae3b6a 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package components +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package components + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package components diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index ef8a20b45b1..c1a4d9d3dfd 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,6 +1,6 @@ { "name": "@freesewing/components", - "version": "2.1.8", + "version": "2.1.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/components/package.json b/packages/components/package.json index 78b3c6d6c0e..14ffd3578d5 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/components", - "version": "2.1.8", + "version": "2.1.9", "description": "A collection of React components for FreeSewing web UIs", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -28,18 +28,18 @@ "peerDependencies": { "react": "^16.8", "prop-types": "15.7.2", - "@freesewing/pattern-info": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/plugin-theme": "^2.1.8", - "@freesewing/core": "^2.1.8", - "@freesewing/models": "^2.1.8", - "@freesewing/examples": "^2.1.8", - "@freesewing/rendertest": "^2.1.8", - "@freesewing/tutorial": "^2.1.8", + "@freesewing/pattern-info": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/plugin-theme": "^2.1.9", + "@freesewing/core": "^2.1.9", + "@freesewing/models": "^2.1.9", + "@freesewing/examples": "^2.1.9", + "@freesewing/rendertest": "^2.1.9", + "@freesewing/tutorial": "^2.1.9", "typeface-roboto-condensed": "latest", - "@freesewing/i18n": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/i18n": "^2.1.9", + "@freesewing/utils": "^2.1.9", "react-intl": "^2.8.0", "@material-ui/core": "^4.0.1", "@material-ui/icons": "^4.0.1", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 705570dabe1..dd7a8301fa1 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package core +## 2.1.9 (2020-01-18) + +### Fixed + + - [#19](https://github.com/freesewing/freesewing/issues/19): Path offset issue is now fixed in upstream bezier-js@2.4.6 ## 2.1.8 (2019-12-16) **Note:** Version bump only for package core diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json index 849991df055..b5c00e7ac22 100644 --- a/packages/core/package-lock.json +++ b/packages/core/package-lock.json @@ -1,6 +1,6 @@ { "name": "@freesewing/core", - "version": "2.1.8", + "version": "2.1.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index 56ad0db4427..7dd2723d8d8 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/core", - "version": "2.1.8", + "version": "2.1.9", "description": "A library for creating made-to-measure sewing patterns", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -37,7 +37,7 @@ }, "peerDependencies": {}, "dependencies": { - "bezier-js": "^2.2.13", + "bezier-js": "^2.4.6", "bin-pack": "1.0.2", "hooks": "^0.3.2" }, diff --git a/packages/create-freesewing-pattern/CHANGELOG.md b/packages/create-freesewing-pattern/CHANGELOG.md index 8bc2c290cfe..cbfcfc5dba7 100644 --- a/packages/create-freesewing-pattern/CHANGELOG.md +++ b/packages/create-freesewing-pattern/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package create-freesewing-pattern +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package create-freesewing-pattern + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package create-freesewing-pattern diff --git a/packages/create-freesewing-pattern/package.json b/packages/create-freesewing-pattern/package.json index a390d26f6b3..6e932457474 100644 --- a/packages/create-freesewing-pattern/package.json +++ b/packages/create-freesewing-pattern/package.json @@ -1,6 +1,6 @@ { "name": "create-freesewing-pattern", - "version": "2.1.8", + "version": "2.1.9", "description": "Initializer package for FreeSewing patterns: npm init FreeSewing-pattern", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -41,8 +41,8 @@ "parse-git-config": "^3.0.0", "validate-npm-package-name": "^3.0.0", "which": "^1.3.1", - "@freesewing/i18n": "^2.1.8", - "@freesewing/pattern-info": "^2.1.8" + "@freesewing/i18n": "^2.1.9", + "@freesewing/pattern-info": "^2.1.9" }, "devDependencies": {}, "files": [ diff --git a/packages/css-theme/CHANGELOG.md b/packages/css-theme/CHANGELOG.md index a2d9b49046b..4a12521740e 100644 --- a/packages/css-theme/CHANGELOG.md +++ b/packages/css-theme/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package css-theme +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package css-theme + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package css-theme diff --git a/packages/css-theme/package-lock.json b/packages/css-theme/package-lock.json index 74844a6faaa..742b4c46c04 100644 --- a/packages/css-theme/package-lock.json +++ b/packages/css-theme/package-lock.json @@ -1,6 +1,6 @@ { "name": "@freesewing/css-theme", - "version": "2.1.8", + "version": "2.1.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/css-theme/package.json b/packages/css-theme/package.json index 79e62fec8d8..377c0e3edbf 100644 --- a/packages/css-theme/package.json +++ b/packages/css-theme/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/css-theme", - "version": "2.1.8", + "version": "2.1.9", "description": "A CSS theme for FreeSewing web UIs", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md index 54fa5a385f6..c27810f53a2 100644 --- a/packages/examples/CHANGELOG.md +++ b/packages/examples/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package examples +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package examples + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package examples diff --git a/packages/examples/package.json b/packages/examples/package.json index 6b8c0535cff..06e7b0d3d6a 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/examples", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern holding examples for our documentation", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -28,8 +28,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -40,14 +40,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/florent/CHANGELOG.md b/packages/florent/CHANGELOG.md index 6a2c8f5ec35..c5e892a8535 100644 --- a/packages/florent/CHANGELOG.md +++ b/packages/florent/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package florent +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package florent + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package florent diff --git a/packages/florent/package.json b/packages/florent/package.json index dab3c7d3619..efac6a19ffe 100644 --- a/packages/florent/package.json +++ b/packages/florent/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/florent", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a flat cap", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/gatsby-remark-jargon/CHANGELOG.md b/packages/gatsby-remark-jargon/CHANGELOG.md index 2f562e6f5fd..1d4cc3959f6 100644 --- a/packages/gatsby-remark-jargon/CHANGELOG.md +++ b/packages/gatsby-remark-jargon/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package gatsby-remark-jargon +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package gatsby-remark-jargon + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package gatsby-remark-jargon diff --git a/packages/gatsby-remark-jargon/package.json b/packages/gatsby-remark-jargon/package.json index 65d25ce7a10..437c967e2d7 100644 --- a/packages/gatsby-remark-jargon/package.json +++ b/packages/gatsby-remark-jargon/package.json @@ -1,6 +1,6 @@ { "name": "gatsby-remark-jargon", - "version": "2.1.8", + "version": "2.1.9", "description": "A gatsby-transformer-remark sub-plugin for jargon terms", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -29,7 +29,7 @@ }, "peerDependencies": {}, "dependencies": { - "remark-jargon": "^2.1.8" + "remark-jargon": "^2.1.9" }, "devDependencies": {}, "files": [ diff --git a/packages/huey/CHANGELOG.md b/packages/huey/CHANGELOG.md index a7b996553de..247b572394d 100644 --- a/packages/huey/CHANGELOG.md +++ b/packages/huey/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package huey +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package huey + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package huey diff --git a/packages/huey/package.json b/packages/huey/package.json index 6efed20b251..cb7bd859acd 100644 --- a/packages/huey/package.json +++ b/packages/huey/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/huey", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a zip-up hoodie", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/hugo/CHANGELOG.md b/packages/hugo/CHANGELOG.md index 82c18c06b63..b4464c2cdba 100644 --- a/packages/hugo/CHANGELOG.md +++ b/packages/hugo/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package hugo +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package hugo + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package hugo diff --git a/packages/hugo/package.json b/packages/hugo/package.json index 61ba18c05d0..8b8dc249236 100644 --- a/packages/hugo/package.json +++ b/packages/hugo/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/hugo", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a hooded jumper with raglan sleeves", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,9 +33,9 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/brian": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/brian": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -46,14 +46,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md index 5c2a5470665..609ab32da86 100644 --- a/packages/i18n/CHANGELOG.md +++ b/packages/i18n/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package i18n +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package i18n + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package i18n diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 1fb62340b43..1a5e5239972 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/i18n", - "version": "2.1.8", + "version": "2.1.9", "description": "Translations for the FreeSewing project", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -28,7 +28,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/pattern-info": "^2.1.8" + "@freesewing/pattern-info": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/jaeger/CHANGELOG.md b/packages/jaeger/CHANGELOG.md index 3968574e38a..5cc69581d89 100644 --- a/packages/jaeger/CHANGELOG.md +++ b/packages/jaeger/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package jaeger +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package jaeger + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package jaeger diff --git a/packages/jaeger/package.json b/packages/jaeger/package.json index 727ae6429b5..4d1651134e4 100644 --- a/packages/jaeger/package.json +++ b/packages/jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/jaeger", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a sport coat style jacket", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,10 +33,10 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/bent": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/bent": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -47,14 +47,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 5ffc6baf7f8..f8bd7e74a7c 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package models +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package models + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package models diff --git a/packages/models/package.json b/packages/models/package.json index 8c7707b7a70..b64a57ad712 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/models", - "version": "2.1.8", + "version": "2.1.9", "description": "Body measurements data for a range of default sizes", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -29,7 +29,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/utils": "^2.1.8" + "@freesewing/utils": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/mui-theme/CHANGELOG.md b/packages/mui-theme/CHANGELOG.md index 89d492808dc..263b725482c 100644 --- a/packages/mui-theme/CHANGELOG.md +++ b/packages/mui-theme/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package mui-theme +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package mui-theme + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package mui-theme diff --git a/packages/mui-theme/package.json b/packages/mui-theme/package.json index 11315cb79cb..b2463ad794b 100644 --- a/packages/mui-theme/package.json +++ b/packages/mui-theme/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/mui-theme", - "version": "2.1.8", + "version": "2.1.9", "description": "A Material-UI theme for FreeSewing web UIs", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", diff --git a/packages/pattern-info/CHANGELOG.md b/packages/pattern-info/CHANGELOG.md index a3295b2c608..2c0278e4c6b 100644 --- a/packages/pattern-info/CHANGELOG.md +++ b/packages/pattern-info/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package pattern-info +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package pattern-info + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package pattern-info diff --git a/packages/pattern-info/package.json b/packages/pattern-info/package.json index d583acf8a5e..4c780689703 100644 --- a/packages/pattern-info/package.json +++ b/packages/pattern-info/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/pattern-info", - "version": "2.1.8", + "version": "2.1.9", "description": "Information about available freesewing patterns", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", diff --git a/packages/penelope/CHANGELOG.md b/packages/penelope/CHANGELOG.md index df58fdd86b7..48e469c028e 100644 --- a/packages/penelope/CHANGELOG.md +++ b/packages/penelope/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package penelope +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package penelope + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package penelope diff --git a/packages/penelope/package.json b/packages/penelope/package.json index 5b6b26d318c..4c457093644 100644 --- a/packages/penelope/package.json +++ b/packages/penelope/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/penelope", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a pencil skirt", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/plugin-banner/CHANGELOG.md b/packages/plugin-banner/CHANGELOG.md index 9d69fde66e9..61154a4737b 100644 --- a/packages/plugin-banner/CHANGELOG.md +++ b/packages/plugin-banner/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-banner +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-banner + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-banner diff --git a/packages/plugin-banner/package.json b/packages/plugin-banner/package.json index b7059cac2e6..7ffb1f80eb7 100644 --- a/packages/plugin-banner/package.json +++ b/packages/plugin-banner/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-banner", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to repeat text on a path", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-bundle/CHANGELOG.md b/packages/plugin-bundle/CHANGELOG.md index 1760a472ace..aab3ee14176 100644 --- a/packages/plugin-bundle/CHANGELOG.md +++ b/packages/plugin-bundle/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-bundle +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-bundle + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-bundle diff --git a/packages/plugin-bundle/package.json b/packages/plugin-bundle/package.json index 93f9110a46e..7da43512071 100644 --- a/packages/plugin-bundle/package.json +++ b/packages/plugin-bundle/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-bundle", - "version": "2.1.8", + "version": "2.1.9", "description": "An umbrella package of 8 essential FreeSewing build-time plugins", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,17 +33,17 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": { - "@freesewing/plugin-cutonfold": "^2.1.8", - "@freesewing/plugin-dimension": "^2.1.8", - "@freesewing/plugin-grainline": "^2.1.8", - "@freesewing/plugin-logo": "^2.1.8", - "@freesewing/plugin-title": "^2.1.8", - "@freesewing/plugin-scalebox": "^2.1.8", - "@freesewing/plugin-round": "^2.1.8", - "@freesewing/plugin-sprinkle": "^2.1.8" + "@freesewing/plugin-cutonfold": "^2.1.9", + "@freesewing/plugin-dimension": "^2.1.9", + "@freesewing/plugin-grainline": "^2.1.9", + "@freesewing/plugin-logo": "^2.1.9", + "@freesewing/plugin-title": "^2.1.9", + "@freesewing/plugin-scalebox": "^2.1.9", + "@freesewing/plugin-round": "^2.1.9", + "@freesewing/plugin-sprinkle": "^2.1.9" }, "devDependencies": {}, "files": [ diff --git a/packages/plugin-bust/CHANGELOG.md b/packages/plugin-bust/CHANGELOG.md index 818e21425a9..74d7f90c873 100644 --- a/packages/plugin-bust/CHANGELOG.md +++ b/packages/plugin-bust/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-bust +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-bust + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-bust diff --git a/packages/plugin-bust/package.json b/packages/plugin-bust/package.json index 49266ed1002..1e4c226efc4 100644 --- a/packages/plugin-bust/package.json +++ b/packages/plugin-bust/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-bust", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin that helps with bust-adjusting menswear patterns", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-buttons/CHANGELOG.md b/packages/plugin-buttons/CHANGELOG.md index ca5e54b52e9..68dd63c1148 100644 --- a/packages/plugin-buttons/CHANGELOG.md +++ b/packages/plugin-buttons/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-buttons +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-buttons + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-buttons diff --git a/packages/plugin-buttons/package.json b/packages/plugin-buttons/package.json index 2533465aaaf..c12bf4fcb56 100644 --- a/packages/plugin-buttons/package.json +++ b/packages/plugin-buttons/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-buttons", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin that provides button and buttonhole snippets", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-cutonfold/CHANGELOG.md b/packages/plugin-cutonfold/CHANGELOG.md index 716a487a8c2..e650976b2cf 100644 --- a/packages/plugin-cutonfold/CHANGELOG.md +++ b/packages/plugin-cutonfold/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-cutonfold +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-cutonfold + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-cutonfold diff --git a/packages/plugin-cutonfold/package.json b/packages/plugin-cutonfold/package.json index dc35497aca8..14712efdc71 100644 --- a/packages/plugin-cutonfold/package.json +++ b/packages/plugin-cutonfold/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-cutonfold", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to add cut-on-fold indicators on your patterns", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-debug/CHANGELOG.md b/packages/plugin-debug/CHANGELOG.md index 89941768b5e..0e081cfce1e 100644 --- a/packages/plugin-debug/CHANGELOG.md +++ b/packages/plugin-debug/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-debug +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-debug + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-debug diff --git a/packages/plugin-debug/package.json b/packages/plugin-debug/package.json index 2148b3293e8..7d492a24461 100644 --- a/packages/plugin-debug/package.json +++ b/packages/plugin-debug/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-debug", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to log debug info to your browser console", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md index 5b05d312fa4..3ab9af5e124 100644 --- a/packages/plugin-designer/CHANGELOG.md +++ b/packages/plugin-designer/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-designer +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-designer + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-designer diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index 8230cb0677e..ab0204344d7 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-designer", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to facilitate pattern design", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-dimension/CHANGELOG.md b/packages/plugin-dimension/CHANGELOG.md index bb4f1d2115a..45e2c702ffc 100644 --- a/packages/plugin-dimension/CHANGELOG.md +++ b/packages/plugin-dimension/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-dimension +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-dimension + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-dimension diff --git a/packages/plugin-dimension/package.json b/packages/plugin-dimension/package.json index 814ed0fd8e2..e908885b478 100644 --- a/packages/plugin-dimension/package.json +++ b/packages/plugin-dimension/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-dimension", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to add dimensions to your (paperless) pattern", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-flip/CHANGELOG.md b/packages/plugin-flip/CHANGELOG.md index fd581bc956d..3a269dddc4a 100644 --- a/packages/plugin-flip/CHANGELOG.md +++ b/packages/plugin-flip/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-flip +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-flip + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-flip diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 37cd707d132..0a1706535e4 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-flip", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to flip parts horizontally", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-grainline/CHANGELOG.md b/packages/plugin-grainline/CHANGELOG.md index 1c3760506f4..b9781d77332 100644 --- a/packages/plugin-grainline/CHANGELOG.md +++ b/packages/plugin-grainline/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-grainline +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-grainline + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-grainline diff --git a/packages/plugin-grainline/package.json b/packages/plugin-grainline/package.json index f36fdc1009c..fabe6adabd0 100644 --- a/packages/plugin-grainline/package.json +++ b/packages/plugin-grainline/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-grainline", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to add grainline indicators on your patterns", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-i18n/CHANGELOG.md b/packages/plugin-i18n/CHANGELOG.md index 2a393f7f633..2bd34837c12 100644 --- a/packages/plugin-i18n/CHANGELOG.md +++ b/packages/plugin-i18n/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-i18n +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-i18n + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-i18n diff --git a/packages/plugin-i18n/package.json b/packages/plugin-i18n/package.json index 4f68dc7934f..abbdaaf5f87 100644 --- a/packages/plugin-i18n/package.json +++ b/packages/plugin-i18n/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-i18n", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin for pattern translation", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-logo/CHANGELOG.md b/packages/plugin-logo/CHANGELOG.md index 7995e83894a..c05d3b42df2 100644 --- a/packages/plugin-logo/CHANGELOG.md +++ b/packages/plugin-logo/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-logo +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-logo + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-logo diff --git a/packages/plugin-logo/package.json b/packages/plugin-logo/package.json index 23f2f29d4fe..5396e2ac560 100644 --- a/packages/plugin-logo/package.json +++ b/packages/plugin-logo/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-logo", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to add our logo to your patterns", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-round/CHANGELOG.md b/packages/plugin-round/CHANGELOG.md index b1264d8900a..8d2294c1064 100644 --- a/packages/plugin-round/CHANGELOG.md +++ b/packages/plugin-round/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-round +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-round + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-round diff --git a/packages/plugin-round/package.json b/packages/plugin-round/package.json index 1f4fa033851..81a160d5f91 100644 --- a/packages/plugin-round/package.json +++ b/packages/plugin-round/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-round", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to round corners", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-scalebox/CHANGELOG.md b/packages/plugin-scalebox/CHANGELOG.md index 9fbbde97799..db46724ff9f 100644 --- a/packages/plugin-scalebox/CHANGELOG.md +++ b/packages/plugin-scalebox/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-scalebox +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-scalebox + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-scalebox diff --git a/packages/plugin-scalebox/package.json b/packages/plugin-scalebox/package.json index 73d4e5f1491..b8bdde77373 100644 --- a/packages/plugin-scalebox/package.json +++ b/packages/plugin-scalebox/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-scalebox", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to add a scalebox to your pattern", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-sprinkle/CHANGELOG.md b/packages/plugin-sprinkle/CHANGELOG.md index 3d9bd8d8ced..bdc34a44f59 100644 --- a/packages/plugin-sprinkle/CHANGELOG.md +++ b/packages/plugin-sprinkle/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-sprinkle +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-sprinkle + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-sprinkle diff --git a/packages/plugin-sprinkle/package.json b/packages/plugin-sprinkle/package.json index 0d1405c88f5..e2b18946a8c 100644 --- a/packages/plugin-sprinkle/package.json +++ b/packages/plugin-sprinkle/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-sprinkle", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to bulk-add snippets to your pattern", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-svgattr/CHANGELOG.md b/packages/plugin-svgattr/CHANGELOG.md index f62d9699b4c..b82dc39eaf6 100644 --- a/packages/plugin-svgattr/CHANGELOG.md +++ b/packages/plugin-svgattr/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-svgattr +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-svgattr + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-svgattr diff --git a/packages/plugin-svgattr/package.json b/packages/plugin-svgattr/package.json index b956b9c518c..0233371b5ae 100644 --- a/packages/plugin-svgattr/package.json +++ b/packages/plugin-svgattr/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-svgattr", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to set SVG attributes", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-theme/CHANGELOG.md b/packages/plugin-theme/CHANGELOG.md index 43ff1b82774..4210044fd8a 100644 --- a/packages/plugin-theme/CHANGELOG.md +++ b/packages/plugin-theme/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-theme +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-theme + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-theme diff --git a/packages/plugin-theme/package.json b/packages/plugin-theme/package.json index 3082c4312db..c82e501f803 100644 --- a/packages/plugin-theme/package.json +++ b/packages/plugin-theme/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-theme", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin that provides a default theme", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-title/CHANGELOG.md b/packages/plugin-title/CHANGELOG.md index 576072385dc..0a5d415a552 100644 --- a/packages/plugin-title/CHANGELOG.md +++ b/packages/plugin-title/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-title +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-title + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-title diff --git a/packages/plugin-title/package.json b/packages/plugin-title/package.json index 3ddd8a377a0..1cd0420cd22 100644 --- a/packages/plugin-title/package.json +++ b/packages/plugin-title/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-title", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin to add a title to your pattern parts", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/plugin-validate/CHANGELOG.md b/packages/plugin-validate/CHANGELOG.md index 95ad4d1f27f..b4abfb9400c 100644 --- a/packages/plugin-validate/CHANGELOG.md +++ b/packages/plugin-validate/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package plugin-validate +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package plugin-validate + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package plugin-validate diff --git a/packages/plugin-validate/package.json b/packages/plugin-validate/package.json index 5d16e738636..ff10daf31b1 100644 --- a/packages/plugin-validate/package.json +++ b/packages/plugin-validate/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/plugin-validate", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing plugin that validates aspects of your code", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -32,7 +32,7 @@ "start": "rollup -c -w" }, "peerDependencies": { - "@freesewing/core": "^2.1.8" + "@freesewing/core": "^2.1.9" }, "dependencies": {}, "devDependencies": {}, diff --git a/packages/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md index ad0b8ef8e4f..b68d18cdd88 100644 --- a/packages/prettier-config/CHANGELOG.md +++ b/packages/prettier-config/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package prettier-config +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package prettier-config + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package prettier-config diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json index 89b483ba11f..eec639848df 100644 --- a/packages/prettier-config/package.json +++ b/packages/prettier-config/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/prettier-config", - "version": "2.1.8", + "version": "2.1.9", "description": "FreeSewing's shared configuration for prettier", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", diff --git a/packages/remark-jargon/CHANGELOG.md b/packages/remark-jargon/CHANGELOG.md index 2f3e205682e..0f998d9755c 100644 --- a/packages/remark-jargon/CHANGELOG.md +++ b/packages/remark-jargon/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package remark-jargon +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package remark-jargon + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package remark-jargon diff --git a/packages/remark-jargon/package.json b/packages/remark-jargon/package.json index d52f813446c..43d2fa3091f 100644 --- a/packages/remark-jargon/package.json +++ b/packages/remark-jargon/package.json @@ -1,6 +1,6 @@ { "name": "remark-jargon", - "version": "2.1.8", + "version": "2.1.9", "description": "A Remark plugin for jargon terms", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", diff --git a/packages/rendertest/CHANGELOG.md b/packages/rendertest/CHANGELOG.md index ec310c668b0..2f052ead75e 100644 --- a/packages/rendertest/CHANGELOG.md +++ b/packages/rendertest/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package rendertest +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package rendertest + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package rendertest diff --git a/packages/rendertest/package.json b/packages/rendertest/package.json index 3f527cdc1a5..3fbdaae860e 100644 --- a/packages/rendertest/package.json +++ b/packages/rendertest/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/rendertest", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern to test (y)our render engine our CSS", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/sandy/CHANGELOG.md b/packages/sandy/CHANGELOG.md index 92638136880..1ff86b40360 100644 --- a/packages/sandy/CHANGELOG.md +++ b/packages/sandy/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package sandy +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package sandy + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package sandy diff --git a/packages/sandy/package.json b/packages/sandy/package.json index 269169ef3e2..4b20f313d11 100644 --- a/packages/sandy/package.json +++ b/packages/sandy/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/sandy", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a circle skirt", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/shin/CHANGELOG.md b/packages/shin/CHANGELOG.md index 65ad3f48d49..6a32c889a15 100644 --- a/packages/shin/CHANGELOG.md +++ b/packages/shin/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package shin +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package shin + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package shin diff --git a/packages/shin/package.json b/packages/shin/package.json index 311e4ae4620..0c3fb5ecdc7 100644 --- a/packages/shin/package.json +++ b/packages/shin/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/shin", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for swim trunks", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/simon/CHANGELOG.md b/packages/simon/CHANGELOG.md index 1b262736f96..c1d9657dd04 100644 --- a/packages/simon/CHANGELOG.md +++ b/packages/simon/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package simon +## 2.1.9 (2020-01-18) + +### Fixed + + - [#253](https://github.com/freesewing/freesewing/issues/253): Fixed type in simon sleeve causing incorrect cuff issue ## 2.1.8 (2019-12-16) ### Fixed diff --git a/packages/simon/package.json b/packages/simon/package.json index afcd14cc07e..7adf679e909 100644 --- a/packages/simon/package.json +++ b/packages/simon/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/simon", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a button down shirt", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,11 +33,11 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/brian": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/brian": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -48,14 +48,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/simone/CHANGELOG.md b/packages/simone/CHANGELOG.md index e7988e88b9b..fd25919c377 100644 --- a/packages/simone/CHANGELOG.md +++ b/packages/simone/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package simone +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package simone + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package simone diff --git a/packages/simone/package.json b/packages/simone/package.json index 050b401ffb5..c2db7d59e24 100644 --- a/packages/simone/package.json +++ b/packages/simone/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/simone", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a button down shirt (Simone = Simon for people with breasts)", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,13 +33,13 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/brian": "^2.1.8", - "@freesewing/simon": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/brian": "^2.1.9", + "@freesewing/simon": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -50,14 +50,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/sven/CHANGELOG.md b/packages/sven/CHANGELOG.md index 7f5b1fc0124..1f1a71ec0ff 100644 --- a/packages/sven/CHANGELOG.md +++ b/packages/sven/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package sven +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package sven + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package sven diff --git a/packages/sven/package.json b/packages/sven/package.json index a7b8bc818d3..262bd8f603f 100644 --- a/packages/sven/package.json +++ b/packages/sven/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/sven", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a straightforward sweater", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/tamiko/CHANGELOG.md b/packages/tamiko/CHANGELOG.md index f05637ba9d4..7c6d8378a53 100644 --- a/packages/tamiko/CHANGELOG.md +++ b/packages/tamiko/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package tamiko +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package tamiko + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package tamiko diff --git a/packages/tamiko/package.json b/packages/tamiko/package.json index 925f2549c11..80291414739 100644 --- a/packages/tamiko/package.json +++ b/packages/tamiko/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/tamiko", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a zero-waste top", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/theo/CHANGELOG.md b/packages/theo/CHANGELOG.md index fb563dbcc09..fb8ddd74a8a 100644 --- a/packages/theo/CHANGELOG.md +++ b/packages/theo/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package theo +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package theo + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package theo diff --git a/packages/theo/package.json b/packages/theo/package.json index 81da8bf30b5..6ccd8ba44fd 100644 --- a/packages/theo/package.json +++ b/packages/theo/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/theo", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for classic trousers", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/trayvon/CHANGELOG.md b/packages/trayvon/CHANGELOG.md index d4d481642d1..c4fec1dee6c 100644 --- a/packages/trayvon/CHANGELOG.md +++ b/packages/trayvon/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package trayvon +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package trayvon + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package trayvon diff --git a/packages/trayvon/package.json b/packages/trayvon/package.json index 570af6cf285..0c92295a52f 100644 --- a/packages/trayvon/package.json +++ b/packages/trayvon/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/trayvon", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a tie", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/tutorial/CHANGELOG.md b/packages/tutorial/CHANGELOG.md index 8be756308c5..4a20346ebff 100644 --- a/packages/tutorial/CHANGELOG.md +++ b/packages/tutorial/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package tutorial +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package tutorial + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package tutorial diff --git a/packages/tutorial/package.json b/packages/tutorial/package.json index 81e13dd332f..18107e9a7e9 100644 --- a/packages/tutorial/package.json +++ b/packages/tutorial/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/tutorial", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a baby bib that's used in our tutorial", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 02019655134..92891939d40 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package utils +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package utils + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package utils diff --git a/packages/utils/package.json b/packages/utils/package.json index 716ab0b5b25..02f5b01393c 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/utils", - "version": "2.1.8", + "version": "2.1.9", "description": "A collection of utilities shared across freesewing frontend projects", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", diff --git a/packages/wahid/CHANGELOG.md b/packages/wahid/CHANGELOG.md index 60cb086d2ea..b08f06450b2 100644 --- a/packages/wahid/CHANGELOG.md +++ b/packages/wahid/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package wahid +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package wahid + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package wahid diff --git a/packages/wahid/package.json b/packages/wahid/package.json index 3c4e9199c1d..41e0b622f95 100644 --- a/packages/wahid/package.json +++ b/packages/wahid/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/wahid", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for a classic fitted waistcoat", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,11 +33,11 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8", - "@freesewing/brian": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-round": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9", + "@freesewing/brian": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-round": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -48,14 +48,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/packages/waralee/CHANGELOG.md b/packages/waralee/CHANGELOG.md index 1611134caa8..63624982761 100644 --- a/packages/waralee/CHANGELOG.md +++ b/packages/waralee/CHANGELOG.md @@ -6,6 +6,11 @@ **Note:** Version bump only for package waralee +## 2.1.9 (2020-01-18) + +**Note:** Version bump only for package waralee + + ## 2.1.8 (2019-12-16) **Note:** Version bump only for package waralee diff --git a/packages/waralee/package.json b/packages/waralee/package.json index 519642be290..af18f70eaec 100644 --- a/packages/waralee/package.json +++ b/packages/waralee/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/waralee", - "version": "2.1.8", + "version": "2.1.9", "description": "A FreeSewing pattern for wrap pants", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", @@ -33,8 +33,8 @@ "netlify": "echo \"Not configured yet\"" }, "peerDependencies": { - "@freesewing/core": "^2.1.8", - "@freesewing/plugin-bundle": "^2.1.8" + "@freesewing/core": "^2.1.9", + "@freesewing/plugin-bundle": "^2.1.9" }, "dependencies": {}, "devDependencies": { @@ -45,14 +45,14 @@ "eslint": "^5.16.0", "babel-jest": "24.7.1", "jest": "24.7.1", - "@freesewing/components": "^2.1.8", - "@freesewing/css-theme": "^2.1.8", - "@freesewing/i18n": "^2.1.8", - "@freesewing/mui-theme": "^2.1.8", - "@freesewing/plugin-bust": "^2.1.8", - "@freesewing/plugin-buttons": "^2.1.8", - "@freesewing/plugin-flip": "^2.1.8", - "@freesewing/utils": "^2.1.8", + "@freesewing/components": "^2.1.9", + "@freesewing/css-theme": "^2.1.9", + "@freesewing/i18n": "^2.1.9", + "@freesewing/mui-theme": "^2.1.9", + "@freesewing/plugin-bust": "^2.1.9", + "@freesewing/plugin-buttons": "^2.1.9", + "@freesewing/plugin-flip": "^2.1.9", + "@freesewing/utils": "^2.1.9", "@svgr/rollup": "^2.4.1", "cross-env": "^5.1.4", "gh-pages": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index abf285ab3de..047e7490391 100644 --- a/yarn.lock +++ b/yarn.lock @@ -33,46 +33,22 @@ dependencies: "@babel/highlight" "^7.0.0" -<<<<<<< HEAD -"@babel/core@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab" - integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ== +"@babel/code-frame@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" + integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== dependencies: - "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.7.4" - "@babel/helpers" "^7.7.4" - "@babel/parser" "^7.7.4" - "@babel/template" "^7.7.4" - "@babel/traverse" "^7.7.4" - "@babel/types" "^7.7.4" - convert-source-map "^1.7.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.13" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" + "@babel/highlight" "^7.8.3" -"@babel/core@^7.0.0", "@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.5.4", "@babel/core@^7.6.0": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e" - integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw== -======= "@babel/core@7.7.4", "@babel/core@^7.0.0", "@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.5.4", "@babel/core@^7.6.0": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab" integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/code-frame" "^7.5.5" "@babel/generator" "^7.7.4" "@babel/helpers" "^7.7.4" -<<<<<<< HEAD - "@babel/parser" "^7.7.5" -======= "@babel/parser" "^7.7.4" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/template" "^7.7.4" "@babel/traverse" "^7.7.4" "@babel/types" "^7.7.4" @@ -94,6 +70,23 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/generator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.3.tgz#0e22c005b0a94c1c74eafe19ef78ce53a4d45c03" + integrity sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug== + dependencies: + "@babel/types" "^7.8.3" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + +"@babel/helper-annotate-as-pure@^7.0.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee" + integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw== + dependencies: + "@babel/types" "^7.8.3" + "@babel/helper-annotate-as-pure@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce" @@ -109,42 +102,11 @@ "@babel/helper-explode-assignable-expression" "^7.7.4" "@babel/types" "^7.7.4" -<<<<<<< HEAD "@babel/helper-builder-react-jsx@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz#da188d247508b65375b2c30cf59de187be6b0c66" integrity sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA== dependencies: -======= -"@babel/helper-annotate-as-pure@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce" - integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og== - dependencies: - "@babel/types" "^7.7.4" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f" - integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f" - integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.7.4" - "@babel/types" "^7.7.4" - -"@babel/helper-builder-react-jsx@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz#da188d247508b65375b2c30cf59de187be6b0c66" - integrity sha512-kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA== - dependencies: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/types" "^7.7.4" esutils "^2.0.0" @@ -157,30 +119,18 @@ "@babel/traverse" "^7.7.4" "@babel/types" "^7.7.4" -<<<<<<< HEAD -======= -"@babel/helper-call-delegate@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801" - integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA== - dependencies: - "@babel/helper-hoist-variables" "^7.7.4" - "@babel/traverse" "^7.7.4" - "@babel/types" "^7.7.4" - "@babel/helper-create-class-features-plugin@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4" - integrity sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg== + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz#5b94be88c255f140fd2c10dd151e7f98f4bff397" + integrity sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-function-name" "^7.8.3" + "@babel/helper-member-expression-to-functions" "^7.8.3" + "@babel/helper-optimise-call-expression" "^7.8.3" + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.3" + "@babel/helper-split-export-declaration" "^7.8.3" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/helper-create-class-features-plugin@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d" @@ -201,87 +151,41 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.6.0" -<<<<<<< HEAD "@babel/helper-define-map@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176" integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg== -======= -"@babel/helper-create-regexp-features-plugin@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59" - integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A== - dependencies: - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.6.0" - -"@babel/helper-define-map@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" - integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg== - dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/types" "^7.5.5" - lodash "^4.17.13" - -"@babel/helper-define-map@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz#60b0e9fd60def9de5054c38afde8c8ee409c7529" - integrity sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-function-name" "^7.7.4" "@babel/types" "^7.7.4" lodash "^4.17.13" -<<<<<<< HEAD "@babel/helper-explode-assignable-expression@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84" integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg== -======= -"@babel/helper-define-map@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176" - integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg== - dependencies: - "@babel/helper-function-name" "^7.7.4" - "@babel/types" "^7.7.4" - lodash "^4.17.13" - -"@babel/helper-explode-assignable-expression@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6" - integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/traverse" "^7.7.4" "@babel/types" "^7.7.4" -<<<<<<< HEAD "@babel/helper-function-name@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e" integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ== -======= -"@babel/helper-explode-assignable-expression@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84" - integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg== - dependencies: - "@babel/traverse" "^7.7.4" - "@babel/types" "^7.7.4" - -"@babel/helper-function-name@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" - integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-get-function-arity" "^7.7.4" "@babel/template" "^7.7.4" "@babel/types" "^7.7.4" +"@babel/helper-function-name@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca" + integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA== + dependencies: + "@babel/helper-get-function-arity" "^7.8.3" + "@babel/template" "^7.8.3" + "@babel/types" "^7.8.3" + "@babel/helper-get-function-arity@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0" @@ -289,26 +193,17 @@ dependencies: "@babel/types" "^7.7.4" -<<<<<<< HEAD +"@babel/helper-get-function-arity@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" + integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA== + dependencies: + "@babel/types" "^7.8.3" + "@babel/helper-hoist-variables@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12" integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ== -======= -"@babel/helper-function-name@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e" - integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ== - dependencies: - "@babel/helper-get-function-arity" "^7.7.4" - "@babel/template" "^7.7.4" - "@babel/types" "^7.7.4" - -"@babel/helper-get-function-arity@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" - integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/types" "^7.7.4" @@ -319,68 +214,12 @@ dependencies: "@babel/types" "^7.7.4" -<<<<<<< HEAD -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91" - integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ== -======= -"@babel/helper-get-function-arity@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0" - integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA== +"@babel/helper-member-expression-to-functions@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c" + integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA== dependencies: - "@babel/types" "^7.7.4" - -"@babel/helper-hoist-variables@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" - integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/types" "^7.7.4" - -"@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835" - integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw== - dependencies: -<<<<<<< HEAD - "@babel/helper-module-imports" "^7.7.4" - "@babel/helper-simple-access" "^7.7.4" - "@babel/helper-split-export-declaration" "^7.7.4" - "@babel/template" "^7.7.4" - "@babel/types" "^7.7.4" -======= - "@babel/types" "^7.7.0" - -"@babel/helper-hoist-variables@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12" - integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ== - dependencies: - "@babel/types" "^7.7.4" - -"@babel/helper-member-expression-to-functions@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" - integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA== - dependencies: - "@babel/types" "^7.5.5" - -"@babel/helper-member-expression-to-functions@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz#472b93003a57071f95a541ea6c2b098398bcad8a" - integrity sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA== - dependencies: - "@babel/types" "^7.7.0" - -"@babel/helper-member-expression-to-functions@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74" - integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw== - dependencies: - "@babel/types" "^7.7.4" + "@babel/types" "^7.8.3" "@babel/helper-module-imports@^7.0.0": version "7.0.0" @@ -389,13 +228,6 @@ dependencies: "@babel/types" "^7.0.0" -"@babel/helper-module-imports@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz#99c095889466e5f7b6d66d98dffc58baaf42654d" - integrity sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw== - dependencies: - "@babel/types" "^7.7.0" - "@babel/helper-module-imports@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91" @@ -403,34 +235,6 @@ dependencies: "@babel/types" "^7.7.4" -"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a" - integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/helper-simple-access" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/template" "^7.4.4" - "@babel/types" "^7.5.5" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - lodash "^4.17.13" - -"@babel/helper-optimise-call-expression@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2" - integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg== - dependencies: -<<<<<<< HEAD - "@babel/types" "^7.7.4" -======= - "@babel/helper-module-imports" "^7.7.0" - "@babel/helper-simple-access" "^7.7.0" - "@babel/helper-split-export-declaration" "^7.7.0" - "@babel/template" "^7.7.0" - "@babel/types" "^7.7.0" - lodash "^4.17.13" - "@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5": version "7.7.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835" @@ -443,21 +247,6 @@ "@babel/types" "^7.7.4" lodash "^4.17.13" -"@babel/helper-optimise-call-expression@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" - integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g== - dependencies: - "@babel/types" "^7.0.0" - -"@babel/helper-optimise-call-expression@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365" - integrity sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg== - dependencies: - "@babel/types" "^7.7.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - "@babel/helper-optimise-call-expression@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2" @@ -465,11 +254,23 @@ dependencies: "@babel/types" "^7.7.4" +"@babel/helper-optimise-call-expression@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9" + integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ== + dependencies: + "@babel/types" "^7.8.3" + "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== +"@babel/helper-plugin-utils@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670" + integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ== + "@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351" @@ -477,31 +278,6 @@ dependencies: lodash "^4.17.13" -<<<<<<< HEAD -======= -"@babel/helper-remap-async-to-generator@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f" - integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-wrap-function" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-remap-async-to-generator@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz#4d69ec653e8bff5bce62f5d33fc1508f223c75a7" - integrity sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.7.0" - "@babel/helper-wrap-function" "^7.7.0" - "@babel/template" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/helper-remap-async-to-generator@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234" @@ -513,29 +289,6 @@ "@babel/traverse" "^7.7.4" "@babel/types" "^7.7.4" -<<<<<<< HEAD -======= -"@babel/helper-replace-supers@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2" - integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" - "@babel/traverse" "^7.5.5" - "@babel/types" "^7.5.5" - -"@babel/helper-replace-supers@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz#d5365c8667fe7cbd13b8ddddceb9bd7f2b387512" - integrity sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.7.0" - "@babel/helper-optimise-call-expression" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/helper-replace-supers@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2" @@ -546,25 +299,16 @@ "@babel/traverse" "^7.7.4" "@babel/types" "^7.7.4" -<<<<<<< HEAD -======= -"@babel/helper-simple-access@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" - integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w== +"@babel/helper-replace-supers@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc" + integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA== dependencies: - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-member-expression-to-functions" "^7.8.3" + "@babel/helper-optimise-call-expression" "^7.8.3" + "@babel/traverse" "^7.8.3" + "@babel/types" "^7.8.3" -"@babel/helper-simple-access@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz#97a8b6c52105d76031b86237dc1852b44837243d" - integrity sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g== - dependencies: - "@babel/template" "^7.7.0" - "@babel/types" "^7.7.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/helper-simple-access@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294" @@ -573,23 +317,6 @@ "@babel/template" "^7.7.4" "@babel/types" "^7.7.4" -<<<<<<< HEAD -======= -"@babel/helper-split-export-declaration@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" - integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q== - dependencies: - "@babel/types" "^7.4.4" - -"@babel/helper-split-export-declaration@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300" - integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA== - dependencies: - "@babel/types" "^7.7.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/helper-split-export-declaration@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8" @@ -597,29 +324,13 @@ dependencies: "@babel/types" "^7.7.4" -<<<<<<< HEAD -======= -"@babel/helper-wrap-function@^7.1.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" - integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ== +"@babel/helper-split-export-declaration@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" + integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.2.0" + "@babel/types" "^7.8.3" -"@babel/helper-wrap-function@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz#15af3d3e98f8417a60554acbb6c14e75e0b33b74" - integrity sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w== - dependencies: - "@babel/helper-function-name" "^7.7.0" - "@babel/template" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/helper-wrap-function@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace" @@ -648,6 +359,15 @@ esutils "^2.0.2" js-tokens "^4.0.0" +"@babel/highlight@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" + integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^4.0.0" + "@babel/node@^7.5.0": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.7.4.tgz#de1cc9c67b335a19e4f71208554779bc63719f5a" @@ -661,17 +381,15 @@ regenerator-runtime "^0.13.3" v8flags "^3.1.1" -<<<<<<< HEAD -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4", "@babel/parser@^7.7.5": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71" - integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig== -======= "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb" integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f + +"@babel/parser@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" + integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== "@babel/plugin-external-helpers@^7.2.0": version "7.7.4" @@ -689,7 +407,7 @@ "@babel/helper-remap-async-to-generator" "^7.7.4" "@babel/plugin-syntax-async-generators" "^7.7.4" -"@babel/plugin-proposal-class-properties@7.7.4", "@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.4.4", "@babel/plugin-proposal-class-properties@^7.7.0": +"@babel/plugin-proposal-class-properties@7.7.4", "@babel/plugin-proposal-class-properties@^7.7.0": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba" integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw== @@ -697,40 +415,23 @@ "@babel/helper-create-class-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -<<<<<<< HEAD +"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.4.4": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" + integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.5.5" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-proposal-decorators@7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz#58c1e21d21ea12f9f5f0a757e46e687b94a7ab2b" integrity sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg== -======= -"@babel/plugin-proposal-async-generator-functions@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d" - integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.7.4" - "@babel/plugin-syntax-async-generators" "^7.7.4" - -"@babel/plugin-proposal-class-properties@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba" - integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.3.3", "@babel/plugin-proposal-class-properties@^7.4.4": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" - integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-create-class-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-decorators" "^7.7.4" -<<<<<<< HEAD "@babel/plugin-proposal-dynamic-import@^7.5.0", "@babel/plugin-proposal-dynamic-import@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d" @@ -738,16 +439,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-dynamic-import" "^7.7.4" -======= -"@babel/plugin-proposal-decorators@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz#58c1e21d21ea12f9f5f0a757e46e687b94a7ab2b" - integrity sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-decorators" "^7.7.4" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/plugin-proposal-json-strings@^7.7.4": version "7.7.4" @@ -765,30 +456,14 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.7.4" -<<<<<<< HEAD "@babel/plugin-proposal-numeric-separator@7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.7.4.tgz#7819a17445f4197bb9575e5750ed349776da858a" integrity sha512-CG605v7lLpVgVldSY6kxsN9ui1DxFOyepBfuX2AzU2TNriMAYApoU55mrGw9Jr4TlrTzPCG10CL8YXyi+E/iPw== -======= -"@babel/plugin-proposal-dynamic-import@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d" - integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-dynamic-import" "^7.7.4" - -"@babel/plugin-proposal-json-strings@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317" - integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-numeric-separator" "^7.7.4" -<<<<<<< HEAD "@babel/plugin-proposal-object-rest-spread@7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71" @@ -804,39 +479,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-optional-catch-binding" "^7.7.4" -======= -"@babel/plugin-proposal-json-strings@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d" - integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-json-strings" "^7.7.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.7.4.tgz#7db302c83bc30caa89e38fee935635ef6bd11c28" - integrity sha512-TbYHmr1Gl1UC7Vo2HVuj/Naci5BEGNZ0AJhzqD2Vpr6QPFWpUmBRLrIDjedzx7/CShq0bRDS2gI4FIs77VHLVQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.7.4" - -"@babel/plugin-proposal-numeric-separator@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.7.4.tgz#7819a17445f4197bb9575e5750ed349776da858a" - integrity sha512-CG605v7lLpVgVldSY6kxsN9ui1DxFOyepBfuX2AzU2TNriMAYApoU55mrGw9Jr4TlrTzPCG10CL8YXyi+E/iPw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-numeric-separator" "^7.7.4" - -"@babel/plugin-proposal-object-rest-spread@7.7.4", "@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71" - integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.7.4" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/plugin-proposal-optional-chaining@7.7.4": version "7.7.4" @@ -846,54 +488,6 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-optional-chaining" "^7.7.4" -<<<<<<< HEAD -"@babel/plugin-proposal-unicode-property-regex@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb" - integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA== -======= -"@babel/plugin-proposal-optional-catch-binding@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379" - integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.7.4" - -"@babel/plugin-proposal-optional-chaining@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.4.tgz#3f04c2de1a942cbd3008324df8144b9cbc0ca0ba" - integrity sha512-JmgaS+ygAWDR/STPe3/7y0lNlHgS+19qZ9aC06nYLwQ/XB7c0q5Xs+ksFU3EDnp9EiEsO0dnRAOKeyLHTZuW3A== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-optional-chaining" "^7.7.4" - -"@babel/plugin-proposal-unicode-property-regex@^7.6.2": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802" - integrity sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-async-generators@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889" - integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/plugin-syntax-decorators@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz#3c91cfee2a111663ff3ac21b851140f5a52a4e0b" - integrity sha512-0oNLWNH4k5ZbBVfAwiTU53rKFWIeTh6ZlaWOXWJc4ywxs0tjz5fc3uZ6jKAnZSxN98eXVgg7bJIuzjX+3SXY+A== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-dynamic-import@7.7.4", "@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.7.4": -======= "@babel/plugin-proposal-unicode-property-regex@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb" @@ -902,13 +496,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-async-generators@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f" - integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-async-generators@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889" @@ -924,50 +511,26 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-dynamic-import@7.7.4", "@babel/plugin-syntax-dynamic-import@^7.7.4": ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec" integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -<<<<<<< HEAD -"@babel/plugin-syntax-flow@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.4.tgz#6d91b59e1a0e4c17f36af2e10dd64ef220919d7b" - integrity sha512-2AMAWl5PsmM5KPkB22cvOkUyWk6MjUaqhHNU5nSPUl/ns3j5qLfw2SuYP5RbVZ0tfLvePr4zUScbICtDP2CUNw== -======= "@babel/plugin-syntax-dynamic-import@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612" integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-json-strings@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc" - integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg== +"@babel/plugin-syntax-flow@^7.2.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz#f2c883bd61a6316f2c89380ae5122f923ba4527f" + integrity sha512-innAx3bUbA0KSYj2E2MNFSn9hiCeowOFLxlsuhXzw8hMQnzkDomUr9QCD7E9VF60NmnG1sNTuuv6Qf4f8INYsg== dependencies: - "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-plugin-utils" "^7.8.3" -<<<<<<< HEAD -"@babel/plugin-syntax-jsx@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz#dab2b56a36fb6c3c222a1fbc71f7bf97f327a9ec" - integrity sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.7.4.tgz#e53b751d0c3061b1ba3089242524b65a7a9da12b" - integrity sha512-XKh/yIRPiQTOeBg0QJjEus5qiSKucKAiApNtO1psqG7D17xmE+X2i5ZqBEuSvo0HRuyPaKaSN/Gy+Ha9KFQolw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -======= "@babel/plugin-syntax-flow@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.4.tgz#6d91b59e1a0e4c17f36af2e10dd64ef220919d7b" @@ -975,13 +538,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-json-strings@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470" - integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-json-strings@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc" @@ -1003,21 +559,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/plugin-syntax-numeric-separator@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.7.4.tgz#39818f8042a09d4c6248d85d82555369da4da5c4" integrity sha512-vmlUUBlLuFnbpaR+1kKIdo62xQEN+THWbtAHSEilo+0rHl2dKKCn6GLUVKpI848wL/T0ZPQgAy8asRJ9yYEjog== -<<<<<<< HEAD -======= - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46" - integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1032,7 +577,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6" integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ== -<<<<<<< HEAD dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1040,21 +584,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz#c91fdde6de85d2eb8906daea7b21944c3610c901" integrity sha512-2MqYD5WjZSbJdUagnJvIdSfkb/ucOC9/1fRJxm7GAxY6YQLWlUvkfxoNbUPcPLHJyetKUDQ4+yyuUyAoc0HriA== -======= - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-optional-chaining@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz#c91fdde6de85d2eb8906daea7b21944c3610c901" - integrity sha512-2MqYD5WjZSbJdUagnJvIdSfkb/ucOC9/1fRJxm7GAxY6YQLWlUvkfxoNbUPcPLHJyetKUDQ4+yyuUyAoc0HriA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-top-level-await@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz#f5699549f50bbe8d12b1843a4e82f0a37bb65f4d" - integrity sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1069,35 +598,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b" integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-syntax-top-level-await@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da" - integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/plugin-syntax-typescript@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b" - integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ== -======= -"@babel/plugin-transform-arrow-functions@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12" - integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-async-to-generator@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e" - integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1112,18 +612,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba" integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg== -<<<<<<< HEAD -======= - dependencies: - "@babel/helper-module-imports" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.7.4" - -"@babel/plugin-transform-block-scoped-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190" - integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" @@ -1133,16 +621,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b" integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ== -<<<<<<< HEAD -======= - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-block-scoping@^7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a" - integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1150,17 +628,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224" integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg== -<<<<<<< HEAD -======= - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - lodash "^4.17.13" - -"@babel/plugin-transform-classes@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" - integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.13" @@ -1179,36 +646,10 @@ "@babel/helper-split-export-declaration" "^7.7.4" globals "^11.1.0" -<<<<<<< HEAD -======= -"@babel/plugin-transform-classes@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec" - integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.7.4" - "@babel/helper-define-map" "^7.7.4" - "@babel/helper-function-name" "^7.7.4" - "@babel/helper-optimise-call-expression" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.7.4" - "@babel/helper-split-export-declaration" "^7.7.4" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da" - integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/plugin-transform-computed-properties@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d" integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ== -<<<<<<< HEAD -======= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1219,14 +660,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-destructuring@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6" - integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.6.2": +"@babel/plugin-transform-dotall-regex@^7.4.4": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9" integrity sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA== @@ -1235,27 +669,6 @@ "@babel/helper-regex" "^7.4.4" regexpu-core "^4.6.0" -"@babel/plugin-transform-dotall-regex@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz#c5c9ecacab3a5e0c11db6981610f0c32fd698b3b" - integrity sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/plugin-transform-destructuring@7.7.4", "@babel/plugin-transform-destructuring@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267" - integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96" - integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw== -======= "@babel/plugin-transform-dotall-regex@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96" @@ -1264,13 +677,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-duplicate-keys@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853" - integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-duplicate-keys@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91" @@ -1278,21 +684,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-exponentiation-operator@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008" - integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/plugin-transform-duplicate-keys@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91" - integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA== -======= "@babel/plugin-transform-exponentiation-operator@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9" @@ -1313,39 +704,9 @@ version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7" integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-exponentiation-operator@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9" - integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/plugin-transform-flow-strip-types@7.7.4", "@babel/plugin-transform-flow-strip-types@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.7.4.tgz#cc73f85944782df1d77d80977bc097920a8bf31a" - integrity sha512-w9dRNlHY5ElNimyMYy0oQowvQpwt/PRHI0QS98ZJCTZU2bvSnKXo5zEiD5u76FBPigTm8TkqzmnUTg16T7qbkA== -======= -"@babel/plugin-transform-for-of@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc" - integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-function-name@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad" - integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.7.4" + "@babel/plugin-syntax-flow" "^7.2.0" "@babel/plugin-transform-for-of@^7.7.4": version "7.7.4" @@ -1358,17 +719,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1" integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g== -<<<<<<< HEAD -======= - dependencies: - "@babel/helper-function-name" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1" - integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-function-name" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" @@ -1377,16 +727,6 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e" integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw== -<<<<<<< HEAD -======= - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-member-expression-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d" - integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1394,39 +734,13 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a" integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA== -<<<<<<< HEAD -======= dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-modules-amd@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91" - integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD "@babel/plugin-transform-modules-amd@^7.7.4", "@babel/plugin-transform-modules-amd@^7.7.5": version "7.7.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c" integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ== -======= -"@babel/plugin-transform-modules-amd@^7.7.4": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c" - integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ== - dependencies: - "@babel/helper-module-transforms" "^7.7.5" - "@babel/helper-plugin-utils" "^7.0.0" - babel-plugin-dynamic-import-node "^2.3.0" - -"@babel/plugin-transform-modules-commonjs@^7.5.0", "@babel/plugin-transform-modules-commonjs@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486" - integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-module-transforms" "^7.7.5" "@babel/helper-plugin-utils" "^7.0.0" @@ -1442,27 +756,10 @@ "@babel/helper-simple-access" "^7.7.4" babel-plugin-dynamic-import-node "^2.3.0" -<<<<<<< HEAD "@babel/plugin-transform-modules-systemjs@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30" integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw== -======= -"@babel/plugin-transform-modules-commonjs@^7.7.4": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345" - integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q== - dependencies: - "@babel/helper-module-transforms" "^7.7.5" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-simple-access" "^7.7.4" - babel-plugin-dynamic-import-node "^2.3.0" - -"@babel/plugin-transform-modules-systemjs@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249" - integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-hoist-variables" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" @@ -1476,26 +773,10 @@ "@babel/helper-module-transforms" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -<<<<<<< HEAD "@babel/plugin-transform-named-capturing-groups-regex@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220" integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw== -======= -"@babel/plugin-transform-modules-systemjs@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30" - integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw== - dependencies: - "@babel/helper-hoist-variables" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - babel-plugin-dynamic-import-node "^2.3.0" - -"@babel/plugin-transform-modules-umd@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae" - integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-create-regexp-features-plugin" "^7.7.4" @@ -1506,70 +787,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -<<<<<<< HEAD -"@babel/plugin-transform-object-super@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262" - integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg== -======= -"@babel/plugin-transform-modules-umd@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f" - integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw== - dependencies: - "@babel/helper-module-transforms" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.6.3": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf" - integrity sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw== - dependencies: - regexpu-core "^4.6.0" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz#358e6fd869b9a4d8f5cbc79e4ed4fc340e60dcaf" - integrity sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.7.0" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220" - integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.7.4" - -"@babel/plugin-transform-new-target@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5" - integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-new-target@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167" - integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-object-super@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9" - integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.7.4" - -<<<<<<< HEAD -"@babel/plugin-transform-parameters@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce" - integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw== -======= "@babel/plugin-transform-object-super@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262" @@ -1578,29 +795,6 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-replace-supers" "^7.7.4" -"@babel/plugin-transform-parameters@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16" - integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-call-delegate" "^7.7.4" - "@babel/helper-get-function-arity" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/plugin-transform-property-literals@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2" - integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.6.3": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.7.4.tgz#499cf732a21ffd62cc4b0016e27c3906097f8982" - integrity sha512-U6XkHZ8RnmeEb8jBUOpeo6oFka5RhLgxAVvK4/fBbwoYlsHQYLb8I37ymTPDVsrWjqb94+hueuWQA/1OAA4rAQ== -======= "@babel/plugin-transform-parameters@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce" @@ -1610,13 +804,6 @@ "@babel/helper-get-function-arity" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-property-literals@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905" - integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-property-literals@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2" @@ -1624,11 +811,18 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.2.0": +"@babel/plugin-transform-react-constant-elements@^7.0.0": version "7.5.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz#4d6ae4033bc38f8a65dfca2b6235c44522a422fc" integrity sha512-c5Ba8cpybZFp1Izkf2sWGuNjOxoQ32tFgBvvYvwGhi4+9f6vGiSK9Gex4uVuO/Va6YJFu41aAh1MzMjUWkp0IQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f + dependencies: + "@babel/helper-annotate-as-pure" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-react-constant-elements@^7.6.3": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.7.4.tgz#499cf732a21ffd62cc4b0016e27c3906097f8982" + integrity sha512-U6XkHZ8RnmeEb8jBUOpeo6oFka5RhLgxAVvK4/fBbwoYlsHQYLb8I37ymTPDVsrWjqb94+hueuWQA/1OAA4rAQ== dependencies: "@babel/helper-annotate-as-pure" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" @@ -1672,7 +866,6 @@ dependencies: regenerator-transform "^0.14.0" -<<<<<<< HEAD "@babel/plugin-transform-reserved-words@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb" @@ -1685,41 +878,6 @@ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.4.tgz#51fe458c1c1fa98a8b07934f4ed38b6cd62177a6" integrity sha512-O8kSkS5fP74Ad/8pfsCMGa8sBRdLxYoSReaARRNSz3FbFQj3z/QUvoUmJ28gn9BO93YfnXc3j+Xyaqe8cKDNBQ== dependencies: -======= -"@babel/plugin-transform-regenerator@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz#f1b20b535e7716b622c99e989259d7dd942dd9cc" - integrity sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg== - dependencies: - regenerator-transform "^0.14.0" - -"@babel/plugin-transform-regenerator@^7.7.4": - version "7.7.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9" - integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw== - dependencies: - regenerator-transform "^0.14.0" - -"@babel/plugin-transform-reserved-words@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634" - integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-reserved-words@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb" - integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-runtime@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.4.tgz#51fe458c1c1fa98a8b07934f4ed38b6cd62177a6" - integrity sha512-O8kSkS5fP74Ad/8pfsCMGa8sBRdLxYoSReaARRNSz3FbFQj3z/QUvoUmJ28gn9BO93YfnXc3j+Xyaqe8cKDNBQ== - dependencies: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" resolve "^1.8.1" @@ -1732,7 +890,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -<<<<<<< HEAD "@babel/plugin-transform-spread@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578" @@ -1744,69 +901,10 @@ version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c" integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A== -======= -"@babel/plugin-transform-shorthand-properties@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e" - integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-spread@^7.6.2": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd" - integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-spread@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578" - integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/plugin-transform-sticky-regex@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1" - integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-regex" "^7.0.0" -<<<<<<< HEAD -"@babel/plugin-transform-template-literals@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604" - integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ== -======= -"@babel/plugin-transform-sticky-regex@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c" - integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.0.0" - -"@babel/plugin-transform-template-literals@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0" - integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@babel/helper-annotate-as-pure" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/plugin-transform-typeof-symbol@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e" - integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -======= "@babel/plugin-transform-template-literals@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604" @@ -1815,13 +913,6 @@ "@babel/helper-annotate-as-pure" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typeof-symbol@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2" - integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-typeof-symbol@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e" @@ -1829,7 +920,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/plugin-transform-typescript@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636" @@ -1838,36 +928,7 @@ "@babel/helper-create-class-features-plugin" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-typescript" "^7.7.4" -<<<<<<< HEAD -======= -"@babel/plugin-transform-unicode-regex@^7.6.2": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698" - integrity sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.6.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - -"@babel/plugin-transform-unicode-regex@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae" - integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - -<<<<<<< HEAD -"@babel/preset-env@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8" - integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g== - dependencies: - "@babel/helper-module-imports" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" -======= "@babel/plugin-transform-unicode-regex@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae" @@ -1883,7 +944,6 @@ dependencies: "@babel/helper-module-imports" "^7.7.4" "@babel/helper-plugin-utils" "^7.0.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/plugin-proposal-async-generator-functions" "^7.7.4" "@babel/plugin-proposal-dynamic-import" "^7.7.4" "@babel/plugin-proposal-json-strings" "^7.7.4" @@ -1992,16 +1052,6 @@ semver "^5.5.0" "@babel/preset-flow@^7.0.0": -<<<<<<< HEAD - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.7.4.tgz#99c1349b6fd7132783196de181e6b32d0949427e" - integrity sha512-6LbUqcHD8BcRtXMOp5bc5nJeU8RlKh6q5U8TgZeCrf9ebBdW8Wyy5ujAUnbJfmzQ56Kkq5XtwErC/5+5RHyFYA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.7.4" - -"@babel/preset-react@7.7.4", "@babel/preset-react@^7.0.0", "@babel/preset-react@^7.7.0": -======= version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2" integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ== @@ -2009,8 +1059,7 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-transform-flow-strip-types" "^7.0.0" -"@babel/preset-react@7.7.4", "@babel/preset-react@^7.0.0": ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f +"@babel/preset-react@7.7.4", "@babel/preset-react@^7.0.0", "@babel/preset-react@^7.7.0": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707" integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g== @@ -2040,31 +1089,10 @@ pirates "^4.0.0" source-map-support "^0.5.16" -<<<<<<< HEAD "@babel/runtime-corejs3@^7.7.4": version "7.7.6" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.7.6.tgz#5b1044ea11b659d288f77190e19c62da959ed9a3" integrity sha512-NrRUehqG0sMSCaP+0XV/vOvvjNl4BQOWq3Qys1Q2KTEm5tGMo9h0dHnIzeKerj0a7SIB8LP5kYg/T1raE3FoKQ== -======= -"@babel/runtime@7.3.4": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83" - integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g== - dependencies: - regenerator-runtime "^0.12.0" - -"@babel/runtime@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b" - integrity sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.3", "@babel/runtime@^7.4.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132" - integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: core-js-pure "^3.0.0" regenerator-runtime "^0.13.2" @@ -2083,18 +1111,7 @@ dependencies: regenerator-runtime "^0.13.2" -<<<<<<< HEAD "@babel/template@^7.4.0", "@babel/template@^7.7.4": -======= -"@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2": - version "7.7.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f" - integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.7.0", "@babel/template@^7.7.4": ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b" integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw== @@ -2103,11 +1120,16 @@ "@babel/parser" "^7.7.4" "@babel/types" "^7.7.4" -<<<<<<< HEAD +"@babel/template@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" + integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/parser" "^7.8.3" + "@babel/types" "^7.8.3" + "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4": -======= -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4": ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558" integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw== @@ -2122,11 +1144,22 @@ globals "^11.1.0" lodash "^4.17.13" -<<<<<<< HEAD +"@babel/traverse@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" + integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.8.3" + "@babel/helper-function-name" "^7.8.3" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.8.3" + "@babel/types" "^7.8.3" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + "@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.4": -======= -"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.3", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.4": ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193" integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA== @@ -2135,6 +1168,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" + integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" @@ -2294,19 +1336,6 @@ version "10.1.0" resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== -<<<<<<< HEAD -======= - -"@emotion/cache@^10.0.14": - version "10.0.14" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.14.tgz#56093cff025c04b0330bdd92afe8335ed326dd18" - integrity sha512-HNGEwWnPlNyy/WPXBXzbjzkzeZFV657Z99/xq2xs5yinJHbMfi3ioCvBJ6Y8Zc8DQzO9F5jDmVXJB41Ytx3QMw== - dependencies: - "@emotion/sheet" "0.9.3" - "@emotion/stylis" "0.8.4" - "@emotion/utils" "0.11.2" - "@emotion/weak-memoize" "0.2.3" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@emotion/cache@^10.0.17", "@emotion/cache@^10.0.9": version "10.0.19" @@ -2485,289 +1514,148 @@ which "^1.3.1" "@freesewing/aaron@file:packages/aaron": -<<<<<<< HEAD - version "2.1.7" + version "2.1.8" "@freesewing/bent@file:packages/bent": - version "2.1.7" + version "2.1.8" "@freesewing/brian@file:packages/brian": - version "2.1.7" + version "2.1.8" "@freesewing/bruce@file:packages/bruce": - version "2.1.7" + version "2.1.8" "@freesewing/carlita@file:packages/carlita": - version "2.1.7" + version "2.1.8" "@freesewing/carlton@file:packages/carlton": - version "2.1.7" + version "2.1.8" "@freesewing/cathrin@file:packages/cathrin": - version "2.1.7" + version "2.1.8" "@freesewing/components@file:packages/components": - version "2.1.7" + version "2.1.8" "@freesewing/core@file:packages/core": - version "2.1.7" -======= - version "2.1.6" - -"@freesewing/bent@file:packages/bent": - version "2.1.6" - -"@freesewing/brian@file:packages/brian": - version "2.1.6" - -"@freesewing/bruce@file:packages/bruce": - version "2.1.6" - -"@freesewing/carlita@file:packages/carlita": - version "2.1.6" - -"@freesewing/carlton@file:packages/carlton": - version "2.1.6" - -"@freesewing/cathrin@file:packages/cathrin": - version "2.1.6" - -"@freesewing/components@file:packages/components": - version "2.1.6" - -"@freesewing/core@file:packages/core": - version "2.1.6" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f + version "2.1.8" dependencies: bezier-js "^2.2.13" bin-pack "1.0.2" hooks "^0.3.2" "@freesewing/css-theme@file:packages/css-theme": -<<<<<<< HEAD - version "2.1.7" -======= - version "2.1.6" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f + version "2.1.8" dependencies: open-color "1.6.3" "@freesewing/examples@file:packages/examples": -<<<<<<< HEAD - version "2.1.7" + version "2.1.8" "@freesewing/florent@file:packages/florent": - version "2.1.7" + version "2.1.8" "@freesewing/huey@file:packages/huey": - version "2.1.7" + version "2.1.8" "@freesewing/hugo@file:packages/hugo": - version "2.1.7" + version "2.1.8" "@freesewing/i18n@file:packages/i18n": - version "2.1.7" + version "2.1.8" "@freesewing/jaeger@file:packages/jaeger": - version "2.1.7" + version "2.1.8" "@freesewing/models@file:packages/models": - version "2.1.7" + version "2.1.8" "@freesewing/mui-theme@file:packages/mui-theme": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-banner@file:packages/plugin-banner": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-bundle@file:packages/plugin-bundle": - version "2.1.7" + version "2.1.8" dependencies: - "@freesewing/plugin-cutonfold" "^2.1.7" - "@freesewing/plugin-dimension" "^2.1.7" - "@freesewing/plugin-grainline" "^2.1.7" - "@freesewing/plugin-logo" "^2.1.7" - "@freesewing/plugin-round" "^2.1.7" - "@freesewing/plugin-scalebox" "^2.1.7" - "@freesewing/plugin-sprinkle" "^2.1.7" - "@freesewing/plugin-title" "^2.1.7" + "@freesewing/plugin-cutonfold" "^2.1.8" + "@freesewing/plugin-dimension" "^2.1.8" + "@freesewing/plugin-grainline" "^2.1.8" + "@freesewing/plugin-logo" "^2.1.8" + "@freesewing/plugin-round" "^2.1.8" + "@freesewing/plugin-scalebox" "^2.1.8" + "@freesewing/plugin-sprinkle" "^2.1.8" + "@freesewing/plugin-title" "^2.1.8" "@freesewing/plugin-bust@file:packages/plugin-bust": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-buttons@file:packages/plugin-buttons": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-cutonfold@file:packages/plugin-cutonfold": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-debug@file:packages/plugin-debug": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-designer@file:packages/plugin-designer": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-dimension@file:packages/plugin-dimension": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-flip@file:packages/plugin-flip": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-grainline@file:packages/plugin-grainline": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-i18n@file:packages/plugin-i18n": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-logo@file:packages/plugin-logo": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-round@file:packages/plugin-round": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-scalebox@file:packages/plugin-scalebox": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-sprinkle@file:packages/plugin-sprinkle": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-svgattr@file:packages/plugin-svgattr": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-theme@file:packages/plugin-theme": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-title@file:packages/plugin-title": - version "2.1.7" + version "2.1.8" "@freesewing/plugin-validate@file:packages/plugin-validate": - version "2.1.7" + version "2.1.8" "@freesewing/shin@file:packages/shin": - version "2.1.7" + version "2.1.8" "@freesewing/simon@file:packages/simon": - version "2.1.7" + version "2.1.8" "@freesewing/sven@file:packages/sven": - version "2.1.7" + version "2.1.8" "@freesewing/tamiko@file:packages/tamiko": - version "2.1.7" + version "2.1.8" "@freesewing/trayvon@file:packages/trayvon": - version "2.1.7" + version "2.1.8" "@freesewing/wahid@file:packages/wahid": - version "2.1.7" -======= - version "2.1.6" - -"@freesewing/florent@file:packages/florent": - version "2.1.6" - -"@freesewing/huey@file:packages/huey": - version "2.1.6" - -"@freesewing/hugo@file:packages/hugo": - version "2.1.6" - -"@freesewing/i18n@file:packages/i18n": - version "2.1.6" - -"@freesewing/jaeger@file:packages/jaeger": - version "2.1.6" - -"@freesewing/models@file:packages/models": - version "2.1.6" - -"@freesewing/mui-theme@file:packages/mui-theme": - version "2.1.6" - -"@freesewing/plugin-banner@file:packages/plugin-banner": - version "2.1.6" - -"@freesewing/plugin-bundle@file:packages/plugin-bundle": - version "2.1.6" - dependencies: - "@freesewing/plugin-cutonfold" "^2.1.6" - "@freesewing/plugin-dimension" "^2.1.6" - "@freesewing/plugin-grainline" "^2.1.6" - "@freesewing/plugin-logo" "^2.1.6" - "@freesewing/plugin-round" "^2.1.6" - "@freesewing/plugin-scalebox" "^2.1.6" - "@freesewing/plugin-sprinkle" "^2.1.6" - "@freesewing/plugin-title" "^2.1.6" - -"@freesewing/plugin-bust@file:packages/plugin-bust": - version "2.1.6" - -"@freesewing/plugin-buttons@file:packages/plugin-buttons": - version "2.1.6" - -"@freesewing/plugin-cutonfold@file:packages/plugin-cutonfold": - version "2.1.6" - -"@freesewing/plugin-debug@file:packages/plugin-debug": - version "2.1.6" - -"@freesewing/plugin-designer@file:packages/plugin-designer": - version "2.1.6" - -"@freesewing/plugin-dimension@file:packages/plugin-dimension": - version "2.1.6" - -"@freesewing/plugin-flip@file:packages/plugin-flip": - version "2.1.6" - -"@freesewing/plugin-grainline@file:packages/plugin-grainline": - version "2.1.6" - -"@freesewing/plugin-i18n@file:packages/plugin-i18n": - version "2.1.6" - -"@freesewing/plugin-logo@file:packages/plugin-logo": - version "2.1.6" - -"@freesewing/plugin-round@file:packages/plugin-round": - version "2.1.6" - -"@freesewing/plugin-scalebox@file:packages/plugin-scalebox": - version "2.1.6" - -"@freesewing/plugin-sprinkle@file:packages/plugin-sprinkle": - version "2.1.6" - -"@freesewing/plugin-svgattr@file:packages/plugin-svgattr": - version "2.1.6" - -"@freesewing/plugin-theme@file:packages/plugin-theme": - version "2.1.6" - -"@freesewing/plugin-title@file:packages/plugin-title": - version "2.1.6" - -"@freesewing/plugin-validate@file:packages/plugin-validate": - version "2.1.6" - -"@freesewing/shin@file:packages/shin": - version "2.1.6" - -"@freesewing/simon@file:packages/simon": - version "2.1.6" - -"@freesewing/sven@file:packages/sven": - version "2.1.6" - -"@freesewing/tamiko@file:packages/tamiko": - version "2.1.6" - -"@freesewing/trayvon@file:packages/trayvon": - version "2.1.6" - -"@freesewing/wahid@file:packages/wahid": - version "2.1.6" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f + version "2.1.8" "@hapi/address@2.x.x": version "2.1.4" @@ -3954,53 +2842,10 @@ prop-types "^15.7.2" util-deprecate "^1.0.2" -<<<<<<< HEAD -======= -"@storybook/addons@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.1.9.tgz#ecf218d08508b97ca5e6e0f1ed361081385bd3ff" - integrity sha512-1bavbcS/NiE65DwyKj8c0DmWmz9VekOinB+has2Pqt2bOffZoZwVnbmepcz9hH3GUyvp5fQBYbxTEmTDvF2lLA== - dependencies: - "@storybook/api" "5.1.9" - "@storybook/channels" "5.1.9" - "@storybook/client-logger" "5.1.9" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - -"@storybook/addons@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.3.tgz#02e35fad3ed4101625896e43e0a1e20215f6be38" - integrity sha512-LTkUJB8ZDc4++yt9acNHNjlnGWCyNtP+NVYPDvg7zFOaMip21Pj4T0pg9UwYxdqrFBWz9tVz7DJeXroS3egXxg== - dependencies: - "@storybook/api" "5.2.3" - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/core-events" "5.2.3" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - -"@storybook/addons@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.6.tgz#c1278137acb3502e068b0b0d07a8371c607e9c02" - integrity sha512-5MF64lsAhIEMxTbVpYROz5Wez595iwSw45yXyP8gWt12d+EmFO5tdy7cYJCxcMuVhDfaCI78tFqS9orr1atVyA== - dependencies: - "@storybook/api" "5.2.6" - "@storybook/channels" "5.2.6" - "@storybook/client-logger" "5.2.6" - "@storybook/core-events" "5.2.6" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@storybook/addons@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.8.tgz#f8bf8bd555b7a69fb1e9a52ab8cdb96384d931ff" integrity sha512-yAo1N5z/45bNIQP8SD+HVTr7X898bYAtz1EZBrQ6zD8bGamzA2Br06rOLL9xXw29eQhsaVnPlqgDwCS1sTC7aQ== -<<<<<<< HEAD -======= dependencies: "@storybook/api" "5.2.8" "@storybook/channels" "5.2.8" @@ -4010,75 +2855,6 @@ global "^4.3.2" util-deprecate "^1.0.2" -"@storybook/api@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.9.tgz#eec5b2f775392ce0803930104c6ce14fa4931e8b" - integrity sha512-d1HhpOkW+706/WJ9lP5nCqOrp/icvbm0o+6jFFOGJ35AW5O9D8vDBxzvgMEO45jjN4I+rtbcNHQCxshSbPvP9w== - dependencies: - "@storybook/channels" "5.1.9" - "@storybook/client-logger" "5.1.9" - "@storybook/core-events" "5.1.9" - "@storybook/router" "5.1.9" - "@storybook/theming" "5.1.9" - core-js "^3.0.1" - fast-deep-equal "^2.0.1" - global "^4.3.2" - lodash "^4.17.11" - memoizerific "^1.11.3" - prop-types "^15.6.2" - react "^16.8.3" - semver "^6.0.0" - shallow-equal "^1.1.0" - store2 "^2.7.1" - telejson "^2.2.1" - util-deprecate "^1.0.2" - -"@storybook/api@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.3.tgz#f30ab65a5c3d72da6b408a5120d63f0135eee247" - integrity sha512-2csxa/d64rXy4Dwoc7YjbPeNUJRgcI/wJUo30CLujk2stEFzDnKeMPR1mlHMCIFDW+KDxJ28bW59VPxwrqJFjw== - dependencies: - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/router" "5.2.3" - "@storybook/theming" "5.2.3" - core-js "^3.0.1" - fast-deep-equal "^2.0.1" - global "^4.3.2" - lodash "^4.17.11" - memoizerific "^1.11.3" - prop-types "^15.6.2" - react "^16.8.3" - semver "^6.0.0" - shallow-equal "^1.1.0" - store2 "^2.7.1" - telejson "^3.0.2" - util-deprecate "^1.0.2" - -"@storybook/api@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.6.tgz#43d3c20b90e585e6c94b36e29845d39704ae2135" - integrity sha512-X/di44/SAL68mD6RHTX2qdWwhjRW6BgcfPtu0dMd38ErB3AfsfP4BITXs6kFOeSM8kWiaQoyuw0pOBzA8vlYug== - dependencies: - "@storybook/channels" "5.2.6" - "@storybook/client-logger" "5.2.6" - "@storybook/core-events" "5.2.6" - "@storybook/router" "5.2.6" - "@storybook/theming" "5.2.6" - core-js "^3.0.1" - fast-deep-equal "^2.0.1" - global "^4.3.2" - lodash "^4.17.15" - memoizerific "^1.11.3" - prop-types "^15.6.2" - react "^16.8.3" - semver "^6.0.0" - shallow-equal "^1.1.0" - store2 "^2.7.1" - telejson "^3.0.2" - util-deprecate "^1.0.2" - "@storybook/api@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f" @@ -4102,163 +2878,6 @@ telejson "^3.0.2" util-deprecate "^1.0.2" -"@storybook/channel-postmessage@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.3.tgz#e6de415d848a20d0e8a1d32cea178475756d114a" - integrity sha512-ixlpr6aAYoRM72cKwEWU/W0rWzOn3mYqb/eUdIaz3Da5BtFGKm3yEFguII0l1my82uhMm5/d3UNfoh0rO3pUyg== - dependencies: - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - core-js "^3.0.1" - global "^4.3.2" - telejson "^3.0.2" - -"@storybook/channel-postmessage@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.6.tgz#60aaef0e80300c9812a571ca3ce0f28e2c404f04" - integrity sha512-y+63wWiEc/Q4s4MZ3KJ//5A8j5VLufxuLvPxwv9FuS4z8lmN0fqeGJn857qIlFGbZhzsQaoRdmfsCQpBBgUneg== - dependencies: - "@storybook/channels" "5.2.6" - "@storybook/client-logger" "5.2.6" - core-js "^3.0.1" - global "^4.3.2" - telejson "^3.0.2" - -"@storybook/channels@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.1.9.tgz#003cfca0b9f1ba6cf47ce68304aedd71bdb55e74" - integrity sha512-R6i7859FsXgY9XFFErVe7gS37wGYpQEEWsO1LzUW7YptGuFTUa8yLgKkNkgfy7Zs61Xm+GiBq8PvS/CWxjotPw== - dependencies: - core-js "^3.0.1" - -"@storybook/channels@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.3.tgz#843752fe26bd1c505256050bfbf810531c2198a0" - integrity sha512-13Mlb+XbE0mHXiLLHdg0w9byhRy/bE605U7U96PGQp2cwX4lf+4jpViO2mDCsndAFRc0+2hexXPTkwgzvZzq0A== - dependencies: - core-js "^3.0.1" - -"@storybook/channels@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.6.tgz#e2837508864dc4d5b5e03f078886f0ce113762ea" - integrity sha512-/UsktYsXuvb1efjVPCEivhh5ywRhm7hl73pQnpJLJHRqyLMM2I5nGPFELTTNuU9yWy7sP9QL5gRqBBPe1sqjZQ== - dependencies: - core-js "^3.0.1" - -"@storybook/channels@5.2.8": - version "5.2.8" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202" - integrity sha512-mFwQec27QSrqcl+IH0xA+4jfoEqC4m1G99LBHt/aTDjLZXclX1A470WqeZCp7Gx4OALpaPEVTaaaKPbiKz4C6w== - dependencies: - core-js "^3.0.1" - -"@storybook/client-api@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.3.tgz#3878cd93d2c1977dc3ef36682c79d0355a3c5872" - integrity sha512-anXxcf2z+KQAk94xxdbeG1N6nTEWXj087XHQ22L3pOoX9TRzfG71UjL0/S7vj4EFUiXVHj8d6YUFwLb5LwpUIw== - dependencies: - "@storybook/addons" "5.2.3" - "@storybook/channel-postmessage" "5.2.3" - "@storybook/channels" "5.2.3" - "@storybook/client-logger" "5.2.3" - "@storybook/core-events" "5.2.3" - "@storybook/router" "5.2.3" - common-tags "^1.8.0" - core-js "^3.0.1" - eventemitter3 "^4.0.0" - global "^4.3.2" - is-plain-object "^3.0.0" - lodash "^4.17.11" - memoizerific "^1.11.3" - qs "^6.6.0" - util-deprecate "^1.0.2" - -"@storybook/client-api@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.6.tgz#5760cb4302d82ce9210a63f3f55b1e05f04759c1" - integrity sha512-upynf4ER2fkThNnE+mBlfRFFJxTiOh60fho1ODFcBun9BbvRD2wOHLvw7+WigIhb99HM20vk8f2dhv3I5Udzlg== - dependencies: - "@storybook/addons" "5.2.6" - "@storybook/channel-postmessage" "5.2.6" - "@storybook/channels" "5.2.6" - "@storybook/client-logger" "5.2.6" - "@storybook/core-events" "5.2.6" - "@storybook/router" "5.2.6" - common-tags "^1.8.0" - core-js "^3.0.1" - eventemitter3 "^4.0.0" - global "^4.3.2" - is-plain-object "^3.0.0" - lodash "^4.17.15" - memoizerific "^1.11.3" - qs "^6.6.0" - util-deprecate "^1.0.2" - -"@storybook/client-logger@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.1.9.tgz#87e2f7578416269adeccd407584010bc353f14d3" - integrity sha512-1+Otcn0EFgWNviDPNCR5LtUViADlboz9fmpZc7UY7bgaY5FVNIUO01E4T43tO7fduiRZoEvdltwTuQRm260Vjw== - dependencies: - core-js "^3.0.1" - -"@storybook/client-logger@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.3.tgz#a02e7b14c979767665648be4db6185bda17aed88" - integrity sha512-Z1irXW4jiFs7rClgqJqYOgg5op51ynV6dVuoIqxkSC0MrOG5s/VbX7T+ojGPXKyQWD4XYGw66Hnw9jouSfXL9g== - dependencies: - core-js "^3.0.1" - -"@storybook/client-logger@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.6.tgz#cfc4536e9b724b086f7509c2bb34c221016713c9" - integrity sha512-hJvPD267cCwLIRMOISjDH8h9wbwOcXIJip29UlJbU9iMtZtgE+YelmlpmZJvqcDfUiXWWrOh7tP76mj8EAfwIQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@storybook/api" "5.2.8" - "@storybook/channels" "5.2.8" - "@storybook/client-logger" "5.2.8" - "@storybook/core-events" "5.2.8" - core-js "^3.0.1" - global "^4.3.2" - util-deprecate "^1.0.2" - -<<<<<<< HEAD -"@storybook/api@5.2.8": - version "5.2.8" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f" - integrity sha512-rFrPtTFDIPQoicLwq1AVsOvZNTUKnjD1w/NX1kKcyuWLL9BcOkU3YNLBlliGBg2JX/yS+fJKMyKk4NMzNBCZCg== -======= -"@storybook/client-logger@5.2.8": - version "5.2.8" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779" - integrity sha512-+oVSEJdeh7TQ1Bhanb3mCr7fc3Bug3+K79abZ28J45Ub5x4L/ZVClj1xMgUsJs30BZ5FB8vhdgH6TQb0NSxR4A== - dependencies: - core-js "^3.0.1" - -"@storybook/components@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.9.tgz#2a5258780fff07172d103287759946dbb4b13e2d" - integrity sha512-F4xcRlifSAfqkuFWtCKRvQDahXyfWBWV2Wa+kYy4YGwEfm3kKtIHVlgdgARL22g9BdYpRFEOJ+42juOu5YvIeQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f - dependencies: - "@storybook/channels" "5.2.8" - "@storybook/client-logger" "5.2.8" - "@storybook/core-events" "5.2.8" - "@storybook/router" "5.2.8" - "@storybook/theming" "5.2.8" - core-js "^3.0.1" - fast-deep-equal "^2.0.1" - global "^4.3.2" - lodash "^4.17.15" - memoizerific "^1.11.3" - prop-types "^15.6.2" - react "^16.8.3" - semver "^6.0.0" - shallow-equal "^1.1.0" - store2 "^2.7.1" - telejson "^3.0.2" - util-deprecate "^1.0.2" - "@storybook/channel-postmessage@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.8.tgz#7a84869ce0fc270c3b5dcd7fa4ed798b6055816f" @@ -4270,23 +2889,11 @@ global "^4.3.2" telejson "^3.0.2" -<<<<<<< HEAD "@storybook/channels@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202" integrity sha512-mFwQec27QSrqcl+IH0xA+4jfoEqC4m1G99LBHt/aTDjLZXclX1A470WqeZCp7Gx4OALpaPEVTaaaKPbiKz4C6w== dependencies: -======= -"@storybook/components@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.6.tgz#cddb60227720aea7cae34fe782d0370bcdbd4005" - integrity sha512-C7OS90bZ1ZvxlWUZ3B2MPFFggqAtUo7X8DqqS3IwsuDUiK9dD/KS0MwPgOuFDnOTW1R5XqmQd/ylt53w3s/U5g== - dependencies: - "@storybook/client-logger" "5.2.6" - "@storybook/theming" "5.2.6" - "@types/react-syntax-highlighter" "10.1.0" - "@types/react-textarea-autosize" "^4.3.3" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f core-js "^3.0.1" "@storybook/client-api@5.2.8": @@ -4343,7 +2950,6 @@ react-textarea-autosize "^7.1.0" simplebar-react "^1.0.0-alpha.6" -<<<<<<< HEAD "@storybook/core-events@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4" @@ -4358,43 +2964,6 @@ dependencies: "@babel/plugin-proposal-class-properties" "^7.7.0" "@babel/plugin-proposal-object-rest-spread" "^7.6.2" -======= -"@storybook/core-events@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.9.tgz#441a6297e2ccfa743e15d1db1f4ac445b91f40d8" - integrity sha512-jHe2uyoLj9i6fntHtOj5azfGdLOb75LF0e1xXE8U2SX7Zp3uwbLAcfJ+dPStdc/q+f/wBiip3tH1dIjaNuUiMw== - dependencies: - core-js "^3.0.1" - -"@storybook/core-events@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.3.tgz#b592273a1e00040dcec258e3bd0ca2fd53357c00" - integrity sha512-sZEv93yE1o+/UJdhtqQ6vo2EauZ90FjN/L8F7CR7iqDEZzqo9g77Idg9LSgcN3TAeXcGAWVSrPb1vkK7H96L2g== - dependencies: - core-js "^3.0.1" - -"@storybook/core-events@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.6.tgz#34c9aae256e7e5f4a565b81f1e77dda8bccc6752" - integrity sha512-W8kLJ7tc0aAxs11CPUxUOCReocKL4MYGyjTg8qwk0USLzPUb/FUQWmhcm2ilFz6Nz8dXLcKrXdRVYTmiMsgAeg== - dependencies: - core-js "^3.0.1" - -"@storybook/core-events@5.2.8": - version "5.2.8" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4" - integrity sha512-NkQKC5doO/YL9gsO61bqaxgveKktkiJWZ3XyyhL1ZebgnO9wTlrU+i9b5aX73Myk1oxbicQw9KcwDGYk0qFuNQ== - dependencies: - core-js "^3.0.1" - -"@storybook/core@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.6.tgz#60c092607158d7d28db59f7e67da4f7e12703fb2" - integrity sha512-q7Ful7TCm9nmjgLsJFqIwVv395NlaOXgGajyaQCQlCKB2V+jgs7GDmdCNNdWAOue4eAsFU6wQSP9lWtq0yzK4w== - dependencies: - "@babel/plugin-proposal-class-properties" "^7.3.3" - "@babel/plugin-proposal-object-rest-spread" "^7.3.2" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-transform-react-constant-elements" "^7.6.3" "@babel/preset-env" "^7.7.1" @@ -4501,46 +3070,6 @@ semver "^6.0.0" webpack "^4.33.0" -<<<<<<< HEAD -======= -"@storybook/router@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.1.9.tgz#8cd97bea4f2acf8ec5f6694d06fb0633dde33417" - integrity sha512-eAmeerE/OTIwCV7WBnb1BPINVN1GTSMsUXLNWpqSISuyWJ+NZAJlObFkvXoc57QSQlv0cvXlm1FMkmRt8ku1Hw== - dependencies: - "@reach/router" "^1.2.1" - core-js "^3.0.1" - global "^4.3.2" - memoizerific "^1.11.3" - qs "^6.6.0" - -"@storybook/router@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.3.tgz#d10284325820275ab7971621333988b5021dd3c9" - integrity sha512-sOu6y2GySaY82SdXfF3yOn0IJTKMqd2BDOSGEno7PWWtSenHFQWY+z99C9k0dLBTkjRes5tPcgm0OJ7RdQVRDQ== - dependencies: - "@reach/router" "^1.2.1" - "@types/reach__router" "^1.2.3" - core-js "^3.0.1" - global "^4.3.2" - lodash "^4.17.11" - memoizerific "^1.11.3" - qs "^6.6.0" - -"@storybook/router@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.6.tgz#5180d3785501699283c6c3717986c877f84fead5" - integrity sha512-/FZd3fYg5s2QzOqSIP8UMOSnCIFFIlli/jKlOxvm3WpcpxgwQOY4lfHsLO+r9ThCLs2UvVg2R/HqGrOHqDFU7A== - dependencies: - "@reach/router" "^1.2.1" - "@types/reach__router" "^1.2.3" - core-js "^3.0.1" - global "^4.3.2" - lodash "^4.17.15" - memoizerific "^1.11.3" - qs "^6.6.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@storybook/router@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.8.tgz#d7de2d401701857c033e28560c30e16512f7f72f" @@ -4554,63 +3083,6 @@ memoizerific "^1.11.3" qs "^6.6.0" -<<<<<<< HEAD -======= -"@storybook/theming@5.1.9": - version "5.1.9" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.9.tgz#c425f5867fae0db79e01112853b1808332a5f1a2" - integrity sha512-4jIFJwTWVf9tsv27noLoFHlKC2Jl9DHV3q+rxGPU8bTNbufCu4oby82SboO5GAKuS3eu1cxL1YY9pYad9WxfHg== - dependencies: - "@emotion/core" "^10.0.9" - "@emotion/styled" "^10.0.7" - "@storybook/client-logger" "5.1.9" - common-tags "^1.8.0" - core-js "^3.0.1" - deep-object-diff "^1.1.0" - emotion-theming "^10.0.9" - global "^4.3.2" - memoizerific "^1.11.3" - polished "^3.3.1" - prop-types "^15.7.2" - resolve-from "^5.0.0" - -"@storybook/theming@5.2.3": - version "5.2.3" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.3.tgz#b506fa2170d850953bfe84e2cb07e81e647e8c9a" - integrity sha512-3/0bo8CaoaHDYZaexydpYcwP6WW8BKRqSQBGXJY9y0TLhwY2Who5nPX9XdOLyu9d7lN//PRZlt8JnZynuncxoQ== - dependencies: - "@emotion/core" "^10.0.14" - "@emotion/styled" "^10.0.14" - "@storybook/client-logger" "5.2.3" - common-tags "^1.8.0" - core-js "^3.0.1" - deep-object-diff "^1.1.0" - emotion-theming "^10.0.14" - global "^4.3.2" - memoizerific "^1.11.3" - polished "^3.3.1" - prop-types "^15.7.2" - resolve-from "^5.0.0" - -"@storybook/theming@5.2.6": - version "5.2.6" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.6.tgz#e04170b3e53dcfc791b2381c8a39192ae88cd291" - integrity sha512-Xa9R/H8DDgmvxsCHloJUJ2d9ZQl80AeqHrL+c/AKNpx05s9lV74DcinusCf0kz72YGUO/Xt1bAjuOvLnAaS8Gw== - dependencies: - "@emotion/core" "^10.0.14" - "@emotion/styled" "^10.0.14" - "@storybook/client-logger" "5.2.6" - common-tags "^1.8.0" - core-js "^3.0.1" - deep-object-diff "^1.1.0" - emotion-theming "^10.0.14" - global "^4.3.2" - memoizerific "^1.11.3" - polished "^3.3.1" - prop-types "^15.7.2" - resolve-from "^5.0.0" - ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f "@storybook/theming@5.2.8": version "5.2.8" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf" @@ -5086,11 +3558,7 @@ babel-runtime "^6.5.0" prop-types "^15.6.0" -<<<<<<< HEAD "@verdaccio/commons-api@8.3.0": -======= -"@verdaccio/commons-api@8.3.0", "@verdaccio/commons-api@^8.2.0": ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "8.3.0" resolved "https://registry.yarnpkg.com/@verdaccio/commons-api/-/commons-api-8.3.0.tgz#3a4b07b63561b21bfc8242330da528e12788635e" integrity sha512-MfXwbPa41mjkjCOFr6QOgThBzmtL1cuQuViurPQXpLsNeTC1EuZ1BkNjbrnOfEQuFKWsWmtLd8tEUP0hNcLMcg== @@ -5375,6 +3843,11 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +acorn-dynamic-import@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" + integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== + acorn-globals@^4.1.0, acorn-globals@^4.3.0, acorn-globals@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" @@ -5398,17 +3871,15 @@ acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -<<<<<<< HEAD -acorn@^6.0.1, acorn@^6.0.4, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.2.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== -======= -acorn@^6.0.1, acorn@^6.0.4, acorn@^6.0.7, acorn@^6.2.0, acorn@^6.2.1: +acorn@^6.0.1, acorn@^6.0.4, acorn@^6.0.7, acorn@^6.2.1: version "6.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f + +acorn@^6.0.5: + version "6.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" + integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== acorn@^7.1.0: version "7.1.0" @@ -6272,18 +4743,6 @@ babel-plugin-macros@2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.7.1.tgz#ee294383c1a38f9d6535be3d89734824cb3ed415" integrity sha512-HNM284amlKSQ6FddI4jLXD+XTqF0cTYOe5uemOIZxHJHnamC+OhFQ57rMF9sgnYhkJQptVl9U1SKVZsV9/GLQQ== -<<<<<<< HEAD -======= - dependencies: - "@babel/runtime" "^7.7.2" - cosmiconfig "^6.0.0" - resolve "^1.12.0" - -babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.4.5: - version "2.6.1" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz#41f7ead616fc36f6a93180e89697f69f51671181" - integrity sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: "@babel/runtime" "^7.7.2" cosmiconfig "^6.0.0" @@ -6609,6 +5068,11 @@ before-after-hook@^2.0.0: resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== +bezier-js@2.4.6: + version "2.4.6" + resolved "https://registry.yarnpkg.com/bezier-js/-/bezier-js-2.4.6.tgz#f418058c1c8d2f2e6ce7ad756ba0a0d4766f761f" + integrity sha512-wkIw2mrUXuHeRKIrn+opgb82wiWZ0gmLXPPrl1D0z23n2BwDM6KSyqevHdSj/BWP5ihA5Ktr0uaAX7eZ/tIuzw== + bezier-js@^2.2.13: version "2.4.4" resolved "https://registry.yarnpkg.com/bezier-js/-/bezier-js-2.4.4.tgz#2859edc31e1b1c287ba4788dcccd5d23838c4578" @@ -6878,11 +5342,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -<<<<<<< HEAD browserslist@4.7.0: -======= -browserslist@4.7.0, browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.2, browserslist@^4.6.3, browserslist@^4.6.4: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "4.7.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17" integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA== @@ -7053,30 +5513,6 @@ cacache@^13.0.1: ssri "^7.0.0" unique-filename "^1.1.1" -cacache@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c" - integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w== - dependencies: - chownr "^1.1.2" - figgy-pudding "^3.5.1" - fs-minipass "^2.0.0" - glob "^7.1.4" - graceful-fs "^4.2.2" - infer-owner "^1.0.4" - lru-cache "^5.1.1" - minipass "^3.0.0" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - p-map "^3.0.0" - promise-inflight "^1.0.1" - rimraf "^2.7.1" - ssri "^7.0.0" - unique-filename "^1.1.1" - cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -7249,11 +5685,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, can resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0" integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ== -caniuse-lite@^1.0.30001010: - version "1.0.30001015" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0" - integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ== - capture-exit@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" @@ -7379,25 +5810,6 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.4, chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - chokidar@^3.0.2: version "3.3.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6" @@ -7418,7 +5830,7 @@ chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.3: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== -chrome-trace-event@^1.0.2: +chrome-trace-event@^1.0.0, chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== @@ -7815,14 +6227,11 @@ commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, comm resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -<<<<<<< HEAD commander@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c" integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA== -======= ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -8201,14 +6610,11 @@ core-js-compat@^3.1.1, core-js-compat@^3.4.7: browserslist "^4.8.2" semver "^6.3.0" -<<<<<<< HEAD core-js-pure@^3.0.0, core-js-pure@^3.0.1: version "3.5.0" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.5.0.tgz#f63c7f2b245e7d678e73f87ad28505480554d70e" integrity sha512-wB0QtKAofWigiISuT1Tej3hKgq932fB//Lf1VoPbiLpTYlHY0nIDhgF+q1na0DAKFHH5wGCirkAknOmDN8ijXA== -======= ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" @@ -8219,11 +6625,6 @@ core-js@^2.0.0, core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== -core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.1, core-js@^3.4.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.5.0.tgz#66df8e49be4bd775e6f952a9d083b756ad41c1ed" - integrity sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw== - core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09" @@ -8289,11 +6690,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -<<<<<<< HEAD cp-file@^6.0.0, cp-file@^6.2.0: -======= -cp-file@^6.2.0: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "6.2.0" resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA== @@ -8304,16 +6701,6 @@ cp-file@^6.2.0: pify "^4.0.1" safe-buffer "^5.0.1" -cp-file@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-7.0.0.tgz#b9454cfd07fe3b974ab9ea0e5f29655791a9b8cd" - integrity sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw== - dependencies: - graceful-fs "^4.1.2" - make-dir "^3.0.0" - nested-error-stacks "^2.0.0" - p-event "^4.1.0" - create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -8330,11 +6717,10 @@ create-error-class@^3.0.0: capture-stack-trace "^1.0.0" "create-freesewing-pattern@file:packages/create-freesewing-pattern": -<<<<<<< HEAD - version "2.1.7" + version "2.1.8" dependencies: - "@freesewing/i18n" "^2.1.7" - "@freesewing/pattern-info" "^2.1.7" + "@freesewing/i18n" "^2.1.8" + "@freesewing/pattern-info" "^2.1.8" chalk "^2.4.2" commander "^2.19.0" conf "^2.2.0" @@ -8346,25 +6732,8 @@ create-error-class@^3.0.0: handlebars "^4.1.0" inquirer "^6.2.2" make-dir "^2.0.0" -======= - version "2.1.6" - dependencies: - "@freesewing/i18n" "^2.1.6" - "@freesewing/pattern-info" "^2.1.6" - chalk "^2.4.2" - commander "^2.19.0" - conf "^2.2.0" - cp-file "^7.0.0" - execa "^1.0.0" - git-config-path "^2.0.0" - github-username "^5.0.1" - globby "^10.0.1" - handlebars "^4.1.0" - inquirer "^7.0.0" - make-dir "^3.0.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f ora "^3.1.0" - p-each-series "^2.1.0" + p-each-series "^1.0.0" parse-git-config "^3.0.0" validate-npm-package-name "^3.0.0" which "^1.3.1" @@ -8517,11 +6886,7 @@ css-has-pseudo@^0.10.0: postcss "^7.0.6" postcss-selector-parser "^5.0.0-rc.4" -<<<<<<< HEAD css-loader@3.2.0: -======= -css-loader@3.2.0, css-loader@^3.0.0: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "3.2.0" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.2.0.tgz#bb570d89c194f763627fcf1f80059c6832d009b2" integrity sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ== @@ -8922,11 +7287,7 @@ debug@3.1.0: dependencies: ms "2.0.0" -<<<<<<< HEAD -debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: -======= -debug@3.2.6, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f +debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -8940,7 +7301,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -8963,7 +7324,7 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= -decompress-response@^3.3.0: +decompress-response@^3.2.0, decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= @@ -9165,11 +7526,6 @@ detect-indent@^5.0.0, detect-indent@~5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -9499,11 +7855,6 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.247, electron-to-chromium resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8" integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA== -electron-to-chromium@^1.3.306: - version "1.3.322" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8" - integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA== - elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -9653,17 +8004,10 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -<<<<<<< HEAD -es-abstract@^1.16.0, es-abstract@^1.16.2: - version "1.16.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" - integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== -======= -es-abstract@^1.10.0, es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0, es-abstract@^1.9.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" - integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f +es-abstract@^1.15.0: + version "1.16.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz#4e874331645e9925edef141e74fc4bd144669d34" + integrity sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" @@ -9676,17 +8020,26 @@ es-abstract@^1.10.0, es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.4. string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" -<<<<<<< HEAD -es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1: - version "1.17.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" - integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== -======= -es-abstract@^1.15.0: - version "1.16.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz#4e874331645e9925edef141e74fc4bd144669d34" - integrity sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f +es-abstract@^1.16.0, es-abstract@^1.16.2: + version "1.16.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" + integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.1.4" + is-regex "^1.0.4" + object-inspect "^1.7.0" + object-keys "^1.1.1" + string.prototype.trimleft "^2.1.0" + string.prototype.trimright "^2.1.0" + +es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1: + version "1.17.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" + integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" @@ -9696,7 +8049,6 @@ es-abstract@^1.15.0: is-regex "^1.0.4" object-inspect "^1.7.0" object-keys "^1.1.1" -<<<<<<< HEAD object.assign "^4.1.0" string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" @@ -9723,44 +8075,19 @@ es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== -======= - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" - -es-to-primitive@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" - integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: is-callable "^1.1.4" is-date-object "^1.0.1" is-symbol "^1.0.2" -<<<<<<< HEAD es5-ext@^0.10.35, es5-ext@^0.10.50: - version "0.10.53" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1" - integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q== -======= -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14: version "0.10.50" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778" integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: es6-iterator "~2.0.3" - es6-symbol "~3.1.3" - next-tick "~1.0.0" + es6-symbol "~3.1.1" + next-tick "^1.0.0" es5-shim@^4.5.13: version "4.5.13" @@ -9798,7 +8125,7 @@ es6-shim@^0.35.5: resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.5.tgz#46f59dc0a84a1c5029e8ff1166ca0a902077a9ab" integrity sha512-E9kK/bjtCQRpN1K28Xh4BlmP8egvZBGJJ+9GtnzOwt7mdqtrjHFuVGr7QJfdjBIKqrlU5duPf3pCBoDrkjVYFg== -es6-symbol@^3.1.1, es6-symbol@~3.1.3: +es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA== @@ -10049,7 +8376,7 @@ eslint-scope@3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^4.0.3: +eslint-scope@^4.0.0, eslint-scope@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== @@ -10361,19 +8688,11 @@ execa@^1.0.0: strip-eof "^1.0.0" execa@^2.0.3: -<<<<<<< HEAD - version "2.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" - integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw== - dependencies: - cross-spawn "^7.0.0" -======= version "2.0.4" resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.4.tgz#2f5cc589c81db316628627004ea4e37b93391d8e" integrity sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ== dependencies: cross-spawn "^6.0.5" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f get-stream "^5.0.0" is-stream "^2.0.0" merge-stream "^2.0.0" @@ -10552,11 +8871,7 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -<<<<<<< HEAD fast-levenshtein@~2.0.6: -======= -fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -11024,13 +9339,6 @@ fs-minipass@^2.0.0: dependencies: minipass "^3.0.0" -fs-minipass@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" - integrity sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A== - dependencies: - minipass "^3.0.0" - fs-vacuum@^1.2.10, fs-vacuum@~1.2.10: version "1.2.10" resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36" @@ -11055,11 +9363,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -<<<<<<< HEAD fsevents@2.1.2, fsevents@~2.1.1: -======= -fsevents@2.1.2: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "2.1.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA== @@ -11072,11 +9376,6 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@^2.0.6: - version "2.0.7" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a" - integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ== - fstream@^1.0.0, fstream@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" @@ -11255,12 +9554,13 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -gh-got@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-8.1.0.tgz#2378d07ac293f524549c75f8dc6f3604a885ab01" - integrity sha512-Jy7+73XqsAVeAtM5zA0dd+A7mmzkQVIzFuw3xRjFbPsQVqS+aeci8v8H1heOCAPlBYWED5ZYPhlYqZVXdD3Fmg== +gh-got@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-6.0.0.tgz#d74353004c6ec466647520a10bd46f7299d268d0" + integrity sha512-F/mS+fsWQMo1zfgG9MD8KWvTWPPzzhuVwY++fhQ5Ggd+0P+CAMHtzMZhNxG+TqGfHDChJKsbh6otfMGqO2AKBw== dependencies: - got "^9.5.0" + got "^7.0.0" + is-plain-obj "^1.1.0" gh-pages@^1.2.0: version "1.2.0" @@ -11354,12 +9654,12 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -github-username@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/github-username/-/github-username-5.0.1.tgz#f4e8c2cd7a3247bd75ae2841f5f69347f5b4c1f0" - integrity sha512-HxFIz5tIQDoiob2ienSKLHoCSFFC6F79IcnM5E5KNAxkxMjvpuUSE7K4fU2n51fwo0idT0ZsMFZIUy4SIPXoVA== +github-username@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/github-username/-/github-username-4.1.0.tgz#cbe280041883206da4212ae9e4b5f169c30bf417" + integrity sha1-y+KABBiDIG2kISrp5LXxacML9Bc= dependencies: - gh-got "^8.1.0" + gh-got "^6.0.0" glob-option-error@^1.0.0: version "1.0.0" @@ -11421,18 +9721,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - global-dirs@^0.1.0, global-dirs@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -11570,7 +9858,27 @@ got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -got@^9.5.0, got@^9.6.0: +got@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a" + integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw== + dependencies: + decompress-response "^3.2.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + is-plain-obj "^1.1.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + isurl "^1.0.0-alpha5" + lowercase-keys "^1.0.0" + p-cancelable "^0.3.0" + p-timeout "^1.1.1" + safe-buffer "^5.0.1" + timed-out "^4.0.0" + url-parse-lax "^1.0.0" + url-to-options "^1.0.1" + +got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== @@ -11592,11 +9900,7 @@ graceful-fs@4.1.11: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= -<<<<<<< HEAD graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3: -======= -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== @@ -11672,11 +9976,7 @@ handle-thing@^2.0.0: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== -<<<<<<< HEAD handlebars@4.5.3, handlebars@^4.1.0, handlebars@^4.1.2, handlebars@^4.4.0: -======= -handlebars@4.5.3, handlebars@^4.1.0, handlebars@^4.1.2: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "4.5.3" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== @@ -11740,28 +10040,28 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -<<<<<<< HEAD has-symbol-support-x@^1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw== -has-symbols@^1.0.0, has-symbols@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" - integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== -======= has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-to-string-tag-x@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" + integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== + dependencies: + has-symbol-support-x "^1.4.1" + has-unicode@^2.0.0, has-unicode@^2.0.1, has-unicode@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -12156,7 +10456,7 @@ hyphenate-style-name@^1.0.2, hyphenate-style-name@^1.0.3: resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48" integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ== -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -12257,14 +10557,6 @@ import-fresh@^3.0.0, import-fresh@^3.1.0: parent-module "^1.0.0" resolve-from "^4.0.0" -import-fresh@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" - integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - import-from@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" @@ -12293,7 +10585,7 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -12845,11 +11137,7 @@ is-observable@^2.0.0: resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-2.0.0.tgz#327af1e8cdea9cd717f95911b87c5d34301721a6" integrity sha512-fhBZv3eFKUbyHXZ1oHujdo2tZ+CNbdpdzzlENgCGZUC8keoGxUew2jYFLYcUB4qo7LDD03o4KK11m/QYD7kEjg== -<<<<<<< HEAD is-path-cwd@^2.0.0, is-path-cwd@^2.2.0: -======= -is-path-cwd@^2.0.0: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "2.2.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== @@ -13140,7 +11428,6 @@ istanbul-reports@^2.2.4, istanbul-reports@^2.2.6: dependencies: handlebars "^4.1.2" -<<<<<<< HEAD isurl@^1.0.0-alpha5: version "1.0.0" resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" @@ -13156,8 +11443,6 @@ iterate-value@^1.0.0: dependencies: es-get-iterator "^1.0.1" -======= ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f jest-changed-files@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039" @@ -13167,7 +11452,7 @@ jest-changed-files@^24.9.0: execa "^1.0.0" throat "^4.0.0" -jest-cli@^24.9.0: +jest-cli@^24.7.1, jest-cli@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af" integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg== @@ -13526,6 +11811,14 @@ jest-worker@^24.6.0, jest-worker@^24.9.0: merge-stream "^2.0.0" supports-color "^6.1.0" +jest@24.7.1: + version "24.7.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-24.7.1.tgz#0d94331cf510c75893ee32f87d7321d5bf8f2501" + integrity sha512-AbvRar5r++izmqo5gdbAjTeA6uNRGoNRuj5vHB0OnDXo2DXWZJVuaObiGgtlvhKb+cWy2oYbQSfxv7Q7GjnAtA== + dependencies: + import-local "^2.0.0" + jest-cli "^24.7.1" + jest@24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171" @@ -14490,7 +12783,7 @@ loader-fs-cache@^1.0.2: find-cache-dir "^0.1.1" mkdirp "0.5.1" -loader-runner@^2.4.0: +loader-runner@^2.3.0, loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== @@ -14569,11 +12862,6 @@ lockfile@1.0.4, lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -14582,33 +12870,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -14699,11 +12965,6 @@ lodash.once@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" @@ -15068,11 +13329,7 @@ memoizerific@^1.11.3: dependencies: map-or-similar "^1.5.0" -<<<<<<< HEAD memory-fs@^0.4.1, memory-fs@~0.4.1: -======= -memory-fs@^0.4.0, memory-fs@^0.4.1: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= @@ -15175,7 +13432,7 @@ microevent.ts@~0.1.1: resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0" integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g== -micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -15227,7 +13484,7 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@2.4.4, mime@^2.3.1, mime@^2.4.4: +mime@2.4.4, mime@^2.3.1, mime@^2.4.2, mime@^2.4.4: version "2.4.4" resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== @@ -15335,17 +13592,18 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -<<<<<<< HEAD -minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== -======= -minipass@^2.2.1, minipass@^2.3.5: +minipass@^2.3.5: version "2.3.5" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== dependencies: safe-buffer "^5.1.2" yallist "^3.0.0" @@ -15569,15 +13827,6 @@ ncp@~2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -15593,7 +13842,7 @@ nested-error-stacks@^2.0.0: resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61" integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug== -next-tick@~1.0.0: +next-tick@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= @@ -15705,7 +13954,7 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -node-libs-browser@^2.2.1: +node-libs-browser@^2.0.0, node-libs-browser@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== @@ -15750,22 +13999,6 @@ node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.29, node-releases@^1.1.40, node-releases@^1.1.42: version "1.1.42" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7" @@ -15773,13 +14006,6 @@ node-releases@^1.1.29, node-releases@^1.1.40, node-releases@^1.1.42: dependencies: semver "^6.3.0" -node-releases@^1.1.40: - version "1.1.42" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7" - integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA== - dependencies: - semver "^6.3.0" - node-sass@^4.11.0: version "4.13.0" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" @@ -15818,7 +14044,7 @@ nomnom@^1.5.x: dependencies: abbrev "1" -nopt@^4.0.1, nopt@~4.0.1: +nopt@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= @@ -15939,7 +14165,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.12, npm-packlist@^1.1.6, npm-packlist@^1.4.4, npm-packlist@^1.4.7: +npm-packlist@^1.1.12, npm-packlist@^1.4.4, npm-packlist@^1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== @@ -16118,7 +14344,7 @@ npm@^6.9.0: worker-farm "^1.7.0" write-file-atomic "^2.4.3" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2, npmlog@~4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.1.2, npmlog@~4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -16215,14 +14441,11 @@ object-inspect@^1.7.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== -<<<<<<< HEAD object-is@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY= -======= ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -16261,21 +14484,12 @@ object.entries@^1.1.0: has "^1.0.3" object.fromentries@^2.0.0, "object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.1: -<<<<<<< HEAD - version "2.0.2" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" - integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" -======= version "2.0.1" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704" integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA== dependencies: define-properties "^1.1.3" es-abstract "^1.15.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f function-bind "^1.1.1" has "^1.0.3" @@ -16427,18 +14641,6 @@ optionator@^0.8.1, optionator@^0.8.2, optionator@^0.8.3: type-check "~0.3.2" word-wrap "~1.2.3" -optionator@^0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - ora@^3.1.0, ora@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" @@ -16505,6 +14707,11 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5: os-homedir "^1.0.0" os-tmpdir "^1.0.0" +p-cancelable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" + integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== + p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -16522,18 +14729,6 @@ p-each-series@^1.0.0: dependencies: p-reduce "^1.0.0" -p-each-series@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" - integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ== - -p-event@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.1.0.tgz#e92bb866d7e8e5b732293b1c8269d38e9982bf8e" - integrity sha512-4vAd06GCsgflX4wHN1JqrMzBh/8QZ4j+rzp0cd2scXRwuBEv+QR3wrVA5aLhWDLw4y2WgDKvzWF3CCLmVM1UgA== - dependencies: - p-timeout "^2.0.1" - p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" @@ -16632,17 +14827,10 @@ p-retry@^3.0.1: dependencies: retry "^0.12.0" -<<<<<<< HEAD p-timeout@^1.1.1: version "1.2.1" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y= -======= -p-timeout@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038" - integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: p-finally "^1.0.0" @@ -18116,13 +16304,7 @@ postcss@^6.0.1, postcss@^6.0.21: source-map "^0.6.1" supports-color "^5.4.0" -<<<<<<< HEAD -postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.24" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.24.tgz#972c3c5be431b32e40caefe6c81b5a19117704c2" - integrity sha512-Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA== -======= -postcss@^7: +postcss@^7, postcss@^7.0.23: version "7.0.24" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.24.tgz#972c3c5be431b32e40caefe6c81b5a19117704c2" integrity sha512-Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA== @@ -18144,7 +16326,6 @@ postcss@^7.0.16: version "7.0.18" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233" integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -18481,11 +16662,7 @@ qw@~1.0.1: resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4" integrity sha1-77/cdA+a0FQwRCassYNBLMi5ltQ= -<<<<<<< HEAD raf@^3.4.1: -======= -raf@^3.4.0, raf@^3.4.1: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "3.4.1" resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== @@ -18535,7 +16712,7 @@ raw-loader@^2.0.0: loader-utils "^1.1.0" schema-utils "^1.0.0" -rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: +rc@^1.0.1, rc@^1.1.6, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -18673,11 +16850,6 @@ react-error-overlay@^6.0.3, react-error-overlay@^6.0.4: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.4.tgz#0d165d6d27488e660bc08e57bdabaad741366f7a" integrity sha512-ueZzLmHltszTshDMwyfELDq8zOA803wQ1ZuzCccXa1m57k1PxSHfflPD5W9YIiTXLs0JTLzoj6o1LuM5N6zzNA== -react-error-overlay@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.4.tgz#0d165d6d27488e660bc08e57bdabaad741366f7a" - integrity sha512-ueZzLmHltszTshDMwyfELDq8zOA803wQ1ZuzCccXa1m57k1PxSHfflPD5W9YIiTXLs0JTLzoj6o1LuM5N6zzNA== - react-event-listener@^0.6.2, react-event-listener@^0.6.6: version "0.6.6" resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.6.tgz#758f7b991cad9086dd39fd29fad72127e1d8962a" @@ -19638,7 +17810,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -19652,13 +17824,6 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - rimraf@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" @@ -20070,22 +18235,15 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -<<<<<<< HEAD -schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.2.0, schema-utils@^2.5.0, schema-utils@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" - integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg== -======= schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.2.0: version "2.5.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f" integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: ajv "^6.10.2" ajv-keywords "^3.4.1" -schema-utils@^2.1.0, schema-utils@^2.5.0: +schema-utils@^2.1.0, schema-utils@^2.5.0, schema-utils@^2.6.0: version "2.6.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg== @@ -20130,7 +18288,7 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -20174,12 +18332,12 @@ serialize-error@^2.1.0: resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a" integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go= -serialize-javascript@^2.1.0, serialize-javascript@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" - integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== +serialize-javascript@^1.7.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" + integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== -serialize-javascript@^2.1.0: +serialize-javascript@^2.1.0, serialize-javascript@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== @@ -20924,22 +19082,6 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" -string.prototype.trimleft@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" - integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - -string.prototype.trimright@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" - integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -21246,7 +19388,7 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.10, tar@^4.4.12, tar@^4.4.13, tar@^4.4.2, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.13, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -21325,17 +19467,10 @@ terser-webpack-plugin@2.2.1: terser "^4.3.9" webpack-sources "^1.4.3" -<<<<<<< HEAD -terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1: +terser-webpack-plugin@^1.1.0: version "1.4.3" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== -======= -terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4" - integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: cacache "^12.0.2" find-cache-dir "^2.1.0" @@ -21347,16 +19482,22 @@ terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.1.0, terser@^4.1.2, terser@^4.1.3, terser@^4.3.9: - version "4.4.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8" - integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ== +terser-webpack-plugin@^1.2.4, terser-webpack-plugin@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz#61b18e40eaee5be97e771cdbb10ed1280888c2b4" + integrity sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg== dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" + cacache "^12.0.2" + find-cache-dir "^2.1.0" + is-wsl "^1.1.0" + schema-utils "^1.0.0" + serialize-javascript "^1.7.0" + source-map "^0.6.1" + terser "^4.1.2" + webpack-sources "^1.4.0" + worker-farm "^1.7.0" -terser@^4.3.9: +terser@^4.1.0, terser@^4.1.2, terser@^4.1.3, terser@^4.3.9: version "4.4.2" resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8" integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ== @@ -21684,11 +19825,7 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== -<<<<<<< HEAD type-fest@^0.8.0, type-fest@^0.8.1: -======= -type-fest@^0.8.1: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== @@ -21998,17 +20135,10 @@ url-parse@^1.4.3: querystringify "^2.1.1" requires-port "^1.0.0" -<<<<<<< HEAD url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= -======= -url-template@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f url@^0.11.0: version "0.11.0" @@ -22239,7 +20369,7 @@ warning@^4.0.1, warning@^4.0.2, warning@^4.0.3: dependencies: loose-envify "^1.0.0" -watchpack@^1.6.0: +watchpack@^1.5.0, watchpack@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA== @@ -22267,26 +20397,16 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -<<<<<<< HEAD -webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" - integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw== -======= webpack-dev-middleware@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff" integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f dependencies: memory-fs "^0.4.1" - mime "^2.4.4" - mkdirp "^0.5.1" + mime "^2.4.2" range-parser "^1.2.1" webpack-log "^2.0.0" -<<<<<<< HEAD -======= webpack-dev-middleware@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" @@ -22298,7 +20418,6 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f webpack-dev-server@3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c" @@ -22366,11 +20485,7 @@ webpack-manifest-plugin@2.2.0: object.entries "^1.1.0" tapable "^1.0.0" -<<<<<<< HEAD webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: -======= -webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -22378,7 +20493,6 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack- source-list-map "^2.0.0" source-map "~0.6.1" -<<<<<<< HEAD webpack@4.29.6: version "4.29.6" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955" @@ -22409,8 +20523,6 @@ webpack@4.29.6: watchpack "^1.5.0" webpack-sources "^1.3.0" -======= ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f webpack@4.41.2, webpack@^4.33.0, webpack@^4.38.0: version "4.41.2" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e" @@ -22837,15 +20949,9 @@ xml-name-validator@^3.0.0: integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== xmlchars@^2.1.1: -<<<<<<< HEAD - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -======= version "2.1.1" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.1.1.tgz#ef1a81c05bff629c2280007f12daca21bd6f6c93" integrity sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w== ->>>>>>> c7b75e6d76a363df7d518f11a7256bfab0df625f xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" @@ -22884,18 +20990,6 @@ yaml@^1.7.2: dependencies: "@babel/runtime" "^7.6.3" -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" - integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== - dependencies: - "@babel/runtime" "^7.6.3" - yargs-parser@13.1.1, yargs-parser@^13.0.0, yargs-parser@^13.1.1: version "13.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"