Skip to content

Commit 9f14e65

Browse files
bloodfMarcin Kwiatkowski
bloodf
authored and
Marcin Kwiatkowski
committed
chore: updated dependencies & configuration management (#538)
* docs: updated docs to match missing elements * chore: added missing Redis password env * refactor(theme): added missing configuration envs Added missing configuration envs for Redis and Sentry * chore(eslint): updated dependencies - updated `eslint-plugin-unicorn` to `40.1.0` * chore(eslint-jest): updated dependencies - updated `eslint-plugin-jest` to `26.0.0` * chore(eslint-typescript): updated dependencies - updated `@typescript-eslint/eslint-plugin` to `5.10.1` - updated `@typescript-eslint/parser` to `5.10.1` * chore(eslint-vue): updated dependencies - updated `eslint-plugin-vue` to `8.4.0` * chore(api-client): updated dependencies - updated `@apollo/client` to `3.5.8` - updated `graphql` to `16.3.0` - updated `cross-fetch` to `3.1.5` - updated `dotenv` to `14.3.2` - updated `msw` to `0.36.7` - updated `typescript` to `4.5.5` * chore(theme): updated dependencies - updated `@sentry/tracing` to `6.17.3` - updated `@storefront-ui/vue` to `0.12.0` - updated `isomorphic-dompurify` to `0.18.0` - updated `@babel/core` to `7.16.12` - updated `cypress` to `9.3.1` - updated `dotenv` to `14.3.2` - updated `lint-staged` to `12.3.2` - updated `mocha` to `9.2.0` - updated `npm-check-updates` to `12.2.1` - updated `typescript` to `4.5.5` * chore: updated dependencies - updated `@babel/core` to `7.16.12` - updated `@babel/plugin-proposal-private-methods` to `7.16.11` - updated `@commitlint/cli` to `16.1.0` - updated `@graphql-codegen/cli` to `2.4.0` - updated `@types/node` to `17.0.13` - updated `@typescript-eslint/parser` to `5.10.1` - updated `eslint` to `8.8.0` - updated `lint-staged` to `12.3.2` - updated `npm-check-updates` to `12.2.1` - updated `rollup` to `2.66.1` - updated `vue-eslint-parser` to `8.2.0` * chore(eslint-typescript): updated dependencies - `@typescript-eslint/eslint-plugin` to `5.10.2` - `@typescript-eslint/parser` to `5.10.2` * chore(api-client): updated dependencies - `dotenv` to `15.0.0` - `msw` to `0.36.8` * chore(theme): rollback storefront-ui update * chore: updated dependencies - `@graphql-codegen/typescript-operations` to `2.2.3` - `@types/node` to `17.0.14` - `@typescript-eslint/parser` to `5.10.2` - `lint-staged` to `12.3.3` * chore: moved sentry package to Dockerfile * chore(theme): added dynamic nuxt.config.js generation * chore: removed REDIS__PASSWORD * chore: removed REDIS__PASSWORD from workflow
1 parent c418374 commit 9f14e65

File tree

15 files changed

+537
-329
lines changed

15 files changed

+537
-329
lines changed

‎docs/guide/recaptcha.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ On the `config` folder update the config file (`dev.json` for example) with your
3838
"recaptchaHideBadge": "{YOUR_RECAPTCHA_HIDE_BADGE}", // true or false, default value is false
3939
"recaptchaSize": "{YOUR_RECAPTCHA_SIZE}", // Size: 'compact', 'normal', 'invisible' (v2), default value is 'invisible'
4040
"recaptchaSiteKey": "{YOUR_RECAPTCHA_SITE_KEY}", // Site key for requests, default value is ''
41-
"recaptchaSecretkey": "{YOUR_RECAPTCHA_SECRET_KEY}", // Secret key for requests, default value is ''
41+
"recaptchaSecretKey": "{YOUR_RECAPTCHA_SECRET_KEY}", // Secret key for requests, default value is ''
4242
"recaptchaVersion": "{YOUR_RECAPTCHA_VERSION}", // Version 2 or 3, default value is 3
4343
"recaptchaMinScore": "{YOUR_RECAPTCHA_MIN_SCORE}" // The min score used for v3, default value is 0.5
4444
...
@@ -65,7 +65,7 @@ RECAPTCHA_MIN_SCORE=0.5
6565
"recaptchaHideBadge": false,
6666
"recaptchaSize": "invisible",
6767
"recaptchaSiteKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
68-
"recaptchaSecretkey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
68+
"recaptchaSecretKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
6969
"recaptchaVersion": 3,
7070
"recaptchaMinScore": 0.5
7171
...

‎docs/guide/ssr.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Introduction
44

5-
VueStorefront 2 - Magento 2 integrations use @vue-storefront/cache module that adds posibility to cache some server-side
5+
VueStorefront 2 - Magento 2 integrations use @vue-storefront/cache module that adds possibility to cache some server-side
66
rendered pages.
77

88
### What is cached

‎internals/eslint-jest/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"rules"
3030
],
3131
"dependencies": {
32-
"eslint-plugin-jest": "^25.3.4"
32+
"eslint-plugin-jest": "^26.0.0"
3333
},
3434
"main": "index.js"
3535
}

‎internals/eslint-typescript/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"rules"
3030
],
3131
"dependencies": {
32-
"@typescript-eslint/eslint-plugin": "^5.9.1",
33-
"@typescript-eslint/parser": "^5.9.1"
32+
"@typescript-eslint/eslint-plugin": "^5.10.2",
33+
"@typescript-eslint/parser": "^5.10.2"
3434
},
3535
"main": "index.js"
3636
}

‎internals/eslint-vue/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"rules"
3030
],
3131
"dependencies": {
32-
"eslint-plugin-vue": "^8.3.0"
32+
"eslint-plugin-vue": "^8.4.0"
3333
},
3434
"main": "index.js"
3535
}

‎internals/eslint/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"eslint-config-airbnb-typescript": "^16.1.0",
3535
"eslint-plugin-node": "^11.1.0",
3636
"eslint-plugin-promise": "^6.0.0",
37-
"eslint-plugin-unicorn": "40.0.0"
37+
"eslint-plugin-unicorn": "40.1.0"
3838
},
3939
"main": "index.js"
4040
}

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,30 @@
3737
"update:update": "ncu -u && lerna run update:update --stream"
3838
},
3939
"devDependencies": {
40-
"@babel/core": "^7.16.7",
41-
"@babel/plugin-proposal-private-methods": "^7.16.7",
42-
"@commitlint/cli": "^16.0.2",
40+
"@babel/core": "^7.16.12",
41+
"@babel/plugin-proposal-private-methods": "^7.16.11",
42+
"@commitlint/cli": "^16.1.0",
4343
"@commitlint/config-conventional": "^16.0.0",
4444
"@commitlint/config-lerna-scopes": "^16.0.0",
45-
"@graphql-codegen/cli": "^2.3.1",
45+
"@graphql-codegen/cli": "^2.4.0",
4646
"@graphql-codegen/typescript": "^2.4.2",
47-
"@graphql-codegen/typescript-operations": "^2.2.2",
47+
"@graphql-codegen/typescript-operations": "^2.2.3",
4848
"@graphql-tools/utils": "^8.6.1",
4949
"@manypkg/cli": "^0.19.1",
5050
"@rollup/plugin-commonjs": "^21.0.1",
5151
"@rollup/plugin-node-resolve": "^13.1.3",
5252
"@types/graphql": "^14.5.0",
5353
"@types/jest": "^27.4.0",
5454
"@types/jsdom": "^16.2.14",
55-
"@types/node": "^17.0.8",
55+
"@types/node": "^17.0.14",
5656
"@types/webpack": "^5.28.0",
57-
"@typescript-eslint/parser": "^5.9.1",
57+
"@typescript-eslint/parser": "^5.10.2",
5858
"@vue/eslint-config-typescript": "^10.0.0",
5959
"all-contributors-cli": "^6.20.0",
6060
"babel-eslint": "^10.1.0",
6161
"commitizen": "^4.2.4",
6262
"ejs": "^3.1.6",
63-
"eslint": "8.6.0",
63+
"eslint": "8.8.0",
6464
"husky": "^7.0.4",
6565
"jest": "^27.4.7",
6666
"jest-date-mock": "^1.0.8",
@@ -70,19 +70,19 @@
7070
"jest-watch-toggle-config": "^2.0.1",
7171
"jest-watch-typeahead": "^1.0.0",
7272
"lerna": "^4.0.0",
73-
"lint-staged": "^12.1.7",
73+
"lint-staged": "^12.3.3",
7474
"majestic": "^1.8.1",
75-
"npm-check-updates": "^12.1.0",
75+
"npm-check-updates": "^12.2.1",
7676
"rimraf": "^3.0.2",
77-
"rollup": "^2.64.0",
77+
"rollup": "^2.66.1",
7878
"rollup-plugin-terser": "^7.0.2",
7979
"rollup-plugin-typescript2": "^0.31.1",
8080
"shx": "^0.3.4",
8181
"ts-jest": "^27.1.3",
8282
"ts-node": "^10.4.0",
8383
"tslib": "^2.3.1",
8484
"typescript": "^4.5.4",
85-
"vue-eslint-parser": "^8.0.1"
85+
"vue-eslint-parser": "^8.2.0"
8686
},
8787
"engines": {
8888
"node": ">=16.x.x",

‎packages/api-client/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"update:update": "ncu -u"
2525
},
2626
"dependencies": {
27-
"@apollo/client": "^3.5.7",
28-
"graphql": "^16.2.0",
27+
"@apollo/client": "^3.5.8",
28+
"graphql": "^16.3.0",
2929
"graphql-tag": "^2.12.6",
3030
"isomorphic-fetch": "^3.0.0"
3131
},
@@ -34,12 +34,12 @@
3434
"@rollup/plugin-graphql": "^1.1.0",
3535
"@rollup/plugin-json": "^4.1.0",
3636
"@types/isomorphic-fetch": "^0.0.35",
37-
"cross-fetch": "^3.1.4",
38-
"dotenv": "^12.0.1",
37+
"cross-fetch": "^3.1.5",
38+
"dotenv": "^15.0.0",
3939
"graphql-tools": "^8.2.0",
4040
"jest-transform-graphql": "^2.1.0",
41-
"msw": "^0.36.4",
42-
"typescript": "^4.5.4",
41+
"msw": "^0.36.8",
42+
"typescript": "^4.5.5",
4343
"webpack": "4.46.0"
4444
},
4545
"peerDependencies": {

‎packages/theme/.env.example‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH=/vue/cart/sync
99
MAGENTO_BASE_URL={YOUR_SITE_FRONT_URL}
1010
IMAGE_PROVIDER={YOUR_IMAGE_PROVIDER}
1111
IMAGE_PROVIDER_BASE_URL={YOUR_IMAGE_PROVIDER_BASE_URL}
12-
MAGENTO_BASE_URL={YOUR_SITE_FRONT_URL}
13-
IMAGE_PROVIDER={YOUR_IMAGE_PROVIDER}
14-
IMAGE_PROVIDER_BASE_URL={YOUR_IMAGE_PROVIDER_BASE_URL}
1512
REDIS__HOST=127.0.0.1
1613
REDIS__PORT=6379
1714
REDIS_PASSWORD=

‎packages/theme/config.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,20 @@ const config = convict({
3636
default: process.env.MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH || '/vue/cart/sync',
3737
env: 'MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH',
3838
},
39-
// endregion
39+
magentoBaseUrl: {
40+
doc: 'Magento base url',
41+
format: String,
42+
default: process.env.MAGENTO_BASE_URL || 'https://magento2-instance.vuestorefront.io/',
43+
env: 'MAGENTO_BASE_URL',
44+
},
4045
storeUrl: {
4146
doc: 'Store base URL',
4247
format: String,
4348
default: process.env.STORE_URL || 'http://localhost:3000',
4449
env: 'STORE_URL',
4550
},
51+
// endregion
52+
// region Nuxt Options
4653
nuxtAppEnvironment: {
4754
doc: 'Nuxt Store environment',
4855
format: String,
@@ -55,12 +62,8 @@ const config = convict({
5562
default: process.env.NUXT_APP_PORT || 3000,
5663
env: 'NUXT_APP_PORT',
5764
},
58-
magentoBaseUrl: {
59-
doc: 'Magento base url',
60-
format: String,
61-
default: process.env.MAGENTO_BASE_URL || 'https://magento2-instance.vuestorefront.io/',
62-
env: 'MAGENTO_BASE_URL',
63-
},
65+
// endregion
66+
// region Nuxt-Image Options
6467
imageProvider: {
6568
doc: 'Image provider',
6669
format: String,
@@ -73,6 +76,7 @@ const config = convict({
7376
default: process.env.IMAGE_PROVIDER_BASE_URL,
7477
env: 'IMAGE_PROVIDER_BASE_URL',
7578
},
79+
// endregion
7680
// region recaptcha
7781
recaptchaEnabled: {
7882
doc: 'reCaptcha Enabled',
@@ -98,7 +102,7 @@ const config = convict({
98102
default: process.env.RECAPTCHA_SITE_KEY || '',
99103
env: 'RECAPTCHA_SITE_KEY',
100104
},
101-
recaptchaSecretkey: {
105+
recaptchaSecretKey: {
102106
doc: 'reCaptcha Secret Key',
103107
format: String,
104108
default: process.env.RECAPTCHA_SECRET_KEY || '',

0 commit comments

Comments
 (0)