Skip to content

Commit 62d62eb

Browse files
authored
Merge branch 'main' into support-multiple-package-managers
2 parents c2209d1 + 6ab2f0a commit 62d62eb

11 files changed

+75
-1071
lines changed

packages/cli/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @arethetypeswrong/cli
22

3+
## 0.17.4
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [f118862]
8+
- @arethetypeswrong/core@0.17.4
9+
310
## 0.17.3
411

512
### Patch Changes

packages/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@arethetypeswrong/cli",
3-
"version": "0.17.3",
3+
"version": "0.17.4",
44
"description": "A CLI tool for arethetypeswrong.github.io",
55
"author": "Andrew Branch & ej-shafran",
66
"contributors": [

packages/core/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @arethetypeswrong/core
22

3+
## 0.17.4
4+
5+
### Patch Changes
6+
7+
- f118862: Use `@loaderkit/resolve` for module resolution
8+
39
## 0.17.3
410

511
### Patch Changes

packages/core/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@arethetypeswrong/core",
3-
"version": "0.17.3",
3+
"version": "0.17.4",
44
"description": "The API behind arethetypeswrong.github.io",
55
"author": "Andrew Branch",
66
"license": "MIT",
@@ -51,6 +51,7 @@
5151
},
5252
"dependencies": {
5353
"@andrewbranch/untar.js": "^1.0.3",
54+
"@loaderkit/resolve": "^1.0.2",
5455
"cjs-module-lexer": "^1.2.3",
5556
"fflate": "^0.8.2",
5657
"lru-cache": "^10.4.3",

packages/core/src/internal/esm/cjsNamespace.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Package } from "../../createPackage.js";
22
import { getCjsModuleBindings } from "./cjsBindings.js";
3-
import { cjsResolve } from "./cjsResolve.js";
3+
import { cjsResolve } from "./resolve.js";
44

55
export function getCjsModuleNamespace(fs: Package, file: URL, seen = new Set<string>()): Set<string> {
66
seen.add(file.pathname);
@@ -17,9 +17,9 @@ export function getCjsModuleNamespace(fs: Package, file: URL, seen = new Set<str
1717

1818
for (const source of bindings.reexports.reverse()) {
1919
try {
20-
const { format, resolved } = cjsResolve(fs, source, file);
21-
if (format === "commonjs" && !seen.has(resolved.pathname)) {
22-
const reexported = getCjsModuleNamespace(fs, resolved, seen);
20+
const { format, url } = cjsResolve(fs, source, file);
21+
if (format === "commonjs" && !seen.has(url.pathname)) {
22+
const reexported = getCjsModuleNamespace(fs, url, seen);
2323
reexported.forEach((name) => exports.add(name));
2424
}
2525
} catch {}

packages/core/src/internal/esm/cjsResolve.ts

-298
This file was deleted.

0 commit comments

Comments
 (0)