Merge remote-tracking branch 'origin/main' into pre-prod/main

Author: aws-amplify-bot

.eslintrc.json

@@ -6,6 +6,10 @@
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint", "prettier"],
+  "parserOptions": {
+    "ecmaVersion": 2024,
+    "sourceType": "module"
+  },
   "rules": {
     "react-hooks/exhaustive-deps": "error",
     "@typescript-eslint/no-explicit-any": "warn",

.github/dependabot.yml

@@ -4,9 +4,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    allow:
-      # Allow updates for any packages starting with "@aws-amplify"
-      - dependency-name: "@aws-amplify*"
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)

package.json

@@ -15,7 +15,7 @@
     "@docsearch/react": "3",
     "ajv": "^8.16.0",
     "aws-amplify": "^6.0.9",
-    "next": "^14.2.25",
+    "next": "^14.2.30",
     "next-image-export-optimizer": "^1.18.0",
     "next-transpile-modules": "^9.0.0",
     "parse-imports": "^1.1.0",
@@ -39,10 +39,11 @@
     "@testing-library/user-event": "^13.5.0",
     "@types/fs-extra": "^9.0.1",
     "@types/jest": "^26.0.19",
-    "@types/node": "^12.12.9",
+    "@types/node": "^20.0.0",
     "@types/react": "^18.0.0",
     "@types/url-parse": "^1.4.3",
     "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
     "axios": "^1.11.0",
     "cheerio": "^1.0.0-rc.12",
     "classnames": "^2.3.2",
@@ -55,7 +56,6 @@
     "eslint-plugin-next": "^0.0.0",
     "eslint-plugin-prettier": "^5.0.1",
     "fs-extra": "^9.0.1",
-    "git-jiggy": "1.1.1",
     "husky": "^8.0.1",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
@@ -79,7 +79,7 @@
     "tiny-glob": "0.2.9",
     "ts-jest": "^29.1.2",
     "ts-node": "^8.5.0",
-    "typescript": "^4.9",
+    "typescript": "^5.3.0",
     "unist-util-visit": "^4.1.0"
   },
   "resolutions": {
@@ -92,13 +92,14 @@
     "cross-spawn": "^7.0.5",
     "semver": "7.5.2",
     "tough-cookie": "4.1.3",
-    "aws-cdk-lib": "2.80.0",
+    "aws-cdk-lib": "2.189.1",
     "@adobe/css-tools": "4.3.2",
     "follow-redirects": "^1.15.6",
     "sharp": "0.33.1",
     "ejs": "3.1.10",
     "braces": "^3.0.3",
-    "ws": "^8.17.1"
+    "ws": "^8.17.1",
+    "tmp": "^0.2.4"
   },
   "scripts": {
     "clean": "rm -rf node_modules yarn.lock",
@@ -120,5 +121,8 @@
     "lint": "next lint",
     "clean-references": "node tasks/clean-references.mjs"
   },
+  "overrides": {
+    "tmp": "^0.2.4"
+  },
   "packageManager": "[email protected]"
 }

src/directory/generateDirectory.mjs

@@ -2,15 +2,80 @@ import { promises as fs } from 'fs';
 import { fileURLToPath } from 'url';
 import { cwd } from 'node:process';
 import path from 'path';
+import { execFile } from 'child_process';
+import { promisify } from 'util';
 import JSON5 from 'json5';
 import { directory } from './directory.mjs';
 import { writeFile } from 'fs/promises';
-import { getLastModifiedDate } from 'git-jiggy';
 import { API_CATEGORIES, API_SUB_CATEGORIES } from '../data/api-categories.mjs';
 
+const execFileAsync = promisify(execFile);
+
 // Set up the root path so that we can get the correct path from the current working directory
 const rootPath = path.resolve(cwd(), 'src/pages');
 
+let gitDatesCache;
+
+/**
+ * Initializes and caches Git last-modified dates for files under `rootPath`.
+ * Executes:
+ *   git log --follow --name-only --pretty=format:%ct -- .
+ * The output is a sequence of lines like:
+ *   1625030400
+ *   src/pages/index.js
+ *   src/pages/about.js
+ *
+ * Parses lines of Unix timestamps and file paths, mapping each file to the ISO date
+ * of its most recent commit. Caches the result to avoid repeated Git invocations.
+ */
+async function initializeGitCache() {
+  if (gitDatesCache) return gitDatesCache;
+
+  try {
+    const { stdout } = await execFileAsync(
+      'git',
+      ['log', '--follow', '--name-only', '--pretty=format:%ct', '--', '.'],
+      { cwd: rootPath, maxBuffer: 50 * 1024 * 1024, timeout: 30000 }
+    );
+
+    const cache = new Map();
+    let currentDate;
+
+    for (const line of stdout.trim().split('\n')) {
+      if (/^\d+$/.test(line)) {
+        currentDate = new Date(Number(line) * 1000).toISOString();
+      } else if (line && !cache.has(line)) {
+        cache.set(line, currentDate);
+      }
+    }
+
+    gitDatesCache = cache;
+  } catch (err) {
+    console.warn(`Git operation failed: ${err.message}`);
+    gitDatesCache = new Map();
+  }
+
+  return gitDatesCache;
+}
+
+/**
+ * Retrieves the last modified date for a given file by looking it up
+ * in the cached Git dates map. Initializes the cache on first invocation.
+ *
+ * @param {string} filePath - Absolute path to the target file.
+ * @returns {Promise<string>} ISO 8601 date string of the last Git commit touching that file.
+ * @throws {Error} If no Git date is found for the given file.
+ */
+async function getLastModifiedDate(filePath) {
+  const cache = await initializeGitCache();
+
+  if (!cache.has(filePath)) {
+    throw new Error(`Git date not found for: ${filePath}`);
+  }
+
+  return cache.get(filePath);
+}
+
 /**
  * Helper function to use RegEx to grab the "meta" object
  * @param {string} filePath

src/directory/generateFlatDirectory.mjs

@@ -1,7 +1,7 @@
 import { fileURLToPath } from 'url';
 import path from 'path';
 import { writeFile } from 'fs/promises';
-import directory from './directory.json' assert { type: 'json' };
+import directory from './directory.json' with { type: 'json' };
 
 function flattenJSON(jsonObj, flattened = {}) {
   if (Array.isArray(jsonObj.children)) {

src/pages/_document.tsx

@@ -1,5 +1,6 @@
 import crypto from 'crypto';
 import Document, { Html, Head, Main, NextScript } from 'next/document';
+import { ALGOLIA_APP_ID } from '../constants/algolia';
 
 const cspHashOf = (text) => {
   const hash = crypto.createHash('sha256');
@@ -14,7 +15,8 @@ const ANALYTICS_CSP = {
       'https://aws.demdex.net',
       'https://dpm.demdex.net',
       'https://cm.everesttech.net',
-      '*.shortbread.aws.dev'
+      'https://prod.tools.shortbread.aws.dev',
+      'https://prod.log.shortbread.aws.dev'
     ],
     img: [
       'https://amazonwebservices.d2.sc.omtrdc.net',
@@ -23,8 +25,8 @@ const ANALYTICS_CSP = {
       'https://cm.everesttech.net'
     ],
     frame: ['https://aws.demdex.net', 'https://dpm.demdex.net'],
-    script: ['*.shortbread.aws.dev'],
-    style: ['*.shortbread.aws.dev']
+    script: ['https://prod.assets.shortbread.aws.dev'],
+    style: ['https://prod.assets.shortbread.aws.dev']
   },
   prod: {
     connect: [
@@ -71,7 +73,7 @@ const getCspContent = (context) => {
         ' '
       )} ${ANALYTICS_CSP.alpha.connect.join(
         ' '
-      )} https://*.algolia.net https://*.algolianet.com *.amazonaws.com;
+      )} https://${ALGOLIA_APP_ID}-dsn.algolia.net https://${ALGOLIA_APP_ID}-1.algolianet.com https://${ALGOLIA_APP_ID}-2.algolianet.com https://${ALGOLIA_APP_ID}-3.algolianet.com;
       img-src 'self' https://img.shields.io data: ${ANALYTICS_CSP.all.img.join(
         ' '
       )} ${ANALYTICS_CSP.alpha.img.join(' ')}; 
@@ -94,7 +96,7 @@ const getCspContent = (context) => {
       ' '
     )} ${ANALYTICS_CSP.prod.connect.join(
       ' '
-    )} https://*.algolia.net https://*.algolianet.com *.amazonaws.com;
+    )} https://${ALGOLIA_APP_ID}-dsn.algolia.net https://${ALGOLIA_APP_ID}-1.algolianet.com https://${ALGOLIA_APP_ID}-2.algolianet.com https://${ALGOLIA_APP_ID}-3.algolianet.com;
     img-src 'self' https://img.shields.io ${ANALYTICS_CSP.all.img.join(
       ' '
     )} ${ANALYTICS_CSP.prod.img.join(' ')};

src/pages/gen1/[platform]/tools/cli-legacy/overwrite-customize-resolvers/index.mdx

@@ -579,7 +579,7 @@ $util.toJson({
 
 Amazon OpenSearch domains can take a while to deploy. Take this time to read up on OpenSearch to see what capabilities you are about to unlock.
 
-[Getting Started with OpenSearch](https://opensearch.org/docs/opensearch/index/)
+[Getting Started with OpenSearch](https://docs.opensearch.org/latest/)
 
 - After the update is complete but before creating any objects, update your OpenSearch index mapping.
 

src/pages/gen1/[platform]/tools/cli-legacy/searchable-directive/index.mdx

@@ -99,12 +99,12 @@ The `filter` parameter in the search query has a searchable type field that corr
 
 - `eq` - which uses the OpenSearch keyword type to match for the exact term.
 - `ne` - this is the inverse operation of `eq`.
-- `matchPhrase` - searches using OpenSearch's [Match Phrase Query](https://opensearch.org/docs/opensearch/query-dsl/full-text/#match-phrase) to filter the documents in the search query.
-- `matchPhrasePrefix` - This uses OpenSearch's [Match Phrase Prefix Query](https://opensearch.org/docs/opensearch/query-dsl/full-text/#match-phrase-prefix) to filter the documents in the search query.
-- `multiMatch` - Corresponds to the OpenSearch [Multi Match Query](https://opensearch.org/docs/opensearch/query-dsl/full-text/#multi-match).
-- `exists` - Corresponds to the OpenSearch [Exists Query](https://opensearch.org/docs/opensearch/query-dsl/term/#exists).
-- `wildcard` - Corresponds to the OpenSearch [Wildcard Query](https://opensearch.org/docs/opensearch/query-dsl/term/#wildcards).
-- `regexp` - Corresponds to the OpenSearch [Regexp Query](https://opensearch.org/docs/opensearch/query-dsl/term/#regex).
+- `matchPhrase` - searches using OpenSearch's [Match Phrase Query](https://docs.opensearch.org/latest/query-dsl/full-text/match-phrase/) to filter the documents in the search query.
+- `matchPhrasePrefix` - This uses OpenSearch's [Match Phrase Prefix Query](https://docs.opensearch.org/latest/query-dsl/full-text/match-phrase-prefix/) to filter the documents in the search query.
+- `multiMatch` - Corresponds to the OpenSearch [Multi Match Query](https://docs.opensearch.org/latest/query-dsl/full-text/multi-match/).
+- `exists` - Corresponds to the OpenSearch [Exists Query](https://docs.opensearch.org/latest/query-dsl/term/exists/).
+- `wildcard` - Corresponds to the OpenSearch [Wildcard Query](https://docs.opensearch.org/latest/query-dsl/term/wildcard/).
+- `regexp` - Corresponds to the OpenSearch [Regexp Query](https://docs.opensearch.org/latest/query-dsl/term/regexp/).
 
 The `sort` parameter can be used to specify the order of the search results, can be ascending (`asc`) or descending (`desc`), if not specified ascending order is used.
 

src/pages/index.tsx

@@ -135,7 +135,7 @@ export default function Page() {
               query: { platform: DEFAULT_PLATFORM }
             }}
           >
-            Write TypeScript across your app&pos;s frontend and backend. Get
+            Write TypeScript across your app's frontend and backend. Get
             schema validation, dot completion, and end-to-end types while you
             code.
           </FeatureItem>

tsconfig.base.json

@@ -15,7 +15,7 @@
     "removeComments": true,
     "strict": true,
     "strictPropertyInitialization": false,
-    "target": "es2017"
+    "target": "ES2024"
   },
   "exclude": ["node_modules"]
 }