Merge branch 'master' into brid-config

.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/browser-tools@1.4.1
-  codecov: codecov/codecov@3.2.4
+  browser-tools: circleci/browser-tools@1.4.3
+  codecov: codecov/codecov@3.2.5
   node: circleci/node@5.1.0
 
 push_and_pr_builds: &push_and_pr_builds
@@ -45,7 +45,7 @@ experiment_job: &experiment_job
 executors:
   base-docker-small:
     docker:
-      - image: cimg/base:stable
+      - image: cimg/base:current
     resource_class: small
   node-docker-medium:
     docker:
@@ -61,11 +61,11 @@ executors:
     resource_class: xlarge
   jdk-docker-2xlarge:
     docker:
-      - image: cimg/openjdk:19.0-node
+      - image: cimg/openjdk:20.0-node
     resource_class: 2xlarge
   macos-medium:
     macos:
-      xcode: 13.4.1
+      xcode: 14.3.1
     resource_class: macos.x86.medium.gen2
 
 commands:
@@ -85,6 +85,9 @@ commands:
       - when:
           condition: << parameters.save-git-cache >>
           steps:
+            - run:
+                name: 'Garbage Collection for Git'
+                command: git gc --auto
             - save_cache:
                 name: 'Save Git Cache'
                 key: git-cache-{{ arch }}-v2-{{ .Branch }}-{{ .Revision }}
@@ -132,6 +135,9 @@ commands:
       - run:
           name: 'Get Pinned Chrome Version'
           command: ./.circleci/get_pinned_chrome_version.sh
+      - run:
+          name: 'Update list of available apt packages'
+          command: sudo apt update
       - browser-tools/install-chrome:
           # chrome-version is set in ./.circleci/get_pinned_chrome_version.sh, see files for details.
           replace-existing: true
@@ -188,6 +194,12 @@ jobs:
           name: 'Initialize Workspace'
           command: cp .circleci/maybe_gracefully_halt.sh /tmp/workspace
       - teardown_vm
+  initialize_mac_os:
+    executor:
+      name: macos-medium
+    steps:
+      - checkout_repo:
+          save-git-cache: true
   checks:
     executor:
       name: node-docker-medium
@@ -366,8 +378,7 @@ jobs:
     executor:
       name: macos-medium
     steps:
-      - setup_vm:
-          save-git-cache: true
+      - setup_vm
       - enable_safari_automation
       - run:
           name: '⭐ Browser Tests (Safari) ⭐'
@@ -396,17 +407,6 @@ jobs:
           command: node build-system/pr-check/browser-tests.js --browser=edge
       - store_test_output
       - teardown_vm
-  performance_tests:
-    executor:
-      name: node-docker-xlarge
-    steps:
-      - setup_vm
-      - install_chrome
-      - run:
-          name: '⭐ Performance Tests ⭐'
-          command: node build-system/pr-check/performance-tests.js
-      - store_test_output
-      - teardown_vm
   experiment_build:
     executor:
       name: node-docker-xlarge
@@ -493,6 +493,9 @@ workflows:
       - initialize_repository:
           name: 'Initialize Repository'
           <<: *push_and_pr_builds
+      - initialize_mac_os:
+          name: 'Initialize for Mac OS'
+          <<: *push_and_pr_builds
       - checks:
           name: 'Checks'
           <<: *push_and_pr_builds
@@ -581,6 +584,7 @@ workflows:
           name: 'Browser Tests (Safari)'
           <<: *push_and_pr_builds
           requires:
+            - 'Initialize for Mac OS'
             - 'Nomodule Build (Test)'
       - browser_tests_firefox:
           name: 'Browser Tests (Firefox)'
@@ -616,11 +620,6 @@ workflows:
           <<: *push_and_pr_builds
           requires:
             - 'Experiment << matrix.exp >> Build'
-      # TODO(wg-performance, #12128): This takes 30 mins and fails regularly.
-      # - performance_tests:
-      #     <<: *push_builds_only
-      #     requires:
-      #       - 'Nomodule Build (Test)'
 
   'Release':
     jobs:

.circleci/install_validator_dependencies.sh

@@ -13,7 +13,7 @@ sudo mv bazel.gpg /etc/apt/trusted.gpg.d/
 echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
 
 echo $(GREEN "Updating and installing apt packages...")
-sudo apt update && sudo apt install bazel clang python3 python3-pip protobuf-compiler
+sudo apt update && sudo apt install bazel-5.4.0 clang python3 python3-pip protobuf-compiler
 
 echo $(GREEN "Installing protobuf python module...")
 pip3 install protobuf==3.19.4

.circleci/restore_build_output.sh

@@ -25,20 +25,6 @@ if [[ -d "${WORKSPACE_DIR}/builds" ]]; then
         rsync -a "${RESTORED_DIR}/" "./${OUTPUT_DIR}"
       fi
     done
-    # Previously, bento components are compiled inside the extension source file.
-    for RESTORED_COMPONENT_DIR in ${RESTORED_BUILD_DIR}/extensions/*/?.?/dist; do
-      OUTPUT_DIR=${RESTORED_COMPONENT_DIR##$RESTORED_BUILD_DIR/}
-      echo "*" $(GREEN "Merging") $(CYAN "${RESTORED_COMPONENT_DIR}") $(GREEN "into") $(CYAN "./${OUTPUT_DIR}")
-      mkdir -p $RESTORED_DIR
-      rsync -a "${RESTORED_COMPONENT_DIR}/" "./${OUTPUT_DIR}"
-    done
-    # Now(-ish, or at least until they're move in to their own repo), bento components are compiled inside the src/bento source file.
-    for RESTORED_COMPONENT_DIR in ${RESTORED_BUILD_DIR}/src/bento/components/*/?.?/dist; do
-      OUTPUT_DIR=${RESTORED_COMPONENT_DIR##$RESTORED_BUILD_DIR/}
-      echo "*" $(GREEN "Merging") $(CYAN "${RESTORED_COMPONENT_DIR}") $(GREEN "into") $(CYAN "./${OUTPUT_DIR}")
-      mkdir -p $RESTORED_DIR
-      rsync -a "${RESTORED_COMPONENT_DIR}/" "./${OUTPUT_DIR}"
-    done
   done
 else
   echo $(YELLOW "Workspace does not contain any build outputs to restore")

.eslintignore

@@ -19,8 +19,6 @@ validator/**
 .*cache
 .amp-dep-check
 build
-build-system/tasks/performance/cache
-build-system/tasks/performance/results.json
 dist
 dist.3p
 dist.tools

.eslintrc.js

@@ -383,8 +383,6 @@ module.exports = {
         'test/**/*.js',
         'extensions/**/test/**/*.js',
         'extensions/**/test-e2e/*.js',
-        'src/bento/components/**/test/**/*.js',
-        'src/bento/components/**/test-e2e/*.js',
         'ads/**/test/**/*.js',
         'testing/**/*.js',
         'build-system/**/test/*.js',
@@ -492,12 +490,7 @@ module.exports = {
       'rules': {'import/order': 0},
     },
     {
-      'files': [
-        'extensions/**/1.0/**',
-        'src/bento/**',
-        'src/preact/**',
-        '**/storybook/**',
-      ],
+      'files': ['extensions/**/1.0/**', 'src/preact/**', '**/storybook/**'],
       'rules': {'local/preact-preferred-props': 2},
     },
     {

.github/ISSUE_TEMPLATE/ga4-bug-report.yml

@@ -0,0 +1,74 @@
+---
+name: Google Analytics 4 and AMP Bug Report
+description: Report a bug in GA4 and AMP integration.
+labels: ['Type: Bug', 'Component: amp-analytics', 'Component: GA4']
+title: "\U0001F41B Google Analytics 4 Related Bug: "
+body:
+  - type: markdown
+    id: header
+    attributes:
+      value: |
+        Thanks for filling out this bug report. Bugs related to Google Analytics 4 and amp-analytics can be reported using the form below.
+        - Bugs related to the [AMP](https://amp.dev) format and cache can be reported using the form below.
+        - Bugs related to the [AMP WordPress Plugin](https://wordpress.org/plugins/amp/) can be reported at the [support forum](https://wordpress.org/support/plugin/amp/) or at the [`amp-wp`](https://github.com/ampproject/amp-wp/issues) repository.
+        - Questions about AMP uage can be asked at the [`#using-amp`](https://amphtml.slack.com/archives/C9HPA6HGB) Slack channel or at the [`amp-html`](http://stackoverflow.com/questions/tagged/amp-html) tag at Stack Overflow.
+        - Questions about Google Search can be asked at Google's [Help Community](https://goo.gl/utQ1KZ).
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the bug.
+      placeholder: Describe the expected vs. the current behavior, so this issue can be directed to the correct working group for investigation.
+    validations:
+      required: true
+  - type: input
+    id: example
+    attributes:
+      label: URL where we can debug and reproduce the problem
+      description: If applicable, give an example web page where we can reproduce the problem.
+      placeholder: e.g. https://amp-dev.cdn.ampproject.org/c/s/amp.dev/
+  - type: textarea
+    id: repro_steps
+    attributes:
+      label: Reproduction Steps
+      description: Step-by-step instructions for reproducing the issue.
+      placeholder: Provide a publicly accessible URL and a reduced set of steps that clearly demonstrate the issue.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant Logs
+      description: Relevant logging output.
+      placeholder: Paste any plain-text logs here (e.g. console warnings or errors from Chrome DevTools). They will automatically be formatted as code.
+      render: shell
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: Browser(s) Affected
+      description: If applicable, specify which browser(s) are affected. Select one or more options below.
+      multiple: true
+      options:
+        - Chrome
+        - Firefox
+        - Safari
+        - Edge
+        - UC Browser
+  - type: input
+    id: operating_systems
+    attributes:
+      label: OS(s) Affected
+      description: If applicable, specify which operating system(s) are affected.
+      placeholder: e.g. Android 11
+  - type: input
+    id: devices
+    attributes:
+      label: Device(s) Affected
+      description: If applicable, specify which device(s) are affected.
+      placeholder: e.g. Pixel 3
+  - type: input
+    id: version
+    attributes:
+      label: AMP Version Affected
+      description: If applicable, specify which version is affected, in the format YYMMDDHHMMXXX.
+      placeholder: e.g. 2101280515000

.github/codeql/config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - 'extensions/**/test/**'