From b2c4531b1fba2fafddc6fda82407af914429c770 Mon Sep 17 00:00:00 2001
From: Alan Orozco <alan@orozco.xyz>
Date: Fri, 1 Apr 2022 14:38:11 -0700
Subject: [PATCH] missing changes

---
 src/3p-frame.js                               | 2 +-
 src/amp-story-player/amp-story-player-impl.js | 2 +-
 src/cookies.js                                | 2 +-
 src/error-reporting.js                        | 2 +-
 src/font-stylesheet-timeout.js                | 2 +-
 src/friendly-iframe-embed.js                  | 2 +-
 src/iframe-attributes.js                      | 2 +-
 src/service/extension-script.js               | 2 +-
 src/service/url-impl.js                       | 2 +-
 src/service/viewer-impl.js                    | 2 +-
 src/url-rewrite.js                            | 2 +-
 src/utils/log.js                              | 2 +-
 src/validator-integration.js                  | 2 +-
 src/web-worker/web-worker.js                  | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

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/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/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/service/extension-script.js b/src/service/extension-script.js
index f3274df8c043..9e5cd7184564 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/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();