mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-15 09:21:06 +02:00
Code Issues Projects Releases Wiki Activity

GUI2 Upgraded Angular to 9rc10 and rules_nodejs to 1.10

Browse Source 
Change-Id: I56f5f28dffb9102b2b7920fcbf6a0b084051662c
This commit is contained in:
Sean Condon 2020-01-24 09:03:03 +00:00
parent e4cf051bd2
commit 6ceebf0392
5 changed files with 314 additions and 2276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -124,9 +124,9 @@ load("//tools/build/bazel:gnoi_workspace.bzl", "generate_gnoi")
generate_gnoi()
# For GUI2 build
RULES_NODEJS_VERSION = "1.0.1"
RULES_NODEJS_VERSION = "1.1.0"
RULES_NODEJS_SHA256 = "e1a0d6eb40ec89f61a13a028e7113aa3630247253bcb1406281b627e44395145"
RULES_NODEJS_SHA256 = "c97bf38546c220fa250ff2cc052c1a9eac977c662c1fc23eda797b0ce8e70a43"
load("//tools/build/bazel:topo_workspace.bzl", "generate_topo_device")

3
web/gui2-fw-lib/BUILD.bazel
View File

@ -43,10 +43,7 @@ ng_module(
"src/lib/**/*.css",
"src/lib/**/*.html",
]),
bundle_dts = True,
entry_point = ":src/public_api.ts",
# tsconfig = "tsconfig.json",
generate_ve_shims = True,
module_name = "gui2-fw-lib",
tsconfig = "//web/gui2:tsconfig.json",
deps = [

58
web/gui2/package.json
View File

@ -1,56 +1,58 @@
{
"name": "gui2",
"version": "2.3.4",
"version": "2.3.5",
"license": "MIT",
"engines": {
"node": ">=10.9.0 <13.0.0",
"yarn": ">=1.9.2 <2.0.0"
},
"scripts": {
"postinstall": "patch-package && ngcc"
"postinstall": "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/http": "^7.2.15",
"@angular/platform-browser": "9.0.0-rc.7",
"@angular/platform-browser-dynamic": "9.0.0-rc.7",
"@angular/router": "9.0.0-rc.7",
"@angular/animations": "9.0.0-rc.10",
"@angular/common": "9.0.0-rc.10",
"@angular/core": "9.0.0-rc.10",
"@angular/forms": "9.0.0-rc.10",
"@angular/http": "^7.2.16",
"@angular/platform-browser": "9.0.0-rc.10",
"@angular/platform-browser-dynamic": "9.0.0-rc.10",
"@angular/router": "9.0.0-rc.10",
"d3": "^5.15.0",
"rxjs": "^6.5.4",
"topojson-client": "^3.1.0",
"zone.js": "^0.10.2",
"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.1",
"@bazel/protractor": "^1.0.1",
"@bazel/typescript": "1.0.1",
"@bazel/rollup": "^1.0.1",
"@bazel/terser": "^1.0.1",
"@compodoc/compodoc": "^1.1.3",
"@types/jasmine": "~3.4.0",
"@angular/bazel": "9.0.0-rc.10",
"@angular/cli": "9.0.0-rc.10",
"@angular/compiler": "9.0.0-rc.10",
"@angular/compiler-cli": "9.0.0-rc.10",
"@bazel/hide-bazel-files": "1.1.0",
"@bazel/karma": "1.1.0",
"@bazel/protractor": "1.1.0",
"@bazel/typescript": "1.1.0",
"@bazel/rollup": "1.1.0",
"@bazel/terser": "1.1.0",
"@types/jasmine": "3.4.0",
"@types/node": "6.14.9",
"core-js": "2.6.9",
"history-server": "^1.3.1",
"html-insert-assets": "^0.4.0",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "~2.0.1",
"karma-chrome-launcher": "2.2.0",
"karma-firefox-launcher": "1.1.0",
"karma-jasmine": "2.0.1",
"karma-requirejs": "1.1.0",
"karma-sourcemap-loader": "0.3.7",
"patch-package": "^6.2.0",
"protractor": "~5.4.2",
"requirejs": "2.3.6",
"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"
"typescript": "3.7.5"
}
}

51
web/gui2/patches/@angular+bazel+9.0.0-rc.7.patch
View File

@ -1,51 +0,0 @@
diff --git a/node_modules/@angular/bazel/src/ng_package/ng_package.bzl b/node_modules/@angular/bazel/src/ng_package/ng_package.bzl
index 55bd685..3666382 100755
--- a/node_modules/@angular/bazel/src/ng_package/ng_package.bzl
+++ b/node_modules/@angular/bazel/src/ng_package/ng_package.bzl
@@ -15,9 +15,9 @@ specification of this format at https://goo.gl/jB3GVv
load("@build_bazel_rules_nodejs//:providers.bzl", "JSEcmaScriptModuleInfo", "JSNamedModuleInfo", "NpmPackageInfo", "node_modules_aspect")
load(
- "@build_bazel_rules_nodejs//internal/npm_package:npm_package.bzl",
- "NPM_PACKAGE_ATTRS",
- "NPM_PACKAGE_OUTPUTS",
+ "@build_bazel_rules_nodejs//internal/pkg_npm:pkg_npm.bzl",
+ "PKG_NPM_ATTRS",
+ "PKG_NPM_OUTPUTS",
"create_package",
)
load("//src:external.bzl", "FLAT_DTS_FILE_SUFFIX")
@@ -619,7 +619,7 @@ def _ng_package_impl(ctx):
if JSNamedModuleInfo in dep:
devfiles = depset(transitive = [devfiles, dep[JSNamedModuleInfo].sources])
- # Re-use the create_package function from the nodejs npm_package rule.
+ # Re-use the create_package function from the nodejs pkg_npm rule.
package_dir = create_package(
ctx,
devfiles.to_list(),
@@ -631,7 +631,7 @@ def _ng_package_impl(ctx):
_NG_PACKAGE_DEPS_ASPECTS = [esm5_outputs_aspect, ng_package_module_mappings_aspect, node_modules_aspect]
-_NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **{
+_NG_PACKAGE_ATTRS = dict(PKG_NPM_ATTRS, **{
"srcs": attr.label_list(
doc = """JavaScript source files from the workspace.
These can use ES2015 syntax and ES Modules (import/export)""",
@@ -807,12 +807,12 @@ def _ng_package_outputs(name, entry_point, entry_point_name):
"umd": "%s.umd.js" % basename,
"umd_min": "%s.umd.min.js" % basename,
}
- for key in NPM_PACKAGE_OUTPUTS:
- # NPM_PACKAGE_OUTPUTS is a "normal" dict-valued outputs so it looks like
+ for key in PKG_NPM_OUTPUTS:
+ # PKG_NPM_OUTPUTS is a "normal" dict-valued outputs so it looks like
# "pack": "%{name}.pack",
# But this is a function-valued outputs.
# Bazel won't replace the %{name} token so we have to do it.
- outputs[key] = NPM_PACKAGE_OUTPUTS[key].replace("%{name}", name)
+ outputs[key] = PKG_NPM_OUTPUTS[key].replace("%{name}", name)
return outputs
ng_package = rule(

2422
web/gui2/yarn.lock
View File

File diff suppressed because it is too large Load Diff