diff --git a/index.html b/index.html
deleted file mode 100644
index 8c37e4a..0000000
--- a/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
- react router
-
-
-
-
-
diff --git a/index.js b/index.js
deleted file mode 100644
index 5f3578a..0000000
--- a/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import {render} from 'react-dom';
-import App from './modules/App';
-import About from './modules/About'
-import Repos from './modules/Repos'
-import NavLink from './modules/NavLink'
-
-import './styles/index.less';
-
-import {Router,Route,hashHistory} from 'react-router'
-render((
-
-
-
-
-
-
-),document.getElementById('app'))
diff --git a/package.json b/package.json
index a9ec425..10aee34 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"description": "",
"main": "index.js",
"scripts": {
- "start": "webpack-dev-server --display-error-details --inline --content-base dist",
+ "start": "webpack-dev-server --display-error-details --inline --content-base dist/ --history-api-fallback",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
diff --git a/src/components/App.js b/src/components/App.js
index 326accc..1277816 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -1,5 +1,5 @@
import React from 'react';
-import {Link} from 'react-router';
+import { Link,IndexLink } from 'react-router';
import NavLink from './NavLink'
export default React.createClass({
@@ -7,8 +7,8 @@ export default React.createClass({
return (
React Router Tutorial
-
- - Index
+
diff --git a/src/config/routes.js b/src/config/routes.js
new file mode 100644
index 0000000..2539129
--- /dev/null
+++ b/src/config/routes.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Route, IndexRoute } from 'react-router'
+import App from '../components/App';
+import About from '../components/About'
+import Repos from '../components/Repos'
+import Repo from '../components/Repo'
+import NavLink from '../components/NavLink'
+
+import '../styles/index.less';
+
+module.exports = (
+
+
+
+
+
+
+)
diff --git a/src/index.js b/src/index.js
index 27b1146..745e976 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,22 +1,12 @@
-import React from 'react';
-import {render} from 'react-dom';
-import App from './components/App';
-import About from './components/About'
-import Repos from './components/Repos'
-import Repo from './components/Repo'
-import NavLink from './components/NavLink'
+import React from 'react'
+import {render} from 'react-dom'
+import {Router,browserHistory} from 'react-router'
+import routes from './config/routes'
-import './styles/index.less';
+// import {Router,Route,hashHistory} from 'react-router'
+// import {Router,Route,browserHistory,IndexRoute} from 'react-router'
-import {Router,Route,hashHistory} from 'react-router'
-
-render((
-
-
-
-
-
-
-
-
-),document.getElementById('app'))
+render(
+ ,
+ document.getElementById('app')
+)
diff --git a/webpack.config.js b/webpack.config.js
index d1ee555..2738dbb 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,3 +1,4 @@
+const webpack = require('webpack')
//打开浏览器
const WebpackBrowserPlugin = require('webpack-browser-plugin');
//单独打包css
@@ -7,10 +8,11 @@ const htmlWebpackPlugin = require('html-webpack-plugin');
const config = {
entry:'./src/index.js',
output:{
- filename:'bundle.js',
+ filename:'bundle[hash:8].js',
publicPath:'dist/',
path:__dirname+'/dist'
},
+ 'devtool': "source-map",
module:{
loaders:[
{
@@ -30,14 +32,15 @@ const config = {
]
},
plugins: [
- new ExtractTextPlugin("bundle.css"),
- new htmlWebpackPlugin({
- template: './src/index.html',
- filename: './index.html'
- }),
- new WebpackBrowserPlugin()
+ new ExtractTextPlugin("bundle[hash:8].css"),
+ new htmlWebpackPlugin({
+ template: './src/index.html',
+ filename: './index.html'
+ }),
+ new WebpackBrowserPlugin()
+ // new webpack.optimize.UglifyJsPlugin()
- ]
+ ]
};
-module.exports = config;
\ No newline at end of file
+module.exports = config;