druxt 0.17.0 → 0.18.0

package/dist/druxt.esm.js

@@ -9,7 +9,7 @@ import Vue from 'vue';
 import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
 
 var name = "druxt";
-var version = "0.17.0";
+var version = "0.18.0";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -47,8 +47,8 @@ var files = [
 	"templates"
 ];
 var dependencies = {
+	"@nuxtjs/axios": "^5.13.6",
 	"@nuxtjs/proxy": "^2.1.0",
-	axios: "^0.21.1",
 	chalk: "^4.1.2",
 	deepmerge: "^4.2.2",
 	"drupal-jsonapi-params": "^1.2.1",
@@ -60,6 +60,7 @@ var devDependencies = {
 	"@storybook/addon-docs": "^6.4.13"
 };
 var peerDependencies = {
+	axios: "*",
 	consola: "*"
 };
 var optionalDependencies = {
@@ -124,6 +125,14 @@ const DruxtNuxtModule = function(moduleOptions = {}) {
     }
     this.addModule("@nuxtjs/proxy");
   }
+  if (!options.axios) {
+    this.options.axios = {
+      baseURL: options.baseUrl,
+      proxy: !!this.options.proxy,
+      ...this.options.axios
+    };
+    this.addModule("@nuxtjs/axios");
+  }
   this.nuxt.hook("components:dirs", (dirs) => {
     dirs.push({ path: join(__dirname, "components") });
   });
@@ -135,10 +144,13 @@ const DruxtNuxtModule = function(moduleOptions = {}) {
   const extendPlugins = this.options.extendPlugins;
   this.options.extendPlugins = (plugins) => {
     plugins = typeof extendPlugins === "function" ? extendPlugins(plugins) : plugins;
-    const index = plugins.findIndex(({ src }) => src === `${this.options.buildDir}/druxt.js`);
-    const plugin = plugins[index];
-    plugins.splice(index, 1);
-    plugins.unshift(plugin);
+    const axiosIndex = plugins.findIndex(({ src }) => src === `${this.options.buildDir}/axios.js`);
+    const axiosPlugin = plugins[axiosIndex];
+    plugins.splice(axiosIndex, 1);
+    const druxtIndex = plugins.findIndex(({ src }) => src === `${this.options.buildDir}/druxt.js`);
+    const druxtPlugin = plugins[druxtIndex];
+    plugins.splice(druxtIndex, 1);
+    plugins = [axiosPlugin, druxtPlugin, ...plugins];
     return plugins;
   };
   this.addPlugin({
@@ -165,14 +177,15 @@ class DruxtClient {
     if (!baseUrl) {
       throw new Error("The 'baseUrl' parameter is required.");
     }
-    let axiosSettings = {};
-    if (baseUrl && !(options.proxy || {}).api) {
-      axiosSettings.baseURL = baseUrl;
-    }
-    if (typeof options.axios === "object") {
-      axiosSettings = Object.assign(axiosSettings, options.axios);
+    this.axios = {};
+    if (typeof options.axios === "function") {
+      this.axios = options.axios;
+    } else {
+      this.axios = axios.create({
+        ...options.axios || {},
+        baseURL: baseUrl
+      });
     }
-    this.axios = axios.create(axiosSettings);
     if (options.debug) {
       const log = this.log;
       this.axios.interceptors.request.use((config) => {

package/dist/druxt.ssr.js

@@ -22,7 +22,7 @@ const md5__default = /*#__PURE__*/_interopDefaultLegacy(md5);
 const Vue__default = /*#__PURE__*/_interopDefaultLegacy(Vue);
 
 var name = "druxt";
-var version = "0.17.0";
+var version = "0.18.0";
 var description = "The Fully Decoupled Drupal Framework for Nuxt.js.";
 var keywords = [
 	"cms",
@@ -60,8 +60,8 @@ var files = [
 	"templates"
 ];
 var dependencies = {
+	"@nuxtjs/axios": "^5.13.6",
 	"@nuxtjs/proxy": "^2.1.0",
-	axios: "^0.21.1",
 	chalk: "^4.1.2",
 	deepmerge: "^4.2.2",
 	"drupal-jsonapi-params": "^1.2.1",
@@ -73,6 +73,7 @@ var devDependencies = {
 	"@storybook/addon-docs": "^6.4.13"
 };
 var peerDependencies = {
+	axios: "*",
 	consola: "*"
 };
 var optionalDependencies = {
@@ -137,6 +138,14 @@ const DruxtNuxtModule = function(moduleOptions = {}) {
     }
     this.addModule("@nuxtjs/proxy");
   }
+  if (!options.axios) {
+    this.options.axios = {
+      baseURL: options.baseUrl,
+      proxy: !!this.options.proxy,
+      ...this.options.axios
+    };
+    this.addModule("@nuxtjs/axios");
+  }
   this.nuxt.hook("components:dirs", (dirs) => {
     dirs.push({ path: path.join(__dirname, "components") });
   });
@@ -148,10 +157,13 @@ const DruxtNuxtModule = function(moduleOptions = {}) {
   const extendPlugins = this.options.extendPlugins;
   this.options.extendPlugins = (plugins) => {
     plugins = typeof extendPlugins === "function" ? extendPlugins(plugins) : plugins;
-    const index = plugins.findIndex(({ src }) => src === `${this.options.buildDir}/druxt.js`);
-    const plugin = plugins[index];
-    plugins.splice(index, 1);
-    plugins.unshift(plugin);
+    const axiosIndex = plugins.findIndex(({ src }) => src === `${this.options.buildDir}/axios.js`);
+    const axiosPlugin = plugins[axiosIndex];
+    plugins.splice(axiosIndex, 1);
+    const druxtIndex = plugins.findIndex(({ src }) => src === `${this.options.buildDir}/druxt.js`);
+    const druxtPlugin = plugins[druxtIndex];
+    plugins.splice(druxtIndex, 1);
+    plugins = [axiosPlugin, druxtPlugin, ...plugins];
     return plugins;
   };
   this.addPlugin({
@@ -178,14 +190,15 @@ class DruxtClient {
     if (!baseUrl) {
       throw new Error("The 'baseUrl' parameter is required.");
     }
-    let axiosSettings = {};
-    if (baseUrl && !(options.proxy || {}).api) {
-      axiosSettings.baseURL = baseUrl;
-    }
-    if (typeof options.axios === "object") {
-      axiosSettings = Object.assign(axiosSettings, options.axios);
+    this.axios = {};
+    if (typeof options.axios === "function") {
+      this.axios = options.axios;
+    } else {
+      this.axios = axios__default['default'].create({
+        ...options.axios || {},
+        baseURL: baseUrl
+      });
     }
-    this.axios = axios__default['default'].create(axiosSettings);
     if (options.debug) {
       const log = this.log;
       this.axios.interceptors.request.use((config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "druxt",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "The Fully Decoupled Drupal Framework for Nuxt.js.",
   "keywords": [
     "cms",
@@ -38,8 +38,8 @@
     "templates"
   ],
   "dependencies": {
+    "@nuxtjs/axios": "^5.13.6",
     "@nuxtjs/proxy": "^2.1.0",
-    "axios": "^0.21.1",
     "chalk": "^4.1.2",
     "deepmerge": "^4.2.2",
     "drupal-jsonapi-params": "^1.2.1",
@@ -51,6 +51,7 @@
     "@storybook/addon-docs": "^6.4.13"
   },
   "peerDependencies": {
+    "axios": "*",
     "consola": "*"
   },
   "optionalDependencies": {

package/templates/plugin.js

@@ -1,6 +1,6 @@
 import { DruxtClient } from 'druxt'
 
-export default (context, inject) => {
+export default ({ app }, inject) => {
   const options = <%= JSON.stringify(options) %>
 
   // Disable the proxy for server side requests.
@@ -8,6 +8,15 @@ export default (context, inject) => {
     options.proxy.api = false
   }
 
+  <% if (typeof options.axios === 'object') { %>
+  // Axios settings.
+  console.warn('[druxt] Axios instance settings are deprecated, use @nuxtjs/axios module configuration instead.')
+  options.axios = <%= JSON.stringify(options.axios) %>
+  <% } else { %>
+  // Use the @nuxtjs/axios module Axios instance.
+  options.axios = app.$axios
+  <% } %>
+
   const druxt = new DruxtClient(options.baseUrl, options)
   druxt.settings = options
   inject('druxt', druxt)