diff --git a/WORKSPACE b/WORKSPACE index fd70ca205..3936dc9de 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -23,8 +23,8 @@ http_archive( # The @angular repo contains rule for building Angular applications http_archive( name = "angular", - url = "https://github.com/angular/angular/archive/7.0.2.zip", - strip_prefix = "angular-7.0.2", + url = "https://github.com/angular/angular/archive/7.0.4.zip", + strip_prefix = "angular-7.0.4", ) # The @rxjs repo contains targets for building rxjs with bazel @@ -36,18 +36,19 @@ http_archive( ) # Angular material -# TODO(gmagolan): update to next tagged https://github.com/angular/material2 +# Using commit that is compatible with angular 7.0.4 +# TODO(gmagolan): Update to https://github.com/angular/material2 v7.0.5 when released http_archive( name = "angular_material", - url = "https://github.com/angular/material2/archive/150c964c320c8573b6c02eb0a7024bb2919a22c2.zip", - strip_prefix = "material2-150c964c320c8573b6c02eb0a7024bb2919a22c2", + url = "https://github.com/DevVersion/material2/archive/c94e095841b063380b9d2c5611da1ff99445e516.zip", + strip_prefix = "material2-c94e095841b063380b9d2c5611da1ff99445e516", ) # Rules for compiling sass http_archive( name = "io_bazel_rules_sass", - url = "https://github.com/bazelbuild/rules_sass/archive/1.14.1.zip", - strip_prefix = "rules_sass-1.14.1", + url = "https://github.com/bazelbuild/rules_sass/archive/1.15.1.zip", + strip_prefix = "rules_sass-1.15.1", ) #################################### @@ -92,7 +93,7 @@ load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace", "check_ru ts_setup_workspace() -load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories") +load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") sass_repositories() diff --git a/package.json b/package.json index 6ed360336..6b33621ec 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,14 @@ "zone.js": "0.8.26" }, "devDependencies": { - "@angular/animations": "7.0.2", - "@angular/bazel": "7.0.2", - "@angular/cdk": "7.0.2", - "@angular/compiler": "7.0.2", - "@angular/compiler-cli": "7.0.2", - "@angular/common": "7.0.2", - "@angular/core": "7.0.2", - "@angular/material": "7.0.2", + "@angular/animations": "7.0.4", + "@angular/bazel": "7.0.4", + "@angular/cdk": "7.0.4", + "@angular/compiler": "7.0.4", + "@angular/compiler-cli": "7.0.4", + "@angular/common": "7.0.4", + "@angular/core": "7.0.4", + "@angular/material": "7.0.4", "@bazel/benchmark-runner": "0.1.0", "@bazel/ibazel": "0.5.0", "@bazel/karma": "0.20.3", diff --git a/src/hello-world/BUILD.bazel b/src/hello-world/BUILD.bazel index 7a2bde635..481e5a286 100644 --- a/src/hello-world/BUILD.bazel +++ b/src/hello-world/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@angular//:index.bzl", "ng_module") -load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary") +load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_web_test_suite") sass_binary( diff --git a/src/styles/BUILD b/src/styles/BUILD index bebeedf87..a270256f1 100644 --- a/src/styles/BUILD +++ b/src/styles/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("@io_bazel_rules_sass//sass:sass.bzl", "sass_library") +load("@io_bazel_rules_sass//:defs.bzl", "sass_library") sass_library( name = "colors", diff --git a/src/todos/BUILD.bazel b/src/todos/BUILD.bazel index cc0b756e7..b256f456e 100644 --- a/src/todos/BUILD.bazel +++ b/src/todos/BUILD.bazel @@ -1,7 +1,7 @@ package(default_visibility = ["//visibility:public"]) load("@angular//:index.bzl", "ng_module") -load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary") +load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_web_test") sass_binary( diff --git a/yarn.lock b/yarn.lock index 220c52cde..1e15c950e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,45 +2,45 @@ # yarn lockfile v1 -"@angular/animations@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.2.tgz#84513e8958b8fb57a35f6e494a0d465d081c7f8d" - integrity sha512-4EqCmfqbqIrMMf9WPiUpVqV+19z6BDtaRPAC6QXU6lcl0Lq67fw6a0yJ6ZvFXThPot3L6NNxmvbO2inzpiVV9A== +"@angular/animations@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.4.tgz#f53fc9f1bce3bf1afe60dcbc08b6863472f519e4" + integrity sha512-QfFikT0FzYNMjdVg0LWTBijdu9JDJyzejnhCFlXxv+KR4zolpRK98/rU7CFW1Fg2jjL3/yL9PT1sf5I0fTJZYA== dependencies: tslib "^1.9.0" -"@angular/bazel@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-7.0.2.tgz#e17ee29cd217aec3519570b6c6a4e494e77502a2" - integrity sha512-ob4GnMFzX0IlpoQovgmZhdOV1LqkCqRzEzqJ82GwW4gH+kkMVT0VQi22/0eFQ+i23syv8TYA5qOhSsOaSpZ/ng== +"@angular/bazel@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-7.0.4.tgz#e653db2202cfc2b41d592bb70e241bfd56bb99ab" + integrity sha512-QukWwQbZlcgzjGWYOwUBpCNlSe0pRrl1gJUOfpHks2mRCL7Nyr/75asMFmpvLCJDbcDGRx/UNQEY/sqUrNWNWw== dependencies: "@bazel/typescript" "^0.20.3" "@types/node" "6.0.84" shelljs "0.8.2" tsickle "0.32.1" -"@angular/cdk@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.0.2.tgz#35081cd27a8f5214568b6ad1acf8cb3b3c315f99" - integrity sha512-MAugJsjQ3ye2RX7vNjd9IN1c7enAxJaCz9UZBFuzfo/pNxvjaEObFmF2NUKyU1DctknqjyOzZYYg0e+bBxrBbQ== +"@angular/cdk@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.0.4.tgz#422c2aec599f0cce0f8ce9ae6656be5b8109a4d0" + integrity sha512-4KbuiVLonwNwzwgJqKOvjqXfXKrdboPzFwk4vGruQV/EhGh6L8V4gy+ESS4seUuYYsMA9k+ijEeO9xUX+pAcZw== dependencies: tslib "^1.7.1" optionalDependencies: parse5 "^5.0.0" -"@angular/common@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.2.tgz#0cb62f93a43ec1c75762deffb329caff53d9ba27" - integrity sha512-AamMjesc88a4c2cc3QI4N/rYY/unZ+py3VenXIRaAJCpM9PROF0klXdcu8wQ+kuwf2Ba+gkqtuAHIS8dsc5YFg== +"@angular/common@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.4.tgz#aafb26ce59c967daa5b122393e1933208a247f72" + integrity sha512-akQojdqY/RBlItkDWAPI3k0Llk1wnbAp+f47yySi3cgQz9SaZ1/RLNWZV84I/cKrksb4ehorT/lTqRBojsAD1A== dependencies: tslib "^1.9.0" -"@angular/compiler-cli@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.2.tgz#ddfcc6ebeca46bc490fa953a1accc26a7ed93a05" - integrity sha512-xGXJ3MHn1LOYrvM9ix5sRp7r6dYsjLj+okUMDcNeYYEQyT7S/qEFZomhdrPydoXSUitjmXbskSUpGzZ6mzBBXQ== +"@angular/compiler-cli@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.4.tgz#f96fc1c0aec27ee97ec5f13a8eb72bc8b964db97" + integrity sha512-kvhWt6OTb1Uduns9Vm+Dwd/UUBNSEU6Jgu+QOPeHr7lg+4NTyr9uQLU0DtfBP0ljOlds8esmfii5IIFTeUQw1Q== dependencies: - canonical-path "0.0.2" + canonical-path "1.0.0" chokidar "^1.4.2" convert-source-map "^1.5.1" dependency-graph "^0.7.2" @@ -49,26 +49,27 @@ reflect-metadata "^0.1.2" shelljs "^0.8.1" source-map "^0.6.1" + tslib "^1.9.0" yargs "9.0.1" -"@angular/compiler@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.2.tgz#7fc3427ee58a2d122d3a039396cec316dd11c4cb" - integrity sha512-nyXX91a/sav+Nf99P7oy6ALuZsxlFhu1HEf24sdH3Ga45X3OL4oFCCfHjjDADyhq1SiRd/25Z8j1C4aeN6MJzQ== +"@angular/compiler@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.4.tgz#df91dab990c46b464705b0901d70d1cfdfd190e1" + integrity sha512-ExDhH1cJkuJkUsgNRZyZBse0a7wWkQyG5O8HONi3Rzig9dalFEuve9jD04zfA1Jx1GTXhovqtGnF72x4kw0V8Q== dependencies: tslib "^1.9.0" -"@angular/core@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.2.tgz#cfb4ae7504473cc2600b24a9c7cfa5d808486cc2" - integrity sha512-KxK0y3ywFd0uGIHzQRKtj7DD6f8IhntQxBrBFLxNOLwzpb5v8B7HkzHUB/Tnflvo4hFetdGEinS6pO7dikWLTQ== +"@angular/core@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.4.tgz#98340a1bdb53f0bbecfcfc9831a7a22a1540d79b" + integrity sha512-17SSmCz1wQoZKnVHF/T8UkWYPpDm5kPyoc1okkTTv8ZA2EAMMuZFFnRSAxEL5i7mNB9z5CvRqF2tRx/DbgbIRA== dependencies: tslib "^1.9.0" -"@angular/material@7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.0.2.tgz#f64a664730dc497dbdc3dcabaf145636af90d0ea" - integrity sha512-zJ9nw+RwfRtkrifpafc9bM5HLPpbSmtYXkO3a2GSiE83jocdiC9wzpdmyhdJ/wvRoMyVmsx5vdQSqaFh03jhjA== +"@angular/material@7.0.4": + version "7.0.4" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.0.4.tgz#946de5ca415bd2cb0330f520011e3dd5361654d1" + integrity sha512-LoDtg6srT9WPEn4bsiJqU1uXJ6bd28FtSc7prDYaPb5ogTj1zaur4LWJ7GjPK1haq4rW4W2NMTuayIsqpdGfSA== dependencies: tslib "^1.7.1" @@ -712,10 +713,10 @@ camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -canonical-path@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574" - integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ= +canonical-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d" + integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg== caseless@~0.11.0: version "0.11.0"