Skip to content

Commit fa11748

Browse files
committed
feat(Chore): Run the babel transpiled code
1 parent 7bfb826 commit fa11748

File tree

14 files changed

+24
-21
lines changed

14 files changed

+24
-21
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules/
22
public/javascripts/
3+
dist/

bin/www

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Module dependencies.
55
*/
66

7-
var app = require('../app');
7+
var app = require('../dist/app');
88
var debug = require('debug')('server-render:server');
99
var http = require('http');
1010

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"scripts": {
66
"start": "node ./bin/www",
77
"dev": "DEBUG=server-render/* nodemon ./bin/www",
8+
"build": "rm -rf dist/ && babel --watch src/ -d dist/",
89
"webpack:server": "webpack --debug --hot --output-path-info --devtool=eval --display-modules --watch -d"
910
},
1011
"dependencies": {
11-
"babel-register": "^6.9.0",
1212
"body-parser": "~1.13.2",
1313
"cookie-parser": "~1.3.5",
1414
"debug": "~2.2.0",
@@ -22,7 +22,7 @@
2222
"serve-favicon": "~2.3.0"
2323
},
2424
"devDependencies": {
25-
"babel-cli": "^6.6.5",
25+
"babel-cli": "^6.23.0",
2626
"babel-core": "^6.9.1",
2727
"babel-eslint": "^6.0.4",
2828
"babel-loader": "^6.2.4",
@@ -36,6 +36,7 @@
3636
"eslint-config-xo-space": "^0.13.0",
3737
"eslint-plugin-babel": "^3.2.0",
3838
"eslint-plugin-react": "^5.1.1",
39+
"nodemon": "^1.11.0",
3940
"webpack": "^1.13.1",
4041
"webpack-dev-server": "^1.14.1",
4142
"xo": "^0.15.1"

app.js renamed to src/app.js

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
require('babel-register');
2-
var express = require('express');
3-
var path = require('path');
4-
var favicon = require('serve-favicon');
5-
var logger = require('morgan');
6-
var cookieParser = require('cookie-parser');
7-
var bodyParser = require('body-parser');
1+
import express from 'express';
2+
import path from 'path';
3+
import favicon from 'serve-favicon';
4+
import logger from 'morgan';
5+
import cookieParser from 'cookie-parser';
6+
import bodyParser from 'body-parser';
87

9-
var routes = require('./routes/index');
10-
var users = require('./routes/users');
8+
import routes from './routes/index';
9+
import users from './routes/users';
1110

12-
var app = express();
11+
const app = express();
12+
13+
console.log(path.join(__dirname, '..', 'views'));
1314

1415
// view engine setup
15-
app.set('views', path.join(__dirname, 'views'));
16-
app.set('view engine', 'jade');
16+
app.set('views', path.join(__dirname, '..', 'views'));
17+
app.set('view engine', 'pug');
1718

1819
app.locals.pretty = true;
1920
// uncomment after placing your favicon in /public
@@ -22,7 +23,7 @@ app.use(logger('dev'));
2223
app.use(bodyParser.json());
2324
app.use(bodyParser.urlencoded({ extended: false }));
2425
app.use(cookieParser());
25-
app.use(express.static(path.join(__dirname, 'public')));
26+
app.use(express.static(path.join(__dirname, '..', 'public')));
2627

2728
app.use('/', routes);
2829
app.use('/users', users);
File renamed without changes.

client/app.jsx renamed to src/client/app.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import {render} from 'react-dom';
33
// import {Router, history, match} from 'react-router';
44

5-
import AppRouter from './router.jsx';
5+
import AppRouter from './router';
66

77
// match({history, routes}, (error, redirectLocation, renderProps) => {
88
// // render(<Router {...renderProps}/>, document.querySelector('#app'));
File renamed without changes.
File renamed without changes.

client/router.jsx renamed to src/client/router.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react';
22
import {Router, browserHistory, Route} from 'react-router';
33

4-
import AppRoot from './app-root.jsx';
5-
import Home from './home.jsx';
6-
import List from './list.jsx';
4+
import AppRoot from './app-root';
5+
import Home from './home';
6+
import List from './list';
77

88
const AppRouter = () => {
99
return (

routes/index.jsx renamed to src/routes/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React, {Component} from 'react';
44
import {renderToString} from 'react-dom/server';
55
import {RouterContext, match, createRoutes} from 'react-router';
66

7-
import appRouter from '../client/router.jsx';
7+
import appRouter from '../client/router';
88

99
const routes = createRoutes(appRouter());
1010

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)