chore(next-release/main): merge in latest from main

.github/workflows/check_bundle_size.yml

@@ -0,0 +1,72 @@
+name: Check Bundle Size
+on:
+  pull_request:
+    branches: [main]
+jobs:
+  checkBundleSizeChange:
+    permissions:
+      pull-requests: read
+    name: Check whether PR increases bundle size more than 5%
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main branch
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 https://github.com/actions/checkout/commit/f43a0e5ff2bd294095638e18286ca9a3d1956744
+        with:
+          ref: main
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 https://github.com/actions/setup-node/commit/5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
+        with:
+          node-version: 16.x
+      - name: Install dependencies
+        run: yarn
+      - name: Run build and analyze base bundle sizes
+        env:
+          CURRENT_BRANCH: ${{ github.base_ref }}
+          CURRENT_REPO: ${{ github.repository }}
+          NODE_OPTIONS: --max_old_space_size=4096
+        run: ANALYZE=true yarn next-build
+      - name: Check base bundle size of select pages
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1 https://github.com/actions/github-script/commit/d7906e4ad0b1822421a7e6a35d5ca353c962f410
+        id: base-bundle-sizes
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { checkBundleSize } = require('./.github/workflows/scripts/check_bundle_size.js');
+            return checkBundleSize();
+      - name: Checkout PR branch
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 https://github.com/actions/checkout/commit/f43a0e5ff2bd294095638e18286ca9a3d1956744
+        with:
+          ref: ${{ github.head_ref }}
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v.3.8.1 https://github.com/actions/setup-node/commit/5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
+        with:
+          node-version: 16.x
+      - name: Install dependencies
+        run: yarn
+      - name: Run build and analyze head bundle sizes
+        env:
+          CURRENT_BRANCH: ${{ github.head_ref }}
+          CURRENT_REPO: ${{ github.repository }}
+          NODE_OPTIONS: --max_old_space_size=4096
+        run: ANALYZE=true yarn next-build
+      - name: Check head bundle size of select pages
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1 https://github.com/actions/github-script/commit/d7906e4ad0b1822421a7e6a35d5ca353c962f410
+        id: head-bundle-sizes
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { checkBundleSize } = require('./.github/workflows/scripts/check_bundle_size.js');
+            return checkBundleSize();
+      - name: Compare bundle page bundle sizes
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1 https://github.com/actions/github-script/commit/d7906e4ad0b1822421a7e6a35d5ca353c962f410
+        id: compare-bundles
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { compareBundles } = require('./.github/workflows/scripts/check_bundle_size.js');
+            const baseBundles = ${{ steps.base-bundle-sizes.outputs.result }}
+            const headBundles = ${{ steps.head-bundle-sizes.outputs.result }}
+            return await compareBundles(baseBundles, headBundles)
+      - name: Fail if bundle size growth exceeds 5% on any of the selected pages
+        if: ${{ steps.compare-bundles.outputs.result > 0 }}
+        run: exit 1

.github/workflows/check_for_broken_links.yml

@@ -24,8 +24,8 @@ jobs:
         with:
           result-encoding: string
           script: |
-            const { checkLinks } = require('./tasks/link-checker.js');
-            return await checkLinks();
+            const { checkProdLinks } = require('./tasks/link-checker.js');
+            return await checkProdLinks();
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2.2.0
         with:

.github/workflows/check_pr_for_broken_links.yml

@@ -0,0 +1,36 @@
+name: CheckPRLinks
+on:
+  pull_request:
+    branches: [main]
+    types: [opened, synchronize]
+jobs:
+  CheckPRLinks:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 https://github.com/actions/checkout/commit/f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 https://github.com/actions/setup-node/commit/e33196f7422957bea03ed53f6fbb155025ffc7b8
+        with:
+          node-version: 16.x
+      - name: Install Dependencies
+        run: yarn
+      - name: Run Build
+        run: yarn build
+        env:
+          NODE_OPTIONS: --max_old_space_size=4096
+      - name: Run Server
+        run: |
+          node ./node_modules/.bin/serve client/www/next-build --no-request-logging &
+          sleep 5
+      - name: Run Link Checker
+        id: checkLinks
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1 https://github.com/actions/github-script/commit/d7906e4ad0b1822421a7e6a35d5ca353c962f410
+        with:
+          result-encoding: string
+          script: |
+            const { checkDevLinks } = require('./tasks/link-checker.js');
+            return await checkDevLinks();
+      - name: Fail if broken links have been found
+        if: ${{ steps.checkLinks.outputs.result }}
+        run: exit 1

.github/workflows/scripts/check_bundle_size.js

@@ -0,0 +1,47 @@
+module.exports = {
+  checkBundleSize: () => {
+    const fs = require('fs');
+    const jsonString = fs.readFileSync('.github/analyze/bundles.json');
+    const data = JSON.parse(jsonString);
+    const pagesToCheck = [
+      '/',
+      '/cli/start/install',
+      '/lib/auth/getting-started/q/platform/[platform]',
+      '/start',
+      '/cli'
+    ];
+    const bundleSizes = [];
+    data.pages.filter((page) => {
+      if (pagesToCheck.includes(page.label)) {
+        bundleSizes.push({
+          page: page.label,
+          gzipSize: page.gzipSize,
+          parsedSize: page.parsedSize,
+          statSize: page.statSize,
+          totalGzipSize: page.totalGzipSize,
+          totalParsedSize: page.totalParsedSize,
+          totalStatSize: page.totalStatSize
+        });
+      }
+    });
+    return bundleSizes;
+  },
+
+  compareBundles: (baseBundles, headBundles) => {
+    const fails = [];
+    baseBundles.forEach((basePage) => {
+      headBundles.forEach((headPage) => {
+        if (
+          basePage.page == headPage.page &&
+          basePage.parsedSize * 1.05 < headPage.parsedSize
+        ) {
+          fails.push(basePage.page);
+        }
+      });
+    });
+    console.log(
+      `The bundle size of ${fails} increased by more than 5% with this PR`
+    );
+    return fails.length;
+  }
+};

cspell.json

@@ -1522,7 +1522,9 @@
     "cloudwatchlogs",
     "userids",
     "xmark",
-    "refreshable"
+    "refreshable",
+    "querytransfers",
+    "generatemodelsforlazyloadandcustomselectionset"
   ],
   "flagWords": ["hte", "full-stack", "Full-stack", "Full-Stack", "sudo"],
   "patterns": [

customHttp.yml

@@ -13,5 +13,5 @@ customHeaders:
       - key: 'X-Content-Type-Options'
         value: 'nosniff'
       - key: 'Content-Security-Policy'
-        value: "upgrade-insecure-requests; default-src 'none'; prefetch-src 'self'; style-src 'self' 'unsafe-inline' *.shortbread.aws.dev; font-src 'self'; frame-src 'self' https://www.youtube-nocookie.com https://aws.demdex.net https://dpm.demdex.net; connect-src 'self' *.shortbread.aws.dev https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/ https://d2c.aws.amazon.com https://vs.aws.amazon.com https://*.algolia.net https://*.algolianet.com *.amazonaws.com https://aws.amazon.com/ https://d2c-alpha.dse.marketing.aws.a2z.com https://aws-mktg-csds-alpha.integ.amazon.com/ https://alpha.d2c.marketing.aws.dev/ https://aa0.awsstatic.com/; img-src 'self' https://img.shields.io https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/ https://alpha.d2c.marketing.aws.dev/ https://aa0.awsstatic.com/; media-src 'self'; script-src 'self' *.shortbread.aws.dev https://a0.awsstatic.com/ https://aa0.awsstatic.com/ https://alpha.d2c.marketing.aws.dev/ https://d2c.aws.amazon.com/;"
+        value: "upgrade-insecure-requests; default-src 'none'; style-src 'self' 'unsafe-inline' *.shortbread.aws.dev; font-src 'self'; frame-src 'self' https://www.youtube-nocookie.com https://aws.demdex.net https://dpm.demdex.net; connect-src 'self' *.shortbread.aws.dev https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/ https://d2c.aws.amazon.com https://vs.aws.amazon.com https://*.algolia.net https://*.algolianet.com *.amazonaws.com https://aws.amazon.com/ https://d2c-alpha.dse.marketing.aws.a2z.com https://aws-mktg-csds-alpha.integ.amazon.com/ https://alpha.d2c.marketing.aws.dev/ https://aa0.awsstatic.com/; img-src 'self' https://img.shields.io https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/ https://alpha.d2c.marketing.aws.dev/ https://aa0.awsstatic.com/; media-src 'self'; script-src 'self' *.shortbread.aws.dev https://a0.awsstatic.com/ https://aa0.awsstatic.com/ https://alpha.d2c.marketing.aws.dev/ https://d2c.aws.amazon.com/;"
       # CSP also set in _document.tsx meta tag

generatePathMap.cjs.js

@@ -67,6 +67,9 @@ function generatePathMap(
     '/lib-v1/q/platform/js': {
       page: '/lib-v1/q/platform/[platform]'
     },
+    '/lib-v1/q/platform/react-native': {
+      page: '/lib-v1/q/platform/[platform]'
+    },
     '/sdk/q/platform/js': {
       page: '/sdk/q/platform/[platform]'
     },
@@ -79,6 +82,9 @@ function generatePathMap(
     '/sdk/q/platform/flutter': {
       page: '/sdk/q/platform/[platform]'
     },
+    '/sdk/q/platform/react-native': {
+      page: '/sdk/q/platform/[platform]'
+    },
     '/console': {
       page: '/console'
     },
@@ -120,19 +126,6 @@ function generatePathMap(
       } else if (route.startsWith('/start')) {
         filterKind = 'integration';
       }
-
-      if (filterKind !== '') {
-        const aOrAn = 'aeiou'.includes(filterKind[0]) ? 'an' : 'a';
-        pathMap[route] = {
-          page: '/ChooseFilterPage',
-          query: {
-            address: route,
-            directoryPath: '/ChooseFilterPage',
-            filterKind: filterKind,
-            message: `Choose ${aOrAn} ${filterKind}:`
-          }
-        };
-      }
     }
 
     if (items) {
@@ -202,17 +195,6 @@ function generatePathMap(
         page: `${route}/q/${routeType}/[${routeType}]`
       };
     });
-    const aOrAn = 'aeiou'.includes(routeType[0]) ? 'an' : 'a';
-    pathMap[route] = {
-      page: '/ChooseFilterPage',
-      query: {
-        address: route,
-        directoryPath: '/ChooseFilterPage',
-        filterKind: routeType,
-        filters: filters,
-        message: `Choose ${aOrAn} ${routeType}:`
-      }
-    };
   }
   return pathMap;
 }

next.config.mjs

@@ -16,7 +16,9 @@ export default async () => {
     }
   });
 
-  const nextConfig = withMDX({
+  const shouldAnalyzeBundles = process.env.ANALYZE === 'true';
+
+  let nextConfig = withMDX({
     env: {
       BUILD_ENV: process.env.BUILD_ENV,
       nextImageExportOptimizer_imageFolderPath: 'public',
@@ -75,5 +77,20 @@ export default async () => {
       ];
     }
   });
+
+  if (shouldAnalyzeBundles) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const withNextBundleAnalyzer = require('next-bundle-analyzer')({
+      format: ['json'],
+      reportDir: '../.github/analyze',
+      json: {
+        filter: {
+          pages: true
+        }
+      }
+    });
+    nextConfig = withNextBundleAnalyzer(nextConfig);
+  }
+
   return nextConfig;
 };

package.json

@@ -15,7 +15,7 @@
     "@algolia/autocomplete-shared": "^1.5.6",
     "@algolia/autocomplete-theme-classic": "^1.6.1",
     "@algolia/client-search": "^4.13.0",
-    "@aws-amplify/amplify-cli-core": "^4.2.7",
+    "@aws-amplify/amplify-cli-core": "^4.2.10",
     "@aws-amplify/ui-react": "^5.3.1",
     "@emotion/react": "^11.1.5",
     "@emotion/styled": "^11.3.0",
@@ -28,6 +28,7 @@
     "aws-amplify": "^5.0.5",
     "classnames": "^2.3.2",
     "copy-to-clipboard": "^3.2.1",
+    "cross-env": "^7.0.3",
     "dotenv": "^16.0.0",
     "emotion": "^10.0.23",
     "eslint-config-next": "^13.2.4",
@@ -58,6 +59,7 @@
   },
   "devDependencies": {
     "@next/mdx": "^13.5.4",
+    "@next/bundle-analyzer": "^13.5.3",
     "@stencil/core": "^1.17.0",
     "@stencil/eslint-plugin": "^0.2.1",
     "@stencil/router": "^1.0.1",
@@ -85,9 +87,11 @@
     "jest": "^26.6.3",
     "jest-cli": "^26.6.3",
     "prettier": "^3.0.3",
+    "next-bundle-analyzer": "^0.6.7",
     "puppeteer": "^20.8.2",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "sass": "^1.54.8",
+    "serve": "^14.2.1",
     "tiny-glob": "0.2.9",
     "ts-jest": "^26.0.3",
     "ts-node": "^8.5.0",
@@ -96,6 +100,8 @@
   },
   "resolutions": {
     "**/trim": "0.0.3",
+    "@babel/core": "^7.23.2",
+    "@babel/traverse": "^7.23.2",
     "loader-utils": "2.0.4",
     "minimatch": "3.1.2",
     "json5": "2.2.2",
@@ -127,7 +133,11 @@
     ],
     "setupFilesAfterEnv": [
       "<rootDir>/jest.setup.js"
-    ]
+    ],
+    "moduleNameMapper": {
+      "\\.(css|less|scss)$": "<rootDir>/src/__mocks__/styleMock.js"
+    },
+    "transformIgnorePatterns": []
   },
   "scripts": {
     "clean": "rm -rf node_modules yarn.lock",
@@ -140,6 +150,8 @@
     "build:release": "yarn build && next-image-export-optimizer --exportFolderPath client/www/next-build",
     "next-build": "next build",
     "next-start": "next start",
-    "prepare": "husky install"
+    "amplify:submissionsLambda": "cd amplify/backend/function/submissionsLambda/src && yarn install && yarn build && yarn test",
+    "prepare": "husky install",
+    "analyze": "ANALYZE=true yarn next-build"
   }
 }

src/__mocks__/styleMock.js

@@ -0,0 +1 @@
+module.exports = {};

src/components/Accordion/index.tsx

@@ -20,6 +20,11 @@ const Accordion: React.FC<AccordionProps> = ({
   const [expandedHeight, setExpandedHeight] = useState(0);
   const docsExpander = useRef<HTMLElement>(null);
 
+  let pathName = '';
+  if (typeof window !== 'undefined') {
+    pathName = window.location.pathname;
+  }
+
   useEffect(() => {
     const expander = docsExpander.current;
 
@@ -62,7 +67,7 @@ const Accordion: React.FC<AccordionProps> = ({
 
   const anchor = createElement(
     'a',
-    { href: window.location.pathname + '#' + headingId },
+    { href: pathName + '#' + headingId },
     expanderTitle
   );