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

Bump protobufjs from 6.8.8 to 7.0.0 #1346

Merged
merged 9 commits into from
Jul 20, 2022
Merged

Bump protobufjs from 6.8.8 to 7.0.0 #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6d8f3c2
Bump protobufjs from 6.8.8 to 6.11.3
dependabot[bot] Jun 2, 2022
7221696
Update protobufjs dep versions
lewish Jun 13, 2022
5fc7e8e
Upgrade to protobufjs v7.0.0, node to 16x
lewish Jul 18, 2022
929141c
Bump bazel to version 5.2.0
lewish Jul 18, 2022
b9fe538
Bump test CI to correct bazel version
lewish Jul 18, 2022
dbd4c01
3.5.0
lewish Jul 18, 2022
4306b93
3.5.0
lewish Jul 18, 2022
286a861
Merge remote-tracking branch 'origin/master' into dependabot/npm_and_…
lewish Jul 20, 2022
0dfeb41
Remove duplicate levels
lewish Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.5.0
5 changes: 3 additions & 2 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ exports_files([

PROTOBUF_DEPS = [
"@npm//protobufjs",
"@npm//protobufjs-cli",
# these deps are needed even though they are not automatic transitive deps of
# protobufjs since if they are not in the runfiles then protobufjs attempts to
# run `npm install` at runtime to get thhem which fails as it tries to access
Expand All @@ -31,14 +32,14 @@ PROTOBUF_DEPS = [
nodejs_binary(
name = "pbjs",
data = PROTOBUF_DEPS,
entry_point = "@npm//:node_modules/protobufjs/bin/pbjs",
entry_point = "@npm//:node_modules/protobufjs-cli/bin/pbjs",
install_source_map_support = False,
)

nodejs_binary(
name = "pbts",
data = PROTOBUF_DEPS,
entry_point = "@npm//:node_modules/protobufjs/bin/pbts",
entry_point = "@npm//:node_modules/protobufjs-cli/bin/pbts",
install_source_map_support = False,
)

Expand Down
7 changes: 6 additions & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ http_archive(
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")

node_repositories(
node_version = "12.13.0",
node_repositories = {
"16.16.0-darwin_amd64": ("node-v16.16.0-darwin-x64.tar.gz", "node-v16.16.0-darwin-x64", "982edd0fad364ad6e2d72161671544ab9399bd0ca8c726bde3cd07775c4c709a"),
"16.16.0-linux_amd64": ("node-v16.16.0-linux-x64.tar.xz", "node-v16.16.0-linux-x64", "edcb6e9bb049ae365611aa209fc03c4bfc7e0295dbcc5b2f1e710ac70384a8ec"),
"16.16.0-windows_amd64": ("node-v16.16.0-win-x64.zip", "node-v16.16.0-win-x64", "c657acc98af55018c8fd6113c7e08d67c8083af75ba0306f9561b0117abc39d4"),
},
node_version = "16.16.0",
package_json = ["//:package.json"],
yarn_version = "1.13.0",
)
Expand Down
17 changes: 9 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@
"babel-preset-env": "^1.7.0",
"bunyan": "^1.8.12",
"chai": "^4.2.0",
"chalk": "^2.4.2",
"chalk": "^4.0.0",
"chokidar": "^2.0.4",
"cron-parser": "^2.15.0",
"css-loader": "^3.6.0",
"deepmerge": "^4.2.2",
"diff": "^4.0.2",
"escodegen": "^1.11.0",
"espree": "^3.5.4",
"estraverse": "^4.2.0",
"escodegen": "^1.13.0",
"espree": "^7.0.0",
"estraverse": "^5.1.0",
"express": "^4.17.1",
"front-matter": "^4.0.1",
"fs-extra": "^9.0.0",
Expand Down Expand Up @@ -100,7 +100,8 @@
"prettier": "^1.14.2",
"pretty-ms": "^4.0.0",
"promise-pool-executor": "^1.1.1",
"protobufjs": "6.8.8",
"protobufjs": "^7.0.0",
"protobufjs-cli": "^1.0.0",
"re-resizable": "^4.7.1",
"react": "^16.12.0",
"react-dom": "^16.12.0",
Expand All @@ -119,14 +120,14 @@
"rimraf": "^2.6.2",
"rollup": "^2.7.3",
"rollup-plugin-dts": "^1.4.0",
"semver": "^5.6.0",
"semver": "^7.1.2",
"snowflake-sdk": "^1.1.11",
"source-map-loader": "^0.2.0",
"sql-formatter": "^2.3.3",
"ssh2": "^1.4.0",
"style-loader": "^1.0.0",
"tarjan-graph": "^2.0.0",
"tmp": "0.0.33",
"tmp": "0.2.0",
"ts-loader": "^5.3.1",
"ts-mockito": "^2.6.1",
"tslint": "^5.14.0",
Expand All @@ -137,7 +138,7 @@
"typedoc": "^0.19.2",
"typescript": "^3.8.3",
"uglify-es": "^3.3.9",
"uglify-js": "^3.4.9",
"uglify-js": "^3.7.7",
"untildify": "^4.0.0",
"uuid": "^7.0.2",
"validator": "^13.7.0",
Expand Down
1 change: 0 additions & 1 deletion testing/runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export class Runner {

// tslint:disable: no-console
public static async run() {
chalk.enabled = true;
chalk.level = 3;
lewish marked this conversation as resolved.
Show resolved Hide resolved
try {
// We tell the runner to start running at the end of current block of
Expand Down
Loading