From bed79432d07c2ba5fbe2622998480c8179ef3cde Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Fri, 7 Dec 2018 16:55:24 +0100 Subject: [PATCH 01/60] Implement cart page and some parts of the summary --- src/components/CartSummary.vue | 134 +++++++++++++++++++++++++++++++++ src/i18n/de.json | 2 - src/i18n/en.json | 3 - src/router.js | 9 +++ src/views/CartPage.vue | 124 ++++++++++++++++++++++++++++++ 5 files changed, 267 insertions(+), 5 deletions(-) create mode 100644 src/components/CartSummary.vue create mode 100644 src/views/CartPage.vue diff --git a/src/components/CartSummary.vue b/src/components/CartSummary.vue new file mode 100644 index 00000000..a3ed60fa --- /dev/null +++ b/src/components/CartSummary.vue @@ -0,0 +1,134 @@ + + + + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/i18n/de.json b/src/i18n/de.json index cc805dad..846bb8ee 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -269,7 +269,6 @@ "discountTooltip": "Weitere Rabatt Informationen...", "discountPromoInfo": "Rabatte", "editMyCart": "Warenkorb bearbeiten", - "itemsTotal": "__count__ Artikel im Warenkorb", "needHelpCustomerService": "Brauchen Sie Hilfe? Kundenservice", "orderDate": "Bestelldatum", "orderDiscount": "Bestelldiscount", @@ -286,7 +285,6 @@ "shippingMethod": "Versandart", "subtotal": "Zwischensumme", "total": "Gesamtpreis", - "yourBag": "Ihr Einkaufswagen", "cartDetailPage": { "title": "Ihr Einkaufswagen" }, diff --git a/src/i18n/en.json b/src/i18n/en.json index e0f20e9e..39f16e33 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -264,8 +264,6 @@ "discountTooltip": "Discount options additional information...", "discountPromoInfo": "PROMOTIONAL DISCOUNT INFO", "editMyCart": "Edit my shopping cart", - "itemsTotal": "__count__ item in total", - "itemsTotal_plural": "__count__ items in total", "needHelpCustomerService": "Need help? Customer Service", "orderDate": "Order Date", "orderDiscount": "Order Discount", @@ -282,7 +280,6 @@ "shippingMethod": "Shipping Method", "subtotal": "Subtotal", "total": "Total", - "yourBag": "Your Bag", "cartDetailPage": { "title": "Your Cart" }, diff --git a/src/router.js b/src/router.js index 8f5ae409..d47c188a 100644 --- a/src/router.js +++ b/src/router.js @@ -8,6 +8,7 @@ import ProductOverviewPage from '@/views/ProductOverviewPage.vue'; import LoginPage from '@/views/LoginPage.vue'; import MyAccountPage from '@/views/MyAccountPage.vue'; import NotFoundPage from '@/views/NotFoundPage.vue'; +import CartPage from '@/views/CartPage.vue'; Vue.use(Router); @@ -65,6 +66,14 @@ const router = new Router({ }, meta: { requiresAuth }, }, + { + path: '/cart', + name: 'cart', + components: { + default: CartPage, + header: TheHeader, + }, + }, ], }); diff --git a/src/views/CartPage.vue b/src/views/CartPage.vue new file mode 100644 index 00000000..f81e0958 --- /dev/null +++ b/src/views/CartPage.vue @@ -0,0 +1,124 @@ + + + + + +{ + "en": { + "yourBag": "Your Bag", + "itemsTotal": "{n} item in total | {n} items in total" + }, + "de": { + "yourBag": "Ihr Einkaufswagen", + "itemsTotal": "{n} Artikel im Warenkorb" + } +} + From 16673c446d5147fe896ff996c95f1bf8c6e223c5 Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Mon, 10 Dec 2018 17:31:30 +0100 Subject: [PATCH 02/60] Enable delete line item --- src/components/CartSummary.vue | 252 +++++++++++++++++++++++++++++---- src/views/CartPage.vue | 42 +----- 2 files changed, 225 insertions(+), 69 deletions(-) diff --git a/src/components/CartSummary.vue b/src/components/CartSummary.vue index a3ed60fa..39e5152b 100644 --- a/src/components/CartSummary.vue +++ b/src/components/CartSummary.vue @@ -1,6 +1,22 @@ diff --git a/src/views/CartPage.vue b/src/views/CartPage.vue index f81e0958..6f1e076d 100644 --- a/src/views/CartPage.vue +++ b/src/views/CartPage.vue @@ -18,8 +18,7 @@
-
@@ -55,56 +54,19 @@ export default { apollo: { me: { query: gql` - query me($locale: Locale!) { + query me { me { carts(limit: 1) { results { id - totalPrice { - centAmount - currencyCode - fractionDigits - } lineItems { id - productSlug(locale: $locale) - name(locale: $locale) quantity - price { - value { - centAmount - currencyCode - fractionDigits - } - discounted { - value { - centAmount - currencyCode - fractionDigits - } - } - } - totalPrice { - centAmount - currencyCode - fractionDigits - } - variant { - sku - images { - url - } - } } } } } }`, - variables() { - return { - locale: this.$i18n.locale, - }; - }, }, }, }; From a9ff82432e0b86411d627d267533499e323680d5 Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Fri, 14 Dec 2018 17:39:24 +0100 Subject: [PATCH 03/60] Restructure files and debounce on change quantity --- package.json | 2 + src/components/CartSummary.vue | 328 ------------------ src/components/DisplayableMoney.graphql | 5 + src/components/cart/CartContents.vue | 113 ++++++ src/components/cart/LineItem.vue | 268 ++++++++++++++ .../CartPage.vue => components/cart/Page.vue} | 13 +- src/components/cart/PriceCalculation.vue | 137 ++++++++ src/router.js | 2 +- 8 files changed, 533 insertions(+), 335 deletions(-) delete mode 100644 src/components/CartSummary.vue create mode 100644 src/components/DisplayableMoney.graphql create mode 100644 src/components/cart/CartContents.vue create mode 100644 src/components/cart/LineItem.vue rename src/{views/CartPage.vue => components/cart/Page.vue} (81%) create mode 100644 src/components/cart/PriceCalculation.vue diff --git a/package.json b/package.json index b29fd3e6..0a9f9368 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,8 @@ "apollo-link-context": "^1.0.8", "babel-loader": "^8.0.2", "graphql-tag": "^2.9.0", + "lodash": "^4.17.11", + "lodash.debounce": "^4.0.8", "register-service-worker": "^1.0.0", "vue": "^2.5.17", "vue-apollo": "^3.0.0-beta.25", diff --git a/src/components/CartSummary.vue b/src/components/CartSummary.vue deleted file mode 100644 index 39e5152b..00000000 --- a/src/components/CartSummary.vue +++ /dev/null @@ -1,328 +0,0 @@ - - - - - -{ - "en": { - }, - "de": { - } -} - diff --git a/src/components/DisplayableMoney.graphql b/src/components/DisplayableMoney.graphql new file mode 100644 index 00000000..411aae3b --- /dev/null +++ b/src/components/DisplayableMoney.graphql @@ -0,0 +1,5 @@ +fragment DisplayableMoney on Money { + centAmount + currencyCode + fractionDigits +} \ No newline at end of file diff --git a/src/components/cart/CartContents.vue b/src/components/cart/CartContents.vue new file mode 100644 index 00000000..c63783e6 --- /dev/null +++ b/src/components/cart/CartContents.vue @@ -0,0 +1,113 @@ + + + + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/components/cart/LineItem.vue b/src/components/cart/LineItem.vue new file mode 100644 index 00000000..3ea08c2a --- /dev/null +++ b/src/components/cart/LineItem.vue @@ -0,0 +1,268 @@ + + + + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/views/CartPage.vue b/src/components/cart/Page.vue similarity index 81% rename from src/views/CartPage.vue rename to src/components/cart/Page.vue index 6f1e076d..8a080917 100644 --- a/src/views/CartPage.vue +++ b/src/components/cart/Page.vue @@ -6,7 +6,7 @@
- bag icon + bag icon {{ $t('yourBag') }}: {{ $tc('itemsTotal', totalItems) }} @@ -18,9 +18,9 @@
- - + +
@@ -37,10 +37,11 @@ + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/router.js b/src/router.js index d47c188a..4b6992a5 100644 --- a/src/router.js +++ b/src/router.js @@ -8,7 +8,7 @@ import ProductOverviewPage from '@/views/ProductOverviewPage.vue'; import LoginPage from '@/views/LoginPage.vue'; import MyAccountPage from '@/views/MyAccountPage.vue'; import NotFoundPage from '@/views/NotFoundPage.vue'; -import CartPage from '@/views/CartPage.vue'; +import CartPage from '@/components/cart/Page.vue'; Vue.use(Router); From 43c32c8151c7c594998f7d1d46c48ef185aeb524 Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Mon, 17 Dec 2018 13:59:36 +0100 Subject: [PATCH 04/60] Cast quantity input value to number --- src/components/cart/LineItem.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/cart/LineItem.vue b/src/components/cart/LineItem.vue index 3ea08c2a..31357d27 100644 --- a/src/components/cart/LineItem.vue +++ b/src/components/cart/LineItem.vue @@ -47,7 +47,7 @@

- {{ lineItem.name }} @@ -29,11 +30,11 @@

-
@@ -57,14 +58,14 @@
- {{ $t('main.common.quantity') }}: + {{ $t('quantity') }}: {{ lineItem.quantity }}
- {{ $t('main.common.price') }} + {{ $t('price') }} {{ formatPrice(originalPrice) }} @@ -83,7 +84,7 @@
- {{ $t('checkout.total') }} + {{ $t('total') }} {{ formatPrice(lineItem.totalPrice) }}
@@ -91,71 +92,12 @@ + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/i18n/de.json b/src/i18n/de.json index 99fcd62b..8f70cfac 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -242,7 +242,6 @@ "discountTooltip": "Weitere Rabatt Informationen...", "discountPromoInfo": "Rabatte", "editMyCart": "Warenkorb bearbeiten", - "itemsTotal": "__count__ Artikel im Warenkorb", "needHelpCustomerService": "Brauchen Sie Hilfe? Kundenservice", "orderDate": "Bestelldatum", "orderDiscount": "Bestelldiscount", @@ -259,7 +258,6 @@ "shippingMethod": "Versandart", "subtotal": "Zwischensumme", "total": "Gesamtpreis", - "yourBag": "Ihr Einkaufswagen", "cartDetailPage": { "title": "Ihr Einkaufswagen" }, diff --git a/src/i18n/en.json b/src/i18n/en.json index 6d391faa..9ee7bd36 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -237,8 +237,6 @@ "discountTooltip": "Discount options additional information...", "discountPromoInfo": "PROMOTIONAL DISCOUNT INFO", "editMyCart": "Edit my shopping cart", - "itemsTotal": "__count__ item in total", - "itemsTotal_plural": "__count__ items in total", "needHelpCustomerService": "Need help? Customer Service", "orderDate": "Order Date", "orderDiscount": "Order Discount", @@ -255,7 +253,6 @@ "shippingMethod": "Shipping Method", "subtotal": "Subtotal", "total": "Total", - "yourBag": "Your Bag", "cartDetailPage": { "title": "Your Cart" }, diff --git a/src/router.js b/src/router.js index 71da61d9..00627dce 100644 --- a/src/router.js +++ b/src/router.js @@ -8,6 +8,7 @@ import LoginPage from '@/components/login/LoginPage.vue'; import MyAccountPage from '@/components/useraccount/UserAccountPage.vue'; import NotFoundPage from '@/components/common/NotFoundPage.vue'; import ProductDetailPage from '@/components/productdetail/ProductDetailPage.vue'; +import CartPage from '@/views/CartPage.vue'; Vue.use(Router); @@ -77,6 +78,14 @@ const router = new Router({ header: false, }, }, + { + path: '/cart', + name: 'cart', + components: { + default: CartPage, + header: TheHeader, + }, + }, ], }); diff --git a/src/views/CartPage.vue b/src/views/CartPage.vue new file mode 100644 index 00000000..f81e0958 --- /dev/null +++ b/src/views/CartPage.vue @@ -0,0 +1,124 @@ + + + + + +{ + "en": { + "yourBag": "Your Bag", + "itemsTotal": "{n} item in total | {n} items in total" + }, + "de": { + "yourBag": "Ihr Einkaufswagen", + "itemsTotal": "{n} Artikel im Warenkorb" + } +} + From 2bfe86da95c34ae3bb3d8259ece301ef206e4b3e Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Mon, 10 Dec 2018 17:31:30 +0100 Subject: [PATCH 09/60] Enable delete line item --- src/components/CartSummary.vue | 252 +++++++++++++++++++++++++++++---- src/views/CartPage.vue | 42 +----- 2 files changed, 225 insertions(+), 69 deletions(-) diff --git a/src/components/CartSummary.vue b/src/components/CartSummary.vue index a3ed60fa..39e5152b 100644 --- a/src/components/CartSummary.vue +++ b/src/components/CartSummary.vue @@ -1,6 +1,22 @@ diff --git a/src/views/CartPage.vue b/src/views/CartPage.vue index f81e0958..6f1e076d 100644 --- a/src/views/CartPage.vue +++ b/src/views/CartPage.vue @@ -18,8 +18,7 @@
-
@@ -55,56 +54,19 @@ export default { apollo: { me: { query: gql` - query me($locale: Locale!) { + query me { me { carts(limit: 1) { results { id - totalPrice { - centAmount - currencyCode - fractionDigits - } lineItems { id - productSlug(locale: $locale) - name(locale: $locale) quantity - price { - value { - centAmount - currencyCode - fractionDigits - } - discounted { - value { - centAmount - currencyCode - fractionDigits - } - } - } - totalPrice { - centAmount - currencyCode - fractionDigits - } - variant { - sku - images { - url - } - } } } } } }`, - variables() { - return { - locale: this.$i18n.locale, - }; - }, }, }, }; From 5d103391d84ddf31903a98f1e098499c4c46e366 Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Fri, 14 Dec 2018 17:39:24 +0100 Subject: [PATCH 10/60] Restructure files and debounce on change quantity --- package.json | 2 + src/components/CartSummary.vue | 328 ------------------ src/components/DisplayableMoney.graphql | 5 + src/components/cart/CartContents.vue | 113 ++++++ src/components/cart/LineItem.vue | 268 ++++++++++++++ .../CartPage.vue => components/cart/Page.vue} | 13 +- src/components/cart/PriceCalculation.vue | 137 ++++++++ src/router.js | 2 +- 8 files changed, 533 insertions(+), 335 deletions(-) delete mode 100644 src/components/CartSummary.vue create mode 100644 src/components/DisplayableMoney.graphql create mode 100644 src/components/cart/CartContents.vue create mode 100644 src/components/cart/LineItem.vue rename src/{views/CartPage.vue => components/cart/Page.vue} (81%) create mode 100644 src/components/cart/PriceCalculation.vue diff --git a/package.json b/package.json index 78ef6a35..a6d7cd2d 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,8 @@ "apollo-link-context": "^1.0.8", "babel-loader": "^8.0.2", "graphql-tag": "^2.9.0", + "lodash": "^4.17.11", + "lodash.debounce": "^4.0.8", "register-service-worker": "^1.0.0", "vue": "^2.5.17", "vue-apollo": "^3.0.0-beta.25", diff --git a/src/components/CartSummary.vue b/src/components/CartSummary.vue deleted file mode 100644 index 39e5152b..00000000 --- a/src/components/CartSummary.vue +++ /dev/null @@ -1,328 +0,0 @@ - - - - - -{ - "en": { - }, - "de": { - } -} - diff --git a/src/components/DisplayableMoney.graphql b/src/components/DisplayableMoney.graphql new file mode 100644 index 00000000..411aae3b --- /dev/null +++ b/src/components/DisplayableMoney.graphql @@ -0,0 +1,5 @@ +fragment DisplayableMoney on Money { + centAmount + currencyCode + fractionDigits +} \ No newline at end of file diff --git a/src/components/cart/CartContents.vue b/src/components/cart/CartContents.vue new file mode 100644 index 00000000..c63783e6 --- /dev/null +++ b/src/components/cart/CartContents.vue @@ -0,0 +1,113 @@ + + + + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/components/cart/LineItem.vue b/src/components/cart/LineItem.vue new file mode 100644 index 00000000..3ea08c2a --- /dev/null +++ b/src/components/cart/LineItem.vue @@ -0,0 +1,268 @@ + + + + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/views/CartPage.vue b/src/components/cart/Page.vue similarity index 81% rename from src/views/CartPage.vue rename to src/components/cart/Page.vue index 6f1e076d..8a080917 100644 --- a/src/views/CartPage.vue +++ b/src/components/cart/Page.vue @@ -6,7 +6,7 @@
- bag icon + bag icon {{ $t('yourBag') }}: {{ $tc('itemsTotal', totalItems) }} @@ -18,9 +18,9 @@
- - + +
@@ -37,10 +37,11 @@ + + +{ + "en": { + }, + "de": { + } +} + diff --git a/src/router.js b/src/router.js index 00627dce..57fbbaa3 100644 --- a/src/router.js +++ b/src/router.js @@ -8,7 +8,7 @@ import LoginPage from '@/components/login/LoginPage.vue'; import MyAccountPage from '@/components/useraccount/UserAccountPage.vue'; import NotFoundPage from '@/components/common/NotFoundPage.vue'; import ProductDetailPage from '@/components/productdetail/ProductDetailPage.vue'; -import CartPage from '@/views/CartPage.vue'; +import CartPage from '@/components/cart/Page.vue'; Vue.use(Router); From 2054d18cf08fb6d7bfbba16581bd7c0d35e87979 Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Mon, 17 Dec 2018 13:59:36 +0100 Subject: [PATCH 11/60] Cast quantity input value to number --- src/components/cart/LineItem.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/cart/LineItem.vue b/src/components/cart/LineItem.vue index 3ea08c2a..31357d27 100644 --- a/src/components/cart/LineItem.vue +++ b/src/components/cart/LineItem.vue @@ -47,7 +47,7 @@

- {{ lineItem.name }} @@ -29,11 +30,11 @@

-
@@ -57,14 +58,14 @@
- {{ $t('main.common.quantity') }}: + {{ $t('quantity') }}: {{ lineItem.quantity }}
- {{ $t('main.common.price') }} + {{ $t('price') }} {{ formatPrice(originalPrice) }} @@ -83,7 +84,7 @@
- {{ $t('checkout.total') }} + {{ $t('total') }} {{ formatPrice(lineItem.totalPrice) }}
@@ -91,71 +92,12 @@ - - - -{ - "de": { - "addToCart": "In den Warenkorb" - }, - "en": { - "addToCart": "Add to Bag" - } -} - \ No newline at end of file diff --git a/src/components/productdetail/AddToCartForm.vue b/src/components/productdetail/AddToCartForm.vue new file mode 100644 index 00000000..2e9b285e --- /dev/null +++ b/src/components/productdetail/AddToCartForm.vue @@ -0,0 +1,182 @@ + + + + + + +{ + "de": { + "addToCart": "In den Warenkorb" + }, + "en": { + "addToCart": "Add to Bag" + } +} + \ No newline at end of file diff --git a/src/components/productdetail/ProductInfo.vue b/src/components/productdetail/ProductInfo.vue index dbc5b34a..c4f8f9a3 100644 --- a/src/components/productdetail/ProductInfo.vue +++ b/src/components/productdetail/ProductInfo.vue @@ -53,10 +53,9 @@
- -
@@ -75,14 +74,14 @@ import productMixin from '@/mixins/productMixin'; import ProductGallery from './ProductGallery.vue'; import SocialMediaLinks from './SocialMediaLinks.vue'; import DetailsSection from './DetailsSection.vue'; -import AddToCartButton from './AddToCartButton.vue'; +import AddToCartForm from './AddToCartForm.vue'; export default { components: { DetailsSection, ProductGallery, SocialMediaLinks, - AddToCartButton, + AddToCartForm, }, props: { diff --git a/src/components/useraccount/EditProfileForm.vue b/src/components/useraccount/EditProfileForm.vue index 80c37f50..381ad602 100644 --- a/src/components/useraccount/EditProfileForm.vue +++ b/src/components/useraccount/EditProfileForm.vue @@ -98,7 +98,10 @@ const customerInfoFragment = gql` }`; export default { - components: { ValidationError, ServerError }, + components: { + ValidationError, + ServerError, + }, data: () => ({ me: null, From c376a5c174308f9071767dfa9281823e3b0d9bbd Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Wed, 23 Jan 2019 14:19:26 +0100 Subject: [PATCH 17/60] Fix login/logout flow with cart --- package-lock.json | 69 ++- package.json | 2 +- src/auth.js | 39 +- src/components/cart/LineItem.vue | 1 + src/components/header/LoginButton.vue | 4 +- src/components/useraccount/UserProfile.vue | 1 + yarn.lock | 586 ++++++++++++--------- 7 files changed, 422 insertions(+), 280 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8af137ae..989d71dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1151,12 +1151,6 @@ "@types/node": "*" } }, - "@types/async": { - "version": "2.0.50", - "resolved": "https://registry.npmjs.org/@types/async/-/async-2.0.50.tgz", - "integrity": "sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q==", - "optional": true - }, "@types/blob-util": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/@types/blob-util/-/blob-util-1.3.3.tgz", @@ -2037,18 +2031,38 @@ } }, "apollo-client": { - "version": "2.4.8", - "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.8.tgz", - "integrity": "sha512-OAFbCTnGPtaIv0j+EZYzY20d+MD2JNbJ/YXZ4s0/oZlSg87bb0gjcIbccw2lnytipymZcZNr5ArFFeh0saGEwA==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.12.tgz", + "integrity": "sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w==", "requires": { - "@types/async": "2.0.50", "@types/zen-observable": "^0.8.0", - "apollo-cache": "1.1.22", + "apollo-cache": "1.1.25", "apollo-link": "^1.0.0", "apollo-link-dedup": "^1.0.0", - "apollo-utilities": "1.0.27", + "apollo-utilities": "1.1.2", "symbol-observable": "^1.0.2", + "tslib": "^1.9.3", "zen-observable": "^0.8.0" + }, + "dependencies": { + "apollo-cache": { + "version": "1.1.25", + "resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.25.tgz", + "integrity": "sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA==", + "requires": { + "apollo-utilities": "^1.1.2", + "tslib": "^1.9.3" + } + }, + "apollo-utilities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.2.tgz", + "integrity": "sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ==", + "requires": { + "fast-json-stable-stringify": "^2.0.0", + "tslib": "^1.9.3" + } + } } }, "apollo-datasource": { @@ -7384,11 +7398,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7401,15 +7417,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7512,7 +7531,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7522,6 +7542,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7534,17 +7555,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7561,6 +7585,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7633,7 +7658,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7643,6 +7669,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7748,6 +7775,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -16052,8 +16080,7 @@ "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", - "dev": true + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, "tty-browserify": { "version": "0.0.0", diff --git a/package.json b/package.json index 386fed6c..32f62715 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "@commercetools/sdk-auth": "^1.5.0", "apollo-cache-inmemory": "^1.3.5", - "apollo-client": "^2.4.2", + "apollo-client": "^2.4.12", "apollo-link-context": "^1.0.8", "babel-loader": "^8.0.2", "graphql-tag": "^2.9.0", diff --git a/src/auth.js b/src/auth.js index 7a221aab..c6e8698c 100644 --- a/src/auth.js +++ b/src/auth.js @@ -4,11 +4,13 @@ import store from '@/store'; import config from '@/../sunrise.config'; const tokenInfoStorageName = 'token'; +const isAuthenticatedStorageName = 'auth'; let storedTokenInfo; try { storedTokenInfo = JSON.parse(localStorage.getItem(tokenInfoStorageName)); - if (storedTokenInfo && storedTokenInfo.refresh_token) { + const isAuthenticated = localStorage.getItem(isAuthenticatedStorageName); + if (storedTokenInfo && isAuthenticated) { store.dispatch('setAuthenticated', true); } } catch (error) { @@ -17,26 +19,39 @@ try { const tokenProvider = new TokenProvider({ sdkAuth: new SdkAuth(config.ct.auth), - fetchTokenInfo: sdkAuth => sdkAuth.clientCredentialsFlow(), + fetchTokenInfo: sdkAuth => sdkAuth.anonymousFlow(), onTokenInfoChanged: tokenInfo => localStorage.setItem(tokenInfoStorageName, JSON.stringify(tokenInfo)), }, storedTokenInfo); -export function clientLogout() { +function cleanUpSession() { + localStorage.removeItem(isAuthenticatedStorageName); + return store.dispatch('setAuthenticated', false); +} + +export function clientLogin(username, password) { localStorage.removeItem(tokenInfoStorageName); - tokenProvider.fetchTokenInfo = sdkAuth => sdkAuth.clientCredentialsFlow(); + tokenProvider.fetchTokenInfo = sdkAuth => sdkAuth.customerPasswordFlow({ username, password }); tokenProvider.invalidateTokenInfo(); - return apolloProvider.defaultClient.clearStore() - .then(() => store.dispatch('setAuthenticated', false)) + return apolloProvider.defaultClient.resetStore() + .then(() => { + localStorage.setItem(isAuthenticatedStorageName, true); + return store.dispatch('setAuthenticated', true); + }) .catch((error) => { // eslint-disable-next-line no-console - console.error('Error on cache reset', error); + console.error('Error on cache reset during login', error); + return cleanUpSession(); }); } -export function clientLogin(username, password) { - tokenProvider.fetchTokenInfo = sdkAuth => sdkAuth.customerPasswordFlow({ username, password }); - tokenProvider.invalidateTokenInfo(); - store.dispatch('setAuthenticated', true); +export function clientLogout(redirect) { + return cleanUpSession() + .then(() => redirect()) + .then(() => apolloProvider.defaultClient.resetStore()) + .catch((error) => { + // eslint-disable-next-line no-console + console.error('Error on cache reset during logout', error); + }); } const buildAuthorizationHeader = () => tokenProvider.getTokenInfo() @@ -46,6 +61,6 @@ export function getAuthToken() { return buildAuthorizationHeader().catch((error) => { // eslint-disable-next-line no-console console.warn('Could not connect to commercetools, cleaning up session...', error); - return clientLogout().then(() => buildAuthorizationHeader()); + return cleanUpSession().then(() => buildAuthorizationHeader()); }); } diff --git a/src/components/cart/LineItem.vue b/src/components/cart/LineItem.vue index 7bf51c32..384d857c 100644 --- a/src/components/cart/LineItem.vue +++ b/src/components/cart/LineItem.vue @@ -157,6 +157,7 @@ export default { }; + { "en": { diff --git a/src/components/header/LoginButton.vue b/src/components/header/LoginButton.vue index 84abc611..bd58f881 100644 --- a/src/components/header/LoginButton.vue +++ b/src/components/header/LoginButton.vue @@ -46,14 +46,14 @@ export default { methods: { logout() { - clientLogout().then(() => this.$router.replace({ query: { logout: true } })); + clientLogout(() => this.$router.replace({ query: { logout: true } })); }, }, apollo: { me: { query: gql` - query me { + query loginButtonMe { me { customer { id diff --git a/src/components/useraccount/UserProfile.vue b/src/components/useraccount/UserProfile.vue index 59468fe8..c64b7a65 100644 --- a/src/components/useraccount/UserProfile.vue +++ b/src/components/useraccount/UserProfile.vue @@ -59,6 +59,7 @@ export default { components: { EditProfileForm }, data: () => ({ + me: null, showEditForm: false, }), diff --git a/yarn.lock b/yarn.lock index 99ac1b6d..5b734cf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -328,7 +328,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-jsx@^7.0.0": +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7" integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw== @@ -693,9 +693,9 @@ figures "^1.7.0" "@cypress/webpack-preprocessor@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.0.2.tgz#4399bdb75247c0aaebd18af792fed304fdb33a50" - integrity sha512-Q7DyCxIuMlydQowjTHsw0DfHErZl3jSokQhEb1b8d51dNDf+SWS+2auk2iKCFvNmC088R/NGN3uEfPuJrjfDGQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.0.3.tgz#9f1029a4293f261c5a4a6e1e764a1a4ae6a09a66" + integrity sha512-gw6QNif0UaMW1FDl5tej14isvDWbONib9t1iXGlWUaz0/pEdIvp6ik7mnOaph/IixkQXtmeOJ8CWj+995Pj47w== dependencies: bluebird "3.5.0" debug "3.1.0" @@ -733,9 +733,9 @@ "@fortawesome/fontawesome-common-types" "^0.2.12" "@fortawesome/vue-fontawesome@^0.1.1": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.4.tgz#610a6d419311d400d24e162f7cb3a30082706a12" - integrity sha512-FRdY+VXpMFHY1jD508rwn3k/7Cd0nYK8reksaC2jAEIF3/mwAKx7GrefbV1apb81Lz36bT8iYus9Q/ZvP+AuCA== + version "0.1.5" + resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.5.tgz#ea70a4d4ad0d6d617048a5b2a2ff33e21fe47d61" + integrity sha512-tiNZCgh+ZkUsyFfm2MQMMdHKRrKj82M7g0XFPSNNY+s5nRB82soy0US+xj0jGRy433b0c4WpylCOhgle3294Uw== "@intervolga/optimize-cssnano-plugin@^1.0.5": version "1.0.6" @@ -831,11 +831,6 @@ dependencies: "@types/node" "*" -"@types/async@2.0.50": - version "2.0.50" - resolved "https://registry.yarnpkg.com/@types/async/-/async-2.0.50.tgz#117540e026d64e1846093abbd5adc7e27fda7bcb" - integrity sha512-VMhZMMQgV1zsR+lX/0IBfAk+8Eb7dPVMWiQGFAt3qjo5x7Ml6b77jUo0e1C3ToD+XRDXqtrfw+6AB0uUsPEr3Q== - "@types/blob-util@1.3.3": version "1.3.3" resolved "https://registry.yarnpkg.com/@types/blob-util/-/blob-util-1.3.3.tgz#adba644ae34f88e1dd9a5864c66ad651caaf628a" @@ -983,9 +978,9 @@ "@types/sinon" "*" "@types/sinon@*": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.3.tgz#f8647e883d873962130f906a6114a4e187755696" - integrity sha512-cjmJQLx2B5Hp9SzO7rdSivipo3kBqRqeYkTW17nLST1tn5YLWBjTdnzdmeTJXA1+KrrBLsEuvKQ0fUPGrfazQg== + version "7.0.4" + resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.4.tgz#bf641dd1c3a7fce5f30d60a008251e831ff36095" + integrity sha512-jTDIwFzEFAcEErkbvPeu0XC/6XCImqbLCZdlumwWSCE1eI9R8Y+3Dio3OR/8O1oM39oWZRR/n2AykAlWZPtRgA== "@types/sinon@7.0.0": version "7.0.0" @@ -1020,10 +1015,27 @@ resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d" integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg== -"@vue/babel-preset-app@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-3.2.2.tgz#05d2643e9ea3986d34bc5c4ccdcb7d96ad61b229" - integrity sha512-qQkf/bAATfwC1aTKpjPXPeoITSV0uJaeCYrlBXrAH93+ycKWkK+mz7hjwYlGVo7xM/UTICXd3H14XPn1svK5yg== +"@vue/babel-helper-vue-jsx-merge-props@^1.0.0-beta.2": + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0-beta.2.tgz#f3e20d77b89ddb7a4b9b7a75372f05cd3ac22d92" + integrity sha512-Yj92Q1GcGjjctecBfnBmVqKSlMdyZaVq10hlZB4HSd1DJgu4cWgpEImJSzcJRUCZmas6UigwE7f4IjJuQs+JvQ== + +"@vue/babel-plugin-transform-vue-jsx@^1.0.0-beta.2": + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.0.0-beta.2.tgz#6f7903fe66a34a02163f418c426cf419e862d97e" + integrity sha512-fvAymRZAPHitomRE+jIipWRj0STXNSMqeOSdOFu9Ffjqg9WGOxSdCjORxexManfZ2y5QDv7gzI1xfgprsK3nlw== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2" + html-tags "^2.0.0" + lodash.kebabcase "^4.1.1" + svg-tags "^1.0.0" + +"@vue/babel-preset-app@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-3.3.0.tgz#390dc0ea20a477c9cc09d3a0541f673c0beedb4f" + integrity sha512-ZnuzErAub1hiFp9c/BI94JMEG7AcbS3/nqToJofOYJFspwWerozxefHF3i3owy6KymBQODVetdyI+iZu80b23A== dependencies: "@babel/plugin-proposal-class-properties" "^7.0.0" "@babel/plugin-proposal-decorators" "^7.1.0" @@ -1033,40 +1045,88 @@ "@babel/preset-env" "^7.0.0" "@babel/runtime" "^7.0.0" "@babel/runtime-corejs2" "^7.2.0" + "@vue/babel-preset-jsx" "^1.0.0-beta.1" babel-helper-vue-jsx-merge-props "^2.0.3" babel-plugin-dynamic-import-node "^2.2.0" babel-plugin-transform-vue-jsx "^4.0.1" core-js "^2.6.1" -"@vue/cli-overlay@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.2.0.tgz#bb5d781914bb5af97d92410babbaa3720707b728" - integrity sha512-RKMSfgTtRs4VOXQhmbrNZJaCCheshebji9NcPNGyXzukCMBtoAbu3cG9HxizCSUA//oFFAdPP5BGeHvv0cpu/A== +"@vue/babel-preset-jsx@^1.0.0-beta.1": + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.0.0-beta.2.tgz#3e5dc2b73da58391c1c7327c2bd2ef154fe4e46e" + integrity sha512-nZoAKBR/h6iPMQ66ieQcIdlpPBmqhtUUcgjBS541jIVxSog1rwzrc00jlsuecLonzUMWPU0PabyitsG74vhN1w== + dependencies: + "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2" + "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2" + "@vue/babel-sugar-functional-vue" "^1.0.0-beta.2" + "@vue/babel-sugar-inject-h" "^1.0.0-beta.2" + "@vue/babel-sugar-v-model" "^1.0.0-beta.2" + "@vue/babel-sugar-v-on" "^1.0.0-beta.2" + +"@vue/babel-sugar-functional-vue@^1.0.0-beta.2": + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.0.0-beta.2.tgz#8831f686e7614f282d5170b902483ef538deef38" + integrity sha512-5qvi4hmExgjtrESDk0vflL69dIxkDAukJcYH9o4663E8Nh12Jpbmr+Ja8WmgkAPtTVhk90UVcVUFCCZLHBmhkQ== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-inject-h@^1.0.0-beta.2": + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.0.0-beta.2.tgz#5f92f994bf4b4126fad8633f554e8a426b51b413" + integrity sha512-qGXZ6yE+1trk82xCVJ9j3shsgI+R2ePj3+o8b2Ee7JNaRqQvMfTwpgx5BRlk4q1+CTjvYexdqBS+q4Kg7sSxcg== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + +"@vue/babel-sugar-v-model@^1.0.0-beta.2": + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.0.0-beta.2.tgz#051d3ae3ef5e70d514e09058ec5790f6a42e8c28" + integrity sha512-63US3IMEtATJzzK2le/Na53Sk2bp3LHfwZ8eMFwbTaz6e2qeV9frBl3ZYaha64ghT4IDSbrDXUmm0J09EAzFfA== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.2" + "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2" + camelcase "^5.0.0" + html-tags "^2.0.0" + svg-tags "^1.0.0" + +"@vue/babel-sugar-v-on@^1.0.0-beta.2": + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.0.0-beta.2.tgz#3e2d122e229b10017f091d178346b601d9245260" + integrity sha512-XH/m3k11EKdMY0MrTg4+hQv8BFM8juzHT95chYkgxDmvDdVJnSCuf9+mcysEJttWD4PVuUGN7EHoIWsIhC0dRw== + dependencies: + "@babel/plugin-syntax-jsx" "^7.2.0" + "@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.2" + camelcase "^5.0.0" + +"@vue/cli-overlay@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-3.3.0.tgz#286fe26509a949aeadaa45c87648b76c99c52fd2" + integrity sha512-UyfeuX6txu8sRtfhJOJlPgETzU3KjshKY2qAnC34KJKcS+7oIYRpeOo8jMMLjImVE0g6d8Rn3A1GkXjRiKWW6w== "@vue/cli-plugin-babel@^3.0.3": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-3.2.2.tgz#2eab2e6fac657e8f2a5342418f0f6bc6538d251b" - integrity sha512-ya2UbXs3+Ac/qxnrdChhtM/0JBNifpeO05jL83Q31d3P+AHGp9psqVLHTdB9zReuHri5OAXSGUg1wpQUYNZyYQ== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-3.3.0.tgz#5dea0b90b1ce0dc0ee48e33b32af6b859bcf8ff3" + integrity sha512-HS5DwLe42fmkDgu4+78zMITNK+WiLoHKHBCCOuoEqjmsvvKaH/ByCGJOHYgTTe0aI+AiTAAkR2sZ2YulAjlvlQ== dependencies: "@babel/core" "^7.0.0" - "@vue/babel-preset-app" "^3.2.2" + "@vue/babel-preset-app" "^3.3.0" babel-loader "^8.0.4" "@vue/cli-plugin-e2e-cypress@^3.0.3": - version "3.2.3" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-3.2.3.tgz#20f7357116b69d208f208590d6f7bd03176562aa" - integrity sha512-nHk4Ag3JsRSyK1h9KoMQu5T0aPQvgbmFr91hbwuBwixLCyWG+xxRfmmnekGpg8QqLXMJ7e5CGogwEyRzmLZd2g== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-3.3.0.tgz#44b4bdfae180173ee4fa20eb73f128c866ca631a" + integrity sha512-GP9F4a77e+os2eh4Ed6zPtVzGXLrD6ve8LQVRCK/oYT4LOECMf6Zd+RDoTgYqGyZiAAKFDAvWd2umt6HSaPJ4g== dependencies: - "@vue/cli-shared-utils" "^3.2.2" + "@vue/cli-shared-utils" "^3.3.0" cypress "^3.1.4" eslint-plugin-cypress "^2.2.0" "@vue/cli-plugin-eslint@^3.0.3": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.2.2.tgz#e235c84f337ba6a83a9bdc997d73494191295a67" - integrity sha512-usaTfKjMq7mGkUyTkgoGT36XLnfWjbxTAK00Hl46u3Iz24/ACapS9/p5O+uMv2Lj7epYWV+C36g72agzRrMP9A== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-3.3.0.tgz#74689305e8623057106ed7654dfb0ea7d11395b1" + integrity sha512-kL68xVHv8xFqB06DmzACSviuNPaJcTvlKrCeZarxrXecry2MiOhbyiBToCQXiu2YhfxH8pUy3GFsSRyn3eYEuw== dependencies: - "@vue/cli-shared-utils" "^3.2.2" + "@vue/cli-shared-utils" "^3.3.0" babel-eslint "^10.0.1" eslint "^4.19.1" eslint-loader "^2.1.1" @@ -1074,19 +1134,19 @@ globby "^8.0.1" "@vue/cli-plugin-pwa@^3.0.3": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-3.2.2.tgz#ec8292d6a8d597e9ae3a4e9cf67043c92200d052" - integrity sha512-ockxbaeWB+nfvg0gIjWKDIo6dxyYiycBpTBHbEtST2Dxpjk1YpSte9VL3UV7e2Wxz+PMPO33iYAxTLBYDMoF8A== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-3.3.0.tgz#7818db99d96fb711014d7f5e35f24d3f909527b7" + integrity sha512-UnhKeWmPe0IeNFei0eIeRvXnsTRFNRGDuqHK0M1eEX9GgCQQ4iPFK+0/wneEbsqorgx+c0rqHUL1S/Q8S7DnJg== dependencies: - "@vue/cli-shared-utils" "^3.2.2" + "@vue/cli-shared-utils" "^3.3.0" workbox-webpack-plugin "^3.6.3" "@vue/cli-plugin-unit-jest@^3.0.3": - version "3.2.3" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-3.2.3.tgz#f1d27e3bba7674a0cb9086baa63104cbcfc7da06" - integrity sha512-cjZPrrmy7V0T0BjxfrchT/U1jetaauEfH1LxP4S6cZ0KOXASsmB68XqNllllx8U595Qz4J1soPzx091spABTrA== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-3.3.0.tgz#570e41a9e84995f2ad8581f274db8b670c829e11" + integrity sha512-Y/WkrO95vdvjVjeNO1vZRQUAxlZ6ngdgAzvMzCeEaujbRG4b8M6W7ePSAe8C9yfoVcJtbnoHcBv2er31sPwtyQ== dependencies: - "@vue/cli-shared-utils" "^3.2.2" + "@vue/cli-shared-utils" "^3.3.0" babel-jest "^23.6.0" babel-plugin-transform-es2015-modules-commonjs "^6.26.2" jest "^23.6.0" @@ -1095,13 +1155,13 @@ vue-jest "^3.0.2" "@vue/cli-service@^3.0.3": - version "3.2.3" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.2.3.tgz#cdc18d8d181c1202dc4825be51be64f043a31be3" - integrity sha512-lRCwf8R/YCo67SAqt1MiYhJnvybedQJz1O3uWSJzv7mDPwRUp2980gzQ3wfsTt0tkUtxRcAOmD+V1co4tWOgrw== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-3.3.0.tgz#d269209c891bf0772b619c4d3647fc731285a729" + integrity sha512-7PNitKBBCFcGfCvXSiuUGV2GpGA6KEupQcuxQ2xPL5T3UMSAzJLpx7Siw/9++yO4nQEib6yP3YQk2zTfeXWTSA== dependencies: "@intervolga/optimize-cssnano-plugin" "^1.0.5" - "@vue/cli-overlay" "^3.2.0" - "@vue/cli-shared-utils" "^3.2.2" + "@vue/cli-overlay" "^3.3.0" + "@vue/cli-shared-utils" "^3.3.0" "@vue/preload-webpack-plugin" "^1.1.0" "@vue/web-component-wrapper" "^1.2.0" acorn "^6.0.4" @@ -1150,10 +1210,10 @@ webpack-merge "^4.1.5" yorkie "^2.0.0" -"@vue/cli-shared-utils@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.2.2.tgz#ac53d391eedcf873f41a9c8398cf0da033b8c5ff" - integrity sha512-pkJDucxDxSnmhN3/zgyvKXDFJDx42sfAdNo02mRYPhv3u2tqJW4/GR0X1/O8p4+LUNwBgtGNmDAACYoLzv101Q== +"@vue/cli-shared-utils@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-3.3.0.tgz#aba6c435bf9affb8180c43195ee85eb8d736d70f" + integrity sha512-V/sU1jc7/jMCAbU8uA5f4j9Yd8lTqdi3I6FEHfLG1nstwhaNi4BU3WKWOAl72NYVWFYG8VuCrYWDn75kMimtuw== dependencies: chalk "^2.4.1" execa "^1.0.0" @@ -1169,9 +1229,9 @@ string.prototype.padstart "^3.0.0" "@vue/component-compiler-utils@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.4.0.tgz#a887b57ff06e562873a0ba1dfcf1f8068efa6e26" - integrity sha512-LZyagnP+93GPiVHhu6HELEuHaSe83tfVrUgfl3ugwEc/k5yVbMu3OdaWrVqNo4hh1KK8o5fYOk2E/QpsfAxqiQ== + version "2.5.0" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.5.0.tgz#411846d582d393f701f747517ddd29275ce64ca4" + integrity sha512-mSB8jWmE/ZeYZHPDEx9hNiiRh5P2V1Q0tObxEQWtxxfXtkIAvPnj7oucGm5SO8Y/QwIlDJgAGqHfj5MCjoKoOg== dependencies: consolidate "^0.15.1" hash-sum "^1.0.2" @@ -1381,12 +1441,10 @@ accepts@^1.3.5, accepts@~1.3.4, accepts@~1.3.5: mime-types "~2.1.18" negotiator "0.6.1" -acorn-dynamic-import@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" - integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg== - dependencies: - acorn "^5.0.0" +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: version "4.3.0" @@ -1413,12 +1471,12 @@ acorn@^3.0.4: resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= -acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3: +acorn@^5.5.0, acorn@^5.5.3, acorn@^5.7.3: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.1, acorn@^6.0.4: +acorn@^6.0.1, acorn@^6.0.4, acorn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a" integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg== @@ -1454,9 +1512,9 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: json-schema-traverse "^0.3.0" ajv@^6.1.0, ajv@^6.5.5: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g== + version "6.7.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96" + integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -1544,35 +1602,36 @@ apollo-cache-control@0.4.0: graphql-extensions "0.4.0" apollo-cache-inmemory@^1.3.5, apollo-cache-inmemory@^1.3.9: - version "1.3.12" - resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.12.tgz#cf7ef7c15730d0b6787d79047d5c06087ac31991" - integrity sha512-jxWcW64QoYQZ09UH6v3syvCCl3MWr6bsxT3wYYL6ORi8svdJUpnNrHTcv5qXqJYVg/a+NHhfEt+eGjJUG2ytXA== + version "1.4.2" + resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.2.tgz#c91aeb4adff45cdc7872d603cbff055fa9cd5021" + integrity sha512-fDVmj5j1e3W+inyuSwjIcMgbQ4edcFgmiKTBMFAEKAq0jg33X7FrbDX8JT2t5Vuf75Mva50JDlt5wXdu7C6WuA== dependencies: - apollo-cache "^1.1.22" - apollo-utilities "^1.0.27" - optimism "^0.6.8" + apollo-cache "^1.1.25" + apollo-utilities "^1.1.2" + optimism "^0.6.9" + tslib "^1.9.3" -apollo-cache@1.1.22, apollo-cache@^1.1.22: - version "1.1.22" - resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.22.tgz#d4682ea6e8b2508a934f61c2fd9e36b4a65041d9" - integrity sha512-8PoxhQLISj2oHwT7i/r4l+ly4y3RKZls+dtXzAewu3U77P9dNZKhYkRNAhx9iEfsrNoHgXBV8vMp64hb1uYh+g== +apollo-cache@1.1.25, apollo-cache@^1.1.25: + version "1.1.25" + resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.25.tgz#87a15a2a19993bb07234ccee6839b59d6fb49ac5" + integrity sha512-9HhI/tVEHAeGaJJvi1Vpf6PzXUCA0PqNbigi2G3uOc180JjxbcaBvEbKXMEDb/UyTXkFWzI4PiPDuDQFqmIMSA== dependencies: - apollo-utilities "^1.0.27" + apollo-utilities "^1.1.2" + tslib "^1.9.3" -apollo-client@^2.4.2, apollo-client@^2.4.5: - version "2.4.8" - resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.8.tgz#3a798f1076243465a59061d44d11bd030b68deb9" - integrity sha512-OAFbCTnGPtaIv0j+EZYzY20d+MD2JNbJ/YXZ4s0/oZlSg87bb0gjcIbccw2lnytipymZcZNr5ArFFeh0saGEwA== +apollo-client@^2.4.12, apollo-client@^2.4.5: + version "2.4.12" + resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.12.tgz#9fa15f502d04f8cc788a9fbb825163b437681504" + integrity sha512-E5ClFSB9btJLYibLKwLDSCg+w9tI+25eZgXOM+DClawu7of4d/xhuV/xvpuZpsMP3qwrp0QPacBnfG4tUJs3/w== dependencies: "@types/zen-observable" "^0.8.0" - apollo-cache "1.1.22" + apollo-cache "1.1.25" apollo-link "^1.0.0" apollo-link-dedup "^1.0.0" - apollo-utilities "1.0.27" + apollo-utilities "1.1.2" symbol-observable "^1.0.2" + tslib "^1.9.3" zen-observable "^0.8.0" - optionalDependencies: - "@types/async" "2.0.50" apollo-datasource@0.2.1: version "0.2.1" @@ -1746,12 +1805,13 @@ apollo-upload-client@^9.1.0: apollo-link-http-common "^0.2.5" extract-files "^4.0.0" -apollo-utilities@1.0.27, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.25, apollo-utilities@^1.0.27, apollo-utilities@^1.0.8: - version "1.0.27" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.27.tgz#77c550f9086552376eca3a48e234a1466b5b057e" - integrity sha512-nzrMQ89JMpNmYnVGJ4t8zN75gQbql27UDhlxNi+3OModp0Masx5g+fQmQJ5B4w2dpRuYOsdwFLmj3lQbwOKV1Q== +apollo-utilities@1.1.2, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.25, apollo-utilities@^1.0.8, apollo-utilities@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.1.2.tgz#aa5eca9d1f1eb721c381a22e0dde03559d856db3" + integrity sha512-EjDx8vToK+zkWIxc76ZQY/irRX52puNg04xf/w8R0kVTDAgHuVfnFVC01O5vE25kFnIaa5em0pFI0p9b6YMkhQ== dependencies: fast-json-stable-stringify "^2.0.0" + tslib "^1.9.3" append-transform@^0.4.0: version "0.4.0" @@ -3009,12 +3069,12 @@ browserslist@^3.2.8: electron-to-chromium "^1.3.47" browserslist@^4.0.0, browserslist@^4.3.4: - version "4.3.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.7.tgz#f1de479a6466ea47a0a26dcc725e7504817e624a" - integrity sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062" + integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A== dependencies: - caniuse-lite "^1.0.30000925" - electron-to-chromium "^1.3.96" + caniuse-lite "^1.0.30000929" + electron-to-chromium "^1.3.103" node-releases "^1.1.3" bser@^2.0.0: @@ -3063,13 +3123,12 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= -busboy@^0.2.14: - version "0.2.14" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453" - integrity sha1-bCpiLvz0fFe7vh4qnDetNseSVFM= +busboy@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.0.tgz#6ee3cb1c844fc1f691d8f9d824f70128b3b5e485" + integrity sha512-e+kzZRAbbvJPLjQz2z+zAyr78BSi9IFeBTyLwF76g78Q2zRt/RZ1NtS3MS17v2yLqYfLz69zHdC+1L4ja8PwqQ== dependencies: - dicer "0.2.5" - readable-stream "1.1.x" + dicer "0.3.0" bytes@3.0.0: version "3.0.0" @@ -3214,6 +3273,11 @@ camelcase@^4.0.0, camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= +camelcase@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" + integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA== + caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -3224,10 +3288,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000925: - version "1.0.30000927" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000927.tgz#114a9de4ff1e01f5790fe578ecd93421c7524665" - integrity sha512-ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000929: + version "1.0.30000929" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317" + integrity sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw== capture-exit@^1.2.0: version "1.2.0" @@ -3271,7 +3335,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3643,9 +3707,9 @@ configstore@^3.0.0: xdg-basedir "^3.0.0" connect-history-api-fallback@^1.3.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" - integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo= + version "1.6.0" + resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== console-browserify@^1.1.0: version "1.1.0" @@ -3735,14 +3799,14 @@ copy-webpack-plugin@^4.6.0: serialize-javascript "^1.4.0" core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.7, core-js@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042" - integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg== + version "2.6.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.2.tgz#267988d7268323b349e20b4588211655f0e83944" + integrity sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g== core-js@^3.0.0-beta.3: - version "3.0.0-beta.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0-beta.7.tgz#d8bc953adc4805e81dbfc73c18050f6ca78d547b" - integrity sha512-Tf2uksQ1zuzoLbjWhEej9/iSAtjwtqzuXAGUidO7PNuUN2uPCCnJoR6YmIO3Ibq6vuGNzH6wt+3pLHrl7wEIYw== + version "3.0.0-beta.9" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0-beta.9.tgz#1897789a5ef0ee1190d54777f35f80c38c077633" + integrity sha512-OGLbGro2f0s8UXVyu2s9kIW42pcuRoNEqJsmn8a4rAOO9G5A2t96l++rf+4mHNw9GKrbdozZ9G5ieDKOBl68zQ== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4371,12 +4435,11 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== -dicer@0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f" - integrity sha1-WZbAhrszIYyBLAkL3cCc0S+stw8= +dicer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" + integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== dependencies: - readable-stream "1.1.x" streamsearch "0.1.2" diff@3.5.0, diff@^3.1.0, diff@^3.2.0: @@ -4393,7 +4456,7 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dir-glob@^2.0.0: +dir-glob@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag== @@ -4401,6 +4464,13 @@ dir-glob@^2.0.0: arrify "^1.0.1" path-type "^3.0.0" +dir-glob@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" + integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== + dependencies: + path-type "^3.0.0" + dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -4575,10 +4645,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ== -electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.96: - version "1.3.98" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.98.tgz#f200bdac84b1110d7d9904f34f4fc6d5573a8a9c" - integrity sha512-WIZdNuvE3dFr6kkPgv4d/cfswNZD6XbeLBM8baOIQTsnbf4xWrVEaLvp7oNnbnMWWXDqq7Tbv+H5JfciLTJm4Q== +electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.47: + version "1.3.103" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.103.tgz#a695777efdbc419cad6cbb0e58458251302cd52f" + integrity sha512-tObPqGmY9X8MUM8i3MEimYmbnLLf05/QV5gPlkR8MQ3Uj8G8B2govE1U4cQcBYtv3ymck9Y8cIOu4waoiykMZQ== elegant-spinner@^1.0.1: version "1.0.1" @@ -4875,9 +4945,9 @@ eslint@^4.19.1: text-table "~0.2.0" esm@^3.0.84: - version "3.0.84" - resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.84.tgz#bb108989f4673b32d4f62406869c28eed3815a63" - integrity sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw== + version "3.1.1" + resolved "https://registry.yarnpkg.com/esm/-/esm-3.1.1.tgz#810d1144522547801a58a8ea01d6566d61578223" + integrity sha512-Md2pR4IbR37UqubbgbA4+wiBorOEFB05Oo+g4WJW7W2ajiOhUfjZt77NzzCoQdrCb40GdKcflitm+XHDF053OQ== espree@^3.5.2, espree@^3.5.4: version "3.5.4" @@ -4936,10 +5006,10 @@ eventemitter3@^3.0.0, eventemitter3@^3.1.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA== -events@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= +events@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88" + integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA== eventsource@^1.0.7: version "1.0.7" @@ -5213,9 +5283,9 @@ fast-deep-equal@^2.0.1: integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= fast-glob@^2.0.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.4.tgz#e54f4b66d378040e0e4d6a68ec36bbc5b04363c0" - integrity sha512-FjK2nCGI/McyzgNtTESqaWP3trPvHyRyoyY70hxjc3oKPNmDe8taohLZpoVKoUjW85tbU5txaYUZCNtVzygl1g== + version "2.2.6" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295" + integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w== dependencies: "@mrmlnc/readdir-enhanced" "^2.2.1" "@nodelib/fs.stat" "^1.1.2" @@ -5526,10 +5596,10 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-capacitor@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-1.0.1.tgz#ff9dbfa14dfaf4472537720f19c3088ed9278df0" - integrity sha512-XdZK0Q78WP29Vm3FGgJRhRhrBm51PagovzWtW2kJ3Q6cYJbGtZqWSGTSPwvtEkyjIirFd7b8Yes/dpOYjt4RRQ== +fs-capacitor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.0.tgz#6cbafaa39313eebf9c49ecff8795aadc08337fc5" + integrity sha512-CIJZpxbVWhO+qyODeCR55Q+6vj0p2oL8DAWd/DZi3Ev+25PimUoScw07K0fPgluaH3lFoqNvwW13BDYfHWFQJw== fs-extra@4.0.1: version "4.0.1" @@ -5581,9 +5651,9 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.2.2, fsevents@^1.2.3: - version "1.2.4" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" - integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg== + version "1.2.7" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4" + integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw== dependencies: nan "^2.9.2" node-pre-gyp "^0.10.0" @@ -5735,9 +5805,9 @@ global-dirs@^0.1.0: ini "^1.3.4" globals@^11.0.1, globals@^11.1.0: - version "11.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" - integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg== + version "11.10.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" + integrity sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ== globals@^9.18.0: version "9.18.0" @@ -5768,12 +5838,12 @@ globby@^7.1.1: slash "^1.0.0" globby@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50" - integrity sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw== + version "8.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d" + integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w== dependencies: array-union "^1.0.1" - dir-glob "^2.0.0" + dir-glob "2.0.0" fast-glob "^2.0.2" glob "^7.1.2" ignore "^3.3.5" @@ -5812,11 +5882,12 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== graphql-anywhere@^4.1.0-alpha.0: - version "4.1.24" - resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.24.tgz#59e2a8bfd3d00ac75f6a377e31e4e9fdaa5ce786" - integrity sha512-g81K7FqXSF3q1iqFWlwiwD+g0SDkPUUa9+Wa+7BOrAe5+7R4BdNWL4dw9BRsJxt0Xx6nOaI2E+VM7QMAucQFvA== + version "4.1.27" + resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.27.tgz#7d013b4c51039ea6c46839a53abe924f8fffd4f3" + integrity sha512-ErASfs9siEMrmroHU0V4heh6cIdA8K/SoYpahJFgEM6YDAwUZuycTAKIrMaK8XJI37sHZWcujF/ySuYnIkP5vw== dependencies: - apollo-utilities "^1.0.27" + apollo-utilities "^1.1.2" + tslib "^1.9.3" graphql-config@^2.0.1: version "2.2.1" @@ -5866,9 +5937,9 @@ graphql-subscriptions@^1.0.0: iterall "^1.2.1" graphql-tag@^2.9.0, graphql-tag@^2.9.2: - version "2.10.0" - resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz#87da024be863e357551b2b8700e496ee2d4353ae" - integrity sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w== + version "2.10.1" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02" + integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg== graphql-tools@^4.0.0: version "4.0.3" @@ -5882,19 +5953,19 @@ graphql-tools@^4.0.0: uuid "^3.1.0" graphql-upload@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/graphql-upload/-/graphql-upload-8.0.2.tgz#1c1f116f15b7f8485cf40ff593a21368f0f58856" - integrity sha512-u8a5tKPfJ0rU4MY+B3skabL8pEjMkm3tUzq25KBx6nT0yEWmqUO7Z5tdwvwYLFpkLwew94Gue0ARbZtar3gLTw== + version "8.0.4" + resolved "https://registry.yarnpkg.com/graphql-upload/-/graphql-upload-8.0.4.tgz#ed7cbde883b5cca493de77e39f95cddf40dfd514" + integrity sha512-jsTfVYXJ5mU6BXiiJ20CUCAcf41ICCQJ2ltwQFUuaFKiY4JhlG99uZZp5S3hbpQ/oA1kS7hz4pRtsnxPCa7Yfg== dependencies: - busboy "^0.2.14" - fs-capacitor "^1.0.0" + busboy "^0.3.0" + fs-capacitor "^2.0.0" http-errors "^1.7.1" object-path "^0.11.4" graphql@^14.0.2: - version "14.0.2" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz#7dded337a4c3fd2d075692323384034b357f5650" - integrity sha512-gUC4YYsaiSJT1h40krG3J+USGlwhzNTXSb4IOZljn9ag5Tj+RkoXrWp+Kh7WyE3t1NCfab5kzCuxBIvOMERMXw== + version "14.1.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0" + integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q== dependencies: iterall "^1.2.2" @@ -6146,6 +6217,11 @@ html-minifier@^3.2.3: relateurl "0.2.x" uglify-js "3.4.x" +html-tags@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" + integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos= + html-webpack-plugin@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b" @@ -6287,9 +6363,9 @@ ignore@^3.3.3, ignore@^3.3.5: integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== immutable-tuple@^0.4.9: - version "0.4.9" - resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz#473ebdd6c169c461913a454bf87ef8f601a20ff0" - integrity sha512-LWbJPZnidF8eczu7XmcnLBsumuyRBkpwIRPCZxlojouhBo5jEBO4toj6n7hMy6IxHU/c+MqDSWkvaTpPlMQcyA== + version "0.4.10" + resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.10.tgz#e0b1625384f514084a7a84b749a3bb26e9179929" + integrity sha512-45jheDbc3Kr5Cw8EtDD+4woGRUV0utIrJBZT8XH0TPZRfm8tzT0/sLGGzyyCCFqFMG5Pv5Igf3WY/arn6+8V9Q== import-cwd@^2.0.0: version "2.1.0" @@ -6444,6 +6520,11 @@ ip-regex@^2.1.0: resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= +ip-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-3.0.0.tgz#0a934694b4066558c46294244a23cc33116bf732" + integrity sha512-T8wDtjy+Qf2TAPDQmBp0eGKJ8GavlWlUnamr3wRn6vvdZlKVuJXXMlSncYFRYgVHOM3If5NR1H4+OvVQU9Idvg== + ip@^1.1.0, ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -7338,9 +7419,9 @@ joi@^14.3.0: topo "3.x.x" js-base64@^2.1.8: - version "2.5.0" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e" - integrity sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g== + version "2.5.1" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" + integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== js-beautify@^1.6.12, js-beautify@^1.6.14: version "1.8.9" @@ -7354,9 +7435,9 @@ js-beautify@^1.6.12, js-beautify@^1.6.14: nopt "~4.0.1" js-levenshtein@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e" - integrity sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow== + version "1.1.6" + resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" + integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g== js-message@1.0.5: version "1.0.5" @@ -7771,9 +7852,9 @@ loader-fs-cache@^1.0.0: mkdirp "0.5.1" loader-runner@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979" - integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw== + version "2.4.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" + integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== loader-utils@^0.2.16: version "0.2.17" @@ -7840,6 +7921,11 @@ lodash.get@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= +lodash.kebabcase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY= + lodash.mapvalues@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" @@ -8025,9 +8111,9 @@ map-visit@^1.0.0: object-visit "^1.0.0" math-random@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" - integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w= + version "1.0.4" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" + integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== md5.js@^1.3.4: version "1.3.5" @@ -8522,9 +8608,9 @@ node-ipc@^9.1.1: js-queue "2.0.0" "node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" - integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg== + version "2.2.0" + resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77" + integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA== dependencies: assert "^1.1.1" browserify-zlib "^0.2.0" @@ -8533,7 +8619,7 @@ node-ipc@^9.1.1: constants-browserify "^1.0.0" crypto-browserify "^3.11.0" domain-browser "^1.1.1" - events "^1.0.0" + events "^3.0.0" https-browserify "^1.0.0" os-browserify "^0.3.0" path-browserify "0.0.0" @@ -8547,7 +8633,7 @@ node-ipc@^9.1.1: timers-browserify "^2.0.4" tty-browserify "0.0.0" url "^0.11.0" - util "^0.10.3" + util "^0.11.0" vm-browserify "0.0.4" node-notifier@^5.2.1: @@ -8883,10 +8969,10 @@ opn@^5.1.0, opn@^5.3.0: dependencies: is-wsl "^1.1.0" -optimism@^0.6.8: - version "0.6.8" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.8.tgz#0780b546da8cd0a72e5207e0c3706c990c8673a6" - integrity sha512-bN5n1KCxSqwBDnmgDnzMtQTHdL+uea2HYFx1smvtE+w2AMl0Uy31g0aXnP/Nt85OINnMJPRpJyfRQLTCqn5Weg== +optimism@^0.6.9: + version "0.6.9" + resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz#19258ff8b3be0cea29ac35f06bff818e026e30bb" + integrity sha512-xoQm2lvXbCA9Kd7SCx6y713Y7sZ6fUc5R6VYpoL5M6svKJbTuvtNopexK8sO8K4s0EOUYHuPN2+yAEsNyRggkQ== dependencies: immutable-tuple "^0.4.9" @@ -9061,9 +9147,9 @@ package-json@^4.0.0: semver "^5.1.0" pako@~1.0.5: - version "1.0.7" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" - integrity sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ== + version "1.0.8" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4" + integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA== parallel-transform@^1.1.0: version "1.1.0" @@ -9082,15 +9168,16 @@ param-case@2.1.x: no-case "^2.2.0" parse-asn1@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" - integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw== + version "5.1.3" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.3.tgz#1600c6cc0727365d68b97f3aa78939e735a75204" + integrity sha512-VrPoetlz7B/FqjBLD2f5wBVZvsZVLnRUrxVLfRYhGXCODa/NWE4p3Wp+6+aV3ZPL3KM7/OZmxDIwwijD7yuucg== dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" create-hash "^1.1.0" evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" parse-glob@^3.0.4: version "3.0.4" @@ -9627,13 +9714,13 @@ postcss@^6.0.1, postcss@^6.0.23: supports-color "^5.4.0" postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5, postcss@^7.0.7: - version "7.0.7" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614" - integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg== + version "7.0.13" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708" + integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg== dependencies: - chalk "^2.4.1" + chalk "^2.4.2" source-map "^0.6.1" - supports-color "^5.5.0" + supports-color "^6.1.0" prelude-ls@~1.1.2: version "1.1.2" @@ -9972,16 +10059,6 @@ readable-stream@1.0: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@1.1.x: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@^3.0.6: version "3.1.1" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06" @@ -10791,9 +10868,9 @@ source-map-support@^0.4.15: source-map "^0.5.6" source-map-support@^0.5.6, source-map-support@~0.5.6: - version "0.5.9" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" - integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA== + version "0.5.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c" + integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -11185,13 +11262,25 @@ supports-color@^3.1.2: dependencies: has-flag "^1.0.0" -supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0: +supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= + svgo@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985" @@ -11332,9 +11421,9 @@ throat@^4.0.0: integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo= throttle-debounce@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.0.1.tgz#7307ddd6cd9acadb349132fbf6c18d78c88a5e62" - integrity sha512-Sr6jZBlWShsAaSXKyNXyNicOrJW/KtkDqIEwHt4wYwWA2wa/q67Luhqoujg48V8hTk60wB56tYrJJn6jc2R7VA== + version "2.1.0" + resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5" + integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg== throttleit@~0.0.2: version "0.0.2" @@ -11466,7 +11555,16 @@ touch@^3.1.0: dependencies: nopt "~1.0.10" -tough-cookie@>=2.3.3, tough-cookie@^2.3.4: +tough-cookie@>=2.3.3: + version "3.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.0.tgz#d2bceddebde633153ff20a52fa844a0dc71dacef" + integrity sha512-LHMvg+RBP/mAVNqVbOX8t+iJ+tqhBA/t49DuI7+IDAWHrASnesqSu1vWbKB7UrE2yk+HMFUBMadRGMkB4VCfog== + dependencies: + ip-regex "^3.0.0" + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -11542,7 +11640,7 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@^1.9.0: +tslib@^1.9.0, tslib@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== @@ -11791,10 +11889,10 @@ util@0.10.3: dependencies: inherits "2.0.1" -util@^0.10.3: - version "0.10.4" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" - integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== +util@^0.11.0: + version "0.11.1" + resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" + integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== dependencies: inherits "2.0.3" @@ -11848,9 +11946,9 @@ vm-browserify@0.0.4: indexof "0.0.1" vue-apollo@^3.0.0-beta.25: - version "3.0.0-beta.26" - resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.26.tgz#d78874d737d61656743adf59e65e6b98cf35ef5d" - integrity sha512-nWaPoKBGq1NR8g6kBnLy5yCCcoHkaxWQwPrY7vCcoBgYU8ZmA0czYN1na7hurtWLZdEiMC6B9LbaJWc+FRcUEA== + version "3.0.0-beta.27" + resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.27.tgz#d071d7bbaf83c9689bdf992d9ef762c17af29623" + integrity sha512-0NcYSLReOI5vsZesX9rLVVKR8iZaJRAKsBG7eAUJ4RRIDzYBVpPET8C7v9oyhHymENN/FhImurq/krTk8z9ZYw== dependencies: chalk "^2.4.1" throttle-debounce "^2.0.0" @@ -11939,9 +12037,9 @@ vue-jest@^3.0.2: vue-template-es2015-compiler "^1.6.0" vue-loader@^15.4.2: - version "15.5.0" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.5.0.tgz#1ff724511b0f40aea9734f611fe34f6af6ba38f8" - integrity sha512-aw+eJsAxxmlD4Ad0ww4s69u4pGs4jjwv9WVDiW5qj2zPYSmgNPWaD0xCl5jQyqgtXstkzYurhdG49cpQmNgRgg== + version "15.5.1" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.5.1.tgz#e005d5fc2481a55a19910f0dcf434206d68acc2a" + integrity sha512-gsTA9xRzu9jGBzkcrAB8my14RkHMzdr5rY/mCFmxgY2tOVsd2Z1MaYCDXHu5nX6PyHAsVK2/hXmarPln/2MiIw== dependencies: "@vue/component-compiler-utils" "^2.4.0" hash-sum "^1.0.2" @@ -11978,22 +12076,22 @@ vue-style-loader@^4.1.0: loader-utils "^1.0.2" vue-template-compiler@^2.5.17: - version "2.5.21" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz#a57ceb903177e8f643560a8d639a0f8db647054a" - integrity sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw== + version "2.5.22" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.22.tgz#c3d3c02c65f1908205c4fbd3b0ef579e51239955" + integrity sha512-1VTw/NPTUeHNiwhkq6NkFzO7gYLjFCueBN0FX8NEiQIemd5EUMQ5hxrF7O0zCPo5tae+U9S/scETPea+hIz8Eg== dependencies: de-indent "^1.0.2" he "^1.1.0" vue-template-es2015-compiler@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18" - integrity sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg== + version "1.8.1" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.1.tgz#e2ec4f42d16b6c712e61899c6b20bcdb1df128ca" + integrity sha512-mxBBMuSaPG9+NkVMbh28r8gvWQJ8UXxqDxVNeLy2KBUZiSNxZsagjYwLL8gjROb4oaaYtwRv3K8gAmw76I/U7Q== vue@^2.5.16, vue@^2.5.17, vue@^2.5.2: - version "2.5.21" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85" - integrity sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ== + version "2.5.22" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.22.tgz#3bf88041af08b8539c37b268b70ca79245e9cc30" + integrity sha512-pxY3ZHlXNJMFQbkjEgGVMaMMkSV1ONpz+4qB55kZuJzyJOhn6MSy/YZdzhdnumegNzVTL/Dn3Pp4UrVBYt1j/g== vuelidate@^0.7.4: version "0.7.4" @@ -12001,9 +12099,9 @@ vuelidate@^0.7.4: integrity sha512-QHZWYOL325Zo+2K7VBNEJTZ496Kd8Z31p85aQJFldKudUUGBmgw4zu4ghl4CyqPwjRCmqZ9lDdx4FSdMnu4fGg== vuex@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.0.1.tgz#e761352ebe0af537d4bb755a9b9dc4be3df7efd2" - integrity sha512-wLoqz0B7DSZtgbWL1ShIBBCjv22GV5U+vcBFox658g6V0s4wZV9P4YjCNyoHSyIBpj1f29JBoNQIqD82cR4O3w== + version "3.1.0" + resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.0.tgz#634b81515cf0cfe976bd1ffe9601755e51f843b9" + integrity sha512-mdHeHT/7u4BncpUZMlxNaIdcN/HIt1GsGG5LKByArvYG/v6DvHcOxvDCts+7SRdCoIRGllK8IMZvQtQXLppDYg== w3c-hr-time@^1.0.1: version "1.0.1" @@ -12151,16 +12249,16 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-map "~0.6.1" webpack@4: - version "4.28.3" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.3.tgz#8acef6e77fad8a01bfd0c2b25aa3636d46511874" - integrity sha512-vLZN9k5I7Nr/XB1IDG9GbZB4yQd1sPuvufMFgJkx0b31fi2LD97KQIjwjxE7xytdruAYfu5S0FLBLjdxmwGJCg== + version "4.29.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750" + integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w== dependencies: "@webassemblyjs/ast" "1.7.11" "@webassemblyjs/helper-module-context" "1.7.11" "@webassemblyjs/wasm-edit" "1.7.11" "@webassemblyjs/wasm-parser" "1.7.11" - acorn "^5.6.2" - acorn-dynamic-import "^3.0.0" + acorn "^6.0.5" + acorn-dynamic-import "^4.0.0" ajv "^6.1.0" ajv-keywords "^3.1.0" chrome-trace-event "^1.0.0" From 5d639376ccbda7af35448282973b3c403837a0ad Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Wed, 23 Jan 2019 14:24:51 +0100 Subject: [PATCH 18/60] Fix style for minicart --- public/js/main.js | 15 +- src/assets/scss/_navigation.scss | 1 - src/components/header/LocationSelector.vue | 2 +- src/components/header/MiniCart.vue | 179 ++++++++++++++++++ src/components/header/TheHeader.vue | 7 +- .../productdetail/AddToCartForm.vue | 2 +- 6 files changed, 185 insertions(+), 21 deletions(-) create mode 100644 src/components/header/MiniCart.vue diff --git a/public/js/main.js b/public/js/main.js index bc55ade0..638ee749 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -57,7 +57,7 @@ sizeGuideTable.prototype = { $(document).ready(() => { $(window).load(() => { // makes the scrollbar's design the same in all browsers - $('.nav-minicart ul, .order-summary-items').mCustomScrollbar({ + $('.order-summary-items').mCustomScrollbar({ theme: 'dark', scrollInertia: 50, }); @@ -75,19 +75,6 @@ $(document).ready(() => { $('.search-toggle').click(() => { $('.search-box').slideToggle(); }); - - // Your bag dropdown - $('.link-your-bag').click(() => { - $('.nav-minicart').slideToggle(); - }); - - // Closing dropdown on click outside of it - $('html').click(() => { - $('.nav-minicart').hide(); - }); - $('.list-item-bag, .nav-minicart').click((event) => { - event.stopPropagation(); - }); }); // Toggling plus and minus icons for mobile navigation menu diff --git a/src/assets/scss/_navigation.scss b/src/assets/scss/_navigation.scss index 861ee331..4d80af7b 100755 --- a/src/assets/scss/_navigation.scss +++ b/src/assets/scss/_navigation.scss @@ -447,7 +447,6 @@ .nav-minicart { - display: none; position: absolute; width: 500%; // TODO: temp fix right: 0; diff --git a/src/components/header/LocationSelector.vue b/src/components/header/LocationSelector.vue index 4e4cb510..559962b2 100644 --- a/src/components/header/LocationSelector.vue +++ b/src/components/header/LocationSelector.vue @@ -1,5 +1,6 @@ From e87ebdb4a8941af3363bef6e794e69a69c8d1453 Mon Sep 17 00:00:00 2001 From: Laura Luiz Date: Thu, 7 Feb 2019 12:26:41 +0100 Subject: [PATCH 30/60] Fix minicart opening action --- src/components/header/MiniCart.vue | 43 ++++++++----------- .../productdetail/AddToCartForm.vue | 4 +- src/store.js | 36 ++++++++++++++++ 3 files changed, 56 insertions(+), 27 deletions(-) diff --git a/src/components/header/MiniCart.vue b/src/components/header/MiniCart.vue index ad101554..369adc85 100644 --- a/src/components/header/MiniCart.vue +++ b/src/components/header/MiniCart.vue @@ -1,8 +1,8 @@