E2E: Fix running with ts-loader

Signed-off-by: Mark Yen <[email protected]>
rancher-sandbox · Jul 15, 2024 · 313e893 · 313e893
1 parent f858fa1
commit 313e893
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/pkg/rancher-desktop/utils/testUtils/setupElectron.ts b/pkg/rancher-desktop/utils/testUtils/setupElectron.ts
@@ -6,15 +6,17 @@
 
 import path from 'path';
 
-jest.mock('electron', () => {
-  return {
-    __esModule: true,
-    default:    {
-      app: {
-        isPackaged: false,
-        getAppPath: () => path.resolve('.'),
+if ('jest' in globalThis && 'mock' in jest) {
+  jest.mock('electron', () => {
+    return {
+      __esModule: true,
+      default:    {
+        app: {
+          isPackaged: false,
+          getAppPath: () => path.resolve('.'),
+        },
+        ipcMain: {},
       },
-      ipcMain: {},
-    },
-  };
-});
+    };
+  });
+}
diff --git a/pkg/rancher-desktop/vue.config.js b/pkg/rancher-desktop/vue.config.js
@@ -27,7 +27,11 @@ module.exports = {
       .test(/\.ts$/)
       .use('ts-loader')
       .loader('ts-loader')
-      .options({ transpileOnly: process.env.NODE_ENV === 'development' });
+      .options({
+        transpileOnly:    process.env.NODE_ENV === 'development',
+        appendTsSuffixTo: ['\\.vue$'],
+        happyPackMode:    true,
+      });
 
     config.module.rule('yaml')
       .test(/\.ya?ml(?:\?[a-z0-9=&.]+)?$/)
@@ -49,6 +53,12 @@ module.exports = {
         featureExtensions:       true,
       }),
     }]);
+
+    config.module.rule('vue').use('vue-loader').tap((options) => {
+      _.set(options, 'loaders.ts', 'ts-loader');
+
+      return options;
+    });
   },
 
   css: {

diff --git a/pkg/rancher-desktop/window/index.ts b/pkg/rancher-desktop/window/index.ts
@@ -468,11 +468,7 @@ export function openDialog(id: string, opts?: Electron.BrowserWindowConstructorO
     }
   });
 
-  if (Shortcuts.isRegistered(window)) {
-    return window;
-  }
-
-  if (escapeKey) {
+  if (!Shortcuts.isRegistered(window) && escapeKey) {
     Shortcuts.register(
       window,
       { key: 'Escape' },