Skip to content

Commit 4c3460d

Browse files
committed
fix all remaining tests
1 parent ea30644 commit 4c3460d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3440
-3445
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.github/workflows/ci.windows.bazelrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
startup --output_user_root=C:/tmp
1+
startup --output_user_root=C:/tmp
2+
build --noshow_progress
3+
test --test_output=errors

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
if: ${{ matrix.os == 'windows-latest' }}
3131
- run: yarn --frozen-lockfile
3232
- run: yarn test --test_tag_filters=-no-${{ matrix.os }}
33-
#- run: cd examples/pure && yarn --frozen-lockfile && yarn test
33+
- run: cd examples/pure && yarn --frozen-lockfile && yarn test

.npmignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

BUILD.bazel

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
package(default_visibility = ["//visibility:public"])
1+
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
2+
3+
package(default_visibility = ["//visibility:public"])
4+
5+
pkg_npm(
6+
name = "package",
7+
package_name = "protoc-gen-ts",
8+
srcs = [
9+
"//bin:protoc-gen-ts.js",
10+
"index.bzl",
11+
"package.json",
12+
"README.md",
13+
],
14+
deps = [
15+
"//src:pkg"
16+
]
17+
)

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ ts_proto_library(
163163
Generates appropriate Protocol Buffer sources from Proto files directly through _TypeScript Compiler API_.
164164

165165
```sh
166-
# to run test invoke
166+
# when you make changes to the plugin, you will have to run the command below
167+
yarn update_checked_in
168+
# then invoke the tests
167169
yarn test
168170
# additionally if you want to see error details
169171
yarn test --test_output=errors

WORKSPACE

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,27 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
1212
# Setup NodeJS toolchain
1313
http_archive(
1414
name = "build_bazel_rules_nodejs",
15-
sha256 = "d63ecec7192394f5cc4ad95a115f8a6c9de55c60d56c1f08da79c306355e4654",
16-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.6.1/rules_nodejs-4.6.1.tar.gz"],
15+
sha256 = "6b951612ce13738516398a8057899394e2b7a779be91e1a68f75f25c0a938864",
16+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.0.0/rules_nodejs-5.0.0.tar.gz"],
1717
)
1818

19+
load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies")
20+
21+
build_bazel_rules_nodejs_dependencies()
22+
1923
load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
2024

25+
2126
node_repositories(
2227
node_version = "16.3.0"
2328
)
2429

2530
yarn_install(
2631
name = "npm",
2732
package_json = "//:package.json",
28-
yarn_lock = "//:yarn.lock"
33+
yarn_lock = "//:yarn.lock",
34+
# See: https://github.com/bazelbuild/rules_nodejs/issues/3280
35+
exports_directories_only = False
2936
)
3037

3138
# Setup Protocol Buffers toolchain

examples/.bazelrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

examples/BUILD.bazel

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/bazel/BUILD.bazel

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)