[pull] main from ampproject:main

.circleci/get_pinned_chrome_version.sh

@@ -46,15 +46,9 @@ echo "$(GREEN "Chrome version history URL is") $(CYAN "${CHROME_VERSION_HISTORY_
 # Determine the Chrome version
 # See https://developer.chrome.com/docs/versionhistory/guide
 echo "$(GREEN "Determining Chrome version...")"
-# TODO(estherkim): remove bandaid
-# CHROME_VERSION_HISTORY_URL does not list a version over 88 for some reason
-if [[ "$CHROME_MAJOR_VERSION" == "95" ]]; then
- CHROME_VERSION="95.0.4638.69"
-else
- CHROME_VERSION="$(curl -sS --retry 3 ${CHROME_VERSION_HISTORY_URL} | jq -r ".versions[]|.version" | grep -m 1 "${CHROME_MAJOR_VERSION}\.[[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+")"
-fi
-
+CHROME_VERSION="$(curl -sS --retry 3 ${CHROME_VERSION_HISTORY_URL} | jq -r ".versions[]|.version" | grep -m 1 "${CHROME_MAJOR_VERSION}\.[[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+")"
 echo "$(GREEN "Chrome version is") $(CYAN "${CHROME_VERSION}")"
 
-echo "export CHROME_VERSION=$CHROME_VERSION" >> $BASH_ENV
+# Workaround for https://github.com/CircleCI-Public/browser-tools-orb/issues/70
+echo "export ORB_PARAM_CHROME_VERSION=$CHROME_VERSION" >> $BASH_ENV
 echo $(GREEN "Successfully determined pinned version of Chrome")

.circleci/install_microsoft_edge.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 #
-# Script used by AMP's CI builds to install Microsoft Edge Beta on CircleCI.
+# Script used by AMP's CI builds to install Microsoft Edge Stable on CircleCI.
 # Reference: https://www.microsoftedgeinsider.com/en-us/download?platform=linux-deb
-# TODO(wg-infra): Switch from Beta to Stable once it's available.
 
 set -e
 
@@ -13,7 +12,7 @@ curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microso
 sudo install -o root -g root -m 644 microsoft.gpg /etc/apt/trusted.gpg.d/
 sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge-dev.list'
 sudo rm microsoft.gpg
-sudo apt update && sudo apt install microsoft-edge-beta
-EDGE_BETA_BIN=`which microsoft-edge-beta`
-echo "export EDGE_BETA_BIN=${EDGE_BETA_BIN}" >> $BASH_ENV
+sudo apt update && sudo apt install microsoft-edge-stable
+EDGE_STABLE_BIN=`which microsoft-edge-stable`
+echo "export EDGE_STABLE_BIN=${EDGE_STABLE_BIN}" >> $BASH_ENV
 echo $(GREEN "Installation complete.")

.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/**'

.github/workflows/codeql.yml

@@ -0,0 +1,49 @@
+name: 'CodeQL'
+
+on:
+ push:
+ branches: ['main']
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: ['main']
+ schedule:
+ - cron: '0 0 * * 1'
+
+permissions:
+ contents: read
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ strategy:
+ fail-fast: false
+ matrix:
+ # TODO: add `cpp` for Validator; don't forget to add a build step
+ language: ['go', 'javascript', 'python', 'typescript']
+
+ steps:
+ - name: Harden Runner
+ uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+ with:
+ egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+ - name: Checkout repository
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+ with:
+ config-file: ./.github/codeql/config.yml
+ languages: ${{ matrix.language }}
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+ with:
+ category: '/language:${{matrix.language}}'

.github/workflows/cross-platform-builds.yml

@@ -18,10 +18,15 @@ jobs:
  fail-fast: false
  runs-on: ${{ matrix.platform }}-latest
  steps:
+ - name: Harden Runner
+ uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+ with:
+ egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
  - name: Checkout Repo
- uses: actions/checkout@v3
+ uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
  - name: Set Up Node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
  with:
  node-version: lts/*
  - name: Install Dependencies
@@ -38,10 +43,15 @@ jobs:
  runs-on: ubuntu-latest
  environment: create_issue_on_error
  steps:
- - uses: actions/checkout@v3
+ - name: Harden Runner
+ uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+ with:
+ egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+ - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
  - name: Create issue on error
- uses: JasonEtco/create-an-issue@v2
+ uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
  with:
  filename: .github/create_issue_on_error.md
  env: