Skip to content

Commit a6eb43b

Browse files
committed
update packages and bugfix
1 parent d7e3aa9 commit a6eb43b

17 files changed

+271593
-268831
lines changed

.eslintrc

+4-4
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@
169169
"browser": true,
170170
"mocha": true
171171
},
172-
"ecmaFeatures": {
173-
"modules": true
174-
},
175172
"extends": "eslint:recommended",
176173
"parserOptions": {
177-
"sourceType": "module"
174+
"sourceType": "module",
175+
"ecmaFeatures": {
176+
"modules": true
177+
}
178178
},
179179
"globals": {
180180
"global": true // for test

gulp/tasks/webpack.js

-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ gulp.task('webpack', ['webpack_ex1', 'webpack_ex2', 'webpack_ex3', 'webpack_ex4'
99

1010
gulp.task('webpack_ex1', function(cb) {
1111
const conf = config.ex1.webpack
12-
conf.resolve.extensions.push('') // *sigh*
1312
const srcPath = conf.context + conf.entry
1413
gulp.src(srcPath)
1514
.pipe(webpack(conf))
@@ -19,7 +18,6 @@ gulp.task('webpack_ex1', function(cb) {
1918

2019
gulp.task('webpack_ex2', function(cb) {
2120
const conf = config.ex2.webpack
22-
conf.resolve.extensions.push('') // *sigh*
2321
const srcPath = conf.context + conf.entry
2422
gulp.src(srcPath)
2523
.pipe(webpack(conf))
@@ -29,7 +27,6 @@ gulp.task('webpack_ex2', function(cb) {
2927

3028
gulp.task('webpack_ex3', function(cb) {
3129
const conf = config.ex3.webpack
32-
conf.resolve.extensions.push('') // *sigh*
3330
const srcPath = conf.context + conf.entry
3431
gulp.src(srcPath)
3532
.pipe(webpack(conf))
@@ -39,7 +36,6 @@ gulp.task('webpack_ex3', function(cb) {
3936

4037
gulp.task('webpack_ex4', function(cb) {
4138
const conf = config.ex4.webpack
42-
conf.resolve.extensions.push('') // *sigh*
4339
const srcPath = conf.context + conf.entry
4440
gulp.src(srcPath)
4541
.pipe(webpack(conf))

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727
"babel-preset-es2015": "^6.24.1",
2828
"file-loader": "^0.11.2",
2929
"gulp": "^3.9.1",
30-
"gulp-babel": "^6.1.2",
30+
"gulp-babel": "^7.0.0",
3131
"gulp-eslint": "^4.0.0",
3232
"gulp-exec": "^2.1.3",
3333
"gulp-if": "^2.0.2",
3434
"gulp-mocha": "^4.3.1",
3535
"gulp-uglify": "^3.0.0",
3636
"gulp-util": "^3.0.8",
3737
"gulp-watch": "^4.3.11",
38-
"jscenekit": "^0.2.15",
39-
"mocha": "^3.4.2",
38+
"jscenekit": "^0.2.16",
39+
"mocha": "^3.5.0",
4040
"mocha-sinon": "^2.0.0",
41-
"nyc": "^11.0.3",
41+
"nyc": "^11.1.0",
4242
"path": "^0.12.7",
4343
"require-dir": "^0.3.2",
44-
"sinon": "^2.4.1",
44+
"sinon": "^3.1.0",
4545
"sinon-chai": "^2.12.0",
4646
"uglifyjs-webpack-plugin": "^0.4.6",
47-
"webpack": "^3.4.1",
48-
"webpack-dev-server": "^2.6.1",
49-
"webpack-stream": "^3.2.0"
47+
"webpack": "^3.5.2",
48+
"webpack-dev-server": "^2.7.1",
49+
"webpack-stream": "^4.0.0"
5050
}
5151
}

0 commit comments

Comments
 (0)