Skip to content

Commit

Permalink
chore: remove import.meta.resolve from vite-node deps
Browse files Browse the repository at this point in the history
  • Loading branch information
sheremet-va committed Jun 19, 2023
1 parent 9aa60e6 commit d3070fb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
1 change: 0 additions & 1 deletion packages/vite-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
"devDependencies": {
"@jridgewell/trace-mapping": "^0.3.18",
"@types/debug": "^4.1.7",
"import-meta-resolve": "^2.2.2",
"rollup": "^2.79.1"
}
}
12 changes: 6 additions & 6 deletions packages/vitest/src/runtime/external-executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,17 @@ export class ExternalModulesExecutor {
return `module.exports = ${code}`
}

importModuleDynamically = async (specifier: string, referencer: VMModule) => {
public importModuleDynamically = async (specifier: string, referencer: VMModule) => {
const module = await this.resolveModule(specifier, referencer)
return this.evaluateModule(module)
}

resolveModule = async (specifier: string, referencer: VMModule) => {
private resolveModule = async (specifier: string, referencer: VMModule) => {
const identifier = await this.resolveAsync(specifier, referencer.identifier)
return await this.createModule(identifier)
}

async resolveAsync(specifier: string, parent: string) {
private async resolveAsync(specifier: string, parent: string) {
return resolveModule(specifier, parent)
}

Expand All @@ -146,7 +146,7 @@ export class ExternalModulesExecutor {
return m
}

async evaluateModule<T extends VMModule>(m: T): Promise<T> {
private async evaluateModule<T extends VMModule>(m: T): Promise<T> {
if (m.status === 'unlinked') {
this.esmLinkMap.set(
m,
Expand Down Expand Up @@ -233,7 +233,7 @@ export class ExternalModulesExecutor {
}
}

async createEsmModule(fileUrl: string, code: string) {
private async createEsmModule(fileUrl: string, code: string) {
const cached = this.moduleCache.get(fileUrl)
if (cached)
return cached
Expand Down Expand Up @@ -275,7 +275,7 @@ export class ExternalModulesExecutor {
return code.match(/data:text\/javascript;.*,(.*)/)?.[1]
}

async createModule(identifier: string): Promise<VMModule> {
private async createModule(identifier: string): Promise<VMModule> {
const extension = extname(identifier)

if (extension === '.node' || isNodeBuiltin(identifier)) {
Expand Down
14 changes: 6 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d3070fb

Please sign in to comment.