Skip to content

Commit

Permalink
build: update bazel setup and angular
Browse files Browse the repository at this point in the history
This should fix the snapshot CI job
  • Loading branch information
devversion committed Apr 13, 2022
1 parent 5846195 commit 18f11b1
Show file tree
Hide file tree
Showing 7 changed files with 187 additions and 976 deletions.
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Add NodeJS rules
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "3ceb1e5b5dcad5fa2ad8870a20201cfbb9c9c63cac4055c9ab370034c765297f",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.3.0/rules_nodejs-5.3.0.tar.gz"],
sha256 = "2b2004784358655f334925e7eadc7ba80f701144363df949b3293e1ae7a2fb7b",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.4.0/rules_nodejs-5.4.0.tar.gz"],
)

# Add sass rules
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
},
"version": "14.0.0-next.9",
"dependencies": {
"@angular/animations": "14.0.0-next.9",
"@angular/common": "14.0.0-next.9",
"@angular/compiler": "14.0.0-next.9",
"@angular/core": "14.0.0-next.9",
"@angular/forms": "14.0.0-next.9",
"@angular/platform-browser": "14.0.0-next.9",
"@angular/animations": "14.0.0-next.13",
"@angular/common": "14.0.0-next.13",
"@angular/compiler": "14.0.0-next.13",
"@angular/core": "14.0.0-next.13",
"@angular/forms": "14.0.0-next.13",
"@angular/platform-browser": "14.0.0-next.13",
"@types/google.maps": "^3.47.3",
"@types/youtube": "^0.0.46",
"rxjs": "^6.6.7",
Expand All @@ -68,30 +68,30 @@
"zone.js": "~0.11.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "14.0.0-next.6",
"@angular-devkit/core": "14.0.0-next.6",
"@angular-devkit/schematics": "14.0.0-next.6",
"@angular/bazel": "14.0.0-next.9",
"@angular/cli": "14.0.0-next.6",
"@angular/compiler-cli": "14.0.0-next.9",
"@angular-devkit/build-angular": "14.0.0-next.8",
"@angular-devkit/core": "14.0.0-next.8",
"@angular-devkit/schematics": "14.0.0-next.8",
"@angular/bazel": "14.0.0-next.13",
"@angular/cli": "14.0.0-next.8",
"@angular/compiler-cli": "14.0.0-next.13",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#4859d1eb3ae2e20646a16f271a39bc02965cbe00",
"@angular/localize": "14.0.0-next.9",
"@angular/platform-browser-dynamic": "14.0.0-next.9",
"@angular/platform-server": "14.0.0-next.9",
"@angular/router": "14.0.0-next.9",
"@angular/localize": "14.0.0-next.13",
"@angular/platform-browser-dynamic": "14.0.0-next.13",
"@angular/platform-server": "14.0.0-next.13",
"@angular/router": "14.0.0-next.13",
"@axe-core/webdriverjs": "^4.3.2",
"@babel/core": "^7.16.12",
"@bazel/bazelisk": "~1.11.0",
"@bazel/buildifier": "~5.0.1",
"@bazel/concatjs": "5.3.0",
"@bazel/esbuild": "5.3.0",
"@bazel/concatjs": "5.4.0",
"@bazel/esbuild": "5.4.0",
"@bazel/ibazel": "~0.16.2",
"@bazel/jasmine": "5.3.0",
"@bazel/protractor": "5.3.0",
"@bazel/rollup": "5.3.0",
"@bazel/runfiles": "5.3.0",
"@bazel/terser": "5.3.0",
"@bazel/worker": "5.3.0",
"@bazel/jasmine": "5.4.0",
"@bazel/protractor": "5.4.0",
"@bazel/rollup": "5.4.0",
"@bazel/runfiles": "5.4.0",
"@bazel/terser": "5.4.0",
"@bazel/worker": "5.4.0",
"@firebase/app-types": "^0.7.0",
"@material/animation": "14.0.0-canary.9736ddce9.0",
"@material/auto-init": "14.0.0-canary.9736ddce9.0",
Expand Down Expand Up @@ -143,7 +143,7 @@
"@octokit/rest": "18.3.5",
"@rollup/plugin-commonjs": "^21.0.0",
"@rollup/plugin-node-resolve": "^13.1.3",
"@schematics/angular": "14.0.0-next.6",
"@schematics/angular": "14.0.0-next.8",
"@types/babel__core": "^7.1.18",
"@types/browser-sync": "^2.26.3",
"@types/fs-extra": "^9.0.13",
Expand Down
6 changes: 4 additions & 2 deletions src/cdk/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ sass_library(
# Creates the @angular/cdk package published to npm.
ng_package(
name = "npm_package",
srcs = ["package.json"],
data = [":sass_lib"] + prebuiltStyleTargets + CDK_SCSS_LIBS,
srcs = [
"package.json",
":sass_lib",
] + prebuiltStyleTargets + CDK_SCSS_LIBS,
nested_packages = [
"//src/cdk/schematics:npm_package",
],
Expand Down
4 changes: 2 additions & 2 deletions src/material-experimental/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ sass_library(

ng_package(
name = "npm_package",
srcs = ["package.json"],
data = [
srcs = [
"package.json",
":sass_lib",
":theming_scss_lib",
],
Expand Down
2 changes: 0 additions & 2 deletions src/material/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ ng_package(
name = "npm_package",
srcs = [
"package.json",
],
data = [
":sass_lib",
"//src/material/core:theming_scss_lib",
"//src/material/prebuilt-themes:deeppurple-amber",
Expand Down
4 changes: 2 additions & 2 deletions tools/defaults.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def ng_module(
if module_name and not testonly:
_make_tsec_test(kwargs["name"])

def ng_package(name, data = [], deps = [], externals = PKG_EXTERNALS, readme_md = None, visibility = None, **kwargs):
def ng_package(name, srcs = [], deps = [], externals = PKG_EXTERNALS, readme_md = None, visibility = None, **kwargs):
# If no readme file has been specified explicitly, use the default readme for
# release packages from "src/README.md".
if not readme_md:
Expand All @@ -186,7 +186,7 @@ def ng_package(name, data = [], deps = [], externals = PKG_EXTERNALS, readme_md
_ng_package(
name = name,
externals = externals,
data = data + [":license_copied"],
srcs = srcs + [":license_copied"],
deps = deps,
# We never set a `package_name` for NPM packages, neither do we enable validation.
# This is necessary because the source targets of the NPM packages all have
Expand Down
Loading

0 comments on commit 18f11b1

Please sign in to comment.