[ONOS-6523] GUI Build: Removed third party libs from repo
- installed at build time as dependancies
Change-Id: I85fd69f0b14e6fd1af2693320c1ca23c62f58ac4
diff --git a/web/gui/src/main/webapp/tests/karma.ci.js b/web/gui/src/main/webapp/tests/karma.ci.js
index fddf81a..d7f7d18 100644
--- a/web/gui/src/main/webapp/tests/karma.ci.js
+++ b/web/gui/src/main/webapp/tests/karma.ci.js
@@ -16,13 +16,15 @@
// list of files / patterns to load in the browser
files: [
// library code...
- '../tp/angular.js',
- '../tp/angular-mocks.js',
- '../tp/angular-route.js',
- '../tp/angular-cookies.js',
- '../tp/d3.js',
- '../tp/topojson.v1.min.js',
- '../tp/lodash.min.js',
+ '../vendor/angular/angular.min.js',
+ '../vendor/angular-mocks/index.js',
+ '../vendor/angular-route/angular-route.min.js',
+ '../vendor/angular-cookies/angular-cookies.min.js',
+ '../vendor/d3/d3.min.js',
+ '../vendor/topojson/topojson.js',
+ '../vendor/Chart.js/dist/Chart.min.js',
+ '../vendor/angular-chart.js/dist/angular-chart.min.js',
+ '../vendor/lodash/index.js',
// production code...
// make sure modules are defined first...
diff --git a/web/gui/src/main/webapp/tests/karma.conf.js b/web/gui/src/main/webapp/tests/karma.conf.js
index ba08e18..bc4c942 100644
--- a/web/gui/src/main/webapp/tests/karma.conf.js
+++ b/web/gui/src/main/webapp/tests/karma.conf.js
@@ -16,13 +16,15 @@
// list of files / patterns to load in the browser
files: [
// library code...
- '../tp/angular.js',
- '../tp/angular-mocks.js',
- '../tp/angular-route.js',
- '../tp/angular-cookies.js',
- '../tp/d3.js',
- '../tp/topojson.v1.min.js',
- '../tp/lodash.min.js',
+ '../vendor/angular/angular.min.js',
+ '../vendor/angular-mocks/index.js',
+ '../vendor/angular-route/angular-route.min.js',
+ '../vendor/angular-cookies/angular-cookies.min.js',
+ '../vendor/d3/d3.min.js',
+ '../vendor/topojson/topojson.js',
+ '../vendor/Chart.js/dist/Chart.min.js',
+ '../vendor/angular-chart.js/dist/angular-chart.min.js',
+ '../vendor/lodash/index.js',
// production code...
// make sure modules are defined first...
diff --git a/web/gui/src/main/webapp/tests/package-lock.json b/web/gui/src/main/webapp/tests/package-lock.json
index 5303aaa..b5f7f3c 100644
--- a/web/gui/src/main/webapp/tests/package-lock.json
+++ b/web/gui/src/main/webapp/tests/package-lock.json
@@ -3,6 +3,12 @@
"version": "1.0.0",
"lockfileVersion": 1,
"dependencies": {
+ "bower": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz",
+ "integrity": "sha1-Vdvr7wrZFVOC2enT5JfBNyNFtEo=",
+ "dev": true
+ },
"jasmine-core": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz",
diff --git a/web/gui/src/main/webapp/tests/package.json b/web/gui/src/main/webapp/tests/package.json
index 4d298bb..59b8102 100644
--- a/web/gui/src/main/webapp/tests/package.json
+++ b/web/gui/src/main/webapp/tests/package.json
@@ -4,8 +4,9 @@
"description": "Tests for the ONOS GUI",
"main": "karma.conf.js",
"scripts": {
- "test:dev": "karma start",
- "test": "karma start karma.ci.js"
+ "install:deps": "./node_modules/bower/bin/bower install ../bower.json --config.directory=../vendor",
+ "test:dev": "npm run install:deps && karma start",
+ "test": "npm run install:deps && karma start karma.ci.js"
},
"author": "ON.Lab",
"license": "Apache-2.0",
@@ -14,6 +15,7 @@
"url": "opennetworkinglab/onos"
},
"devDependencies": {
+ "bower": "^1.8.0",
"jasmine-core": "^2.4.1",
"karma": "^0.13.22",
"karma-babel-preprocessor": "^6.0.1",