From 91178658d559596d7c1bab50b0933a855c4e18b8 Mon Sep 17 00:00:00 2001 From: Alex Hunt Date: Tue, 20 Dec 2022 17:12:25 +0000 Subject: [PATCH 1/2] tests: Invert comments on pattern trailer handling, extend test values --- test/resolve.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/resolve.js b/test/resolve.js index 99b6244..7431877 100644 --- a/test/resolve.js +++ b/test/resolve.js @@ -382,11 +382,11 @@ resolve('exports["./features/*"]', () => { pass(pkg, './features/abc.js', 'foobar/features/abc'); pass(pkg, './features/hello.js', 'foobar/features/hello'); - pass(pkg, './features/world.js', 'foobar/features/world'); + pass(pkg, './features/hello/world.js', 'foobar/features/hello/world'); - // incorrect, but matches Node. evaluate as defined + // Valid: Pattern trailers allow any exact substrings to be matched pass(pkg, './features/hello.js.js', 'foobar/features/hello.js'); - pass(pkg, './features/world.js.js', 'foobar/features/world.js'); + pass(pkg, './features/hello/world.js.js', 'foobar/features/hello/world.js'); fail(pkg, './package.json', 'package.json'); fail(pkg, './package.json', 'foobar/package.json'); @@ -410,11 +410,11 @@ resolve('exports["./features/*"] :: with "./" key', () => { pass(pkg, './features/', 'foobar/features/'); // via "./" pass(pkg, './features/hello.js', 'foobar/features/hello'); - pass(pkg, './features/world.js', 'foobar/features/world'); + pass(pkg, './features/hello/world.js', 'foobar/features/hello/world'); - // incorrect, but matches Node. evaluate as defined + // Valid: Pattern trailers allow any exact substrings to be matched pass(pkg, './features/hello.js.js', 'foobar/features/hello.js'); - pass(pkg, './features/world.js.js', 'foobar/features/world.js'); + pass(pkg, './features/hello/world.js.js', 'foobar/features/hello/world.js'); pass(pkg, './package.json', 'package.json'); pass(pkg, './package.json', 'foobar/package.json'); From e0a914bd87db66bc32dd14005010e49fedba49b1 Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Wed, 11 Jan 2023 10:55:21 -0800 Subject: [PATCH 2/2] Apply suggestions from code review --- test/resolve.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/resolve.js b/test/resolve.js index 7431877..7b5af61 100644 --- a/test/resolve.js +++ b/test/resolve.js @@ -382,11 +382,11 @@ resolve('exports["./features/*"]', () => { pass(pkg, './features/abc.js', 'foobar/features/abc'); pass(pkg, './features/hello.js', 'foobar/features/hello'); - pass(pkg, './features/hello/world.js', 'foobar/features/hello/world'); + pass(pkg, './features/foo/bar.js', 'foobar/features/foo/bar'); // Valid: Pattern trailers allow any exact substrings to be matched pass(pkg, './features/hello.js.js', 'foobar/features/hello.js'); - pass(pkg, './features/hello/world.js.js', 'foobar/features/hello/world.js'); + pass(pkg, './features/foo/bar.js.js', 'foobar/features/foo/bar.js'); fail(pkg, './package.json', 'package.json'); fail(pkg, './package.json', 'foobar/package.json'); @@ -410,11 +410,11 @@ resolve('exports["./features/*"] :: with "./" key', () => { pass(pkg, './features/', 'foobar/features/'); // via "./" pass(pkg, './features/hello.js', 'foobar/features/hello'); - pass(pkg, './features/hello/world.js', 'foobar/features/hello/world'); + pass(pkg, './features/foo/bar.js', 'foobar/features/foo/bar'); // Valid: Pattern trailers allow any exact substrings to be matched pass(pkg, './features/hello.js.js', 'foobar/features/hello.js'); - pass(pkg, './features/hello/world.js.js', 'foobar/features/hello/world.js'); + pass(pkg, './features/foo/bar.js.js', 'foobar/features/foo/bar.js'); pass(pkg, './package.json', 'package.json'); pass(pkg, './package.json', 'foobar/package.json');