Skip to content

Commit

Permalink
Do not use built-in import.meta.resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolo-ribaudo committed Sep 8, 2023
1 parent 851d551 commit 0da2406
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 30 deletions.
27 changes: 0 additions & 27 deletions packages/babel-core/src/config/files/import-meta-resolve.ts

This file was deleted.

9 changes: 6 additions & 3 deletions packages/babel-core/src/config/files/plugins.ts
Expand Up @@ -9,7 +9,7 @@ import { isAsync } from "../../gensync-utils/async.ts";
import loadCodeDefault, { supportsESM } from "./module-types.ts";
import { fileURLToPath, pathToFileURL } from "url";

import importMetaResolve from "./import-meta-resolve.ts";
import { resolve as importMetaResolve } from "../../vendor/import-meta-resolve.ts";

import { createRequire } from "module";
const require = createRequire(import.meta.url);
Expand All @@ -34,6 +34,7 @@ export function* loadPlugin(
name: string,
dirname: string,
): Handler<{ filepath: string; value: unknown }> {
debugger;
const filepath = resolvePlugin(name, dirname, yield* isAsync());

const value = yield* requireModule("plugin", filepath);
Expand Down Expand Up @@ -146,8 +147,8 @@ function tryRequireResolve(
}

function tryImportMetaResolve(
id: Parameters<ImportMeta["resolve"]>[0],
options: Parameters<ImportMeta["resolve"]>[1],
id: Parameters<typeof importMetaResolve>[0],
options: Parameters<typeof importMetaResolve>[1],
): Result<string> {
try {
return { error: null, value: importMetaResolve(id, options) };
Expand Down Expand Up @@ -180,6 +181,7 @@ function resolveStandardizedNameForImport(
const it = resolveAlternativesHelper(type, name);
let res = it.next();
while (!res.done) {
debugger;
res = it.next(tryImportMetaResolve(res.value, parentUrl));
}
return fileURLToPath(res.value);
Expand All @@ -196,6 +198,7 @@ function resolveStandardizedName(
}

try {
debugger;
return resolveStandardizedNameForImport(type, name, dirname);
} catch (e) {
try {
Expand Down

0 comments on commit 0da2406

Please sign in to comment.