diff options
| -rw-r--r-- | .vscode/c_cpp_properties.json | 37 | ||||
| -rw-r--r-- | test/bun.js/resolve.test.js | 20 |
2 files changed, 35 insertions, 22 deletions
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 58053b214..56cde0394 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -4,47 +4,40 @@ "name": "Mac", "forcedInclude": ["${workspaceFolder}/src/bun.js/bindings/root.h"], "includePath": [ + "${workspaceFolder}/../webkit-build/include/", + "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/", + "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/", "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/", "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/WTF/Headers", - "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/*", + "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/bmalloc/Headers/", "${workspaceFolder}/src/bun.js/bindings/", + "${workspaceFolder}/src/bun.js/bindings/WebCore/", "${workspaceFolder}/src/bun.js/bindings/sqlite/", "${workspaceFolder}/src/bun.js/bindings/webcrypto/", - "${workspaceFolder}/src/deps/boringssl/include/", - "${workspaceFolder}/src/bun.js/bindings/webcrypto/openssl/", - "${workspaceFolder}/src/bun.js/bindings/webcrypto/algorithms/", - "${workspaceFolder}/src/bun.js/bindings/webcrypto/parameters/", "${workspaceFolder}/src/bun.js/builtins/", "${workspaceFolder}/src/bun.js/builtins/cpp", - "${workspaceFolder}/src/bun.js/bindings/WebCore/", - "${workspaceFolder}/src/bun.js/WebKit/Source/bmalloc/", - "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/", - "${workspaceFolder}/../webkit-build/include/", + "${workspaceFolder}/src/deps/boringssl/include/", "${workspaceFolder}/src/deps", "${workspaceFolder}/src/deps/uws/uSockets/src" ], "browse": { "path": [ - "${workspaceFolder}/src/bun.js/bindings/*", + "${workspaceFolder}/../webkit-build/include/", + "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/", + "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/", "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/JavaScriptCore/PrivateHeaders/**", - "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/JavaScriptCore/Headers/**", "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/WTF/Headers/**", - "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/*", + "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/bmalloc/Headers/**", + "${workspaceFolder}/src/bun.js/bindings/*", "${workspaceFolder}/src/bun.js/bindings/**", - "${workspaceFolder}/src/bun.js/modules/**", - "${workspaceFolder}/src/bun.js/builtins/**", - "${workspaceFolder}/src/deps/boringssl/include/", "${workspaceFolder}/src/bun.js/bindings/sqlite/", - "${workspaceFolder}/src/bun.js/builtins/cpp/**", - "${workspaceFolder}/src/bun.js/WebKit/Source/bmalloc/**", - "${workspaceFolder}/src/bun.js/WebKit/WebKitBuild/Release/ICU/Headers/", "${workspaceFolder}/src/bun.js/bindings/webcrypto/", - "${workspaceFolder}/src/bun.js/bindings/webcrypto/openssl/", - "${workspaceFolder}/src/bun.js/bindings/webcrypto/algorithms/", - "${workspaceFolder}/src/bun.js/bindings/webcrypto/parameters/", - "${workspaceFolder}/../webkit-build/include/", + "${workspaceFolder}/src/bun.js/builtins/**", + "${workspaceFolder}/src/bun.js/builtins/cpp/**", + "${workspaceFolder}/src/bun.js/modules/**", "${workspaceFolder}/src/deps", + "${workspaceFolder}/src/deps/boringssl/include/", "${workspaceFolder}/src/deps/uws/uSockets/src" ], "limitSymbolsToIncludedHeaders": true, diff --git a/test/bun.js/resolve.test.js b/test/bun.js/resolve.test.js index ea7b6cf2d..6d8daedc5 100644 --- a/test/bun.js/resolve.test.js +++ b/test/bun.js/resolve.test.js @@ -44,6 +44,18 @@ it("#imports", async () => { } }); +// this is known to be failing +it("#imports with wildcard", async () => { + await writePackageJSONImportsFixture(); + + // Chcek that package-json-imports/#foo/wildcard works + expect( + ( + await import.meta.resolve("package-json-imports/#foo/wildcard.js") + ).endsWith("/wildcard.js") + ).toBe(true); +}); + it("import.meta.resolve", async () => { expect(await import.meta.resolve("./resolve.test.js")).toBe(import.meta.path); @@ -209,6 +221,13 @@ function writePackageJSONImportsFixture() { writeFileSync( join( import.meta.dir, + "./node_modules/package-json-imports/foo/wildcard.js" + ), + "export const wildcard = 1;" + ); + writeFileSync( + join( + import.meta.dir, "./node_modules/package-json-imports/foo/private-foo.js" ), "export {bar} from 'package-json-imports/#foo';" @@ -224,6 +243,7 @@ function writePackageJSONImportsFixture() { imports: { "#foo": "./foo/private-foo.js", "#foo/bar": "./foo/private-foo.js", + "#foo/": "./foo/", "#internal-react": "react", }, }, |