chore(build-system): drop bower, use npm|yarn for frontend dependencies (#1416)

* chore(build-system): drop bower, use npm|yarn for frontend dependencies

* chore(build-sytem): for github dependencies, use semver format instead of tag/commit

* add yarn.lock
pull/1468/head
1138-4EB 2017-12-05 09:52:38 +01:00 committed by Anthony Lapenna
parent 75b3a78e2b
commit 997af882c4
5 changed files with 4613 additions and 157 deletions

View File

@ -1,62 +0,0 @@
{
"name": "portainer",
"version": "1.15.3",
"homepage": "https://github.com/portainer/portainer",
"authors": [
"Anthony Lapenna <anthony.lapenna at gmail dot com>"
],
"description": "A web interface for the Docker Remote API.",
"keywords": [
"docker",
"ui",
"api",
"portainer",
"uifordocker",
"dockerui",
"swarm"
],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"angular": "~1.5.0",
"angular-cookies": "~1.5.0",
"angular-bootstrap": "~2.5.0",
"angular-sanitize": "~1.5.0",
"angular-mocks": "~1.5.0",
"angular-resource": "~1.5.0",
"angular-ui-select": "~0.19.6",
"angular-utils-pagination": "~0.11.1",
"angular-local-storage": "~0.5.2",
"angular-jwt": "~0.1.8",
"angular-json-tree": "1.0.1",
"angular-google-analytics": "~1.1.9",
"bootstrap": "~3.3.6",
"filesize": "~3.3.0",
"jquery": "1.11.1",
"lodash": "4.12.0",
"rdash-ui": "1.0.*",
"moment": "~2.14.1",
"font-awesome": "~4.7.0",
"ng-file-upload": "~12.2.13",
"splitargs": "~0.2.0",
"bootbox.js": "bootbox#^4.4.0",
"angular-multi-select": "~4.0.0",
"toastr": "~2.1.3",
"xterm.js": "~2.8.1",
"chart.js": "~2.6.0",
"angularjs-slider": "^6.4.0",
"angular-ui-router": "~1.0.6",
"codemirror": "~5.30.0",
"js-yaml": "~3.10.0",
"angular-loading-bar": "~0.9.0"
},
"resolutions": {
"angular": "1.5.11"
}
}

View File

@ -132,9 +132,9 @@ module.exports = function (grunt) {
},
assets: {
files: [
{dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'bower_components/bootstrap/fonts/'},
{dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'bower_components/font-awesome/fonts/'},
{dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'bower_components/rdash-ui/dist/fonts/'},
{dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/bootstrap/fonts/'},
{dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/font-awesome/fonts/'},
{dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/rdash-ui/dist/fonts/'},
{dest: '<%= distdir %>/images/', src: '**', expand: true, cwd: 'assets/images/'},
{dest: '<%= distdir %>/ico', src: '**', expand: true, cwd: 'assets/ico'}
]

View File

@ -22,9 +22,41 @@
"engines": {
"node": ">= 0.8.4"
},
"dependencies": {
"angular": "~1.5.0",
"angular-cookies": "~1.5.0",
"angular-ui-bootstrap": "~2.5.0",
"angular-sanitize": "~1.5.0",
"angular-mocks": "~1.5.0",
"angular-resource": "~1.5.0",
"ui-select": "~0.19.6",
"angular-utils-pagination": "~0.11.1",
"angular-local-storage": "~0.5.2",
"angular-jwt": "~0.1.8",
"angular-json-tree": "1.0.1",
"angular-google-analytics": "github:revolunet/angular-google-analytics#~1.1.9",
"bootstrap": "~3.3.6",
"filesize": "~3.3.0",
"jquery": "1.11.1",
"lodash": "4.12.0",
"rdash-ui": "1.0.*",
"moment": "~2.14.1",
"font-awesome": "~4.7.0",
"ng-file-upload": "~12.2.13",
"splitargs": "github:deviantony/splitargs#~0.2.0",
"bootbox": "^4.4.0",
"isteven-angular-multiselect": "~4.0.0",
"toastr": "github:CodeSeven/toastr#~2.1.3",
"xterm": "~2.8.1",
"chart.js": "~2.6.0",
"angularjs-slider": "^6.4.0",
"@uirouter/angularjs": "~1.0.6",
"codemirror": "~5.30.0",
"js-yaml": "~3.10.0",
"angular-loading-bar": "~0.9.0"
},
"devDependencies": {
"autoprefixer": "^7.1.1",
"bower": "^1.5.2",
"cssnano": "^3.10.0",
"eslint": "^3.19.0",
"grunt": "~0.4.0",
@ -45,8 +77,5 @@
"grunt-usemin": "^3.1.1",
"gruntify-eslint": "^3.1.0",
"load-grunt-tasks": "^3.5.2"
},
"scripts": {
"postinstall": "bower install"
}
}

View File

@ -1,98 +1,98 @@
---
js:
regular:
- bower_components/jquery/dist/jquery.js
- bower_components/bootstrap/dist/js/bootstrap.js
- bower_components/bootbox.js/bootbox.js
- bower_components/filesize/lib/filesize.js
- bower_components/lodash/dist/lodash.js
- bower_components/moment/moment.js
- bower_components/chart.js/dist/Chart.js
- bower_components/splitargs/src/splitargs.js
- bower_components/toastr/toastr.js
- bower_components/xterm.js/dist/xterm.js
- bower_components/xterm.js/dist/addons/fit/fit.js
- bower_components/js-yaml/dist/js-yaml.js
- bower_components/codemirror/lib/codemirror.js
- bower_components/codemirror/mode/yaml/yaml.js
- bower_components/codemirror/addon/lint/lint.js
- bower_components/codemirror/addon/lint/yaml-lint.js
- node_modules/jquery/dist/jquery.js
- node_modules/bootstrap/dist/js/bootstrap.js
- node_modules/bootbox/bootbox.js
- node_modules/filesize/lib/filesize.js
- node_modules/lodash/lodash.js
- node_modules/moment/moment.js
- node_modules/chart.js/dist/Chart.js
- node_modules/splitargs/src/splitargs.js
- node_modules/toastr/toastr.js
- node_modules/xterm/dist/xterm.js
- node_modules/xterm/dist/addons/fit/fit.js
- node_modules/js-yaml/dist/js-yaml.js
- node_modules/codemirror/lib/codemirror.js
- node_modules/codemirror/mode/yaml/yaml.js
- node_modules/codemirror/addon/lint/lint.js
- node_modules/codemirror/addon/lint/yaml-lint.js
minified:
- bower_components/jquery/dist/jquery.min.js
- bower_components/bootstrap/dist/js/bootstrap.min.js
- bower_components/bootbox.js/bootbox.js
- bower_components/filesize/lib/filesize.min.js
- bower_components/lodash/dist/lodash.min.js
- bower_components/moment/min/moment.min.js
- bower_components/chart.js/dist/Chart.min.js
- bower_components/splitargs/src/splitargs.js
- bower_components/toastr/toastr.min.js
- bower_components/xterm.js/dist/xterm.js
- bower_components/xterm.js/dist/addons/fit/fit.js
- bower_components/js-yaml/dist/js-yaml.min.js
- bower_components/codemirror/lib/codemirror.js
- bower_components/codemirror/mode/yaml/yaml.js
- bower_components/codemirror/addon/lint/lint.js
- bower_components/codemirror/addon/lint/yaml-lint.js
- node_modules/jquery/dist/jquery.min.js
- node_modules/bootstrap/dist/js/bootstrap.min.js
- node_modules/bootbox/bootbox.js
- node_modules/filesize/lib/filesize.js
- node_modules/lodash/lodash.min.js
- node_modules/moment/min/moment.min.js
- node_modules/chart.js/dist/Chart.min.js
- node_modules/splitargs/src/splitargs.js
- node_modules/toastr/build/toastr.min.js
- node_modules/xterm/dist/xterm.js
- node_modules/xterm/dist/addons/fit/fit.js
- node_modules/js-yaml/dist/js-yaml.min.js
- node_modules/codemirror/lib/codemirror.js
- node_modules/codemirror/mode/yaml/yaml.js
- node_modules/codemirror/addon/lint/lint.js
- node_modules/codemirror/addon/lint/yaml-lint.js
css:
regular:
- bower_components/bootstrap/dist/css/bootstrap.css
- bower_components/rdash-ui/dist/css/rdash.css
- bower_components/angular-multi-select/isteven-multi-select.css
- bower_components/angular-ui-select/dist/select.css
- bower_components/font-awesome/css/font-awesome.css
- bower_components/toastr/toastr.css
- bower_components/xterm.js/dist/xterm.css
- bower_components/angularjs-slider/dist/rzslider.css
- bower_components/codemirror/lib/codemirror.css
- bower_components/codemirror/addon/lint/lint.css
- bower_components/angular-json-tree/dist/angular-json-tree.css
- bower_components/angular-loading-bar/build/loading-bar.css
- node_modules/bootstrap/dist/css/bootstrap.css
- node_modules/rdash-ui/dist/css/rdash.css
- node_modules/isteven-angular-multiselect/isteven-multi-select.css
- node_modules/ui-select/dist/select.css
- node_modules/font-awesome/css/font-awesome.css
- node_modules/toastr/build/toastr.css
- node_modules/xterm/dist/xterm.css
- node_modules/angularjs-slider/dist/rzslider.css
- node_modules/codemirror/lib/codemirror.css
- node_modules/codemirror/addon/lint/lint.css
- node_modules/angular-json-tree/dist/angular-json-tree.css
- node_modules/angular-loading-bar/build/loading-bar.css
minified:
- bower_components/bootstrap/dist/css/bootstrap.min.css
- bower_components/rdash-ui/dist/css/rdash.min.css
- bower_components/angular-multi-select/isteven-multi-select.css
- bower_components/angular-ui-select/dist/select.min.css
- bower_components/font-awesome/css/font-awesome.min.css
- bower_components/toastr/toastr.min.css
- bower_components/xterm.js/dist/xterm.css
- bower_components/angularjs-slider/dist/rzslider.min.css
- bower_components/codemirror/lib/codemirror.css
- bower_components/codemirror/addon/lint/lint.css
- bower_components/angular-json-tree/dist/angular-json-tree.css
- bower_components/angular-loading-bar/build/loading-bar.min.css
- node_modules/bootstrap/dist/css/bootstrap.min.css
- node_modules/rdash-ui/dist/css/rdash.min.css
- node_modules/isteven-angular-multiselect/isteven-multi-select.css
- node_modules/ui-select/dist/select.min.css
- node_modules/font-awesome/css/font-awesome.min.css
- node_modules/toastr/build/toastr.min.css
- node_modules/xterm/dist/xterm.css
- node_modules/angularjs-slider/dist/rzslider.min.css
- node_modules/codemirror/lib/codemirror.css
- node_modules/codemirror/addon/lint/lint.css
- node_modules/angular-json-tree/dist/angular-json-tree.css
- node_modules/angular-loading-bar/build/loading-bar.min.css
angular:
regular:
- bower_components/angular/angular.js
- bower_components/angular-bootstrap/ui-bootstrap-tpls.js
- bower_components/angular-cookies/angular-cookies.js
- bower_components/angular-google-analytics/dist/angular-google-analytics.js
- bower_components/angular-jwt/dist/angular-jwt.js
- bower_components/angular-local-storage/dist/angular-local-storage.js
- bower_components/angular-resource/angular-resource.js
- bower_components/angular-sanitize/angular-sanitize.js
- bower_components/angular-ui-select/dist/select.js
- bower_components/angular-ui-router/release/angular-ui-router.js
- bower_components/angular-utils-pagination/dirPagination.js
- bower_components/ng-file-upload/ng-file-upload.js
- bower_components/angularjs-slider/dist/rzslider.js
- bower_components/angular-multi-select/isteven-multi-select.js
- bower_components/angular-json-tree/dist/angular-json-tree.js
- bower_components/angular-loading-bar/build/loading-bar.js
- node_modules/angular/angular.js
- node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js
- node_modules/angular-cookies/angular-cookies.js
- node_modules/angular-google-analytics/dist/angular-google-analytics.js
- node_modules/angular-jwt/dist/angular-jwt.js
- node_modules/angular-local-storage/dist/angular-local-storage.js
- node_modules/angular-resource/angular-resource.js
- node_modules/angular-sanitize/angular-sanitize.js
- node_modules/ui-select/dist/select.js
- node_modules/@uirouter/angularjs/release/angular-ui-router.js
- node_modules/angular-utils-pagination/dirPagination.js
- node_modules/ng-file-upload/dist/ng-file-upload.js
- node_modules/angularjs-slider/dist/rzslider.js
- node_modules/isteven-angular-multiselect/isteven-multi-select.js
- node_modules/angular-json-tree/dist/angular-json-tree.js
- node_modules/angular-loading-bar/build/loading-bar.js
minified:
- bower_components/angular/angular.min.js
- bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
- bower_components/angular-cookies/angular-cookies.min.js
- bower_components/angular-google-analytics/dist/angular-google-analytics.min.js
- bower_components/angular-jwt/dist/angular-jwt.min.js
- bower_components/angular-local-storage/dist/angular-local-storage.min.js
- bower_components/angular-resource/angular-resource.min.js
- bower_components/angular-sanitize/angular-sanitize.min.js
- bower_components/angular-ui-select/dist/select.min.js
- bower_components/angular-ui-router/release/angular-ui-router.min.js
- bower_components/angular-utils-pagination/dirPagination.js
- bower_components/ng-file-upload/ng-file-upload.min.js
- bower_components/angularjs-slider/dist/rzslider.min.js
- bower_components/angular-multi-select/isteven-multi-select.js
- bower_components/angular-json-tree/dist/angular-json-tree.min.js
- bower_components/angular-loading-bar/build/loading-bar.min.js
- node_modules/angular/angular.min.js
- node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js
- node_modules/angular-cookies/angular-cookies.min.js
- node_modules/angular-google-analytics/dist/angular-google-analytics.min.js
- node_modules/angular-jwt/dist/angular-jwt.min.js
- node_modules/angular-local-storage/dist/angular-local-storage.min.js
- node_modules/angular-resource/angular-resource.min.js
- node_modules/angular-sanitize/angular-sanitize.min.js
- node_modules/ui-select/dist/select.min.js
- node_modules/@uirouter/angularjs/release/angular-ui-router.min.js
- node_modules/angular-utils-pagination/dirPagination.js
- node_modules/ng-file-upload/dist/ng-file-upload.min.js
- node_modules/angularjs-slider/dist/rzslider.min.js
- node_modules/isteven-angular-multiselect/isteven-multi-select.js
- node_modules/angular-json-tree/dist/angular-json-tree.min.js
- node_modules/angular-loading-bar/build/loading-bar.min.js

4489
yarn.lock Normal file

File diff suppressed because it is too large Load Diff