rename from esm modules to esm packages

iterative · May 11, 2023 · 3094ba8 · 3094ba8
1 parent bc1c230
commit 3094ba8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/extension/src/extension.ts b/extension/src/extension.ts
@@ -50,7 +50,7 @@ import { DvcViewer } from './cli/dvc/viewer'
 import { registerSetupCommands } from './setup/register'
 import { Status } from './status'
 import { registerPersistenceCommands } from './persistence/register'
-import { esmModulesImported } from './util/esm'
+import { esmPackagesImported } from './util/esm'
 
 class Extension extends Disposable {
   protected readonly internalCommands: InternalCommands
@@ -305,7 +305,7 @@ class Extension extends Disposable {
 let extension: undefined | Extension
 
 export async function activate(context: ExtensionContext): Promise<void> {
-  await esmModulesImported
+  await esmPackagesImported
   extension = new Extension(context)
   context.subscriptions.push(extension)
 }

diff --git a/extension/src/python/index.ts b/extension/src/python/index.ts
@@ -4,7 +4,7 @@ import { getProcessPlatform } from '../env'
 import { exists } from '../fileSystem'
 import { Logger } from '../common/logger'
 import { createProcess, executeProcess, Process } from '../process/execution'
-import { esmModulesImported } from '../util/esm'
+import { esmPackagesImported } from '../util/esm'
 
 const sendOutput = (process: Process) => {
   process.all?.on('data', chunk =>
@@ -35,7 +35,7 @@ export const setupTestVenv = async (
   envDir: string,
   ...installArgs: string[]
 ) => {
-  await esmModulesImported
+  await esmPackagesImported
   if (!exists(join(cwd, envDir))) {
     const initVenv = createProcess({
       args: ['-m', 'venv', envDir],

diff --git a/extension/src/test/suite/cli/child.ts b/extension/src/test/suite/cli/child.ts
@@ -4,16 +4,16 @@ import { delay } from '../../../util/time'
 
 require('../../../vscode/mockModule')
 
-const importModuleAfterMockingVsCode = () => {
+const importModuleAfterMockingVsCode = async () => {
   const { Cli } = require('../../../cli')
-  const { esmModulesImported } = require('../../../util/esm')
-  return { Cli, esmModulesImported }
+  const { esmPackagesImported } = require('../../../util/esm')
+  await esmPackagesImported
+  return { Cli }
 }
 
 const main = async () => {
-  const { Cli, esmModulesImported } = importModuleAfterMockingVsCode()
+  const { Cli } = await importModuleAfterMockingVsCode()
 
-  await esmModulesImported
   const cli = new Cli()
 
   const options = getOptions('background')

diff --git a/extension/src/util/esm.ts b/extension/src/util/esm.ts
@@ -1,7 +1,7 @@
 import { Deferred } from '@hediet/std/synchronization'
 
 const deferred = new Deferred()
-export const esmModulesImported = deferred.promise
+export const esmPackagesImported = deferred.promise
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
@@ -14,7 +14,7 @@ const shouldImportEsm = !process.env.JEST_WORKER_ID
 
 let execa: EsmExeca
 let doesProcessExist: EsmProcessExists
-const importEsmModules = async () => {
+const importEsmPackages = async () => {
   const [{ execa: esmExeca }, { processExists: esmProcessExists }] =
     await Promise.all([import('execa'), import('process-exists')])
   execa = esmExeca
@@ -23,7 +23,7 @@ const importEsmModules = async () => {
 }
 
 if (shouldImportEsm) {
-  void importEsmModules()
+  void importEsmPackages()
 }
 
 export { execa, doesProcessExist }