druxt-blocks 0.13.1 → 0.14.3

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # druxt-blocks
 
+## 0.14.3
+
+### Patch Changes
+
+- Updated dependencies [2ae1d6d]
+  - druxt@0.15.0
+  - druxt-entity@0.21.4
+  - druxt-router@0.24.2
+
+## 0.14.2
+
+### Patch Changes
+
+- Updated dependencies [45bc0b9]
+  - druxt@0.14.0
+  - druxt-entity@0.21.3
+  - druxt-router@0.24.1
+
+## 0.14.1
+
+### Patch Changes
+
+- Updated dependencies [9161b38]
+  - druxt-router@0.24.0
+  - druxt-entity@0.21.2
+
+## 0.14.0
+
+### Minor Changes
+
+- e7b1533: Refactored DruxtModule fetch hooks
+
+### Patch Changes
+
+- Updated dependencies [025315a]
+  - druxt-entity@0.21.0
+  - druxt@0.13.0
+  - druxt-router@0.23.0
+
 ## 0.13.1
 
 ### Patch Changes

package/dist/components/DruxtBlock.vue

@@ -56,43 +56,6 @@ export default {
     resource: {},
   }),
 
-  /**
-   * The Nuxt Fetch hook.
-   *
-   * Fetches the Block JSON:API resource by either UUID or ID.
-   */
-  async fetch() {
-    // Build query.
-    const type = 'block--block'
-    const query = new DrupalJsonApiParams()
-
-    const fields = ((this.$druxt.settings.blocks || {}).query || {}).fields
-    if (Array.isArray(fields)) {
-      query.addFields(type, [
-        ...fields,
-        'plugin',
-        'region',
-        'settings',
-        'theme',
-      ])
-    }
-
-    // Fetch Block by UUID.
-    if (this.uuid) {
-      const id = this.uuid
-      this.resource = await this.getResource({ type, id, query })
-    }
-
-    // Fetch Block by Drupal internal ID.
-    else if (this.id) {
-      query.addFilter('drupal_internal__id', this.id)
-      const collection = await this.getCollection({ type, query })
-      this.resource = { data: collection.data[0] }
-    }
-
-    await DruxtModule.fetch.call(this)
-  },
-
   fetchKey(getCounter) {
     const parts = ['DruxtBlock', this.uuid || this.id].filter((o) => o)
     return [...parts, getCounter(parts.join(':'))].join(':')
@@ -148,6 +111,39 @@ export default {
       return componentOptions
     },
 
+    /**
+     * Fetches the Block JSON:API resource by either UUID or ID.
+     */
+    async fetchConfig() {
+      // Build query.
+      const type = 'block--block'
+      const query = new DrupalJsonApiParams()
+
+      const fields = ((this.$druxt.settings.blocks || {}).query || {}).fields
+      if (Array.isArray(fields)) {
+        query.addFields(type, [
+          ...fields,
+          'plugin',
+          'region',
+          'settings',
+          'theme',
+        ])
+      }
+
+      // Fetch Block by UUID.
+      if (this.uuid) {
+        const id = this.uuid
+        this.resource = await this.getResource({ type, id, query })
+      }
+
+      // Fetch Block by Drupal internal ID.
+      else if (this.id) {
+        query.addFilter('drupal_internal__id', this.id)
+        const collection = await this.getCollection({ type, query })
+        this.resource = { data: collection.data[0] }
+      }
+    },
+
     /**
      * Provides propsData for the DruxtWrapper.
      *

package/dist/components/DruxtBlockRegion.vue

@@ -58,27 +58,6 @@ export default {
     blocks: []
   }),
 
-  /**
-   * The Nuxt Fetch hook.
-   *
-   * Fetches all blocks by region and theme.
-   */
-  async fetch() {
-    const type = 'block--block'
-    const query = new DrupalJsonApiParams()
-    query
-      .addFilter('region', this.name)
-      .addFilter('status', '1')
-      .addFilter('theme', this.theme)
-      .addSort('weight')
-      .addFields(type, ['drupal_internal__id', 'visibility', 'weight'])
-
-    const collection = await this.getCollection({ type, query })
-    this.blocks = collection.data
-
-    await DruxtModule.fetch.call(this)
-  },
-
   fetchKey(getCounter) {
     const parts = ['DruxtBlockRegion', this.name].filter((o) => o)
     return [...parts, getCounter(parts.join(':'))].join(':')
@@ -146,6 +125,23 @@ export default {
      */
     componentOptions: ({ name, theme }) => [[name, theme], ['default']],
 
+    /**
+     * Fetches all blocks by region and theme.
+     */
+    async fetchConfig() {
+      const type = 'block--block'
+      const query = new DrupalJsonApiParams()
+      query
+        .addFilter('region', this.name)
+        .addFilter('status', '1')
+        .addFilter('theme', this.theme)
+        .addSort('weight')
+        .addFields(type, ['drupal_internal__id', 'visibility', 'weight'])
+
+      const collection = await this.getCollection({ type, query })
+      this.blocks = collection.data
+    },
+
     /**
      * Provides propsData for the DruxtWrapper.
      *

package/dist/druxt-blocks.esm.js

@@ -5,7 +5,7 @@ import { DruxtClient } from 'druxt';
 const titleFn = (parts) => parts.map((part) => part.charAt(0).toUpperCase() + part.slice(1).replace(/_/g, " ")).join("/");
 async function DruxtBlocksStorybook({ stories }) {
   const { addTemplate, options } = this;
-  const druxt = new DruxtClient(options.druxt.baseUrl, options.druxt);
+  const druxt = new DruxtClient(options.druxt.baseUrl, { ...options.druxt, proxy: { api: false } });
   const query = new DrupalJsonApiParams().addFilter("status", true);
   const blocks = (await druxt.getCollectionAll("block--block", query)).map((collection) => collection.data).flat();
   const blockStories = blocks.map((block) => {

package/dist/druxt-blocks.ssr.js

@@ -9,7 +9,7 @@ const druxt = require('druxt');
 const titleFn = (parts) => parts.map((part) => part.charAt(0).toUpperCase() + part.slice(1).replace(/_/g, " ")).join("/");
 async function DruxtBlocksStorybook({ stories }) {
   const { addTemplate, options } = this;
-  const druxt$1 = new druxt.DruxtClient(options.druxt.baseUrl, options.druxt);
+  const druxt$1 = new druxt.DruxtClient(options.druxt.baseUrl, { ...options.druxt, proxy: { api: false } });
   const query = new drupalJsonapiParams.DrupalJsonApiParams().addFilter("status", true);
   const blocks = (await druxt$1.getCollectionAll("block--block", query)).map((collection) => collection.data).flat();
   const blockStories = blocks.map((block) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-blocks",
-  "version": "0.13.1",
+  "version": "0.14.3",
   "description": "Drupal Block and Block Region Druxt components.",
   "keywords": [
     "block",
@@ -44,9 +44,9 @@
   "dependencies": {
     "axios": "^0.21.1",
     "drupal-jsonapi-params": "^1.1.12",
-    "druxt": "^0.12.0",
-    "druxt-entity": "^0.20.0",
-    "druxt-router": "^0.22.0"
+    "druxt": "^0.15.0",
+    "druxt-entity": "^0.21.4",
+    "druxt-router": "^0.24.2"
   },
   "optionalDependencies": {
     "vue": "^2.6.14",