提交 8c606dbb 编写于 作者: P Piotr Bryk

Merge pull request #202 from bryk/update-deps

Update bower and npm dependencies
......@@ -5,17 +5,17 @@
"name": "kubernetes-dashboard",
"version": "0.0.1",
"dependencies": {
"angular": "~1.4.2",
"angular-animate": "~1.4.2",
"angular-aria": "~1.4.2",
"angular-material": "~1.0.0",
"angular-messages": "~1.4.2",
"angular": "~1.4.8",
"angular-animate": "~1.4.8",
"angular-aria": "~1.4.8",
"angular-material": "~1.0.1",
"angular-messages": "~1.4.8",
"angular-ui-router": "~0.2.15",
"angular-resource": "~1.4.2",
"angular-sanitize": "~1.4.2"
"angular-resource": "~1.4.8",
"angular-sanitize": "~1.4.8"
},
"devDependencies": {
"angular-mocks": "~1.4.2",
"angular-mocks": "~1.4.8",
"google-closure-library": "*"
}
}
......@@ -19,7 +19,7 @@ import del from 'del';
import gulp from 'gulp';
import gulpFilter from 'gulp-filter';
import gulpMinifyCss from 'gulp-minify-css';
import gulpMinifyHtml from 'gulp-minify-html';
import gulpHtmlmin from 'gulp-htmlmin';
import gulpUglify from 'gulp-uglify';
import gulpUseref from 'gulp-useref';
import gulpRev from 'gulp-rev';
......@@ -70,10 +70,9 @@ gulp.task('build-frontend', ['assets', 'index:prod'], function() {
.pipe(gulpUseref({searchPath: [conf.paths.prodTmp]}))
.pipe(gulpRevReplace())
.pipe(htmlFilter)
.pipe(gulpMinifyHtml({
empty: true,
spare: true,
quotes: true,
.pipe(gulpHtmlmin({
removeComments: true,
collapseWhitespace: true,
}))
.pipe(htmlFilter.restore)
.pipe(gulp.dest(conf.paths.distPublic));
......
......@@ -18,7 +18,7 @@
import gulp from 'gulp';
import gulpAngularTemplatecache from 'gulp-angular-templatecache';
import gulpClosureCompiler from 'gulp-closure-compiler';
import gulpMinifyHtml from 'gulp-minify-html';
import gulpHtmlmin from 'gulp-htmlmin';
import path from 'path';
import webpackStream from 'webpack-stream';
......@@ -121,10 +121,9 @@ gulp.task('scripts:prod', ['angular-templates'], function() {
*/
gulp.task('angular-templates', function() {
return gulp.src(path.join(conf.paths.frontendSrc, '**/!(index).html'))
.pipe(gulpMinifyHtml({
empty: true,
spare: true,
quotes: true,
.pipe(gulpHtmlmin({
removeComments: true,
collapseWhitespace: true,
}))
.pipe(
gulpAngularTemplatecache(
......
......@@ -8,17 +8,16 @@
},
"license": "Apache-2.0",
"devDependencies": {
"babel": "~6.3.13",
"babel-core": "~6.3.13",
"babel": "~6.3.26",
"babel-core": "~6.3.26",
"babel-loader": "~6.2.0",
"babel-preset-es2015": "~6.3.13",
"babelify": "~7.2.0",
"bower": "~1.7.0",
"browser-sync": "~2.10.0",
"browser-sync-spa": "~1.0.2",
"bower": "~1.7.1",
"browser-sync": "~2.10.1",
"browser-sync-spa": "~1.0.3",
"browserify": "~12.0.1",
"browserify-istanbul": "~0.2.1",
"gulp-codecov.io": "~1.0.1",
"del": "~2.2.0",
"eslint-plugin-angular": "~0.15.0",
"google-closure-compiler": "~20151216.0.0",
......@@ -29,35 +28,36 @@
"gulp-chmod": "~1.3.0",
"gulp-clang-format": "~1.0.23",
"gulp-closure-compiler": "~0.4.0",
"gulp-codecov.io": "~1.0.1",
"gulp-concat": "~2.6.0",
"gulp-eslint": "~1.1.0",
"gulp-eslint": "~1.1.1",
"gulp-filter": "~3.0.1",
"gulp-flatten": "~0.2.0",
"gulp-git": "~1.6.0",
"gulp-gunzip": "~0.0.3",
"gulp-htmlmin": "^1.3.0",
"gulp-inject": "~3.0.0",
"gulp-load-plugins": "~1.1.0",
"gulp-minify-css": "~1.2.1",
"gulp-minify-html": "~1.0.4",
"gulp-minify-css": "^1.2.2",
"gulp-protractor": "~2.1.0",
"gulp-rename": "~1.2.2",
"gulp-replace": "~0.5.4",
"gulp-rev": "~6.0.1",
"gulp-rev-replace": "~0.4.2",
"gulp-sass": "~2.1.0",
"gulp-rev-replace": "~0.4.3",
"gulp-sass": "~2.1.1",
"gulp-sass-lint": "^1.1.0",
"gulp-size": "~2.0.0",
"gulp-sourcemaps": "~1.6.0",
"gulp-uglify": "~1.5.1",
"gulp-untar": "~0.0.4",
"gulp-useref": "~3.0.3",
"gulp-util": "~3.0.6",
"gulp-useref": "~3.0.4",
"gulp-util": "~3.0.7",
"gulp-watch": "~4.3.5",
"isparta": "~4.0.0",
"karma": "~0.13.9",
"karma-browserify": "~4.4.0",
"karma-chrome-launcher": "~0.2.0",
"karma-coverage": "~0.5.2",
"karma": "0.13.15",
"karma-browserify": "~4.4.2",
"karma-chrome-launcher": "~0.2.2",
"karma-coverage": "~0.5.3",
"karma-jasmine": "~0.3.6",
"karma-ng-html2js-preprocessor": "~0.2.0",
"karma-sourcemap-loader": "~0.3.6",
......@@ -67,11 +67,11 @@
"q": "~1.4.1",
"request": "~2.67.0",
"run-sequence": "~1.1.5",
"semver": "~2.0.0",
"semver": "~5.1.0",
"uglify-save-license": "~0.4.1",
"vinyl-source-stream": "1.1.0",
"webpack-stream": "~3.1.0",
"wiredep": "~3.0.0-beta",
"wiredep": "~3.0.0",
"wrench": "~1.5.8"
},
"engines": {
......
......@@ -274,7 +274,7 @@ limitations under the License.
{{event.message}}
</td>
<td class="kd-replicasetdetail-table-cell">
{<!>{{event.sourceComponent}} {{event.sourceHost}}<!>}
{&lt;!&gt;{{event.sourceComponent}} {{event.sourceHost}}&lt;!&gt;}
</td>
<td class="kd-replicasetdetail-table-cell">{{event.object}}</td>
<td class="kd-replicasetdetail-table-cell">{{event.count}}</td>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册