ff-stream-web

commit 4d62b4fd00897193bb4fc124203f29fc3beb1d3d
parent b6e088ea3caa9bd80e3c97136de18bab48b6e8c2
Author: Konstantin Tarkus <koistya@gmail.com>
Date:   Tue,  1 Mar 2016 12:42:27 +0300

Merge pull request #477 from justicepay/fiximport

small fix(data/schema.js), update webpack-hot-middleware
Diffstat:
M
package.json
 | 
2
+-
M
src/data/queries/content.js
 | 
10
+++++++---
M
src/data/queries/me.js
 | 
4
+++-
M
src/data/schema.js
 | 
7
+++++--

4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
@@ -78,7 +78,7 @@
     "replace": "^0.3.0",
     "url-loader": "^0.5.7",
     "webpack": "^1.12.14",
-    "webpack-hot-middleware": "^2.7.1",
+    "webpack-hot-middleware": "^2.8.1",
     "webpack-middleware": "^1.4.0"
   },
   "jest": {
diff --git a/src/data/queries/content.js b/src/data/queries/content.js
@@ -12,6 +12,7 @@ import { join } from 'path';
 import Promise from 'bluebird';
 import jade from 'jade';
 import fm from 'front-matter';
+import MarkdownIt from 'markdown-it';
 
 import {
   GraphQLString as StringType,
@@ -20,7 +21,7 @@ import {
 
 import ContentType from '../types/ContentType';
 
-const md = require('markdown-it')();
+const md = new MarkdownIt();
 
 // A folder with Jade/Markdown/HTML content pages
 const CONTENT_DIR = join(__dirname, './content');
@@ -42,7 +43,8 @@ const parseContent = (path, fileContent, extension) => {
     default:
       return null;
   }
-  return Object.assign({ path, content: htmlContent }, fmContent.attributes);
+  const smth = Object.assign({ path, content: htmlContent }, fmContent.attributes);
+  return smth;
 };
 
 const readFile = Promise.promisify(fs.readFile);
@@ -84,7 +86,7 @@ async function resolveFileName(path) {
   return { success: false, fileName: null, extension: null };
 }
 
-export default {
+const content = {
   type: ContentType,
   args: {
     path: { type: new NonNull(StringType) },
@@ -99,3 +101,5 @@ export default {
     return parseContent(path, source, extension);
   },
 };
+
+export default content;
diff --git a/src/data/queries/me.js b/src/data/queries/me.js
@@ -9,7 +9,7 @@
 
 import UserType from '../types/UserType';
 
-export default {
+const me = {
   type: UserType,
   resolve({ request }) {
     return request.user && {
@@ -18,3 +18,5 @@ export default {
     };
   },
 };
+
+export default me;
diff --git a/src/data/schema.js b/src/data/schema.js
@@ -12,12 +12,15 @@ import {
   GraphQLObjectType as ObjectType,
 } from 'graphql';
 
+import me from './queries/me';
+import content from './queries/content';
+
 const schema = new Schema({
   query: new ObjectType({
     name: 'Query',
     fields: {
-      me: require('./queries/me').default,
-      content: require('./queries/content').default,
+      me,
+      content,
     },
   }),
 });