Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tokita committed Feb 6, 2018
1 parent caf6a2f commit c5cf286
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
"presets": "env"
},
"eslintConfig": {
"extends": "airbnb-base"
"extends": "airbnb-base",
"globals": {
"window": true,
"document": true,
"alert": true
}
},
"devDependencies": {
"babel-core": "^6.26.0",
Expand Down
4 changes: 0 additions & 4 deletions src/js/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
// testのサンプルです。
const sum = (a, b) => a + b;

export default sum;
4 changes: 4 additions & 0 deletions src/js/example.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// testのサンプルです。
const sum = (a, b) => a + b;

export default sum;
2 changes: 1 addition & 1 deletion src/js/test/app.test.js → src/js/test/example.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sum from '../app';
import sum from '../example';

it('adds 1 + 2 to equal 3', () => {
expect(sum(1, 2)).toBe(3);
Expand Down
20 changes: 8 additions & 12 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,14 @@ module.exports = [
filename: 'style.css'
},
module: {
rules: [
{
test: /\.scss$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: ['css-loader', 'sass-loader']
})
}
]
rules: [{
test: /\.scss$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: ['css-loader', 'sass-loader']
})
}]
},
plugins: [
new ExtractTextPlugin('style.css')
]
plugins: [ new ExtractTextPlugin('style.css') ]
}
];

0 comments on commit c5cf286

Please sign in to comment.