Merge pull request graphql#76 from graphql/new-source

Merge: New source

Author: leebyron

.gitignore

@@ -6,3 +6,4 @@ node_modules
 npm-debug.log
 
 /build/
+.tmp.*

README.md

@@ -1,3 +1,7 @@
+# WORK IN PROGRESS
+
+This new-source branch represents a work in progress improvement to graphql.org
+
 # Contributing
 
 Organization gh-pages deploy the `master` branch, so active development occurs

package.json

@@ -25,14 +25,17 @@
     "babel-runtime": "^5.8.20",
     "express": "^4.13.3",
     "js-yaml": "^3.4.0",
-    "react": "^0.14.3",
+    "less": "^2.7.1",
+    "react": "15.3.1",
+    "react-dom": "15.3.1",
     "sane": "^1.2.0",
     "webpack": "^1.12.1"
   },
   "dependencies": {
     "codemirror": "^5.6.0",
-    "codemirror-graphql": "^0.1.1",
-    "graphql": "^0.4.3",
+    "codemirror-graphql": "^0.5.7",
+    "graphql": "^0.7.0",
+    "graphql-tools": "^0.6.6",
     "marked": "^0.3.5"
   }
 }

resources/Site.js

@@ -40,13 +40,29 @@ async function readSite(siteRoot) {
     });
   });
 
+  // Cross-link all prev/next pages
+  var pageByUrl = Object.create(null);
+  for (var i = 0; i < site.files.length; i++) {
+    pageByUrl[path.resolve(site.files[i].url)] = site.files[i];
+  }
+
+  for (var i = 0; i < site.files.length; i++) {
+    var page = site.files[i];
+    if (page.next) {
+      page.nextPage = pageByUrl[path.resolve(page.url, page.next)];
+    }
+  }
+
   return site;
 }
 
-function buildSite(buildRoot, site) {
-  return Promise.all(site.files.map(file => {
-    return writer(buildRoot, file, site);
-  }));
+function buildSite(buildRoot, site, filter) {
+  return Promise.all(site.files
+    .filter(file =>
+      !filter ||
+      (filter.test ? filter.test(file.absPath) : filter === file.absPath))
+    .map(file => writer(buildRoot, file, site))
+  );
 }
 
 
@@ -91,6 +107,8 @@ function readFileData(absPath, relPath, stat) {
 function normalizeData(file) {
   file.isPage = file.content && isPageish(file.relPath);
   file.url = urlToFile(file);
+  var dirname = path.dirname(file.relPath);
+  file.dir = dirname === '.' ? 'docs' : dirname.split('/')[0];
   file.date = file.date ?
     Date.parse(file.date) :
     (file.stat.birthtime || file.stat.ctime);
@@ -123,6 +141,11 @@ function urlToFile(file) {
     }
   }
 
+  // Convert .less to .css
+  if (path.extname(url) === '.less') {
+    url = url.slice(0, -5) + '.css';
+  }
+
   // Assume index.html stands for the parent directory
   if (path.basename(url) === 'index.html') {
     url = path.dirname(url);

resources/build.js

@@ -11,9 +11,10 @@ var Site = require('./Site');
 
 module.exports = build;
 
-process.on('unhandledRejection', error => {
+process.on('unhandledRejection', (error, promise) => {
   console.error('Unhandled Promise Rejection:');
   console.error(error && error.stack || error);
+  console.error(promise);
 });
 
 var pwd = process.env.PWD;
@@ -23,10 +24,10 @@ var buildDir = process.env.npm_package_site_build || './_build';
 var SITE_ROOT = path.resolve(pwd, sourceDir);
 var BUILD_ROOT = path.resolve(pwd, buildDir);
 
-async function build() {
+async function build(filter) {
   console.log('building...');
   var site = await Site.readSite(SITE_ROOT);
-  await Site.buildSite(BUILD_ROOT, site);
+  await Site.buildSite(BUILD_ROOT, site, filter);
   console.log('built');
 }
 

resources/renderReactPage.js

@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+var ReactDOM = require('react-dom/server')
 var React = require('react');
 
 module.exports = renderReactPage;
@@ -21,7 +22,9 @@ function renderReactPage(options) {
   var component = options.component;
   var props = options.props;
 
-  var html = React.renderToStaticMarkup(React.createElement(component, props));
+  var html = ReactDOM.renderToStaticMarkup(
+    React.createElement(component, props)
+  );
 
   if (html.indexOf('<feed') !== -1) {
     // react remove namespace so we re-add manually

resources/watch.js

@@ -51,14 +51,48 @@ function startWatch() {
   console.log('watching...');
 }
 
+function changeFile(fileName) {
+  enqueue(fileName);
+}
+
 function deleteFile(fileName) {
-  clearCache(fileName);
-  build().catch(error => console.error(error.stack || error));
+  enqueue(fileName);
 }
 
-function changeFile(fileName) {
+const queue = [];
+
+function enqueue(fileName) {
+  queue.push(fileName);
+  if (queue.length === 1) {
+    rebuild();
+  } else {
+    console.log('queue', fileName);
+  }
+}
+
+function rebuild() {
+  const fileName = queue[0];
+  const filter =
+    /_core\//.test(fileName) ? /\.(js|md)$/ :
+    /\.less$/.test(fileName) ? /\.less$/ :
+    fileName ? SITE_ROOT + '/' + fileName :
+    null;
   clearCache(fileName);
-  build().catch(error => console.error(error.stack || error));
+  return build(filter).then(
+    () => {
+      queue.shift();
+      if (queue.length) {
+        return rebuild();
+      }
+    },
+    error => {
+      console.error(error.stack || error);
+      queue.shift();
+      if (queue.length) {
+        return rebuild();
+      }
+    }
+  );
 }
 
 function clearCache(causeFileName) {