Merge branch 'google:master' into master

Author: rfontanarosa

.github/workflows/jekyll-gh-pages.yml

@@ -1,53 +1,51 @@
+# Copyright 2025 The Ground Authors.
+#
+# 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
+#
+#     https://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.
+
 # Sample workflow for building and deploying a Jekyll site to GitHub Pages
-name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+name: Deploy GitHub Pages
 
 on:
   # Runs on pushes targeting the default branch
   push:
     branches: ["master"]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+    
 permissions:
   contents: read
   pages: write
   id-token: write
 
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
 jobs:
-  # Build job
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Pages
         uses: actions/configure-pages@v5
-      - name: Build with Jekyll
+      - name: Build
         uses: actions/jekyll-build-pages@v1
         with:
-          source: ./docs
-          destination: ./_site
+          source: "./docs"
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
-
-  # Deployment job
   deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     needs: build
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: ./_site
+        uses: actions/deploy-pages@v4
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}

functions/.eslintrc.json

@@ -8,6 +8,6 @@
   },
   "root": true,
   "rules": {
-    "eqeqeq": ["error", "always", {"null": "ignore"}]    
+    "eqeqeq": ["error", "always", {"null": "ignore"}]
   }
 }

functions/package.json

@@ -42,7 +42,7 @@
     "nodemailer": "^6.9.16",
     "requests": "0.3.0",
     "sanitize-html": "^2.13.1",
-    "ts-node": "^10.9.1"
+    "ts-node": "^10.9.2"
   },
   "engines": {
     "node": "20"
@@ -68,7 +68,7 @@
     "prettier": "^2.8.1",
     "source-map-support": "^0.5.21",
     "ts-mocha": "^10.0.0",
-    "typescript": "4.8.4",
+    "typescript": "^5.7.3",
     "wkt": "0.1.1"
   },
   "type": "commonjs"

functions/src/handlers.ts

@@ -76,8 +76,8 @@ export function onHttpsRequest(handler: HttpsRequestHandler) {
   return https.onRequest((req: https.Request, res: Response) =>
     corsMiddleware(req, res, () =>
       cookieParser()(
-        req,
-        res,
+        req as any,
+        res as any,
         async () =>
           await requireIdToken(req, res, async (idToken: DecodedIdToken) => {
             try {
@@ -158,8 +158,8 @@ export function onHttpsRequestAsync(callback: HttpsRequestCallback) {
   return https.onRequest((req: https.Request, res: Response) =>
     corsMiddleware(req, res, () =>
       cookieParser()(
-        req,
-        res,
+        req as any,
+        res as any,
         async () =>
           await requireIdToken(req, res, async (idToken: DecodedIdToken) => {
             await invokeCallbackAsync(callback, req, res, idToken);

functions/src/testing/http-test-helpers.ts

@@ -17,6 +17,7 @@
 import functions from 'firebase-functions';
 import {buffer} from 'node:stream/consumers';
 import {FormDataEncoder} from 'form-data-encoder';
+import {FormData} from 'formdata-node';
 
 export async function createPostRequestSpy(
   args: object,

lib/.eslintrc.json

@@ -3,12 +3,12 @@
   "env": {
     "jasmine": true
   },
-  "root": true,
   "parser": "@typescript-eslint/parser",
   "plugins": [
     "eslint-plugin-absolute-imports"
   ],
+  "root": true,
   "rules": {
-    "eqeqeq": ["error", "always", {"null": "ignore"}]    
+    "eqeqeq": ["error", "always", {"null": "ignore"}]
   }
 }

lib/package.json

@@ -41,7 +41,7 @@
     "diff": "^5.2.0",
     "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-prettier": "^4.2.1",
     "gts": "^5.3.0",
     "jasmine": "^5.1.0",
@@ -51,6 +51,6 @@
     "source-map-support": "^0.5.21",
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "4.8.4"
+    "typescript": "^5.4.5"
   }
 }