From 0a9a1da23a94b5f4892f309490ed2ee6a48a2fcd Mon Sep 17 00:00:00 2001 From: Gianluca Esposito Date: Sun, 6 Sep 2015 23:31:01 +0200 Subject: [PATCH 1/4] let ES6 in serve --- bin/gatsby-serve.js | 3 +++ lib/loaders/config-loader/index.js | 1 - package.json | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/gatsby-serve.js b/bin/gatsby-serve.js index 476d7b4b77bdf..f74a43a2dc365 100755 --- a/bin/gatsby-serve.js +++ b/bin/gatsby-serve.js @@ -1,4 +1,7 @@ #!/usr/bin/env node +require("babel/register")({ + stage: 0 +}); require('coffee-script/register'); require('./serve'); diff --git a/lib/loaders/config-loader/index.js b/lib/loaders/config-loader/index.js index b46a585e2e63d..f6f4c27604cc5 100644 --- a/lib/loaders/config-loader/index.js +++ b/lib/loaders/config-loader/index.js @@ -23,7 +23,6 @@ value.relativePath = path.relative('.', directory); return globPages(directory, function(err, pagesData) { value.pages = pagesData; - this.value = [value]; return callback(null, 'module.exports = ' + JSON.stringify(value, void 0, "\t")); }); }; diff --git a/package.json b/package.json index 9e3d1cf0471e8..58b37a90367eb 100644 --- a/package.json +++ b/package.json @@ -73,5 +73,8 @@ }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" + }, + "devDependencies": { + "babel": "^5.8.23" } } From a6acbce7f6404251562b40acf4302d5efc039bca Mon Sep 17 00:00:00 2001 From: Gianluca Esposito Date: Wed, 9 Sep 2015 19:46:13 +0200 Subject: [PATCH 2/4] let ES6 in build, added .babelrc --- .babelrc | 3 +++ bin/gatsby-build.js | 2 +- bin/gatsby-serve.js | 4 +--- lib/utils/glob-pages.coffee | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 .babelrc diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000000000..b0b9a96ef0ecd --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "stage": 0 +} diff --git a/bin/gatsby-build.js b/bin/gatsby-build.js index 77050eccb55be..0509e5b24fa75 100755 --- a/bin/gatsby-build.js +++ b/bin/gatsby-build.js @@ -1,5 +1,5 @@ #!/usr/bin/env node +require("babel/register"); require('coffee-script/register'); require('./build'); - diff --git a/bin/gatsby-serve.js b/bin/gatsby-serve.js index f74a43a2dc365..96cb797b52a70 100755 --- a/bin/gatsby-serve.js +++ b/bin/gatsby-serve.js @@ -1,7 +1,5 @@ #!/usr/bin/env node -require("babel/register")({ - stage: 0 -}); +require("babel/register"); require('coffee-script/register'); require('./serve'); diff --git a/lib/utils/glob-pages.coffee b/lib/utils/glob-pages.coffee index 724c36f912fca..1688f0fc86d36 100644 --- a/lib/utils/glob-pages.coffee +++ b/lib/utils/glob-pages.coffee @@ -17,7 +17,7 @@ module.exports = (directory, callback) -> # Make this easy to add to through the config? # Or just keep adding extensions...? - glob directory + '/pages/**/?(*.coffee|*.cjsx|*.jsx|*.md|*.html)', null, (err, pages) => + glob directory + '/pages/**/?(*.coffee|*.cjsx|*.jsx|*.js|*.md|*.html)', null, (err, pages) => if err then return callback(err) for page in pages @@ -83,4 +83,3 @@ module.exports = (directory, callback) -> pagesData.push pageData callback(null, pagesData) - From 3bad3b60427ffbb3632d20bfdad35513c1f15d44 Mon Sep 17 00:00:00 2001 From: Gianluca Esposito Date: Thu, 10 Sep 2015 20:09:56 +0200 Subject: [PATCH 3/4] babel register for .babelrc --- bin/gatsby-build.js | 2 +- bin/gatsby-serve.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/gatsby-build.js b/bin/gatsby-build.js index 0509e5b24fa75..d2e6e0b63ac4d 100755 --- a/bin/gatsby-build.js +++ b/bin/gatsby-build.js @@ -1,5 +1,5 @@ #!/usr/bin/env node -require("babel/register"); +require('babel/register'); require('coffee-script/register'); require('./build'); diff --git a/bin/gatsby-serve.js b/bin/gatsby-serve.js index 96cb797b52a70..10581d0fd0a41 100755 --- a/bin/gatsby-serve.js +++ b/bin/gatsby-serve.js @@ -1,5 +1,5 @@ #!/usr/bin/env node -require("babel/register"); +require('babel/register'); require('coffee-script/register'); require('./serve'); From af24e3727a3dedded272d229c8985bf8f1d1e75f Mon Sep 17 00:00:00 2001 From: Gianluca Esposito Date: Thu, 10 Sep 2015 20:49:14 +0200 Subject: [PATCH 4/4] Moved Babel to dependencies --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 58b37a90367eb..be83b23970840 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "async": "^1.2.1", + "babel": "^5.8.23", "babel-core": "^5.5.8", "babel-loader": "^5.1.4", "boom": "^2.7.2", @@ -73,8 +74,5 @@ }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" - }, - "devDependencies": { - "babel": "^5.8.23" } }