druxt-site 0.11.2 → 0.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -93,6 +93,12 @@ export default {
93
93
  regions: ({ model, value }) => model || value || [],
94
94
  },
95
95
 
96
+ watch: {
97
+ theme() {
98
+ this.$fetch()
99
+ }
100
+ },
101
+
96
102
  methods: {
97
103
  ...mapActions({ getCollection: 'druxt/getCollection' }),
98
104
  },
@@ -196,13 +202,18 @@ export default {
196
202
  *
197
203
  * @example @lang js
198
204
  * [
205
+ * 'DruxtSite[Theme][Langcode]',
199
206
  * 'DruxtSite[Theme]',
200
- * 'DruxtSiteDefault',
207
+ * 'DruxtSite[Default][Langcode]',
208
+ * 'DruxtSite[Default]',
201
209
  * ]
202
210
  *
203
211
  * @example <caption>Umami</caption> @lang js
204
212
  * [
213
+ * 'DruxtSiteUmamiEn',
205
214
  * 'DruxtSiteUmami',
215
+ * 'DruxtSiteDefaultEn',
216
+ * 'DruxtSiteDefault',
206
217
  * ]
207
218
  */
208
219
 
@@ -34,10 +34,6 @@ const DruxtSiteNuxtModule = async function(moduleOptions = {}) {
34
34
  const options = {
35
35
  baseUrl: moduleOptions.baseUrl,
36
36
  ...(this.options || {}).druxt || {},
37
- menu: {
38
- jsonApiMenuItems: true,
39
- ...((this.options || {}).druxt || {}).menu
40
- },
41
37
  proxy: {
42
38
  api: false,
43
39
  files: true,
@@ -64,7 +60,7 @@ const DruxtSiteNuxtModule = async function(moduleOptions = {}) {
64
60
  "druxt-views"
65
61
  ];
66
62
  for (const module of druxtModules) {
67
- this.addModule(module);
63
+ await this.addModule(module);
68
64
  }
69
65
  if (!await existsSync(resolve(this.options.srcDir, this.options.dir.layouts)) && options.site.layout) {
70
66
  this.addLayout(resolve(__dirname, "./layouts/default.vue"), "default");
@@ -77,6 +73,10 @@ DruxtSiteNuxtModule.meta = require("../package.json");
77
73
 
78
74
  const DruxtSiteMixin = {
79
75
  props: {
76
+ langcode: {
77
+ type: String,
78
+ default: void 0
79
+ },
80
80
  props: {
81
81
  type: Object,
82
82
  default: () => ({})
@@ -92,5 +92,4 @@ const DruxtSiteMixin = {
92
92
  }
93
93
  };
94
94
 
95
- export default DruxtSiteNuxtModule;
96
- export { DruxtSiteMixin };
95
+ export { DruxtSiteMixin, DruxtSiteNuxtModule as default };
@@ -38,10 +38,6 @@ const DruxtSiteNuxtModule = async function(moduleOptions = {}) {
38
38
  const options = {
39
39
  baseUrl: moduleOptions.baseUrl,
40
40
  ...(this.options || {}).druxt || {},
41
- menu: {
42
- jsonApiMenuItems: true,
43
- ...((this.options || {}).druxt || {}).menu
44
- },
45
41
  proxy: {
46
42
  api: false,
47
43
  files: true,
@@ -68,7 +64,7 @@ const DruxtSiteNuxtModule = async function(moduleOptions = {}) {
68
64
  "druxt-views"
69
65
  ];
70
66
  for (const module of druxtModules) {
71
- this.addModule(module);
67
+ await this.addModule(module);
72
68
  }
73
69
  if (!await fs.existsSync(path.resolve(this.options.srcDir, this.options.dir.layouts)) && options.site.layout) {
74
70
  this.addLayout(path.resolve(__dirname, "./layouts/default.vue"), "default");
@@ -81,6 +77,10 @@ DruxtSiteNuxtModule.meta = require("../package.json");
81
77
 
82
78
  const DruxtSiteMixin = {
83
79
  props: {
80
+ langcode: {
81
+ type: String,
82
+ default: void 0
83
+ },
84
84
  props: {
85
85
  type: Object,
86
86
  default: () => ({})
@@ -97,4 +97,4 @@ const DruxtSiteMixin = {
97
97
  };
98
98
 
99
99
  exports.DruxtSiteMixin = DruxtSiteMixin;
100
- exports.default = DruxtSiteNuxtModule;
100
+ exports["default"] = DruxtSiteNuxtModule;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "druxt-site",
3
- "version": "0.11.2",
3
+ "version": "0.13.0",
4
4
  "description": "Out of the box Decoupled Drupal sites with Druxt.",
5
5
  "keywords": [
6
6
  "cms",
@@ -43,15 +43,15 @@
43
43
  ],
44
44
  "dependencies": {
45
45
  "drupal-jsonapi-params": "^2.0.0",
46
- "druxt": "^0.18.2",
47
- "druxt-blocks": "^0.15.2",
48
- "druxt-breadcrumb": "^0.14.1",
49
- "druxt-entity": "^0.24.3",
50
- "druxt-menu": "^0.16.3",
51
- "druxt-router": "^0.26.1",
52
- "druxt-schema": "^0.10.3",
53
- "druxt-views": "^0.18.2",
54
- "md5": "^2.2.1"
46
+ "druxt": "^0.20.0",
47
+ "druxt-blocks": "^0.16.3",
48
+ "druxt-breadcrumb": "^0.16.0",
49
+ "druxt-entity": "^0.26.0",
50
+ "druxt-menu": "^0.18.0",
51
+ "druxt-router": "^0.28.0",
52
+ "druxt-schema": "^0.11.0",
53
+ "druxt-views": "^0.20.0",
54
+ "md5": "^2.3.0"
55
55
  },
56
56
  "optionalDependencies": {
57
57
  "vue": "^2.6.14",
@@ -1,4 +1,10 @@
1
1
  import DruxtSite from 'druxt-site/dist/components/DruxtSite.vue'
2
+ import DruxtModule from 'druxt/dist/components/DruxtModule.vue'
3
+
4
+ DruxtSite.__docgenInfo.props = [
5
+ ...DruxtModule.__docgenInfo.props,
6
+ ...DruxtSite.__docgenInfo.props,
7
+ ].sort((a, b) => a.name < b.name ? -1 : 1).filter((o) => o.name !== 'v-model')
2
8
 
3
9
  export default {
4
10
  title: 'Druxt/Site/DruxtSite',
@@ -50,7 +56,9 @@ export const Wrapper = (args, { argTypes }) => ({
50
56
  })
51
57
  Wrapper.parameters = {
52
58
  docs: {
53
- storyDescription: 'The DruxtSite component can be themed by using a Druxt Wrapper component.\n\nCreate an appropriately named component, using the relevant component option, with the following boilerplate:\n\n```jsx\n' + code + '\n```',
59
+ description: {
60
+ story: 'The DruxtSite component can be themed by using a Druxt Wrapper component.\n\nCreate an appropriately named component, using the relevant component option, with the following boilerplate:\n\n```jsx\n' + code + '\n```',
61
+ },
54
62
  source: { code }
55
63
  }
56
64
  }
@@ -69,7 +77,9 @@ export const TemplateInjection = (args, { argTypes }) => ({
69
77
  })
70
78
  TemplateInjection.parameters = {
71
79
  docs: {
72
- storyDescription: 'The DruxtSite component can be themed by injecting the default template into the compomnent.\n\n```jsx\n' + code + '\n```',
80
+ description: {
81
+ story: 'The DruxtSite component can be themed by injecting the default template into the compomnent.\n\n```jsx\n' + code + '\n```',
82
+ },
73
83
  source: { code }
74
84
  }
75
85
  }