From ca42fb02350065b3aea7de576d4a6f744028da30 Mon Sep 17 00:00:00 2001 From: Kazuhide Adachi Date: Tue, 31 Jan 2017 10:12:46 +0900 Subject: [PATCH 1/2] Fix to avoid server crash in exercise 8 (#111) --- exercises/isomorphic/problem.en.md | 12 +++--------- exercises/isomorphic/problem.ko.md | 12 +++--------- exercises/isomorphic/problem.md | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/exercises/isomorphic/problem.en.md b/exercises/isomorphic/problem.en.md index 11df04d..2f9bad7 100644 --- a/exercises/isomorphic/problem.en.md +++ b/exercises/isomorphic/problem.en.md @@ -52,9 +52,7 @@ var babelify = require("babelify"); Next, add a line that reads `index.jsx` under the sentence that `require` s `babel/register`. ``` -require('babel/register')({ - ignore: false -}); +require('babel/register'); var TodoBox = require('./views/index.jsx'); ``` @@ -67,12 +65,8 @@ If you have an access to `/`, you response HTML that consists of reading `index. app.use('/bundle.js', function (req, res) { res.setHeader('content-type', 'application/javascript'); - browserify({ debug: true }) - .transform(babelify.configure({ - presets: ["react", "es2015"], - compact: false - })) - .require("./app.js", { entry: true }) + browserify("./app.js") + .transform("babelify", {presets: ["es2015", "react"]}) .bundle() .pipe(res); }); diff --git a/exercises/isomorphic/problem.ko.md b/exercises/isomorphic/problem.ko.md index 09a5416..982ae61 100644 --- a/exercises/isomorphic/problem.ko.md +++ b/exercises/isomorphic/problem.ko.md @@ -49,9 +49,7 @@ var babelify = require("babelify"); 그런 다음 `babel/register`를 `require`하고 있는 구문 밑에 다음과 같이 `index.jsx`를 불러 오도록 추가해 주세요. ``` -require('babel/register')({ - ignore: false -}); +require('babel/register'); var TodoBox = require('./views/index.jsx'); ``` @@ -65,12 +63,8 @@ var TodoBox = require('./views/index.jsx'); app.use('/bundle.js', function (req, res) { res.setHeader('content-type', 'application/javascript'); - browserify({ debug: true }) - .transform(babelify.configure({ - presets: ["react", "es2015"], - compact: false - })) - .require("./app.js", { entry: true }) + browserify("./app.js") + .transform("babelify", {presets: ["es2015", "react"]}) .bundle() .pipe(res); }); diff --git a/exercises/isomorphic/problem.md b/exercises/isomorphic/problem.md index 7a99aa1..a2cdfe1 100644 --- a/exercises/isomorphic/problem.md +++ b/exercises/isomorphic/problem.md @@ -49,9 +49,7 @@ var babelify = require("babelify"); 次に `babel/register` を `require` している文の下に以下のように `index.jsx` を読み込む処理を1行追加してください。 ``` -require('babel/register')({ - ignore: false -}); +require('babel/register'); var TodoBox = require('./views/index.jsx'); ``` @@ -65,12 +63,8 @@ var TodoBox = require('./views/index.jsx'); app.use('/bundle.js', function (req, res) { res.setHeader('content-type', 'application/javascript'); - browserify({ debug: true }) - .transform(babelify.configure({ - presets: ["react", "es2015"], - compact: false - })) - .require("./app.js", { entry: true }) + browserify("./app.js") + .transform("babelify", {presets: ["es2015", "react"]}) .bundle() .pipe(res); }); From 25695b1fcc2ed9c88a3a87fc97807dd41b934589 Mon Sep 17 00:00:00 2001 From: Kazuhide Adachi Date: Tue, 31 Jan 2017 10:24:49 +0900 Subject: [PATCH 2/2] Also fix solution.js in exercise 8 (#111) --- exercises/isomorphic/solution/solution.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/exercises/isomorphic/solution/solution.js b/exercises/isomorphic/solution/solution.js index b46f66e..f146764 100644 --- a/exercises/isomorphic/solution/solution.js +++ b/exercises/isomorphic/solution/solution.js @@ -16,9 +16,7 @@ app.set('view engine', 'jsx'); app.set('views', __dirname + '/views'); app.engine('jsx', require('express-react-views').createEngine({transformViews: false})); -require('babel/register')({ - ignore: false -}); +require('babel/register'); var TodoBox = require('./views/index.jsx'); @@ -30,12 +28,8 @@ var data = [ app.use('/bundle.js', function (req, res) { res.setHeader('content-type', 'application/javascript'); - browserify({debug: true}) - .transform(babelify.configure({ - presets: ["react", "es2015"], - compact: false - })) - .require("isomorphic/solution/app.js", {entry: true}) + browserify("./app.js") + .transform("babelify", {presets: ["es2015", "react"]}) .bundle() .pipe(res); });