Revert "Core package separation"

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

core/api/wishlist/test/TestInstance.vue

@@ -11,15 +11,15 @@
 
 <script>
 // Just import the features that you need in the view grouped in modules
-import {
+import { 
   addToWishlist,
   removeFromWishlist,
   clearWishlist,
   productsInWishlist,
   openWishlist,
   closeWishlist,
   isWishlistOpen
-} from '@vue-storefront/core/api/wishlist'
+} from 'core/api/wishlist'
 
 export default {
   data () {

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: [

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 = {}
 

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)$/,

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

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',

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',

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) {

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) {

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',

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',

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',

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',

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',

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',

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',

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',

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',

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',

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',

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',

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',

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 {

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',

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',

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',

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']
 

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)
 

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'
 
 /**

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 () {