Skip to content

Commit 2bda894

Browse files
committed
Merge pull request #15 from jkazama/0.2.x
Polish
2 parents aa1aa5a + c4f05f4 commit 2bda894

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

gulpfile.babel.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,18 @@ const resource = {
2626
src: {
2727
jade: `${paths.src.html}/**/*.jade`,
2828
webpack: {
29-
babel: `${paths.src.js}/**/*.js`,
30-
vue: `${paths.src.js}/**/*.vue`
29+
babel: `${paths.src.js}/**/*.(js|jsx)`
3130
},
3231
sass: `${paths.src.css}/**/*.s+(a|c)ss`,
33-
static: `${paths.src.static}/**/*`,
32+
static: `${paths.src.static}/**/*`
3433
},
3534
vendor: {
3635
js: {
3736
jquery: `${paths.node.modules}/jquery/dist/jquery.js`,
3837
bootstrap: `${paths.node.modules}/bootstrap-sass/assets/javascripts/bootstrap.js`,
3938
eventemitter: `${paths.node.modules}/wolfy87-eventemitter/EventEmitter.js`
4039
},
41-
fontawesome: `${paths.node.modules}/font-awesome/fonts/**/*`,
40+
fontawesome: `${paths.node.modules}/font-awesome/fonts/**/*`
4241
}
4342
}
4443

@@ -88,7 +87,7 @@ gulp.task('build:webpack', () => {
8887
process.env.NODE_ENV = (production == true) ? 'production' : 'development'
8988
let plugins = [ new webpack.optimize.DedupePlugin() ]
9089
if (production) plugins.push(new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }}))
91-
gulp.src([resource.src.webpack.babel, resource.src.webpack.vue])
90+
gulp.src(resource.src.webpack.babel)
9291
.pipe($.plumber())
9392
.pipe(webpackStream({
9493
entry: `${paths.src.js}/main.js`,
@@ -101,7 +100,7 @@ gulp.task('build:webpack', () => {
101100
},
102101
resolve: {
103102
modulesDirectories: ['node_modules', paths.src.js],
104-
extensions: ['', '.js', ".jsx", ".jade"]
103+
extensions: ['', '.js', ".jsx"]
105104
},
106105
plugins: plugins
107106
}, webpack))

0 commit comments

Comments
 (0)