Skip to content

Commit 660fff2

Browse files
authored
Merge pull request #51 from akiran/rewrite
Upgrading to React16
2 parents 433f71c + fe96677 commit 660fff2

File tree

14 files changed

+80
-299
lines changed

14 files changed

+80
-299
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ node_modules
2929
.sass-cache
3030
build
3131
lib
32+
package-lock.json

.npmignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/_default.scss

Lines changed: 0 additions & 152 deletions
This file was deleted.

docs/docs.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/index.html

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/index.jsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

docs/snippets/html.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/snippets/html.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

gulpfile.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

karma.conf.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,27 @@ module.exports = function(config) {
3232

3333
webpack: {
3434
module: {
35-
loaders: [
36-
{test: /\.(js|jsx)$/, loaders: ['babel']},
37-
]
35+
rules: [
36+
{
37+
test: /\.(js|jsx)$/,
38+
use: {
39+
loader: 'babel-loader',
40+
options: {
41+
presets: ['env'],
42+
plugins: [
43+
'transform-class-properties',
44+
'transform-react-jsx',
45+
],
46+
},
47+
},
48+
},
49+
],
3850
},
3951
externals: {
4052
react: 'React'
4153
},
4254
resolve: {
43-
root: __dirname
55+
modules: [__dirname, 'node_modules']
4456
}
4557
},
4658
webpackServer: {

0 commit comments

Comments
 (0)