Merge branch 'release/0.23.1'

druxt · Nov 2, 2023 · 15651ad · 15651ad
2 parents 530a489 + 1d1b8a9
commit 15651ad
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 20 deletions.
diff --git 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
@@ -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/druxt/src/components/DruxtWrapper.vue b/packages/druxt/src/components/DruxtWrapper.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <slot />
+    <slot v-bind="{ ...$parent.$attrs }" />
   </div>
 </template>
 

diff --git 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`] = `
 "<div data=\\"true\\">
-  <div data=\\"true\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"true\\"><label><strong>Status:</strong><br>
-      <div><input type=\\"checkbox\\"></div></label></div>
+  <div data=\\"true\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"true\\"><label><strong data=\\"true\\">Status:</strong><br>
+      <div><input data=\\"true\\" type=\\"checkbox\\"></div></label></div>
 </div>"
 `;
 
 exports[`DruxtField datetime - form 1`] = `
 "<div data=\\"2021-10-25T00:48:44+00:00\\">
-  <div data=\\"2021-10-25T00:48:44+00:00\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"2021-10-25T00:48:44+00:00\\"><label><strong>Created:</strong><br>
-      <div><input type=\\"datetime-local\\"></div></label></div>
+  <div data=\\"2021-10-25T00:48:44+00:00\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"2021-10-25T00:48:44+00:00\\"><label><strong data=\\"2021-10-25T00:48:44+00:00\\">Created:</strong><br>
+      <div><input data=\\"2021-10-25T00:48:44+00:00\\" type=\\"datetime-local\\"></div></label></div>
 </div>"
 `;
 
 exports[`DruxtField fallback - form 1`] = `
 "<div data=\\"[object Object]\\">
-  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><label><strong>Path:</strong><br>
-      <div><textarea></textarea></div></label></div>
+  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><label><strong data=\\"[object Object]\\">Path:</strong><br>
+      <div><textarea data=\\"[object Object]\\"></textarea></div></label></div>
 </div>"
 `;
 
@@ -43,13 +43,13 @@ exports[`DruxtField image - view 1`] = `
 
 exports[`DruxtField link - view 1`] = `
 "<div data=\\"[object Object]\\">
-  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><a href=\\"https://druxtjs.org\\" target=\\"_blank\\">DruxtJS</a></div>
+  <div data=\\"[object Object]\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"[object Object]\\"><a data=\\"[object Object]\\" href=\\"https://druxtjs.org\\" target=\\"_blank\\">DruxtJS</a></div>
 </div>"
 `;
 
 exports[`DruxtField text - form 1`] = `
 "<div data=\\"About Umami\\">
-  <div data=\\"About Umami\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"About Umami\\"><label><strong>Title:</strong><br>
-      <div><input></div></label></div>
+  <div data=\\"About Umami\\" errors=\\"\\" schema=\\"[object Object]\\" value=\\"About Umami\\"><label><strong data=\\"About Umami\\">Title:</strong><br>
+      <div><input data=\\"About Umami\\"></div></label></div>
 </div>"
 `;
diff --git 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]
+  - [email protected]
+
 ## 0.19.1
 
 ### Patch Changes

diff --git 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/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)
 }
diff --git 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]
+  - [email protected]
+
 ## 0.29.1
 
 ### Patch Changes

diff --git 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": {

diff --git 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)

diff --git 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