Skip to content

Commit

Permalink
fix(cli): support js_ignore_imports for package.json imports (#6926)
Browse files Browse the repository at this point in the history
The package.json deps should support the same `js_ignore_imports`
directive as all other js imports.

Ideally this will move to a more common location but this is the quick
fix.

---

### Changes are visible to end-users: no

### Test plan

- Covered by existing test cases
- New test cases added

GitOrigin-RevId: cfa2a62823454674453f3d6458e52ed30fbe0581
  • Loading branch information
jbedard committed Sep 28, 2024
1 parent e6055ca commit 0328923
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 0 deletions.
4 changes: 4 additions & 0 deletions gazelle/js/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ func (ts *typeScriptLang) addPackageRule(cfg *JsGazelleConfig, args language.Gen
}

for _, impt := range packageImports {
if cfg.IsImportIgnored(impt) {
continue
}

if sourceFiles.Contains(impt) || dataFiles.Contains(impt) {
npmPackageInfo.sources.Add(impt)
} else {
Expand Down
1 change: 1 addition & 0 deletions gazelle/js/tests/npm_package_deps/exports-ignore/BUILD.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# gazelle:js_ignore_imports **/does-not-exist.js
8 changes: 8 additions & 0 deletions gazelle/js/tests/npm_package_deps/exports-ignore/BUILD.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
load("@aspect_rules_js//js:defs.bzl", "js_library")

# gazelle:js_ignore_imports **/does-not-exist.js

js_library(
name = "tsc",
srcs = ["lib1.js"],
)
Empty file.
12 changes: 12 additions & 0 deletions gazelle/js/tests/npm_package_deps/exports-ignore/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "exports-ignore",
"private": true,
"exports": {
".": {
"node": "./lib/does-not-exist.js"
},
"./bin": "./bin/does-not-exist.js",
"./dne": "./does-not-exist.js",
"./lib": "./lib1.js"
}
}

0 comments on commit 0328923

Please sign in to comment.