From 5dbc2ddcdc02600ea06336b05a66633c07ca71be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 11:32:43 +1000 Subject: [PATCH 1/5] chore(deps): bump word-wrap from 1.2.3 to 1.2.4 (#659) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2891457d2..8247bff87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23992,9 +23992,9 @@ typescript@^4.3.5: linkType: hard "word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f + version: 1.2.4 + resolution: "word-wrap@npm:1.2.4" + checksum: 8f1f2e0a397c0e074ca225ba9f67baa23f99293bc064e31355d426ae91b8b3f6b5f6c1fc9ae5e9141178bb362d563f55e62fd8d5c31f2a77e3ade56cb3e35bd1 languageName: node linkType: hard From 7664d90d51ecd7a91218147299dde2b6e5a3592d Mon Sep 17 00:00:00 2001 From: Stuart Clark Date: Tue, 25 Jul 2023 11:34:01 +1000 Subject: [PATCH 2/5] feat(#87): add attrs passthrough to DruxtWrapper component (#657) * feat(#87): add attrs passthrough to DruxtWrapper component * chore(#87): update test snapshot --- .changeset/small-jeans-smell.md | 5 +++++ packages/druxt/src/components/DruxtWrapper.vue | 2 +- .../__snapshots__/DruxtField.test.js.snap | 18 +++++++++--------- 3 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 .changeset/small-jeans-smell.md diff --git a/.changeset/small-jeans-smell.md b/.changeset/small-jeans-smell.md new file mode 100644 index 000000000..573d9cb42 --- /dev/null +++ b/.changeset/small-jeans-smell.md @@ -0,0 +1,5 @@ +--- +"druxt": minor +--- + +feat(#87): add attrs passthrough to DruxtWrapper component diff --git a/packages/druxt/src/components/DruxtWrapper.vue b/packages/druxt/src/components/DruxtWrapper.vue index 7d6d41df1..aa26ebc9c 100644 --- a/packages/druxt/src/components/DruxtWrapper.vue +++ b/packages/druxt/src/components/DruxtWrapper.vue @@ -1,6 +1,6 @@ diff --git a/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap b/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap index ae1570ccd..76a53d59d 100644 --- a/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap +++ b/packages/entity/test/components/__snapshots__/DruxtField.test.js.snap @@ -2,22 +2,22 @@ exports[`DruxtField boolean - form 1`] = ` "
-
+
" `; exports[`DruxtField datetime - form 1`] = ` "
-
+
" `; exports[`DruxtField fallback - form 1`] = ` "
-
+
" `; @@ -43,13 +43,13 @@ exports[`DruxtField image - view 1`] = ` exports[`DruxtField link - view 1`] = ` "
-
DruxtJS
+
DruxtJS
" `; exports[`DruxtField text - form 1`] = ` "
-
+
" `; From 86094105534af2c13816625feafe4b4c8d9b9668 Mon Sep 17 00:00:00 2001 From: Stuart Clark Date: Tue, 25 Jul 2023 12:09:34 +1000 Subject: [PATCH 3/5] feat(#660): add @nuxtjs/axios support to router (#661) --- .changeset/weak-years-jump.md | 5 +++++ packages/router/templates/plugin.js | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .changeset/weak-years-jump.md diff --git a/.changeset/weak-years-jump.md b/.changeset/weak-years-jump.md new file mode 100644 index 000000000..4c74fc1d5 --- /dev/null +++ b/.changeset/weak-years-jump.md @@ -0,0 +1,5 @@ +--- +"druxt-router": minor +--- + +feat(#660): added @nuxtjs/axios support to the Router plugin. diff --git a/packages/router/templates/plugin.js b/packages/router/templates/plugin.js index 9510d6493..52795187b 100644 --- a/packages/router/templates/plugin.js +++ b/packages/router/templates/plugin.js @@ -1,6 +1,6 @@ import { DruxtRouter } from 'druxt-router' -export default (context, inject) => { +export default ({ app }, inject) => { const baseUrl = '<%= options.baseUrl %>' const options = {} @@ -24,6 +24,9 @@ export default (context, inject) => { <% if (typeof options.axios === 'object') { %> // Axios settings. options.axios = <%= JSON.stringify(options.axios) %> + <% } else { %> + // Use the @nuxtjs/axios module Axios instance. + options.axios = app.$axios <% } %> const router = new DruxtRouter(baseUrl, options) From 86c8235bd7bff537096902856161b94c881189c9 Mon Sep 17 00:00:00 2001 From: Stuart Clark Date: Thu, 2 Nov 2023 12:48:31 +1100 Subject: [PATCH 4/5] fix(#679): add nuxt auth axios instance to plugin (#680) * fix(#679): add nuxt auth axios instance to plugin * chore(#679): add changeset --- .changeset/wise-months-double.md | 5 +++++ packages/menu/templates/plugin.js | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .changeset/wise-months-double.md diff --git a/.changeset/wise-months-double.md b/.changeset/wise-months-double.md new file mode 100644 index 000000000..cfae10222 --- /dev/null +++ b/.changeset/wise-months-double.md @@ -0,0 +1,5 @@ +--- +"druxt-menu": patch +--- + +feat(#679): Adds Nuxt Auth Axios instance to the DruxtMenu plugin to ensure correct results are provided when authenticated. diff --git a/packages/menu/templates/plugin.js b/packages/menu/templates/plugin.js index bc4386018..9d09a99cc 100644 --- a/packages/menu/templates/plugin.js +++ b/packages/menu/templates/plugin.js @@ -1,6 +1,6 @@ import { DruxtMenu } from 'druxt-menu' -export default (context, inject) => { +export default ({ app }, inject) => { const baseUrl = '<%= options.baseUrl %>' const options = {} @@ -12,6 +12,14 @@ export default (context, inject) => { options.menu = <%= JSON.stringify(options.menu) %> <% } %> + <% if (typeof options.axios === 'object') { %> + // Axios settings. + options.axios = <%= JSON.stringify(options.axios) %> + <% } else { %> + // Use the @nuxtjs/axios module Axios instance. + options.axios = app.$axios + <% } %> + const druxtMenu = new DruxtMenu(baseUrl, options) inject('druxtMenu', druxtMenu) } From 1d1b8a95e596f7fab4679ace9977268fb5d6f9b3 Mon Sep 17 00:00:00 2001 From: Stuart Clark Date: Thu, 2 Nov 2023 12:55:58 +1100 Subject: [PATCH 5/5] chore: update versions --- .changeset/small-jeans-smell.md | 5 ----- .changeset/weak-years-jump.md | 5 ----- .changeset/wise-months-double.md | 5 ----- packages/druxt/CHANGELOG.md | 6 ++++++ packages/druxt/package.json | 2 +- packages/menu/CHANGELOG.md | 8 ++++++++ packages/menu/package.json | 4 ++-- packages/router/CHANGELOG.md | 11 +++++++++++ packages/router/package.json | 4 ++-- 9 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 .changeset/small-jeans-smell.md delete mode 100644 .changeset/weak-years-jump.md delete mode 100644 .changeset/wise-months-double.md diff --git a/.changeset/small-jeans-smell.md b/.changeset/small-jeans-smell.md deleted file mode 100644 index 573d9cb42..000000000 --- a/.changeset/small-jeans-smell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"druxt": minor ---- - -feat(#87): add attrs passthrough to DruxtWrapper component diff --git a/.changeset/weak-years-jump.md b/.changeset/weak-years-jump.md deleted file mode 100644 index 4c74fc1d5..000000000 --- a/.changeset/weak-years-jump.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"druxt-router": minor ---- - -feat(#660): added @nuxtjs/axios support to the Router plugin. diff --git a/.changeset/wise-months-double.md b/.changeset/wise-months-double.md deleted file mode 100644 index cfae10222..000000000 --- a/.changeset/wise-months-double.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"druxt-menu": patch ---- - -feat(#679): Adds Nuxt Auth Axios instance to the DruxtMenu plugin to ensure correct results are provided when authenticated. diff --git a/packages/druxt/CHANGELOG.md b/packages/druxt/CHANGELOG.md index cb98731a7..42aea4fd3 100644 --- a/packages/druxt/CHANGELOG.md +++ b/packages/druxt/CHANGELOG.md @@ -1,5 +1,11 @@ # druxt +## 0.24.0 + +### Minor Changes + +- 7664d90d: feat(#87): add attrs passthrough to DruxtWrapper component + ## 0.22.0 ### Minor Changes diff --git a/packages/druxt/package.json b/packages/druxt/package.json index 17d48ce6a..02184ac60 100644 --- a/packages/druxt/package.json +++ b/packages/druxt/package.json @@ -1,6 +1,6 @@ { "name": "druxt", - "version": "0.22.0", + "version": "0.24.0", "description": "The Fully Decoupled Drupal Framework for Nuxt.js.", "keywords": [ "cms", diff --git a/packages/menu/CHANGELOG.md b/packages/menu/CHANGELOG.md index 5132fd906..566013bf5 100644 --- a/packages/menu/CHANGELOG.md +++ b/packages/menu/CHANGELOG.md @@ -1,5 +1,13 @@ # druxt-menu +## 0.19.2 + +### Patch Changes + +- 86c8235b: feat(#679): Adds Nuxt Auth Axios instance to the DruxtMenu plugin to ensure correct results are provided when authenticated. +- Updated dependencies [7664d90d] + - druxt@0.24.0 + ## 0.19.1 ### Patch Changes diff --git a/packages/menu/package.json b/packages/menu/package.json index 5a8e91383..f16749702 100644 --- a/packages/menu/package.json +++ b/packages/menu/package.json @@ -1,6 +1,6 @@ { "name": "druxt-menu", - "version": "0.19.1", + "version": "0.19.2", "description": "Drupal Menu and Menu item Druxt components, with support for the JSON:API Menu Items module.", "keywords": [ "cms", @@ -44,7 +44,7 @@ "dependencies": { "deepmerge": "^4.3.1", "drupal-jsonapi-params": "^2.2.0", - "druxt": "^0.22.0", + "druxt": "^0.24.0", "druxt-blocks": "^0.17.1" }, "optionalDependencies": { diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md index dc8b08de0..77ff873f3 100644 --- a/packages/router/CHANGELOG.md +++ b/packages/router/CHANGELOG.md @@ -1,5 +1,16 @@ # druxt-router +## 0.31.0 + +### Minor Changes + +- 86094105: feat(#660): added @nuxtjs/axios support to the Router plugin. + +### Patch Changes + +- Updated dependencies [7664d90d] + - druxt@0.24.0 + ## 0.29.1 ### Patch Changes diff --git a/packages/router/package.json b/packages/router/package.json index b374f13ee..97afb466d 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "druxt-router", - "version": "0.29.1", + "version": "0.31.0", "description": "Drupal router for Nuxt, powered by the Drupal Decoupled Router module.", "keywords": [ "cms", @@ -42,7 +42,7 @@ "templates" ], "dependencies": { - "druxt": "^0.22.0", + "druxt": "^0.24.0", "url-parse": "^1.5.10" }, "devDependencies": {