Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: preserve slashes in specified files #205

Merged
merged 1 commit into from
Dec 1, 2023
Merged

fix: preserve slashes in specified files #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,10 @@ class PackWalker extends IgnoreWalker {
if (files) {
for (let file of files) {
// invert the rule because these are things we want to include
if (file.startsWith('/')) {
if (file.startsWith('./')) {
file = file.slice(1)
} else if (file.startsWith('./')) {
file = file.slice(2)
} else if (file.endsWith('/*')) {
file = file.slice(0, -2)
file = file.slice(0, -1)
}
const inverse = `!${file}`

Expand All @@ -326,7 +324,7 @@ class PackWalker extends IgnoreWalker {
// if we have a file and we know that, it's strictly required
if (stat.isFile()) {
strict.unshift(inverse)
this.requiredFiles.push(file)
this.requiredFiles.push(file.startsWith('/') ? file.slice(1) : file)
} else if (stat.isDirectory()) {
// otherwise, it's a default ignore, and since we got here we know it's not a pattern
// so we include the directory contents
Expand Down
2 changes: 2 additions & 0 deletions test/package-json-dir-with-slashes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const pkg = t.testdir({
files: [
'/lib',
'./lib2',
'./lib3/*',
],
}),
lib: {
Expand All @@ -26,6 +27,7 @@ const pkg = t.testdir({
'fiv.js': 'fiv',
'.DS_Store': 'a store of ds',
},
lib3: 'not a dir',
})

t.test('package with slash directories', async (t) => {
Expand Down
4 changes: 4 additions & 0 deletions test/package-json-files-with-slashes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,20 @@ const packlist = require('../')
const pkg = t.testdir({
'package.json': JSON.stringify({
files: [
'./fiv.js',
'/lib/one.js',
'/lib/two.js',
'/lib/tre.js',
'./lib/for.js',
],
}),
'fiv.js': 'fiv',
lib: {
'one.js': 'one',
'two.js': 'two',
'tre.js': 'tre',
'for.js': 'for',
'fiv.js': 'fiv',
'.npmignore': 'two.js',
'.DS_Store': 'a store of ds',
},
Expand All @@ -32,6 +35,7 @@ t.test('package with slash files', async (t) => {
const tree = await arborist.loadActual()
const files = await packlist(tree)
t.same(files, [
'fiv.js',
'lib/for.js',
'lib/one.js',
'lib/tre.js',
Expand Down
Loading