From 2c8c5a2bb7d65790438558376ea2989c6337fa5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Thu, 14 Jan 2021 17:02:09 +0100 Subject: [PATCH 1/8] Moved the same dependencies from ct/bp to nuxt-theme-module --- packages/boilerplate/theme/package.json | 12 +----------- packages/commercetools/theme/package.json | 11 +---------- packages/core/nuxt-theme-module/package.json | 11 ++++++++++- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/packages/boilerplate/theme/package.json b/packages/boilerplate/theme/package.json index 7c6edbb5c01..fadfc19900e 100644 --- a/packages/boilerplate/theme/package.json +++ b/packages/boilerplate/theme/package.json @@ -11,20 +11,10 @@ "test": "jest" }, "dependencies": { - "@storefront-ui/vue": "^0.9.1", "@vue-storefront/boilerplate": "0.0.1", - "@vue-storefront/nuxt": "^2.2.0", - "@vue-storefront/nuxt-theme": "^2.2.0", - "@nuxtjs/style-resources": "^1.0.0", - "cookie-universal-nuxt": "^2.1.3", - "core-js": "^2.6.5", - "nuxt": "^2.13.3", - "nuxt-i18n": "^6.5.0", - "vee-validate": "^3.2.3", - "vue-scrollto": "^2.17.1" + "@nuxtjs/style-resources": "^1.0.0" }, "devDependencies": { - "@nuxt/types": "^0.7.9", "@nuxt/typescript-build": "^2.0.0", "@vue/test-utils": "^1.0.0-beta.27", "babel-jest": "^24.1.0", diff --git a/packages/commercetools/theme/package.json b/packages/commercetools/theme/package.json index ec97a813f11..c5fd22d97aa 100644 --- a/packages/commercetools/theme/package.json +++ b/packages/commercetools/theme/package.json @@ -16,16 +16,7 @@ }, "dependencies": { "@nuxtjs/pwa": "^3.2.2", - "@storefront-ui/vue": "0.9.2", - "@vue-storefront/commercetools": "^1.1.0", - "@vue-storefront/nuxt": "^2.2.0", - "@vue-storefront/nuxt-theme": "^2.2.0", - "cookie-universal-nuxt": "^2.1.3", - "core-js": "^2.6.5", - "nuxt": "^2.13.3", - "nuxt-i18n": "^6.5.0", - "vee-validate": "^3.2.3", - "vue-scrollto": "^2.17.1" + "@vue-storefront/commercetools": "^1.1.0" }, "devDependencies": { "@nuxt/types": "^0.7.9", diff --git a/packages/core/nuxt-theme-module/package.json b/packages/core/nuxt-theme-module/package.json index 6e5d28a2571..f953ec5cd70 100644 --- a/packages/core/nuxt-theme-module/package.json +++ b/packages/core/nuxt-theme-module/package.json @@ -23,6 +23,15 @@ "access": "public" }, "dependencies": { - "lodash.merge": "^4.6.2" + "lodash.merge": "^4.6.2", + "@storefront-ui/vue": "0.9.2", + "vue-scrollto": "^2.17.1", + "vee-validate": "^3.2.3", + "nuxt-i18n": "^6.5.0", + "core-js": "^2.6.5", + "nuxt": "^2.13.3", + "cookie-universal-nuxt": "^2.1.3", + "@vue-storefront/nuxt": "^2.2.0", + "@vue-storefront/nuxt-theme": "^2.2.0" } } From e2e86804e3368a34d1652a071205245e27702ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Thu, 14 Jan 2021 17:29:26 +0100 Subject: [PATCH 2/8] revert nuxt-theme to ct/bp --- packages/boilerplate/theme/package.json | 3 ++- packages/commercetools/theme/package.json | 3 ++- packages/core/nuxt-theme-module/package.json | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/boilerplate/theme/package.json b/packages/boilerplate/theme/package.json index fadfc19900e..be250ffa3a1 100644 --- a/packages/boilerplate/theme/package.json +++ b/packages/boilerplate/theme/package.json @@ -12,7 +12,8 @@ }, "dependencies": { "@vue-storefront/boilerplate": "0.0.1", - "@nuxtjs/style-resources": "^1.0.0" + "@nuxtjs/style-resources": "^1.0.0", + "@vue-storefront/nuxt-theme": "^2.2.0" }, "devDependencies": { "@nuxt/typescript-build": "^2.0.0", diff --git a/packages/commercetools/theme/package.json b/packages/commercetools/theme/package.json index c5fd22d97aa..b9218551894 100644 --- a/packages/commercetools/theme/package.json +++ b/packages/commercetools/theme/package.json @@ -16,7 +16,8 @@ }, "dependencies": { "@nuxtjs/pwa": "^3.2.2", - "@vue-storefront/commercetools": "^1.1.0" + "@vue-storefront/commercetools": "^1.1.0", + "@vue-storefront/nuxt-theme": "^2.2.0" }, "devDependencies": { "@nuxt/types": "^0.7.9", diff --git a/packages/core/nuxt-theme-module/package.json b/packages/core/nuxt-theme-module/package.json index f953ec5cd70..2cb4167e1ee 100644 --- a/packages/core/nuxt-theme-module/package.json +++ b/packages/core/nuxt-theme-module/package.json @@ -31,7 +31,6 @@ "core-js": "^2.6.5", "nuxt": "^2.13.3", "cookie-universal-nuxt": "^2.1.3", - "@vue-storefront/nuxt": "^2.2.0", - "@vue-storefront/nuxt-theme": "^2.2.0" + "@vue-storefront/nuxt": "^2.2.0" } } From 39f8b6ad7980b090a3c52fd2f2ec731632797189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Thu, 14 Jan 2021 17:34:38 +0100 Subject: [PATCH 3/8] missing @nuxt/types --- packages/boilerplate/theme/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/boilerplate/theme/package.json b/packages/boilerplate/theme/package.json index be250ffa3a1..0438aad3558 100644 --- a/packages/boilerplate/theme/package.json +++ b/packages/boilerplate/theme/package.json @@ -16,6 +16,7 @@ "@vue-storefront/nuxt-theme": "^2.2.0" }, "devDependencies": { + "@nuxt/types": "^0.7.9", "@nuxt/typescript-build": "^2.0.0", "@vue/test-utils": "^1.0.0-beta.27", "babel-jest": "^24.1.0", From 9385bd641c26f399466eee3ae7f53c3f9b1ca5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Mon, 18 Jan 2021 10:00:19 +0100 Subject: [PATCH 4/8] fixes from cr --- packages/boilerplate/theme/package.json | 10 +++++++++- packages/commercetools/theme/package.json | 10 +++++++++- packages/core/nuxt-module/package.json | 1 + packages/core/nuxt-theme-module/package.json | 11 ----------- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/packages/boilerplate/theme/package.json b/packages/boilerplate/theme/package.json index 0438aad3558..d140dca0d14 100644 --- a/packages/boilerplate/theme/package.json +++ b/packages/boilerplate/theme/package.json @@ -11,9 +11,17 @@ "test": "jest" }, "dependencies": { + "@storefront-ui/vue": "0.9.1", "@vue-storefront/boilerplate": "0.0.1", + "@vue-storefront/nuxt": "^2.2.0", "@nuxtjs/style-resources": "^1.0.0", - "@vue-storefront/nuxt-theme": "^2.2.0" + "lodash.merge": "^4.6.2", + "vue-scrollto": "^2.17.1", + "vee-validate": "^3.2.3", + "nuxt-i18n": "^6.5.0", + "core-js": "^2.6.5", + "nuxt": "^2.13.3", + "cookie-universal-nuxt": "^2.1.3" }, "devDependencies": { "@nuxt/types": "^0.7.9", diff --git a/packages/commercetools/theme/package.json b/packages/commercetools/theme/package.json index b9218551894..fa3552261c8 100644 --- a/packages/commercetools/theme/package.json +++ b/packages/commercetools/theme/package.json @@ -16,8 +16,16 @@ }, "dependencies": { "@nuxtjs/pwa": "^3.2.2", + "@storefront-ui/vue": "0.9.2", "@vue-storefront/commercetools": "^1.1.0", - "@vue-storefront/nuxt-theme": "^2.2.0" + "@vue-storefront/nuxt": "^2.2.0", + "lodash.merge": "^4.6.2", + "vue-scrollto": "^2.17.1", + "vee-validate": "^3.2.3", + "nuxt-i18n": "^6.5.0", + "core-js": "^2.6.5", + "nuxt": "^2.13.3", + "cookie-universal-nuxt": "^2.1.3" }, "devDependencies": { "@nuxt/types": "^0.7.9", diff --git a/packages/core/nuxt-module/package.json b/packages/core/nuxt-module/package.json index 1d07d2f17b2..8f31a41ff92 100644 --- a/packages/core/nuxt-module/package.json +++ b/packages/core/nuxt-module/package.json @@ -13,6 +13,7 @@ "@vue/composition-api": "1.0.0-beta.21", "@nuxtjs/composition-api": "0.17.0", "@nuxtjs/style-resources": "^1.0.0", + "@vue-storefront/nuxt-theme": "^2.2.0", "chalk": "^2.4.2", "chokidar": "^3.3.1", "consola": "^2.10.1", diff --git a/packages/core/nuxt-theme-module/package.json b/packages/core/nuxt-theme-module/package.json index 2cb4167e1ee..8b1df1129ea 100644 --- a/packages/core/nuxt-theme-module/package.json +++ b/packages/core/nuxt-theme-module/package.json @@ -21,16 +21,5 @@ }, "publishConfig": { "access": "public" - }, - "dependencies": { - "lodash.merge": "^4.6.2", - "@storefront-ui/vue": "0.9.2", - "vue-scrollto": "^2.17.1", - "vee-validate": "^3.2.3", - "nuxt-i18n": "^6.5.0", - "core-js": "^2.6.5", - "nuxt": "^2.13.3", - "cookie-universal-nuxt": "^2.1.3", - "@vue-storefront/nuxt": "^2.2.0" } } From ec0ce27df35693d32dc0372563e9228aaebd2804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Mon, 18 Jan 2021 10:02:49 +0100 Subject: [PATCH 5/8] chore: missing ^ --- packages/boilerplate/theme/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/boilerplate/theme/package.json b/packages/boilerplate/theme/package.json index d140dca0d14..c3b6a6a51a6 100644 --- a/packages/boilerplate/theme/package.json +++ b/packages/boilerplate/theme/package.json @@ -11,7 +11,7 @@ "test": "jest" }, "dependencies": { - "@storefront-ui/vue": "0.9.1", + "@storefront-ui/vue": "^0.9.1", "@vue-storefront/boilerplate": "0.0.1", "@vue-storefront/nuxt": "^2.2.0", "@nuxtjs/style-resources": "^1.0.0", From 292864a3ba962d006f959b68ca7b02f10f305d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Mon, 18 Jan 2021 15:42:45 +0100 Subject: [PATCH 6/8] fixes from cr --- packages/boilerplate/theme/package.json | 2 +- packages/commercetools/theme/package.json | 2 +- packages/core/nuxt-module/package.json | 1 - packages/core/nuxt-theme-module/package.json | 3 +++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/boilerplate/theme/package.json b/packages/boilerplate/theme/package.json index c3b6a6a51a6..fb56800dc87 100644 --- a/packages/boilerplate/theme/package.json +++ b/packages/boilerplate/theme/package.json @@ -14,8 +14,8 @@ "@storefront-ui/vue": "^0.9.1", "@vue-storefront/boilerplate": "0.0.1", "@vue-storefront/nuxt": "^2.2.0", + "@vue-storefront/nuxt-theme": "^2.2.0", "@nuxtjs/style-resources": "^1.0.0", - "lodash.merge": "^4.6.2", "vue-scrollto": "^2.17.1", "vee-validate": "^3.2.3", "nuxt-i18n": "^6.5.0", diff --git a/packages/commercetools/theme/package.json b/packages/commercetools/theme/package.json index fa3552261c8..76da2ef8802 100644 --- a/packages/commercetools/theme/package.json +++ b/packages/commercetools/theme/package.json @@ -19,7 +19,7 @@ "@storefront-ui/vue": "0.9.2", "@vue-storefront/commercetools": "^1.1.0", "@vue-storefront/nuxt": "^2.2.0", - "lodash.merge": "^4.6.2", + "@vue-storefront/nuxt-theme": "^2.2.0", "vue-scrollto": "^2.17.1", "vee-validate": "^3.2.3", "nuxt-i18n": "^6.5.0", diff --git a/packages/core/nuxt-module/package.json b/packages/core/nuxt-module/package.json index 8f31a41ff92..1d07d2f17b2 100644 --- a/packages/core/nuxt-module/package.json +++ b/packages/core/nuxt-module/package.json @@ -13,7 +13,6 @@ "@vue/composition-api": "1.0.0-beta.21", "@nuxtjs/composition-api": "0.17.0", "@nuxtjs/style-resources": "^1.0.0", - "@vue-storefront/nuxt-theme": "^2.2.0", "chalk": "^2.4.2", "chokidar": "^3.3.1", "consola": "^2.10.1", diff --git a/packages/core/nuxt-theme-module/package.json b/packages/core/nuxt-theme-module/package.json index 8b1df1129ea..d275f5d454d 100644 --- a/packages/core/nuxt-theme-module/package.json +++ b/packages/core/nuxt-theme-module/package.json @@ -19,6 +19,9 @@ "vue": "^2.6.11", "vue-lazy-hydration": "^2.0.0-beta.4" }, + "dependencies": { + "lodash.merge": "^4.6.2" + }, "publishConfig": { "access": "public" } From 80dd68a5fa538eb3c9139aba62110059ec9cfa14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Tue, 19 Jan 2021 12:28:45 +0100 Subject: [PATCH 7/8] chore: update changelog --- packages/core/docs/changelog/5404.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/core/docs/changelog/5404.js diff --git a/packages/core/docs/changelog/5404.js b/packages/core/docs/changelog/5404.js new file mode 100644 index 00000000000..5d16e386c65 --- /dev/null +++ b/packages/core/docs/changelog/5404.js @@ -0,0 +1,8 @@ +module.exports = { + description: 'Moved dependencies from integration themes to nuxt-theme-module', + link: 'https://github.com/vuestorefront/vue-storefront/issues/5404', + isBreaking: false, + breakingChanges: [], + author: 'Łukasz Jędrasik', + linkToGitHubAccount: 'https://github.com/lukaszjedrasik' +}; From 02201a6dc3345fcfa4084172897eba6b8ccfeae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Tue, 19 Jan 2021 12:41:41 +0100 Subject: [PATCH 8/8] chore: update changelog --- packages/core/docs/changelog/5404.js | 8 -------- packages/core/docs/contributing/changelog.md | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 packages/core/docs/changelog/5404.js diff --git a/packages/core/docs/changelog/5404.js b/packages/core/docs/changelog/5404.js deleted file mode 100644 index 5d16e386c65..00000000000 --- a/packages/core/docs/changelog/5404.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - description: 'Moved dependencies from integration themes to nuxt-theme-module', - link: 'https://github.com/vuestorefront/vue-storefront/issues/5404', - isBreaking: false, - breakingChanges: [], - author: 'Łukasz Jędrasik', - linkToGitHubAccount: 'https://github.com/lukaszjedrasik' -}; diff --git a/packages/core/docs/contributing/changelog.md b/packages/core/docs/contributing/changelog.md index 8a48a96f128..3d46874a342 100644 --- a/packages/core/docs/contributing/changelog.md +++ b/packages/core/docs/contributing/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 2.3.0 (not relased) + +- Moved dependencies from integration themes to nuxt-theme-module ([#5404](https://github.com/vuestorefront/vue-storefront/issues/5404)) - [Łukasz Jędrasik](https://github.com/lukaszjedrasik) + + ## 2.2.0 - added bottom margin to fix visibility of last footer category ([#5253](https://github.com/DivanteLtd/vue-storefront/issues/5253)) - [BREAKING] refactored names of many factory methods and composable methods, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))