From 7445c25975066a7a0dd8eeb847638825ae9911f8 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 15 Aug 2019 02:24:20 -0700 Subject: [PATCH] Remove bower.json This will be replaced in an adjacent commit with updates to composer.json --- bin/setup.sh | 22 +--------------------- bower.json | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 bower.json diff --git a/bin/setup.sh b/bin/setup.sh index f71e7a6d74..2badb46673 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -144,32 +144,12 @@ if [ -n "$DO_DOWNLOAD" ]; then COMPOSER=$(pickcmd composer composer.phar) $COMPOSER install - if has_commands bower karma ; then + if has_commands karma ; then ## dev dependencies have been installed globally; don't force developer to redownload npm install --production else npm install fi - - BOWER=$(pickcmd node_modules/bower/bin/bower bower) - if [ -f "$BOWER" ]; then - NODE=$(pickcmd node nodejs) - BOWER="$NODE $BOWER" - fi - # Without the force flag, bower may not check for new versions or verify that installed software matches version specified in bower.json - # With the force flag, bower will ignore all caches and download all deps. - if [ -n "$OFFLINE" ]; then - BOWER_OPT= - elif [ ! -f "bower_components/.setupsh.ts" ]; then - ## First run -- or cleanup from failed run - BOWER_OPT=-f - elif [ "bower.json" -nt "bower_components/.setupsh.ts" ]; then - ## Bower.json has changed since last run - BOWER_OPT=-f - fi - [ -f "bower_components/.setupsh.ts" ] && rm -f "bower_components/.setupsh.ts" - $BOWER install $BOWER_OPT - touch bower_components/.setupsh.ts popd fi diff --git a/bower.json b/bower.json deleted file mode 100644 index f4159c2636..0000000000 --- a/bower.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "civicrm", - "description": "CiviCRM", - "version": "5.0.0", - "license": "AGPL-3.0", - "private": true, - "dependencies": { - "angular": "~1.5.0", - "angular-file-upload": ">=1.1.5 <=1.1.6", - "angular-jquery-dialog-service": "totten/angular-jquery-dialog-service#civicrm", - "angular-mocks": "~1.5.0", - "angular-route": "~1.5.0", - "angular-ui-sortable": "0.12.x", - "angular-ui-utils": "0.1.x", - "angular-unsavedChanges": "~0.1.1", - "qunit": "~1.10", - "d3": "3.4.11", - "d3-3.5.x": "d3#~3.5.17", - "dc-2.1.x": "dc.js#~2.1.8", - "crossfilter-1.3.x": "crossfilter2#~1.3.11", - "jquery": "civicrm/jquery#1.12.4-civicrm-1.2", - "jquery-ui": "~1.12", - "lodash-compat": "~3.0", - "google-code-prettify": "~1.0", - "select2": "colemanw/select2#v3.5-civicrm-1.0", - "jquery-validation": "~1.13", - "datatables": "~1.10", - "jstree": "~3", - "ckeditor": "~4.9", - "font-awesome": "~4", - "angular-bootstrap": "^2.5.0", - "angular-sanitize": "~1.5.0", - "smartmenus": "~1.1", - "phantomjs-polyfill": "^0.0.2", - "es6-promise": "^4.2.4", - "angular-xeditable": "^0.9.0", - "checklist-model": "~1", - "css-color-names": "~1" - }, - "resolutions": { - "angular": "~1.5.11", - "jquery": "1.12.4-civicrm-1.2" - } -} -- 2.25.1