Added native Bazel build to GUI2. Reduced a lot of the unused Angular CLI structures
Reviewers should look at the changes in WORKSPACE, BUILD, BUILD.bazel, README.md files
This is only possible now as rules_nodejs went to 1.0.0 on December 20
gui2 has now been made the entry point (rather than gui2-fw-lib)
No tests or linting are functional yet for Typescript
Each NgModule now has its own BUILD.bazel file with ng_module
gui2-fw-lib is all one module and has been refactored to simplify the directory structure
gui2-topo-lib is also all one module - its directory structure has had 3 layers removed
The big bash script in web/gui2/BUILD has been removed - all is done through ng_module rules
in web/gui2/src/main/webapp/BUILD.bazel and web/gui2/src/main/webapp/app/BUILD.bazel
Change-Id: Ifcfcc23a87be39fe6d6c8324046cc8ebadb90551
diff --git a/web/gui2/package.json b/web/gui2/package.json
index b94ce30..c262ca3 100644
--- a/web/gui2/package.json
+++ b/web/gui2/package.json
@@ -1,62 +1,54 @@
{
- "name": "onos",
- "version": "2.3.0",
- "license": "MIT",
- "scripts": {
- "ng": "ng",
- "start": "ng serve",
- "build": "ng build --prod",
- "test": "ng test",
- "lint": "ng lint",
- "e2e": "ng e2e",
- "compodoc": "./node_modules/.bin/compodoc -p src/main/webapp/tsconfig.app.json -n 'ONOS GUI2 Documentation' --includes ."
- },
- "private": true,
- "dependencies": {
- "@angular/animations": "^8.2.13",
- "@angular/common": "^8.2.13",
- "@angular/compiler": "^8.2.13",
- "@angular/core": "^8.2.13",
- "@angular/forms": "^8.2.13",
- "@angular/http": "^7.0.2",
- "@angular/platform-browser": "^8.2.13",
- "@angular/platform-browser-dynamic": "^8.2.13",
- "@angular/router": "^8.2.13",
- "core-js": "^2.5.4",
- "d3": "^5.9.2",
- "rxjs": "^6.3.3",
- "topojson-client": "^3.0.0",
- "zone.js": "^0.9.1",
- "fm-gui2-lib": "file:../../bazel-out/k8-fastbuild/bin/apps/faultmanagement/fm-gui2-lib/fm-gui2-lib-ver.tgz",
- "gui2-fw-lib": "file:../../bazel-out/k8-fastbuild/bin/web/gui2-fw-lib/gui2-fw-lib-ver.tgz",
- "gui2-topo-lib": "file:../../bazel-out/k8-fastbuild/bin/web/gui2-topo-lib/gui2-topo-lib-ver.tgz",
- "roadm-gui-lib": "file:../../bazel-out/k8-fastbuild/bin/apps/roadm/web/roadm-gui/roadm-gui-lib-ver.tgz"
- },
- "devDependencies": {
- "@angular-devkit/build-angular": "^0.803.17",
- "@angular-devkit/build-ng-packagr": "^0.803.17",
- "@angular/cli": "^8.3.17",
- "@angular/compiler-cli": "^8.2.13",
- "@angular/language-service": "^8.2.13",
- "@bazel/hide-bazel-files": "0.40.0",
- "@compodoc/compodoc": "^1.1.3",
- "@types/jasmine": "~2.8.6",
- "@types/jasminewd2": "~2.0.3",
- "@types/node": "~8.9.4",
- "codelyzer": "^4.2.1",
- "jasmine-core": "~2.99.1",
- "jasmine-spec-reporter": "~4.2.1",
- "karma": "~4.4.1",
- "karma-chrome-launcher": "~2.2.0",
- "karma-coverage-istanbul-reporter": "~1.4.2",
- "karma-firefox-launcher": "^1.1.0",
- "karma-jasmine": "~1.1.1",
- "karma-jasmine-html-reporter": "^0.2.2",
- "ng-packagr": "^5.7.1",
- "protractor": "~5.4.2",
- "ts-node": "~5.0.1",
- "tsickle": "^0.37.0",
- "tslint": "~5.9.1",
- "typescript": "~3.5.3"
- }
+ "name": "gui2",
+ "version": "2.3.4",
+ "license": "MIT",
+ "scripts": {
+ "postinstall": "patch-package && ngcc"
+ },
+ "private": true,
+ "dependencies": {
+ "@angular/animations": "9.0.0-rc.7",
+ "@angular/common": "9.0.0-rc.7",
+ "@angular/core": "9.0.0-rc.7",
+ "@angular/forms": "9.0.0-rc.7",
+ "@angular/platform-browser": "9.0.0-rc.7",
+ "@angular/platform-browser-dynamic": "9.0.0-rc.7",
+ "@angular/router": "9.0.0-rc.7",
+ "d3": "^5.15.0",
+ "rxjs": "^6.5.4",
+ "topojson-client": "^3.1.0",
+ "zone.js": "^0.10.2",
+ "tslib": "1.10.0"
+ },
+ "devDependencies": {
+ "@angular/bazel": "9.0.0-rc.7",
+ "@angular/cli": "9.0.0-rc.7",
+ "@angular/compiler": "9.0.0-rc.7",
+ "@angular/compiler-cli": "9.0.0-rc.7",
+ "@bazel/hide-bazel-files": "1.0.0",
+ "@bazel/karma": "^1.0.0",
+ "@bazel/protractor": "^1.0.0",
+ "@bazel/typescript": "1.0.0",
+ "@bazel/rollup": "^1.0.0",
+ "@bazel/terser": "^1.0.0",
+ "@compodoc/compodoc": "^1.1.3",
+ "@types/jasmine": "~3.3.8",
+ "@types/node": "~8.9.4",
+ "core-js": "2.6.9",
+ "history-server": "^1.3.1",
+ "jasmine-core": "~3.4.0",
+ "jasmine-spec-reporter": "~4.2.1",
+ "karma": "~4.1.0",
+ "karma-chrome-launcher": "~2.2.0",
+ "karma-coverage-istanbul-reporter": "~2.0.1",
+ "karma-firefox-launcher": "^1.1.0",
+ "karma-jasmine": "~2.0.1",
+ "patch-package": "^6.2.0",
+ "protractor": "~5.4.2",
+ "rollup": "^1.21.4",
+ "rollup-plugin-commonjs": "^10.1.0",
+ "rollup-plugin-node-resolve": "^5.2.0",
+ "terser": "4.3.1",
+ "typescript": "~3.6.4"
+ }
}