diff --git a/client/src/entry/analysis/index.ts b/client/src/entry/analysis/index.ts
index e33eada15d3..44c179dac9f 100644
--- a/client/src/entry/analysis/index.ts
+++ b/client/src/entry/analysis/index.ts
@@ -11,7 +11,7 @@ Vue.use(PiniaVuePlugin);
 const pinia = createPinia();
 pinia.use(piniaPluginPersistedstate);
 
-addInitialization((Galaxy) => {
+addInitialization((Galaxy: any) => {
     console.log("App setup");
     const router = getRouter(Galaxy);
     new Vue({
diff --git a/client/tsconfig.json b/client/tsconfig.json
index d6db865cceb..083452f8105 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -30,10 +30,12 @@
     "baseUrl": "./src",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
-    "types": [
-      // "webpack-env"
-    ],                                      /* Specify type package names to be included without being referenced in a source file. */
+    "typeRoots": [
+      "./types"
+    ],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
+    // "types": [
+    //   // "webpack-env"
+    // ],                                      /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "resolveJsonModule": true,                        /* Enable importing .json files */
     // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
@@ -101,7 +103,7 @@
     "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
   },
   "include": [
-    "shim-vue.d.ts",
+    "types/*.d.ts",
     "src/**/*.ts",
     "src/**/*.tsx",
     "src/**/*.vue",
diff --git a/client/shim-vue.d.ts b/client/types/shim-vue.d.ts
similarity index 100%
rename from client/shim-vue.d.ts
rename to client/types/shim-vue.d.ts
diff --git a/client/types.d.ts b/client/types/types.d.ts
similarity index 100%
rename from client/types.d.ts
rename to client/types/types.d.ts
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 19723bd8791..5d67bb86834 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -90,17 +90,17 @@ module.exports = (env = {}, argv = {}) => {
                     test: /\.vue$/,
                     loader: "vue-loader",
                 },
-                {
-                    test: /\.mjs$/,
-                    include: /node_modules/,
-                    type: "javascript/auto",
-                },
                 {
                     test: /\.tsx?$/,
                     exclude: /node_modules/,
                     loader: "ts-loader",
                     options: { appendTsSuffixTo: [/\.vue$/] },
                 },
+                {
+                    test: /\.mjs$/,
+                    include: /node_modules/,
+                    type: "javascript/auto",
+                },
                 {
                     test: `${libsBase}/jquery.custom.js`,
                     loader: "expose-loader",