diff --git a/Gruntfile.js b/Gruntfile.js index cb93bb45..d51a69ed 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,6 @@ module.exports = function (grunt) { - - var webpack = require('webpack'); var webpackConfig = require('./webpack.config.js'); + var webpackDevConfig = require('./webpack.dev.config.js'); var webpackTestConfig = require('./webpack.test.config.js'); var fs = require('fs'); var path = require('path'); @@ -20,6 +19,8 @@ module.exports = function (grunt) { target: [ 'Gruntfile.js', 'webpack.config.js', + 'webpack.dev.config.js', + 'webpack.test.config.js', 'src/**/*.js', 'test/*.js' ] @@ -127,22 +128,19 @@ module.exports = function (grunt) { 'webpack-dev-server': { options: { - webpack: webpack.dev, + webpack: webpackDevConfig, publicPath: '/dist/' }, start: { - keepAlive: true, webpack: { - devtool: 'eval', - debug: true + devtool: 'eval' } } }, webpack: { - options: webpackConfig, - build: webpackConfig.build, - dev: webpackConfig.dev, + build: webpackConfig, + dev: webpackDevConfig, test: webpackTestConfig }, diff --git a/dist/starter.html b/dist/starter.html index 87f775b7..c1517d4f 100644 --- a/dist/starter.html +++ b/dist/starter.html @@ -1,10 +1,10 @@
-| + | From | +Destination | +Road Distance (km) | +By Air (hrs) | +By Rail (hrs) | +
|---|---|---|---|---|---|
| + + | +Sydney | +Adelaide | +1412 | +1.4 | +25.3 | +
| + + | +Sydney | +Brisbane | +982 | +1.5 | +16 | +
| + + | +Sydney | +Canberra | +286 | +.6 | +4.3 | +
| + + | +Sydney | +Melbourne | +872 | +1.1 | +10.5 | +
| + + | +Adelaide | +Perth | +2781 | +3.1 | +38 | +
| + + | +Adelaide | +Alice Springs | +1533 | +2 | +20.25 | +
| + + | +Adelaide | +Brisbane | +2045 | +2.15 | +40 | +
| Sum: | ++ | + | + | + |
| Mean: | ++ | + | + | + |
| Min: | ++ | + | + | + |
| Max: | ++ | + | + | + |
| Median: | ++ | + | + | + |
| Q1: | ++ | + | + | + |
| Q3: | ++ | + | + | + |
| From | +Destination | +Road Distance (km) | +By Air (hrs) | +By Rail (hrs) | +
|---|---|---|---|---|
| Sydney | +Adelaide | +1412 | +1.4 | +25.3 | +
| Sydney | +Brisbane | +982 | +1.5 | +16 | +
| Sydney | +Canberra | +286 | +.6 | +4.3 | +
| Sydney | +Melbourne | +872 | +1.1 | +10.5 | +
| Adelaide | +Perth | +2781 | +3.1 | +38 | +
| Adelaide | +Alice Springs | +1533 | +2 | +20.25 | +
| Adelaide | +Brisbane | +2045 | +2.15 | +40 | +
| Sum: | ++ | + | + | + |
| Mean: | ++ | + | + | + |
| Min: | ++ | + | + | + |
| Max: | ++ | + | + | + |
| Median: | ++ | + | + | + |
| Q1: | ++ | + | + | + |
| Q3: | ++ | + | + | + |
| From | +Destination | +Road Distance (km) | +By Air (hrs) | +By Rail (hrs) | +
|---|---|---|---|---|
| Sydney | +Adelaide | +1412 | +1.4 | +25.3 | +
| Sydney | +Brisbane | +982 | +1.5 | +16 | +
| Sydney | +Canberra | +286 | +.6 | +4.3 | +
| Sydney | +Melbourne | +872 | +1.1 | +10.5 | +
| Adelaide | +Perth | +2781 | +3.1 | +38 | +
| Adelaide | +Alice Springs | +1533 | +2 | +20.25 | +
| Adelaide | +Brisbane | +2045 | +2.15 | +40 | +
| From | +Destination | +Road Distance (km) | +By Air (hrs) | +By Rail (hrs) | +
|---|---|---|---|---|
| Sydney | +Adelaide | +1412 | +1.4 | +25.3 | +
| Sydney | +Brisbane | +982 | +1.5 | +16 | +
| Sydney | +Canberra | +286 | +.6 | +4.3 | +
| Sydney | +Melbourne | +872 | +1.1 | +10.5 | +
| Adelaide | +Perth | +2781 | +3.1 | +38 | +
| Adelaide | +Alice Springs | +1533 | +2 | +20.25 | +
| Adelaide | +Brisbane | +2045 | +2.15 | +40 | +
| From | +Destination | +Road Distance (km) | +By Air (hrs) | +By Rail (hrs) | +
|---|---|---|---|---|
| Sydney | +Adelaide | +1412 | +1.4 | +25.3 | +
| Sydney | +Brisbane | +982 | +1.5 | +16 | +
| Sydney | +Canberra | +286 | +.6 | +4.3 | +
| Sydney | +Melbourne | +872 | +1.1 | +10.5 | +
| Adelaide | +Perth | +2781 | +3.1 | +38 | +
| Adelaide | +Alice Springs | +1533 | +2 | +20.25 | +
| Adelaide | +Brisbane | +2045 | +2.15 | +40 | +
| From | +Destination | +Road Distance (km) | +By Air (hrs) | +By Rail (hrs) | +
|---|---|---|---|---|
| Sydney | +Adelaide | +1412 | +1.4 | +25.3 | +
| Sydney | +Brisbane | +982 | +1.5 | +16 | +
| Sydney | +Canberra | +286 | +.6 | +4.3 | +
| Sydney | +Melbourne | +872 | +1.1 | +10.5 | +
| Adelaide | +Perth | +2781 | +3.1 | +38 | +
| Adelaide | +Alice Springs | +1533 | +2 | +20.25 | +
| Adelaide | +Brisbane | +2045 | +2.15 | +40 | +