undid config globalSetup

Moonsong-Labs · Nov 16, 2023 · 0937884 · 0937884
1 parent f19044d
commit 0937884
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 27 deletions.
diff --git a/packages/cli/src/cmds/runTests.ts b/packages/cli/src/cmds/runTests.ts
@@ -18,18 +18,6 @@ import {
   runNetworkOnly as legacyRunNetworkOnly,
   contextCreator,
 } from "../lib/globalContext";
-import { fileURLToPath } from "url";
-
-let __dirname;
-
-if (typeof import.meta.url !== "undefined") {
-  // ESM environment
-  __dirname = path.dirname(fileURLToPath(import.meta.url));
-} else {
-  // CJS environment
-  // eslint-disable-next-line no-self-assign
-  __dirname = __dirname;
-}
 
 export const testEffect = (envName: string, additionalArgs?: object) => {
   return Effect.gen(function* (_) {
@@ -166,7 +154,6 @@ export const executeTestEffect = (env: Environment, additionalArgs?: object) =>
     const baseOptions = {
       watch: false,
       globals: true,
-      setupFiles: [path.join(__dirname, "internal/vitestSetup.js")],
       reporters: env.reporters ? env.reporters : ["default"],
       outputFile: env.reportFile,
       testTimeout: env.timeout || globalConfig.defaultTestTimeout,

diff --git a/packages/cli/src/internal/vitestSetup.ts b/packages/cli/src/internal/vitestSetup.ts
diff --git a/packages/cli/src/lib/configReader.ts b/packages/cli/src/lib/configReader.ts
@@ -69,10 +69,6 @@ export function isEthereumDevConfig(): boolean {
 }
 
 export function importJsonConfig(): MoonwallConfig {
-  if (globalThis.config) {
-    return replaceEnvVars(globalThis.config);
-  }
-
   const configPath = process.env.MOON_CONFIG_PATH!;
   const filePath = path.isAbsolute(configPath) ? configPath : path.join(process.cwd(), configPath);
 
@@ -87,10 +83,6 @@ export function importJsonConfig(): MoonwallConfig {
 }
 
 export async function importAsyncConfig() {
-  if (globalThis.config) {
-    return replaceEnvVars(globalThis.config);
-  }
-
   const configPath = process.env.MOON_CONFIG_PATH!;
   const filePath = path.isAbsolute(configPath) ? configPath : path.join(process.cwd(), configPath);
 

diff --git a/packages/cli/src/lib/globalContextEffect.ts b/packages/cli/src/lib/globalContextEffect.ts
@@ -505,6 +505,9 @@ export class MoonwallContext {
 
 export const createContextEffect = () =>
   Effect.gen(function* (_) {
+    // console.log("globalThis.config", globalThis.config.length);
+    // console.dir(globalThis.config, { depth: 1 })
+
     const config = yield* _(
       Effect.tryPromise({
         try: () => importAsyncConfig(),