Skip to content

Commit 81b736b

Browse files
authored
Merge pull request #1513 from DivanteLtd/feature/core-package-separation
Core package separation
2 parents a19724d + a08cef1 commit 81b736b

File tree

136 files changed

+340
-1124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+340
-1124
lines changed

core/api/cart/test/TestInstance.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
<script>
1212
// Just import the features that you need in the view grouped in modules
13-
import {
14-
addToCart,
15-
removeFromCart,
16-
productsInCart,
13+
import {
14+
addToCart,
15+
removeFromCart,
16+
productsInCart,
1717
closeMicrocart,
1818
openMicrocart,
1919
isMicrocartOpen
20-
} from 'core/api/cart'
20+
} from '@vue-storefront/core/api/cart'
2121
2222
export default {
2323
data () {
@@ -27,9 +27,9 @@ export default {
2727
},
2828
// And register them as a mixins
2929
mixins: [
30-
addToCart,
31-
removeFromCart,
32-
productsInCart,
30+
addToCart,
31+
removeFromCart,
32+
productsInCart,
3333
closeMicrocart,
3434
openMicrocart,
3535
isMicrocartOpen

core/api/wishlist/test/TestInstance.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
<script>
1313
// Just import the features that you need in the view grouped in modules
14-
import {
14+
import {
1515
addToWishlist,
1616
removeFromWishlist,
1717
clearWishlist,
1818
productsInWishlist,
1919
openWishlist,
2020
closeWishlist,
2121
isWishlistOpen
22-
} from 'core/api/wishlist'
22+
} from '@vue-storefront/core/api/wishlist'
2323
2424
export default {
2525
data () {

core/api/wishlist/test/TestInstanceForLoadTest.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
</template>
44

55
<script>
6-
// Just import the features that you need in the view grouped in modules
7-
import {
8-
loadWishlist
9-
} from 'core/api/wishlist'
6+
// Import the features you need in the view grouped in modules
7+
import { loadWishlist } from '@vue-storefront/core/api/wishlist'
108
119
export default {
1210
mixins: [

core/app.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
import union from 'lodash-es/union'
21
import Vue from 'vue'
3-
import App from 'theme/App'
4-
import store from '@vue-storefront/store'
5-
import router from 'core/router'
6-
import config from 'config'
72
import { sync } from 'vuex-router-sync'
8-
import EventBus from 'core/plugins/event-bus'
9-
10-
import { registerTheme, plugins, mixins, filters } from 'core/lib/themes'
11-
import registerExtensions from 'core/lib/extensions'
12-
import extensionEntryPoints from 'src/extensions'
13-
import themeExtensionEntryPoints from 'theme/extensions'
143
import VueObserveVisibility from 'vue-observe-visibility'
15-
4+
import { union } from 'lodash-es'
5+
import config from 'config'
166
import VueLazyload from 'vue-lazyload'
177
import Vuelidate from 'vuelidate'
188
import Meta from 'vue-meta'
19-
import i18n from 'core/lib/i18n'
20-
import shippingMethods from 'core/resource/shipping_methods.json'
21-
import { prepareStoreView } from './store/lib/multistore'
229

23-
import coreModules from './store/modules'
10+
import router from '@vue-storefront/core/router'
11+
import EventBus from '@vue-storefront/core/plugins/event-bus'
12+
import { registerTheme, plugins, mixins, filters } from '@vue-storefront/core/lib/themes'
13+
import registerExtensions from '@vue-storefront/core/lib/extensions'
14+
import i18n from '@vue-storefront/core/lib/i18n'
15+
import shippingMethods from '@vue-storefront/core/resource/shipping_methods.json'
16+
17+
import store from '@vue-storefront/store'
18+
import coreModules from '@vue-storefront/store/modules'
19+
import { prepareStoreView } from '@vue-storefront/store/lib/multistore'
20+
21+
import App from 'theme/App'
2422
import themeModules from 'theme/store'
23+
import themeExtensionEntryPoints from 'theme/extensions'
24+
import extensionEntryPoints from 'src/extensions'
2525

2626
if (!global.$VS) global.$VS = {}
2727

core/build/webpack.base.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ module.exports = {
129129
{
130130
test: /\.js$/,
131131
loader: 'babel-loader',
132-
exclude: /node_modules/
132+
exclude: /node_modules/,
133+
include: /node_modules\/@vue-storefront/
133134
},
134135
{
135136
test: /\.(png|jpg|gif|svg)$/,

core/client-entry.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
import { createApp } from './app'
2-
import config from 'config'
3-
import { execute } from '@vue-storefront/store/lib/task'
4-
import UniversalStorage from '@vue-storefront/store/lib/storage'
51
import * as localForage from 'localforage'
6-
import EventBus from 'core/plugins/event-bus'
7-
import union from 'lodash-es/union'
2+
import { union } from 'lodash-es'
83
import sizeof from 'object-sizeof'
4+
import config from 'config'
5+
6+
import { createApp } from '@vue-storefront/core/app'
7+
import EventBus from '@vue-storefront/core/plugins/event-bus'
8+
99
import rootStore from '@vue-storefront/store'
10+
import { execute } from '@vue-storefront/store/lib/task'
11+
import UniversalStorage from '@vue-storefront/store/lib/storage'
12+
import i18n from '@vue-storefront/core/lib/i18n'
1013
import { prepareStoreView, storeCodeFromRoute, currentStoreView } from '@vue-storefront/store/lib/multistore'
11-
import i18n from 'core/lib/i18n'
1214

13-
require('./service-worker-registration') // register the service worker
15+
require('@vue-storefront/core/service-worker-registration') // register the service worker
1416

1517
const { app, router, store } = createApp()
1618
global.$VS.isSSR = false

core/components/AddToCart.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addToCart } from 'core/api/cart'
1+
import { addToCart } from '@vue-storefront/core/api/cart'
22

33
export default {
44
name: 'AddToCart',

core/components/Modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mapMutations } from 'vuex'
2-
import onEscapePress from 'core/mixins/onEscapePress'
2+
import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
33

44
export default {
55
name: 'Modal',

core/components/ProductBundleOptions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { mapMutations } from 'vuex'
2-
import * as types from 'core/store/mutation-types'
3-
import rootStore from 'core/store'
4-
import i18n from 'core/lib/i18n'
2+
import * as types from '@vue-storefront/store/mutation-types'
3+
import rootStore from '@vue-storefront/store'
4+
import i18n from '@vue-storefront/core/lib/i18n'
55

66
function _defaultOptionValue (co, field = 'id') {
77
if (co.product_links && co.product_links.length) {

core/components/ProductCustomOptions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { mapMutations } from 'vuex'
2-
import * as types from 'core/store/mutation-types'
3-
import rootStore from 'core/store'
4-
import i18n from 'core/lib/i18n'
2+
import * as types from '@vue-storefront/store/mutation-types'
3+
import rootStore from '@vue-storefront/store'
4+
import i18n from '@vue-storefront/core/lib/i18n'
55

66
function _defaultOptionValue (co) {
77
switch (co.type) {

0 commit comments

Comments
 (0)