From 73ee1ab0b34b32eb661f07888822127e14653bea Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Mon, 11 Dec 2023 17:06:20 -0800 Subject: [PATCH] test: move patch tests to e2e/verify-patches --- MODULE.bazel | 4 ---- WORKSPACE | 4 ---- examples/npm_deps/patches/patches | 3 --- examples/npm_deps/patches/test-a.patch | 5 ----- examples/npm_deps/patches/test-a@0.0.1.patch | 6 ------ examples/npm_deps/patches/test-b.patch | 5 ----- npm/private/test/repositories_checked.bzl | 4 ---- 7 files changed, 31 deletions(-) delete mode 100644 examples/npm_deps/patches/test-a.patch delete mode 100644 examples/npm_deps/patches/test-a@0.0.1.patch delete mode 100644 examples/npm_deps/patches/test-b.patch diff --git a/MODULE.bazel b/MODULE.bazel index cd362243a8..1e57c9ce07 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 de4a953c62..dd9a9be9a0 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 a1e3676398..5f42322f49 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 30a4ebef7c..0000000000 --- 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 4452db44da..0000000000 --- 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 dbdab56c38..0000000000 --- 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 7c506e45ae..1c6741a04a 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-b": ["0.0.2"], "@gregmagolan/test-a": ["0.0.1"], }, - patches = ["@//examples/npm_deps:patches/test-b.patch"], - patch_args = ["-p1"], ) npm_import(