Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.

Commit 1596b29

Browse files
authored
Merge branch 'master' into develop
2 parents 8854adc + 220bcb9 commit 1596b29

File tree

3 files changed

+6
-6358
lines changed

3 files changed

+6
-6358
lines changed

config/default.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@
142142
}
143143
},
144144
"magento2": {
145-
"url": "http://magento2.demo-1.xyz.com",
146-
"imgUrl": "http://localhost:8080/media/catalog/product",
145+
"url": "http://demo-magento2.vuestorefront.io/",
146+
"imgUrl": "http://demo-magento2.vuestorefront.io/media/catalog/product",
147147
"assetPath": "/../var/magento2-sample-data/pub/media",
148148
"magentoUserName": "",
149149
"magentoUserPassword": "",

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"config": "^1.30.0",
6060
"cors": "^2.8.4",
6161
"elasticdump": "^3.3.12",
62-
"elasticsearch": "^13.3.1",
62+
"elasticsearch": "^15.2.0",
6363
"email-check": "^1.1.0",
6464
"express": "^4.16.3",
6565
"graphql": "^0.10.1",
@@ -73,7 +73,7 @@
7373
"mage2vuestorefront": "git+https://github.com/DivanteLtd/mage2vuestorefront.git",
7474
"magento2-rest-client": "github:DivanteLtd/magento2-rest-client",
7575
"merge-graphql-schemas": "^1.5.2",
76-
"migrate": "^1.5.0",
76+
"migrate": "^1.6.2",
7777
"mime-types": "^2.1.18",
7878
"morgan": "^1.9.0",
7979
"nodemailer": "^4.6.8",
@@ -83,7 +83,7 @@
8383
"request-promise-native": "^1.0.5",
8484
"resource-router-middleware": "^0.6.0",
8585
"sharp": "^0.21.0",
86-
"soap": "^0.23.0",
86+
"soap": "^0.25.0",
8787
"winston": "^2.4.2"
8888
},
8989
"devDependencies": {
@@ -93,7 +93,7 @@
9393
"babel-preset-env": "^1.7.0",
9494
"babel-preset-stage-0": "^6.24.1",
9595
"eslint": "^4.16.0",
96-
"nodemon": "^1.18.4"
96+
"nodemon": "^1.18.7"
9797
},
9898
"bugs": {
9999
"url": "https://github.com/DivanteLtd/vue-storefront-api/issues"

0 commit comments

Comments
 (0)