From 2df70a669dc0aff591103a545abf1a1f96fa1c28 Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Tue, 2 Feb 2016 20:08:07 -0800 Subject: [PATCH 1/2] Remove bower --- .travis.yml | 2 -- app/account/account.module.js | 1 - app/index.js | 4 +--- bower.json | 19 ------------------- package.json | 1 + 5 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 bower.json diff --git a/.travis.yml b/.travis.yml index 31682b926..645bdd212 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,6 @@ before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sleep 3 # give xvfb some time to start - - npm install -g bower - - bower install script: - npm test - webpack --bail --progress --build --tc diff --git a/app/account/account.module.js b/app/account/account.module.js index 50f028f5f..c45ce1ea5 100644 --- a/app/account/account.module.js +++ b/app/account/account.module.js @@ -8,7 +8,6 @@ import angular from 'angular' 'tc.services', 'ngIsoConstants', 'angucomplete-alt', - 'ngBusy', 'blocks.logger' ] diff --git a/app/index.js b/app/index.js index 7cbdd5930..ac7021959 100644 --- a/app/index.js +++ b/app/index.js @@ -11,6 +11,7 @@ require('angular-jwt') require('angular-filter') require('angular-carousel') require('angular-intro.js') +require('angular-img-fallback') require('tc-angular-ellipsis') require('d3') require('lodash') @@ -24,9 +25,6 @@ require('xml2js') require('appirio-tech-ng-ui-components') require('appirio-tech-ng-iso-constants') -require('../bower_components/ng-busy/build/angular-busy') -require('../bower_components/angular-img-fallback/angular.dcb-img-fallback') - // Vendor styles require('../node_modules/angucomplete-alt/angucomplete-alt.css') require('../node_modules/intro.js/introjs.css') diff --git a/bower.json b/bower.json deleted file mode 100644 index e93960633..000000000 --- a/bower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "topcoder-app", - "version": "0.0.0", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "angular-img-fallback": "~0.1.3", - "ng-busy": "~0.2.0" - }, - "resolutions": { - "angular": "1.4.x", - "angular-sanitize": "1.4.x" - } -} diff --git a/package.json b/package.json index b2f633e43..717dbd792 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "angular-carousel": "^1.0.1", "angular-cookies": "^1.4.9", "angular-filter": "^0.5.8", + "angular-img-fallback": "^0.1.3", "angular-intro.js": "appirio-tech/angular-intro.js.git#feature/fix-for-webpack", "angular-jwt": "0.0.9", "angular-messages": "^1.4.9", From 6080ae23cc568d3f1e9b6c5f523bd4047bf090bf Mon Sep 17 00:00:00 2001 From: Nick Litwin Date: Tue, 2 Feb 2016 20:15:22 -0800 Subject: [PATCH 2/2] Update test dependencies --- webpack.tests.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/webpack.tests.js b/webpack.tests.js index c7cb4e633..cf3e8f6c2 100644 --- a/webpack.tests.js +++ b/webpack.tests.js @@ -17,8 +17,8 @@ require('angular-jwt') require('angular-filter') require('angular-carousel') require('angular-intro.js') +require('angular-img-fallback') require('tc-angular-ellipsis') -require('moment') require('d3') require('lodash') require('zepto/zepto.min.js') @@ -31,9 +31,6 @@ require('xml2js') require('appirio-tech-ng-ui-components') require('appirio-tech-ng-iso-constants') -require('./bower_components/ng-busy/build/angular-busy') -require('./bower_components/angular-img-fallback/angular.dcb-img-fallback') - // Require Angular modules first requireContextFiles(require.context('./app/', true, /^.*\.module\.js$/igm)) requireContextFiles(require.context('./app/', true, /^(?!index\.js$)(.*\.js)$/igm))