[1.0] Change directory structure

.gitignore

@@ -38,4 +38,4 @@ test/**/public
 .DS_Store
 public/
 node_modules/
-.intermediate-representation/
+.cache/

.vscode/settings.json

@@ -0,0 +1,6 @@
+// Place your settings in this file to overwrite the default settings
+{
+  "prettier.semi": false,
+  "prettier.trailingComma": "es5",
+  "editor.formatOnSave": true
+}

docs/docs/gatsby-on-windows.md

@@ -16,3 +16,7 @@ powershell console. On installing this package, it downloads and installs the
 Visual C++ Build Tools 2015, provided free of charge by Microsoft. These tools
 are required to compile popular native modules. It will also install Python
 2.7, configuring your machine and npm appropriately.
+
+## Installing dependencies without troubles.
+
+Run `yarn` or `npm i` in **a powershell console** to have a correct build (some issues with sharp and sqlite3 with a bash console)

examples/gatsbygram/.gitignore

@@ -1,3 +1,3 @@
 public
-.intermediate-representation
+.cache
 node_modules

examples/gatsbygram/gatsby-node.js

@@ -41,7 +41,7 @@ exports.createPages = ({ graphql, actionCreators }) => {
       }
 
       // Create image post pages.
-      const postTemplate = path.resolve(`templates/post-page.js`)
+      const postTemplate = path.resolve(`src/templates/post-page.js`)
       // We want to create a detailed page for each
       // Instagram post. Since the scrapped Instagram data
       // already includes an ID field, we just use that for

examples/gatsbygram/html.js → examples/gatsbygram/src/html.js

@@ -4,12 +4,12 @@ import DocumentTitle from "react-document-title"
 //import { prefixLink } from 'gatsby-helpers'
 import { GoogleFont, TypographyStyle } from "react-typography"
 import typography from "./utils/typography"
-import logo from "!file-loader!./images/logo.png"
+import logo from "!file-loader!../static/images/logo.png"
 
 let stylesStr
 if (process.env.NODE_ENV === `production`) {
   try {
-    stylesStr = require("!raw-loader!./public/styles.css")
+    stylesStr = require("!raw-loader!../public/styles.css")
   } catch (e) {
     console.log(e)
   }

packages/gatsby-dev-cli/README.md

@@ -9,7 +9,7 @@ It's a simple cli tool for have easily a functionnal development environment for
 Fork gatsby repo and clone it.
 
 ```bash
-$ npm install -g gatsby-cli-tools@canary
+$ npm install -g gatsby-dev-cli@canary
 $ gatsby-dev --set-path-to-repo /path/to/my/cloned/version/gatsby
 ```
 

packages/gatsby-link/README.md

@@ -21,8 +21,9 @@ Edge), this component will also preload code chunks on these browsers.
 
 ## How to use
 
+In javascript:
 ```jsx
-const Link = require('gatsby-link')
+import Link from "gatsby-link"
 
 render () {
   <div>
@@ -31,6 +32,9 @@ render () {
       activeStyle={{
         color: 'red'
       }}
+    >
+    Another page
+    </Link>
   </div>
 }
 ```

packages/gatsby-link/index.d.ts

@@ -0,0 +1,7 @@
+import { ClassicComponentClass } from "react";
+import { LinkProps } from "react-router";
+
+type GatsbyLink = ClassicComponentClass<LinkProps>;
+declare const GatsbyLink: GatsbyLink;
+
+export = GatsbyLink;

packages/gatsby-link/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0-alpha12",
   "description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
   "main": "index.js",
+  "types": "index.d.ts",
   "scripts": {
     "build": "babel src --out-dir .",
     "watch": "babel -w src --out-dir ."
@@ -15,5 +16,8 @@
   "license": "MIT",
   "devDependencies": {
     "babel-cli": "^6.18.0"
+  },
+  "dependencies": {
+    "@types/react-router": "^2.0.49"
   }
 }

packages/gatsby-plugin-typescript/README.md

@@ -2,7 +2,7 @@
 Provides drop-in support for TypeScript and TSX.
 
 ## Install
-`yarn add gatsby-plugin-typescript`
+`yarn add gatsby-plugin-typescript ts-loader typescript`
 
 ## How to use
 1. Include the plugin in your `gatsby-config.js` file.

packages/gatsby-source-filesystem/src/gatsby-node.js

@@ -1,14 +1,8 @@
-import Promise from "bluebird"
-import mapLimit from "async/mapLimit"
-
 const path = require("path")
 const md5File = require("md5-file")
-const recursive = require("recursive-readdir")
 const fs = require("fs")
 const prettyBytes = require("pretty-bytes")
-const u = require("unist-builder")
 const slash = require("slash")
-const _ = require("lodash")
 const chokidar = require("chokidar")
 
 function readFile(file, pluginOptions, cb) {
@@ -27,7 +21,7 @@ function readFile(file, pluginOptions, cb) {
           sourceName: pluginOptions.name,
           children: [],
           relativePath: slash(
-            path.posix.relative(pluginOptions.path, slashedFile.absolutePath)
+            path.relative(pluginOptions.path, slashedFile.absolutePath)
           ),
           extension: slashedFile.ext.slice(1).toLowerCase(),
           size: stats.size,
@@ -52,7 +46,6 @@ exports.sourceNodes = ({ actionCreators }, pluginOptions) => {
     plugin: `source-filesystem --- ${pluginOptions.name}`,
     ready: false,
   })
-  let testNode
   const watcher = chokidar.watch(pluginOptions.path, {
     ignored: [
       `**/*.un~`,

packages/gatsby/lib/bootstrap/index.js

@@ -7,11 +7,8 @@ import _ from "lodash"
 import slash from "slash"
 import createPath from "./create-path"
 import fs from "fs-extra"
-import Joi from "joi"
-import chalk from "chalk"
 import apiRunnerNode from "../utils/api-runner-node"
 import { graphql } from "graphql"
-import { layoutComponentChunkName } from "../utils/js-chunk-names"
 import { store } from "../redux"
 const { boundActionCreators } = require("../redux/actions")
 
@@ -33,16 +30,16 @@ const preferDefault = m => (m && m.default) || m
 
 const mkdirs = Promise.promisify(fs.mkdirs)
 const copy = Promise.promisify(fs.copy)
-const removeDir = Promise.promisify(fs.remove)
 const glob = Promise.promisify(globCB)
 
 // Path creator.
 // Auto-create pages.
 // algorithm is glob /pages directory for js/jsx/cjsx files *not*
 // underscored. Then create url w/ our path algorithm *unless* user
 // takes control of that page component in gatsby-node.
-const autoPathCreator = async (program: any) => {
-  const pagesDirectory = path.posix.join(program.directory, `pages`)
+const autoPathCreator = async () => {
+  const { program } = store.getState()
+  const pagesDirectory = path.posix.join(program.directory, `/src/pages`)
   const exts = program.extensions.map(e => `*${e}`).join("|")
   // The promisified version wasn't working for some reason
   // so we'll use sync for now.
@@ -92,15 +89,13 @@ module.exports = async (program: any) => {
   console.time(`open and validate gatsby-config.js`)
   let config = {}
   try {
-    config = require(`${program.directory}/gatsby-config`)
+    config = preferDefault(require(`${program.directory}/gatsby-config`))
   } catch (e) {
     console.log(`Couldn't open your gatsby-config.js file`)
     console.log(e)
     process.exit()
   }
 
-  config = preferDefault(config)
-
   store.dispatch({
     type: "SET_SITE_CONFIG",
     payload: config,
@@ -115,7 +110,7 @@ module.exports = async (program: any) => {
   // Also test adding to redux store.
   const processPlugin = plugin => {
     if (_.isString(plugin)) {
-      const resolvedPath = path.dirname(require.resolve(plugin))
+      const resolvedPath = slash(path.dirname(require.resolve(plugin)))
       const packageJSON = JSON.parse(
         fs.readFileSync(`${resolvedPath}/package.json`, `utf-8`)
       )
@@ -137,7 +132,7 @@ module.exports = async (program: any) => {
       }
       plugin.options.plugins = subplugins
 
-      const resolvedPath = path.dirname(require.resolve(plugin.resolve))
+      const resolvedPath = slash(path.dirname(require.resolve(plugin.resolve)))
       const packageJSON = JSON.parse(
         fs.readFileSync(`${resolvedPath}/package.json`, `utf-8`)
       )
@@ -158,7 +153,7 @@ module.exports = async (program: any) => {
 
   // Add the site's default "plugin" i.e. gatsby-x files in root of site.
   plugins.push({
-    resolve: process.cwd(),
+    resolve: slash(process.cwd()),
     name: `defaultSitePlugin`,
     version: `n/a`,
     pluginOptions: {
@@ -196,14 +191,14 @@ module.exports = async (program: any) => {
 
   // Copy our site files to the root of the site.
   console.time(`copy gatsby files`)
-  const srcDir = `${__dirname}/../intermediate-representation-dir`
-  const siteDir = `${program.directory}/.intermediate-representation`
+  const srcDir = `${__dirname}/../cache-dir`
+  const siteDir = `${program.directory}/.cache`
   try {
     // await removeDir(siteDir)
     await copy(srcDir, siteDir, { clobber: true })
-    await mkdirs(`${program.directory}/.intermediate-representation/json`)
+    await mkdirs(`${program.directory}/.cache/json`)
   } catch (e) {
-    console.log(`Unable to copy site files to .intermediate-representation`)
+    console.log(`Unable to copy site files to .cache`)
     console.log(e)
   }
 
@@ -272,10 +267,13 @@ module.exports = async (program: any) => {
   }
 
   // Collect resolvable extensions and attach to program.
-  // TODO refactor this to use Redux.
   const extensions = [`.js`, `.jsx`]
   const apiResults = await apiRunnerNode("resolvableExtensions")
-  program.extensions = apiResults.reduce((a, b) => a.concat(b), extensions)
+
+  store.dispatch({
+    type: "SET_PROGRAM_EXTENSIONS",
+    payload: _.flattenDeep([extensions, apiResults]),
+  })
 
   // Collect pages.
   await apiRunnerNode(`createPages`, {
@@ -285,7 +283,7 @@ module.exports = async (program: any) => {
   // TODO move this to own source plugin per component type
   // (js/cjsx/typescript, etc.). Only do after there's themes
   // so can cement default /pages setup in default core theme.
-  autoPathCreator(program)
+  autoPathCreator()
 
   // Copy /404/ to /404.html as many static site hosting companies expect
   // site 404 pages to be named this.

packages/gatsby/lib/intermediate-representation-dir/static-entry.js → packages/gatsby/lib/cache-dir/static-entry.js

@@ -2,15 +2,13 @@ import React from "react"
 import { renderToString, renderToStaticMarkup } from "react-dom/server"
 import { match, RouterContext } from "react-router"
 import Html from "html"
-import _ from "lodash"
-//import { prefixLink } from '../isomorphic/gatsby-helpers'
-import rootRoute from ".intermediate-representation/child-routes.js"
-import pages from "public/tmp-pages.json"
-//import { pathChunkName } from './js-chunk-names'
-import apiRunner from ".intermediate-representation/api-runner-ssr"
+import { kebabCase, get, merge } from "lodash"
+import rootRoute from "./child-routes"
+import apiRunner from "./api-runner-ssr"
+import pages from "../public/tmp-pages.json"
 
 const pathChunkName = path => {
-  const name = path === `/` ? `index` : _.kebabCase(path)
+  const name = path === `/` ? `index` : kebabCase(path)
   return `path---${name}`
 }
 
@@ -59,7 +57,7 @@ module.exports = (locals, callback) => {
         }
 
         // Add the chunk-manifest as a head component.
-        const chunkManifest = require("!raw!public/chunk-manifest.json")
+        const chunkManifest = require("!raw!../public/chunk-manifest.json")
 
         postBodyComponents.unshift(
           <script
@@ -76,7 +74,7 @@ module.exports = (locals, callback) => {
 
         let stats
         try {
-          stats = require("public/stats.json")
+          stats = require("../public/stats.json")
         } catch (e) {
           // ignore
         }
@@ -88,7 +86,7 @@ module.exports = (locals, callback) => {
         ]
         dascripts.forEach(script => {
           const fetchKey = `assetsByChunkName[${script}][0]`
-          const prefixedScript = `${linkPrefix}${_.get(stats, fetchKey, ``)}`
+          const prefixedScript = `${linkPrefix}${get(stats, fetchKey, ``)}`
 
           // Add preload <link>s for scripts.
           headComponents.unshift(
@@ -121,7 +119,7 @@ module.exports = (locals, callback) => {
           { bodyRenderProps },
           {}
         )
-        bodyRenderProps = _.merge(bodyRenderProps, pluginBodyRenderProps)
+        bodyRenderProps = merge(bodyRenderProps, pluginBodyRenderProps)
 
         const html = `<!DOCTYPE html>\n ${renderToStaticMarkup(<Html {...bodyRenderProps} headComponents={headComponents} postBodyComponents={postBodyComponents} body={body} {...renderProps} />)}`
         callback(null, html)

packages/gatsby/lib/redux/__tests__/__snapshots__/site-config.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`add site config Validates configs with unsupported options 1`] = `"The site's gatsby-config.js failed validation"`;
+exports[`add site config Validates configs with unsupported options 1`] = `"config is not defined"`;
 
 exports[`add site config allow you to add basic site config 1`] = `
 Object {

packages/gatsby/lib/redux/__tests__/nodes.js

@@ -1,5 +1,5 @@
-const { actions, boundActions } = require("../actions");
-const nodeReducer = require("../reducers/nodes");
+const { actions, boundActions } = require("../actions")
+const nodeReducer = require("../reducers/nodes")
 
 describe(`Create and update nodes`, () => {
   // TODO add these back when we stop directly consoleing errors.
@@ -23,24 +23,24 @@ describe(`Create and update nodes`, () => {
       id: `hi`,
       type: `Test`,
       pickle: true,
-    });
-    expect(action).toMatchSnapshot();
-    expect(nodeReducer(undefined, action)).toMatchSnapshot();
-  });
+    })
+    expect(action).toMatchSnapshot()
+    expect(nodeReducer(undefined, action)).toMatchSnapshot()
+  })
 
   it(`allows updating nodes`, () => {
     const action = actions.createNode({
       id: `hi`,
       type: `Test`,
       pickle: true,
-    });
+    })
     const updateAction = actions.createNode({
       id: `hi`,
       type: `Test`,
       pickle: false,
-    });
-    let state = nodeReducer(undefined, action);
-    state = nodeReducer(state, updateAction);
-    expect(state["hi"].pickle).toEqual(false);
-  });
-});
+    })
+    let state = nodeReducer(undefined, action)
+    state = nodeReducer(state, updateAction)
+    expect(state["hi"].pickle).toEqual(false)
+  })
+})