From 049447aa0a04a313e3f87a5709322763663c1f21 Mon Sep 17 00:00:00 2001
From: erwin mombay <erwinm@google.com>
Date: Tue, 5 Apr 2022 12:13:16 -0700
Subject: [PATCH 1/6] move file url calculation to extension-script.js (#38008)

---
 build-system/server/app-utils.js              |  7 +--
 build-system/server/app.js                    | 13 +++++
 extensions/amp-story/1.0/amp-story.js         | 10 ++--
 .../amp-story/1.0/test/test-amp-story.js      |  2 +-
 src/service/extension-script.js               | 19 +++++++
 test/unit/test-extension-script.js            | 49 +++++++++++++++++++
 6 files changed, 90 insertions(+), 10 deletions(-)

diff --git a/build-system/server/app-utils.js b/build-system/server/app-utils.js
index ac011eae4d6a..65582bb541fa 100644
--- a/build-system/server/app-utils.js
+++ b/build-system/server/app-utils.js
@@ -72,7 +72,7 @@ const isRtvMode = (serveMode) => {
  */
 const getCdnUrlRegExp = (pathPattern = '[^\'">]+') =>
   new RegExp(
-    `(https://cdn\\.ampproject\\.org)/${pathPattern}(\\.m?js|\\.css)`,
+    `(https://cdn\\.ampproject\\.org)/${pathPattern}(\\.json|\\.m?js|\\.css)`,
     'g'
   );
 
@@ -116,8 +116,9 @@ function replaceCdnJsUrls(mode, html, hostName, useMaxNames) {
     if (isRtv) {
       return CDNURLToRTVURL(url, mode, pathnames, extension).href;
     }
-    // CSS files are never output as .max.css
-    const useMaxNamesForFile = useMaxNames && extension !== '.css';
+    // Only JS files have "max" files. Even mjs files don't have an equivalent
+    // max file during "amp build".
+    const useMaxNamesForFile = useMaxNames && extension === '.js';
     const href = getHrefWithoutHost(
       replaceCDNURLPath(url, pathnames, extension, useMaxNamesForFile)
     );
diff --git a/build-system/server/app.js b/build-system/server/app.js
index 671217091693..29d785dec7b9 100644
--- a/build-system/server/app.js
+++ b/build-system/server/app.js
@@ -1400,6 +1400,19 @@ app.get(
   }
 );
 
+/**
+ * Handle amp-story translation file requests with an rtv path.
+ * We need to make sure we only handle the amp-story requests since this
+ * can affect other tests with json requests.
+ */
+app.get('/dist/rtv/*/v0/amp-story*.json', async (req, _res, next) => {
+  const fileName = path.basename(req.path);
+  let filePath = 'https://cdn.ampproject.org/v0/' + fileName;
+  filePath = replaceUrls(SERVE_MODE, filePath);
+  req.url = filePath;
+  next();
+});
+
 if (argv.coverage === 'live') {
   app.get('/dist/amp.js', async (req, res) => {
     const ampJs = await fs.promises.readFile(`${pc.cwd()}${req.path}`);
diff --git a/extensions/amp-story/1.0/amp-story.js b/extensions/amp-story/1.0/amp-story.js
index 5dd1212e8d5c..f5003b0ab3c2 100644
--- a/extensions/amp-story/1.0/amp-story.js
+++ b/extensions/amp-story/1.0/amp-story.js
@@ -55,7 +55,7 @@ import {getHistoryState as getWindowHistoryState} from '#core/window/history';
 import {isExperimentOn} from '#experiments';
 
 import {Services} from '#service';
-import {calculateScriptBaseUrl} from '#service/extension-script';
+import {calculateExtensionFileUrl} from '#service/extension-script';
 import {createPseudoLocale} from '#service/localization/strings';
 
 import {getDetail} from '#utils/event-helper';
@@ -2668,14 +2668,12 @@ export class AmpStory extends AMP.BaseElement {
   fetchLocalizationStrings_(languageCode) {
     const localizationService = getLocalizationService(this.element);
 
-    const base = calculateScriptBaseUrl(
+    const localizationUrl = calculateExtensionFileUrl(
+      this.win,
       this.win.location,
+      `amp-story.${languageCode}.json`,
       getMode(this.win).localDev
     );
-    const rtvPath = getMode(this.win).localDev
-      ? ''
-      : `rtv/${getMode(this.win).rtvVersion}/`;
-    const localizationUrl = `${base}/${rtvPath}v0/amp-story.${languageCode}.json`;
 
     // The cache fallbacks to english if language not found, locally it errors.
     Services.xhrFor(this.win)
diff --git a/extensions/amp-story/1.0/test/test-amp-story.js b/extensions/amp-story/1.0/test/test-amp-story.js
index 8cb6433ed042..60d905304ae6 100644
--- a/extensions/amp-story/1.0/test/test-amp-story.js
+++ b/extensions/amp-story/1.0/test/test-amp-story.js
@@ -2162,7 +2162,7 @@ describes.realWin(
           await createStoryWithPages(1, ['cover']);
 
           expect(fetchStub).to.have.been.calledOnceWithExactly(
-            '/dist/v0/amp-story.es-419.json',
+            '/dist/rtv/123/v0/amp-story.es-419.json',
             env.sandbox.match.any
           );
         });
diff --git a/src/service/extension-script.js b/src/service/extension-script.js
index f3274df8c043..b63a3ee15471 100644
--- a/src/service/extension-script.js
+++ b/src/service/extension-script.js
@@ -49,6 +49,25 @@ export function calculateExtensionScriptUrl(
   return `${base}/rtv/${rtv}/v0/${extensionId}${extensionVersion}${fileExtension}`;
 }
 
+/**
+ * Calculate url for a file in the v0/ extension directory.
+ * @param {!Window} win The window
+ * @param {!Location} location The window's location
+ * @param {string} filename
+ * @param {boolean=} opt_isLocalDev
+ * @return {string}
+ */
+export function calculateExtensionFileUrl(
+  win,
+  location,
+  filename,
+  opt_isLocalDev
+) {
+  const base = calculateScriptBaseUrl(location, opt_isLocalDev);
+  const rtv = getMode(win).rtvVersion;
+  return `${base}/rtv/${rtv}/v0/${filename}`;
+}
+
 /**
  * Calculate script url for an entry point.
  * If `opt_rtv` is true, returns the URL matching the current RTV.
diff --git a/test/unit/test-extension-script.js b/test/unit/test-extension-script.js
index 0a9c52206d07..db989e1b5f50 100644
--- a/test/unit/test-extension-script.js
+++ b/test/unit/test-extension-script.js
@@ -2,6 +2,7 @@ import {createElementWithAttributes} from '#core/dom';
 
 import {
   calculateEntryPointScriptUrl,
+  calculateExtensionFileUrl,
   calculateExtensionScriptUrl,
   getExtensionScripts,
   parseExtensionUrl,
@@ -323,6 +324,54 @@ describes.sandboxed('Module Extension Location', {}, () => {
   });
 });
 
+describes.sandboxed('Extension File Location', {}, () => {
+  describe('get correct file location', () => {
+    beforeEach(() => {
+      // These functions must not rely on log for cases in SW.
+      resetLogConstructorForTesting();
+    });
+
+    afterEach(() => {
+      initLogConstructor();
+      window.__AMP_MODE = {};
+    });
+
+    it('with local mode', () => {
+      window.__AMP_MODE = {rtvVersion: '123'};
+      const script = calculateExtensionFileUrl(
+        window,
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'some-file.json',
+        true
+      );
+      expect(script).to.equal(
+        'http://localhost:8000/dist/rtv/123/v0/some-file.json'
+      );
+    });
+
+    it('with remote mode', () => {
+      window.__AMP_MODE = {rtvVersion: '123'};
+      const script = calculateExtensionFileUrl(
+        window,
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'some-file.json',
+        false
+      );
+      expect(script).to.equal(
+        'https://cdn.ampproject.org/rtv/123/v0/some-file.json'
+      );
+    });
+  });
+});
+
 describes.fakeWin('getExtensionScripts', {}, (env) => {
   let win, doc;
 

From 0a4434ead0af41aa1d96ef896693ef10c52f38ae Mon Sep 17 00:00:00 2001
From: Jonathan <jshamble@users.noreply.github.com>
Date: Tue, 5 Apr 2022 12:24:18 -0700
Subject: [PATCH 2/6] =?UTF-8?q?=E2=9C=85=20amp-story-shopping=20validation?=
 =?UTF-8?q?=20test=20to=20be=20re-added=20before=20launch=20(#36606)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* stories code lab work so far

* updated shopping comonent to add vlidation and unit tests

* updated stories codelab unit tests to work

* finished the codelab

* Added boiler plate with working linked css files and working test cases for amp story shopping tag, attachment, and config components

* cleaned up a few files

* added css file to make circleci happy

* fixed formatting of owners file

* added validator tests

* Updated validation test

* added descendat tags

* added layout changes

* added validtor tags for amp story shopping subcomponenets to story protoascii file

* Added subcomponent elements to valdiation tests

* fixed formatting

* added mandatory ancestors

* Added amp story page

* added auto width for tag element

* added tag and config to amp-story-protoascii

* added child tags to correct location

* fixed layout issues

* updated validation tests

* added mroe validation checks

* Added increased test coverage for layouts

* fixed unit test with correct alyout

* added increased code coverage

* added increased test coverage

* fixed code coverage title bug with amp shopping tag unit test (needed an extra dash between the version number)

* cleanup up unit tests

* added shopping tag stuff

* added requires usage method

* cleaned up config files and test files

* reconfigured protoascii

* removed unnescessary config files

* updated ownders files

* fixed layout attribute so that publisher don't need ot specify

* added fixed to css files

* updated owners file

* removed hasCSs line

* removed css files

* removed some non-validation files

* removed even more non-validation files

* added shopping validation code before launch

* added link rel canonical

* removed shopping config from protoascii

* added required and optional attributes for amp story shoppiing tag and attachment

* fixed AMP validation with correct protoascii fields

* removed stray space

* remove unused field

* fixed validation formatiing

* added container layout

* updated attribute and child tags

* added script config from auto ads

* added test for script children

* removed trialing whitespaces
---
 examples/amp-story/amp-story-shopping.html    |   1 +
 .../amp-story-shopping-landscape.html         |   1 +
 .../amp-story/amp-story-shopping-lang-de.html |   1 +
 .../amp-story/amp-story-shopping-rtl.html     |   1 +
 .../test/validator-amp-story-shopping.html    | 257 +++++++++++++++++
 .../0.1/test/validator-amp-story-shopping.out | 258 ++++++++++++++++++
 .../validator-amp-story-shopping.protoascii   |  52 +++-
 ...lidator-amp-story-amp-experiment-error.out |   4 +-
 .../validator-amp-story-amp-twitter-error.out |   4 +-
 .../amp-story/validator-amp-story.protoascii  |   2 +
 10 files changed, 566 insertions(+), 15 deletions(-)
 create mode 100644 extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.html
 create mode 100644 extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.out

diff --git a/examples/amp-story/amp-story-shopping.html b/examples/amp-story/amp-story-shopping.html
index 9588e3939976..e139e368ceea 100644
--- a/examples/amp-story/amp-story-shopping.html
+++ b/examples/amp-story/amp-story-shopping.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
diff --git a/examples/visual-tests/amp-story/amp-story-shopping-landscape.html b/examples/visual-tests/amp-story/amp-story-shopping-landscape.html
index 5dd3036f42f9..5b65ec395853 100644
--- a/examples/visual-tests/amp-story/amp-story-shopping-landscape.html
+++ b/examples/visual-tests/amp-story/amp-story-shopping-landscape.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
diff --git a/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
index 5db508b1a9cf..4f9f12e55f87 100644
--- a/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
+++ b/examples/visual-tests/amp-story/amp-story-shopping-lang-de.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
diff --git a/examples/visual-tests/amp-story/amp-story-shopping-rtl.html b/examples/visual-tests/amp-story/amp-story-shopping-rtl.html
index e763a50e41de..aab8f1158206 100644
--- a/examples/visual-tests/amp-story/amp-story-shopping-rtl.html
+++ b/examples/visual-tests/amp-story/amp-story-shopping-rtl.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
     <script async src="https://cdn.ampproject.org/v0.js"></script>
diff --git a/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.html b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.html
new file mode 100644
index 000000000000..17e600a8806c
--- /dev/null
+++ b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.html
@@ -0,0 +1,257 @@
+<!doctype html>
+<html amp lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Shopping</title>
+    <link rel="canonical" href="amps.html">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+    <script async src="https://cdn.ampproject.org/v0.js"></script>
+    <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+    <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+    <style amp-custom>
+      [data-product-id="lamp"] {
+        top: 31%;
+        left: 1%;
+      }
+      [data-product-id="art"] {
+        top: 15%;
+        left: 40%;
+      }
+      [data-product-id="chair"] {
+        top: 53%;
+        left: 30%;
+      }
+      [data-product-id="flowers"] {
+        top: 46%;
+        left: 83%;
+      }
+    </style>
+  </head>
+  <body>
+    <amp-story
+        standalone
+        title="Story Shopping Component"
+        publisher="AMP Story Shopping"
+        publisher-logo-src="example.com/logo.png"
+        poster-portrait-src="example.com/poster.jpg">
+      <amp-story-page id="inline-light-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-shopping-attachment>
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productVendor": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                      {"url": "https://source.unsplash.com/Ry9WBo3qmoc/500x500", "alt": "lamp 1"},
+                      {"url": "https://source.unsplash.com/KP7p0-DRGbg", "alt": "lamp 2"},
+                      {"url": "https://source.unsplash.com/mFnbFaCIu1I", "alt": "lamp 3"},
+                      {"url": "https://source.unsplash.com/py9sH2rThWs", "alt": "lamp 4"},
+                      {"url": "https://source.unsplash.com/VDPauwJ_sHo", "alt": "lamp 5"},
+                      {"url": "https://source.unsplash.com/3LTht2nxd34", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productVendor": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    },
+                    "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productVendor": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-dark-theme">
+        <!--
+          Dark theme example of Inline config. Multiple product tags with icon defined.
+        -->
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+          <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <amp-story-shopping-attachment theme="dark">
+          <script type="application/json">
+            {
+                "items" : [
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "lamp",
+                    "productTitle": "Brass Lamp",
+                    "productVendor": "Lamp Co",
+                    "productPrice": 799.00,
+                    "productPriceCurrency": "USD",
+                    "productImages": [
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+                      {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+                    ],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "art",
+                    "productTitle": "Abstract Art",
+                    "productVendor": "V. Artsy",
+                    "productPrice": 1200.00,
+                    "productPriceCurrency": "INR",
+                    "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "chair",
+                    "productTitle": "Yellow chair",
+                    "productPrice": 1000.00,
+                    "productPriceCurrency": "BRL",
+                    "productTagText": "The perfectly imperfect yellow chair",
+                    "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   },
+                   {
+                    "productUrl": "https://www.google.com",
+                    "productId": "flowers",
+                    "productTitle": "Flowers",
+                    "productVendor": "Very Long Flower Company Name",
+                    "productPrice": 10.00,
+                    "productPriceCurrency": "USD",
+                    "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+                    "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+                    "aggregateRating": {
+                      "ratingValue": 4.4,
+                      "reviewCount": 89,
+                      "reviewUrl": "https://www.google.com"
+                    }
+                   }
+                ]
+              }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="remote-with-product">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button rendering due to remote product tag existing, but no inline.
+        -->
+        <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+          <script type="application/json">
+            {
+              "items" : []
+            }
+          </script>
+        </amp-story-shopping-attachment>
+      </amp-story-page>
+      <amp-story-page id="inline-no-product">
+      <amp-story-grid-layer template="fill">
+        <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+      </amp-story-grid-layer>
+        <!--
+          Example of:
+          CTA Button not rendering due to no product tags.
+        -->
+      <amp-story-shopping-attachment>
+        <script type="application/json">
+          {
+            "items" : []
+          }
+        </script>
+      </amp-story-shopping-attachment>
+      </amp-story-page>
+       <!--
+          Example of:
+          CTA Button not rendering due to no shopping attachment.
+        -->
+      <amp-story-page id="remote-dark-theme">
+        <amp-story-grid-layer template="fill">
+          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+        </amp-story-grid-layer>
+        <amp-story-grid-layer template="vertical">
+          <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+        </amp-story-grid-layer>
+      </amp-story-page>
+    </amp-story>
+  </body>
+</html>
diff --git a/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.out b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.out
new file mode 100644
index 000000000000..7b2ce6513d3d
--- /dev/null
+++ b/extensions/amp-story-shopping/0.1/test/validator-amp-story-shopping.out
@@ -0,0 +1,258 @@
+PASS
+|  <!doctype html>
+|  <html amp lang="en">
+|    <head>
+|      <meta charset="utf-8">
+|      <title>Shopping</title>
+|      <link rel="canonical" href="amps.html">
+|      <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+|      <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|      <script async src="https://cdn.ampproject.org/v0.js"></script>
+|      <script async custom-element="amp-story" src="https://cdn.ampproject.org/v0/amp-story-1.0.js"></script>
+|      <script async custom-element="amp-story-shopping" src="https://cdn.ampproject.org/v0/amp-story-shopping-0.1.js"></script>
+|      <style amp-custom>
+|        [data-product-id="lamp"] {
+|          top: 31%;
+|          left: 1%;
+|        }
+|        [data-product-id="art"] {
+|          top: 15%;
+|          left: 40%;
+|        }
+|        [data-product-id="chair"] {
+|          top: 53%;
+|          left: 30%;
+|        }
+|        [data-product-id="flowers"] {
+|          top: 46%;
+|          left: 83%;
+|        }
+|      </style>
+|    </head>
+|    <body>
+|      <amp-story
+|          standalone
+|          title="Story Shopping Component"
+|          publisher="AMP Story Shopping"
+|          publisher-logo-src="example.com/logo.png"
+|          poster-portrait-src="example.com/poster.jpg">
+|        <amp-story-page id="inline-light-theme">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|          <!--
+|            Example of Inline config. Multiple product tags with icon defined.
+|          -->
+|          <amp-story-shopping-attachment>
+|            <script type="application/json">
+|              {
+|                  "items" : [
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "lamp",
+|                      "productTitle": "Brass Lamp",
+|                      "productVendor": "Lamp Co",
+|                      "productPrice": 799.00,
+|                      "productPriceCurrency": "USD",
+|                      "productImages": [
+|                        {"url": "https://source.unsplash.com/Ry9WBo3qmoc/500x500", "alt": "lamp 1"},
+|                        {"url": "https://source.unsplash.com/KP7p0-DRGbg", "alt": "lamp 2"},
+|                        {"url": "https://source.unsplash.com/mFnbFaCIu1I", "alt": "lamp 3"},
+|                        {"url": "https://source.unsplash.com/py9sH2rThWs", "alt": "lamp 4"},
+|                        {"url": "https://source.unsplash.com/VDPauwJ_sHo", "alt": "lamp 5"},
+|                        {"url": "https://source.unsplash.com/3LTht2nxd34", "alt": "lamp 6"}
+|                      ],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      },
+|                      "productDetails": "One newline after this. \n Two newlines after this. \n\n  Five consecutive newlines after this, should become 2 newlines. \n\n\n\n\n Many consecutive newlines with different spacing and tabs after this, should become 2 newlines. \n          \n\n   \n  \n \n  \n \n I hope it works!"
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "art",
+|                      "productTitle": "Abstract Art",
+|                      "productVendor": "V. Artsy",
+|                      "productPrice": 1200.00,
+|                      "productPriceCurrency": "INR",
+|                      "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+|                      "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci. Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "chair",
+|                      "productTitle": "Yellow chair",
+|                      "productPrice": 1000.00,
+|                      "productPriceCurrency": "BRL",
+|                      "productTagText": "The perfectly imperfect yellow chair",
+|                      "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      },
+|                      "productDetails": "Lorem ipsum dolor sit amet consectetur adipisicing elit. Facere error deserunt dignissimos in laborum ea molestias veritatis sint laudantium iusto expedita atque provident doloremque, ad voluptatem culpa adipisci."
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "flowers",
+|                      "productTitle": "Flowers",
+|                      "productVendor": "Very Long Flower Company Name",
+|                      "productPrice": 10.00,
+|                      "productPriceCurrency": "USD",
+|                      "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+|                      "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     }
+|                  ]
+|                }
+|            </script>
+|          </amp-story-shopping-attachment>
+|        </amp-story-page>
+|        <amp-story-page id="inline-dark-theme">
+|          <!--
+|            Dark theme example of Inline config. Multiple product tags with icon defined.
+|          -->
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="lamp" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="chair" ></amp-story-shopping-tag>
+|            <amp-story-shopping-tag data-product-id="flowers" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|          <amp-story-shopping-attachment theme="dark">
+|            <script type="application/json">
+|              {
+|                  "items" : [
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "lamp",
+|                      "productTitle": "Brass Lamp",
+|                      "productVendor": "Lamp Co",
+|                      "productPrice": 799.00,
+|                      "productPriceCurrency": "USD",
+|                      "productImages": [
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 1"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 2"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 3"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 4"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 5"},
+|                        {"url": "/examples/visual-tests/amp-story/img/cat1.jpg", "alt": "lamp 6"}
+|                      ],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "art",
+|                      "productTitle": "Abstract Art",
+|                      "productVendor": "V. Artsy",
+|                      "productPrice": 1200.00,
+|                      "productPriceCurrency": "INR",
+|                      "productImages": [{"url": "https://source.unsplash.com/BdVQU-NDtA8/500x500", "alt": "art"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "chair",
+|                      "productTitle": "Yellow chair",
+|                      "productPrice": 1000.00,
+|                      "productPriceCurrency": "BRL",
+|                      "productTagText": "The perfectly imperfect yellow chair",
+|                      "productImages": [{"url": "https://source.unsplash.com/DgQGKKLaVhY/500x500", "alt": "chair"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     },
+|                     {
+|                      "productUrl": "https://www.google.com",
+|                      "productId": "flowers",
+|                      "productTitle": "Flowers",
+|                      "productVendor": "Very Long Flower Company Name",
+|                      "productPrice": 10.00,
+|                      "productPriceCurrency": "USD",
+|                      "productIcon": "/examples/visual-tests/amp-story/img/shopping/icon.png",
+|                      "productImages": [{"url": "https://source.unsplash.com/SavQfLRm4Do/500x500", "alt": "flowers"}],
+|                      "aggregateRating": {
+|                        "ratingValue": 4.4,
+|                        "reviewCount": 89,
+|                        "reviewUrl": "https://www.google.com"
+|                      }
+|                     }
+|                  ]
+|                }
+|            </script>
+|          </amp-story-shopping-attachment>
+|        </amp-story-page>
+|        <amp-story-page id="remote-with-product">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|          <!--
+|            Example of:
+|            CTA Button rendering due to remote product tag existing, but no inline.
+|          -->
+|          <amp-story-shopping-attachment theme="dark" src="/examples/amp-story/shopping/remote.json">
+|            <script type="application/json">
+|              {
+|                "items" : []
+|              }
+|            </script>
+|          </amp-story-shopping-attachment>
+|        </amp-story-page>
+|        <amp-story-page id="inline-no-product">
+|        <amp-story-grid-layer template="fill">
+|          <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|        </amp-story-grid-layer>
+|          <!--
+|            Example of:
+|            CTA Button not rendering due to no product tags.
+|          -->
+|        <amp-story-shopping-attachment>
+|          <script type="application/json">
+|            {
+|              "items" : []
+|            }
+|          </script>
+|        </amp-story-shopping-attachment>
+|        </amp-story-page>
+|         <!--
+|            Example of:
+|            CTA Button not rendering due to no shopping attachment.
+|          -->
+|        <amp-story-page id="remote-dark-theme">
+|          <amp-story-grid-layer template="fill">
+|            <amp-img layout="fill" src="https://source.unsplash.com/_HqHX3LBN18/1000x2000"></amp-img>
+|          </amp-story-grid-layer>
+|          <amp-story-grid-layer template="vertical">
+|            <amp-story-shopping-tag data-product-id="art" ></amp-story-shopping-tag>
+|          </amp-story-grid-layer>
+|        </amp-story-page>
+|      </amp-story>
+|    </body>
+|  </html>
diff --git a/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii b/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii
index ca7752c24d96..9c42003f3446 100644
--- a/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii
+++ b/extensions/amp-story-shopping/validator-amp-story-shopping.protoascii
@@ -14,29 +14,59 @@ html_format: AMP
   tag_name: "AMP-STORY-SHOPPING-TAG"
   requires_extension: "amp-story-shopping"
   mandatory_ancestor: "AMP-STORY-GRID-LAYER"
-  attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
   amp_layout: {
     supported_layouts: CONTAINER
   }
+  attrs: {
+    name: "data-product-id"
+    mandatory: true
+  }
 }
-tags: {  # <amp-story-shopping-config>
+tags: {  # <amp-story-shopping-attachment>
   html_format: AMP
-  tag_name: "AMP-STORY-SHOPPING-CONFIG"
+  tag_name: "AMP-STORY-SHOPPING-ATTACHMENT"
   requires_extension: "amp-story-shopping"
-  attr_lists: "extended-amp-global"
+  mandatory_last_child: true
   spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
+  attrs: {
+    name: "src"
+    value_url: {
+      protocol: "https"
+      allow_relative: true
+    }
+  }
+  attrs: {
+    name: "theme"
+    value: "dark"
+    value: "light"
+  }
+  child_tags: {
+    child_tag_name_oneof: "SCRIPT"
+    mandatory_min_num_child_tags: 1
+  }
   amp_layout: {
-    supported_layouts: NODISPLAY
+    supported_layouts: CONTAINER
   }
 }
-tags: {  # <amp-story-shopping-attachment>
+tags: { # amp-story-shopping-attachment
   html_format: AMP
-  tag_name: "AMP-STORY-SHOPPING-ATTACHMENT"
+  tag_name: "SCRIPT"
+  spec_name: "amp-story-shopping-attachment config script"
+  mandatory_parent: "AMP-STORY-SHOPPING-ATTACHMENT"
   requires_extension: "amp-story-shopping"
-  attr_lists: "extended-amp-global"
-  spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
-  amp_layout: {
-    supported_layouts: NODISPLAY
+  attrs: {
+    name: "type"
+    mandatory: true
+    value_casei: "application/json"
+    dispatch_key: NAME_VALUE_PARENT_DISPATCH
+  }
+  attr_lists: "nonce-attr"
+  cdata: {
+    disallowed_cdata_regex: {
+      regex: "<!--"
+      error_message: "html comments"
+    }
   }
+  spec_url: "https://amp.dev/documentation/components/amp-story-shopping/"
 }
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out b/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out
index 56035dcce0f8..a58ceab6a4b2 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-amp-experiment-error.out
@@ -51,7 +51,7 @@ amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:36:8 Custom Jav
 |        <!-- Invalid: amp-experiment not allowed as a child of amp-story-page -->
 |        <amp-experiment>
 >>       ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:49:6 Tag 'amp-experiment' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink']. (see https://amp.dev/documentation/components/amp-story)
+amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:49:6 Tag 'amp-experiment' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink', 'amp-story-shopping-attachment']. (see https://amp.dev/documentation/components/amp-story)
 |            <script type="application/json">
 |              {
 |                "background-color-test": {
@@ -83,4 +83,4 @@ amp-story/1.0/test/validator-amp-story-amp-experiment-error.html:65:4 Tag 'amp-e
 |      </amp-experiment>
 |    </amp-story>
 |  </body>
-|  </html>
\ No newline at end of file
+|  </html>
diff --git a/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out b/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out
index c891aaad71cc..e9dc6a7bdf27 100644
--- a/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out
+++ b/extensions/amp-story/1.0/test/validator-amp-story-amp-twitter-error.out
@@ -24,7 +24,7 @@ FAIL
 |        <!-- Invalid: is not a descendant of amp-story-grid-layer. -->
 |        <amp-twitter width="375"
 >>       ^~~~~~~~~
-amp-story/1.0/test/validator-amp-story-amp-twitter-error.html:24:6 Tag 'amp-twitter' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink']. (see https://amp.dev/documentation/components/amp-story)
+amp-story/1.0/test/validator-amp-story-amp-twitter-error.html:24:6 Tag 'amp-twitter' is disallowed as child of tag 'amp-story-page'. Child tag must be one of ['amp-analytics', 'amp-pixel', 'amp-story-animation', 'amp-story-auto-analytics', 'amp-story-cta-layer', 'amp-story-grid-layer', 'amp-story-page-attachment', 'amp-story-page-outlink', 'amp-story-shopping-attachment']. (see https://amp.dev/documentation/components/amp-story)
 >>       ^~~~~~~~~
 amp-story/1.0/test/validator-amp-story-amp-twitter-error.html:24:6 The tag 'amp-twitter' requires including the 'amp-twitter' extension JavaScript. (see https://amp.dev/documentation/components/amp-twitter)
 |          height="472"
@@ -34,4 +34,4 @@ amp-story/1.0/test/validator-amp-story-amp-twitter-error.html:24:6 The tag 'amp-
 |      </amp-story-page>
 |    </amp-story>
 |  </body>
-|  </html>
\ No newline at end of file
+|  </html>
diff --git a/extensions/amp-story/validator-amp-story.protoascii b/extensions/amp-story/validator-amp-story.protoascii
index 92d6d499a559..fe284b6506c2 100644
--- a/extensions/amp-story/validator-amp-story.protoascii
+++ b/extensions/amp-story/validator-amp-story.protoascii
@@ -137,6 +137,7 @@ tags: {  # <amp-story-page>
     child_tag_name_oneof: "AMP-STORY-GRID-LAYER"
     child_tag_name_oneof: "AMP-STORY-PAGE-ATTACHMENT"
     child_tag_name_oneof: "AMP-STORY-PAGE-OUTLINK"
+    child_tag_name_oneof: "AMP-STORY-SHOPPING-ATTACHMENT"
     mandatory_min_num_child_tags: 1
   }
 }
@@ -733,6 +734,7 @@ descendant_tag_list: {
   tag: "AMP-STORY-INTERACTIVE-QUIZ"
   tag: "AMP-STORY-INTERACTIVE-RESULTS"
   tag: "AMP-STORY-PANNING-MEDIA"
+  tag: "AMP-STORY-SHOPPING-TAG"
   tag: "AMP-TIMEAGO"
   tag: "AMP-TWITTER"
   tag: "AMP-VIDEO"

From d0dede1880b9a5cbc09371bd06b1d3d0f41d1802 Mon Sep 17 00:00:00 2001
From: Matias Szylkowski <mszylkowski@google.com>
Date: Tue, 5 Apr 2022 15:31:54 -0400
Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=90=9B=20[Story=20animations]=20Cente?=
 =?UTF-8?q?r=20vertical=20panning=20(#38017)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added tasts

* Undo

* Use better images, fix vertical align

* Fix test on equality
---
 examples/amp-story/animations-presets.html    | 37 ++++++++++++++-----
 extensions/amp-story/1.0/animation-presets.js |  4 +-
 .../1.0/test/test-full-bleed-animations.js    |  2 +-
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/examples/amp-story/animations-presets.html b/examples/amp-story/animations-presets.html
index 67564334ac0b..324a34767e40 100644
--- a/examples/amp-story/animations-presets.html
+++ b/examples/amp-story/animations-presets.html
@@ -190,8 +190,8 @@ <h1>zoom-out</h1>
     <!-- ## Pan-Left -->
     <amp-story-page id="pan-left">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-left" id="img-pan-left" translate-x="600px" animate-in-duration="4s" layout="fixed" src="https://picsum.photos/720/320?image=1026"
-          width="720" height="320">
+        <amp-img animate-in="pan-left" id="img-pan-left" translate-x="200px" animate-in-duration="4s" layout="fixed"  src="https://images.unsplash.com/photo-1648098470019-c103e39aa32b?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1287&q=80"
+        width="192" height="288">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
@@ -202,8 +202,8 @@ <h1>pan-left</h1>
     <!-- ## Pan-Right -->
     <amp-story-page id="pan-right">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-right" animate-in-duration="4s" translate-x="200px" layout="fixed" src="https://picsum.photos/720/320?image=1026" width="720"
-          height="320">
+        <amp-img animate-in="pan-right" animate-in-duration="4s" translate-x="200px" layout="fixed" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+        width="1920" height="1280">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
@@ -214,8 +214,8 @@ <h1>pan-right</h1>
     <!-- ## Pan-Up -->
     <amp-story-page id="pan-up">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-up" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://picsum.photos/720/320?image=1026" width="720"
-          height="320">
+        <amp-img animate-in="pan-up" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://images.unsplash.com/photo-1648098470019-c103e39aa32b?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1287&q=80"
+        width="192" height="288">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
@@ -226,8 +226,8 @@ <h1>pan-up</h1>
     <!-- ## Pan-Down -->
     <amp-story-page id="pan-down">
       <amp-story-grid-layer template="fill">
-        <amp-img animate-in="pan-down" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://picsum.photos/720/320?image=1026" width="720"
-          height="320">
+        <amp-img animate-in="pan-down" animate-in-duration="4s" translate-y="100px" layout="fixed" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+        width="1920" height="1280">
         </amp-img>
       </amp-story-grid-layer>
       <amp-story-grid-layer template="fill">
@@ -245,8 +245,25 @@ <h1>pan-right</h1>
             animate-in="pan-right" animate-in-timing-function="ease-out"
             pan-scaling-factor=".9"
             translate-x="35px" animate-in-duration="3.5s"
-            id="img-pan-right" layout="responsive" src="https://picsum.photos/720/320?image=1026"
-            width="720" height="320">
+            id="img-pan-right" layout="responsive" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+            width="1920" height="1280">
+          </amp-img>
+        </div>
+      </amp-story-grid-layer>
+    </amp-story-page>
+
+    <!-- ## Pan-Down with pan-scaling-factor attr -->
+    <amp-story-page id="pan-down-with-static-scale">
+      <amp-story-grid-layer template="vertical">
+        <h1>pan-down</h1>
+        <p>with pan-scaling-factor attr</p>
+        <div class="img-container" style="height: 120%">
+          <amp-img
+            animate-in="pan-down" animate-in-timing-function="ease-out"
+            pan-scaling-factor="0.9"
+            translate-y="35px" animate-in-duration="3.5s"
+            id="img-pan-down" layout="responsive" src="https://images.unsplash.com/photo-1644308251427-cd809dc65e4c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2670&q=80"
+            width="1920" height="1280">
           </amp-img>
         </div>
       </amp-story-grid-layer>
diff --git a/extensions/amp-story/1.0/animation-presets.js b/extensions/amp-story/1.0/animation-presets.js
index ac047ab8b7a9..9d36c98dcadb 100644
--- a/extensions/amp-story/1.0/animation-presets.js
+++ b/extensions/amp-story/1.0/animation-presets.js
@@ -340,7 +340,7 @@ export const presets = {
       dimensions.targetWidth *= scalingFactor;
       dimensions.targetHeight *= scalingFactor;
 
-      const offsetX = -dimensions.targetWidth / 2;
+      const offsetX = (dimensions.pageWidth - dimensions.targetWidth) * 0.5;
       const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
       return scaleAndTranslate(
@@ -363,7 +363,7 @@ export const presets = {
       dimensions.targetWidth *= scalingFactor;
       dimensions.targetHeight *= scalingFactor;
 
-      const offsetX = -dimensions.targetWidth / 2;
+      const offsetX = (dimensions.pageWidth - dimensions.targetWidth) * 0.5;
       const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
       return scaleAndTranslate(
diff --git a/extensions/amp-story/1.0/test/test-full-bleed-animations.js b/extensions/amp-story/1.0/test/test-full-bleed-animations.js
index 0adf0e92f97e..89833b525a8a 100644
--- a/extensions/amp-story/1.0/test/test-full-bleed-animations.js
+++ b/extensions/amp-story/1.0/test/test-full-bleed-animations.js
@@ -234,7 +234,7 @@ describes.realWin(
         /* options */ {}
       );
 
-      const offsetX = -dimensions.targetWidth / 2;
+      const offsetX = (dimensions.pageWidth - dimensions.targetWidth) / 2;
       const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
       const expectedKeyframes = [

From 9a372aa4b41b56e122efa10a11e91a34eefcd23e Mon Sep 17 00:00:00 2001
From: William Johnson <dethstrobe@gmail.com>
Date: Tue, 5 Apr 2022 16:29:31 -0400
Subject: [PATCH 4/6] add bento-timeago preact/react e2e test. resolves #37923
 (#38007)

---
 extensions/amp-timeago/1.0/storybook/Basic.js |  1 +
 .../amp-timeago/1.0/test-e2e/e2e-fixture.js   | 11 ++++++
 .../1.0/test-e2e/test-preact-react.js         | 35 +++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 extensions/amp-timeago/1.0/test-e2e/e2e-fixture.js
 create mode 100644 extensions/amp-timeago/1.0/test-e2e/test-preact-react.js

diff --git a/extensions/amp-timeago/1.0/storybook/Basic.js b/extensions/amp-timeago/1.0/storybook/Basic.js
index 91e5952cd059..f5ea7c28c121 100644
--- a/extensions/amp-timeago/1.0/storybook/Basic.js
+++ b/extensions/amp-timeago/1.0/storybook/Basic.js
@@ -20,6 +20,7 @@ export default {
   args: {
     cutoff: 0,
     placeholder: 'Time passed!',
+    dateTime: Date.now(),
   },
   argTypes: {
     dateTime: {
diff --git a/extensions/amp-timeago/1.0/test-e2e/e2e-fixture.js b/extensions/amp-timeago/1.0/test-e2e/e2e-fixture.js
new file mode 100644
index 000000000000..0d9011cb3bd1
--- /dev/null
+++ b/extensions/amp-timeago/1.0/test-e2e/e2e-fixture.js
@@ -0,0 +1,11 @@
+import {getDefaultArgs} from '#bento/util/e2e-helpers';
+
+import * as Preact from '#preact';
+import {render} from '#preact';
+
+import config, {_default as App} from '../storybook/Basic';
+
+render(
+  <App {...getDefaultArgs(config, App)} />,
+  document.querySelector('#bento')
+);
diff --git a/extensions/amp-timeago/1.0/test-e2e/test-preact-react.js b/extensions/amp-timeago/1.0/test-e2e/test-preact-react.js
new file mode 100644
index 000000000000..eede77b0b0a9
--- /dev/null
+++ b/extensions/amp-timeago/1.0/test-e2e/test-preact-react.js
@@ -0,0 +1,35 @@
+describes.endtoend(
+  'bento-timeago react e2e',
+  {
+    bentoComponentName: 'timeago',
+    testFor: 'react',
+    version: '1.0',
+    fixture: 'dist/bento-timeago-e2e-build-react.html',
+    environments: ['single'],
+  },
+  testSuite
+);
+describes.endtoend(
+  'bento-timeago preact e2e',
+  {
+    bentoComponentName: 'timeago',
+    testFor: 'preact',
+    version: '1.0',
+    fixture: 'dist/bento-timeago-e2e-build-preact.html',
+    environments: ['single'],
+  },
+  testSuite
+);
+
+function testSuite(env) {
+  let controller;
+
+  beforeEach(() => {
+    controller = env.controller;
+  });
+
+  it('render how long ago the time stamp was set', async () => {
+    const timeago = await controller.findElement('time');
+    await expect(controller.getElementText(timeago)).to.equal('just now');
+  });
+}

From ca2a14a4e9bb413ccd7520b6b7fac9cee56585db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Sok=C3=B3=C5=82?=
 <88041828+smart-adserver@users.noreply.github.com>
Date: Tue, 5 Apr 2022 22:47:19 +0200
Subject: [PATCH 5/6] Disable XHR (#38014)

---
 .../0.1/amp-ad-network-smartadserver-impl.js           |  5 +++++
 .../0.1/test/test-amp-ad-network-smartadserver-impl.js | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js b/extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js
index eb16e6aeefd2..859b7f8eebc8 100644
--- a/extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js
+++ b/extensions/amp-ad-network-smartadserver-impl/0.1/amp-ad-network-smartadserver-impl.js
@@ -121,6 +121,11 @@ export class AmpAdNetworkSmartadserverImpl extends AmpA4A {
     return this.isAmpAdElement();
   }
 
+  /** @override */
+  isXhrAllowed() {
+    return false;
+  }
+
   /** @override */
   sendXhrRequest(adUrl) {
     return super.sendXhrRequest(adUrl).then((response) => {
diff --git a/extensions/amp-ad-network-smartadserver-impl/0.1/test/test-amp-ad-network-smartadserver-impl.js b/extensions/amp-ad-network-smartadserver-impl/0.1/test/test-amp-ad-network-smartadserver-impl.js
index 6cf9d9376269..c402f96a8583 100644
--- a/extensions/amp-ad-network-smartadserver-impl/0.1/test/test-amp-ad-network-smartadserver-impl.js
+++ b/extensions/amp-ad-network-smartadserver-impl/0.1/test/test-amp-ad-network-smartadserver-impl.js
@@ -62,6 +62,16 @@ describes.realWin('amp-ad-network-smartadserver-impl', realWinConfig, (env) => {
     });
   });
 
+  describe('isXhrAllowed', () => {
+    it('should be not allowed', async () => {
+      impl = new AmpAdNetworkSmartadserverImpl(
+        createElementWithAttributes(doc, 'amp-ad', {})
+      );
+
+      expect(impl.isXhrAllowed()).to.be.false;
+    });
+  });
+
   describe('getCustomRealTimeConfigMacros', () => {
     it('should return correct macros', () => {
       const macros = {

From cb67fc9827971df8d0ca0ad0b5b123496323b03a Mon Sep 17 00:00:00 2001
From: Alan Orozco <alanorozco@users.noreply.github.com>
Date: Tue, 5 Apr 2022 16:00:46 -0700
Subject: [PATCH 6/6] =?UTF-8?q?=E2=99=BB=EF=B8=8F=F0=9F=8F=97=20Allow=20de?=
 =?UTF-8?q?ad-code-eliminating=20`config.urls`=20(#37998)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refactors `config.urls` so that they can be dead-code-eliminated.

Nearly all bundles change from `-0.15kb` to `-0.38kb`. Runtimes change by `+0.01kb`.

```diff
  var J =
-     self.AMP_CONFIG || {},
+     (t) => (self.AMP_CONFIG ? self.AMP_CONFIG[t] : null),
    K =
-     ('string' == typeof J.cdnProxyRegex
-       ? new RegExp(J.cdnProxyRegex)
-       : J.cdnProxyRegex) ||
+     ('string' == typeof J('cdnProxyRegex')
+       ? new RegExp(J('cdnProxyRegex'))
+       : J('cdnProxyRegex')) ||
      /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org$/,
-   T =
-     ('string' == typeof J.thirdPartyFrameRegex
-       ? new RegExp(J.thirdPartyFrameRegex)
-       : J.thirdPartyFrameRegex) || /^d-\d+\.ampproject\.net$/;
    Q =
-     {
-       thirdParty: J.thirdPartyUrl || 'https://3p.ampproject.net',
-       thirdPartyFrameHost: J.thirdPartyFrameHost || 'ampproject.net',
-       thirdPartyFrameRegex: T,
-       cdn: J.cdnUrl || Z('runtime-host') || 'https://cdn.ampproject.org',
-       cdnProxyRegex: X,
-       localhostRegex: /^https?:\/\/localhost(:\d+)?$/,
-       errorReporting:
-         J.errorReportingUrl ||
-         'https://us-central1-amp-error-reporting.cloudfunctions.net/r',
-       betaErrorReporting:
-         J.betaErrorReportingUrl ||
-         'https://us-central1-amp-error-reporting.cloudfunctions.net/r-beta',
-       localDev: J.localDev || !1,
-       trustedViewerHosts: [
-         /(^|\.)google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)$/,
-         /(^|\.)gmail\.(com|dev)$/,
-       ],
-       geoApi: J.geoApiUrl || Z('amp-geo-api'),
-     };
+     J('cdnUrl') || Z('runtime-host') || 'https://cdn.ampproject.org';
```
---
 3p/integration-lib.js                         |   2 +-
 ads/alp/handler.js                            |   2 +-
 build-system/babel-config/minified-config.js  |   1 +
 .../babel-plugin-deep-pure/index.js           |  89 ++++++++++++++++
 .../error-member-expression/input.mjs         |   2 +
 .../error-member-expression/options.json      |   6 ++
 .../transform/ignored-import-source/input.mjs |   4 +
 .../ignored-import-source/options.json        |   5 +
 .../ignored-import-source/output.mjs          |   2 +
 .../transform/ignored-not-import/input.mjs    |   4 +
 .../transform/ignored-not-import/options.json |   5 +
 .../transform/ignored-not-import/output.mjs   |   3 +
 .../transform-aliased-path/input.mjs          |   6 ++
 .../transform-aliased-path/options.json       |   5 +
 .../transform-aliased-path/output.mjs         |   4 +
 .../transform-relative-path/input.mjs         |   6 ++
 .../transform-relative-path/options.json      |   5 +
 .../transform-relative-path/output.mjs        |   4 +
 .../babel-plugin-deep-pure/test/index.js      |   3 +
 .../eslint-rules/no-export-side-effect.js     |   7 +-
 build-system/eslint-rules/no-import-rename.js |   1 +
 build-system/test-configs/dep-check-config.js |   2 +-
 build-system/test-configs/forbidden-terms.js  |   6 +-
 .../amp-a4a/0.1/amp-ad-template-helper.js     |   2 +-
 extensions/amp-a4a/0.1/amp-ad-utils.js        |   2 +-
 extensions/amp-a4a/0.1/head-validation.js     |   2 +-
 extensions/amp-a4a/0.1/template-validator.js  |   2 +-
 extensions/amp-access/0.1/login-dialog.js     |   2 +-
 .../0.1/external-reorder-head-transformer.js  |   2 +-
 .../amp-analytics/0.1/iframe-transport.js     |   2 +-
 .../0.1/test/test-iframe-transport.js         |   2 +-
 extensions/amp-cache-url/0.1/amp-cache-url.js |   2 +-
 extensions/amp-geo/0.1/amp-geo.js             |   2 +-
 extensions/amp-geo/0.1/test/test-amp-geo.js   |   2 +-
 extensions/amp-iframe/0.1/amp-iframe.js       |   2 +-
 .../0.1/amp-install-serviceworker.js          |   2 +-
 extensions/amp-mraid/0.1/amp-mraid.js         |   2 +-
 .../0.1/amp-recaptcha-service.js              |   2 +-
 extensions/amp-script/0.1/amp-script.js       |   2 +-
 .../0.1/amp-story-dev-tools-tab-debug.js      |   2 +-
 src/3p-frame.js                               |   2 +-
 src/amp-story-player/amp-story-player-impl.js |   2 +-
 src/config.js                                 | 100 ------------------
 src/config/urls.js                            |  99 +++++++++++++++++
 src/cookies.js                                |   2 +-
 src/core/types/pure.js                        |   9 ++
 src/error-reporting.js                        |   2 +-
 src/font-stylesheet-timeout.js                |   2 +-
 src/friendly-iframe-embed.js                  |   2 +-
 src/iframe-attributes.js                      |   2 +-
 src/runtime.js                                |  36 ++++++-
 src/service/extension-script.js               |   2 +-
 src/service/url-impl.js                       |   2 +-
 src/service/viewer-impl.js                    |   2 +-
 src/url-rewrite.js                            |   2 +-
 src/url.js                                    |   2 +-
 src/utils/log.js                              |   2 +-
 src/validator-integration.js                  |   2 +-
 src/web-worker/web-worker.js                  |   2 +-
 test/unit/3p/test-recaptcha.js                |   2 +-
 60 files changed, 341 insertions(+), 143 deletions(-)
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/index.js
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/input.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/options.json
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/output.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/input.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/options.json
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/output.mjs
 create mode 100644 build-system/babel-plugins/babel-plugin-deep-pure/test/index.js
 delete mode 100644 src/config.js
 create mode 100644 src/config/urls.js
 create mode 100644 src/core/types/pure.js

diff --git a/3p/integration-lib.js b/3p/integration-lib.js
index 1dd038e4d3d6..017b4d956ee2 100644
--- a/3p/integration-lib.js
+++ b/3p/integration-lib.js
@@ -14,7 +14,7 @@ import {IntegrationAmpContext} from './ampcontext-integration';
 import {installEmbedStateListener, manageWin} from './environment';
 import {getAmpConfig, getEmbedType, getLocation} from './frame-metadata';
 
-import {urls} from '../src/config';
+import * as urls from '../src/config/urls';
 import {getSourceUrl, isProxyOrigin, parseUrlDeprecated} from '../src/url';
 
 /**
diff --git a/ads/alp/handler.js b/ads/alp/handler.js
index a0c85609b556..b52b6f7f70ff 100644
--- a/ads/alp/handler.js
+++ b/ads/alp/handler.js
@@ -3,7 +3,7 @@ import {parseQueryString} from '#core/types/string/url';
 
 import {dev} from '#utils/log';
 
-import {urls} from '../../src/config';
+import * as urls from '../../src/config/urls';
 import {openWindowDialog} from '../../src/open-window-dialog';
 import {
   addParamToUrl,
diff --git a/build-system/babel-config/minified-config.js b/build-system/babel-config/minified-config.js
index 925598c0a11f..79cda690a5d7 100644
--- a/build-system/babel-config/minified-config.js
+++ b/build-system/babel-config/minified-config.js
@@ -26,6 +26,7 @@ function getMinifiedConfig(buildFor = 'preact') {
 
   const plugins = [
     'optimize-objstr',
+    './build-system/babel-plugins/babel-plugin-deep-pure',
     './build-system/babel-plugins/babel-plugin-mangle-object-values',
     './build-system/babel-plugins/babel-plugin-jsx-style-object',
     getImportResolverPlugin(buildFor),
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/index.js b/build-system/babel-plugins/babel-plugin-deep-pure/index.js
new file mode 100644
index 000000000000..e81ea32d2d6d
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/index.js
@@ -0,0 +1,89 @@
+const pureFnName = 'pure';
+const pureFnImportSourceRe = new RegExp(
+  '(^#|/)core/types/pure(\\.{js,jsx,ts,tsx})?$'
+);
+
+/**
+ * Deeply adds #__PURE__ comments to an expression passed to a function named
+ * `pure()`.
+ * @param {import('@babel/core')} babel
+ * @return {import('@babel/core').PluginObj}
+ */
+module.exports = function (babel) {
+  const {types: t} = babel;
+
+  /**
+   * @param {import('@babel/core').NodePath} path
+   * @return {boolean}
+   */
+  function referencesPureFnImport(path) {
+    if (!path.isIdentifier()) {
+      return false;
+    }
+    const binding = path.scope.getBinding(path.node.name);
+    if (!binding || binding.kind !== 'module') {
+      return false;
+    }
+    const bindingPath = binding.path;
+    const parent = bindingPath.parentPath;
+    if (
+      !parent?.isImportDeclaration() ||
+      !pureFnImportSourceRe.test(parent?.node.source.value)
+    ) {
+      return false;
+    }
+    return (
+      bindingPath.isImportSpecifier() &&
+      t.isIdentifier(bindingPath.node.imported, {name: pureFnName})
+    );
+  }
+
+  /**
+   * @param {import('@babel/core').NodePath<import('@babel/types').CallExpression>} path
+   * @return {boolean}
+   */
+  function isPureFnCallExpression(path) {
+    return (
+      path.node.arguments.length === 1 &&
+      referencesPureFnImport(path.get('callee'))
+    );
+  }
+
+  /** @param {import('@babel/core').NodePath} path */
+  function addPureComment(path) {
+    path.addComment('leading', ' #__PURE__ ');
+  }
+
+  /** @param {import('@babel/core').NodePath<import('@babel/types').CallExpression>} path */
+  function replaceWithFirstArgument(path) {
+    path.replaceWith(path.node.arguments[0]);
+  }
+
+  return {
+    name: 'deep-pure',
+    visitor: {
+      CallExpression(path) {
+        if (isPureFnCallExpression(path)) {
+          path.traverse({
+            NewExpression(path) {
+              addPureComment(path);
+            },
+            CallExpression(path) {
+              if (isPureFnCallExpression(path)) {
+                replaceWithFirstArgument(path);
+              } else {
+                addPureComment(path);
+              }
+            },
+            MemberExpression(path) {
+              throw path.buildCodeFrameError(
+                `${pureFnName}() expressions cannot contain member expressions`
+              );
+            },
+          });
+          replaceWithFirstArgument(path);
+        }
+      },
+    },
+  };
+};
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs
new file mode 100644
index 000000000000..ed635b154ed1
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs
@@ -0,0 +1,2 @@
+import {pure} from '#core/types/pure';
+pure(error.memberExpression);
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json
new file mode 100644
index 000000000000..90cfd0869484
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json
@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "throws": "pure() expressions cannot contain member expressions"
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs
new file mode 100644
index 000000000000..88ef5e8f5e4e
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs
@@ -0,0 +1,4 @@
+import {pure} from 'something other than core/types/pure';
+const ignored = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs
new file mode 100644
index 000000000000..2f1bf185e592
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs
@@ -0,0 +1,2 @@
+import { pure } from 'something other than core/types/pure';
+const ignored = pure(foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo'));
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs
new file mode 100644
index 000000000000..897e0c8c815d
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs
@@ -0,0 +1,4 @@
+const pure = (v) => v;
+const ignored = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs
new file mode 100644
index 000000000000..195af8bae9b6
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs
@@ -0,0 +1,3 @@
+const pure = v => v;
+
+const ignored = pure(foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo'));
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/input.mjs
new file mode 100644
index 000000000000..4cfbe91c349b
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/input.mjs
@@ -0,0 +1,6 @@
+import {pure} from '#core/types/pure';
+const ignored = foo();
+const a = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
+const b = pure('foo');
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/output.mjs
new file mode 100644
index 000000000000..8b3ef0f0ac19
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-aliased-path/output.mjs
@@ -0,0 +1,4 @@
+import { pure } from '#core/types/pure';
+const ignored = foo();
+const a = /* #__PURE__ */foo() || /* #__PURE__ */new Bar() || /* #__PURE__ */foo('bar', /* #__PURE__ */bar(), /* #__PURE__ */new Baz()) || 'foo';
+const b = 'foo';
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/input.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/input.mjs
new file mode 100644
index 000000000000..bfe5e959b860
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/input.mjs
@@ -0,0 +1,6 @@
+import {pure} from '../../../../../../../src/core/types/pure';
+const ignored = foo();
+const a = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
+const b = pure('foo');
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/options.json b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/options.json
new file mode 100644
index 000000000000..3ebeb6374116
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/output.mjs b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/output.mjs
new file mode 100644
index 000000000000..7b5127c163dc
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform-relative-path/output.mjs
@@ -0,0 +1,4 @@
+import { pure } from '../../../../../../../src/core/types/pure';
+const ignored = foo();
+const a = /* #__PURE__ */foo() || /* #__PURE__ */new Bar() || /* #__PURE__ */foo('bar', /* #__PURE__ */bar(), /* #__PURE__ */new Baz()) || 'foo';
+const b = 'foo';
diff --git a/build-system/babel-plugins/babel-plugin-deep-pure/test/index.js b/build-system/babel-plugins/babel-plugin-deep-pure/test/index.js
new file mode 100644
index 000000000000..23251129fae9
--- /dev/null
+++ b/build-system/babel-plugins/babel-plugin-deep-pure/test/index.js
@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);
diff --git a/build-system/eslint-rules/no-export-side-effect.js b/build-system/eslint-rules/no-export-side-effect.js
index 391ece7d900e..4bb00e4c67b6 100644
--- a/build-system/eslint-rules/no-export-side-effect.js
+++ b/build-system/eslint-rules/no-export-side-effect.js
@@ -11,7 +11,12 @@ module.exports = function (context) {
               return declarator.init;
             })
             .filter(function (init) {
-              return init && /(?:Call|New)Expression/.test(init.type);
+              return (
+                init &&
+                /(?:Call|New)Expression/.test(init.type) &&
+                // Allow pure()
+                init.callee?.name !== 'pure'
+              );
             })
             .forEach(function (init) {
               context.report({
diff --git a/build-system/eslint-rules/no-import-rename.js b/build-system/eslint-rules/no-import-rename.js
index 72ed5765b6d0..4165ec8f8aa2 100644
--- a/build-system/eslint-rules/no-import-rename.js
+++ b/build-system/eslint-rules/no-import-rename.js
@@ -30,6 +30,7 @@ const imports = {
     'setStyles',
   ],
   '#core/types/enum': ['mangleObjectValues'],
+  '#core/types/pure': ['pure'],
   '#experiments': ['isExperimentOn'],
   '#utils/log': ['user', 'dev'],
   '#preact/utils': ['propName', 'tabindexFromProps'],
diff --git a/build-system/test-configs/dep-check-config.js b/build-system/test-configs/dep-check-config.js
index 511a25b6e6b0..f6bbce0a15ee 100644
--- a/build-system/test-configs/dep-check-config.js
+++ b/build-system/test-configs/dep-check-config.js
@@ -79,7 +79,7 @@ exports.rules = [
     allowlist: [
       '3p/**->src/utils/log.js',
       '3p/**->src/url.js',
-      '3p/**->src/config.js',
+      '3p/**->src/config/urls.js',
       '3p/**->src/mode.js',
       '3p/polyfills.js->src/polyfills/math-sign.js',
       '3p/polyfills.js->src/polyfills/object-assign.js',
diff --git a/build-system/test-configs/forbidden-terms.js b/build-system/test-configs/forbidden-terms.js
index 14f2a7ce06b2..a685b786ac46 100644
--- a/build-system/test-configs/forbidden-terms.js
+++ b/build-system/test-configs/forbidden-terms.js
@@ -633,7 +633,7 @@ const forbiddenTermsGlobal = {
       'build-system/tasks/build.js',
       'build-system/tasks/default-task.js',
       'build-system/tasks/dist.js',
-      'src/config.js',
+      'src/config/urls.js',
       'src/experiments/index.js',
       'src/mode.js',
       'src/core/mode/test.js',
@@ -922,7 +922,7 @@ const forbiddenTermsSrcInclusive = {
   '(cdn|3p)\\.ampproject\\.': {
     message:
       'The CDN domain should typically not be hardcoded in source ' +
-      'code. Use a property of urls from src/config.js instead.',
+      'code. Use urls from src/config/urls.js instead.',
     allowlist: [
       'ads/_a4a-config.js',
       'build-system/server/amp4test.js',
@@ -936,7 +936,7 @@ const forbiddenTermsSrcInclusive = {
       'build-system/tasks/performance/helpers.js',
       'src/3p-frame.js',
       'src/amp-story-player/amp-story-player-impl.js',
-      'src/config.js',
+      'src/config/urls.js',
       'testing/local-amp-chrome-extension/background.js',
       'tools/experiments/experiments.js',
       'validator/js/engine/htmlparser-interface.js',
diff --git a/extensions/amp-a4a/0.1/amp-ad-template-helper.js b/extensions/amp-a4a/0.1/amp-ad-template-helper.js
index b914931f1355..e27f1642eaba 100644
--- a/extensions/amp-a4a/0.1/amp-ad-template-helper.js
+++ b/extensions/amp-a4a/0.1/amp-ad-template-helper.js
@@ -6,7 +6,7 @@ import {Services} from '#service';
 
 import {devAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {
   getServiceForDoc,
diff --git a/extensions/amp-a4a/0.1/amp-ad-utils.js b/extensions/amp-a4a/0.1/amp-ad-utils.js
index 970f408546f2..8ef16fb1853f 100644
--- a/extensions/amp-a4a/0.1/amp-ad-utils.js
+++ b/extensions/amp-a4a/0.1/amp-ad-utils.js
@@ -6,7 +6,7 @@ import {parseExtensionUrl} from '#service/extension-script';
 
 import {dev} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {isSecureUrlDeprecated} from '../../../src/url';
 
 const TAG = 'amp-ad-util';
diff --git a/extensions/amp-a4a/0.1/head-validation.js b/extensions/amp-a4a/0.1/head-validation.js
index 1e60cc0e22ce..3f0e86304602 100644
--- a/extensions/amp-a4a/0.1/head-validation.js
+++ b/extensions/amp-a4a/0.1/head-validation.js
@@ -5,7 +5,7 @@ import {includes} from '#core/types/string';
 import {Services} from '#service';
 import {parseExtensionUrl} from '#service/extension-script';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {preloadFriendlyIframeEmbedExtensions} from '../../../src/friendly-iframe-embed';
 import {getMode} from '../../../src/mode';
 
diff --git a/extensions/amp-a4a/0.1/template-validator.js b/extensions/amp-a4a/0.1/template-validator.js
index 2595f32548c3..a6c27c315296 100644
--- a/extensions/amp-a4a/0.1/template-validator.js
+++ b/extensions/amp-a4a/0.1/template-validator.js
@@ -10,7 +10,7 @@ import {
   mergeExtensionsMetadata,
 } from './amp-ad-utils';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {preloadFriendlyIframeEmbedExtensions} from '../../../src/friendly-iframe-embed';
 
 /** @const {string} */
diff --git a/extensions/amp-access/0.1/login-dialog.js b/extensions/amp-access/0.1/login-dialog.js
index 6467e9cc6a15..9289f5a2d995 100644
--- a/extensions/amp-access/0.1/login-dialog.js
+++ b/extensions/amp-access/0.1/login-dialog.js
@@ -3,7 +3,7 @@ import {Services} from '#service';
 import {getData, listen} from '#utils/event-helper';
 import {dev, userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {openWindowDialog} from '../../../src/open-window-dialog';
 import {parseUrlDeprecated} from '../../../src/url';
diff --git a/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js b/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js
index 1d1abdf353b8..a162f53cd9de 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js
+++ b/extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js
@@ -1,6 +1,6 @@
 import {endsWith} from '#core/types/string';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 
 export class ExternalReorderHeadTransformer {
   /** constructor */
diff --git a/extensions/amp-analytics/0.1/iframe-transport.js b/extensions/amp-analytics/0.1/iframe-transport.js
index 304ce0c35192..14d282643a22 100644
--- a/extensions/amp-analytics/0.1/iframe-transport.js
+++ b/extensions/amp-analytics/0.1/iframe-transport.js
@@ -7,7 +7,7 @@ import {devAssert, user} from '#utils/log';
 
 import {IframeTransportMessageQueue} from './iframe-transport-message-queue';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 /**
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport.js b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
index 8de2aa7b909b..2c30d02ec159 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
@@ -2,7 +2,7 @@ import {user} from '#utils/log';
 
 import {expectPostMessage} from '#testing/iframe';
 
-import {urls} from '../../../../src/config';
+import * as urls from '../../../../src/config/urls';
 import {addParamsToUrl} from '../../../../src/url';
 import {
   IframeTransport,
diff --git a/extensions/amp-cache-url/0.1/amp-cache-url.js b/extensions/amp-cache-url/0.1/amp-cache-url.js
index c6fc0e087f61..add3d6bfaed3 100644
--- a/extensions/amp-cache-url/0.1/amp-cache-url.js
+++ b/extensions/amp-cache-url/0.1/amp-cache-url.js
@@ -1,6 +1,6 @@
 import * as ampToolboxCacheUrl from '@ampproject/toolbox-cache-url';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 
 export class AmpCacheUrlService {
   /**
diff --git a/extensions/amp-geo/0.1/amp-geo.js b/extensions/amp-geo/0.1/amp-geo.js
index ec2c48ce5c50..a0e584974126 100644
--- a/extensions/amp-geo/0.1/amp-geo.js
+++ b/extensions/amp-geo/0.1/amp-geo.js
@@ -41,7 +41,7 @@ import {dev, user, userAssert} from '#utils/log';
 import {GEO_IN_GROUP} from './amp-geo-in-group';
 import {ampGeoPresets} from './amp-geo-presets';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 /** @const */
diff --git a/extensions/amp-geo/0.1/test/test-amp-geo.js b/extensions/amp-geo/0.1/test/test-amp-geo.js
index 4f6ff6176133..c969e094356d 100644
--- a/extensions/amp-geo/0.1/test/test-amp-geo.js
+++ b/extensions/amp-geo/0.1/test/test-amp-geo.js
@@ -3,7 +3,7 @@ import {vsyncForTesting} from '#service/vsync-impl';
 
 import {user} from '#utils/log';
 
-import {urls} from '../../../../src/config';
+import * as urls from '../../../../src/config/urls';
 import {AmpGeo} from '../amp-geo';
 import {GEO_IN_GROUP} from '../amp-geo-in-group';
 
diff --git a/extensions/amp-iframe/0.1/amp-iframe.js b/extensions/amp-iframe/0.1/amp-iframe.js
index 37191421d255..bdfd39501465 100644
--- a/extensions/amp-iframe/0.1/amp-iframe.js
+++ b/extensions/amp-iframe/0.1/amp-iframe.js
@@ -25,7 +25,7 @@ import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host';
 import {user, userAssert} from '#utils/log';
 
 import {isAdPositionAllowed} from '../../../src/ad-helper';
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getConsentDataToForward} from '../../../src/consent';
 import {
   isAdLike,
diff --git a/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js b/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
index ecdcdd13fac7..ecebd0ce33ff 100644
--- a/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
+++ b/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
@@ -7,7 +7,7 @@ import {Services} from '#service';
 import {listen} from '#utils/event-helper';
 import {dev, user, userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {removeFragment} from '../../../src/url';
 
diff --git a/extensions/amp-mraid/0.1/amp-mraid.js b/extensions/amp-mraid/0.1/amp-mraid.js
index 2fc02250bf0e..4c2ec4c22470 100644
--- a/extensions/amp-mraid/0.1/amp-mraid.js
+++ b/extensions/amp-mraid/0.1/amp-mraid.js
@@ -26,7 +26,7 @@ import {dev} from '#utils/log';
 
 import {MraidService} from './mraid-service';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 const TAG = 'amp-mraid';
diff --git a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
index f32cde122cbd..7df6232c2d21 100644
--- a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
+++ b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
@@ -13,7 +13,7 @@ import {Services} from '#service';
 import {loadPromise} from '#utils/event-helper';
 import {dev, devAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {listenFor, postMessage} from '../../../src/iframe-helper';
 import {getMode} from '../../../src/mode';
 import {getServicePromiseForDoc} from '../../../src/service-helpers';
diff --git a/extensions/amp-script/0.1/amp-script.js b/extensions/amp-script/0.1/amp-script.js
index ac22be8f6472..8a4c1ac580de 100644
--- a/extensions/amp-script/0.1/amp-script.js
+++ b/extensions/amp-script/0.1/amp-script.js
@@ -22,7 +22,7 @@ import {dev, user, userAssert} from '#utils/log';
 import {UserActivationTracker} from './user-activation-tracker';
 
 import {CSS} from '../../../build/amp-script-0.1.css';
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getElementServiceForDoc} from '../../../src/element-service';
 import {cancellation} from '../../../src/error-reporting';
 import {getMode} from '../../../src/mode';
diff --git a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js
index 607ab31af106..fa89d5f93607 100644
--- a/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js
+++ b/extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js
@@ -5,7 +5,7 @@ import {Services} from '#service';
 
 import {userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {loadScript} from '../../../src/validator-integration';
 
 /**
diff --git a/src/3p-frame.js b/src/3p-frame.js
index b62f47aeea9e..38e86a6ac1a2 100644
--- a/src/3p-frame.js
+++ b/src/3p-frame.js
@@ -5,7 +5,7 @@ import {tryParseJson} from '#core/types/object/json';
 
 import {dev, devAssert, user, userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getContextMetadata} from './iframe-attributes';
 import {assertHttpsUrl, parseUrlDeprecated} from './url';
 
diff --git a/src/amp-story-player/amp-story-player-impl.js b/src/amp-story-player/amp-story-player-impl.js
index bde26a0f44ec..db803bba22f3 100644
--- a/src/amp-story-player/amp-story-player-impl.js
+++ b/src/amp-story-player/amp-story-player-impl.js
@@ -20,7 +20,7 @@ import {PageScroller} from './page-scroller';
 
 import {cssText} from '../../build/amp-story-player-shadow.css';
 import {applySandbox} from '../3p-frame';
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {getMode} from '../mode';
 import {
   addParamsToUrl,
diff --git a/src/config.js b/src/config.js
deleted file mode 100644
index c33d90e859a9..000000000000
--- a/src/config.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Allows for runtime configuration. Internally, the runtime should
- * use the src/config.js module for various constants. We can use the
- * AMP_CONFIG global to translate user-defined configurations to this
- * module.
- * @type {!Object<string, string>}
- */
-const env = self.AMP_CONFIG || {};
-
-const thirdPartyFrameRegex =
-  (typeof env['thirdPartyFrameRegex'] == 'string'
-    ? new RegExp(env['thirdPartyFrameRegex'])
-    : env['thirdPartyFrameRegex']) || /^d-\d+\.ampproject\.net$/;
-
-const cdnProxyRegex =
-  (typeof env['cdnProxyRegex'] == 'string'
-    ? new RegExp(env['cdnProxyRegex'])
-    : env['cdnProxyRegex']) ||
-  /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org$/;
-
-/**
- * Check for a custom URL definition in special <meta> tags. Note that this does
- * not allow for distinct custom URLs in AmpDocShadow instances. The shell is
- * allowed to define one set of custom URLs via AMP_CONFIG (recommended) or by
- * including <meta> tags in the shell <head>. Those custom URLs then apply to
- * all AMP documents loaded in the shell.
- * @param {string} name
- * @return {?string}
- * @private
- */
-function getMetaUrl(name) {
-  // Avoid exceptions in unit tests
-  if (!self.document || !self.document.head) {
-    return null;
-  }
-
-  // Disallow on proxy origins
-  if (self.location && cdnProxyRegex.test(self.location.origin)) {
-    return null;
-  }
-
-  const metaEl = self.document.head./*OK*/ querySelector(
-    `meta[name="${name}"]`
-  );
-  return (metaEl && metaEl.getAttribute('content')) || null;
-}
-
-/**
- * @typedef {{
- *   thirdParty: string,
- *   thirdPartyFrameHost: string,
- *   thirdPartyFrameRegex: !RegExp,
- *   cdn: string,
- *   cdnProxyRegex: !RegExp,
- *   localhostRegex: !RegExp,
- *   errorReporting: string,
- *   betaErrorReporting: string,
- *   localDev: boolean,
- *   trustedViewerHosts: !Array<!RegExp>,
- *   geoApi: ?string,
- * }}
- */
-export const urls = {
-  thirdParty: env['thirdPartyUrl'] || 'https://3p.ampproject.net',
-  thirdPartyFrameHost: env['thirdPartyFrameHost'] || 'ampproject.net',
-  thirdPartyFrameRegex,
-  cdn:
-    env['cdnUrl'] || getMetaUrl('runtime-host') || 'https://cdn.ampproject.org',
-  /* Note that cdnProxyRegex is only ever checked against origins
-   * (proto://host[:port]) so does not need to consider path
-   */
-  cdnProxyRegex,
-  localhostRegex: /^https?:\/\/localhost(:\d+)?$/,
-  errorReporting:
-    env['errorReportingUrl'] ||
-    'https://us-central1-amp-error-reporting.cloudfunctions.net/r',
-  betaErrorReporting:
-    env['betaErrorReportingUrl'] ||
-    'https://us-central1-amp-error-reporting.cloudfunctions.net/r-beta',
-  localDev: env['localDev'] || false,
-  /**
-   * These domains are trusted with more sensitive viewer operations such as
-   * propagating the referrer. If you believe your domain should be here,
-   * file the issue on GitHub to discuss. The process will be similar
-   * (but somewhat more stringent) to the one described in the [3p/README.md](
-   * https://github.com/ampproject/amphtml/blob/main/3p/README.md)
-   *
-   * {!Array<!RegExp>}
-   */
-  trustedViewerHosts: [
-    /(^|\.)google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)$/,
-    /(^|\.)gmail\.(com|dev)$/,
-  ],
-  // Optional fallback API if amp-geo is left unpatched
-  geoApi: env['geoApiUrl'] || getMetaUrl('amp-geo-api'),
-};
-
-export const config = {
-  urls,
-};
diff --git a/src/config/urls.js b/src/config/urls.js
new file mode 100644
index 000000000000..ecc6ec4f200d
--- /dev/null
+++ b/src/config/urls.js
@@ -0,0 +1,99 @@
+import {pure} from '#core/types/pure';
+
+/**
+ * Allows for runtime configuration. Internally, the runtime should import this
+ * module for various constants. We can use the AMP_CONFIG global to translate
+ * user-defined configurations to this module.
+ * @param {string} key
+ * @return {any}
+ */
+const env = (key) => (self.AMP_CONFIG ? self.AMP_CONFIG[key] : null);
+
+// Important: Make sure to wrap every exported symbol with `pure()`. This allows
+// this module to be dead-code-eliminated.
+
+/* Note that cdnProxyRegex is only ever checked against origins
+ * (proto://host[:port]) so does not need to consider path
+ */
+export const cdnProxyRegex = pure(
+  (typeof env('cdnProxyRegex') == 'string'
+    ? new RegExp(env('cdnProxyRegex'))
+    : env('cdnProxyRegex')) ||
+    /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org$/
+);
+
+/**
+ * Check for a custom URL definition in special <meta> tags. Note that this does
+ * not allow for distinct custom URLs in AmpDocShadow instances. The shell is
+ * allowed to define one set of custom URLs via AMP_CONFIG (recommended) or by
+ * including <meta> tags in the shell <head>. Those custom URLs then apply to
+ * all AMP documents loaded in the shell.
+ * @param {string} name
+ * @return {?string}
+ * @private
+ */
+function getMetaUrl(name) {
+  // Avoid exceptions in unit tests
+  if (!self.document || !self.document.head) {
+    return null;
+  }
+
+  // Disallow on proxy origins
+  if (self.location && cdnProxyRegex.test(self.location.origin)) {
+    return null;
+  }
+
+  const metaEl = self.document.head./*OK*/ querySelector(
+    `meta[name="${name}"]`
+  );
+  return (metaEl && metaEl.getAttribute('content')) || null;
+}
+
+export const thirdParty = pure(
+  env('thirdPartyUrl') || 'https://3p.ampproject.net'
+);
+
+export const thirdPartyFrameHost = pure(
+  env('thirdPartyFrameHost') || 'ampproject.net'
+);
+
+export const thirdPartyFrameRegex = pure(
+  (typeof env('thirdPartyFrameRegex') == 'string'
+    ? new RegExp(env('thirdPartyFrameRegex'))
+    : env('thirdPartyFrameRegex')) || /^d-\d+\.ampproject\.net$/
+);
+
+export const cdn = pure(
+  env('cdnUrl') || getMetaUrl('runtime-host') || 'https://cdn.ampproject.org'
+);
+
+export const localhostRegex = pure(/^https?:\/\/localhost(:\d+)?$/);
+
+export const errorReporting = pure(
+  env('errorReportingUrl') ||
+    'https://us-central1-amp-error-reporting.cloudfunctions.net/r'
+);
+
+export const betaErrorReporting = pure(
+  env('betaErrorReportingUrl') ||
+    'https://us-central1-amp-error-reporting.cloudfunctions.net/r-beta'
+);
+
+export const localDev = pure(env('localDev') || false);
+
+/**
+ * These domains are trusted with more sensitive viewer operations such as
+ * propagating the referrer. If you believe your domain should be here,
+ * file the issue on GitHub to discuss. The process will be similar
+ * (but somewhat more stringent) to the one described in the [3p/README.md](
+ * https://github.com/ampproject/amphtml/blob/main/3p/README.md)
+ *
+ * @type {!Array<!RegExp>}
+ */
+export const trustedViewerHosts = pure([
+  /(^|\.)google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)$/,
+  /(^|\.)gmail\.(com|dev)$/,
+]);
+
+// Optional fallback API if amp-geo is left unpatched
+export const geoApi = pure(env('geoApiUrl') || getMetaUrl('amp-geo-api'));
diff --git a/src/cookies.js b/src/cookies.js
index 7679b1fee28c..455d223bcfe3 100644
--- a/src/cookies.js
+++ b/src/cookies.js
@@ -3,7 +3,7 @@ import {tryDecodeUriComponent} from '#core/types/string/url';
 
 import {userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getSourceOrigin, isProxyOrigin, parseUrlDeprecated} from './url';
 
 const TEST_COOKIE_NAME = '-test-amp-cookie-tmp';
diff --git a/src/core/types/pure.js b/src/core/types/pure.js
new file mode 100644
index 000000000000..f323c1202be0
--- /dev/null
+++ b/src/core/types/pure.js
@@ -0,0 +1,9 @@
+/**
+ * No effect on runtime. Merely an annotation for the compiler to deeply add
+ * #__PURE__ comments to an expression
+ * See babel-plugin-deep-pure
+ * @param {T} value
+ * @return {T}
+ * @template T
+ */
+export const pure = (value) => value;
diff --git a/src/error-reporting.js b/src/error-reporting.js
index e182dd3e0aea..3d1228e12a25 100644
--- a/src/error-reporting.js
+++ b/src/error-reporting.js
@@ -17,7 +17,7 @@ import {triggerAnalyticsEvent} from '#utils/analytics';
 import {isLoadErrorMessage} from '#utils/event-helper';
 import {dev, setReportError} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getMode} from './mode';
 import {makeBodyVisibleRecovery} from './style-installer';
 import {isProxyOrigin} from './url';
diff --git a/src/font-stylesheet-timeout.js b/src/font-stylesheet-timeout.js
index 94213ce64949..e6157528653e 100644
--- a/src/font-stylesheet-timeout.js
+++ b/src/font-stylesheet-timeout.js
@@ -1,7 +1,7 @@
 import {onDocumentReady} from '#core/document/ready';
 import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 
 /**
  * While browsers put a timeout on font downloads (3s by default,
diff --git a/src/friendly-iframe-embed.js b/src/friendly-iframe-embed.js
index 1cea47afa0d3..51842d6a19b2 100644
--- a/src/friendly-iframe-embed.js
+++ b/src/friendly-iframe-embed.js
@@ -29,7 +29,7 @@ import {installTimerInEmbedWindow} from '#service/timer-impl';
 import {loadPromise} from '#utils/event-helper';
 import {dev, devAssert, userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {FIE_EMBED_PROP} from './iframe-helper';
 import {whenContentIniLoad} from './ini-load';
 import {getMode} from './mode';
diff --git a/src/iframe-attributes.js b/src/iframe-attributes.js
index 8ec7fc0538f8..dd03f47fbeaf 100644
--- a/src/iframe-attributes.js
+++ b/src/iframe-attributes.js
@@ -7,7 +7,7 @@ import {experimentToggles, isCanary} from '#experiments';
 
 import {Services} from '#service';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getModeObject} from './mode-object';
 
 /**
diff --git a/src/runtime.js b/src/runtime.js
index b93edc60eea0..120fa4708d35 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -27,7 +27,7 @@ import {
 
 import {BaseElement} from './base-element';
 import {startupChunk} from './chunk';
-import {config} from './config';
+import * as urls from './config/urls';
 import {reportErrorForWin} from './error-reporting';
 import {getMode} from './mode';
 import {MultidocManager} from './multidoc-manager';
@@ -106,8 +106,38 @@ function adoptShared(global, callback) {
     };
   }
 
-  /** @const */
-  global.AMP.config = config;
+  /**
+   * @const {{
+   *   urls: {
+   *     thirdParty: string,
+   *     thirdPartyFrameHost: string,
+   *     thirdPartyFrameRegex: !RegExp,
+   *     cdn: string,
+   *     cdnProxyRegex: !RegExp,
+   *     localhostRegex: !RegExp,
+   *     errorReporting: string,
+   *     betaErrorReporting: string,
+   *     localDev: boolean,
+   *     trustedViewerHosts: !Array<!RegExp>,
+   *     geoApi: ?string,
+   *   }
+   * }}
+   */
+  global.AMP.config = {
+    urls: {
+      thirdParty: urls.thirdParty,
+      thirdPartyFrameHost: urls.thirdPartyFrameHost,
+      thirdPartyFrameRegex: urls.thirdPartyFrameRegex,
+      cdn: urls.cdn,
+      cdnProxyRegex: urls.cdnProxyRegex,
+      localhostRegex: urls.localhostRegex,
+      errorReporting: urls.errorReporting,
+      betaErrorReporting: urls.betaErrorReporting,
+      localDev: urls.localDev,
+      trustedViewerHosts: urls.trustedViewerHosts,
+      geoApi: urls.geoApi,
+    },
+  };
 
   global.AMP.BaseElement = BaseElement;
 
diff --git a/src/service/extension-script.js b/src/service/extension-script.js
index b63a3ee15471..d18bc1014668 100644
--- a/src/service/extension-script.js
+++ b/src/service/extension-script.js
@@ -1,7 +1,7 @@
 import {propagateNonce} from '#core/dom';
 import * as mode from '#core/mode';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {getMode} from '../mode';
 
 const CUSTOM_TEMPLATES = ['amp-mustache'];
diff --git a/src/service/url-impl.js b/src/service/url-impl.js
index f0d652fdd334..a6e51ed62c65 100644
--- a/src/service/url-impl.js
+++ b/src/service/url-impl.js
@@ -1,7 +1,7 @@
 import {LruCache} from '#core/data-structures/lru-cache';
 import * as mode from '#core/mode';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {registerServiceBuilderForDoc} from '../service-helpers';
 import {
   assertAbsoluteHttpOrHttpsUrl,
diff --git a/src/service/viewer-impl.js b/src/service/viewer-impl.js
index 950fdafbcbab..3fc6477e6942 100644
--- a/src/service/viewer-impl.js
+++ b/src/service/viewer-impl.js
@@ -17,7 +17,7 @@ import {dev, devAssert} from '#utils/log';
 
 import {ViewerInterface} from './viewer-interface';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {reportError} from '../error-reporting';
 import {registerServiceBuilderForDoc} from '../service-helpers';
 import {
diff --git a/src/url-rewrite.js b/src/url-rewrite.js
index ed6f753f6cc8..bf5d270d4b5f 100644
--- a/src/url-rewrite.js
+++ b/src/url-rewrite.js
@@ -2,7 +2,7 @@ import {parseSrcset} from '#core/dom/srcset';
 
 import {user} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {
   checkCorsUrl,
   getSourceUrl,
diff --git a/src/url.js b/src/url.js
index 5d36f6afeee5..b90b07195c11 100644
--- a/src/url.js
+++ b/src/url.js
@@ -7,7 +7,7 @@ import {INVALID_PROTOCOLS, parseQueryString} from '#core/types/string/url';
 
 import {userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 
 const SERVING_TYPE_PREFIX = new Set([
   // No viewer
diff --git a/src/utils/log.js b/src/utils/log.js
index fdb705daafb5..21107c14736d 100644
--- a/src/utils/log.js
+++ b/src/utils/log.js
@@ -16,7 +16,7 @@ import {isArray, isString} from '#core/types';
 import {once} from '#core/types/function';
 import {getHashParams} from '#core/types/string/url';
 
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {getMode} from '../mode';
 
 const noop = () => {};
diff --git a/src/validator-integration.js b/src/validator-integration.js
index 3bb53a3d9b52..7dc42e37ba52 100644
--- a/src/validator-integration.js
+++ b/src/validator-integration.js
@@ -3,7 +3,7 @@ import {getHashParams} from '#core/types/string/url';
 
 import {loadPromise} from '#utils/event-helper';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {isModeDevelopment} from './mode';
 
 /**
diff --git a/src/web-worker/web-worker.js b/src/web-worker/web-worker.js
index 35f65d0fae57..c4f1fd4de34c 100644
--- a/src/web-worker/web-worker.js
+++ b/src/web-worker/web-worker.js
@@ -11,7 +11,7 @@ import {exponentialBackoff} from '#core/types/function/exponential-backoff';
 import {dev, initLogConstructor, setReportError} from '#utils/log';
 
 import {BindEvaluator} from '../../extensions/amp-bind/0.1/bind-evaluator';
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {reportError} from '../error-reporting';
 
 initLogConstructor();
diff --git a/test/unit/3p/test-recaptcha.js b/test/unit/3p/test-recaptcha.js
index 5ffed3833adc..2f6491e0e8ac 100644
--- a/test/unit/3p/test-recaptcha.js
+++ b/test/unit/3p/test-recaptcha.js
@@ -1,6 +1,6 @@
 import {doesOriginDomainMatchIframeSrc, initRecaptcha} from '#3p/recaptcha';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {parseUrlDeprecated} from '../../../src/url';
 
 describes.sandboxed('3p recaptcha.js', {}, () => {