Skip to content

Commit

Permalink
Merge pull request #7 from civic-panda/fix/build
Browse files Browse the repository at this point in the history
[chore] fix build
  • Loading branch information
matt-casey authored Nov 29, 2016
2 parents 13eeeee + a9a7c25 commit f12695a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ build
.DS_Store
.env
npm-debug.log

.idea
10 changes: 5 additions & 5 deletions config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ module.exports = {
{
test: /\.(js|jsx)$/,
loader: 'eslint',
include: paths.appSrc,
include: paths.appSrc
}
],
loaders: [
// All files with a '.ts' or '.tsx' extension will be handled by 'ts-loader'.
{
test: /\.tsx?$/,
include: paths.appSrc,
loader: "ts-loader",
loader: "ts-loader"
},
// // Process JS with Babel.
// {
Expand Down Expand Up @@ -166,9 +166,9 @@ module.exports = {
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9', // React doesn't support IE8 anyway
'not ie < 9' // React doesn't support IE8 anyway
]
}),
})
];
},
plugins: [
Expand All @@ -181,7 +181,7 @@ module.exports = {
// Generates an `index.html` file with the <script> injected.
new HtmlWebpackPlugin({
inject: true,
template: paths.appHtml,
template: paths.appHtml
}),
// Makes some environment variables available to the JS code, for example:
// if (process.env.NODE_ENV === 'development') { ... }. See `./env.js`.
Expand Down
6 changes: 3 additions & 3 deletions config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ module.exports = {
{
test: /\.tsx?$/,
include: paths.appSrc,
loader: "ts-loader",
loader: "ts-loader"
},
// // Process JS with Babel.
// {
Expand Down Expand Up @@ -177,9 +177,9 @@ module.exports = {
'>1%',
'last 4 versions',
'Firefox ESR',
'not ie < 9', // React doesn't support IE8 anyway
'not ie < 9' // React doesn't support IE8 anyway
]
}),
})
];
},
plugins: [
Expand Down
26 changes: 13 additions & 13 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"compilerOptions": {
"outDir": "./build/",
"sourceMap": true,
"noImplicitAny": true,
"module": "commonjs",
"target": "es6",
"jsx": "react"
},
"filesGlob": [
"src/**/*.ts",
"src/**/*.tsx"
]
}
"compilerOptions": {
"outDir": "./build/",
"sourceMap": true,
"noImplicitAny": true,
"module": "commonjs",
"target": "es6",
"jsx": "react"
},
"filesGlob": [
"src/**/*.ts",
"src/**/*.tsx"
]
}

0 comments on commit f12695a

Please sign in to comment.