Skip to content

Commit 986b48b

Browse files
author
Slinto
committed
Packages update & webpack changes.
1 parent b85cac8 commit 986b48b

7 files changed

Lines changed: 48 additions & 35 deletions

File tree

build/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/js/build.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/js/build.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/css/app.styl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
@import 'helpers'
88

99
@import 'modules/*'
10+

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ gulp.task('stylus', function() {
6464
use: [nib()],
6565
'include css': true
6666
}))
67-
.pipe(autoprefixer(['> 1%', 'last 2 versions', 'Firefox ESR', 'Opera 12.1', 'ie 8', 'ie 9']))
67+
.pipe(autoprefixer(['> 1%', 'last 2 versions', 'ie 8', 'ie 9']))
6868
.pipe(minifyCSS())
6969
.pipe(size({
7070
showFiles: true

package.json

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "slinto-devstack",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"author": "Tomáš Stankovič <hello@slinto.sk> (http://slinto.sk/)",
55
"license": "MIT",
66
"repository": {
@@ -12,46 +12,48 @@
1212
"test": "gulp test-deployed"
1313
},
1414
"engines": {
15-
"node": "^4.0.0",
16-
"npm": "^3.0.0"
15+
"node": "^5.0.0"
1716
},
1817
"dependencies": {
19-
"babel": "^5.8.23",
20-
"body-parser": "^1.14.0",
21-
"compression": "^1.5.2",
18+
"babel": "^6.1.18",
19+
"body-parser": "^1.14.1",
20+
"compression": "^1.6.0",
2221
"connect-flash": "^0.1.1",
2322
"cookie-parser": "^1.4.0",
2423
"express": "^4.13.3",
25-
"express-session": "^1.11.3",
24+
"express-session": "^1.12.1",
2625
"i18n": "^0.5.0",
2726
"jade": "^1.11.0",
2827
"method-override": "^2.3.5",
29-
"mongoose": "^4.1.8",
28+
"mongoose": "^4.2.5",
3029
"pretty-error": "^1.2.0",
3130
"serve-favicon": "^2.3.0"
3231
},
3332
"devDependencies": {
34-
"babel-loader": "^5.3.2",
33+
"babel-core": "^6.2.0",
34+
"babel-loader": "^6.2.0",
35+
"babel-plugin-transform-runtime": "^6.1.18",
36+
"babel-preset-es2015": "^6.1.18",
37+
"babel-runtime": "^6.2.0",
3538
"gulp": "^3.9.0",
36-
"gulp-autoprefixer": "^3.0.2",
37-
"gulp-bump": "^0.3.1",
38-
"gulp-git": "^1.4.0",
39-
"gulp-imagemin": "^2.3.0",
40-
"gulp-livereload": "^3.8.0",
39+
"gulp-autoprefixer": "^3.1.0",
40+
"gulp-bump": "^1.0.0",
41+
"gulp-git": "^1.6.0",
42+
"gulp-imagemin": "^2.4.0",
43+
"gulp-livereload": "^3.8.1",
4144
"gulp-minify-css": "^1.2.1",
42-
"gulp-mocha": "^2.1.3",
45+
"gulp-mocha": "^2.2.0",
4346
"gulp-nodemon": "^2.0.4",
4447
"gulp-plumber": "^1.0.1",
45-
"gulp-rimraf": "^0.1.1",
46-
"gulp-shell": "^0.4.3",
48+
"gulp-rimraf": "^0.2.0",
49+
"gulp-shell": "^0.5.1",
4750
"gulp-size": "^2.0.0",
48-
"gulp-stylus": "^2.0.7",
51+
"gulp-stylus": "^2.1.0",
4952
"gulp-webpack": "^1.5.0",
5053
"imagemin-pngquant": "^4.2.0",
51-
"jshint-stylish": "^2.0.1",
5254
"nib": "^1.1.0",
5355
"run-sequence": "^1.1.4",
54-
"webpack": "^1.12.2",
55-
"yargs": "^3.26.0"
56+
"webpack": "^1.12.6",
57+
"yargs": "^3.29.0"
5658
}
5759
}

webpack.config.js

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
var webpack = require('webpack');
2+
var path = require('path');
23

34
module.exports = {
45
module: {
56
loaders: [{
6-
loader: 'babel-loader'
7+
loader: "babel-loader",
8+
include: [
9+
path.resolve(__dirname, "client/js/")
10+
],
11+
test: /\.js?$/,
12+
query: {
13+
plugins: ['transform-runtime'],
14+
presets: ['es2015']
15+
}
716
}]
817
},
918
devtool: "source-map",
@@ -15,15 +24,16 @@ module.exports = {
1524
new webpack.optimize.DedupePlugin(),
1625
new webpack.optimize.OccurenceOrderPlugin(),
1726
new webpack.optimize.UglifyJsPlugin({
18-
compress: {
19-
keep_fnames: true,
20-
screw_ie8: true,
21-
warnings: false
22-
},
23-
mangle: {
24-
keep_fnames: true
25-
}
26-
})
27+
compress: {
28+
keep_fnames: true,
29+
screw_ie8: true,
30+
warnings: false
31+
},
32+
comments: false,
33+
mangle: {
34+
keep_fnames: true
35+
}
36+
})
2737
];
2838
})(),
2939
modulesDirectories: ['app/bower_components']

0 commit comments

Comments
 (0)