more vite confi

iTwin · Dec 12, 2024 · 00efca2 · 00efca2
1 parent 21f5ea9
commit 00efca2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/packages/electron/src/integration-test/integration.test.ts b/packages/electron/src/integration-test/integration.test.ts
@@ -99,7 +99,9 @@ test("sign in successful", async ({ browser }) => {
   const page = await browser.newPage();
   await testHelper.checkStatus(electronPage, false);
   await testHelper.clickSignIn(electronPage);
-  await testHelper.signIn(page, await getUrl(electronApp));
+  const url = await getUrl(electronApp);
+  console.log(url);
+  await testHelper.signIn(page, url);
   await page.waitForLoadState("networkidle");
   await testHelper.checkStatus(electronPage, true);
   await page.close();

diff --git a/packages/electron/src/integration-test/test-app/renderer.ts b/packages/electron/src/integration-test/test-app/renderer.ts
@@ -4,7 +4,7 @@ if (!process.env.IMJS_TEST_ELECTRON_CLIENT_ID)
   throw new Error("Please provide a clientId in env");
 
 const auth = new ElectronRendererAuthorization({
-  clientId: process.env.IMJS_TEST_ELECTRON_CLIENT_ID,
+  clientId: process.env.IMJS_TEST_ELECTRON_CLIENT_ID
 });
 
 const signOutButton = document.getElementById("signOut");

diff --git a/packages/electron/src/integration-test/tsconfig.json b/packages/electron/src/integration-test/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "module": "node16",
-    "moduleResolution": "node16",
+    "module": "NodeNext",
+    "moduleResolution": "nodenext",
     "lib": ["DOM"],
     "target": "ES5",
     "skipLibCheck": true,
@@ -10,4 +10,4 @@
   },
   "include": ["./test-app/index.ts", "../renderer/ElectronPreload.ts"],
   "exclude": ["node_modules"]
-}
+}
diff --git a/packages/electron/vite.config.mts b/packages/electron/vite.config.mts
@@ -1,10 +1,15 @@
 
-import { defineConfig } from 'vite';
+import { defineConfig, loadEnv } from 'vite';
+const env = loadEnv("", process.cwd(), '');
 
 export default defineConfig({
   root: './src/integration-test/test-app',
   build: {
-    outDir: './dist/integration-test/test-app',
+    outDir: '../../../dist/integration-test/test-app',
     emptyOutDir: true,
   },
+  base: "./",
+  define: {
+    'process.env': env,
+  },
 });