Merge branch 'main' into vitest-4-bump-and-test-fixes

Author: jescalada

experimental/li-cli/package-lock.json

@@ -29,6 +29,6 @@
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.16",
     "tslib": "^2.8.1",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3"
   }
 }

experimental/li-cli/package.json

@@ -202,8 +202,8 @@
     "tailwindcss": "^4.2.2",
     "ts-node": "^10.9.2",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.2",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.61.1",
     "vite": "^8.0.14",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^4.1.8"

package-lock.json

@@ -524,7 +524,7 @@ const handleConfigUpdate = async (newConfig: Configuration) => {
     const validatedConfig = Convert.toGitProxyConfig(JSON.stringify(newConfig));
 
     // 2. Get proxy module dynamically to avoid circular dependency
-    const proxy = (await import('../proxy')) as any;
+    const proxy = (await import('../proxy/index.js')) as any;
 
     // 3. Stop existing services
     await proxy.stop();
@@ -541,7 +541,7 @@ const handleConfigUpdate = async (newConfig: Configuration) => {
     handleErrorAndLog(error, 'Failed to apply new configuration');
     // Attempt to restart with previous config
     try {
-      const proxy = (await import('../proxy')) as any;
+      const proxy = (await import('../proxy/index.js')) as any;
       await proxy.start();
     } catch (startError: unknown) {
       handleErrorAndLog(startError, 'Failed to restart services');

package.json

@@ -48,7 +48,7 @@ const isKnownDefaultCredentialAttempt = (username: string, password: string): bo
 
 // Dynamic import to always get the current db module instance
 // This is necessary for test environments where modules may be reset
-const getDb = () => import('../../db');
+const getDb = () => import('../../db/index.js');
 
 export const configure = async (passport: PassportStatic): Promise<PassportStatic> => {
   passport.use(

src/config/index.ts

@@ -17,15 +17,15 @@
 import * as db from '../../db';
 import { PassportStatic } from 'passport';
 import { getAuthMethods } from '../../config';
-import { type UserInfoResponse } from 'openid-client';
+import type { UserInfoResponse } from 'openid-client';
+import type { Request } from 'express';
 import { handleErrorAndLog } from '../../utils/errors';
 
 export const type = 'openidconnect';
 
 export const configure = async (passport: PassportStatic): Promise<PassportStatic> => {
   // Use dynamic imports to avoid ESM/CommonJS issues
   const { discovery, fetchUserInfo } = await import('openid-client');
-  // @ts-expect-error - throws error due to missing type definitions
   const { Strategy } = await import('openid-client/passport');
 
   const authMethods = getAuthMethods();

src/service/passport/local.ts

@@ -0,0 +1,17 @@
+/**
+ * Copyright 2026 GitProxy Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+declare module '*.css';

src/service/passport/oidc.ts

@@ -5,11 +5,11 @@
     "allowJs": true,
     "checkJs": false,
     "jsx": "react-jsx",
-    "moduleResolution": "Node",
+    "moduleResolution": "nodenext",
     "strict": true,
     "skipLibCheck": true,
     "isolatedModules": false,
-    "module": "CommonJS",
+    "module": "NodeNext",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
@@ -20,7 +20,6 @@
     "rootDir": "./src",
     "noEmit": false,
     "types": ["node"],
-    "baseUrl": ".",
     "paths": {
       "@primer/react/experimental": ["./node_modules/@primer/react/dist/experimental/index"]
     }