Skip to content

Commit e758431

Browse files
authored
fix: npm deps on git+https urls (#2592)
Found while adding more tests for #2403 ### Changes are visible to end-users: no ### Test plan - Covered by existing test cases - New test cases added
1 parent 550d591 commit e758431

21 files changed

Lines changed: 889 additions & 279 deletions

File tree

e2e/git_dep_metadata/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ npm.npm_import(
2626
commit = "c245af8ea73ce3345d92bbda6c684092a841e262",
2727
package = "syncpack",
2828
root_package = "",
29-
url = "https://codeload.github.com/JamieMason/syncpack/tar.gz/c245af8ea73ce3345d92bbda6c684092a841e262",
30-
version = "github.com/JamieMason/syncpack/c245af8ea73ce3345d92bbda6c684092a841e262",
29+
url = "https://git@github.com/JamieMason/syncpack.git",
30+
version = "c245af8ea73ce3345d92bbda6c684092a841e262",
3131
)
3232
use_repo(npm, "syncpack")
3333
use_repo(npm, "syncpack__links")

e2e/git_dep_metadata/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ npm_import(
3636
commit = "c245af8ea73ce3345d92bbda6c684092a841e262",
3737
package = "syncpack",
3838
root_package = "",
39-
url = "https://codeload.github.com/JamieMason/syncpack/tar.gz/c245af8ea73ce3345d92bbda6c684092a841e262",
40-
version = "github.com/JamieMason/syncpack/c245af8ea73ce3345d92bbda6c684092a841e262",
39+
url = "https://git@github.com/JamieMason/syncpack.git",
40+
version = "c245af8ea73ce3345d92bbda6c684092a841e262",
4141
)

e2e/pnpm_lockfiles/base/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@
1111
"@isaacs/cliui": "8.0.2",
1212
"debug": "ngokevin/debug#9742c5f383a6f8046241920156236ade8ec30d53",
1313
"esbuild": "0.27.0",
14+
"highlightjs-git-https-notar": "git+https://gitea.osmocom.org/vyanitskiy/highlight.js.git#58dc5961f6f2bb8bc8bb1e7ce39f268a2fdd874f",
1415
"jsonify": "https://github.com/aspect-build/test-packages/releases/download/0.0.0/@foo-jsonify-0.0.0.tgz",
16+
"jquery-github": "github:jquery/jquery",
1517
"jquery-git-ssh-e61fccb": "git+ssh://[email protected]/jquery/jquery.git#e61fccb9d736235b4b011f89cba6866bc0b8997d",
1618
"jquery-git-ssh-399b201": "git+ssh://[email protected]:jquery/jquery#399b201bb3143a3952894cf3489b4848fc003967",
19+
"jquery-git-https-763ade6": "git+https://[email protected]:jquery/jquery#763ade6dda092709b36d97491951bcae415d91d1",
20+
"jquery-http-git-f85d521": "https://github.com/jquery/jquery.git#f85d521cdeeb3c6d3f4563a06dba8be793e26ef0",
1721
"rollup": "2.14.0",
1822
"rollup3": "npm:[email protected]",
1923
"rollup-plugin-with-peers": "npm:@rollup/[email protected]",

e2e/pnpm_lockfiles/lockfile-test.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,12 @@ def lockfile_test(npm_link_all_packages, name = None):
165165
# Odd git/http versions
166166
":node_modules/debug",
167167
":node_modules/jsonify",
168+
":node_modules/highlightjs-git-https-notar",
169+
":node_modules/jquery-github",
168170
":node_modules/jquery-git-ssh-e61fccb",
169171
":node_modules/jquery-git-ssh-399b201",
172+
":node_modules/jquery-http-git-f85d521",
173+
":node_modules/jquery-git-https-763ade6",
170174

171175
# npm: alias
172176
":node_modules/@aspect-test/a2",

e2e/pnpm_lockfiles/v101/pnpm-lock.yaml

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)