From 92ff01091b0c30ca3a34ff9c6639f7a7c4e8ce35 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Wed, 17 Jan 2024 17:59:41 +0100 Subject: [PATCH 1/6] Upgrade to Volto 17.11.1 and Plone 6.0.9 --- .github/workflows/acceptance.yml | 2 +- Makefile | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 08ed50f9..75b688e9 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -4,7 +4,7 @@ on: [push, pull_request] env: ADDON_NAME: "@kitconcept/volto-light-theme" ADDON_PATH: "volto-light-theme" - VOLTO_VERSION: "17.5.0" + VOLTO_VERSION: "17.11.1" jobs: diff --git a/Makefile b/Makefile index c1540a0f..18537e48 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ GREEN=`tput setaf 2` RESET=`tput sgr0` YELLOW=`tput setaf 3` -PLONE_VERSION=6.0.8 -VOLTO_VERSION=17.7.0 +PLONE_VERSION=6.0.9 +VOLTO_VERSION=17.11.1 ADDON_NAME='@kitconcept/volto-light-theme' ADDON_PATH='volto-light-theme' diff --git a/package.json b/package.json index 9ad702c2..f8e8da09 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,6 @@ "@kitconcept/volto-introduction-block": "^1.0.0", "@kitconcept/volto-separator-block": "^4.0.0", "@kitconcept/volto-slider-block": "^6.1.0", - "@plone/volto": "^17.8.0" + "@plone/volto": "^17.11.1" } } From efe29886363411bb72046b22e130f598f462b036 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Wed, 17 Jan 2024 18:05:07 +0100 Subject: [PATCH 2/6] Changelog --- news/328.internal | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/328.internal diff --git a/news/328.internal b/news/328.internal new file mode 100644 index 00000000..a49b93c9 --- /dev/null +++ b/news/328.internal @@ -0,0 +1 @@ +Upgrade to Volto 17.11.1 and Plone 6.0.9 @sneridagh From 965a905afbf399bc69de1c4834ddc20971ba676c Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Wed, 17 Jan 2024 18:06:22 +0100 Subject: [PATCH 3/6] lock --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index d6aa7ec5..b1391cd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1852,7 +1852,7 @@ __metadata: "@kitconcept/volto-introduction-block": ^1.0.0 "@kitconcept/volto-separator-block": ^4.0.0 "@kitconcept/volto-slider-block": ^6.1.0 - "@plone/volto": ^17.8.0 + "@plone/volto": ^17.11.1 languageName: unknown linkType: soft From 7b07160602719bc9cd14f44e1942de4526ec70da Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Wed, 17 Jan 2024 20:15:20 +0100 Subject: [PATCH 4/6] Upgrade to 17.11.2 --- .github/workflows/acceptance.yml | 2 +- .github/workflows/deploy.yml | 2 +- Makefile | 2 +- news/328.internal | 2 +- package.json | 2 +- yarn.lock | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 75b688e9..3e65c1ae 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -4,7 +4,7 @@ on: [push, pull_request] env: ADDON_NAME: "@kitconcept/volto-light-theme" ADDON_PATH: "volto-light-theme" - VOLTO_VERSION: "17.11.1" + VOLTO_VERSION: "17.11.2" jobs: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dce251d4..048b6c18 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ on: env: ENVIRONMENT: "light-theme.kitconcept.io" IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend" - VOLTO_VERSION: "17.5.0" + VOLTO_VERSION: "17.11.2" jobs: meta: diff --git a/Makefile b/Makefile index 18537e48..3bcf266f 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ RESET=`tput sgr0` YELLOW=`tput setaf 3` PLONE_VERSION=6.0.9 -VOLTO_VERSION=17.11.1 +VOLTO_VERSION=17.11.2 ADDON_NAME='@kitconcept/volto-light-theme' ADDON_PATH='volto-light-theme' diff --git a/news/328.internal b/news/328.internal index a49b93c9..35b984e2 100644 --- a/news/328.internal +++ b/news/328.internal @@ -1 +1 @@ -Upgrade to Volto 17.11.1 and Plone 6.0.9 @sneridagh +Upgrade to Volto 17.11.2 and Plone 6.0.9 @sneridagh diff --git a/package.json b/package.json index f8e8da09..20503191 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,6 @@ "@kitconcept/volto-introduction-block": "^1.0.0", "@kitconcept/volto-separator-block": "^4.0.0", "@kitconcept/volto-slider-block": "^6.1.0", - "@plone/volto": "^17.11.1" + "@plone/volto": "^17.11.2" } } diff --git a/yarn.lock b/yarn.lock index b1391cd1..d9aec3df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1852,7 +1852,7 @@ __metadata: "@kitconcept/volto-introduction-block": ^1.0.0 "@kitconcept/volto-separator-block": ^4.0.0 "@kitconcept/volto-slider-block": ^6.1.0 - "@plone/volto": ^17.11.1 + "@plone/volto": ^17.11.2 languageName: unknown linkType: soft From dec51128bcad1c2b33cc7d04a206d85c98c9b0a9 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Fri, 26 Jan 2024 16:34:14 +0100 Subject: [PATCH 5/6] Update to 17.11.5 --- .github/workflows/acceptance.yml | 2 +- .github/workflows/deploy.yml | 2 +- Makefile | 2 +- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 3e65c1ae..dbe6ca0c 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -4,7 +4,7 @@ on: [push, pull_request] env: ADDON_NAME: "@kitconcept/volto-light-theme" ADDON_PATH: "volto-light-theme" - VOLTO_VERSION: "17.11.2" + VOLTO_VERSION: "17.11.5" jobs: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 048b6c18..23c3031a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ on: env: ENVIRONMENT: "light-theme.kitconcept.io" IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend" - VOLTO_VERSION: "17.11.2" + VOLTO_VERSION: "17.11.5" jobs: meta: diff --git a/Makefile b/Makefile index 3bcf266f..3cc6a72b 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ RESET=`tput sgr0` YELLOW=`tput setaf 3` PLONE_VERSION=6.0.9 -VOLTO_VERSION=17.11.2 +VOLTO_VERSION=17.11.5 ADDON_NAME='@kitconcept/volto-light-theme' ADDON_PATH='volto-light-theme' diff --git a/package.json b/package.json index 20503191..07d00338 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@babel/eslint-parser": "7.22.15", - "@plone/scripts": "^3.0.0", + "@plone/scripts": "^3.3.2", "eslint": "8.49.0", "eslint-config-prettier": "9.0.0", "eslint-config-react-app": "7.0.1", @@ -72,6 +72,6 @@ "@kitconcept/volto-introduction-block": "^1.0.0", "@kitconcept/volto-separator-block": "^4.0.0", "@kitconcept/volto-slider-block": "^6.1.0", - "@plone/volto": "^17.11.2" + "@plone/volto": "^17.11.5" } } diff --git a/yarn.lock b/yarn.lock index d9aec3df..fb57c5e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1824,7 +1824,7 @@ __metadata: resolution: "@kitconcept/volto-light-theme@workspace:." dependencies: "@babel/eslint-parser": 7.22.15 - "@plone/scripts": ^3.0.0 + "@plone/scripts": ^3.3.2 eslint: 8.49.0 eslint-config-prettier: 9.0.0 eslint-config-react-app: 7.0.1 @@ -1852,7 +1852,7 @@ __metadata: "@kitconcept/volto-introduction-block": ^1.0.0 "@kitconcept/volto-separator-block": ^4.0.0 "@kitconcept/volto-slider-block": ^6.1.0 - "@plone/volto": ^17.11.2 + "@plone/volto": ^17.11.5 languageName: unknown linkType: soft @@ -2105,9 +2105,9 @@ __metadata: languageName: node linkType: hard -"@plone/scripts@npm:^3.0.0": - version: 3.1.0 - resolution: "@plone/scripts@npm:3.1.0" +"@plone/scripts@npm:^3.3.2": + version: 3.3.2 + resolution: "@plone/scripts@npm:3.3.2" dependencies: "@babel/core": ^7.0.0 babel-plugin-react-intl: 5.1.17 @@ -2119,13 +2119,13 @@ __metadata: git-url-parse: ^13.1.0 glob: 7.1.6 lodash: 4.17.21 - mrs-developer: "*" + mrs-developer: ^2.1.1 pofile: 1.0.10 bin: addon: addon/index.js changelogupdater: changelogupdater.cjs i18n: i18n.cjs - checksum: 5c12da74fad98f65526685f5cb7818392b97007345e9225d33db1663be4c680d54a705be355309922f8a7485d7f0f15ffd7aa2c2cc202031ce4a6c1320be6feb + checksum: 7dc67a582e4a9b48fd51564ceccc3ce7f57c6b9355c56ebf915e32add6ac3b216e796f2ae4dc5f0c2dca53a815e05c79e2b7dabc02f6e0b9df7ea03e347b9763 languageName: node linkType: hard @@ -6615,7 +6615,7 @@ __metadata: languageName: node linkType: hard -"mrs-developer@npm:*": +"mrs-developer@npm:^2.1.1": version: 2.1.1 resolution: "mrs-developer@npm:2.1.1" dependencies: From bcd2217ccd155bb8821f39dc333238609c8ada41 Mon Sep 17 00:00:00 2001 From: Victor Fernandez de Alba Date: Fri, 26 Jan 2024 16:34:57 +0100 Subject: [PATCH 6/6] Changelog --- news/331.internal | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/331.internal diff --git a/news/331.internal b/news/331.internal new file mode 100644 index 00000000..660b6dbe --- /dev/null +++ b/news/331.internal @@ -0,0 +1 @@ +Upgrade to Votlo 17.11.5 and Plone 6.0.9 @sneridagh