langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168963460f
anki/ts/patches/@bazel+labs+3.0.0.patch

42 lines
1.6 KiB
Diff
Raw Normal View History

initial Bazel conversion Running and testing should be working on the three platforms, but there's still a fair bit that needs to be done: - Wheel building + testing in a venv still needs to be implemented. - Python requirements still need to be compiled with piptool and pinned; need to compile on all platforms then merge - Cargo deps in cargo/ and rslib/ need to be cleaned up, and ideally unified into one place - Currently using rustls to work around openssl compilation issues on Linux, but this will break corporate proxies with custom SSL authorities; need to conditionally use openssl or use https://github.com/seanmonstar/reqwest/pull/1058 - Makefiles and docs still need cleaning up - It may make sense to reparent ts/* to the top level, as we don't nest the other modules under a specific language. - rspy and pylib must always be updated in lock-step, so merging rspy into pylib as a private module would simplify things. - Merging desktop-ftl and mobile-ftl into the core ftl would make managing and updating translations easier. - Obsolete scripts need removing. - And probably more.
2020-11-01 05:26:58 +01:00
diff --git a/node_modules/@bazel/labs/protobufjs/ts_proto_library.bzl b/node_modules/@bazel/labs/protobufjs/ts_proto_library.bzl
update to rules_nodejs 3.0.0 Seems to fix the rollup issues on Windows.
2020-12-23 07:05:15 +01:00
index fec29b6..fc77192 100755
initial Bazel conversion Running and testing should be working on the three platforms, but there's still a fair bit that needs to be done: - Wheel building + testing in a venv still needs to be implemented. - Python requirements still need to be compiled with piptool and pinned; need to compile on all platforms then merge - Cargo deps in cargo/ and rslib/ need to be cleaned up, and ideally unified into one place - Currently using rustls to work around openssl compilation issues on Linux, but this will break corporate proxies with custom SSL authorities; need to conditionally use openssl or use https://github.com/seanmonstar/reqwest/pull/1058 - Makefiles and docs still need cleaning up - It may make sense to reparent ts/* to the top level, as we don't nest the other modules under a specific language. - rspy and pylib must always be updated in lock-step, so merging rspy into pylib as a private module would simplify things. - Merging desktop-ftl and mobile-ftl into the core ftl would make managing and updating translations easier. - Obsolete scripts need removing. - And probably more.
2020-11-01 05:26:58 +01:00
--- a/node_modules/@bazel/labs/protobufjs/ts_proto_library.bzl
+++ b/node_modules/@bazel/labs/protobufjs/ts_proto_library.bzl
@@ -15,7 +15,16 @@
load("@build_bazel_rules_nodejs//:providers.bzl", "DeclarationInfo", "JSEcmaScriptModuleInfo", "JSModuleInfo", "JSNamedModuleInfo")
-def _run_pbjs(actions, executable, var, output_name, proto_files, suffix = ".js", wrap = "default", amd_name = ""):
+def _run_pbjs(
+ actions,
+ executable,
+ var,
+ output_name,
+ proto_files,
+ suffix = ".js",
+ wrap = "default",
+ amd_name = "",
+ target = "static-module"):
js_file = actions.declare_file(output_name + suffix)
# Create an intermediate file so that we can do some manipulation of the
@@ -25,9 +34,8 @@ def _run_pbjs(actions, executable, var, output_name, proto_files, suffix = ".js"
# Reference of arguments:
# https://github.com/dcodeIO/ProtoBuf.js/#pbjs-for-javascript
args = actions.args()
- args.add_all(["--target", "static-module"])
+ args.add_all(["--target", target])
args.add_all(["--wrap", wrap])
- args.add("--strict-long") # Force usage of Long type with int64 fields
args.add_all(["--out", js_file.path + ".tmpl"])
args.add_all(proto_files)
@@ -106,6 +114,7 @@ def _ts_proto_library(ctx):
sources,
suffix = ".mjs",
wrap = "es6",
+ target = "json-module",
)
# pbts doesn't understand '.mjs' extension so give it the es5 file
Reference in New Issue Copy Permalink