Fix circular import issue

cloudflare · May 6, 2024 · a7b8f61 · a7b8f61
1 parent 74ba19f
commit a7b8f61
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/pyodide/internal/metadata.js b/src/pyodide/internal/metadata.js
@@ -16,3 +16,4 @@ export const MEMORY_SNAPSHOT_READER = MetadataReader.hasMemorySnapshot()
   : ArtifactBundler.hasMemorySnapshot()
     ? ArtifactBundler
     : undefined;
+export let LOADED_SNAPSHOT_VERSION = undefined;
diff --git a/src/pyodide/internal/snapshot.js b/src/pyodide/internal/snapshot.js
@@ -11,6 +11,7 @@ import {
   SHOULD_SNAPSHOT_TO_DISK,
   IS_CREATING_BASELINE_SNAPSHOT,
   MEMORY_SNAPSHOT_READER,
+  LOADED_SNAPSHOT_VERSION,
 } from "pyodide-internal:metadata";
 import { reportError, simpleRunPython } from "pyodide-internal:util";
 
@@ -320,7 +321,6 @@ export function maybeSetupSnapshotUpload(Module) {
 const SNAPSHOT_MAGIC = 0x706e7300;
 const CREATE_SNAPSHOT_VERSION = 2;
 const HEADER_SIZE = 4 * 4;
-export let LOADED_SNAPSHOT_VERSION = undefined;
 
 /**
  * Encode heap and dsoJSON into the memory snapshot artifact that we'll upload

diff --git a/src/pyodide/internal/topLevelEntropy/lib.js b/src/pyodide/internal/topLevelEntropy/lib.js
@@ -10,8 +10,7 @@
 import { default as entropyPatches } from "pyodide-internal:topLevelEntropy/entropy_patches.py";
 import { default as entropyImportContext } from "pyodide-internal:topLevelEntropy/entropy_import_context.py";
 import { default as importPatchManager } from "pyodide-internal:topLevelEntropy/import_patch_manager.py";
-import { IS_TRACING } from "pyodide-internal:metadata";
-import { LOADED_SNAPSHOT_VERSION } from "pyodide-internal:snapshot";
+import { IS_TRACING, LOADED_SNAPSHOT_VERSION } from "pyodide-internal:metadata";
 import { simpleRunPython } from "pyodide-internal:util";
 
 // TODO: When we've updated all the snapshots, remove this.