Merge to main

package.json

@@ -23,26 +23,26 @@
     "@fortawesome/free-regular-svg-icons": "^6.7.2",
     "@fortawesome/free-solid-svg-icons": "^6.7.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
-    "@mui/icons-material": "^6.4.2",
+    "@mui/icons-material": "^6.4.5",
     "@mui/material": "^6.0.1",
-    "@octokit/auth-app": "^7.1.4",
-    "@octokit/core": "^6.1.3",
-    "@octokit/webhooks": "~13.4.3",
+    "@octokit/auth-app": "^7.1.5",
+    "@octokit/core": "^6.1.4",
+    "@octokit/webhooks": "~13.6.1",
     "core-js": "^3.39.0",
     "encoding": "^0.1.13",
     "figma-squircle": "^1.1.0",
     "install": "^0.13.0",
-    "ioredis": "^5.4.1",
+    "ioredis": "^5.5.0",
     "mobx": "^6.13.5",
     "next": "^15.1.6",
     "next-auth": "^5.0.0-beta.25",
-    "npm": "^10.9.0",
+    "npm": "^11.1.0",
     "nprogress": "^0.2.0",
-    "octokit": "^4.1.0",
+    "octokit": "^4.1.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "redis-semaphore": "^5.6.0",
-    "redoc": "^2.2.0",
+    "redoc": "^2.4.0",
     "sharp": "^0.33.5",
     "styled-components": "^6.1.13",
     "swagger-ui-react": "^5.17.14",
@@ -53,21 +53,21 @@
   },
   "devDependencies": {
     "@auth/pg-adapter": "^1.7.2",
+    "@tailwindcss/postcss": "^4.0.8",
     "@types/jest": "^29.5.12",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.13.5",
     "@types/nprogress": "^0.2.3",
     "@types/pg": "^8.11.10",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.0",
     "@types/swagger-ui-react": "^4.18.3",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
-    "autoprefixer": "^10.4.20",
-    "eslint": "^9.19.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.1",
+    "@typescript-eslint/parser": "^8.24.1",
+    "eslint": "^9.21.0",
     "eslint-config-next": "^15.1.6",
     "pg": "^8.13.1",
     "postcss": "^8.4.41",
-    "tailwindcss": "^3.4.13",
+    "tailwindcss": "^4.0.8",
     "ts-jest": "^29.2.5",
     "typescript": "^5.6.3"
   }

postcss.config.js

@@ -1,6 +1,5 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
+    '@tailwindcss/postcss': {},
   },
 }

src/app/api/remotes/[encodedRemoteConfig]/route.ts

@@ -55,7 +55,7 @@ export async function GET(_req: NextRequest, { params }: { params: Promise<Remot
     } else if (error.name === ErrorName.TIMEOUT) {
       return makeAPIErrorResponse(408, "The operation timed out.")
     } else if (error.name === ErrorName.NOT_JSON_OR_YAML) {
-      return makeAPIErrorResponse(400, "Url does not point to a JSON or YAML file.")
+      return makeAPIErrorResponse(400, error.message)
     } else if (error.name === ErrorName.URL_MAY_NOT_INCLUDE_BASIC_AITH) {
       return makeAPIErrorResponse(400, "Url may not include basic auth.")
     } else {

src/app/globals.css

@@ -1,6 +1,30 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss';
+
+@theme {
+  --background-image-gradient-radial: radial-gradient(var(--tw-gradient-stops));
+  --background-image-gradient-conic: conic-gradient(
+    from 180deg at 50% 50%,
+    var(--tw-gradient-stops)
+  );
+}
+
+/*
+  The default border color has changed to `currentColor` in Tailwind CSS v4,
+  so we've added these compatibility styles to make sure everything still
+  looks the same as it did with Tailwind CSS v3.
+
+  If we ever want to remove these styles, we need to add an explicit border
+  color utility to any element that depends on these defaults.
+*/
+@layer base {
+  *,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    border-color: var(--color-gray-200, currentColor);
+  }
+}
 
 html, body {
   height: 100%;

src/common/utils/fileUtils.ts

@@ -66,7 +66,7 @@ export function checkIfJsonOrYaml(fileText: string) {
     try {
         parseYaml(fileText) // will also parse JSON as it is a subset of YAML
     } catch {
-        const error = new Error("File is not JSON or YAML")
+        const error = new Error("File is not JSON or YAML. Content: " + fileText.slice(0, 1000));
         error.name = ErrorName.NOT_JSON_OR_YAML
         throw error
     }

src/features/projects/data/GitHubProjectDataSource.ts

@@ -242,7 +242,7 @@ export default class GitHubProjectDataSource implements IProjectDataSource {
         password: this.encryptionService.decrypt(projectConfigRemoteSpec.auth.encryptedPassword)
       }
     } catch (error) {
-      console.error(`Failed to decrypt remote specification auth for ${projectConfigRemoteSpec.url}. Perhaps a different public key was used?:`, error);
+      console.info(`Failed to decrypt remote specification auth for ${projectConfigRemoteSpec.name} (${projectConfigRemoteSpec.url}). Perhaps a different public key was used?:`, error);
       return undefined
     }
   }