[1.0] Change directory structure

.vscode/settings.json

@@ -0,0 +1,6 @@
+// Placez vos paramètres dans ce fichier pour remplacer les paramètres par défaut et les paramètres utilisateur.
+{
+  "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)

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,20 @@ 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 { config, program } = store.getState()
+  const pagesDirectory = path.posix.join(
+    program.directory,
+    config.rootPath,
+    `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.
@@ -90,17 +91,20 @@ module.exports = async (program: any) => {
 
   // Try opening the site's gatsby-config.js file.
   console.time(`open and validate gatsby-config.js`)
-  let config = {}
+  let config = {
+    rootPath: `/`,
+  }
   try {
-    config = require(`${program.directory}/gatsby-config`)
+    Object.assign(
+      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 +119,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 +141,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 +162,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: {
@@ -272,10 +276,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 +292,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/joi-schemas/joi.js

@@ -1,6 +1,14 @@
 const Joi = require("joi")
 
 export const gatsbyConfigSchema = Joi.object().keys({
+  rootPath: Joi.string()
+    .regex(/(^\/$)|(^\/(?!\.{2}).*\/$)/)
+    .notes([
+      `should start with "/"`,
+      `should finish with "/"`,
+      `should not have ".." pattern`,
+      `can be "/" (default)`,
+    ]),
   siteMetadata: Joi.object(),
   linkPrefix: Joi.string(),
   mapping: Joi.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)
+  })
+})

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

@@ -1,16 +1,16 @@
-const { store, reducer } = require("../index");
-const { actions, boundActions } = require("../actions");
+const { store, reducer } = require("../index")
+const { actions, boundActions } = require("../actions")
 
 describe(`Add pages`, () => {
   it(`allows you to add pages`, () => {
     const action = actions.upsertPage({
       path: `/hi/`,
       component: `/whatever/index.js`,
-    });
-    const state = reducer({ pages: [] }, action);
-    expect(action).toMatchSnapshot();
-    expect(state).toMatchSnapshot();
-  });
+    })
+    const state = reducer({ pages: [] }, action)
+    expect(action).toMatchSnapshot()
+    expect(state).toMatchSnapshot()
+  })
 
   it(`allows you to add pages with context`, () => {
     const action = actions.upsertPage({
@@ -19,42 +19,42 @@ describe(`Add pages`, () => {
       context: {
         id: 123,
       },
-    });
-    const state = reducer({ pages: [] }, action);
-    expect(action).toMatchSnapshot();
-    expect(state).toMatchSnapshot();
-  });
+    })
+    const state = reducer({ pages: [] }, action)
+    expect(action).toMatchSnapshot()
+    expect(state).toMatchSnapshot()
+  })
 
   it(`allows you to add multiple pages`, () => {
     const action = actions.upsertPage({
       path: `/hi/`,
       component: `/whatever/index.js`,
-    });
+    })
     const action2 = actions.upsertPage({
       path: `/hi/pizza/`,
       component: `/whatever/index.js`,
-    });
-    let state = reducer({ pages: [] }, action);
-    state = reducer(state, action2);
-    expect(state).toMatchSnapshot();
-    expect(state.pages.length).toEqual(2);
-  });
+    })
+    let state = reducer({ pages: [] }, action)
+    state = reducer(state, action2)
+    expect(state).toMatchSnapshot()
+    expect(state.pages.length).toEqual(2)
+  })
 
   it(`allows you to update existing pages (based on path)`, () => {
     const action = actions.upsertPage({
       path: `/hi/`,
       component: `/whatever/index.js`,
-    });
+    })
 
     // Change the component
     const action2 = actions.upsertPage({
       path: `/hi/`,
       component: `/whatever2/index.js`,
-    });
+    })
 
-    let state = reducer({ pages: [] }, action);
-    state = reducer(state, action2);
-    expect(state).toMatchSnapshot();
-    expect(state.pages.length).toEqual(1);
-  });
-});
+    let state = reducer({ pages: [] }, action)
+    state = reducer(state, action2)
+    expect(state).toMatchSnapshot()
+    expect(state.pages.length).toEqual(1)
+  })
+})