Fix css min

This commit is contained in:
RainLoop Team 2016-09-17 00:18:17 +03:00
parent 9263fe5fa4
commit 300a3373a8
4 changed files with 150 additions and 65 deletions

1
.cmds
View file

@ -4,6 +4,7 @@ tx pull -a
# dependencies checker # dependencies checker
npm-check --skip-unused --save-exact npm-check --skip-unused --save-exact
npm-dedupe
# dependencies locker # dependencies locker
npm shrinkwrap --dev npm shrinkwrap --dev

View file

@ -316,18 +316,18 @@ gulp.task('css:social', function() {
}); });
gulp.task('css:main:min', ['css:main'], function() { gulp.task('css:main:min', ['css:main'], function() {
var csso = require('gulp-csso'); var cleanCss = require('gulp-clean-css');
return gulp.src(cfg.paths.staticCSS + cfg.paths.css.main.name) return gulp.src(cfg.paths.staticCSS + cfg.paths.css.main.name)
.pipe(csso()) .pipe(cleanCss())
.pipe(rename({suffix: '.min'})) .pipe(rename({suffix: '.min'}))
.pipe(eol('\n', true)) .pipe(eol('\n', true))
.pipe(gulp.dest(cfg.paths.staticCSS)); .pipe(gulp.dest(cfg.paths.staticCSS));
}); });
gulp.task('css:social:min', ['css:social'], function() { gulp.task('css:social:min', ['css:social'], function() {
var csso = require('gulp-csso'); var cleanCss = require('gulp-clean-css');
return gulp.src(cfg.paths.staticCSS + cfg.paths.css.social.name) return gulp.src(cfg.paths.staticCSS + cfg.paths.css.social.name)
.pipe(csso()) .pipe(cleanCss())
.pipe(rename({suffix: '.min'})) .pipe(rename({suffix: '.min'}))
.pipe(eol('\n', true)) .pipe(eol('\n', true))
.pipe(gulp.dest(cfg.paths.staticCSS)); .pipe(gulp.dest(cfg.paths.staticCSS));

204
npm-shrinkwrap.json generated
View file

@ -212,6 +212,11 @@
"version": "1.0.0", "version": "1.0.0",
"from": "path-exists@>=1.0.0 <2.0.0", "from": "path-exists@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz" "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz"
},
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
} }
} }
}, },
@ -223,7 +228,14 @@
"babel-generator": { "babel-generator": {
"version": "6.14.0", "version": "6.14.0",
"from": "babel-generator@>=6.14.0 <7.0.0", "from": "babel-generator@>=6.14.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.14.0.tgz" "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.14.0.tgz",
"dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
}, },
"babel-helper-bindify-decorators": { "babel-helper-bindify-decorators": {
"version": "6.8.0", "version": "6.8.0",
@ -751,6 +763,18 @@
"from": "buffer-xor@>=1.0.2 <2.0.0", "from": "buffer-xor@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz" "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
}, },
"bufferstreams": {
"version": "1.0.1",
"from": "bufferstreams@1.0.1",
"resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.0.1.tgz",
"dependencies": {
"readable-stream": {
"version": "1.1.14",
"from": "readable-stream@>=1.0.33 <2.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
}
}
},
"builtin-modules": { "builtin-modules": {
"version": "1.1.1", "version": "1.1.1",
"from": "builtin-modules@>=1.0.0 <2.0.0", "from": "builtin-modules@>=1.0.0 <2.0.0",
@ -821,16 +845,16 @@
"from": "circular-json@>=0.3.0 <0.4.0", "from": "circular-json@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz" "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz"
}, },
"clap": {
"version": "1.1.1",
"from": "clap@>=1.0.9 <2.0.0",
"resolved": "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz"
},
"classnames": { "classnames": {
"version": "2.2.5", "version": "2.2.5",
"from": "classnames@>=2.2.5 <3.0.0", "from": "classnames@>=2.2.5 <3.0.0",
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz" "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz"
}, },
"clean-css": {
"version": "3.4.19",
"from": "clean-css@>=3.4.12 <4.0.0",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.19.tgz"
},
"cli-boxes": { "cli-boxes": {
"version": "1.0.0", "version": "1.0.0",
"from": "cli-boxes@>=1.0.0 <2.0.0", "from": "cli-boxes@>=1.0.0 <2.0.0",
@ -905,6 +929,11 @@
"from": "combined-stream@>=0.0.4 <0.1.0", "from": "combined-stream@>=0.0.4 <0.1.0",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz" "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"
}, },
"commander": {
"version": "2.8.1",
"from": "commander@>=2.8.0 <2.9.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
},
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"from": "concat-map@0.0.1", "from": "concat-map@0.0.1",
@ -940,7 +969,14 @@
"concat-with-sourcemaps": { "concat-with-sourcemaps": {
"version": "1.0.4", "version": "1.0.4",
"from": "concat-with-sourcemaps@*", "from": "concat-with-sourcemaps@*",
"resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz" "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz",
"dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.1 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
}, },
"configstore": { "configstore": {
"version": "2.0.0", "version": "2.0.0",
@ -1007,11 +1043,6 @@
"from": "crypto-browserify@>=3.11.0 <4.0.0", "from": "crypto-browserify@>=3.11.0 <4.0.0",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz" "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"
}, },
"csso": {
"version": "2.2.1",
"from": "csso@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz"
},
"currently-unhandled": { "currently-unhandled": {
"version": "0.4.1", "version": "0.4.1",
"from": "currently-unhandled@>=0.4.1 <0.5.0", "from": "currently-unhandled@>=0.4.1 <0.5.0",
@ -1139,7 +1170,14 @@
"duplexer2": { "duplexer2": {
"version": "0.0.2", "version": "0.0.2",
"from": "duplexer2@0.0.2", "from": "duplexer2@0.0.2",
"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz" "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
"dependencies": {
"readable-stream": {
"version": "1.1.14",
"from": "readable-stream@>=1.1.9 <1.2.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
}
}
}, },
"duplexify": { "duplexify": {
"version": "3.4.5", "version": "3.4.5",
@ -1688,6 +1726,11 @@
"from": "graceful-fs@>=4.1.2 <5.0.0", "from": "graceful-fs@>=4.1.2 <5.0.0",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz" "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"
}, },
"graceful-readlink": {
"version": "1.0.1",
"from": "graceful-readlink@>=1.0.0",
"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
},
"growly": { "growly": {
"version": "1.3.0", "version": "1.3.0",
"from": "growly@>=1.2.0 <2.0.0", "from": "growly@>=1.2.0 <2.0.0",
@ -1732,6 +1775,11 @@
} }
} }
}, },
"gulp-clean-css": {
"version": "2.0.12",
"from": "gulp-clean-css@2.0.12",
"resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-2.0.12.tgz"
},
"gulp-concat-util": { "gulp-concat-util": {
"version": "0.5.5", "version": "0.5.5",
"from": "gulp-concat-util@>=0.5.5 <0.6.0", "from": "gulp-concat-util@>=0.5.5 <0.6.0",
@ -1744,11 +1792,6 @@
} }
} }
}, },
"gulp-csso": {
"version": "2.0.0",
"from": "gulp-csso@*",
"resolved": "https://registry.npmjs.org/gulp-csso/-/gulp-csso-2.0.0.tgz"
},
"gulp-eol": { "gulp-eol": {
"version": "0.1.2", "version": "0.1.2",
"from": "gulp-eol@>=0.1.2 <0.2.0", "from": "gulp-eol@>=0.1.2 <0.2.0",
@ -2073,7 +2116,14 @@
"uglify-js": { "uglify-js": {
"version": "2.7.0", "version": "2.7.0",
"from": "uglify-js@2.7.0", "from": "uglify-js@2.7.0",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz" "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz",
"dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.1 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
} }
} }
}, },
@ -2578,7 +2628,14 @@
"less": { "less": {
"version": "2.7.1", "version": "2.7.1",
"from": "less@>=2.6.0 <3.0.0", "from": "less@>=2.6.0 <3.0.0",
"resolved": "https://registry.npmjs.org/less/-/less-2.7.1.tgz" "resolved": "https://registry.npmjs.org/less/-/less-2.7.1.tgz",
"dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.3 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
}, },
"levn": { "levn": {
"version": "0.3.0", "version": "0.3.0",
@ -2769,6 +2826,11 @@
"from": "lodash.assignwith@>=4.0.7 <5.0.0", "from": "lodash.assignwith@>=4.0.7 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz" "resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"
}, },
"lodash.clonedeep": {
"version": "3.0.2",
"from": "lodash.clonedeep@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
},
"lodash.defaults": { "lodash.defaults": {
"version": "2.4.1", "version": "2.4.1",
"from": "lodash.defaults@>=2.4.1 <3.0.0", "from": "lodash.defaults@>=2.4.1 <3.0.0",
@ -3137,14 +3199,7 @@
"node-notifier": { "node-notifier": {
"version": "4.6.1", "version": "4.6.1",
"from": "node-notifier@4.6.1", "from": "node-notifier@4.6.1",
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-4.6.1.tgz", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-4.6.1.tgz"
"dependencies": {
"lodash.clonedeep": {
"version": "3.0.2",
"from": "lodash.clonedeep@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
}
}
}, },
"node-status-codes": { "node-status-codes": {
"version": "1.0.0", "version": "1.0.0",
@ -3156,6 +3211,11 @@
"from": "node.extend@>=1.1.3 <2.0.0", "from": "node.extend@>=1.1.3 <2.0.0",
"resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.5.tgz" "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.5.tgz"
}, },
"nopt": {
"version": "1.0.10",
"from": "nopt@>=1.0.10 <1.1.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
},
"normalize-package-data": { "normalize-package-data": {
"version": "2.3.5", "version": "2.3.5",
"from": "normalize-package-data@>=2.3.4 <3.0.0", "from": "normalize-package-data@>=2.3.4 <3.0.0",
@ -3401,6 +3461,11 @@
"from": "postcss@>=5.0.4 <6.0.0", "from": "postcss@>=5.0.4 <6.0.0",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.1.2.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.1.2.tgz",
"dependencies": { "dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.6 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
},
"supports-color": { "supports-color": {
"version": "3.1.2", "version": "3.1.2",
"from": "supports-color@>=3.1.2 <4.0.0", "from": "supports-color@>=3.1.2 <4.0.0",
@ -3570,9 +3635,16 @@
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz" "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
}, },
"readable-stream": { "readable-stream": {
"version": "1.1.14", "version": "2.1.5",
"from": "readable-stream@>=1.1.9 <1.2.0", "from": "readable-stream@>=2.1.4 <3.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz" "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
"dependencies": {
"isarray": {
"version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
}
}
}, },
"readdirp": { "readdirp": {
"version": "2.1.0", "version": "2.1.0",
@ -3842,9 +3914,9 @@
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz" "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
}, },
"signal-exit": { "signal-exit": {
"version": "3.0.0", "version": "3.0.1",
"from": "signal-exit@>=3.0.0 <4.0.0", "from": "signal-exit@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz" "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"
}, },
"simplestatemanager": { "simplestatemanager": {
"version": "3.2.0", "version": "3.2.0",
@ -3877,9 +3949,9 @@
"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz" "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz"
}, },
"source-map": { "source-map": {
"version": "0.5.6", "version": "0.4.4",
"from": "source-map@>=0.5.1 <0.6.0", "from": "source-map@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz" "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
}, },
"source-map-support": { "source-map-support": {
"version": "0.2.10", "version": "0.2.10",
@ -4132,19 +4204,7 @@
"readable-stream": { "readable-stream": {
"version": "2.0.6", "version": "2.0.6",
"from": "readable-stream@>=2.0.0 <2.1.0", "from": "readable-stream@>=2.0.0 <2.1.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
"dependencies": {
"process-nextick-args": {
"version": "1.0.7",
"from": "process-nextick-args@>=1.0.6 <1.1.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
},
"util-deprecate": {
"version": "1.0.2",
"from": "util-deprecate@>=1.0.1 <1.1.0",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
}
}
} }
} }
}, },
@ -4186,14 +4246,7 @@
"touch": { "touch": {
"version": "1.0.0", "version": "1.0.0",
"from": "touch@>=1.0.0 <2.0.0", "from": "touch@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz", "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz"
"dependencies": {
"nopt": {
"version": "1.0.10",
"from": "nopt@>=1.0.10 <1.1.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
}
}
}, },
"tough-cookie": { "tough-cookie": {
"version": "2.3.1", "version": "2.3.1",
@ -4272,7 +4325,14 @@
"uglify-js": { "uglify-js": {
"version": "2.7.3", "version": "2.7.3",
"from": "uglify-js@>=2.6.0 <3.0.0", "from": "uglify-js@>=2.6.0 <3.0.0",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz" "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz",
"dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.1 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
}, },
"uglify-save-license": { "uglify-save-license": {
"version": "0.4.1", "version": "0.4.1",
@ -4373,6 +4433,11 @@
"from": "vinyl@>=0.5.0 <0.6.0", "from": "vinyl@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz" "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"
}, },
"vinyl-bufferstream": {
"version": "1.0.1",
"from": "vinyl-bufferstream@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/vinyl-bufferstream/-/vinyl-bufferstream-1.0.1.tgz"
},
"vinyl-fs": { "vinyl-fs": {
"version": "0.3.14", "version": "0.3.14",
"from": "vinyl-fs@>=0.3.0 <0.4.0", "from": "vinyl-fs@>=0.3.0 <0.4.0",
@ -4413,7 +4478,14 @@
"vinyl-sourcemaps-apply": { "vinyl-sourcemaps-apply": {
"version": "0.2.1", "version": "0.2.1",
"from": "vinyl-sourcemaps-apply@>=0.2.0 <0.3.0", "from": "vinyl-sourcemaps-apply@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz" "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
"dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.1 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
}, },
"vm-browserify": { "vm-browserify": {
"version": "0.0.4", "version": "0.0.4",
@ -4452,6 +4524,11 @@
"from": "camelcase@>=1.0.2 <2.0.0", "from": "camelcase@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz" "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
}, },
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.3 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
},
"supports-color": { "supports-color": {
"version": "3.1.2", "version": "3.1.2",
"from": "supports-color@>=3.1.0 <4.0.0", "from": "supports-color@>=3.1.0 <4.0.0",
@ -4501,7 +4578,14 @@
"webpack-sources": { "webpack-sources": {
"version": "0.1.2", "version": "0.1.2",
"from": "webpack-sources@>=0.1.0 <0.2.0", "from": "webpack-sources@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.2.tgz" "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.2.tgz",
"dependencies": {
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.3 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
}, },
"websocket-driver": { "websocket-driver": {
"version": "0.6.5", "version": "0.6.5",

View file

@ -65,8 +65,8 @@
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.1", "gulp-autoprefixer": "^3.1.1",
"gulp-cached": "^1.1.0", "gulp-cached": "^1.1.0",
"gulp-clean-css": "^2.0.12",
"gulp-concat-util": "^0.5.5", "gulp-concat-util": "^0.5.5",
"gulp-csso": "^2.0.0",
"gulp-eol": "^0.1.2", "gulp-eol": "^0.1.2",
"gulp-eslint": "^3.0.1", "gulp-eslint": "^3.0.1",
"gulp-filter": "^4.0.0", "gulp-filter": "^4.0.0",