Revert "fix: preserve slashes in specified files (npm#205)"

This reverts commit cd5ddbd.
danpere · Dec 14, 2023 · ff9aae5 · ff9aae5
1 parent 734e65a
commit ff9aae5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -308,10 +308,12 @@ 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, -1)
+          file = file.slice(0, -2)
         }
         const inverse = `!${file}`
 
@@ -325,7 +327,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.startsWith('/') ? file.slice(1) : file)
+            this.requiredFiles.push(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

diff --git a/test/package-json-dir-with-slashes.js b/test/package-json-dir-with-slashes.js
@@ -13,7 +13,6 @@ const pkg = t.testdir({
     files: [
       '/lib',
       './lib2',
-      './lib3/*',
     ],
   }),
   lib: {
@@ -27,7 +26,6 @@ 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) => {

diff --git a/test/package-json-files-with-slashes.js b/test/package-json-files-with-slashes.js
@@ -11,20 +11,17 @@ 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',
   },
@@ -35,7 +32,6 @@ 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',