druxt-router 0.26.0 → 0.27.1

package/dist/components/DruxtRouter.vue

@@ -175,6 +175,13 @@ export default {
 
   /** */
   watch: {
+    $route() {
+      const path = this.$route.fullPath
+      if (this.$store.state.druxtRouter.routes[path] && this.$store.state.druxtRouter.route !== this.$store.state.druxtRouter.routes[path]) {
+        this.$store.commit('druxtRouter/setRoute', path)
+      }
+    },
+
     /**
      * Re-fetch on update to Path prop.
      */
@@ -272,16 +279,22 @@ export default {
  *
  * @example @lang js
  * [
+ *   'DruxtRouter[Module][IsFront?][Langcode]',
  *   'DruxtRouter[Module][IsFront?]',
- *   'DruxtRouterDefault',
+ *   'DruxtRouter[Module][Langcode]',
+ *   'DruxtRouter[Module]',
+ *   'DruxtRouter[Default][Langcode]',
+ *   'DruxtRouter[Default]',
  * ]
  *
  * @example <caption>Entity route</caption> @lang js
  * [
+ *   'DruxtRouterEntityFrontEn',
  *   'DruxtRouterEntityFront',
+ *   'DruxtRouterEntityEn',
  *   'DruxtRouterEntity',
- *   'DruxtRouterDefault',
- *   '',
+ *   'DruxtRouterDefaultEn',
+ *   'DruxtRouterDefault'
  * ]
  */
 

package/dist/components/index.mjs

@@ -4,7 +4,7 @@
  * @type {object}
  * @exports DruxtRouterComponent
  * @name DruxtRouterComponent
- * @see {@link ./components/DruxtRouter.html|DruxtRouterComponent}
+ * @see {@link ./components/DruxtRouter|DruxtRouterComponent}
  *
  * @example
  * <script>

package/dist/druxt-router.esm.js

@@ -1,5 +1,6 @@
 import { DruxtClient } from 'druxt';
 import Url from 'url-parse';
+import Vue from 'vue';
 import { mapState, mapActions } from 'vuex';
 
 class DruxtRouter {
@@ -12,6 +13,7 @@ class DruxtRouter {
           component: "druxt-entity",
           property: "entity",
           props: (route) => ({
+            langcode: route.entity.langcode,
             type: route.jsonapi.resourceName,
             uuid: route.entity.uuid
           })
@@ -23,6 +25,7 @@ class DruxtRouter {
           property: "view",
           props: (route) => ({
             displayId: route.view.display_id,
+            langcode: route.view.langcode || void 0,
             type: route.jsonapi.resourceName,
             uuid: route.view.uuid,
             viewId: route.view.view_id
@@ -60,13 +63,15 @@ class DruxtRouter {
     return this.index;
   }
   getRedirect(path, route = {}) {
+    const prefix = (route.props || {}).langcode || "";
     if (((route.redirect || [])[0] || {}).to) {
       return route.redirect[0].to;
     }
     const url = Url(path);
     if (route.isHomePath) {
-      if (url.pathname !== "/") {
-        return "/";
+      const homePath = prefix ? `/${prefix}` : "/";
+      if (!(url.pathname === homePath || url.pathname === `${homePath}/`)) {
+        return homePath;
       }
       return false;
     }
@@ -99,10 +104,10 @@ class DruxtRouter {
     return resources.data || false;
   }
   async getResourceByRoute(route) {
-    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid);
+    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid, route.prefix);
     return resource.data || false;
   }
-  async getRoute(path) {
+  async getRoute(path = "/") {
     const url = `/router/translate-path?path=${path}`;
     const response = await this.druxt.get(url, {
       validateStatus: (status) => status < 500
@@ -124,7 +129,8 @@ class DruxtRouter {
       label: data.label,
       props: false,
       redirect: data.redirect,
-      resolvedPath: Url(data.resolved).pathname
+      resolvedPath: Url(data.resolved).pathname,
+      entity: data.entity
     };
     for (const key in this.options.types) {
       const type = {
@@ -190,7 +196,7 @@ const DruxtRouterStore = ({ store }) => {
         if (typeof path !== "string" || typeof route === "undefined") {
           return;
         }
-        state.routes[path] = route;
+        Vue.set(state.routes, path, route);
       },
       setRoute(state, path) {
         if (typeof path !== "string" || typeof state.routes[path] === "undefined") {
@@ -289,6 +295,10 @@ const DruxtRouterEntityMixin = {
 
 const DruxtRouterMixin = {
   props: {
+    langcode: {
+      type: String,
+      default: void 0
+    },
     path: {
       type: String,
       default: void 0

package/dist/druxt-router.ssr.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const druxt = require('druxt');
 const Url = require('url-parse');
+const Vue = require('vue');
 const vuex = require('vuex');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 const Url__default = /*#__PURE__*/_interopDefaultLegacy(Url);
+const Vue__default = /*#__PURE__*/_interopDefaultLegacy(Vue);
 
 class DruxtRouter {
   constructor(baseUrl, options = {}) {
@@ -20,6 +22,7 @@ class DruxtRouter {
           component: "druxt-entity",
           property: "entity",
           props: (route) => ({
+            langcode: route.entity.langcode,
             type: route.jsonapi.resourceName,
             uuid: route.entity.uuid
           })
@@ -31,6 +34,7 @@ class DruxtRouter {
           property: "view",
           props: (route) => ({
             displayId: route.view.display_id,
+            langcode: route.view.langcode || void 0,
             type: route.jsonapi.resourceName,
             uuid: route.view.uuid,
             viewId: route.view.view_id
@@ -68,18 +72,20 @@ class DruxtRouter {
     return this.index;
   }
   getRedirect(path, route = {}) {
+    const prefix = (route.props || {}).langcode || "";
     if (((route.redirect || [])[0] || {}).to) {
       return route.redirect[0].to;
     }
-    const url = Url__default['default'](path);
+    const url = Url__default["default"](path);
     if (route.isHomePath) {
-      if (url.pathname !== "/") {
-        return "/";
+      const homePath = prefix ? `/${prefix}` : "/";
+      if (!(url.pathname === homePath || url.pathname === `${homePath}/`)) {
+        return homePath;
       }
       return false;
     }
     if (typeof route.canonical === "string") {
-      const canonicalUrl = new Url__default['default'](route.canonical);
+      const canonicalUrl = new Url__default["default"](route.canonical);
       if (url.pathname !== canonicalUrl.pathname) {
         return canonicalUrl.pathname;
       }
@@ -107,10 +113,10 @@ class DruxtRouter {
     return resources.data || false;
   }
   async getResourceByRoute(route) {
-    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid);
+    const resource = await this.druxt.getResource(route.jsonapi.resourceName, route.entity.uuid, route.prefix);
     return resource.data || false;
   }
-  async getRoute(path) {
+  async getRoute(path = "/") {
     const url = `/router/translate-path?path=${path}`;
     const response = await this.druxt.get(url, {
       validateStatus: (status) => status < 500
@@ -132,7 +138,8 @@ class DruxtRouter {
       label: data.label,
       props: false,
       redirect: data.redirect,
-      resolvedPath: Url__default['default'](data.resolved).pathname
+      resolvedPath: Url__default["default"](data.resolved).pathname,
+      entity: data.entity
     };
     for (const key in this.options.types) {
       const type = {
@@ -198,7 +205,7 @@ const DruxtRouterStore = ({ store }) => {
         if (typeof path !== "string" || typeof route === "undefined") {
           return;
         }
-        state.routes[path] = route;
+        Vue__default["default"].set(state.routes, path, route);
       },
       setRoute(state, path) {
         if (typeof path !== "string" || typeof state.routes[path] === "undefined") {
@@ -297,6 +304,10 @@ const DruxtRouterEntityMixin = {
 
 const DruxtRouterMixin = {
   props: {
+    langcode: {
+      type: String,
+      default: void 0
+    },
     path: {
       type: String,
       default: void 0

package/nuxt/index.d.ts

@@ -27,4 +27,4 @@ declare namespace DruxtRouterNuxtModule {
     const meta: any;
 }
 
-export default DruxtRouterNuxtModule;
+export { DruxtRouterNuxtModule as default };

package/nuxt/index.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const fs = require('fs');
 const path = require('path');
+const drupalJsonapiParams = require('drupal-jsonapi-params');
+const druxt = require('druxt');
 
 const DruxtRouterNuxtModule = async function(moduleOptions = {}) {
   const options = {
@@ -20,23 +22,42 @@ const DruxtRouterNuxtModule = async function(moduleOptions = {}) {
     dirs.push({ path: path.join(__dirname, "../dist/components") });
   });
   if (options.router.wildcard) {
+    if (!options.router.pages) {
+      this.nuxt.hook("build:before", () => this.nuxt.options.build.createRoutes = () => []);
+    }
     this.addTemplate({
       src: path.resolve(__dirname, "../templates/component.js"),
       fileName: "components/druxt-router.js",
       options
     });
-    this.extendRoutes((routes, resolve2) => {
+    let languages = [];
+    const druxt$1 = new druxt.DruxtClient(options.baseUrl, {
+      ...options,
+      proxy: { ...options.proxy || {}, api: false }
+    });
+    const languageResourceType = "configurable_language--configurable_language";
+    if (await druxt$1.getIndex(languageResourceType)) {
+      const query = new drupalJsonapiParams.DrupalJsonApiParams().addFields(languageResourceType, ["drupal_internal__id"]);
+      languages = (await druxt$1.getCollectionAll(languageResourceType, query) || []).map((o) => o.data).flat().filter((o) => !["und", "zxx"].includes(((o || {}).attributes || {}).drupal_internal__id));
+    }
+    this.extendRoutes((routes) => {
+      languages.forEach((o) => {
+        routes.push({
+          name: `druxt-router__${o.attributes.drupal_internal__id}`,
+          path: `/${o.attributes.drupal_internal__id}*`,
+          component: path.resolve(this.options.buildDir, "components/druxt-router.js"),
+          chunkName: "druxt-router",
+          meta: { langcode: o.attributes.drupal_internal__id }
+        });
+      });
       routes.push({
         name: "druxt-router",
         path: "*",
-        component: resolve2(this.options.buildDir, "components/druxt-router.js"),
+        component: path.resolve(this.options.buildDir, "components/druxt-router.js"),
         chunkName: "druxt-router"
       });
     });
   }
-  if (options.router.wildcard && !options.router.pages) {
-    this.nuxt.hook("build:before", () => this.nuxt.options.build.createRoutes = () => []);
-  }
   this.addPlugin({
     src: path.resolve(__dirname, "../templates/plugin.js"),
     fileName: "druxt-router.js",
@@ -59,4 +80,4 @@ const DruxtRouterNuxtModule = async function(moduleOptions = {}) {
 };
 DruxtRouterNuxtModule.meta = require("../package.json");
 
-exports.default = DruxtRouterNuxtModule;
+exports["default"] = DruxtRouterNuxtModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt-router",
-  "version": "0.26.0",
+  "version": "0.27.1",
   "description": "Drupal router for Nuxt, powered by the Drupal Decoupled Router module.",
   "keywords": [
     "cms",
@@ -42,8 +42,14 @@
     "templates"
   ],
   "dependencies": {
-    "druxt": "^0.17.0",
-    "url-parse": "^1.4.7"
+    "druxt": "^0.19.1",
+    "url-parse": "^1.5.10"
+  },
+  "devDependencies": {
+    "vue-router": "^3.5.4"
+  },
+  "peerDependencies": {
+    "drupal-jsonapi-params": "*"
   },
   "optionalDependencies": {
     "vue": "^2.6.14",