druxt-blocks 0.11.1 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # druxt-blocks
 
+## 0.12.0
+
+### Minor Changes
+
+- 715e5ef: Updated component registration method to use the Nuxt `components:dirs` hook
+- 2b8c3f3: Updated to use DruxtDebug component
+
+### Patch Changes
+
+- 49454cb: Fixed path to components in Storybook
+- Updated dependencies [1ab762c]
+  - druxt-router@0.20.0
+  - druxt@0.10.0
+  - druxt-entity@0.18.0
+
 ## 0.11.1
 
 ### Patch Changes

package/dist/components/DruxtBlock.vue

@@ -49,6 +49,13 @@ export default {
     },
   },
 
+  /**
+   * @property {object} resource - The JSON:API resource object.
+   */
+  data: () => ({
+    resource: {},
+  }),
+
   /**
    * The Nuxt Fetch hook.
    *
@@ -89,13 +96,6 @@ export default {
     return [...parts, getCounter(parts.join(':'))].join(':')
   },
 
-  /**
-   * @property {object} resource - The JSON:API resource object.
-   */
-  data: () => ({
-    resource: {},
-  }),
-
   /** */
   computed: {
     /**
@@ -165,26 +165,14 @@ export default {
     slots(h) {
       const scopedSlots = {}
 
-      // Provide debug data if Nuxt is running in dev mode.
-      if (this.$nuxt.context.isDev)  {
-        scopedSlots.default = (attrs) => h(
-          'details',
-          {
-            style: {
-              border: '2px dashed lightgrey',
-              margin: '0.5em 0',
-              padding: '1em',
-            },
-          },
-          [
-            h('summary', [`[DruxtBlock] Missing wrapper component for '${((this.block || {}).attributes || {}).drupal_internal__id}'`]),
-            h('br'),
-            h('label', ['Component options:', h('ul', this.component.options.map((s) => h('li', [s])))]),
-            h('br'),
-            h('label', ['Block settings:', h('pre', [JSON.stringify(((this.block || {}).attributes || {}).settings, null, '  ')])])
-          ]
-        )
-      }
+      // Debug data.
+      scopedSlots.debug = () => h('DruxtDebug',
+        { props: { summary: `Missing wrapper component for '${((this.block || {}).attributes || {}).drupal_internal__id}'`} },
+        [
+          h('label', ['Component options:', h('ul', this.component.options.map((s) => h('li', [s])))]),
+          h('label', ['Block settings:', h('pre', [JSON.stringify(((this.block || {}).attributes || {}).settings, null, '  ')])])
+        ]
+      )
 
       return scopedSlots
     },

package/dist/components/DruxtBlockRegion.vue

@@ -51,6 +51,13 @@ export default {
     },
   },
 
+  /**
+   * @property {objects[]} blocks - The Block JSON:API resources.
+   */
+  data: () => ({
+    blocks: []
+  }),
+
   /**
    * The Nuxt Fetch hook.
    *
@@ -77,13 +84,6 @@ export default {
     return [...parts, getCounter(parts.join(':'))].join(':')
   },
 
-  /**
-   * @property {objects[]} blocks - The Block JSON:API resources.
-   */
-  data: () => ({
-    blocks: []
-  }),
-
   /**
    * @vue-computed {object} route The current Route from the [DruxtRouter vuex store](https://router.druxtjs.org/api/stores/router.html).
    */

package/dist/druxt-blocks.esm.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path';
+import { resolve, join } from 'path';
 import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
 import { DruxtClient } from 'druxt';
 
@@ -39,7 +39,7 @@ async function DruxtBlocksStorybook({ stories }) {
   stories.push.apply(stories, regionStories);
 }
 
-const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
+const DruxtBlocksNuxtModule = function() {
   const { options } = this;
   if (typeof options === "undefined" || !options.druxt) {
     throw new TypeError("Druxt settings missing.");
@@ -48,6 +48,10 @@ const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
   for (const module of modules) {
     this.addModule(module);
   }
+  this.nuxt.hook("components:dirs", (dirs) => {
+    dirs.push({ path: join(__dirname, "components") });
+    dirs.push({ path: join(__dirname, "components/blocks") });
+  });
   this.addPlugin({
     src: resolve(__dirname, "../nuxt/plugin.js"),
     fileName: "druxt-blocks.js",

package/dist/druxt-blocks.ssr.js

@@ -43,7 +43,7 @@ async function DruxtBlocksStorybook({ stories }) {
   stories.push.apply(stories, regionStories);
 }
 
-const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
+const DruxtBlocksNuxtModule = function() {
   const { options } = this;
   if (typeof options === "undefined" || !options.druxt) {
     throw new TypeError("Druxt settings missing.");
@@ -52,6 +52,10 @@ const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
   for (const module of modules) {
     this.addModule(module);
   }
+  this.nuxt.hook("components:dirs", (dirs) => {
+    dirs.push({ path: path.join(__dirname, "components") });
+    dirs.push({ path: path.join(__dirname, "components/blocks") });
+  });
   this.addPlugin({
     src: path.resolve(__dirname, "../nuxt/plugin.js"),
     fileName: "druxt-blocks.js",

package/nuxt/druxt-block-region.stories.js

@@ -1,4 +1,4 @@
-import { default as DruxtBlockRegion } from 'druxt-blocks/src/components/DruxtBlockRegion.vue'
+import DruxtBlockRegion from 'druxt-blocks/dist/components/DruxtBlockRegion.vue'
 
 export default {
   title: '<%= options.title %>',

package/nuxt/druxt-block.stories.js

@@ -1,4 +1,4 @@
-import { default as DruxtBlock } from 'druxt-blocks/src/components/DruxtBlock.vue'
+import DruxtBlock from 'druxt-blocks/dist/components/DruxtBlock.vue'
 
 export default {
   title: '<%= options.title %>',

package/nuxt/plugin.js

@@ -1,19 +1,3 @@
-import Vue from 'vue'
-
-import * as DruxtBlocksComponents from 'druxt-blocks/dist/components/index.mjs'
-
-Vue.use({
-  install: function (Vue) {
-    if (Vue._druxt_blocks_installed) return
-    Vue._druxt_blocks_installed = true
-
-    // Register components.
-    for (const component in DruxtBlocksComponents) {
-      Vue.component(component, DruxtBlocksComponents[component])
-    }
-  }
-})
-
 export default (context, inject) => {
   const options = {}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-blocks",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "description": "Drupal Block and Block Region Druxt components.",
   "keywords": [
     "block",
@@ -31,9 +31,9 @@
   "dependencies": {
     "axios": "^0.21.1",
     "drupal-jsonapi-params": "^1.1.12",
-    "druxt": "^0.9.0",
-    "druxt-entity": "^0.17.1",
-    "druxt-router": "^0.19.1"
+    "druxt": "^0.10.0",
+    "druxt-entity": "^0.18.0",
+    "druxt-router": "^0.20.0"
   },
   "optionalDependencies": {
     "vue": "^2.6.14",

package/dist/components/blocks/index.mjs

@@ -1,3 +0,0 @@
-export { default as DruxtBlockBlockContent } from './DruxtBlockBlockContent.vue'
-export { default as DruxtBlockPageTitleBlock } from './DruxtBlockPageTitleBlock.vue'
-export { default as DruxtBlockSystemMainBlock } from './DruxtBlockSystemMainBlock.vue'

package/dist/components/index.mjs

@@ -1,3 +0,0 @@
-export { default as DruxtBlock } from './DruxtBlock.vue'
-export { default as DruxtBlockRegion } from './DruxtBlockRegion.vue'
-export * from './blocks/index.mjs'