Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
Merge pull request #41 from esperco/af/dependencies-update
Browse files Browse the repository at this point in the history
Clean up deprecated packages, missing dependencies
  • Loading branch information
haoyang committed Jan 29, 2016
2 parents f4b42e4 + d8bb78b commit 81bbf5a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
7 changes: 5 additions & 2 deletions build-helpers/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var data = require("gulp-data"),
deglob = require("./deglob"),
gulp = require("gulp"),
gutil = require("gulp-util"),
minify = require("gulp-minify-html"),
minify = require("gulp-htmlmin"),
nunjucksRender = require("gulp-nunjucks-render"),
production = require("./production"),
rename = require("gulp-rename"),
Expand Down Expand Up @@ -49,7 +49,10 @@ module.exports = function(globs, out, context) {
}));

if (production.isSet()) {
ret = ret.pipe(minify());
ret = ret.pipe(minify({
collapseWhitespace: true,
conservativeCollapse: true
}));
}

/*
Expand Down
2 changes: 1 addition & 1 deletion build-helpers/less.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var _ = require("lodash"),
filter = require("gulp-filter"),
gulp = require("gulp"),
less = require("gulp-less"),
minifyCss = require("gulp-minify-css"),
minifyCss = require("gulp-cssnano"),
path = require("path"),
production = require("./production"),
sourcemaps = require("gulp-sourcemaps");
Expand Down
1 change: 0 additions & 1 deletion esper.com/ts/test.js/test.js.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ declare module Esper {
export var React: ReactStatic;
export var ReactDOM: ReactDOMStatic;
export var page: PageJS.Static;
export var twttr: Twitter;
export var PRODUCTION: boolean;
}

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"gulp": "git://github.com/gulpjs/gulp.git#4.0",
"gulp-autoprefixer": "^2.3.1",
"gulp-cached": "^1.1.0",
"gulp-cssnano": "^2.1.0",
"gulp-data": "^1.2.1",
"gulp-exec": "^2.1.1",
"gulp-filter": "^3.0.1",
"gulp-htmlmin": "^1.3.0",
"gulp-less": "^3.0.3",
"gulp-minify-css": "^1.2.0",
"gulp-minify-html": "^1.0.4",
"gulp-nunjucks-render": "^1.1.0",
"gulp-remember": "^0.3.0",
"gulp-rename": "^1.2.2",
Expand Down

0 comments on commit 81bbf5a

Please sign in to comment.