From 84a022ba276b8965425fbb5e2de493930142cae1 Mon Sep 17 00:00:00 2001
From: Piotr Karwatka <pkarwatka@divante.pl>
Date: Fri, 3 Aug 2018 16:08:37 +0200
Subject: [PATCH] Revert "Core package separation"

---
 core/api/cart/test/TestInstance.vue           |  16 +-
 core/api/wishlist/test/TestInstance.vue       |   4 +-
 .../wishlist/test/TestInstanceForLoadTest.vue |   6 +-
 core/app.js                                   |  32 +-
 core/build/webpack.base.config.js             |   3 +-
 core/client-entry.js                          |  18 +-
 core/components/AddToCart.js                  |   2 +-
 core/components/Modal.js                      |   2 +-
 core/components/ProductBundleOptions.js       |   6 +-
 core/components/ProductCustomOptions.js       |   6 +-
 core/components/ProductTile.js                |   2 +-
 core/components/blocks/Auth/Login.js          |   3 +-
 core/components/blocks/Auth/Register.js       |   2 +-
 .../components/blocks/Checkout/CartSummary.js |   2 +-
 .../components/blocks/Checkout/OrderReview.js |   2 +-
 core/components/blocks/Checkout/Payment.js    |   2 +-
 core/components/blocks/Checkout/Shipping.js   |   2 +-
 core/components/blocks/Header/AccountIcon.js  |   2 +-
 .../components/blocks/Header/MicrocartIcon.js |   2 +-
 core/components/blocks/Header/WishlistIcon.js |   2 +-
 core/components/blocks/Microcart/Microcart.js |   4 +-
 core/components/blocks/MyAccount/MyProfile.js |   2 +-
 .../blocks/MyAccount/MyShippingDetails.js     |   2 +-
 .../blocks/SearchPanel/SearchPanel.js         |   4 +-
 .../blocks/SidebarMenu/SidebarMenu.js         |   2 +-
 core/components/blocks/Wishlist/Product.js    |   2 +-
 core/components/blocks/Wishlist/Wishlist.js   |   4 +-
 core/lib/i18n-utils.js                        |   2 +-
 core/lib/i18n.js                              |   4 +-
 core/lib/themes.js                            |   8 +-
 core/mixins/composite/index.js                |   2 +-
 core/package.json                             |  82 +-
 core/pages/Category.js                        |   8 +-
 core/pages/Checkout.js                        |   4 +-
 core/pages/Compare.js                         |   4 +-
 core/pages/Home.js                            |   6 +-
 core/pages/MyAccount.js                       |   4 +-
 core/pages/PageNotFound.js                    |   6 +-
 core/pages/Product.js                         |  10 +-
 core/server-entry.js                          |  10 +-
 core/store/lib/multistore.js                  |   4 +-
 core/store/modules/stock/index.js             |   2 +-
 package.json                                  |   2 +-
 src/extensions/google-analytics/index.js      |   2 +-
 src/extensions/mailchimp-subscribe/index.js   |   2 +-
 .../payment-backend-methods/index.js          |   2 +-
 .../payment-cash-on-delivery/index.js         |   2 +-
 src/extensions/template/index.js              |   2 +-
 .../default/components/core/AddToCart.vue     |   4 +-
 .../default/components/core/Breadcrumbs.vue   |   2 +-
 .../default/components/core/ColorSelector.vue |   2 +-
 .../components/core/CookieNotification.vue    |   2 +-
 .../components/core/GenericSelector.vue       |   2 +-
 src/themes/default/components/core/Loader.vue |   2 +-
 src/themes/default/components/core/Modal.vue  |   2 +-
 .../components/core/NewsletterPopup.vue       |   2 +-
 .../default/components/core/Notification.vue  |   2 +-
 .../default/components/core/Overlay.vue       |   2 +-
 .../default/components/core/PriceSelector.vue |   2 +-
 .../components/core/ProductAttribute.vue      |   2 +-
 .../components/core/ProductBundleOptions.vue  |   2 +-
 .../components/core/ProductCustomOptions.vue  |   2 +-
 .../components/core/ProductGallery.vue        |   2 +-
 .../default/components/core/ProductLinks.vue  |   2 +-
 .../components/core/ProductListing.vue        |   2 +-
 .../default/components/core/ProductTile.vue   |   2 +-
 .../components/core/ProductsSlider.vue        |   2 +-
 .../default/components/core/SizeSelector.vue  |   2 +-
 src/themes/default/components/core/SortBy.vue |   2 +-
 .../components/core/ValidationError.vue       |   2 +-
 .../core/blocks/Auth/ForgotPass.vue           |   4 +-
 .../components/core/blocks/Auth/Login.vue     |   4 +-
 .../components/core/blocks/Auth/Register.vue  |   2 +-
 .../components/core/blocks/Auth/SignUp.vue    |   2 +-
 .../core/blocks/Category/Sidebar.vue          |   2 +-
 .../core/blocks/Checkout/CartSummary.vue      |   2 +-
 .../core/blocks/Checkout/OrderReview.vue      |   4 +-
 .../core/blocks/Checkout/Payment.vue          |   2 +-
 .../core/blocks/Checkout/PersonalDetails.vue  |   2 +-
 .../core/blocks/Checkout/Product.vue          |   2 +-
 .../core/blocks/Checkout/Shipping.vue         |   2 +-
 .../core/blocks/Checkout/ThankYouPage.vue     |   2 +-
 .../components/core/blocks/Footer/Footer.vue  |   2 +-
 .../core/blocks/Footer/Newsletter.vue         |   2 +-
 .../core/blocks/Form/BaseCheckbox.vue         |   2 +-
 .../components/core/blocks/Form/BaseInput.vue |   2 +-
 .../core/blocks/Form/BaseRadiobutton.vue      |   2 +-
 .../core/blocks/Form/BaseSelect.vue           |   2 +-
 .../core/blocks/Form/BaseTextarea.vue         |   2 +-
 .../core/blocks/Header/AccountIcon.vue        |   4 +-
 .../core/blocks/Header/CompareIcon.vue        |   2 +-
 .../core/blocks/Header/HamburgerIcon.vue      |   2 +-
 .../components/core/blocks/Header/Header.vue  |   2 +-
 .../core/blocks/Header/MicrocartIcon.vue      |   2 +-
 .../core/blocks/Header/ReturnIcon.vue         |   2 +-
 .../core/blocks/Header/SearchIcon.vue         |   2 +-
 .../core/blocks/Header/WishlistIcon.vue       |   2 +-
 .../core/blocks/MainSlider/MainSlider.vue     |   2 +-
 .../core/blocks/Microcart/Microcart.vue       |   2 +-
 .../core/blocks/Microcart/Product.vue         |   2 +-
 .../core/blocks/MyAccount/MyNewsletter.vue    |   2 +-
 .../core/blocks/MyAccount/MyOrder.vue         |   2 +-
 .../core/blocks/MyAccount/MyOrders.vue        |   2 +-
 .../core/blocks/MyAccount/MyProfile.vue       |   2 +-
 .../blocks/MyAccount/MyShippingDetails.vue    |   2 +-
 .../core/blocks/Product/Related.vue           |   2 +-
 .../core/blocks/SearchPanel/SearchPanel.vue   |   2 +-
 .../core/blocks/SidebarMenu/SidebarMenu.vue   |   4 +-
 .../core/blocks/SidebarMenu/SubCategory.vue   |   2 +-
 .../core/blocks/Wishlist/Product.vue          |   2 +-
 .../core/blocks/Wishlist/Wishlist.vue         |   2 +-
 src/themes/default/pages/Category.vue         |   2 +-
 src/themes/default/pages/Checkout.vue         |   2 +-
 src/themes/default/pages/Compare.vue          |   2 +-
 src/themes/default/pages/Home.vue             |   2 +-
 src/themes/default/pages/MyAccount.vue        |   4 +-
 src/themes/default/pages/PageNotFound.vue     |   2 +-
 src/themes/default/pages/Product.vue          |   2 +-
 src/themes/default/pages/Static.vue           |   2 +-
 src/themes/default/router/index.js            |   2 +-
 .../default/store/product-extensions.js       |   2 +-
 src/themes/default/store/ui-store.js          |   2 +-
 .../theme-starter/components/AddToCart.vue    |   2 +-
 .../components/Category/Sidebar.vue           |   2 +-
 .../components/Filters/ColorSelector.vue      |   2 +-
 .../components/Filters/GenericSelector.vue    |   2 +-
 .../components/Filters/PriceSelector.vue      |   2 +-
 .../components/Filters/SizeSelector.vue       |   2 +-
 .../components/Microcart/Microcart.vue        |   2 +-
 .../theme-starter/components/ProductTile.vue  |   2 +-
 src/themes/theme-starter/pages/Category.vue   |   2 +-
 src/themes/theme-starter/pages/Product.vue    |   2 +-
 src/themes/theme-starter/router/index.js      |   2 +-
 .../theme-starter/store/product-extensions.js |   2 +-
 src/themes/theme-starter/store/ui-store.js    |   2 +-
 yarn.lock                                     | 972 +++++++++++++++++-
 136 files changed, 1124 insertions(+), 340 deletions(-)

diff --git a/core/api/cart/test/TestInstance.vue b/core/api/cart/test/TestInstance.vue
index 954f142d4f..3e11527604 100644
--- a/core/api/cart/test/TestInstance.vue
+++ b/core/api/cart/test/TestInstance.vue
@@ -10,14 +10,14 @@
 
 <script>
 // Just import the features that you need in the view grouped in modules
-import {
-  addToCart,
-  removeFromCart,
-  productsInCart,
+import { 
+  addToCart, 
+  removeFromCart, 
+  productsInCart, 
   closeMicrocart,
   openMicrocart,
   isMicrocartOpen
-} from '@vue-storefront/core/api/cart'
+} from 'core/api/cart'
 
 export default {
   data () {
@@ -27,9 +27,9 @@ export default {
   },
   // And register them as a mixins
   mixins: [
-    addToCart,
-    removeFromCart,
-    productsInCart,
+    addToCart, 
+    removeFromCart, 
+    productsInCart, 
     closeMicrocart,
     openMicrocart,
     isMicrocartOpen
diff --git a/core/api/wishlist/test/TestInstance.vue b/core/api/wishlist/test/TestInstance.vue
index a82332784f..63bd628606 100644
--- a/core/api/wishlist/test/TestInstance.vue
+++ b/core/api/wishlist/test/TestInstance.vue
@@ -11,7 +11,7 @@
 
 <script>
 // Just import the features that you need in the view grouped in modules
-import {
+import { 
   addToWishlist,
   removeFromWishlist,
   clearWishlist,
@@ -19,7 +19,7 @@ import {
   openWishlist,
   closeWishlist,
   isWishlistOpen
-} from '@vue-storefront/core/api/wishlist'
+} from 'core/api/wishlist'
 
 export default {
   data () {
diff --git a/core/api/wishlist/test/TestInstanceForLoadTest.vue b/core/api/wishlist/test/TestInstanceForLoadTest.vue
index 7462e77f99..cc4a290f32 100644
--- a/core/api/wishlist/test/TestInstanceForLoadTest.vue
+++ b/core/api/wishlist/test/TestInstanceForLoadTest.vue
@@ -3,8 +3,10 @@
 </template>
 
 <script>
-// Import the features you need in the view grouped in modules
-import { loadWishlist } from '@vue-storefront/core/api/wishlist'
+// Just import the features that you need in the view grouped in modules
+import { 
+  loadWishlist
+} from 'core/api/wishlist'
 
 export default {
   mixins: [
diff --git a/core/app.js b/core/app.js
index 0b5ff6e124..73ed97afed 100755
--- a/core/app.js
+++ b/core/app.js
@@ -1,27 +1,27 @@
+import union from 'lodash-es/union'
 import Vue from 'vue'
+import App from 'theme/App'
+import store from '@vue-storefront/store'
+import router from 'core/router'
+import config from 'config'
 import { sync } from 'vuex-router-sync'
+import EventBus from 'core/plugins/event-bus'
+
+import { registerTheme, plugins, mixins, filters } from 'core/lib/themes'
+import registerExtensions from 'core/lib/extensions'
+import extensionEntryPoints from 'src/extensions'
+import themeExtensionEntryPoints from 'theme/extensions'
 import VueObserveVisibility from 'vue-observe-visibility'
-import { union } from 'lodash-es'
-import config from 'config'
+
 import VueLazyload from 'vue-lazyload'
 import Vuelidate from 'vuelidate'
 import Meta from 'vue-meta'
+import i18n from 'core/lib/i18n'
+import shippingMethods from 'core/resource/shipping_methods.json'
+import { prepareStoreView } from './store/lib/multistore'
 
-import router from '@vue-storefront/core/router'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
-import { registerTheme, plugins, mixins, filters } from '@vue-storefront/core/lib/themes'
-import registerExtensions from '@vue-storefront/core/lib/extensions'
-import i18n from '@vue-storefront/core/lib/i18n'
-import shippingMethods from '@vue-storefront/core/resource/shipping_methods.json'
-
-import store from '@vue-storefront/store'
-import coreModules from '@vue-storefront/store/modules'
-import { prepareStoreView } from '@vue-storefront/store/lib/multistore'
-
-import App from 'theme/App'
+import coreModules from './store/modules'
 import themeModules from 'theme/store'
-import themeExtensionEntryPoints from 'theme/extensions'
-import extensionEntryPoints from 'src/extensions'
 
 if (!global.$VS) global.$VS = {}
 
diff --git a/core/build/webpack.base.config.js b/core/build/webpack.base.config.js
index b78858a19b..2846045acd 100644
--- a/core/build/webpack.base.config.js
+++ b/core/build/webpack.base.config.js
@@ -129,8 +129,7 @@ module.exports = {
       {
         test: /\.js$/,
         loader: 'babel-loader',
-        exclude: /node_modules/,
-        include: /node_modules\/@vue-storefront/
+        exclude: /node_modules/
       },
       {
         test: /\.(png|jpg|gif|svg)$/,
diff --git a/core/client-entry.js b/core/client-entry.js
index 32220193f9..34be67c2b5 100755
--- a/core/client-entry.js
+++ b/core/client-entry.js
@@ -1,18 +1,16 @@
-import * as localForage from 'localforage'
-import { union } from 'lodash-es'
-import sizeof from 'object-sizeof'
+import { createApp } from './app'
 import config from 'config'
-
-import { createApp } from '@vue-storefront/core/app'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
-
-import rootStore from '@vue-storefront/store'
 import { execute } from '@vue-storefront/store/lib/task'
 import UniversalStorage from '@vue-storefront/store/lib/storage'
-import i18n from '@vue-storefront/core/lib/i18n'
+import * as localForage from 'localforage'
+import EventBus from 'core/plugins/event-bus'
+import union from 'lodash-es/union'
+import sizeof from 'object-sizeof'
+import rootStore from '@vue-storefront/store'
 import { prepareStoreView, storeCodeFromRoute, currentStoreView } from '@vue-storefront/store/lib/multistore'
+import i18n from 'core/lib/i18n'
 
-require('@vue-storefront/core/service-worker-registration') // register the service worker
+require('./service-worker-registration') // register the service worker
 
 const { app, router, store } = createApp()
 global.$VS.isSSR = false
diff --git a/core/components/AddToCart.js b/core/components/AddToCart.js
index fa2122e2c0..fa2350a8f6 100644
--- a/core/components/AddToCart.js
+++ b/core/components/AddToCart.js
@@ -1,4 +1,4 @@
-import { addToCart } from '@vue-storefront/core/api/cart'
+import { addToCart } from 'core/api/cart'
 
 export default {
   name: 'AddToCart',
diff --git a/core/components/Modal.js b/core/components/Modal.js
index 538db60a3a..c2e8eafc6e 100644
--- a/core/components/Modal.js
+++ b/core/components/Modal.js
@@ -1,5 +1,5 @@
 import { mapMutations } from 'vuex'
-import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
+import onEscapePress from 'core/mixins/onEscapePress'
 
 export default {
   name: 'Modal',
diff --git a/core/components/ProductBundleOptions.js b/core/components/ProductBundleOptions.js
index 4254f882d3..185306d2ba 100644
--- a/core/components/ProductBundleOptions.js
+++ b/core/components/ProductBundleOptions.js
@@ -1,7 +1,7 @@
 import { mapMutations } from 'vuex'
-import * as types from '@vue-storefront/store/mutation-types'
-import rootStore from '@vue-storefront/store'
-import i18n from '@vue-storefront/core/lib/i18n'
+import * as types from 'core/store/mutation-types'
+import rootStore from 'core/store'
+import i18n from 'core/lib/i18n'
 
 function _defaultOptionValue (co, field = 'id') {
   if (co.product_links && co.product_links.length) {
diff --git a/core/components/ProductCustomOptions.js b/core/components/ProductCustomOptions.js
index 3828e9ec93..1acb376aa8 100644
--- a/core/components/ProductCustomOptions.js
+++ b/core/components/ProductCustomOptions.js
@@ -1,7 +1,7 @@
 import { mapMutations } from 'vuex'
-import * as types from '@vue-storefront/store/mutation-types'
-import rootStore from '@vue-storefront/store'
-import i18n from '@vue-storefront/core/lib/i18n'
+import * as types from 'core/store/mutation-types'
+import rootStore from 'core/store'
+import i18n from 'core/lib/i18n'
 
 function _defaultOptionValue (co) {
   switch (co.type) {
diff --git a/core/components/ProductTile.js b/core/components/ProductTile.js
index b2ef7aac33..b02f4205e7 100644
--- a/core/components/ProductTile.js
+++ b/core/components/ProductTile.js
@@ -1,5 +1,5 @@
 import { productThumbnailPath } from '@vue-storefront/store/helpers'
-import imgPlaceholder from '@vue-storefront/core/directives/imgPlaceholder'
+import imgPlaceholder from 'core/directives/imgPlaceholder'
 
 export default {
   name: 'ProductTile',
diff --git a/core/components/blocks/Auth/Login.js b/core/components/blocks/Auth/Login.js
index 94f9366f71..97ace8a81f 100644
--- a/core/components/blocks/Auth/Login.js
+++ b/core/components/blocks/Auth/Login.js
@@ -1,4 +1,5 @@
-import i18n from '@vue-storefront/core/lib/i18n'
+
+import i18n from 'core/lib/i18n'
 
 export default {
   name: 'Login',
diff --git a/core/components/blocks/Auth/Register.js b/core/components/blocks/Auth/Register.js
index eb448e52ff..aa7cd79eac 100644
--- a/core/components/blocks/Auth/Register.js
+++ b/core/components/blocks/Auth/Register.js
@@ -1,4 +1,4 @@
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   name: 'Register',
diff --git a/core/components/blocks/Checkout/CartSummary.js b/core/components/blocks/Checkout/CartSummary.js
index c0721af0af..f4b54a5326 100644
--- a/core/components/blocks/Checkout/CartSummary.js
+++ b/core/components/blocks/Checkout/CartSummary.js
@@ -1,5 +1,5 @@
 import { mapGetters } from 'vuex'
-import Microcart from '@vue-storefront/core/components/blocks/Microcart/Microcart'
+import Microcart from 'core/components/blocks/Microcart/Microcart'
 
 export default {
   name: 'CartSummary',
diff --git a/core/components/blocks/Checkout/OrderReview.js b/core/components/blocks/Checkout/OrderReview.js
index 93c3dafa86..c73e020157 100644
--- a/core/components/blocks/Checkout/OrderReview.js
+++ b/core/components/blocks/Checkout/OrderReview.js
@@ -1,4 +1,4 @@
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   name: 'OrderReview',
diff --git a/core/components/blocks/Checkout/Payment.js b/core/components/blocks/Checkout/Payment.js
index ce77fbb992..7c3e88446d 100644
--- a/core/components/blocks/Checkout/Payment.js
+++ b/core/components/blocks/Checkout/Payment.js
@@ -1,5 +1,5 @@
 import { mapState, mapGetters } from 'vuex'
-import Countries from '@vue-storefront/core/resource/countries.json'
+import Countries from 'core/resource/countries.json'
 
 export default {
   name: 'Payment',
diff --git a/core/components/blocks/Checkout/Shipping.js b/core/components/blocks/Checkout/Shipping.js
index 36a1bf018b..11ba0d7fe3 100644
--- a/core/components/blocks/Checkout/Shipping.js
+++ b/core/components/blocks/Checkout/Shipping.js
@@ -1,5 +1,5 @@
 import { mapState, mapGetters } from 'vuex'
-import Countries from '@vue-storefront/core/resource/countries.json'
+import Countries from 'core/resource/countries.json'
 
 export default {
   name: 'Shipping',
diff --git a/core/components/blocks/Header/AccountIcon.js b/core/components/blocks/Header/AccountIcon.js
index 57ddb165bb..9342935e67 100644
--- a/core/components/blocks/Header/AccountIcon.js
+++ b/core/components/blocks/Header/AccountIcon.js
@@ -1,5 +1,5 @@
 import { mapState } from 'vuex'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   name: 'AccountIcon',
diff --git a/core/components/blocks/Header/MicrocartIcon.js b/core/components/blocks/Header/MicrocartIcon.js
index b8d2119847..eea2e1e691 100644
--- a/core/components/blocks/Header/MicrocartIcon.js
+++ b/core/components/blocks/Header/MicrocartIcon.js
@@ -1,5 +1,5 @@
 import { mapGetters } from 'vuex'
-import { openMicrocart, isMicrocartOpen } from '@vue-storefront/core/api/cart'
+import { openMicrocart, isMicrocartOpen } from 'core/api/cart'
 
 export default {
   name: 'MicrocartIcon',
diff --git a/core/components/blocks/Header/WishlistIcon.js b/core/components/blocks/Header/WishlistIcon.js
index 68482a555f..c2b7c2baf4 100644
--- a/core/components/blocks/Header/WishlistIcon.js
+++ b/core/components/blocks/Header/WishlistIcon.js
@@ -1,4 +1,4 @@
-import { openWishlist, closeWishlist, isWishlistOpen } from '@vue-storefront/core/api/wishlist'
+import { openWishlist, closeWishlist, isWishlistOpen } from 'core/api/wishlist'
 
 export default {
   name: 'WishlistIcon',
diff --git a/core/components/blocks/Microcart/Microcart.js b/core/components/blocks/Microcart/Microcart.js
index 0e34149411..f3f0a8ae41 100644
--- a/core/components/blocks/Microcart/Microcart.js
+++ b/core/components/blocks/Microcart/Microcart.js
@@ -3,10 +3,10 @@ import { mapGetters } from 'vuex'
 import VueOfflineMixin from 'vue-offline/mixin'
 
 // Core dependecies
-import { productsInCart, closeMicrocart, isMicrocartOpen, removeFromCart } from '@vue-storefront/core/api/cart'
+import { productsInCart, closeMicrocart, isMicrocartOpen, removeFromCart } from 'core/api/cart'
 
 // Core mixins
-import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
+import onEscapePress from 'core/mixins/onEscapePress'
 
 export default {
   name: 'Microcart',
diff --git a/core/components/blocks/MyAccount/MyProfile.js b/core/components/blocks/MyAccount/MyProfile.js
index c5a362179c..69f9af6e86 100644
--- a/core/components/blocks/MyAccount/MyProfile.js
+++ b/core/components/blocks/MyAccount/MyProfile.js
@@ -1,4 +1,4 @@
-import Countries from '@vue-storefront/core/resource/countries.json'
+import Countries from 'core/resource/countries.json'
 
 export default {
   name: 'MyProfile',
diff --git a/core/components/blocks/MyAccount/MyShippingDetails.js b/core/components/blocks/MyAccount/MyShippingDetails.js
index 4fa1bcade3..0d658dc1e0 100644
--- a/core/components/blocks/MyAccount/MyShippingDetails.js
+++ b/core/components/blocks/MyAccount/MyShippingDetails.js
@@ -1,4 +1,4 @@
-import Countries from '@vue-storefront/core/resource/countries.json'
+import Countries from 'core/resource/countries.json'
 
 export default {
   name: 'MyShippingDetails',
diff --git a/core/components/blocks/SearchPanel/SearchPanel.js b/core/components/blocks/SearchPanel/SearchPanel.js
index bceea0841e..114c98e915 100644
--- a/core/components/blocks/SearchPanel/SearchPanel.js
+++ b/core/components/blocks/SearchPanel/SearchPanel.js
@@ -1,7 +1,7 @@
 import bodybuilder from 'bodybuilder'
 import { mapState } from 'vuex'
-import i18n from '@vue-storefront/core/lib/i18n'
-import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
+import i18n from 'core/lib/i18n'
+import onEscapePress from 'core/mixins/onEscapePress'
 import config from 'config'
 
 export default {
diff --git a/core/components/blocks/SidebarMenu/SidebarMenu.js b/core/components/blocks/SidebarMenu/SidebarMenu.js
index 5441341ce9..9e79146c11 100644
--- a/core/components/blocks/SidebarMenu/SidebarMenu.js
+++ b/core/components/blocks/SidebarMenu/SidebarMenu.js
@@ -1,5 +1,5 @@
 import { mapState } from 'vuex'
-import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
+import onEscapePress from 'core/mixins/onEscapePress'
 
 export default {
   name: 'SidebarMenu',
diff --git a/core/components/blocks/Wishlist/Product.js b/core/components/blocks/Wishlist/Product.js
index 71fd281bba..3bb9d0f280 100644
--- a/core/components/blocks/Wishlist/Product.js
+++ b/core/components/blocks/Wishlist/Product.js
@@ -1,4 +1,4 @@
-import { removeFromWishlist, closeWishlist } from '@vue-storefront/core/api/wishlist'
+import { removeFromWishlist, closeWishlist } from 'core/api/wishlist'
 
 export default {
   name: 'Product',
diff --git a/core/components/blocks/Wishlist/Wishlist.js b/core/components/blocks/Wishlist/Wishlist.js
index 7499d62abf..af18e85362 100644
--- a/core/components/blocks/Wishlist/Wishlist.js
+++ b/core/components/blocks/Wishlist/Wishlist.js
@@ -1,5 +1,5 @@
-import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
-import { loadWishlist, productsInWishlist, closeWishlist, isWishlistOpen } from '@vue-storefront/core/api/wishlist'
+import onEscapePress from 'core/mixins/onEscapePress'
+import { loadWishlist, productsInWishlist, closeWishlist, isWishlistOpen } from 'core/api/wishlist'
 
 export default {
   name: 'Wishlist',
diff --git a/core/lib/i18n-utils.js b/core/lib/i18n-utils.js
index b5a1830337..5aa5f098aa 100644
--- a/core/lib/i18n-utils.js
+++ b/core/lib/i18n-utils.js
@@ -1,4 +1,4 @@
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 const loadedLanguages = ['en-US']
 
diff --git a/core/lib/i18n.js b/core/lib/i18n.js
index bb9935e46d..5e77a227f3 100644
--- a/core/lib/i18n.js
+++ b/core/lib/i18n.js
@@ -1,7 +1,7 @@
-import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 import config from 'config'
-import { loadLanguageAsync } from '@vue-storefront/core/lib/i18n-utils'
+import Vue from 'vue'
+import { loadLanguageAsync } from 'core/lib/i18n-utils'
 
 Vue.use(VueI18n)
 
diff --git a/core/lib/themes.js b/core/lib/themes.js
index 99c3800e47..f9095e1df9 100644
--- a/core/lib/themes.js
+++ b/core/lib/themes.js
@@ -1,8 +1,8 @@
-import { merge } from 'lodash-es'
-import * as corePlugins from '@vue-storefront/core/plugins'
-import * as coreMixins from '@vue-storefront/core/mixins'
-import * as coreFilters from '@vue-storefront/core/filters'
+import merge from 'lodash-es/merge'
+import * as corePlugins from 'core/plugins'
+import * as coreMixins from 'core/mixins'
 import * as themeMixins from 'theme/mixins'
+import * as coreFilters from 'core/filters'
 import * as themeFilters from 'theme/filters'
 
 /**
diff --git a/core/mixins/composite/index.js b/core/mixins/composite/index.js
index bfbdfd53d0..bf95c4a0a7 100644
--- a/core/mixins/composite/index.js
+++ b/core/mixins/composite/index.js
@@ -1,4 +1,4 @@
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import EventBus from 'core/plugins/event-bus'
 
 export default {
   beforeCreated () {
diff --git a/core/package.json b/core/package.json
index 7167c11e19..2d241d1747 100644
--- a/core/package.json
+++ b/core/package.json
@@ -4,86 +4,10 @@
   "description": "Vue Storefront core",
   "license": "MIT",
   "main": "app.js",
+  "directories": {
+    "lib": "lib"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "@vue-storefront/store": "^1.1.0",
-    "app-root-path": "^2.0.1",
-    "bodybuilder": "^2.2.1",
-    "config": "^1.30.0",
-    "d3-dsv": "^1.0.8",
-    "detect-installed": "^2.0.4",
-    "express": "^4.14.0",
-    "he": "^1.1.1",
-    "inquirer": "^3.3.0",
-    "jsonfile": "^4.0.0",
-    "localforage": "^1.7.2",
-    "lodash-es": "^4.17.10",
-    "lru-cache": "^4.0.1",
-    "mkdirp": "^0.5.1",
-    "object-sizeof": "^1.2.0",
-    "url-parse": "^1.2.0",
-    "vue": "^2.5.2",
-    "vue-carousel": "^0.6.9",
-    "vue-i18n": "^7.4.2",
-    "vue-lazyload": "^1.2.6",
-    "vue-meta": "^1.4.3",
-    "vue-observe-visibility": "^0.3.1",
-    "vue-offline": "^1.0.8",
-    "vue-router": "^3.0.1",
-    "vue-server-renderer": "^2.5.2",
-    "vuelidate": "^0.6.2",
-    "vuex": "^3.0.0",
-    "vuex-router-sync": "^5.0.0"
-  },
-  "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.19",
-    "autoprefixer": "^8.6.2",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.3",
-    "babel-preset-env": "^1.6.x",
-    "babel-preset-stage-2": "^6.13.0",
-    "case-sensitive-paths-webpack-plugin": "^2.1.2",
-    "command-exists": "^1.2.2",
-    "commander": "^2.15.1",
-    "cross-env": "^3.1.4",
-    "css-loader": "^1.0.0",
-    "empty-dir": "^1.0.0",
-    "eslint": "^4.16.0",
-    "eslint-config-standard": "^11.0.0",
-    "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^2.0.0",
-    "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-promise": "^3.7.0",
-    "eslint-plugin-standard": "^3.1.0",
-    "eslint-plugin-vue": "^4.5.0",
-    "eslint-plugin-vue-storefront": "^0.0.1",
-    "file-loader": "^1.1.11",
-    "fs-exists-sync": "^0.1.0",
-    "html-webpack-plugin": "^3.2.0",
-    "is-windows": "^1.0.1",
-    "markdown-to-vue-loader": "^1.0.0",
-    "memory-fs": "^0.4.1",
-    "node-sass": "^4.9.2",
-    "phantomjs-prebuilt": "^2.1.10",
-    "postcss-flexbugs-fixes": "^3.3.1",
-    "postcss-loader": "^2.1.5",
-    "print-message": "^2.1.0",
-    "sass-loader": "^7.0.3",
-    "shelljs": "^0.8.1",
-    "sw-precache-webpack-plugin": "^0.11.5",
-    "url-loader": "^1.0.1",
-    "val-loader": "^1.1.1",
-    "vue-eslint-parser": "^2.0.3",
-    "vue-loader": "^15.2.6",
-    "vue-ssr-webpack-plugin": "^3.0.0",
-    "vue-template-compiler": "^2.5.16",
-    "webpack": "^4.16.3",
-    "webpack-cli": "^2.1.3",
-    "webpack-dev-middleware": "^3.1.3",
-    "webpack-hot-middleware": "^2.22.3",
-    "webpack-merge": "^4.1.3"
   }
 }
diff --git a/core/pages/Category.js b/core/pages/Category.js
index 005fc2501f..cd39dcae09 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -3,13 +3,13 @@ import toString from 'lodash-es/toString'
 
 // Core dependecies
 import config from 'config'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import EventBus from 'core/plugins/event-bus'
 import { baseFilterProductsQuery, buildFilterProductsQuery } from '@vue-storefront/store/helpers'
-import { htmlDecode } from '@vue-storefront/core/filters/html-decode'
-import i18n from '@vue-storefront/core/lib/i18n'
+import { htmlDecode } from 'core/filters/html-decode'
+import i18n from 'core/lib/i18n'
 
 // Core mixins
-import Composite from '@vue-storefront/core/mixins/composite'
+import Composite from 'core/mixins/composite'
 
 export default {
   name: 'Category',
diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index f9ae4d2bd0..01f746ac58 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -2,11 +2,11 @@
 import VueOfflineMixin from 'vue-offline/mixin'
 
 // Core dependecies
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 import config from 'config'
 
 // Core mixins
-import Composite from '@vue-storefront/core/mixins/composite'
+import Composite from 'core/mixins/composite'
 import { currentStoreView } from '@vue-storefront/store/lib/multistore'
 
 export default {
diff --git a/core/pages/Compare.js b/core/pages/Compare.js
index 80c4d3928b..a4dbefde71 100644
--- a/core/pages/Compare.js
+++ b/core/pages/Compare.js
@@ -1,6 +1,6 @@
 import { mapState, mapGetters } from 'vuex'
-import i18n from '@vue-storefront/core/lib/i18n'
-import Composite from '@vue-storefront/core/mixins/composite'
+import i18n from 'core/lib/i18n'
+import Composite from 'core/mixins/composite'
 
 export default {
   name: 'Compare',
diff --git a/core/pages/Home.js b/core/pages/Home.js
index 05e39e7e68..102a945562 100644
--- a/core/pages/Home.js
+++ b/core/pages/Home.js
@@ -2,11 +2,11 @@
 import { mapGetters } from 'vuex'
 
 // Core dependecies
-import EventBus from '@vue-storefront/core/plugins/event-bus'
-import i18n from '@vue-storefront/core/lib/i18n'
+import EventBus from 'core/plugins/event-bus'
+import i18n from 'core/lib/i18n'
 
 // Core mixins
-import Composite from '@vue-storefront/core/mixins/composite'
+import Composite from 'core/mixins/composite'
 
 export default {
   name: 'Home',
diff --git a/core/pages/MyAccount.js b/core/pages/MyAccount.js
index a46dba4141..f0554ca9bf 100644
--- a/core/pages/MyAccount.js
+++ b/core/pages/MyAccount.js
@@ -1,8 +1,8 @@
 // Core dependecies
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 // Core mixins
-import Composite from '@vue-storefront/core/mixins/composite'
+import Composite from 'core/mixins/composite'
 
 export default {
   name: 'MyAccount',
diff --git a/core/pages/PageNotFound.js b/core/pages/PageNotFound.js
index 48f9256a2e..a7b09e9697 100644
--- a/core/pages/PageNotFound.js
+++ b/core/pages/PageNotFound.js
@@ -2,11 +2,11 @@
 import builder from 'bodybuilder'
 
 // Core dependecies
-import i18n from '@vue-storefront/core/lib/i18n'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import i18n from 'core/lib/i18n'
+import EventBus from 'core/plugins/event-bus'
 
 // Core mixins
-import Composite from '@vue-storefront/core/mixins/composite'
+import Composite from 'core/mixins/composite'
 
 export default {
   name: 'PageNotFound',
diff --git a/core/pages/Product.js b/core/pages/Product.js
index 03061b790d..9b274101c7 100644
--- a/core/pages/Product.js
+++ b/core/pages/Product.js
@@ -4,14 +4,14 @@ import groupBy from 'lodash-es/groupBy'
 import uniqBy from 'lodash-es/uniqBy'
 
 // Core dependecies
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 import config from 'config'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
-import { htmlDecode } from '@vue-storefront/core/filters/html-decode'
+import EventBus from 'core/plugins/event-bus'
+import { htmlDecode } from 'core/filters/html-decode'
 
 // Core mixins
-import Composite from '@vue-storefront/core/mixins/composite'
-import { addToWishlist, removeFromWishlist } from '@vue-storefront/core/api/wishlist'
+import Composite from 'core/mixins/composite'
+import { addToWishlist, removeFromWishlist } from 'core/api/wishlist'
 
 export default {
   name: 'Product',
diff --git a/core/server-entry.js b/core/server-entry.js
index 6a52d4e25a..376dda0bc7 100755
--- a/core/server-entry.js
+++ b/core/server-entry.js
@@ -1,10 +1,8 @@
-import config from 'config'
-import { union } from 'lodash-es'
-
-import { createApp } from '@vue-storefront/core/app'
-import { HttpError } from '@vue-storefront/core/lib/exceptions'
+import { createApp } from './app'
 import { prepareStoreView, storeCodeFromRoute } from '@vue-storefront/store/lib/multistore'
-
+import config from 'config'
+import union from 'lodash-es/union'
+import { HttpError } from 'core/lib/exceptions'
 global.$VS.isSSR = true
 
 function _commonErrorHandler (err, reject) {
diff --git a/core/store/lib/multistore.js b/core/store/lib/multistore.js
index 0f681cafc8..2f1e1f8da3 100644
--- a/core/store/lib/multistore.js
+++ b/core/store/lib/multistore.js
@@ -1,7 +1,7 @@
-import config from 'config'
 import store from '../'
 import EventBus from './event-bus'
-import { loadLanguageAsync } from '@vue-storefront/core/lib/i18n-utils'
+import config from 'config'
+import { loadLanguageAsync } from 'core/lib/i18n-utils'
 
 export function currentStoreView () {
   return global.$VS.storeView
diff --git a/core/store/modules/stock/index.js b/core/store/modules/stock/index.js
index fc4284c624..6787af55a1 100644
--- a/core/store/modules/stock/index.js
+++ b/core/store/modules/stock/index.js
@@ -1,9 +1,9 @@
-import i18n from '@vue-storefront/core/lib/i18n'
 import actions from './actions'
 import store from '../../'
 import EventBus from '../../lib/event-bus'
 import * as types from '../../mutation-types'
 import config from '../../lib/config'
+import i18n from 'core/lib/i18n'
 
 EventBus.$on('stock-after-check', (event) => { // example stock check callback
   setTimeout(() => {
diff --git a/package.json b/package.json
index a49b0e301c..6b0cae8e75 100755
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "localforage": "^1.7.2",
     "lru-cache": "^4.0.1",
     "mkdirp": "^0.5.1",
+    "npm": "^5.7.1",
     "object-hash": "^1.2.0",
     "object-sizeof": "^1.2.0",
     "pm2": "^2.10.4",
@@ -158,7 +159,6 @@
     ]
   },
   "workspaces": [
-    "core",
     "core/store",
     "src/extensions/*",
     "src/themes/*"
diff --git a/src/extensions/google-analytics/index.js b/src/extensions/google-analytics/index.js
index e75e68f957..be4cc4a865 100644
--- a/src/extensions/google-analytics/index.js
+++ b/src/extensions/google-analytics/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import VueAnalytics from 'vue-analytics'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import EventBus from 'core/plugins/event-bus'
 
 import extensionStore from './store'
 import extensionRoutes from './router'
diff --git a/src/extensions/mailchimp-subscribe/index.js b/src/extensions/mailchimp-subscribe/index.js
index c5c0a934e1..9983970b86 100755
--- a/src/extensions/mailchimp-subscribe/index.js
+++ b/src/extensions/mailchimp-subscribe/index.js
@@ -1,6 +1,6 @@
 import extensionStore from './store'
 import extensionRoutes from './router'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import EventBus from 'core/plugins/event-bus'
 
 const EXTENSION_KEY = 'mailchimp-subscribe'
 
diff --git a/src/extensions/payment-backend-methods/index.js b/src/extensions/payment-backend-methods/index.js
index 899051c3f1..ac0bff9a64 100644
--- a/src/extensions/payment-backend-methods/index.js
+++ b/src/extensions/payment-backend-methods/index.js
@@ -1,4 +1,4 @@
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import EventBus from 'core/plugins/event-bus'
 
 import extensionStore from './store'
 import extensionRoutes from './router'
diff --git a/src/extensions/payment-cash-on-delivery/index.js b/src/extensions/payment-cash-on-delivery/index.js
index 4bde8f6e27..6a3fb5747d 100755
--- a/src/extensions/payment-cash-on-delivery/index.js
+++ b/src/extensions/payment-cash-on-delivery/index.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import EventBus from 'core/plugins/event-bus'
 
 import extensionStore from './store'
 import extensionRoutes from './router'
diff --git a/src/extensions/template/index.js b/src/extensions/template/index.js
index 3c88857fde..58f01430fc 100755
--- a/src/extensions/template/index.js
+++ b/src/extensions/template/index.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import EventBus from '@vue-storefront/core/plugins/event-bus'
+import EventBus from 'core/plugins/event-bus'
 
 import extensionStore from './store'
 import extensionRoutes from './router'
diff --git a/src/themes/default/components/core/AddToCart.vue b/src/themes/default/components/core/AddToCart.vue
index 5e6a69c926..16a3079363 100644
--- a/src/themes/default/components/core/AddToCart.vue
+++ b/src/themes/default/components/core/AddToCart.vue
@@ -7,8 +7,8 @@
 <script>
 import focusClean from 'theme/components/theme/directives/focusClean'
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
-import addToCart from '@vue-storefront/core/components/AddToCart'
-import { formatProductMessages } from '@vue-storefront/core/filters/product-messages'
+import addToCart from 'core/components/AddToCart'
+import { formatProductMessages } from 'core/filters/product-messages'
 
 export default {
   mixins: [addToCart],
diff --git a/src/themes/default/components/core/Breadcrumbs.vue b/src/themes/default/components/core/Breadcrumbs.vue
index 61082cf399..a9039d2367 100644
--- a/src/themes/default/components/core/Breadcrumbs.vue
+++ b/src/themes/default/components/core/Breadcrumbs.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import Breadcrumbs from '@vue-storefront/core/components/Breadcrumbs'
+import Breadcrumbs from 'core/components/Breadcrumbs'
 
 export default {
   mixins: [Breadcrumbs]
diff --git a/src/themes/default/components/core/ColorSelector.vue b/src/themes/default/components/core/ColorSelector.vue
index ab03b4d40b..a95cf488a0 100644
--- a/src/themes/default/components/core/ColorSelector.vue
+++ b/src/themes/default/components/core/ColorSelector.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import GenericSelector from '@vue-storefront/core/components/GenericSelector'
+import GenericSelector from 'core/components/GenericSelector'
 
 export default {
   mixins: [GenericSelector],
diff --git a/src/themes/default/components/core/CookieNotification.vue b/src/themes/default/components/core/CookieNotification.vue
index ff41e9a726..a7bbe457b1 100644
--- a/src/themes/default/components/core/CookieNotification.vue
+++ b/src/themes/default/components/core/CookieNotification.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 export default {
   props: {
     detailsLinkText: {
diff --git a/src/themes/default/components/core/GenericSelector.vue b/src/themes/default/components/core/GenericSelector.vue
index ede8d52400..e570c3a021 100644
--- a/src/themes/default/components/core/GenericSelector.vue
+++ b/src/themes/default/components/core/GenericSelector.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import GenericSelector from '@vue-storefront/core/components/GenericSelector'
+import GenericSelector from 'core/components/GenericSelector'
 export default {
   mixins: [GenericSelector]
 }
diff --git a/src/themes/default/components/core/Loader.vue b/src/themes/default/components/core/Loader.vue
index 55cf237cf7..56742ac3ad 100644
--- a/src/themes/default/components/core/Loader.vue
+++ b/src/themes/default/components/core/Loader.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import Loader from '@vue-storefront/core/components/Loader'
+import Loader from 'core/components/Loader'
 
 export default {
   mixins: [Loader]
diff --git a/src/themes/default/components/core/Modal.vue b/src/themes/default/components/core/Modal.vue
index 07594b2c92..42a4206a77 100644
--- a/src/themes/default/components/core/Modal.vue
+++ b/src/themes/default/components/core/Modal.vue
@@ -34,7 +34,7 @@
 
 <script>
 import StaticContent from 'theme/components/theme/StaticContent'
-import Modal from '@vue-storefront/core/components/Modal'
+import Modal from 'core/components/Modal'
 
 export default {
   components: {
diff --git a/src/themes/default/components/core/NewsletterPopup.vue b/src/themes/default/components/core/NewsletterPopup.vue
index 5f13c5e068..843bbb7b6a 100644
--- a/src/themes/default/components/core/NewsletterPopup.vue
+++ b/src/themes/default/components/core/NewsletterPopup.vue
@@ -44,7 +44,7 @@ import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import Modal from 'theme/components/core/Modal'
 import BaseInput from 'theme/components/core/blocks/Form/BaseInput.vue'
 import { required, email } from 'vuelidate/lib/validators'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   data () {
diff --git a/src/themes/default/components/core/Notification.vue b/src/themes/default/components/core/Notification.vue
index 8884e5c7c8..88dbd26c08 100644
--- a/src/themes/default/components/core/Notification.vue
+++ b/src/themes/default/components/core/Notification.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import Notification from '@vue-storefront/core/components/Notification'
+import Notification from 'core/components/Notification'
 
 export default {
   mixins: [Notification]
diff --git a/src/themes/default/components/core/Overlay.vue b/src/themes/default/components/core/Overlay.vue
index d444663126..3a724e049a 100644
--- a/src/themes/default/components/core/Overlay.vue
+++ b/src/themes/default/components/core/Overlay.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import Overlay from '@vue-storefront/core/components/Overlay'
+import Overlay from 'core/components/Overlay'
 
 export default {
   mixins: [Overlay],
diff --git a/src/themes/default/components/core/PriceSelector.vue b/src/themes/default/components/core/PriceSelector.vue
index 9b1ee56cf8..c18a9d63b0 100644
--- a/src/themes/default/components/core/PriceSelector.vue
+++ b/src/themes/default/components/core/PriceSelector.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import PriceSelector from '@vue-storefront/core/components/PriceSelector'
+import PriceSelector from 'core/components/PriceSelector'
 
 export default {
   mixins: [PriceSelector]
diff --git a/src/themes/default/components/core/ProductAttribute.vue b/src/themes/default/components/core/ProductAttribute.vue
index 75ff523385..0ca76331b5 100644
--- a/src/themes/default/components/core/ProductAttribute.vue
+++ b/src/themes/default/components/core/ProductAttribute.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import ProductAttribute from '@vue-storefront/core/components/ProductAttribute'
+import ProductAttribute from 'core/components/ProductAttribute'
 
 export default {
   mixins: [ProductAttribute],
diff --git a/src/themes/default/components/core/ProductBundleOptions.vue b/src/themes/default/components/core/ProductBundleOptions.vue
index 54eb0867d2..d15bbbab21 100644
--- a/src/themes/default/components/core/ProductBundleOptions.vue
+++ b/src/themes/default/components/core/ProductBundleOptions.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import ProductBundleOptions from '@vue-storefront/core/components/ProductBundleOptions'
+import ProductBundleOptions from 'core/components/ProductBundleOptions'
 
 export default {
   mixins: [ProductBundleOptions]
diff --git a/src/themes/default/components/core/ProductCustomOptions.vue b/src/themes/default/components/core/ProductCustomOptions.vue
index 2b836db0e1..1c8e3af647 100644
--- a/src/themes/default/components/core/ProductCustomOptions.vue
+++ b/src/themes/default/components/core/ProductCustomOptions.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import ProductCustomOptions from '@vue-storefront/core/components/ProductCustomOptions'
+import ProductCustomOptions from 'core/components/ProductCustomOptions'
 
 export default {
   mixins: [ProductCustomOptions]
diff --git a/src/themes/default/components/core/ProductGallery.vue b/src/themes/default/components/core/ProductGallery.vue
index eb8e0f50c4..72bd61cdaa 100644
--- a/src/themes/default/components/core/ProductGallery.vue
+++ b/src/themes/default/components/core/ProductGallery.vue
@@ -83,7 +83,7 @@
 </template>
 
 <script>
-import ProductGallery from '@vue-storefront/core/components/ProductGallery'
+import ProductGallery from 'core/components/ProductGallery'
 import NoSSR from 'vue-no-ssr'
 import VueOfflineMixin from 'vue-offline/mixin'
 
diff --git a/src/themes/default/components/core/ProductLinks.vue b/src/themes/default/components/core/ProductLinks.vue
index 199d707d10..08a5ef5837 100644
--- a/src/themes/default/components/core/ProductLinks.vue
+++ b/src/themes/default/components/core/ProductLinks.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import ProductLinks from '@vue-storefront/core/components/ProductLinks'
+import ProductLinks from 'core/components/ProductLinks'
 export default {
   mixins: [ProductLinks]
 }
diff --git a/src/themes/default/components/core/ProductListing.vue b/src/themes/default/components/core/ProductListing.vue
index 15a51d4184..a33e6a577a 100644
--- a/src/themes/default/components/core/ProductListing.vue
+++ b/src/themes/default/components/core/ProductListing.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import ProductListing from '@vue-storefront/core/components/ProductListing'
+import ProductListing from 'core/components/ProductListing'
 import ProductTile from 'theme/components/core/ProductTile'
 let lastHero = 0
 export default {
diff --git a/src/themes/default/components/core/ProductTile.vue b/src/themes/default/components/core/ProductTile.vue
index 13348c4b00..28c84dfb37 100644
--- a/src/themes/default/components/core/ProductTile.vue
+++ b/src/themes/default/components/core/ProductTile.vue
@@ -59,7 +59,7 @@
 <script>
 import config from 'config'
 import rootStore from '@vue-storefront/store'
-import ProductTile from '@vue-storefront/core/components/ProductTile'
+import ProductTile from 'core/components/ProductTile'
 
 export default {
   mixins: [ProductTile],
diff --git a/src/themes/default/components/core/ProductsSlider.vue b/src/themes/default/components/core/ProductsSlider.vue
index 38ed0fa89a..4a16a83bb0 100644
--- a/src/themes/default/components/core/ProductsSlider.vue
+++ b/src/themes/default/components/core/ProductsSlider.vue
@@ -39,7 +39,7 @@
 import NoSSR from 'vue-no-ssr'
 import { Carousel, Slide } from 'vue-carousel'
 
-import ProductsSlider from '@vue-storefront/core/components/ProductsSlider'
+import ProductsSlider from 'core/components/ProductsSlider'
 import ProductTile from 'theme/components/core/ProductTile'
 
 export default {
diff --git a/src/themes/default/components/core/SizeSelector.vue b/src/themes/default/components/core/SizeSelector.vue
index 7cbb1d1c47..08311affa8 100644
--- a/src/themes/default/components/core/SizeSelector.vue
+++ b/src/themes/default/components/core/SizeSelector.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import GenericSelector from '@vue-storefront/core/components/GenericSelector'
+import GenericSelector from 'core/components/GenericSelector'
 
 export default {
   mixins: [GenericSelector]
diff --git a/src/themes/default/components/core/SortBy.vue b/src/themes/default/components/core/SortBy.vue
index 22c3f49778..c3e5a75db0 100644
--- a/src/themes/default/components/core/SortBy.vue
+++ b/src/themes/default/components/core/SortBy.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import SortBy from '@vue-storefront/core/components/SortBy'
+import SortBy from 'core/components/SortBy'
 export default {
   mixins: [SortBy]
 }
diff --git a/src/themes/default/components/core/ValidationError.vue b/src/themes/default/components/core/ValidationError.vue
index b16611d0d7..a6a1106970 100644
--- a/src/themes/default/components/core/ValidationError.vue
+++ b/src/themes/default/components/core/ValidationError.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import ValidationError from '@vue-storefront/core/components/ValidationError'
+import ValidationError from 'core/components/ValidationError'
 
 export default {
   mixins: [ValidationError]
diff --git a/src/themes/default/components/core/blocks/Auth/ForgotPass.vue b/src/themes/default/components/core/blocks/Auth/ForgotPass.vue
index eea6259c24..6bc6166b46 100644
--- a/src/themes/default/components/core/blocks/Auth/ForgotPass.vue
+++ b/src/themes/default/components/core/blocks/Auth/ForgotPass.vue
@@ -62,12 +62,12 @@
 </template>
 
 <script>
-import ForgotPass from '@vue-storefront/core/components/blocks/Auth/ForgotPass'
+import ForgotPass from 'core/components/blocks/Auth/ForgotPass'
 
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import BaseInput from '../Form/BaseInput.vue'
 import { required, email } from 'vuelidate/lib/validators'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   validations: {
diff --git a/src/themes/default/components/core/blocks/Auth/Login.vue b/src/themes/default/components/core/blocks/Auth/Login.vue
index 7e6d4a788e..9f33809916 100644
--- a/src/themes/default/components/core/blocks/Auth/Login.vue
+++ b/src/themes/default/components/core/blocks/Auth/Login.vue
@@ -73,13 +73,13 @@
 </template>
 
 <script>
-import Login from '@vue-storefront/core/components/blocks/Auth/Login'
+import Login from 'core/components/blocks/Auth/Login'
 
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import BaseCheckbox from '../Form/BaseCheckbox.vue'
 import BaseInput from '../Form/BaseInput.vue'
 import { required, email } from 'vuelidate/lib/validators'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   mixins: [Login],
diff --git a/src/themes/default/components/core/blocks/Auth/Register.vue b/src/themes/default/components/core/blocks/Auth/Register.vue
index 34b7198c06..390e5f4456 100644
--- a/src/themes/default/components/core/blocks/Auth/Register.vue
+++ b/src/themes/default/components/core/blocks/Auth/Register.vue
@@ -130,7 +130,7 @@
   </div>
 </template>
 <script>
-import Register from '@vue-storefront/core/components/blocks/Auth/Register'
+import Register from 'core/components/blocks/Auth/Register'
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox.vue'
 import BaseInput from 'theme/components/core/blocks/Form/BaseInput.vue'
diff --git a/src/themes/default/components/core/blocks/Auth/SignUp.vue b/src/themes/default/components/core/blocks/Auth/SignUp.vue
index 1df46d21c6..ee5e90da87 100644
--- a/src/themes/default/components/core/blocks/Auth/SignUp.vue
+++ b/src/themes/default/components/core/blocks/Auth/SignUp.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import SignUp from '@vue-storefront/core/components/blocks/Auth/SignUp'
+import SignUp from 'core/components/blocks/Auth/SignUp'
 import Modal from 'theme/components/core/Modal'
 import Login from 'theme/components/core/blocks/Auth/Login'
 import Register from 'theme/components/core/blocks/Auth/Register'
diff --git a/src/themes/default/components/core/blocks/Category/Sidebar.vue b/src/themes/default/components/core/blocks/Category/Sidebar.vue
index 0972662ef2..512e268134 100644
--- a/src/themes/default/components/core/blocks/Category/Sidebar.vue
+++ b/src/themes/default/components/core/blocks/Category/Sidebar.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import Sidebar from '@vue-storefront/core/components/blocks/Category/Sidebar'
+import Sidebar from 'core/components/blocks/Category/Sidebar'
 
 import ColorSelector from 'theme/components/core/ColorSelector'
 import SizeSelector from 'theme/components/core/SizeSelector'
diff --git a/src/themes/default/components/core/blocks/Checkout/CartSummary.vue b/src/themes/default/components/core/blocks/Checkout/CartSummary.vue
index dabf6c9c07..c24759720a 100644
--- a/src/themes/default/components/core/blocks/Checkout/CartSummary.vue
+++ b/src/themes/default/components/core/blocks/Checkout/CartSummary.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import CartSummary from '@vue-storefront/core/components/blocks/Checkout/CartSummary'
+import CartSummary from 'core/components/blocks/Checkout/CartSummary'
 import Product from './Product'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/Checkout/OrderReview.vue b/src/themes/default/components/core/blocks/Checkout/OrderReview.vue
index ccf619655f..49b431370d 100644
--- a/src/themes/default/components/core/blocks/Checkout/OrderReview.vue
+++ b/src/themes/default/components/core/blocks/Checkout/OrderReview.vue
@@ -85,13 +85,13 @@
 
 <script>
 import { required } from 'vuelidate/lib/validators'
-import Composite from '@vue-storefront/core/mixins/composite'
+import Composite from 'core/mixins/composite'
 
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox'
 import ButtonFull from 'theme/components/theme/ButtonFull'
 import CartSummary from 'theme/components/core/blocks/Checkout/CartSummary'
 import Modal from 'theme/components/core/Modal'
-import OrderReview from '@vue-storefront/core/components/blocks/Checkout/OrderReview'
+import OrderReview from 'core/components/blocks/Checkout/OrderReview'
 import ValidationError from 'theme/components/core/ValidationError'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/Checkout/Payment.vue b/src/themes/default/components/core/blocks/Checkout/Payment.vue
index 258c9a2a0c..efa4ff19d8 100644
--- a/src/themes/default/components/core/blocks/Checkout/Payment.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Payment.vue
@@ -315,7 +315,7 @@
 
 <script>
 import { required, minLength } from 'vuelidate/lib/validators'
-import Payment from '@vue-storefront/core/components/blocks/Checkout/Payment'
+import Payment from 'core/components/blocks/Checkout/Payment'
 
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox'
 import BaseInput from 'theme/components/core/blocks/Form/BaseInput'
diff --git a/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue b/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue
index 010dd3f76a..765f39ca24 100644
--- a/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue
+++ b/src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue
@@ -221,7 +221,7 @@
 
 <script>
 import { required, minLength, email, sameAs } from 'vuelidate/lib/validators'
-import PersonalDetails from '@vue-storefront/core/components/blocks/Checkout/PersonalDetails'
+import PersonalDetails from 'core/components/blocks/Checkout/PersonalDetails'
 
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox'
 import BaseInput from 'theme/components/core/blocks/Form/BaseInput'
diff --git a/src/themes/default/components/core/blocks/Checkout/Product.vue b/src/themes/default/components/core/blocks/Checkout/Product.vue
index c93bfa7ccc..9d4ea8d7d5 100644
--- a/src/themes/default/components/core/blocks/Checkout/Product.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Product.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import Product from '@vue-storefront/core/components/blocks/Checkout/Product'
+import Product from 'core/components/blocks/Checkout/Product'
 
 export default {
   mixins: [Product]
diff --git a/src/themes/default/components/core/blocks/Checkout/Shipping.vue b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
index d5ddd23ada..bc103d4ea6 100644
--- a/src/themes/default/components/core/blocks/Checkout/Shipping.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
@@ -254,7 +254,7 @@
 
 <script>
 import { required, minLength } from 'vuelidate/lib/validators'
-import shipping from '@vue-storefront/core/components/blocks/Checkout/Shipping'
+import shipping from 'core/components/blocks/Checkout/Shipping'
 
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox'
 import BaseInput from 'theme/components/core/blocks/Form/BaseInput'
diff --git a/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue b/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue
index 36c600c82e..3fa121899a 100644
--- a/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue
+++ b/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import Composite from '@vue-storefront/core/mixins/composite'
+import Composite from 'core/mixins/composite'
 import Breadcrumbs from 'theme/components/core/Breadcrumbs'
 import BaseTextarea from 'theme/components/core/blocks/Form/BaseTextarea'
 import ButtonOutline from 'theme/components/theme/ButtonOutline'
diff --git a/src/themes/default/components/core/blocks/Footer/Footer.vue b/src/themes/default/components/core/blocks/Footer/Footer.vue
index d83cb230de..9c7e6af3e8 100644
--- a/src/themes/default/components/core/blocks/Footer/Footer.vue
+++ b/src/themes/default/components/core/blocks/Footer/Footer.vue
@@ -187,7 +187,7 @@
 <script>
 import CurrentPage from 'theme/mixins/currentPage'
 import LanguageSwitcher from '../../LanguageSwitcher.vue'
-import Footer from '@vue-storefront/core/components/blocks/Footer/Footer'
+import Footer from 'core/components/blocks/Footer/Footer'
 import Newsletter from 'theme/components/core/blocks/Footer/Newsletter'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/Footer/Newsletter.vue b/src/themes/default/components/core/blocks/Footer/Newsletter.vue
index 65836ff532..12020ab7b2 100644
--- a/src/themes/default/components/core/blocks/Footer/Newsletter.vue
+++ b/src/themes/default/components/core/blocks/Footer/Newsletter.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import Newsletter from '@vue-storefront/core/components/blocks/Footer/Newsletter'
+import Newsletter from 'core/components/blocks/Footer/Newsletter'
 import ButtonOutline from 'theme/components/theme/ButtonOutline'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/Form/BaseCheckbox.vue b/src/themes/default/components/core/blocks/Form/BaseCheckbox.vue
index 58ab8df7e5..19759cdcd3 100644
--- a/src/themes/default/components/core/blocks/Form/BaseCheckbox.vue
+++ b/src/themes/default/components/core/blocks/Form/BaseCheckbox.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import baseCheckbox from '@vue-storefront/core/components/blocks/Form/BaseCheckbox'
+import baseCheckbox from 'core/components/blocks/Form/BaseCheckbox'
 
 export default {
   mixins: [baseCheckbox]
diff --git a/src/themes/default/components/core/blocks/Form/BaseInput.vue b/src/themes/default/components/core/blocks/Form/BaseInput.vue
index 5147ae90f6..6085aa3947 100644
--- a/src/themes/default/components/core/blocks/Form/BaseInput.vue
+++ b/src/themes/default/components/core/blocks/Form/BaseInput.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import baseInput from '@vue-storefront/core/components/blocks/Form/BaseInput'
+import baseInput from 'core/components/blocks/Form/BaseInput'
 
 export default {
   mixins: [baseInput]
diff --git a/src/themes/default/components/core/blocks/Form/BaseRadiobutton.vue b/src/themes/default/components/core/blocks/Form/BaseRadiobutton.vue
index ac55f06b39..06e53079b8 100644
--- a/src/themes/default/components/core/blocks/Form/BaseRadiobutton.vue
+++ b/src/themes/default/components/core/blocks/Form/BaseRadiobutton.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import BaseRadiobutton from '@vue-storefront/core/components/blocks/Form/BaseRadiobutton'
+import BaseRadiobutton from 'core/components/blocks/Form/BaseRadiobutton'
 
 export default {
   mixins: [BaseRadiobutton]
diff --git a/src/themes/default/components/core/blocks/Form/BaseSelect.vue b/src/themes/default/components/core/blocks/Form/BaseSelect.vue
index 13faf28395..00ad17b62b 100644
--- a/src/themes/default/components/core/blocks/Form/BaseSelect.vue
+++ b/src/themes/default/components/core/blocks/Form/BaseSelect.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import BaseSelect from '@vue-storefront/core/components/blocks/Form/BaseSelect'
+import BaseSelect from 'core/components/blocks/Form/BaseSelect'
 
 export default {
   mixins: [BaseSelect]
diff --git a/src/themes/default/components/core/blocks/Form/BaseTextarea.vue b/src/themes/default/components/core/blocks/Form/BaseTextarea.vue
index d1d527c84a..430d372407 100644
--- a/src/themes/default/components/core/blocks/Form/BaseTextarea.vue
+++ b/src/themes/default/components/core/blocks/Form/BaseTextarea.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import BaseTextarea from '@vue-storefront/core/components/blocks/Form/BaseTextarea'
+import BaseTextarea from 'core/components/blocks/Form/BaseTextarea'
 
 export default {
   mixins: [BaseTextarea]
diff --git a/src/themes/default/components/core/blocks/Header/AccountIcon.vue b/src/themes/default/components/core/blocks/Header/AccountIcon.vue
index 01ee421fba..7e6c1bdb8a 100644
--- a/src/themes/default/components/core/blocks/Header/AccountIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/AccountIcon.vue
@@ -27,8 +27,8 @@
 </template>
 
 <script>
-import i18n from '@vue-storefront/core/lib/i18n'
-import AccountIcon from '@vue-storefront/core/components/blocks/Header/AccountIcon'
+import i18n from 'core/lib/i18n'
+import AccountIcon from 'core/components/blocks/Header/AccountIcon'
 
 export default {
   mixins: [AccountIcon],
diff --git a/src/themes/default/components/core/blocks/Header/CompareIcon.vue b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
index 0656de831f..a713ec2337 100644
--- a/src/themes/default/components/core/blocks/Header/CompareIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import CompareIcon from '@vue-storefront/core/components/blocks/Header/CompareIcon'
+import CompareIcon from 'core/components/blocks/Header/CompareIcon'
 
 export default {
   mixins: [CompareIcon]
diff --git a/src/themes/default/components/core/blocks/Header/HamburgerIcon.vue b/src/themes/default/components/core/blocks/Header/HamburgerIcon.vue
index 91c05ad479..c4f0e4b3b4 100644
--- a/src/themes/default/components/core/blocks/Header/HamburgerIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/HamburgerIcon.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import HamburgerIcon from '@vue-storefront/core/components/blocks/Header/HamburgerIcon'
+import HamburgerIcon from 'core/components/blocks/Header/HamburgerIcon'
 
 export default {
   mixins: [HamburgerIcon]
diff --git a/src/themes/default/components/core/blocks/Header/Header.vue b/src/themes/default/components/core/blocks/Header/Header.vue
index f02831b48a..04bc4719da 100644
--- a/src/themes/default/components/core/blocks/Header/Header.vue
+++ b/src/themes/default/components/core/blocks/Header/Header.vue
@@ -68,7 +68,7 @@
 <script>
 import { mapState } from 'vuex'
 import CurrentPage from 'theme/mixins/currentPage'
-import Header from '@vue-storefront/core/components/blocks/Header/Header'
+import Header from 'core/components/blocks/Header/Header'
 import AccountIcon from 'theme/components/core/blocks/Header/AccountIcon'
 import CompareIcon from 'theme/components/core/blocks/Header/CompareIcon'
 import HamburgerIcon from 'theme/components/core/blocks/Header/HamburgerIcon'
diff --git a/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue b/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue
index 5f36e93f04..898b73a4eb 100644
--- a/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/MicrocartIcon.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import MicrocartIcon from '@vue-storefront/core/components/blocks/Header/MicrocartIcon'
+import MicrocartIcon from 'core/components/blocks/Header/MicrocartIcon'
 
 export default {
   mixins: [MicrocartIcon]
diff --git a/src/themes/default/components/core/blocks/Header/ReturnIcon.vue b/src/themes/default/components/core/blocks/Header/ReturnIcon.vue
index 8310310a1a..40563f2708 100644
--- a/src/themes/default/components/core/blocks/Header/ReturnIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/ReturnIcon.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import ReturnIcon from '@vue-storefront/core/components/blocks/Header/ReturnIcon'
+import ReturnIcon from 'core/components/blocks/Header/ReturnIcon'
 
 export default {
   mixins: [ReturnIcon]
diff --git a/src/themes/default/components/core/blocks/Header/SearchIcon.vue b/src/themes/default/components/core/blocks/Header/SearchIcon.vue
index 011d4ebea2..778c1a305c 100644
--- a/src/themes/default/components/core/blocks/Header/SearchIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/SearchIcon.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import SearchIcon from '@vue-storefront/core/components/blocks/Header/SearchIcon'
+import SearchIcon from 'core/components/blocks/Header/SearchIcon'
 
 export default {
   mixins: [SearchIcon]
diff --git a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
index 0a0524e1f4..1139c1ff3c 100644
--- a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import WishlistIcon from '@vue-storefront/core/components/blocks/Header/WishlistIcon'
+import WishlistIcon from 'core/components/blocks/Header/WishlistIcon'
 
 export default {
   mixins: [WishlistIcon]
diff --git a/src/themes/default/components/core/blocks/MainSlider/MainSlider.vue b/src/themes/default/components/core/blocks/MainSlider/MainSlider.vue
index f431c6199d..cd9fbbf5c3 100644
--- a/src/themes/default/components/core/blocks/MainSlider/MainSlider.vue
+++ b/src/themes/default/components/core/blocks/MainSlider/MainSlider.vue
@@ -34,7 +34,7 @@ import NoSSR from 'vue-no-ssr'
 import { Carousel, Slide } from 'vue-carousel'
 import sliderData from 'theme/resource/slider.json'
 
-import MainSlider from '@vue-storefront/core/components/blocks/MainSlider/MainSlider'
+import MainSlider from 'core/components/blocks/MainSlider/MainSlider'
 import ButtonOutline from 'theme/components/theme/ButtonOutline'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/Microcart/Microcart.vue b/src/themes/default/components/core/blocks/Microcart/Microcart.vue
index 64e77156ad..353438f1cf 100644
--- a/src/themes/default/components/core/blocks/Microcart/Microcart.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Microcart.vue
@@ -109,7 +109,7 @@
 </template>
 
 <script>
-import Microcart from '@vue-storefront/core/components/blocks/Microcart/Microcart'
+import Microcart from 'core/components/blocks/Microcart/Microcart'
 
 import BaseInput from 'theme/components/core/blocks/Form/BaseInput'
 import ButtonFull from 'theme/components/theme/ButtonFull'
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index ffb0466c40..80f907e995 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import Product from '@vue-storefront/core/components/blocks/Microcart/Product'
+import Product from 'core/components/blocks/Microcart/Product'
 
 import EditButton from './EditButton'
 import RemoveButton from './RemoveButton'
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue b/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
index 4d21d5655a..b61caca081 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyNewsletter.vue
@@ -99,7 +99,7 @@
 </template>
 
 <script>
-import MyNewsletter from '@vue-storefront/core/components/blocks/MyAccount/MyNewsletter'
+import MyNewsletter from 'core/components/blocks/MyAccount/MyNewsletter'
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import BaseCheckbox from '../Form/BaseCheckbox.vue'
 
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue b/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue
index bd5a0324cd..ca03eaf6ab 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyOrder.vue
@@ -102,7 +102,7 @@
 </template>
 
 <script>
-import MyOrder from '@vue-storefront/core/components/blocks/MyAccount/MyOrder'
+import MyOrder from 'core/components/blocks/MyAccount/MyOrder'
 
 export default {
   mixins: [MyOrder]
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyOrders.vue b/src/themes/default/components/core/blocks/MyAccount/MyOrders.vue
index 6daca43422..e78d43f2f2 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyOrders.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyOrders.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import MyOrders from '@vue-storefront/core/components/blocks/MyAccount/MyOrders'
+import MyOrders from 'core/components/blocks/MyAccount/MyOrders'
 
 export default {
   mixins: [MyOrders]
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue b/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue
index c0be75d603..db24746e40 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue
@@ -350,7 +350,7 @@
 
 <script>
 import { required, minLength, email, sameAs } from 'vuelidate/lib/validators'
-import MyProfile from '@vue-storefront/core/components/blocks/MyAccount/MyProfile'
+import MyProfile from 'core/components/blocks/MyAccount/MyProfile'
 
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox'
 import BaseSelect from 'theme/components/core/blocks/Form/BaseSelect'
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue b/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue
index 0a31a52bda..90ebfbfc6d 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue
@@ -233,7 +233,7 @@
 
 <script>
 import { required, minLength } from 'vuelidate/lib/validators'
-import MyShippingDetails from '@vue-storefront/core/components/blocks/MyAccount/MyShippingDetails'
+import MyShippingDetails from 'core/components/blocks/MyAccount/MyShippingDetails'
 
 import ButtonFull from 'theme/components/theme/ButtonFull'
 import Tooltip from 'theme/components/core/Tooltip'
diff --git a/src/themes/default/components/core/blocks/Product/Related.vue b/src/themes/default/components/core/blocks/Product/Related.vue
index c44a894631..23a2dd48e4 100644
--- a/src/themes/default/components/core/blocks/Product/Related.vue
+++ b/src/themes/default/components/core/blocks/Product/Related.vue
@@ -20,7 +20,7 @@
 import ProductListing from 'theme/components/core/ProductListing'
 
 import builder from 'bodybuilder'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 import config from 'config'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue b/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue
index eea60032be..bc1c52738a 100644
--- a/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue
+++ b/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import SearchPanel from '@vue-storefront/core/components/blocks/SearchPanel/SearchPanel'
+import SearchPanel from 'core/components/blocks/SearchPanel/SearchPanel'
 import ProductTile from 'theme/components/core/ProductTile'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue
index 204376be5f..32c738ae8a 100644
--- a/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue
+++ b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue
@@ -118,9 +118,9 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
-import SidebarMenu from '@vue-storefront/core/components/blocks/SidebarMenu/SidebarMenu'
+import SidebarMenu from 'core/components/blocks/SidebarMenu/SidebarMenu'
 import SubBtn from 'theme/components/core/blocks/SidebarMenu/SubBtn'
 import SubCategory from 'theme/components/core/blocks/SidebarMenu/SubCategory'
 
diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
index fafc87d756..b3a9d69161 100644
--- a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
+++ b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
@@ -72,7 +72,7 @@
 <script>
 import { mapState } from 'vuex'
 import SubBtn from './SubBtn.vue'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   name: 'SubCategory',
diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index e13c5f9d2a..132e9bdf59 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import Product from '@vue-storefront/core/components/blocks/Wishlist/Product'
+import Product from 'core/components/blocks/Wishlist/Product'
 import RemoveButton from './RemoveButton'
 
 export default {
diff --git a/src/themes/default/components/core/blocks/Wishlist/Wishlist.vue b/src/themes/default/components/core/blocks/Wishlist/Wishlist.vue
index 60e40d06a1..2c51c89e9e 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Wishlist.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Wishlist.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import Wishlist from '@vue-storefront/core/components/blocks/Wishlist/Wishlist'
+import Wishlist from 'core/components/blocks/Wishlist/Wishlist'
 import Product from 'theme/components/core/blocks/Wishlist/Product'
 
 export default {
diff --git a/src/themes/default/pages/Category.vue b/src/themes/default/pages/Category.vue
index 7fb3c38389..e48c86fb56 100644
--- a/src/themes/default/pages/Category.vue
+++ b/src/themes/default/pages/Category.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import Category from '@vue-storefront/core/pages/Category'
+import Category from 'core/pages/Category'
 import Sidebar from '../components/core/blocks/Category/Sidebar.vue'
 import ProductListing from '../components/core/ProductListing.vue'
 import Breadcrumbs from '../components/core/Breadcrumbs.vue'
diff --git a/src/themes/default/pages/Checkout.vue b/src/themes/default/pages/Checkout.vue
index 759d84a082..8b744bccea 100644
--- a/src/themes/default/pages/Checkout.vue
+++ b/src/themes/default/pages/Checkout.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import Checkout from '@vue-storefront/core/pages/Checkout'
+import Checkout from 'core/pages/Checkout'
 
 import PersonalDetails from 'theme/components/core/blocks/Checkout/PersonalDetails'
 import Shipping from 'theme/components/core/blocks/Checkout/Shipping'
diff --git a/src/themes/default/pages/Compare.vue b/src/themes/default/pages/Compare.vue
index 36e9b97ed8..8e1a8e3437 100644
--- a/src/themes/default/pages/Compare.vue
+++ b/src/themes/default/pages/Compare.vue
@@ -68,7 +68,7 @@
 </template>
 
 <script>
-import Compare from '@vue-storefront/core/pages/Compare'
+import Compare from 'core/pages/Compare'
 import Breadcrumbs from '../components/core/Breadcrumbs'
 import RemoveButton from '../components/core/blocks/Compare/RemoveButton'
 import ProductTile from '../components/core/ProductTile'
diff --git a/src/themes/default/pages/Home.vue b/src/themes/default/pages/Home.vue
index 45301a2902..f3c91bb0fa 100755
--- a/src/themes/default/pages/Home.vue
+++ b/src/themes/default/pages/Home.vue
@@ -38,7 +38,7 @@ import builder from 'bodybuilder'
 import config from 'config'
 
 // Core pages
-import Home from '@vue-storefront/core/pages/Home'
+import Home from 'core/pages/Home'
 
 // Theme core components
 import ProductListing from 'theme/components/core/ProductListing'
diff --git a/src/themes/default/pages/MyAccount.vue b/src/themes/default/pages/MyAccount.vue
index 1cb1d6e83c..f92643fc9f 100644
--- a/src/themes/default/pages/MyAccount.vue
+++ b/src/themes/default/pages/MyAccount.vue
@@ -32,14 +32,14 @@
 </template>
 
 <script>
-import MyAccount from '@vue-storefront/core/pages/MyAccount'
+import MyAccount from 'core/pages/MyAccount'
 import Breadcrumbs from '../components/core/Breadcrumbs'
 import MyProfile from '../components/core/blocks/MyAccount/MyProfile'
 import MyShippingDetails from '../components/core/blocks/MyAccount/MyShippingDetails'
 import MyNewsletter from '../components/core/blocks/MyAccount/MyNewsletter'
 import MyOrders from '../components/core/blocks/MyAccount/MyOrders'
 import MyOrder from '../components/core/blocks/MyAccount/MyOrder'
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 
 export default {
   data () {
diff --git a/src/themes/default/pages/PageNotFound.vue b/src/themes/default/pages/PageNotFound.vue
index 6242b20fec..e14a68e743 100644
--- a/src/themes/default/pages/PageNotFound.vue
+++ b/src/themes/default/pages/PageNotFound.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import PageNotFound from '@vue-storefront/core/pages/PageNotFound'
+import PageNotFound from 'core/pages/PageNotFound'
 import ProductTile from '../components/core/ProductTile.vue'
 
 export default {
diff --git a/src/themes/default/pages/Product.vue b/src/themes/default/pages/Product.vue
index e06de71afe..5da09be766 100644
--- a/src/themes/default/pages/Product.vue
+++ b/src/themes/default/pages/Product.vue
@@ -222,7 +222,7 @@
 </template>
 
 <script>
-import Product from '@vue-storefront/core/pages/Product'
+import Product from 'core/pages/Product'
 
 import RelatedProducts from 'theme/components/core/blocks/Product/Related.vue'
 import AddToCart from 'theme/components/core/AddToCart.vue'
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index ccd1229e6c..d993509954 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import i18n from '@vue-storefront/core/lib/i18n'
+import i18n from 'core/lib/i18n'
 import Breadcrumbs from 'theme/components/core/Breadcrumbs'
 import StaticContent from 'theme/components/theme/StaticContent'
 
diff --git a/src/themes/default/router/index.js b/src/themes/default/router/index.js
index 5960e9dfe9..ecb4b097f9 100644
--- a/src/themes/default/router/index.js
+++ b/src/themes/default/router/index.js
@@ -1,4 +1,4 @@
-// import router from '@vue-storefront/core/router'
+// import router from 'core/router'
 // uncomment if you want to modify the router e.g. add before/after hooks
 import Home from 'theme/pages/Home.vue'
 import Category from 'theme/pages/Category.vue'
diff --git a/src/themes/default/store/product-extensions.js b/src/themes/default/store/product-extensions.js
index 1f6bed6434..f36cb6dd4f 100644
--- a/src/themes/default/store/product-extensions.js
+++ b/src/themes/default/store/product-extensions.js
@@ -2,7 +2,7 @@
 // The good practise is to keep all ui-related states in this file
 
 import coreStore from '@vue-storefront/store/modules/product'
-import { extendStore } from '@vue-storefront/core/lib/themes'
+import { extendStore } from 'core/lib/themes'
 
 const state = {
 }
diff --git a/src/themes/default/store/ui-store.js b/src/themes/default/store/ui-store.js
index 4cdcf73b50..04f5eaed1b 100644
--- a/src/themes/default/store/ui-store.js
+++ b/src/themes/default/store/ui-store.js
@@ -2,7 +2,7 @@
 // The good practise is to keep all ui-related states in this file
 
 import coreStore from '@vue-storefront/store/modules/ui-store'
-import { extendStore } from '@vue-storefront/core/lib/themes'
+import { extendStore } from 'core/lib/themes'
 
 const state = {
   submenu: {
diff --git a/src/themes/theme-starter/components/AddToCart.vue b/src/themes/theme-starter/components/AddToCart.vue
index 5ec6bca177..ae97375c1e 100644
--- a/src/themes/theme-starter/components/AddToCart.vue
+++ b/src/themes/theme-starter/components/AddToCart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import AddToCart from '@vue-storefront/core/components/AddToCart'
+import AddToCart from 'core/components/AddToCart'
 
 export default {
   mixins: [AddToCart]
diff --git a/src/themes/theme-starter/components/Category/Sidebar.vue b/src/themes/theme-starter/components/Category/Sidebar.vue
index b685f64e8a..db3a400e87 100644
--- a/src/themes/theme-starter/components/Category/Sidebar.vue
+++ b/src/themes/theme-starter/components/Category/Sidebar.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import Sidebar from '@vue-storefront/core/components/blocks/Category/Sidebar'
+import Sidebar from 'core/components/blocks/Category/Sidebar'
 
 import ColorSelector from '../Filters/ColorSelector'
 import PriceSelector from '../Filters/PriceSelector'
diff --git a/src/themes/theme-starter/components/Filters/ColorSelector.vue b/src/themes/theme-starter/components/Filters/ColorSelector.vue
index 8d04b7df47..b83633e413 100644
--- a/src/themes/theme-starter/components/Filters/ColorSelector.vue
+++ b/src/themes/theme-starter/components/Filters/ColorSelector.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import GenericSelector from '@vue-storefront/core/components/GenericSelector'
+import GenericSelector from 'core/components/GenericSelector'
 
 export default {
   methods: {
diff --git a/src/themes/theme-starter/components/Filters/GenericSelector.vue b/src/themes/theme-starter/components/Filters/GenericSelector.vue
index bec8d35377..2fa8db415d 100644
--- a/src/themes/theme-starter/components/Filters/GenericSelector.vue
+++ b/src/themes/theme-starter/components/Filters/GenericSelector.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import GenericSelector from '@vue-storefront/core/components/GenericSelector'
+import GenericSelector from 'core/components/GenericSelector'
 
 export default {
   mixins: [GenericSelector]
diff --git a/src/themes/theme-starter/components/Filters/PriceSelector.vue b/src/themes/theme-starter/components/Filters/PriceSelector.vue
index d47f0c432e..9300d1227e 100644
--- a/src/themes/theme-starter/components/Filters/PriceSelector.vue
+++ b/src/themes/theme-starter/components/Filters/PriceSelector.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import PriceSelector from '@vue-storefront/core/components/PriceSelector'
+import PriceSelector from 'core/components/PriceSelector'
 
 export default {
   name: 'PriceSelector',
diff --git a/src/themes/theme-starter/components/Filters/SizeSelector.vue b/src/themes/theme-starter/components/Filters/SizeSelector.vue
index c55adc4a9c..bb23440906 100644
--- a/src/themes/theme-starter/components/Filters/SizeSelector.vue
+++ b/src/themes/theme-starter/components/Filters/SizeSelector.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import GenericSelector from '@vue-storefront/core/components/GenericSelector'
+import GenericSelector from 'core/components/GenericSelector'
 
 export default {
   name: 'SizeSelector',
diff --git a/src/themes/theme-starter/components/Microcart/Microcart.vue b/src/themes/theme-starter/components/Microcart/Microcart.vue
index 1415746325..89d803e2b8 100644
--- a/src/themes/theme-starter/components/Microcart/Microcart.vue
+++ b/src/themes/theme-starter/components/Microcart/Microcart.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import Microcart from '@vue-storefront/core/components/blocks/Microcart/Microcart'
+import Microcart from 'core/components/blocks/Microcart/Microcart'
 
 export default {
   mixins: [Microcart]
diff --git a/src/themes/theme-starter/components/ProductTile.vue b/src/themes/theme-starter/components/ProductTile.vue
index f334a335b5..020ea55e98 100644
--- a/src/themes/theme-starter/components/ProductTile.vue
+++ b/src/themes/theme-starter/components/ProductTile.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import ProductTile from '@vue-storefront/core/components/ProductTile'
+import ProductTile from 'core/components/ProductTile'
 import AddToCart from 'theme/components/AddToCart'
 export default {
   mixins: [ProductTile],
diff --git a/src/themes/theme-starter/pages/Category.vue b/src/themes/theme-starter/pages/Category.vue
index 3eb8e1dfa4..217661044c 100644
--- a/src/themes/theme-starter/pages/Category.vue
+++ b/src/themes/theme-starter/pages/Category.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import Category from '@vue-storefront/core/pages/Category'
+import Category from 'core/pages/Category'
 import Sidebar from 'theme/components/Category/Sidebar'
 import ProductTile from 'theme/components/ProductTile' // Component to display small product tile
 
diff --git a/src/themes/theme-starter/pages/Product.vue b/src/themes/theme-starter/pages/Product.vue
index 5db67f92d3..6ae9622b56 100644
--- a/src/themes/theme-starter/pages/Product.vue
+++ b/src/themes/theme-starter/pages/Product.vue
@@ -8,7 +8,7 @@
 
 <script>
 // Here we are importing Core Page module responsible for business logic injection
-import Product from '@vue-storefront/core/pages/Product'
+import Product from 'core/pages/Product'
 
 export default {
   // Here we are injecting core Product Page business logic (you can find it under core/pages/Product.vue)
diff --git a/src/themes/theme-starter/router/index.js b/src/themes/theme-starter/router/index.js
index b64a098f56..66e2d9670e 100644
--- a/src/themes/theme-starter/router/index.js
+++ b/src/themes/theme-starter/router/index.js
@@ -1,4 +1,4 @@
-// import router from '@vue-storefront/core/router'
+// import router from 'core/router'
 // uncomment if you want to modify the router e.g. add before/after hooks
 import Home from 'theme/pages/Home.vue'
 import Product from 'theme/pages/Product.vue'
diff --git a/src/themes/theme-starter/store/product-extensions.js b/src/themes/theme-starter/store/product-extensions.js
index 1f6bed6434..f36cb6dd4f 100644
--- a/src/themes/theme-starter/store/product-extensions.js
+++ b/src/themes/theme-starter/store/product-extensions.js
@@ -2,7 +2,7 @@
 // The good practise is to keep all ui-related states in this file
 
 import coreStore from '@vue-storefront/store/modules/product'
-import { extendStore } from '@vue-storefront/core/lib/themes'
+import { extendStore } from 'core/lib/themes'
 
 const state = {
 }
diff --git a/src/themes/theme-starter/store/ui-store.js b/src/themes/theme-starter/store/ui-store.js
index 4cdcf73b50..04f5eaed1b 100644
--- a/src/themes/theme-starter/store/ui-store.js
+++ b/src/themes/theme-starter/store/ui-store.js
@@ -2,7 +2,7 @@
 // The good practise is to keep all ui-related states in this file
 
 import coreStore from '@vue-storefront/store/modules/ui-store'
-import { extendStore } from '@vue-storefront/core/lib/themes'
+import { extendStore } from 'core/lib/themes'
 
 const state = {
   submenu: {
diff --git a/yarn.lock b/yarn.lock
index 3826d8b16d..9d973f744b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -333,14 +333,14 @@
     "@webassemblyjs/wast-parser" "1.5.13"
     long "^3.2.0"
 
-JSONStream@^1.0.4:
+JSONStream@^1.0.4, JSONStream@^1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abbrev@1:
+abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
 
@@ -386,6 +386,18 @@ after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
 
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agentkeepalive@^3.3.0, agentkeepalive@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.1.tgz#4eba75cf2ad258fc09efd506cdb8d8c2971d35a4"
+  dependencies:
+    humanize-ms "^1.2.1"
+
 ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
@@ -463,7 +475,7 @@ ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
-ansi-regex@^3.0.0:
+ansi-regex@^3.0.0, ansi-regex@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
 
@@ -481,6 +493,14 @@ ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+
+ansistyles@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
+
 any-observable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
@@ -503,10 +523,18 @@ app-root-path@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, aproba@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
+"aproba@^1.1.2 || 2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+
+archy@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -584,6 +612,10 @@ arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
+asap@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -1388,6 +1420,16 @@ big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
 
+bin-links@^1.1.0, bin-links@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757"
+  dependencies:
+    bluebird "^3.5.0"
+    cmd-shim "^2.0.2"
+    gentle-fs "^2.0.0"
+    graceful-fs "^4.1.11"
+    write-file-atomic "^2.3.0"
+
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
@@ -1414,7 +1456,7 @@ bluebird@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
-bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.5.1:
+bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@~3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1619,15 +1661,23 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
 
+byte-size@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.3.tgz#b7c095efc68eadf82985fccd9a2df43a74fa2ccd"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
 
-cacache@^10.0.4:
+cacache@^10.0.0, cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
   dependencies:
@@ -1645,6 +1695,25 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
+cacache@^11.0.1, cacache@^11.0.2:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.1.0.tgz#3d76dbc2e9da413acaad2557051960a4dad3e1a4"
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    figgy-pudding "^3.1.0"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.3"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.0"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1677,6 +1746,10 @@ cachedir@1.3.0:
   dependencies:
     os-homedir "^1.0.1"
 
+call-limit@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.0.tgz#6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -1857,7 +1930,7 @@ chokidar@^2, chokidar@^2.0.2:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chownr@^1.0.1:
+chownr@^1.0.1, chownr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
@@ -1871,6 +1944,10 @@ ci-info@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
+cidr-regex@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-1.0.6.tgz#74abfd619df370b9d54ab14475568e97dd64c0c1"
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -1901,6 +1978,13 @@ cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
+cli-columns@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
+  dependencies:
+    string-width "^2.0.0"
+    strip-ansi "^3.0.1"
+
 cli-cursor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
@@ -1923,6 +2007,24 @@ cli-table-redemption@^1.0.0:
   dependencies:
     chalk "^1.1.3"
 
+cli-table2@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz#2d1ef7f218a0e786e214540562d4bd177fe32d97"
+  dependencies:
+    lodash "^3.10.1"
+    string-width "^1.0.1"
+  optionalDependencies:
+    colors "^1.1.2"
+
+cli-table3@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+  dependencies:
+    object-assign "^4.1.0"
+    string-width "^2.1.1"
+  optionalDependencies:
+    colors "^1.1.2"
+
 cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
@@ -2007,7 +2109,7 @@ cloneable-readable@^1.0.0:
     process-nextick-args "^2.0.0"
     readable-stream "^2.3.5"
 
-cmd-shim@^2.0.2:
+cmd-shim@^2.0.2, cmd-shim@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
   dependencies:
@@ -2055,7 +2157,7 @@ colors@~0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
 
-columnify@^1.5.4:
+columnify@^1.5.4, columnify@~1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
   dependencies:
@@ -2145,7 +2247,7 @@ concat-stream@1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@1.6.2, concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@1.6.2, concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -2154,6 +2256,13 @@ concat-stream@1.6.2, concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+config-chain@~1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 config@^1.30.0:
   version "1.31.0"
   resolved "https://registry.yarnpkg.com/config/-/config-1.31.0.tgz#ab08aeba6536015d220cd0afe14b3e0501082542"
@@ -2186,7 +2295,7 @@ console-browserify@^1.1.0:
   dependencies:
     date-now "^0.1.4"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
@@ -2692,6 +2801,10 @@ debug@3.1.0, debug@^3, debug@^3.0, debug@^3.1.0:
   dependencies:
     ms "2.0.0"
 
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -2833,7 +2946,7 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-indent@^5.0.0:
+detect-indent@^5.0.0, detect-indent@~5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
 
@@ -2847,6 +2960,17 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
+detect-newline@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+
+dezalgo@^1.0.0, dezalgo@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
@@ -2971,6 +3095,10 @@ dot-prop@^4.1.0, dot-prop@^4.1.1:
   dependencies:
     is-obj "^1.0.0"
 
+dotenv@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -2999,6 +3127,10 @@ editions@^1.3.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
 
+editor@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3116,6 +3248,10 @@ envinfo@^5.7.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.10.0.tgz#503a9774ae15b93ea68bdfae2ccd6306624ea6df"
 
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -3173,6 +3309,12 @@ es6-promise@^4.0.3, es6-promise@^4.0.5, es6-promise@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
 
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  dependencies:
+    es6-promise "^4.0.3"
+
 es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
@@ -3231,7 +3373,7 @@ eslint-module-utils@^2.2.0:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
-eslint-plugin-import@^2.12.0, eslint-plugin-import@^2.13.0:
+eslint-plugin-import@^2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.13.0.tgz#df24f241175e312d91662dc91ca84064caec14ed"
   dependencies:
@@ -3638,6 +3780,10 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+figgy-pudding@^3.0.0, figgy-pudding@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.2.0.tgz#464626b73d7b0fc045a99753d191b0785957ff73"
+
 figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
@@ -3728,6 +3874,10 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-npm-prefix@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz#8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3837,6 +3987,13 @@ fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
 
+from2@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz#88413baaa5f9a597cfde9221d86986cd3c061dfd"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "~1.1.10"
+
 from2@^2.1.0, from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
@@ -3884,7 +4041,15 @@ fs-minipass@^1.2.5:
   dependencies:
     minipass "^2.2.1"
 
-fs-write-stream-atomic@^1.0.8:
+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"
+  dependencies:
+    graceful-fs "^4.1.2"
+    path-is-inside "^1.0.1"
+    rimraf "^2.5.2"
+
+fs-write-stream-atomic@^1.0.8, fs-write-stream-atomic@~1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
   dependencies:
@@ -3940,6 +4105,23 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
+genfun@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-4.0.1.tgz#ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"
+
+gentle-fs@^2.0.0, gentle-fs@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.0.1.tgz#585cfd612bfc5cd52471fdb42537f016a5ce3687"
+  dependencies:
+    aproba "^1.1.2"
+    fs-vacuum "^1.2.10"
+    graceful-fs "^4.1.11"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    path-is-inside "^1.0.2"
+    read-cmd-shim "^1.0.1"
+    slide "^1.1.6"
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -4077,7 +4259,7 @@ glob@7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
+glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -4239,7 +4421,7 @@ got@^8.3.1:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.11:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -4335,7 +4517,7 @@ has-to-string-tag-x@^1.2.0:
   dependencies:
     has-symbol-support-x "^1.4.1"
 
-has-unicode@^2.0.0:
+has-unicode@^2.0.0, has-unicode@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
@@ -4435,7 +4617,7 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.5.0:
+hosted-git-info@^2.1.4, hosted-git-info@^2.5.0, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
 
@@ -4487,7 +4669,7 @@ htmlparser2@~3.3.0:
     domutils "1.1"
     readable-stream "1.0"
 
-http-cache-semantics@3.8.1:
+http-cache-semantics@3.8.1, http-cache-semantics@^3.8.0, http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
 
@@ -4509,6 +4691,13 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-proxy-agent@^2.0.0, http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy@^1.13.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
@@ -4537,6 +4726,19 @@ https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
 
+https-proxy-agent@^2.1.0, https-proxy-agent@^2.2.0, https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  dependencies:
+    ms "^2.0.0"
+
 iconv-lite@0.4, iconv-lite@0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -4561,7 +4763,7 @@ ieee754@^1.1.11, ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
 
-iferr@^0.1.5:
+iferr@^0.1.5, iferr@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
 
@@ -4628,7 +4830,7 @@ indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
 
-inflight@^1.0.4:
+inflight@^1.0.4, inflight@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   dependencies:
@@ -4643,10 +4845,23 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
 
+init-package-json@^1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe"
+  dependencies:
+    glob "^7.1.1"
+    npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0"
+    promzard "^0.3.0"
+    read "~1.0.1"
+    read-package-json "1 || 2"
+    semver "2.x || 3.x || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+    validate-npm-package-name "^3.0.0"
+
 inquirer@^3.0.6, inquirer@^3.2.2, inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
@@ -4705,6 +4920,10 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
+ip@^1.1.4, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
@@ -4757,6 +4976,12 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.0.0"
 
+is-cidr@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-1.0.0.tgz#fb5aacf659255310359da32cae03e40c6a1c2afc"
+  dependencies:
+    cidr-regex "1.0.6"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -5127,7 +5352,7 @@ json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
@@ -5337,6 +5562,10 @@ lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
+lazy-property@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz#84ddc4b370679ba8bd4cdcfa4c06b43d57111147"
+
 lazy@~1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690"
@@ -5398,6 +5627,37 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+libcipm@^1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-1.6.3.tgz#dc4052d710941547782d85bbdb3c77eedec733ff"
+  dependencies:
+    bin-links "^1.1.2"
+    bluebird "^3.5.1"
+    find-npm-prefix "^1.0.2"
+    graceful-fs "^4.1.11"
+    lock-verify "^2.0.2"
+    npm-lifecycle "^2.0.3"
+    npm-logical-tree "^1.2.1"
+    npm-package-arg "^6.1.0"
+    pacote "^8.1.6"
+    protoduck "^5.0.0"
+    read-package-json "^2.0.13"
+    rimraf "^2.6.2"
+    worker-farm "^1.6.0"
+
+libnpx@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.0.tgz#1bf4a1c9f36081f64935eb014041da10855e3102"
+  dependencies:
+    dotenv "^5.0.1"
+    npm-package-arg "^6.0.0"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.0"
+    update-notifier "^2.3.0"
+    which "^1.3.0"
+    y18n "^4.0.0"
+    yargs "^11.0.0"
+
 lie@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
@@ -5560,6 +5820,19 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+lock-verify@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.0.2.tgz#148e4f85974915c9e3c34d694b7de9ecb18ee7a8"
+  dependencies:
+    npm-package-arg "^5.1.2 || 6"
+    semver "^5.4.1"
+
+lockfile@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
+  dependencies:
+    signal-exit "^3.0.2"
+
 lodash-es@^4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
@@ -5579,6 +5852,17 @@ lodash._basecreate@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
 
+lodash._baseuniq@~4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
+  dependencies:
+    lodash._createset "~4.0.0"
+    lodash._root "~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"
+
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
@@ -5591,6 +5875,10 @@ lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
 
+lodash._root@~3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
@@ -5599,7 +5887,7 @@ lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
-lodash.clonedeep@^4.3.2:
+lodash.clonedeep@^4.3.2, lodash.clonedeep@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
@@ -5676,15 +5964,23 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash.uniq@^4.5.0:
+lodash.union@~4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+
+lodash.uniq@^4.5.0, lodash.uniq@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
+lodash.without@~4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
+
 lodash@4.17.10, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.9.0, lodash@~4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-lodash@^3.8.0:
+lodash@^3.10.1, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
@@ -5766,7 +6062,7 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   dependencies:
@@ -5779,6 +6075,54 @@ make-dir@^1.0.0, make-dir@^1.1.0:
   dependencies:
     pify "^3.0.0"
 
+"make-fetch-happen@^2.5.0 || 3 || 4", make-fetch-happen@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.0.1"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
+make-fetch-happen@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz#8474aa52198f6b1ae4f3094c04e8370d35ea8a38"
+  dependencies:
+    agentkeepalive "^3.3.0"
+    cacache "^10.0.0"
+    http-cache-semantics "^3.8.0"
+    http-proxy-agent "^2.0.0"
+    https-proxy-agent "^2.1.0"
+    lru-cache "^4.1.1"
+    mississippi "^1.2.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^3.0.1"
+    ssri "^5.0.0"
+
+make-fetch-happen@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-3.0.0.tgz#7b661d2372fc4710ab5cc8e1fa3c290eea69a961"
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^10.0.4"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.0"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^3.0.1"
+    ssri "^5.2.4"
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -5839,6 +6183,10 @@ mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
 
+meant@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz#66044fea2f23230ec806fb515efea29c44d2115d"
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -5873,7 +6221,7 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   dependencies:
@@ -6050,6 +6398,21 @@ minizlib@^1.1.0:
   dependencies:
     minipass "^2.2.1"
 
+mississippi@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^1.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -6065,6 +6428,21 @@ mississippi@^2.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -6085,7 +6463,7 @@ mkdirp@0.5.0:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -6145,6 +6523,10 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
 multimatch@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -6216,6 +6598,14 @@ node-dir@0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
 
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -6223,7 +6613,7 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-gyp@^3.3.1:
+node-gyp@^3.3.1, node-gyp@^3.6.2:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.7.0.tgz#789478e8f6c45e277aa014f3e28f958f286f9203"
   dependencies:
@@ -6320,14 +6710,14 @@ nomnom@^1.8.1:
   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"
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0", normalize-package-data@~2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -6354,24 +6744,226 @@ normalize-url@2.0.1:
     query-string "^5.0.1"
     sort-keys "^2.0.0"
 
+npm-audit-report@^1.0.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.1.tgz#e79ea1fcb5ffaf3031102b389d5222c2b0459632"
+  dependencies:
+    cli-table3 "^0.5.0"
+    console-control-strings "^1.1.0"
+
 npm-bundled@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
 
-npm-packlist@^1.1.6:
+npm-cache-filename@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
+
+npm-install-checks@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.0.tgz#d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"
+  dependencies:
+    semver "^2.3.0 || 3.x || 4 || 5"
+
+npm-lifecycle@^2.0.1, npm-lifecycle@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.0.3.tgz#696bedf1143371163e9cc16fe872357e25d8d90e"
+  dependencies:
+    byline "^5.0.0"
+    graceful-fs "^4.1.11"
+    node-gyp "^3.6.2"
+    resolve-from "^4.0.0"
+    slide "^1.1.6"
+    uid-number "0.0.6"
+    umask "^1.1.0"
+    which "^1.3.0"
+
+npm-logical-tree@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88"
+
+"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^5.1.2 || 6", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.10, npm-packlist@^1.1.6, npm-packlist@~1.1.10:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-pick-manifest@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5"
+  dependencies:
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-profile@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-3.0.2.tgz#58d568f1b56ef769602fd0aed8c43fa0e0de0f57"
+  dependencies:
+    aproba "^1.1.2 || 2"
+    make-fetch-happen "^2.5.0 || 3 || 4"
+
+npm-registry-client@^8.5.1:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
+  dependencies:
+    concat-stream "^1.5.2"
+    graceful-fs "^4.1.6"
+    normalize-package-data "~1.0.1 || ^2.0.0"
+    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
+    once "^1.3.3"
+    request "^2.74.0"
+    retry "^0.10.0"
+    safe-buffer "^5.1.1"
+    semver "2 >=2.2.1 || 3.x || 4 || 5"
+    slide "^1.1.3"
+    ssri "^5.2.4"
+  optionalDependencies:
+    npmlog "2 || ^3.1.0 || ^4.0.0"
+
+npm-registry-fetch@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-1.1.1.tgz#710bc5947d9ee2c549375072dab6d5d17baf2eb2"
+  dependencies:
+    bluebird "^3.5.1"
+    figgy-pudding "^3.0.0"
+    lru-cache "^4.1.2"
+    make-fetch-happen "^3.0.0"
+    npm-package-arg "^6.0.0"
+    safe-buffer "^5.1.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
+npm-user-validate@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
+
+npm@^5.7.1:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-5.10.0.tgz#3bec62312c94a9b0f48f208e00b98bf0304b40db"
+  dependencies:
+    JSONStream "^1.3.2"
+    abbrev "~1.1.1"
+    ansi-regex "~3.0.0"
+    ansicolors "~0.3.2"
+    ansistyles "~0.1.3"
+    aproba "~1.2.0"
+    archy "~1.0.0"
+    bin-links "^1.1.0"
+    bluebird "~3.5.1"
+    byte-size "^4.0.2"
+    cacache "^10.0.4"
+    call-limit "~1.1.0"
+    chownr "~1.0.1"
+    cli-columns "^3.1.2"
+    cli-table2 "~0.2.0"
+    cmd-shim "~2.0.2"
+    columnify "~1.5.4"
+    config-chain "~1.1.11"
+    detect-indent "~5.0.0"
+    detect-newline "^2.1.0"
+    dezalgo "~1.0.3"
+    editor "~1.0.0"
+    find-npm-prefix "^1.0.2"
+    fs-vacuum "~1.2.10"
+    fs-write-stream-atomic "~1.0.10"
+    gentle-fs "^2.0.1"
+    glob "~7.1.2"
+    graceful-fs "~4.1.11"
+    has-unicode "~2.0.1"
+    hosted-git-info "^2.6.0"
+    iferr "~0.1.5"
+    inflight "~1.0.6"
+    inherits "~2.0.3"
+    ini "^1.3.5"
+    init-package-json "^1.10.3"
+    is-cidr "~1.0.0"
+    json-parse-better-errors "^1.0.2"
+    lazy-property "~1.0.0"
+    libcipm "^1.6.2"
+    libnpx "^10.2.0"
+    lock-verify "^2.0.2"
+    lockfile "^1.0.4"
+    lodash._baseuniq "~4.6.0"
+    lodash.clonedeep "~4.5.0"
+    lodash.union "~4.6.0"
+    lodash.uniq "~4.5.0"
+    lodash.without "~4.4.0"
+    lru-cache "^4.1.2"
+    meant "~1.0.1"
+    mississippi "^3.0.0"
+    mkdirp "~0.5.1"
+    move-concurrently "^1.0.1"
+    node-gyp "^3.6.2"
+    nopt "~4.0.1"
+    normalize-package-data "~2.4.0"
+    npm-audit-report "^1.0.9"
+    npm-cache-filename "~1.0.2"
+    npm-install-checks "~3.0.0"
+    npm-lifecycle "^2.0.1"
+    npm-package-arg "^6.1.0"
+    npm-packlist "~1.1.10"
+    npm-profile "^3.0.1"
+    npm-registry-client "^8.5.1"
+    npm-registry-fetch "^1.1.0"
+    npm-user-validate "~1.0.0"
+    npmlog "~4.1.2"
+    once "~1.4.0"
+    opener "~1.4.3"
+    osenv "^0.1.5"
+    pacote "^7.6.1"
+    path-is-inside "~1.0.2"
+    promise-inflight "~1.0.1"
+    qrcode-terminal "^0.12.0"
+    query-string "^6.1.0"
+    qw "~1.0.1"
+    read "~1.0.7"
+    read-cmd-shim "~1.0.1"
+    read-installed "~4.0.3"
+    read-package-json "^2.0.13"
+    read-package-tree "^5.2.1"
+    readable-stream "^2.3.6"
+    request "^2.85.0"
+    retry "^0.12.0"
+    rimraf "~2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.5.0"
+    sha "~2.0.1"
+    slide "~1.1.6"
+    sorted-object "~2.0.1"
+    sorted-union-stream "~2.1.3"
+    ssri "^5.3.0"
+    strip-ansi "~4.0.0"
+    tar "^4.4.2"
+    text-table "~0.2.0"
+    tiny-relative-date "^1.3.0"
+    uid-number "0.0.6"
+    umask "~1.1.0"
+    unique-filename "~1.1.0"
+    unpipe "~1.0.0"
+    update-notifier "^2.5.0"
+    uuid "^3.2.1"
+    validate-npm-package-license "^3.0.3"
+    validate-npm-package-name "~3.0.0"
+    which "~1.3.0"
+    worker-farm "^1.6.0"
+    wrappy "~1.0.2"
+    write-file-atomic "^2.3.0"
+
+"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2, npmlog@~4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -6484,7 +7076,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0, once@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -6500,6 +7092,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+opener@~1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
+
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -6557,7 +7153,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@0, osenv@^0.1.4:
+osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
@@ -6635,6 +7231,65 @@ package-json@^4.0.0, package-json@^4.0.1:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
+pacote@^7.6.1:
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-7.6.1.tgz#d44621c89a5a61f173989b60236757728387c094"
+  dependencies:
+    bluebird "^3.5.1"
+    cacache "^10.0.4"
+    get-stream "^3.0.0"
+    glob "^7.1.2"
+    lru-cache "^4.1.1"
+    make-fetch-happen "^2.6.0"
+    minimatch "^3.0.4"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.0.0"
+    npm-packlist "^1.1.10"
+    npm-pick-manifest "^2.1.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.0"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.1"
+    semver "^5.5.0"
+    ssri "^5.2.4"
+    tar "^4.4.0"
+    unique-filename "^1.1.0"
+    which "^1.3.0"
+
+pacote@^8.1.6:
+  version "8.1.6"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-8.1.6.tgz#8e647564d38156367e7a9dc47a79ca1ab278d46e"
+  dependencies:
+    bluebird "^3.5.1"
+    cacache "^11.0.2"
+    get-stream "^3.0.0"
+    glob "^7.1.2"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.3"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.10"
+    npm-pick-manifest "^2.1.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.0"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.5.0"
+    ssri "^6.0.0"
+    tar "^4.4.3"
+    unique-filename "^1.1.0"
+    which "^1.3.0"
+
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -6747,7 +7402,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2, path-is-inside@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
@@ -7066,16 +7721,39 @@ progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
 
-promise-inflight@^1.0.1:
+promise-inflight@^1.0.1, promise-inflight@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
 
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
 promptly@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/promptly/-/promptly-2.2.0.tgz#2a13fa063688a2a5983b161fff0108a07d26fc74"
   dependencies:
     read "^1.0.4"
 
+promzard@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"
+  dependencies:
+    read "1"
+
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+
+protoduck@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.0.tgz#752145e6be0ad834cb25716f670a713c860dce70"
+  dependencies:
+    genfun "^4.0.1"
+
 proxy-addr@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
@@ -7101,6 +7779,13 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
+pump@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
@@ -7108,6 +7793,13 @@ pump@^2.0.0, pump@^2.0.1:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
@@ -7136,6 +7828,10 @@ qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
 
+qrcode-terminal@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
+
 qs@6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
@@ -7156,6 +7852,13 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+query-string@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.1.0.tgz#01e7d69f6a0940dac67a937d6c6325647aa4532a"
+  dependencies:
+    decode-uri-component "^0.2.0"
+    strict-uri-encode "^2.0.0"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -7172,6 +7875,10 @@ quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
 
+qw@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4"
+
 ramda@0.24.1:
   version "0.24.1"
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.24.1.tgz#c3b7755197f35b8dc3502228262c4c91ddb6b857"
@@ -7235,12 +7942,46 @@ read-chunk@^2.1.0:
     pify "^3.0.0"
     safe-buffer "^5.1.1"
 
-read-cmd-shim@^1.0.1:
+read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
   dependencies:
     graceful-fs "^4.1.2"
 
+read-installed@~4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
+  dependencies:
+    debuglog "^1.0.1"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    slide "~1.1.3"
+    util-extend "^1.0.1"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  dependencies:
+    glob "^7.1.1"
+    json-parse-better-errors "^1.0.1"
+    normalize-package-data "^2.0.0"
+    slash "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-tree@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -7286,7 +8027,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read@^1.0.4:
+read@1, read@^1.0.4, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   dependencies:
@@ -7313,6 +8054,24 @@ readable-stream@1.0, readable-stream@~1.0.2:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+readable-stream@~1.1.10:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -7489,7 +8248,7 @@ request-progress@^2.0.1:
   dependencies:
     throttleit "^1.0.0"
 
-request@2.87.0, request@^2.81.0:
+request@2.87.0, request@^2.74.0, request@^2.81.0, request@^2.85.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
@@ -7589,6 +8348,10 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -7623,13 +8386,21 @@ ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
 
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -7762,7 +8533,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@5.*, semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@5.*, "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -7854,6 +8625,13 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+sha@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz#6030822fbd2c9823949f8f72ed6411ee5cf25aae"
+  dependencies:
+    graceful-fs "^4.1.2"
+    readable-stream "^2.0.2"
+
 shallow-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
@@ -7923,10 +8701,18 @@ slice-ansi@1.0.0:
   dependencies:
     is-fullwidth-code-point "^2.0.0"
 
-slide@^1.1.5:
+slide@^1.1.3, slide@^1.1.5, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
+smart-buffer@^1.0.13:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
+
+smart-buffer@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -8004,12 +8790,51 @@ socket.io@1.7.3:
     socket.io-client "1.7.3"
     socket.io-parser "2.3.1"
 
+socks-proxy-agent@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz#2eae7cf8e2a82d34565761539a7f9718c5617659"
+  dependencies:
+    agent-base "^4.1.0"
+    socks "^1.1.10"
+
+socks-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  dependencies:
+    agent-base "~4.2.0"
+    socks "~2.2.0"
+
+socks@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"
+  dependencies:
+    ip "^1.1.4"
+    smart-buffer "^1.0.13"
+
+socks@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.0.1"
+
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
   dependencies:
     is-plain-obj "^1.0.0"
 
+sorted-object@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz#7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"
+
+sorted-union-stream@~2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz#c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"
+  dependencies:
+    from2 "^1.3.0"
+    stream-iterate "^1.1.0"
+
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
@@ -8122,12 +8947,16 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
+ssri@^5.0.0, ssri@^5.2.4, ssri@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
   dependencies:
     safe-buffer "^5.1.1"
 
+ssri@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.0.tgz#fc21bfc90e03275ac3e23d5a42e38b8a1cbc130d"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -8177,6 +9006,13 @@ stream-http@^2.7.2:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
+stream-iterate@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/stream-iterate/-/stream-iterate-1.2.0.tgz#2bd7c77296c1702a46488b8ad41f79865eecd4e1"
+  dependencies:
+    readable-stream "^2.1.5"
+    stream-shift "^1.0.0"
+
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -8189,6 +9025,10 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+strict-uri-encode@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -8228,7 +9068,7 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
+strip-ansi@^4.0.0, strip-ansi@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
   dependencies:
@@ -8366,7 +9206,7 @@ tar@^2.0.0:
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4:
+tar@^4, tar@^4.4.0, tar@^4.4.2, tar@^4.4.3:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
   dependencies:
@@ -8454,6 +9294,10 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-relative-date@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
+
 tmp@0.0.31:
   version "0.0.31"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
@@ -8627,10 +9471,18 @@ uglifyjs-webpack-plugin@^1.2.4:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+uid-number@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
 ultron@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
 
+umask@^1.1.0, umask@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
+
 underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
@@ -8648,7 +9500,7 @@ uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
 
-unique-filename@^1.1.0:
+unique-filename@^1.1.0, unique-filename@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
   dependencies:
@@ -8693,7 +9545,7 @@ upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
 
-update-notifier@^2.3.0:
+update-notifier@^2.3.0, update-notifier@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
   dependencies:
@@ -8787,6 +9639,10 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
+util-extend@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
+
 util.promisify@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
@@ -8828,7 +9684,7 @@ uuid@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
@@ -8847,13 +9703,19 @@ val-loader@^1.1.1:
     loader-utils "^1.0.0"
     schema-utils "^0.4.5"
 
-validate-npm-package-license@^3.0.1:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  dependencies:
+    builtins "^1.0.3"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -9214,7 +10076,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@1, which@^1.2.1, which@^1.2.10, which@^1.2.14, which@^1.2.9:
+which@1, which@^1.2.1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@~1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
@@ -9248,7 +10110,7 @@ wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
-worker-farm@^1.5.2:
+worker-farm@^1.5.2, worker-farm@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
   dependencies:
@@ -9261,7 +10123,7 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrappy@1:
+wrappy@1, wrappy@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
@@ -9369,7 +10231,7 @@ yargs-parser@^9.0.2:
   dependencies:
     camelcase "^4.1.0"
 
-yargs@^11.1.0:
+yargs@^11.0.0, yargs@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
   dependencies: