Skip to content

Commit 0582ad6

Browse files
committed
chore(npm): backup before upgrade everything
1 parent 3f00bc7 commit 0582ad6

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

server/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// 多一個 index.js 只是方便在 server 上也能寫 ES6 語法,
2-
// 因為下面 babel-register 會在背景預先做 precompile
1+
// use babel-register to precompile ES6 syntax
32
require('babel-register')
43
require('./server')

server/server.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var fs = require('fs');
2-
var express = require('express');
3-
var path = require('path');
1+
import fs from 'fs';
2+
import express from 'express';
3+
import path from 'path';
44

55
import React from 'react'
66
import { renderToString } from 'react-dom/server'
@@ -20,16 +20,16 @@ const finalCreateStore = applyMiddleware(promiseMiddleware)( createStore );
2020

2121
// console.log( 'env: ', process.env.NODE_ENV )
2222

23-
var app = express();
24-
// app.use('/build', express.static(path.join(__dirname, '../build')))
23+
const app = express();
24+
2525
app.use('/assets', express.static(path.join(__dirname, '../client/assets')))
2626

2727
// initialize webpack HMR
28-
var webpack = require('webpack')
29-
var webpackDevMiddleware = require('webpack-dev-middleware')
30-
var webpackHotMiddleware = require('webpack-hot-middleware')
31-
var config = require('../webpack.config')
32-
var compiler = webpack(config)
28+
const webpack = require('webpack')
29+
const webpackDevMiddleware = require('webpack-dev-middleware')
30+
const webpackHotMiddleware = require('webpack-hot-middleware')
31+
const config = require('../webpack.config')
32+
const compiler = webpack(config)
3333
app.use(webpackDevMiddleware(compiler, { noInfo: true, publicPath: config.output.publicPath }))
3434
app.use(webpackHotMiddleware(compiler))
3535

webpack.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module.exports = {
88
devtool: '#inline-source-map',
99

1010
entry: [
11-
'webpack-hot-middleware/client',
12-
'./client/index.js' // client app 的進入點
11+
'webpack-hot-middleware/client', // for hot reload
12+
'./client/index.js' // entry point for the client app
1313
],
1414

1515
//
@@ -30,11 +30,11 @@ module.exports = {
3030
resolve: {
3131
alias: {
3232
},
33-
// require() 時不用加 .suffix
33+
// require() file without adding .jsx and .js .suffix
3434
extensions: ['', '.js', '.jsx']
3535
},
3636

37-
// jx: 記得設定 babel 的 stage=0 才支援最新 es7 語法
37+
// be sure to add 'stage-0' in .babelrc to support es7 syntax
3838
module: {
3939
loaders: [
4040
{

0 commit comments

Comments
 (0)