Skip to content

Commit 387dd6d

Browse files
committed
Merge branch 'master' into issue#54-jquery-sample
2 parents e597d9c + a9a0e45 commit 387dd6d

5 files changed

Lines changed: 6 additions & 12 deletions

File tree

lib/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
"@types/sinon": "^1.16.35",
3737
"awesome-typescript-loader": "^3.1.2",
3838
"babel-core": "^6.24.0",
39-
"babel-plugin-es6-promise": "^1.1.1",
4039
"babel-preset-env": "^1.2.2",
41-
"babel-preset-es2015": "^6.24.0",
4240
"chai": "^3.5.0",
4341
"chai-as-promised": "^5.3.0",
4442
"copy-webpack-plugin": "^4.0.1",

lib/webpack.config.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@ var config = {
2828
{
2929
test: /\.(ts|tsx)$/,
3030
exclude: /node_modules/,
31-
use: [
32-
{
33-
loader: 'awesome-typescript-loader',
34-
options: {
35-
useBabel: true
36-
}
31+
use:
32+
{
33+
loader: 'awesome-typescript-loader',
34+
options: {
35+
useBabel: true
3736
}
38-
]
37+
}
3938
}
4039
]
4140
},

samples/react/00 SimpleForm/webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ module.exports = {
8484
plugins: [
8585
new webpack.optimize.CommonsChunkPlugin({
8686
name: 'vendor',
87-
filaneme: 'vendor.js'
8887
}),
8988
//Generate index.html in /dist => https://github.com/ampedandwired/html-webpack-plugin
9089
new HtmlWebpackPlugin({

samples/react/01 SignupForm/webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ module.exports = {
8484
plugins: [
8585
new webpack.optimize.CommonsChunkPlugin({
8686
name: 'vendor',
87-
filaneme: 'vendor.js'
8887
}),
8988
//Generate index.html in /dist => https://github.com/ampedandwired/html-webpack-plugin
9089
new HtmlWebpackPlugin({

samples/react/02 QuizForm/webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ module.exports = {
8686
plugins: [
8787
new webpack.optimize.CommonsChunkPlugin({
8888
name: 'vendor',
89-
filaneme: 'vendor.js'
9089
}),
9190
//Generate index.html in /dist => https://github.com/ampedandwired/html-webpack-plugin
9291
new HtmlWebpackPlugin({

0 commit comments

Comments
 (0)