config fix

Tiliavir · Sep 9, 2017 · dc4631a · dc4631a
1 parent 91c8a15
commit dc4631a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mvw-creator",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Module to generate a static website using pug, scss and typescript.",
   "license": "MIT",
   "author": {

diff --git a/ts/creator-config-schema.ts b/ts/creator-config-schema.ts
@@ -1,3 +1,5 @@
+import { SiteStructureSchema } from "mvw-navigation/js/site-structure-schema.js";
+
 export const CreatorConfigSchema: any = {
   $schema: "http://json-schema.org/draft-06/schema",
 
@@ -24,7 +26,7 @@ export const CreatorConfigSchema: any = {
     pugPath: { type: "string" },
     pugLintPath: { type: "string" },
     siteTitle: { type: "string" },
-    structureJsonPath: { type: "string" },
+    structure: { $ref: SiteStructureSchema },
     searchIndex: {
       anyOf: [{
           additionalProperties: false,
@@ -41,7 +43,7 @@ export const CreatorConfigSchema: any = {
       ]
     }
   },
-  required: ["destinationPath", "environment", "environments", "pugPath", "pugLintPath", "structureJsonPath"],
+  required: ["destinationPath", "environment", "environments", "pugPath", "pugLintPath", "structure"],
   title: "JSON Schema for the MVW Creator configuration",
   type: "object"
 };
diff --git a/ts/creator-config.ts b/ts/creator-config.ts
@@ -1,3 +1,5 @@
+import { INavigationNode } from "mvw-navigation/js";
+
 export interface ISearchIndexConfig {
   destination: string;
   bodySelector: string;
@@ -18,6 +20,6 @@ export interface ICreatorConfig {
   pugPath: string;
   pugLintPath: string;
   siteTitle?: string;
-  structure: string;
+  structure: INavigationNode[];
   searchIndex?: ISearchIndexConfig | boolean;
 }