Fix dynamic import of atmosphere as top level await not allowed

Env should be optional for other frameworks Fixes #2867
vaadin · Nov 13, 2024 · 3ba43b0 · 3ba43b0
1 parent 33b8cc7
commit 3ba43b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/ts/frontend/src/FluxConnection.ts b/packages/ts/frontend/src/FluxConnection.ts
@@ -71,14 +71,15 @@ type EndpointInfo = {
   reconnect?(): ActionOnLostSubscription | void;
 };
 
-const initAtmosphere = async () => {
-  if (!import.meta.env.VITE_SW_CONTEXT) {
-    return await import('atmosphere.js').then((module) => module.default);
-  }
-  return undefined;
-};
+let atmosphere: Atmosphere.Atmosphere | undefined;
 
-const atmosphere: Atmosphere.Atmosphere | undefined = await initAtmosphere();
+(async () => {
+  if (!import.meta.env?.VITE_SW_CONTEXT) {
+    atmosphere = await import('atmosphere.js').then((module) => module.default);
+  }
+})().catch((e) => {
+  console.error('Failed to load atmosphere.js', e);
+});
 
 /**
  * A representation of the underlying persistent network connection used for subscribing to Flux type endpoint methods.

diff --git a/packages/ts/frontend/src/vite-env.d.ts b/packages/ts/frontend/src/vite-env.d.ts
@@ -6,5 +6,5 @@ interface ImportMetaEnv {
 }
 
 interface ImportMeta {
-  readonly env: ImportMetaEnv;
+  readonly env?: ImportMetaEnv;
 }