Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: update to rules_nodejs 1.6.0 #36580

Closed
wants to merge 2 commits into from
Closed

build: update to rules_nodejs 1.6.0 #36580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b61dd9b
build: update to rules_nodejs 1.6.0
gregmagolan Apr 11, 2020
a7f8aa1
style: lint
gregmagolan Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
Expand Up @@ -8,16 +8,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Fetch rules_nodejs so we can install our npm dependencies
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "d0c4bb8b902c1658f42eb5563809c70a06e46015d64057d25560b0eb4bdc9007",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.5.0/rules_nodejs-1.5.0.tar.gz"],
sha256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
)

# Check the rules_nodejs version and download npm dependencies
# Note: bazel (version 2 and after) will check the .bazelversion file so we don't need to
# assert on that.
load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")

check_rules_nodejs_version(minimum_version_string = "1.5.0")
check_rules_nodejs_version(minimum_version_string = "1.6.0")

# Setup the Node.js toolchain
node_repositories(
Expand Down
4 changes: 2 additions & 2 deletions integration/bazel/WORKSPACE
View file
Open in desktop
Expand Up @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Fetch rules_nodejs so we can install our npm dependencies
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "d0c4bb8b902c1658f42eb5563809c70a06e46015d64057d25560b0eb4bdc9007",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.5.0/rules_nodejs-1.5.0.tar.gz"],
sha256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
)

# Fetch sass rules for compiling sass files
Expand Down
10 changes: 5 additions & 5 deletions integration/bazel/package.json
View file
Open in desktop
Expand Up @@ -23,11 +23,11 @@
"@angular/compiler": "file:../../dist/packages-dist/compiler",
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
"@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk",
"@bazel/karma": "1.5.0",
"@bazel/protractor": "1.5.0",
"@bazel/rollup": "1.5.0",
"@bazel/terser": "1.5.0",
"@bazel/typescript": "1.5.0",
"@bazel/karma": "1.6.0",
"@bazel/protractor": "1.6.0",
"@bazel/rollup": "1.6.0",
"@bazel/terser": "1.6.0",
"@bazel/typescript": "1.6.0",
"@types/jasmine": "2.8.8",
"http-server": "0.12.0",
"karma": "4.4.1",
Expand Down
64 changes: 32 additions & 32 deletions integration/bazel/yarn.lock
View file
Open in desktop
Expand Up @@ -3,10 +3,10 @@


"@angular/animations@file:../../dist/packages-dist/animations":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@angular/bazel@file:../../dist/packages-dist/bazel":
version "9.1.0-rc.0"
version "10.0.0-next.1"
dependencies:
"@microsoft/api-extractor" "^7.3.9"
shelljs "0.8.2"
Expand All @@ -22,10 +22,10 @@
parse5 "^5.0.0"

"@angular/common@file:../../dist/packages-dist/common":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
version "9.1.0-rc.0"
version "10.0.0-next.1"
dependencies:
canonical-path "1.0.0"
chokidar "^3.0.0"
Expand All @@ -41,13 +41,13 @@
yargs "15.3.0"

"@angular/compiler@file:../../dist/packages-dist/compiler":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@angular/core@file:../../dist/packages-dist/core":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@angular/forms@file:../../dist/packages-dist/forms":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@angular/material@8.0.1":
version "8.0.1"
Expand All @@ -57,43 +57,43 @@
tslib "^1.7.1"

"@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@angular/router@file:../../dist/packages-dist/router":
version "9.1.0-rc.0"
version "10.0.0-next.1"

"@bazel/bazelisk@file:../../node_modules/@bazel/bazelisk":
version "1.3.0"

"@bazel/karma@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.5.0.tgz#75ea27c3c2a8a7fadbb5c5ab644c3acd3bc22702"
integrity sha512-j5S2Xya4Rr7vK0DzTaZ8FKDHBydtTNldwlx+rihjKJgbEBt76wQM7ucXD6aSA23lC+JM/dPRSKkpIIGeWf2JdQ==
"@bazel/karma@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.6.0.tgz#98950b71114dd9ec169e6778a35d31ae1f578655"
integrity sha512-9cX0E1SiMWwA70ZMFnMzeqSRn3biduGx03bGV77FSUYKocZpyfU2cOEygYGfxAqHnyM7x4cS8nflRv3+ZE0Aqg==
dependencies:
tmp "0.1.0"

"@bazel/protractor@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.5.0.tgz#ac92442bf38f5cd718812e4cca41ba2e5ebf1fa5"
integrity sha512-nUwOOUjNGJUU18JiE3sPOBzIul0jvGApEEikntKTLLwQ7w7/1TnOdXDWvHXrXRW3nwit6flWIzEUoFtWgwtCeg==
"@bazel/protractor@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.6.0.tgz#cf095a1dbc038def7031c513a3b87f4e79bedb00"
integrity sha512-gPiRv0oUJbVPpQ9nrwe5vjkffAc8VsYJhpTGgG+8aPdOaTLWgmBP/sy4BdfijU9O1Z/mNYojQCZgMzQz6kAvdg==

"@bazel/rollup@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.5.0.tgz#d0933d167e682470b90f8149eecf4c5bd7511369"
integrity sha512-/FEJfNi9dbbH8oQbf7LHyd0uhGSB0CQQhOpz8d4b2WLnYLhK0NZhoNF4afFjju5kQkrbrOfKaho64BfVxvNppA==
"@bazel/rollup@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.6.0.tgz#c0bdad0ad0ba5c5b2e21d1634dc2ce48840ca044"
integrity sha512-MLF7laHX3CSAJH+RbIEVWgnQdz3U8dPkdJWJqiX/z9mUSEgC47LNsMBPKlRy1TpOJOpw1j0vLaJv0qN/bgq9NQ==

"@bazel/terser@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.5.0.tgz#141e1492043231001da3f3ef67b575dd9c2df0be"
integrity sha512-ajT2roE+tiW+xm2YOSfUG55MaUHv0hHYlQneNV1GI3lZoowWPbToOaZiuVza90ulHFHP7lDXn/5MC4UF5/piOQ==
"@bazel/terser@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.6.0.tgz#63ccd20dd6c9793e7b3b23fb5ea82b55b3ef6eb2"
integrity sha512-csBrN4XfX/hYTtDVcH/ulVO9K4Ca/IlrCWk5o/l7JBJq/cHoTj5AWIA7PKJ4QgnxXeEjso4CmLFgUMEVKVYV3Q==

"@bazel/typescript@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.5.0.tgz#d69324c08e7dbfe10b21a6fcb7b4d66c71c8d171"
integrity sha512-Vi8n1p35EhxGC22TEnmnVPlyakrALyH2ccVN5J6YeZXE1oWlSMSqQEhXKTjqUfQ3FT76nW1K91AdH4TG3me5nQ==
"@bazel/typescript@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.6.0.tgz#8dfd29e71bcf917d5f9cb67f19ac4dcfc9082439"
integrity sha512-vAKuwy1Hgl+t3M3sH/G0oqHRYN35TdENj+0lsCI3x7EbSzyI6cbA3YQrLrlyvdScksqOpZa3PZ3UBGqfJJq2DA==
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down Expand Up @@ -2084,7 +2084,7 @@ rollup@1.27.5:
acorn "^7.1.0"

"rxjs@file:../../node_modules/rxjs":
version "6.5.3"
version "6.5.4"
dependencies:
tslib "^1.9.0"

Expand Down Expand Up @@ -2437,7 +2437,7 @@ tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

"tslib@file:../../node_modules/tslib":
version "1.10.0"
version "1.11.1"

tsutils@2.27.2:
version "2.27.2"
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Expand Up @@ -51,12 +51,12 @@
"@babel/template": "^7.8.6",
"@babel/traverse": "^7.8.6",
"@babel/types": "^7.8.6",
"@bazel/jasmine": "1.5.0",
"@bazel/karma": "1.5.0",
"@bazel/protractor": "1.5.0",
"@bazel/rollup": "1.5.0",
"@bazel/terser": "1.5.0",
"@bazel/typescript": "1.5.0",
"@bazel/jasmine": "1.6.0",
"@bazel/karma": "1.6.0",
"@bazel/protractor": "1.6.0",
"@bazel/rollup": "1.6.0",
"@bazel/terser": "1.6.0",
"@bazel/typescript": "1.6.0",
"@microsoft/api-extractor": "~7.6.0",
"@schematics/angular": "9.0.3",
"@types/angular": "^1.6.47",
Expand Down
4 changes: 2 additions & 2 deletions packages/bazel/src/builders/files/WORKSPACE.template
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@ workspace(

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

RULES_NODEJS_VERSION = "1.5.0"
RULES_NODEJS_SHA256 = "d0c4bb8b902c1658f42eb5563809c70a06e46015d64057d25560b0eb4bdc9007"
RULES_NODEJS_VERSION = "1.6.0"
RULES_NODEJS_SHA256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116"
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = RULES_NODEJS_SHA256,
Expand Down
19 changes: 10 additions & 9 deletions packages/bazel/src/schematics/ng-add/index.ts
View file
Open in desktop
Expand Up @@ -9,10 +9,10 @@
*/

import {JsonAstObject, parseJsonAst} from '@angular-devkit/core';
import {Rule, SchematicContext, SchematicsException, Tree, apply, applyTemplates, chain, mergeWith, url} from '@angular-devkit/schematics';
import {apply, applyTemplates, chain, mergeWith, Rule, SchematicContext, SchematicsException, Tree, url} from '@angular-devkit/schematics';
import {NodePackageInstallTask} from '@angular-devkit/schematics/tasks';
import {getWorkspace, getWorkspacePath} from '@schematics/angular/utility/config';
import {NodeDependencyType, addPackageJsonDependency, getPackageJsonDependency, removePackageJsonDependency} from '@schematics/angular/utility/dependencies';
import {addPackageJsonDependency, getPackageJsonDependency, NodeDependencyType, removePackageJsonDependency} from '@schematics/angular/utility/dependencies';
import {findPropertyInAstObject, insertPropertyInAstObjectInOrder} from '@schematics/angular/utility/json-utils';
import {validateProjectName} from '@schematics/angular/utility/validation';

Expand Down Expand Up @@ -40,11 +40,11 @@ function addDevDependenciesToPackageJson(options: Schema) {
['@angular/bazel', angularCore.version],
['@bazel/bazel', '2.1.0'],
['@bazel/ibazel', '0.12.3'],
['@bazel/karma', '1.5.0'],
['@bazel/protractor', '1.5.0'],
['@bazel/rollup', '1.5.0'],
['@bazel/terser', '1.5.0'],
['@bazel/typescript', '1.5.0'],
['@bazel/karma', '1.6.0'],
['@bazel/protractor', '1.6.0'],
['@bazel/rollup', '1.6.0'],
['@bazel/terser', '1.6.0'],
['@bazel/typescript', '1.6.0'],
['history-server', '1.3.1'],
['html-insert-assets', '0.5.0'],
['karma', '4.4.1'],
Expand Down Expand Up @@ -137,7 +137,7 @@ function updateGitignore() {
*/
function updateAngularJsonToUseBazelBuilder(options: Schema): Rule {
return (host: Tree) => {
const name = options.name !;
const name = options.name!;
const workspacePath = getWorkspacePath(host);
if (!workspacePath) {
throw new Error('Could not find angular.json');
Expand Down Expand Up @@ -235,7 +235,8 @@ function backupAngularJson(): Rule {
return;
}
host.create(
`${workspacePath}.bak`, '// This is a backup file of the original angular.json. ' +
`${workspacePath}.bak`,
'// This is a backup file of the original angular.json. ' +
'This file is needed in case you want to revert to the workflow without Bazel.\n\n' +
host.read(workspacePath));
};
Expand Down
48 changes: 24 additions & 24 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -872,42 +872,42 @@
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.3.tgz#c8c82647f920cd529c7793c50e087e1a754a5973"
integrity sha512-dyx62Uo5kogrxFmqFNpGvbavfr8yjmuQlOyZczOuA60piULwlUsO7Oh3/1OUWKDSXaMMqHhFQfpdl+z0HjI6TQ==

"@bazel/jasmine@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.5.0.tgz#be980cb8e9f82a87036e27f86278bd7a54d74c43"
integrity sha512-r06GTWKxZYs6msPTbIJ+vcHLQke6wMULo3p4w3ecDybRzKq54syjSzlmejIm9wJ8OHrVyRRSvHgvygxCGJfhTA==
"@bazel/jasmine@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.6.0.tgz#c469ab8725d9a2e48c0c3c965861ff8add9272ac"
integrity sha512-WtOQDtIMHKTxlp0+FcdrADV6LMrpJV7eEGZippSNFPL5YhwwrPfCSOs5WkooatsrjL5YEszswzqQXFjvC7EZKQ==
dependencies:
jasmine "~3.5.0"
jasmine-core "~3.5.0"
jasmine-reporters "~2.3.2"
v8-coverage "1.0.9"

"@bazel/karma@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.5.0.tgz#75ea27c3c2a8a7fadbb5c5ab644c3acd3bc22702"
integrity sha512-j5S2Xya4Rr7vK0DzTaZ8FKDHBydtTNldwlx+rihjKJgbEBt76wQM7ucXD6aSA23lC+JM/dPRSKkpIIGeWf2JdQ==
"@bazel/karma@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.6.0.tgz#98950b71114dd9ec169e6778a35d31ae1f578655"
integrity sha512-9cX0E1SiMWwA70ZMFnMzeqSRn3biduGx03bGV77FSUYKocZpyfU2cOEygYGfxAqHnyM7x4cS8nflRv3+ZE0Aqg==
dependencies:
tmp "0.1.0"

"@bazel/protractor@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.5.0.tgz#ac92442bf38f5cd718812e4cca41ba2e5ebf1fa5"
integrity sha512-nUwOOUjNGJUU18JiE3sPOBzIul0jvGApEEikntKTLLwQ7w7/1TnOdXDWvHXrXRW3nwit6flWIzEUoFtWgwtCeg==
"@bazel/protractor@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.6.0.tgz#cf095a1dbc038def7031c513a3b87f4e79bedb00"
integrity sha512-gPiRv0oUJbVPpQ9nrwe5vjkffAc8VsYJhpTGgG+8aPdOaTLWgmBP/sy4BdfijU9O1Z/mNYojQCZgMzQz6kAvdg==

"@bazel/rollup@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.5.0.tgz#d0933d167e682470b90f8149eecf4c5bd7511369"
integrity sha512-/FEJfNi9dbbH8oQbf7LHyd0uhGSB0CQQhOpz8d4b2WLnYLhK0NZhoNF4afFjju5kQkrbrOfKaho64BfVxvNppA==
"@bazel/rollup@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.6.0.tgz#c0bdad0ad0ba5c5b2e21d1634dc2ce48840ca044"
integrity sha512-MLF7laHX3CSAJH+RbIEVWgnQdz3U8dPkdJWJqiX/z9mUSEgC47LNsMBPKlRy1TpOJOpw1j0vLaJv0qN/bgq9NQ==

"@bazel/terser@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.5.0.tgz#141e1492043231001da3f3ef67b575dd9c2df0be"
integrity sha512-ajT2roE+tiW+xm2YOSfUG55MaUHv0hHYlQneNV1GI3lZoowWPbToOaZiuVza90ulHFHP7lDXn/5MC4UF5/piOQ==
"@bazel/terser@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.6.0.tgz#63ccd20dd6c9793e7b3b23fb5ea82b55b3ef6eb2"
integrity sha512-csBrN4XfX/hYTtDVcH/ulVO9K4Ca/IlrCWk5o/l7JBJq/cHoTj5AWIA7PKJ4QgnxXeEjso4CmLFgUMEVKVYV3Q==

"@bazel/typescript@1.5.0":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.5.0.tgz#d69324c08e7dbfe10b21a6fcb7b4d66c71c8d171"
integrity sha512-Vi8n1p35EhxGC22TEnmnVPlyakrALyH2ccVN5J6YeZXE1oWlSMSqQEhXKTjqUfQ3FT76nW1K91AdH4TG3me5nQ==
"@bazel/typescript@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.6.0.tgz#8dfd29e71bcf917d5f9cb67f19ac4dcfc9082439"
integrity sha512-vAKuwy1Hgl+t3M3sH/G0oqHRYN35TdENj+0lsCI3x7EbSzyI6cbA3YQrLrlyvdScksqOpZa3PZ3UBGqfJJq2DA==
dependencies:
protobufjs "6.8.8"
semver "5.6.0"
Expand Down