druxt-blocks 0.15.1 → 0.16.1

package/dist/components/DruxtBlock.vue

@@ -171,13 +171,22 @@ export default {
       // Fetch Block by UUID.
       if (this.uuid) {
         const id = this.uuid
-        this.resource = await this.getResource({ type, id, query })
+        this.resource = await this.getResource({
+          id,
+          prefix: this.lang,
+          type,
+          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 })
+        const collection = await this.getCollection({
+          prefix: this.lang,
+          type,
+          query
+        })
         this.resource = { data: collection.data[0] }
       }
     },
@@ -238,19 +247,29 @@ export default {
  *
  * @example @lang js
  * [
+ *   'DruxtBlock[Plugin][PluginId][Region][Theme][Langcode]',
  *   'DruxtBlock[Plugin][PluginId][Region][Theme]',
+ *   'DruxtBlock[Plugin][PluginId][Theme][Langcode]',
  *   'DruxtBlock[Plugin][PluginId][Theme]',
+ *   'DruxtBlock[Plugin][Region][Theme][Langcode]',
  *   'DruxtBlock[Plugin][Region][Theme]',
+ *   'DruxtBlock[Plugin][Theme][Langcode]',
  *   'DruxtBlock[Plugin][Theme]',
+ *   'DruxtBlock[Default][Langcode]',
  *   'DruxtBlock[Default]',
  * ]
  *
  * @example <caption>Umami Branding block</caption> @lang js
  * [
+ *   'DruxtBlockSystemBrandingBlockHeaderUmamiEn',
  *   'DruxtBlockSystemBrandingBlockHeaderUmami',
+ *   'DruxtBlockSystemBrandingBlockHeaderEn',
  *   'DruxtBlockSystemBrandingBlockHeader',
+ *   'DruxtBlockSystemBrandingBlockUmamiEn',
  *   'DruxtBlockSystemBrandingBlockUmami',
+ *   'DruxtBlockSystemBrandingBlockEn',
  *   'DruxtBlockSystemBrandingBlock',
+ *   'DruxtBlockDefaultEn',
  *   'DruxtBlockDefault',
  * ]
  */

package/dist/components/DruxtBlockRegion.vue

@@ -121,7 +121,9 @@ export default {
           visible = true
         }
 
-        if (pages.includes(this.route.resolvedPath) || (!pages.includes(this.route.resolvedPath) && negate)) {
+        // Remove langcode prefix from the resolved path before comparing.
+        const resolvedPath = (this.route.resolvedPath || '').replace(new RegExp(`^/${this.lang}`), '')
+        if (pages.includes(resolvedPath) || (!pages.includes(resolvedPath) && negate)) {
           visible = true
         }
 
@@ -166,7 +168,11 @@ export default {
         .addSort('weight')
         .addFields(type, ['drupal_internal__id', 'visibility', 'weight'])
 
-      const collection = await this.getCollection({ type, query })
+      const collection = await this.getCollection({
+        prefix: this.lang,
+        type,
+        query
+      })
       this.blocks = collection.data
     },
 
@@ -209,6 +215,7 @@ export default {
             attrs,
             key: block.attributes.drupal_internal__id,
             props: {
+              langcode: this.langcode,
               uuid: block.id,
             },
             ref: block.attributes.drupal_internal__id,
@@ -235,15 +242,21 @@ export default {
  *
  * @example @lang js
  * [
+ *   'DruxtBlockRegion[Name][Theme][Langcode]',
  *   'DruxtBlockRegion[Name][Theme]',
+ *   'DruxtBlockRegion[Name][Langcode]',
  *   'DruxtBlockRegion[Name]',
+ *   'DruxtBlockRegion[Default][Langcode]',
  *   'DruxtBlockRegion[Default]',
  * ]
  *
  * @example <caption>Banner top - Umami</caption> @lang js
  * [
+ *   'DruxtBlockRegionBannerTopUmamiEn',
  *   'DruxtBlockRegionBannerTopUmami',
+ *   'DruxtBlockRegionBannerTopEn',
  *   'DruxtBlockRegionBannerTop',
+ *   'DruxtBlockRegionDefaultEn',
  *   'DruxtBlockRegionDefault',
  * ]
  */

package/dist/components/blocks/DruxtBlockBlockContent.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <DruxtEntity
-      v-if="!$fetchState.pending"
+      v-if="!$fetchState.pending && propsData"
       v-bind="propsData"
     />
   </div>
@@ -38,6 +38,7 @@ export default {
 
   async fetch() {
     await this.$store.dispatch('druxt/getResource', {
+      prefix: this.langcode,
       type: this.block.type,
       id: this.block.id,
       query: new DrupalJsonApiParams().addFields(this.block.type, ['dependencies']),
@@ -53,18 +54,19 @@ export default {
      *
      * @type {object}
      *
-     * @see {@link https://druxt.github.io/druxt-entity/api/components/DruxtEntity.html|DruxtEntity}
+     * @see {@link https://druxt.github.io/druxt-entity/api/components/DruxtEntity|DruxtEntity}
      */
-    propsData: ({ $fetchState, $store, block }) => {
+    propsData: ({ $fetchState, $store, block, langcode }) => {
       if ($fetchState.pending) return false
 
-      const resource = $store.state.druxt.resources[block.type][block.id]
-      if (!resource.data.attributes.dependencies) return false
+      const { data } = $store.state.druxt.resources[block.type][block.id][langcode]
+      if (!((data || {}).attributes || {}).dependencies) return false
 
-      const parts = resource.data.attributes.dependencies.content[0].split(':')
+      const parts = data.attributes.dependencies.content[0].split(':')
 
       return {
-        key: resource.data.attributes.dependencies.content[0],
+        key: data.attributes.dependencies.content[0],
+        langcode,
         type: `${parts[0]}--${parts[1]}`,
         uuid: parts[2]
       }

package/dist/druxt-blocks.esm.js

@@ -52,7 +52,7 @@ async function DruxtBlocksStorybook({ stories }) {
   stories.push(resolve(options.buildDir, `./stories/druxt-block-region.*.stories.js`));
 }
 
-const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
+const DruxtBlocksNuxtModule = async function(moduleOptions = {}) {
   const options = {
     baseUrl: moduleOptions.baseUrl,
     ...(this.options || {}).druxt || {},
@@ -62,7 +62,7 @@ const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
       ...moduleOptions
     }
   };
-  this.addModule(["druxt", options]);
+  await this.addModule(["druxt", options]);
   this.nuxt.hook("components:dirs", (dirs) => {
     dirs.push({ path: join(__dirname, "components") });
     dirs.push({ path: join(__dirname, "components/blocks") });
@@ -78,6 +78,10 @@ const DruxtBlocksBlockMixin = {
     block: {
       type: Object,
       require: true
+    },
+    langcode: {
+      type: String,
+      default: void 0
     }
   },
   computed: {
@@ -93,6 +97,10 @@ const DruxtBlocksRegionMixin = {
       type: Array,
       required: true
     },
+    langcode: {
+      type: String,
+      default: void 0
+    },
     name: {
       type: String,
       default: "content"
@@ -104,5 +112,4 @@ const DruxtBlocksRegionMixin = {
   }
 };
 
-export default DruxtBlocksNuxtModule;
-export { DruxtBlocksBlockMixin, DruxtBlocksRegionMixin };
+export { DruxtBlocksBlockMixin, DruxtBlocksRegionMixin, DruxtBlocksNuxtModule as default };

package/dist/druxt-blocks.ssr.js

@@ -56,7 +56,7 @@ async function DruxtBlocksStorybook({ stories }) {
   stories.push(path.resolve(options.buildDir, `./stories/druxt-block-region.*.stories.js`));
 }
 
-const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
+const DruxtBlocksNuxtModule = async function(moduleOptions = {}) {
   const options = {
     baseUrl: moduleOptions.baseUrl,
     ...(this.options || {}).druxt || {},
@@ -66,7 +66,7 @@ const DruxtBlocksNuxtModule = function(moduleOptions = {}) {
       ...moduleOptions
     }
   };
-  this.addModule(["druxt", options]);
+  await this.addModule(["druxt", options]);
   this.nuxt.hook("components:dirs", (dirs) => {
     dirs.push({ path: path.join(__dirname, "components") });
     dirs.push({ path: path.join(__dirname, "components/blocks") });
@@ -82,6 +82,10 @@ const DruxtBlocksBlockMixin = {
     block: {
       type: Object,
       require: true
+    },
+    langcode: {
+      type: String,
+      default: void 0
     }
   },
   computed: {
@@ -97,6 +101,10 @@ const DruxtBlocksRegionMixin = {
       type: Array,
       required: true
     },
+    langcode: {
+      type: String,
+      default: void 0
+    },
     name: {
       type: String,
       default: "content"
@@ -110,4 +118,4 @@ const DruxtBlocksRegionMixin = {
 
 exports.DruxtBlocksBlockMixin = DruxtBlocksBlockMixin;
 exports.DruxtBlocksRegionMixin = DruxtBlocksRegionMixin;
-exports.default = DruxtBlocksNuxtModule;
+exports["default"] = DruxtBlocksNuxtModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-blocks",
-  "version": "0.15.1",
+  "version": "0.16.1",
   "description": "Drupal Block and Block Region Druxt components.",
   "keywords": [
     "block",
@@ -42,11 +42,11 @@
     "templates"
   ],
   "dependencies": {
-    "axios": "^0.21.1",
-    "drupal-jsonapi-params": "^1.1.12",
-    "druxt": "^0.18.0",
-    "druxt-entity": "^0.24.2",
-    "druxt-router": "^0.26.1"
+    "axios": "^0.27.2",
+    "drupal-jsonapi-params": "^2.0.0",
+    "druxt": "^0.19.0",
+    "druxt-entity": "^0.25.0",
+    "druxt-router": "^0.27.0"
   },
   "optionalDependencies": {
     "vue": "^2.6.14",