Skip to content

Commit

Permalink
wasm: disable npm install (envoyproxy#21487)
Browse files Browse the repository at this point in the history
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Signed-off-by: Amila Senadheera <amila.15@cse.mrt.ac.lk>
  • Loading branch information
lizan authored and Amila-Rukshan committed Jun 28, 2022
1 parent 4a7894d commit a64bd39
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 1 deletion.
48 changes: 48 additions & 0 deletions bazel/emsdk.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl
index 95801ba..95fdabd 100644
--- a/bazel/emscripten_deps.bzl
+++ b/bazel/emscripten_deps.bzl
@@ -69,31 +69,3 @@ def emscripten_deps(emscripten_version = "latest"):
build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
type = "zip",
)
-
- if "emscripten_npm_linux" not in excludes:
- npm_install(
- name = "emscripten_npm_linux",
- package_json = "@emscripten_bin_linux//:emscripten/package.json",
- package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json",
- )
-
- if "emscripten_npm_mac" not in excludes:
- npm_install(
- name = "emscripten_npm_mac",
- package_json = "@emscripten_bin_mac//:emscripten/package.json",
- package_lock_json = "@emscripten_bin_mac//:emscripten/package-lock.json",
- )
-
- if "emscripten_npm_mac_arm64" not in excludes:
- npm_install(
- name = "emscripten_npm_mac",
- package_json = "@emscripten_bin_mac_arm64//:emscripten/package.json",
- package_lock_json = "@emscripten_bin_mac_arm64//:emscripten/package-lock.json",
- )
-
- if "emscripten_npm_win" not in excludes:
- npm_install(
- name = "emscripten_npm_win",
- package_json = "@emscripten_bin_win//:emscripten/package.json",
- package_lock_json = "@emscripten_bin_win//:emscripten/package-lock.json",
- )
diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel
index eb36959..12dba37 100644
--- a/bazel/emscripten_toolchain/BUILD.bazel
+++ b/bazel/emscripten_toolchain/BUILD.bazel
@@ -13,7 +13,6 @@ filegroup(
"env.sh",
"env.bat",
"@emsdk//:binaries",
- "@emsdk//:node_modules",
"@nodejs//:node_files",
],
)
6 changes: 5 additions & 1 deletion bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,11 @@ def _proxy_wasm_cpp_host():
external_http_archive(name = "proxy_wasm_cpp_host")

def _emsdk():
external_http_archive(name = "emsdk")
external_http_archive(
name = "emsdk",
patch_args = ["-p2"],
patches = ["@envoy//bazel:emsdk.patch"],
)

def _com_github_google_jwt_verify():
external_http_archive("com_github_google_jwt_verify")
Expand Down

0 comments on commit a64bd39

Please sign in to comment.