diff --git a/MODULE.bazel b/MODULE.bazel index ac118969b..5aa23668d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -168,12 +168,8 @@ npm.npm_translate_lock( }, patch_args = { "*": ["-p1"], - "@gregmagolan/test-a": ["-p4"], }, patches = { - "@gregmagolan/test-a": ["//examples/npm_deps:patches/test-a.patch"], - "@gregmagolan/test-a@0.0.1": ["//examples/npm_deps:patches/test-a@0.0.1.patch"], - "@gregmagolan/test-b": ["//examples/npm_deps:patches/test-b.patch"], "meaning-of-life@1.0.0": ["//examples/npm_deps:patches/meaning-of-life@1.0.0-after_pnpm.patch"], }, pnpm_lock = "//:pnpm-lock.yaml", diff --git a/WORKSPACE b/WORKSPACE index de4a953c6..dd9a9be9a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -145,12 +145,8 @@ npm_translate_lock( }, patch_args = { "*": ["-p1"], - "@gregmagolan/test-a": ["-p4"], }, patches = { - "@gregmagolan/test-a": ["//examples/npm_deps:patches/test-a.patch"], - "@gregmagolan/test-a@0.0.1": ["//examples/npm_deps:patches/test-a@0.0.1.patch"], - "@gregmagolan/test-b": ["//examples/npm_deps:patches/test-b.patch"], "meaning-of-life@1.0.0": ["//examples/npm_deps:patches/meaning-of-life@1.0.0-after_pnpm.patch"], }, pnpm_lock = "//:pnpm-lock.yaml", diff --git a/examples/npm_deps/patches/patches b/examples/npm_deps/patches/patches index a1e367639..5f42322f4 100644 --- a/examples/npm_deps/patches/patches +++ b/examples/npm_deps/patches/patches @@ -1,5 +1,2 @@ examples/npm_deps/patches/meaning-of-life@1.0.0-after_pnpm.patch examples/npm_deps/patches/meaning-of-life@1.0.0-pnpm.patch -examples/npm_deps/patches/test-a.patch -examples/npm_deps/patches/test-a@0.0.1.patch -examples/npm_deps/patches/test-b.patch diff --git a/examples/npm_deps/patches/test-a.patch b/examples/npm_deps/patches/test-a.patch deleted file mode 100644 index 30a4ebef7..000000000 --- a/examples/npm_deps/patches/test-a.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/node_modules/@gregmagolan/test-a/main.js -+++ b/node_modules/@gregmagolan/test-a/main.js -@@ -1 +1,2 @@ - module.exports = 'test-a-0.0.1'; -+console.log("Hello world!") diff --git a/examples/npm_deps/patches/test-a@0.0.1.patch b/examples/npm_deps/patches/test-a@0.0.1.patch deleted file mode 100644 index 4452db44d..000000000 --- a/examples/npm_deps/patches/test-a@0.0.1.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/node_modules/@gregmagolan/test-a/main.js -+++ b/node_modules/@gregmagolan/test-a/main.js -@@ -1,2 +1,3 @@ - module.exports = 'test-a-0.0.1'; - console.log("Hello world!") -+console.log("Foobar") diff --git a/examples/npm_deps/patches/test-b.patch b/examples/npm_deps/patches/test-b.patch deleted file mode 100644 index dbdab56c3..000000000 --- a/examples/npm_deps/patches/test-b.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/main.js -+++ b/main.js -@@ -1 +1,2 @@ - module.exports = 'test-b-0.0.1'; -+console.log("Hello world!") diff --git a/npm/private/test/repositories_checked.bzl b/npm/private/test/repositories_checked.bzl index f52f2fa81..32846c008 100644 --- a/npm/private/test/repositories_checked.bzl +++ b/npm/private/test/repositories_checked.bzl @@ -1743,8 +1743,6 @@ def npm_repositories(): transitive_closure = { "@gregmagolan/test-a": ["0.0.1"], }, - patches = ["@//examples/npm_deps:patches/test-a.patch", "@//examples/npm_deps:patches/test-a@0.0.1.patch"], - patch_args = ["-p4"], ) npm_import( @@ -1769,8 +1767,6 @@ def npm_repositories(): "@gregmagolan/test-a": ["0.0.1"], "@gregmagolan/test-b": ["0.0.2"], }, - patches = ["@//examples/npm_deps:patches/test-b.patch"], - patch_args = ["-p1"], ) npm_import(