diff --git a/WORKSPACE b/WORKSPACE index c535dac7b4b..7bbc1055362 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # Add NodeJS rules (explicitly used for sass bundle rules) http_archive( name = "build_bazel_rules_nodejs", - sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"], + sha256 = "88e5e579fb9edfbd19791b8a3c6bfbe16ae3444dba4b428e5efd36856db7cf16", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.8/rules_nodejs-0.27.8.tar.gz"], ) # Add sass rules @@ -68,8 +68,7 @@ rules_sass_dependencies() load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") sass_repositories() -# Temporarily add Angular sources and its dependencies to consume the ts_api_guardian, -# remote-build-execution, and protractor stuff. +# Temporarily add the Angular repository so that we can set up "ts_api_guardian". # TODO(jelbourn): remove this once we can do all the same stuff via @npm//@angular http_archive( name = "angular", @@ -77,11 +76,14 @@ http_archive( url = "https://github.com/angular/angular/archive/8.0.0-beta.6.zip", strip_prefix = "angular-8.0.0-beta.6", ) -load("@angular//packages/bazel:package.bzl", "rules_angular_dependencies") -rules_angular_dependencies() -load("@angular//:index.bzl", "ng_setup_workspace") -ng_setup_workspace() +# Only install the "ts-api-guardian" dependencies as we don't want to install the +# Angular dev dependencies which are not needed. +yarn_install( + name = "ts-api-guardian_deps", + package_json = "@angular//tools/ts-api-guardian:package.json", + yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock", +) # Bring in bazel_toolchains for RBE stuff. http_archive( diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel index fa6ad2df94e..cc8905637aa 100644 --- a/e2e/BUILD.bazel +++ b/e2e/BUILD.bazel @@ -39,7 +39,7 @@ ts_library( ":e2e_utils_lib", ], data = [ - "@angular//packages/bazel/src/protractor/utils", + "@npm//@angular/bazel", "//tools/axe-protractor", ], ) for spec_file in glob(["components/**/*.spec.ts"])] diff --git a/package.json b/package.json index af36293111d..292aa61ea8b 100644 --- a/package.json +++ b/package.json @@ -31,13 +31,13 @@ "version": "7.3.6", "requiredAngularVersion": ">=7.0.0", "dependencies": { - "@angular/animations": "8.0.0-beta.6", - "@angular/common": "8.0.0-beta.6", - "@angular/compiler": "8.0.0-beta.6", - "@angular/core": "8.0.0-beta.6", - "@angular/elements": "8.0.0-beta.6", - "@angular/forms": "8.0.0-beta.6", - "@angular/platform-browser": "8.0.0-beta.6", + "@angular/animations": "8.0.0-beta.9", + "@angular/common": "8.0.0-beta.9", + "@angular/compiler": "8.0.0-beta.9", + "@angular/core": "8.0.0-beta.9", + "@angular/elements": "8.0.0-beta.9", + "@angular/forms": "8.0.0-beta.9", + "@angular/platform-browser": "8.0.0-beta.9", "@webcomponents/custom-elements": "^1.1.0", "core-js": "^2.6.1", "rxjs": "^6.4.0", @@ -52,14 +52,14 @@ "@angular/bazel": "8.0.0-beta.6", "@angular/compiler-cli": "8.0.0-beta.6", "@angular/http": "8.0.0-beta.6", - "@angular/platform-browser-dynamic": "8.0.0-beta.6", - "@angular/platform-server": "8.0.0-beta.6", - "@angular/router": "8.0.0-beta.6", - "@angular/upgrade": "8.0.0-beta.6", + "@angular/platform-browser-dynamic": "8.0.0-beta.9", + "@angular/platform-server": "8.0.0-beta.9", + "@angular/router": "8.0.0-beta.9", + "@angular/upgrade": "8.0.0-beta.9", "@bazel/ibazel": "^0.9.0", "@bazel/jasmine": "0.26.0", - "@bazel/karma": "0.26.0", - "@bazel/typescript": "0.26.0", + "@bazel/karma": "0.27.8", + "@bazel/typescript": "0.27.8", "@firebase/app-types": "^0.3.2", "@octokit/rest": "^15.9.4", "@schematics/angular": "7.3.6", diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 37cc1e02f3f..5aeeb459656 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -2,7 +2,6 @@ package(default_visibility=["//visibility:public"]) load("//tools:defaults.bzl", "ts_library") load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary") - ts_library( name = "sass_bundle_lib", srcs = ["sass-bundle.ts"], diff --git a/yarn.lock b/yarn.lock index 7b68965ae3f..3ae81bb733d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -78,10 +78,10 @@ "@angular-devkit/core" "7.3.3" rxjs "6.3.3" -"@angular/animations@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.6.tgz#60773d723068265370d90b2507a77631f877c06f" - integrity sha512-stnVi/e1WwMw6Lb6dag1t0qKnv0vvPE9H2syXDMjfZCGn4B14oc3VCGJn4flQpmzHUf11z8QOay75rFygj6ygg== +"@angular/animations@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.9.tgz#9605f7b6be49b3bcde7cc7fa145ba329b2fdc6f8" + integrity sha512-4OLo3432jwPIo5GiYkrVrjUWPMIKBTXqZLr09A5cScM0RA3N9KaSLk7wg1sjSb0mK3KuEfJ00jCzaLUGdvO5Kw== dependencies: tslib "^1.9.0" @@ -101,10 +101,10 @@ shelljs "0.8.2" tsickle "0.34.0" -"@angular/common@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.6.tgz#4921e0e44e908bf0ec40241577857f3f067b0b91" - integrity sha512-r7bAAzNoeEXo1joA4dQxRgaPMqQLfqoFzC2P/w/tZPmTESSby61MIPOLsyFlceVCjx4Pw5rxpeOWYR+cceJTWA== +"@angular/common@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.9.tgz#8e23e54eadc45b187c0321e59f1b7c36b1ae8e0d" + integrity sha512-dov21tsbnvNb+hmuPztqUgzDAbtiw0zSvzEzSZsZYq+mU6FbXOXZnyycXzNij+rewZMyVAQNEUIEmjc6UF8nEA== dependencies: tslib "^1.9.0" @@ -125,31 +125,31 @@ tslib "^1.9.0" yargs "9.0.1" -"@angular/compiler@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.6.tgz#007c05be13a353f706a26ce0c9a38459f9a6ffab" - integrity sha512-RXxg4/Fm22n23ulP8dc+XPGqlH1vhU9fPlswN1B59vPNM2jYhBNmAyKJ66SOj1w+v9vn/n8nyDm4/kU5ej7EKA== +"@angular/compiler@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.9.tgz#4f999b1276b78bc91197a5119cab4f22e528b86b" + integrity sha512-X22gQYGT6xR+I0umj6ZJlHbX/uO2x6rZCKDisK0KLIM7ud29ggGz/fZdBgBdZPBUB/ivzWLFUCxewQoqLLRyMA== dependencies: tslib "^1.9.0" -"@angular/core@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.6.tgz#bdb7ebc867237f0522c7be42722f65fb1ca358a3" - integrity sha512-W5p7SwaMnFMvSso+xWnEnYBSBJxJNdqxS9DIJOtCG9xsCHSlf0ojqMkQhCmUN0WEwa+R+OsQoPajY3yORRqYfA== +"@angular/core@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.9.tgz#55fbf127af9847df854fc8c86844dd33b3008450" + integrity sha512-/x0ZD3yPlMOhtx9Onp/3nAq995xBarZiTv/dp9/obgts3U/AHEQCDw+7WWhxCqUKV38wMZOLK0FMrubC9mAyug== dependencies: tslib "^1.9.0" -"@angular/elements@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-beta.6.tgz#06820dd75f4a6f08626513e0930d6c728068cbeb" - integrity sha512-yUkeVGavNo/kzv3TEnb0gXMH2GheaKNeKRiq5kSPUgtC05XiuG3jnOQH/vKcuAAW09s+zrblyKhQGSE65QYomQ== +"@angular/elements@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-beta.9.tgz#2a81089e7e5b05851725af73ce0117f16ed8c7cd" + integrity sha512-pULBwevq6EQSqNgA3nvBpfh39sXrAt2InhKxUOWReFcNIHScbm5GUTiTDqca63nQSKTWxlnNh9Z+yikYs5eCRg== dependencies: tslib "^1.9.0" -"@angular/forms@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-beta.6.tgz#0b4d206298d5aa0c61ff3a0e639cc54be525dfb9" - integrity sha512-RWGo5OYFYLm/lJv+nlBVUbPsDc1s14TtM3OmBcDghdMBXHcSfdp5KVoC/NQuGYpuR9PF7TAvDCy5K4+m+9o8zA== +"@angular/forms@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-beta.9.tgz#3a5d16708474d047aa963fe1fcbfb86155c806bb" + integrity sha512-jk6prdEPdXTjhnGNmzSH8REXShP5tQBySGBJQc/gH/egaP3dxDEDZ9j0Qe/tx7lt1tq2Gzackt453mLsBN5LSg== dependencies: tslib "^1.9.0" @@ -160,40 +160,40 @@ dependencies: tslib "^1.9.0" -"@angular/platform-browser-dynamic@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.6.tgz#141c916419d3045c1f00f3b4eb4959958a0ad706" - integrity sha512-MfTAoG0rY3ViMeAVlJFEsfCi2Nj+A7FxPNnL5NNu89VugvtTJTC5ILtEK0baj9W1lrqLOunbQtdPLXtZIeLgrQ== +"@angular/platform-browser-dynamic@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.9.tgz#c7d6113c7941ab612d487d6d6ec0203336fc7f38" + integrity sha512-p94e+hQ6gEUG2eAbdfdiYWrQCGTt/tXKh2K5hlhg3RNci4mac5icW0sHGYDCJjcER7sOSWmJL8gfohX0t4H9uQ== dependencies: tslib "^1.9.0" -"@angular/platform-browser@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.6.tgz#4d81862641ea44b445b864eea6b6cef6d04378a2" - integrity sha512-UGAIIwdL55I0auLzYgOp397bPDNcu7ob1wANf0PCIfWoKuxYJn6r4UsnmKFKuvrKpHen0OKp8nXuMAO34EVsbw== +"@angular/platform-browser@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.9.tgz#7b4a731c2dbfd05266575a83a91b532b81d1490d" + integrity sha512-wNwbLSwdruDmdJ9IW2M1jL2OwWxqZ1R+xR8ZdmpUandGTf3R17u89gMzCjRvYx+rP//7p4XMHbNA8nx/lae3yA== dependencies: tslib "^1.9.0" -"@angular/platform-server@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.6.tgz#dad4a4990fabd35f26cf0f9fd9a9f910e22eb271" - integrity sha512-cgd5XXvy7S8XrtgyKRYYLxhKpGbqMlAqXaWwlhEMlLrj+pzp9mrgBh/7OaLvlRIW8mhWVItg1W3RX8YdB4SlVQ== +"@angular/platform-server@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.9.tgz#c0f2a1476ad1ee1897ff2541ba6a5959dc455668" + integrity sha512-Qwy6U8xPoapJgj5dqFc1vzg4y+QEnfeQZr5e1VNcP04aViofZyKD0uNS9rzZcPUdLsuDRU+09uhFeIMJVbjmPw== dependencies: - domino "^2.1.0" + domino "^2.1.2" tslib "^1.9.0" xhr2 "^0.1.4" -"@angular/router@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.6.tgz#9fd7c4dcae296123f0468bd92e827d2f75d58ff0" - integrity sha512-uyul+0hX15Rnqoa9vw1tLusUEEKY12h/mLgXQi06iTLOE5W4kLKvPPpTaFQNCLTL0keNEsXGQwq27L0Mz3YqPw== +"@angular/router@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.9.tgz#29197556d779318edd710b0d2935da35131ceacc" + integrity sha512-+6vLGw7Lwgrrs+UXoqM/6KDGFVOckkJaxtpIQfLh7mnHyJ4bM6d/0JxaNGQOye3CUlk32C5MsG7dt3ldL6V2Ig== dependencies: tslib "^1.9.0" -"@angular/upgrade@8.0.0-beta.6": - version "8.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-8.0.0-beta.6.tgz#b0ff5d0a38da440cc03a811f78dd9e5e6fae52ff" - integrity sha512-w8XdLOZ+2jJpZqiNgJTFiCXl85Ai6gJXWhAukqHmLHUu/0YyZlCPaUrGNfHV+pjitORXL4ugZBEtXhQbqpGFhA== +"@angular/upgrade@8.0.0-beta.9": + version "8.0.0-beta.9" + resolved "https://registry.yarnpkg.com/@angular/upgrade/-/upgrade-8.0.0-beta.9.tgz#cd908bfb0c66ed1cbc0a18c15dd1a7f2aa4e3e28" + integrity sha512-iyAPrLTYaf/yWUSSr91071ferialBxPJGQSsGE2MY3JdVJeaBFcwVmdQg/BT/HTxrLWO8Zd8ZB5vIEb2nbs3AQ== dependencies: tslib "^1.9.0" @@ -326,10 +326,10 @@ dependencies: jasmine "~3.3.1" -"@bazel/karma@0.26.0": - version "0.26.0" - resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2" - integrity sha512-yZv0fgAjVrfrM0ld8e+wNaPIpYCpwBzVQi2GUErsKStUZXPUUofpBwBjlYsdY1Osn5/FmAF9e6xDkk1JWn/wSg== +"@bazel/karma@0.27.8": + version "0.27.8" + resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.27.8.tgz#e9c4ef4190b2da3c23b01bc7b79830c3985cfb1f" + integrity sha512-H6TDIUcP+nW4dvjQeCINAyGLMnEV45maAM0HxModAe0cKfVxBpZrVKwG6ZuKChvQWY2nLDtN3C9K/GGISxP7hg== dependencies: jasmine-core "2.8.0" karma "^4.0.0" @@ -343,12 +343,11 @@ semver "5.6.0" tmp "0.0.33" -"@bazel/typescript@0.26.0": - version "0.26.0" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0.tgz#c06139d76c8b9d3a3ed98a721b776fedb4b11c82" - integrity sha512-dh/Y/SZzmeChsLap8FVHYl0FuaeLh/6t9WBVhm5nOgyVrqfEyVpNzy4W20E4NqnmJY2/PqmD5qncf+Oo1q9h1A== +"@bazel/typescript@0.27.8": + version "0.27.8" + resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.27.8.tgz#b9a566e4a95c0425b52961e9e899b59c7b22efcf" + integrity sha512-beApzTtgm+lKrhQf5OgPk1amGfi5PJ1DCVVWYbNsbJP/Joi+NgCrgykG55NbaJIzEc+6IQoh8y0QUVMYRt562Q== dependencies: - jasmine-core "2.8.0" protobufjs "5.0.3" semver "5.6.0" source-map-support "0.5.9" @@ -3212,10 +3211,10 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domino@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.1.tgz#cd5c639940db72bb7cde1cdb5beea466a4113136" - integrity sha512-fqoTi6oQ881wYRENIEmz78hKVoc3X9HqVpklo419yxzebys6dtU5c83iVh3UYvvexPFdAuwlDYCsUM9//CrMMg== +domino@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601" + integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg== domutils@^1.5.1: version "1.7.0"