diff --git a/3p/3d-gltf/index.js b/3p/3d-gltf/index.js index 58d830013bb0..86f0a874b0ab 100644 --- a/3p/3d-gltf/index.js +++ b/3p/3d-gltf/index.js @@ -6,9 +6,9 @@ import {listenParent, nonSensitiveDataPostMessage} from '#3p/messaging'; import {dict} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; -import GltfViewer from './viewer'; +import {user} from '#utils/log'; -import {user} from '../../src/log'; +import GltfViewer from './viewer'; const seq = (taskA, taskB) => (cb) => taskA(() => taskB(cb)); const parallel = (taskA, taskB) => (cb) => { diff --git a/3p/3p.js b/3p/3p.js index 30098c7ac538..e223027de451 100644 --- a/3p/3p.js +++ b/3p/3p.js @@ -9,7 +9,7 @@ import {rethrowAsync} from '#core/error'; import {isArray} from '#core/types'; import {hasOwn, map} from '#core/types/object'; -import {devAssert, userAssert} from '../src/log'; +import {devAssert, userAssert} from '#utils/log'; /** @typedef {function(!Window, !Object)} */ let ThirdPartyFunctionDef; diff --git a/3p/ampcontext-integration.js b/3p/ampcontext-integration.js index 325a6fcd725c..aea522c64b2e 100644 --- a/3p/ampcontext-integration.js +++ b/3p/ampcontext-integration.js @@ -1,10 +1,10 @@ import {dict} from '#core/types/object'; +import {dev, user, userAssert} from '#utils/log'; + import {computeInMasterFrame} from './3p'; import {AbstractAmpContext} from './ampcontext'; -import {dev, user, userAssert} from '../src/log'; - /** * Returns the "master frame" for all widgets of a given type. * This frame should be used to e.g. fetch scripts that can diff --git a/3p/ampcontext-lib.js b/3p/ampcontext-lib.js index 5557e3d8829f..f86cd97531d2 100644 --- a/3p/ampcontext-lib.js +++ b/3p/ampcontext-lib.js @@ -1,9 +1,9 @@ // src/polyfills.js must be the first import. import './polyfills'; -import {AmpContext} from './ampcontext'; +import {initLogConstructor, setReportError} from '#utils/log'; -import {initLogConstructor, setReportError} from '../src/log'; +import {AmpContext} from './ampcontext'; initLogConstructor(); diff --git a/3p/ampcontext.js b/3p/ampcontext.js index 7e1493600750..87f922dbbd6b 100644 --- a/3p/ampcontext.js +++ b/3p/ampcontext.js @@ -5,9 +5,10 @@ import {isObject} from '#core/types'; import {dict, map} from '#core/types/object'; import {tryParseJson} from '#core/types/object/json'; +import {dev, devAssert} from '#utils/log'; + import {IframeMessagingClient} from './iframe-messaging-client'; -import {dev, devAssert} from '../src/log'; import {parseUrlDeprecated} from '../src/url'; export class AbstractAmpContext { diff --git a/3p/bodymovinanimation.js b/3p/bodymovinanimation.js index 35779b24d6ad..c60a3b2f3120 100644 --- a/3p/bodymovinanimation.js +++ b/3p/bodymovinanimation.js @@ -3,9 +3,9 @@ import {tryPlay} from '#core/dom/video'; import {dict} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; -import {loadScript} from './3p'; +import {getData} from '#utils/event-helper'; -import {getData} from '../src/event-helper'; +import {loadScript} from './3p'; const libSourceUrl = dict({ 'canvas': diff --git a/3p/facebook.js b/3p/facebook.js index 519395bd556f..83fd622a2a97 100644 --- a/3p/facebook.js +++ b/3p/facebook.js @@ -3,9 +3,9 @@ import {isEnumValue} from '#core/types/enum'; import {dict} from '#core/types/object'; import {dashToUnderline} from '#core/types/string'; -import {loadScript} from './3p'; +import {devAssert} from '#utils/log'; -import {devAssert} from '../src/log'; +import {loadScript} from './3p'; /** @const @enum {string} */ export const FacebookEmbedType = { diff --git a/3p/frame-metadata.js b/3p/frame-metadata.js index c678afcd63b4..e7f65673e120 100644 --- a/3p/frame-metadata.js +++ b/3p/frame-metadata.js @@ -2,7 +2,8 @@ import {once} from '#core/types/function'; import {dict} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; -import {dev} from '../src/log'; +import {dev} from '#utils/log'; + import {getMode} from '../src/mode'; import {parseUrlDeprecated} from '../src/url'; diff --git a/3p/github.js b/3p/github.js index 155b9fce25de..45f69a641d74 100644 --- a/3p/github.js +++ b/3p/github.js @@ -1,6 +1,6 @@ -import {writeScript} from './3p'; +import {userAssert} from '#utils/log'; -import {userAssert} from '../src/log'; +import {writeScript} from './3p'; /** * Get the correct script for the gist. diff --git a/3p/iframe-messaging-client.js b/3p/iframe-messaging-client.js index 52e8c2510813..f4215813adea 100644 --- a/3p/iframe-messaging-client.js +++ b/3p/iframe-messaging-client.js @@ -7,8 +7,9 @@ import { import {Observable} from '#core/data-structures/observable'; import {dict, map} from '#core/types/object'; -import {getData} from '../src/event-helper'; -import {dev} from '../src/log'; +import {getData} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {getMode} from '../src/mode'; export class IframeMessagingClient { diff --git a/3p/iframe-transport-client-lib.js b/3p/iframe-transport-client-lib.js index 068111f5f967..1a838fee51cd 100644 --- a/3p/iframe-transport-client-lib.js +++ b/3p/iframe-transport-client-lib.js @@ -1,9 +1,9 @@ // src/polyfills.js must be the first import. import './polyfills'; -import {IframeTransportClient} from './iframe-transport-client'; +import {initLogConstructor, setReportError} from '#utils/log'; -import {initLogConstructor, setReportError} from '../src/log'; +import {IframeTransportClient} from './iframe-transport-client'; initLogConstructor(); // TODO(alanorozco): Refactor src/error.reportError so it does not contain big diff --git a/3p/iframe-transport-client.js b/3p/iframe-transport-client.js index 2ea317eb8354..58d7c26dc24c 100644 --- a/3p/iframe-transport-client.js +++ b/3p/iframe-transport-client.js @@ -1,9 +1,9 @@ import {IframeTransportEventDef, MessageType} from '#core/3p-frame-messaging'; import {tryParseJson} from '#core/types/object/json'; -import {IframeMessagingClient} from './iframe-messaging-client'; +import {dev, devAssert, user, userAssert} from '#utils/log'; -import {dev, devAssert, user, userAssert} from '../src/log'; +import {IframeMessagingClient} from './iframe-messaging-client'; /** @private @const {string} */ const TAG_ = 'iframe-transport-client'; diff --git a/3p/integration-lib.js b/3p/integration-lib.js index ae3fe9eec2eb..7181fc23752b 100644 --- a/3p/integration-lib.js +++ b/3p/integration-lib.js @@ -3,18 +3,19 @@ import {dict} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; import {endsWith} from '#core/types/string'; +import { + initLogConstructor, + isUserErrorMessage, + setReportError, + userAssert, +} from '#utils/log'; + import {run, setExperimentToggles} from './3p'; import {IntegrationAmpContext} from './ampcontext-integration'; import {installEmbedStateListener, manageWin} from './environment'; import {getAmpConfig, getEmbedType, getLocation} from './frame-metadata'; import {urls} from '../src/config'; -import { - initLogConstructor, - isUserErrorMessage, - setReportError, - userAssert, -} from '../src/log'; import {getSourceUrl, isProxyOrigin, parseUrlDeprecated} from '../src/url'; /** diff --git a/3p/integration.js b/3p/integration.js index 4197e32b6083..bbde59e38a71 100644 --- a/3p/integration.js +++ b/3p/integration.js @@ -13,7 +13,7 @@ import './polyfills'; import {draw3p, init} from './integration-lib'; import {getMode} from '../src/mode'; import {register} from './3p'; -import {user} from 'src/log'; +import {user} from '#utils/log'; // 3P - please keep in alphabetic order import {beopinion} from './beopinion'; diff --git a/3p/mathml.js b/3p/mathml.js index dd4bb6088290..6f202ffeab40 100644 --- a/3p/mathml.js +++ b/3p/mathml.js @@ -1,8 +1,8 @@ import {setStyle} from '#core/dom/style'; -import {writeScript} from './3p'; +import {userAssert} from '#utils/log'; -import {userAssert} from '../src/log'; +import {writeScript} from './3p'; /** * Get the correct script for the mathml formula. diff --git a/3p/messaging.js b/3p/messaging.js index b3d7b14a70dd..546309b6c162 100644 --- a/3p/messaging.js +++ b/3p/messaging.js @@ -1,6 +1,6 @@ import {parseJson} from '#core/types/object/json'; -import {getData} from '../src/event-helper'; +import {getData} from '#utils/event-helper'; /** * Send messages to parent frame. These should not contain user data. diff --git a/3p/recaptcha.js b/3p/recaptcha.js index cbdbedfbff09..5af6e6cf2e6d 100644 --- a/3p/recaptcha.js +++ b/3p/recaptcha.js @@ -4,16 +4,17 @@ import './polyfills'; import {dict, hasOwn} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; -import {loadScript} from './3p'; -import {IframeMessagingClient} from './iframe-messaging-client'; - import { dev, devAssert, initLogConstructor, setReportError, user, -} from '../src/log'; +} from '#utils/log'; + +import {loadScript} from './3p'; +import {IframeMessagingClient} from './iframe-messaging-client'; + import {isProxyOrigin, parseUrlDeprecated} from '../src/url'; import ampToolboxCacheUrl from '../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm'; diff --git a/3p/viqeoplayer.js b/3p/viqeoplayer.js index 94282b04694d..803630a34024 100644 --- a/3p/viqeoplayer.js +++ b/3p/viqeoplayer.js @@ -1,9 +1,9 @@ import {tryPlay} from '#core/dom/video'; import {tryDecodeUriComponent} from '#core/types/string/url'; -import {loadScript} from './3p'; +import {getData} from '#utils/event-helper'; -import {getData} from '../src/event-helper'; +import {loadScript} from './3p'; /** * @param {Window} global diff --git a/ads/alp/handler.js b/ads/alp/handler.js index 467bcb53bddb..524f7c6086aa 100644 --- a/ads/alp/handler.js +++ b/ads/alp/handler.js @@ -5,7 +5,7 @@ import { parseUrlDeprecated, } from '../../src/url'; import {closest} from '#core/dom/query'; -import {dev} from '../../src/log'; +import {dev} from '#utils/log'; import {dict} from '#core/types/object'; import {openWindowDialog} from '../../src/open-window-dialog'; import {parseQueryString} from '#core/types/string/url'; diff --git a/ads/alp/install-alp.js b/ads/alp/install-alp.js index 4808d11481e0..0350b02661cd 100644 --- a/ads/alp/install-alp.js +++ b/ads/alp/install-alp.js @@ -1,6 +1,6 @@ // Utility file that generates URLs suitable for AMP's impression tracking. -import {initLogConstructor, setReportError} from '../../src/log'; +import {initLogConstructor, setReportError} from '#utils/log'; import {installAlpClickHandler, warmupStatic} from './handler'; import {reportError} from '../../src/error-reporting'; diff --git a/ads/google/a4a/test/test-utils.js b/ads/google/a4a/test/test-utils.js index 548dcb4c4aa8..56c4e09aeebd 100644 --- a/ads/google/a4a/test/test-utils.js +++ b/ads/google/a4a/test/test-utils.js @@ -35,7 +35,7 @@ import {installDocService} from '#service/ampdoc-impl'; import {installExtensionsService} from '#service/extensions-impl'; import {installXhrService} from '#service/xhr-impl'; import {toggleExperiment} from '#experiments'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; function setupForAdTesting(fixture) { installDocService(fixture.win, /* isSingleDoc */ true); diff --git a/ads/google/a4a/utils.js b/ads/google/a4a/utils.js index 1a89bb503a5c..e7ecb80836d3 100644 --- a/ads/google/a4a/utils.js +++ b/ads/google/a4a/utils.js @@ -3,7 +3,7 @@ import {DomFingerprint} from '#core/dom/fingerprint'; import {GEO_IN_GROUP} from '../../../extensions/amp-geo/0.1/amp-geo-in-group'; import {Services} from '#service'; import {buildUrl} from './shared/url-builder'; -import {dev, devAssert, user} from '../../../src/log'; +import {dev, devAssert, user} from '#utils/log'; import {dict} from '#core/types/object'; import {getBinaryType, isExperimentOn, toggleExperiment} from '#experiments'; import {getConsentPolicyState} from '../../../src/consent'; diff --git a/ads/google/doubleclick.js b/ads/google/doubleclick.js index 29e94c30bb63..fc57a5ea7073 100644 --- a/ads/google/doubleclick.js +++ b/ads/google/doubleclick.js @@ -1,4 +1,4 @@ -import {dev} from '../../src/log'; +import {dev} from '#utils/log'; const TAG = 'DOUBLECLICK - DEPRECATED'; /** diff --git a/ads/google/ima/ima-video.js b/ads/google/ima/ima-video.js index a9ebf55a1941..030345f722a6 100644 --- a/ads/google/ima/ima-video.js +++ b/ads/google/ima/ima-video.js @@ -1,7 +1,7 @@ import {CONSENT_POLICY_STATE} from '#core/constants/consent-state'; import {ImaPlayerData} from './ima-player-data'; import {camelCaseToTitleCase, setStyle, toggle} from '#core/dom/style'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; import {htmlFor, htmlRefs, svgFor} from '#core/dom/static-template'; import {isArray, isObject} from '#core/types'; import {loadScript} from '#3p/3p'; diff --git a/ads/google/utils.js b/ads/google/utils.js index 8be27c6d0645..e51735b4e594 100644 --- a/ads/google/utils.js +++ b/ads/google/utils.js @@ -4,7 +4,7 @@ import { getAutoConfig, getPubControlConfig, } from './a4a/shared/content-recommendation'; -import {user} from '../../src/log'; +import {user} from '#utils/log'; /** * Approved height for AdSense full-width responsive ads. diff --git a/ads/inabox/inabox-host.js b/ads/inabox/inabox-host.js index 4aede9055786..bfe15e55f88a 100644 --- a/ads/inabox/inabox-host.js +++ b/ads/inabox/inabox-host.js @@ -4,8 +4,8 @@ */ import {InaboxMessagingHost} from './inabox-messaging-host'; -import {dev, initLogConstructor, setReportError, user} from '../../src/log'; -import {getData} from '../../src/event-helper'; +import {dev, initLogConstructor, setReportError, user} from '#utils/log'; +import {getData} from '#utils/event-helper'; import {reportError} from '../../src/error-reporting'; /** @const {string} */ diff --git a/ads/inabox/inabox-messaging-host.js b/ads/inabox/inabox-messaging-host.js index 4d1fa97a12bf..60cb766179f3 100644 --- a/ads/inabox/inabox-messaging-host.js +++ b/ads/inabox/inabox-messaging-host.js @@ -4,9 +4,9 @@ import { serializeMessage, } from '#core/3p-frame-messaging'; import {canInspectWindow} from '../../src/iframe-helper'; -import {dev, devAssert} from '../../src/log'; +import {dev, devAssert} from '#utils/log'; import {dict} from '#core/types/object'; -import {getData} from '../../src/event-helper'; +import {getData} from '#utils/event-helper'; import {getFrameOverlayManager} from './frame-overlay-manager'; import {getPositionObserver} from './position-observer'; diff --git a/ads/vendors/_ping_.js b/ads/vendors/_ping_.js index 66f3b9a1cb99..fd0276167e06 100644 --- a/ads/vendors/_ping_.js +++ b/ads/vendors/_ping_.js @@ -1,4 +1,4 @@ -import {dev, devAssert, userAssert} from '../../src/log'; +import {dev, devAssert, userAssert} from '#utils/log'; import {validateData} from '#3p/3p'; /** diff --git a/ads/vendors/criteo.js b/ads/vendors/criteo.js index d65645e8dc8d..4e70c654624a 100644 --- a/ads/vendors/criteo.js +++ b/ads/vendors/criteo.js @@ -1,4 +1,4 @@ -import {dev} from '../../src/log'; +import {dev} from '#utils/log'; import {loadScript} from '#3p/3p'; /* global Criteo: false */ diff --git a/ads/vendors/csa.js b/ads/vendors/csa.js index 1e62a3024a65..a4d2a9301ff5 100644 --- a/ads/vendors/csa.js +++ b/ads/vendors/csa.js @@ -1,4 +1,4 @@ -import {devAssert} from '../../src/log'; +import {devAssert} from '#utils/log'; import {getStyle, setStyle, setStyles} from '#core/dom/style'; import {loadScript, validateData} from '#3p/3p'; import {tryParseJson} from '#core/types/object/json'; diff --git a/ads/vendors/netletix.js b/ads/vendors/netletix.js index 129511a7995d..eff556dd2dce 100644 --- a/ads/vendors/netletix.js +++ b/ads/vendors/netletix.js @@ -1,5 +1,5 @@ import {addParamsToUrl, assertHttpsUrl} from '../../src/url'; -import {dev} from '../../src/log'; +import {dev} from '#utils/log'; import {dict} from '#core/types/object'; import {loadScript, validateData, writeScript} from '#3p/3p'; diff --git a/ads/vendors/promoteiq.js b/ads/vendors/promoteiq.js index 55fbab393580..943d67f27ab1 100644 --- a/ads/vendors/promoteiq.js +++ b/ads/vendors/promoteiq.js @@ -1,6 +1,6 @@ import {loadScript, validateData} from '#3p/3p'; import {parseJson} from '#core/types/object/json'; -import {user} from '../../src/log'; +import {user} from '#utils/log'; const TAG = 'PROMOTEIQ'; const mandatoryDataFields = ['src', 'params', 'sfcallback']; diff --git a/ads/vendors/yieldbot.js b/ads/vendors/yieldbot.js index 94df2f372902..f47938bfd0e6 100644 --- a/ads/vendors/yieldbot.js +++ b/ads/vendors/yieldbot.js @@ -1,7 +1,7 @@ import {getMultiSizeDimensions} from '#ads/google/utils'; import {loadScript, validateData} from '#3p/3p'; import {rethrowAsync} from '#core/error'; -import {user} from '../../src/log'; +import {user} from '#utils/log'; /** * @param {!Window} global diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/index.js b/build-system/babel-plugins/babel-plugin-transform-dev-methods/index.js index 681149f9e140..d75d9d56d9f6 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/index.js +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/index.js @@ -57,7 +57,7 @@ module.exports = function () { resolve(dirname(state.file.opts.filename), source.value) ); - if (filepath.endsWith('src/log')) { + if (filepath.endsWith('utils/log')) { const propertyMapped = calleeToPropertiesMap.get( specifier.imported.name ); diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/input.js b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/input.js index f349d2f443d6..519bb15fcbf3 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/input.js +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/input.js @@ -1 +1 @@ -import {dev, user} from '../../../../../../../src/log'; \ No newline at end of file +import {dev, user} from '#utils/log'; diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/output.mjs b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/output.mjs index e96e6ba3511d..53a243afd167 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/output.mjs +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-no-usage/output.mjs @@ -1 +1 @@ -import { dev, user } from '../../../../../../../src/log'; +import { dev, user } from '#utils/log'; diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/input.js b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/input.js index d9e12d84f539..0128bfe9baa1 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/input.js +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/input.js @@ -1,4 +1,4 @@ -import {dev, user} from '../../../../../../../src/log'; +import {dev, user} from '#utils/log'; dev().info( TAG, @@ -47,4 +47,4 @@ class Foo { dev().error(TAG, 'Should not be removed'); user().error('Should not be removed'); } -} \ No newline at end of file +} diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/output.mjs b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/output.mjs index dbc755202a1d..22d9732861c0 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/output.mjs +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/output.mjs @@ -1,4 +1,4 @@ -import { dev, user } from '../../../../../../../src/log'; +import { dev, user } from '#utils/log'; dev().info; user().fine; diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/input.js b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/input.js index 32feb8f9c6eb..4b55fc7e4dd7 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/input.js +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/input.js @@ -1 +1 @@ -import {dev} from '../../../../../../../src/log'; \ No newline at end of file +import {dev} from '#utils/log'; diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/output.mjs b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/output.mjs index 66df2cbdfbd3..508ba882195a 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/output.mjs +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-no-usage/output.mjs @@ -1 +1 @@ -import { dev } from '../../../../../../../src/log'; +import { dev } from '#utils/log'; diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/input.js b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/input.js index 733b263d9f81..51551649a359 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/input.js +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/input.js @@ -1,4 +1,4 @@ -import {dev} from '../../../../../../../src/log'; +import {dev} from '#utils/log'; dev().info( TAG, @@ -39,4 +39,4 @@ class Foo { ); dev().fine(TAG, 'fine'); } -} \ No newline at end of file +} diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/output.mjs b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/output.mjs index 1aaef1f1ca7a..699d0a727e15 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/output.mjs +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-dev-usage/output.mjs @@ -1,4 +1,4 @@ -import { dev } from '../../../../../../../src/log'; +import { dev } from '#utils/log'; dev().info; dev().fine; diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/input.js b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/input.js index 2890a5fedca9..d6664feba4f8 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/input.js +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/input.js @@ -1,4 +1,4 @@ -import {user} from '../../../../../../../src/log'; +import {user} from '#utils/log'; user().fine(TAG, 'fine'); user().fine; @@ -21,4 +21,4 @@ class Foo { user().fine(TAG, 'fine'); user().info('Should be removed'); } -} \ No newline at end of file +} diff --git a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/output.mjs b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/output.mjs index 6e9e8f096aa0..589bf006ac1d 100644 --- a/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/output.mjs +++ b/build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-user-usage/output.mjs @@ -1,4 +1,4 @@ -import { user } from '../../../../../../../src/log'; +import { user } from '#utils/log'; user().fine; user().error('Should not be removed'); diff --git a/build-system/babel-plugins/log-module-metadata.js b/build-system/babel-plugins/log-module-metadata.js index 752a81584c77..a14161e8c06f 100644 --- a/build-system/babel-plugins/log-module-metadata.js +++ b/build-system/babel-plugins/log-module-metadata.js @@ -8,7 +8,7 @@ * }} LogMethodMetadataDef */ -const definitionFile = 'src/log.js'; +const definitionFile = 'src/utils/log.js'; /** Functions exposed as singleton getters for `Log`. */ const singletonFunctions = ['dev', 'user']; diff --git a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js index e0e591f82990..7030827c03ac 100644 --- a/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js +++ b/build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/amp-__component_name_hyphenated__.js @@ -2,7 +2,7 @@ import {BaseElement} from './base-element'; __css_import__; import {dict} from '#core/types/object'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-__component_name_hyphenated__'; diff --git a/build-system/test-configs/dep-check-config.js b/build-system/test-configs/dep-check-config.js index 9697e81b56a4..46fc22148c10 100644 --- a/build-system/test-configs/dep-check-config.js +++ b/build-system/test-configs/dep-check-config.js @@ -77,7 +77,7 @@ exports.rules = [ filesMatching: '3p/**/*.js', mustNotDependOn: SRC_EXCLUDING_CORE, allowlist: [ - '3p/**->src/log.js', + '3p/**->src/utils/log.js', '3p/**->src/url.js', '3p/**->src/config.js', '3p/**->src/mode.js', @@ -86,10 +86,10 @@ exports.rules = [ '3p/polyfills.js->src/polyfills/object-values.js', '3p/polyfills.js->src/polyfills/string-starts-with.js', '3p/polyfills.js->src/polyfills/promise.js', - '3p/messaging.js->src/event-helper.js', - '3p/bodymovinanimation.js->src/event-helper.js', - '3p/iframe-messaging-client.js->src/event-helper.js', - '3p/viqeoplayer.js->src/event-helper.js', + '3p/messaging.js->src/utils/event-helper.js', + '3p/bodymovinanimation.js->src/utils/event-helper.js', + '3p/iframe-messaging-client.js->src/utils/event-helper.js', + '3p/viqeoplayer.js->src/utils/event-helper.js', ], }, { @@ -101,7 +101,7 @@ exports.rules = [ filesMatching: 'ads/**/*.js', mustNotDependOn: SRC_EXCLUDING_CORE, allowlist: [ - 'ads/**->src/log.js', + 'ads/**->src/utils/log.js', 'ads/**->src/mode.js', 'ads/**->src/url.js', // ads/google/a4a doesn't contain 3P ad code and should probably move @@ -113,7 +113,7 @@ exports.rules = [ 'ads/google/a4a/utils.js->src/service/variable-source.js', 'ads/google/a4a/utils.js->src/ini-load.js', // IMA, similar to other non-Ad 3Ps above, needs access to event-helper - 'ads/google/ima/ima-video.js->src/event-helper.js', + 'ads/google/ima/ima-video.js->src/utils/event-helper.js', ], }, { @@ -463,7 +463,7 @@ exports.rules = [ allowlist: [ 'src/core/assert/dev.js->src/core/assert/base.js', 'src/core/assert/user.js->src/core/assert/base.js', - 'src/log.js->src/core/assert/base.js', + 'src/utils/log.js->src/core/assert/base.js', ], }, diff --git a/build-system/test-configs/forbidden-terms.js b/build-system/test-configs/forbidden-terms.js index 11f0282865c0..f3b49999c811 100644 --- a/build-system/test-configs/forbidden-terms.js +++ b/build-system/test-configs/forbidden-terms.js @@ -332,7 +332,7 @@ const forbiddenTermsGlobal = { 'extensions/amp-web-push/0.1/amp-web-push-helper-frame.js', 'src/amp-story-player/amp-story-component-manager.js', 'src/runtime.js', - 'src/log.js', + 'src/utils/log.js', 'src/error-reporting.js', 'src/web-worker/web-worker.js', 'testing/async-errors.js', @@ -538,7 +538,7 @@ const forbiddenTermsGlobal = { ', depending on your use case.', allowlist: [ 'src/core/3p-frame-messaging.js', - 'src/event-helper.js', + 'src/utils/event-helper.js', 'src/core/dom/event-helper-listen.js', ], }, @@ -919,7 +919,7 @@ const forbiddenTermsSrcInclusive = { message: 'Most users should use BaseElement…loadPromise.', allowlist: [ 'src/base-element.js', - 'src/event-helper.js', + 'src/utils/event-helper.js', 'src/friendly-iframe-embed.js', 'src/service/resources-impl.js', 'src/service/variable-source.js', diff --git a/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js b/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js index d1a2a8301af1..2bc0c2f79720 100644 --- a/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js +++ b/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js @@ -11,9 +11,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {dev, devAssert} from '#utils/log'; + import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {listenFor, postMessage} from '../../../src/iframe-helper'; -import {dev, devAssert} from '../../../src/log'; import {assertHttpsUrl, resolveRelativeUrl} from '../../../src/url'; const TAG = 'amp-3d-gltf'; diff --git a/extensions/amp-3q-player/0.1/amp-3q-player.js b/extensions/amp-3q-player/0.1/amp-3q-player.js index 4b6b571856b9..8737a1d61c1f 100644 --- a/extensions/amp-3q-player/0.1/amp-3q-player.js +++ b/extensions/amp-3q-player/0.1/amp-3q-player.js @@ -11,13 +11,14 @@ import {PauseHelper} from '#core/dom/video/pause-helper'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { createFrameFor, objOrParseJson, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {addParamToUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js index 41e24b675c06..bdf1bec51c04 100644 --- a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js +++ b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js @@ -4,9 +4,10 @@ import * as fullscreen from '#core/dom/fullscreen'; import {Services} from '#service'; +import {listenOncePromise} from '#utils/event-helper'; + import {installResizeObserverStub} from '#testing/resize-observer-stub'; -import {listenOncePromise} from '../../../../src/event-helper'; import {VideoEvents} from '../../../../src/video-interface'; describes.realWin( diff --git a/extensions/amp-a4a/0.1/a4a-variable-source.js b/extensions/amp-a4a/0.1/a4a-variable-source.js index d9df9f7e46df..40119d259134 100644 --- a/extensions/amp-a4a/0.1/a4a-variable-source.js +++ b/extensions/amp-a4a/0.1/a4a-variable-source.js @@ -6,7 +6,7 @@ import { getTimingDataSync, } from '#service/variable-source'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; const ALLOWLISTED_VARIABLES = [ 'AMPDOC_HOST', diff --git a/extensions/amp-a4a/0.1/amp-a4a.js b/extensions/amp-a4a/0.1/amp-a4a.js index c3084fd97e31..14bb572edb8b 100644 --- a/extensions/amp-a4a/0.1/amp-a4a.js +++ b/extensions/amp-a4a/0.1/amp-a4a.js @@ -27,6 +27,11 @@ import {Services} from '#service'; import {installRealTimeConfigServiceForDoc} from '#service/real-time-config/real-time-config-impl'; import {installUrlReplacementsForEmbed} from '#service/url-replacements-impl'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {DomTransformStream} from '#utils/dom-tranform-stream'; +import {listenOnce} from '#utils/event-helper'; +import {dev, devAssert, logHashParam, user, userAssert} from '#utils/log'; + import {A4AVariableSource} from './a4a-variable-source'; import {getExtensionsFromMetadata} from './amp-ad-utils'; import {processHead} from './head-validation'; @@ -44,14 +49,12 @@ import { getDefaultBootstrapBaseUrl, } from '../../../src/3p-frame'; import {isAdPositionAllowed} from '../../../src/ad-helper'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; import { getConsentMetadata, getConsentPolicyInfo, getConsentPolicyState, } from '../../../src/consent'; import {cancellation, isCancellation} from '../../../src/error-reporting'; -import {listenOnce} from '../../../src/event-helper'; import {insertAnalyticsElement} from '../../../src/extension-analytics'; import { installFriendlyIframeEmbed, @@ -59,10 +62,8 @@ import { preloadFriendlyIframeEmbedExtensions, } from '../../../src/friendly-iframe-embed'; import {getContextMetadata} from '../../../src/iframe-attributes'; -import {dev, devAssert, logHashParam, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {assertHttpsUrl} from '../../../src/url'; -import {DomTransformStream} from '../../../src/utils/dom-tranform-stream'; import { getAmpAdRenderOutsideViewport, incrementLoadingAds, diff --git a/extensions/amp-a4a/0.1/amp-ad-network-base.js b/extensions/amp-a4a/0.1/amp-ad-network-base.js index a2b5a5ed34b0..8c80b253f556 100644 --- a/extensions/amp-a4a/0.1/amp-ad-network-base.js +++ b/extensions/amp-a4a/0.1/amp-ad-network-base.js @@ -1,11 +1,11 @@ import {isLayoutSizeDefined} from '#core/dom/layout'; import {map} from '#core/types/object'; +import {dev, devAssert} from '#utils/log'; + import {FailureType, RecoveryModeType} from './amp-ad-type-defs'; import {sendXhrRequest} from './amp-ad-utils'; -import {dev, devAssert} from '../../../src/log'; - const TAG = 'amp-ad-network-base'; /** 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 f39a7ba3191e..9fa3be393625 100644 --- a/extensions/amp-a4a/0.1/amp-ad-template-helper.js +++ b/extensions/amp-a4a/0.1/amp-ad-template-helper.js @@ -5,8 +5,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {devAssert} from '#utils/log'; + import {urls} from '../../../src/config'; -import {devAssert} from '../../../src/log'; 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 4e5660c14658..970f408546f2 100644 --- a/extensions/amp-a4a/0.1/amp-ad-utils.js +++ b/extensions/amp-a4a/0.1/amp-ad-utils.js @@ -4,8 +4,9 @@ import {parseJson} from '#core/types/object/json'; import {Services} from '#service'; import {parseExtensionUrl} from '#service/extension-script'; +import {dev} from '#utils/log'; + import {urls} from '../../../src/config'; -import {dev} from '../../../src/log'; import {isSecureUrlDeprecated} from '../../../src/url'; const TAG = 'amp-ad-util'; diff --git a/extensions/amp-a4a/0.1/cryptographic-validator.js b/extensions/amp-a4a/0.1/cryptographic-validator.js index 8966da70d1e5..6e867346e950 100644 --- a/extensions/amp-a4a/0.1/cryptographic-validator.js +++ b/extensions/amp-a4a/0.1/cryptographic-validator.js @@ -2,12 +2,12 @@ import {signingServerURLs} from '#ads/_a4a-config'; import {utf8Decode} from '#core/types/string/bytes'; +import {user} from '#utils/log'; + import {AdResponseType, Validator, ValidatorResult} from './amp-ad-type-defs'; import {getAmpAdMetadata} from './amp-ad-utils'; import {SignatureVerifier, VerificationStatus} from './signature-verifier'; -import {user} from '../../../src/log'; - export const SIGNATURE_VERIFIER_PROPERTY_NAME = 'AMP_FAST_FETCH_SIGNATURE_VERIFIER_'; diff --git a/extensions/amp-a4a/0.1/friendly-frame-renderer.js b/extensions/amp-a4a/0.1/friendly-frame-renderer.js index b0f270201224..c979e821fbda 100644 --- a/extensions/amp-a4a/0.1/friendly-frame-renderer.js +++ b/extensions/amp-a4a/0.1/friendly-frame-renderer.js @@ -1,8 +1,8 @@ +import {devAssert} from '#utils/log'; + import {Renderer} from './amp-ad-type-defs'; import {renderCreativeIntoFriendlyFrame} from './friendly-frame-util'; -import {devAssert} from '../../../src/log'; - /** * @typedef {{ * creativeMetadata: ./amp-ad-type-defs.CreativeMetaDataDef, diff --git a/extensions/amp-a4a/0.1/refresh-manager.js b/extensions/amp-a4a/0.1/refresh-manager.js index bbe837ca8fa4..10af7a087dd9 100644 --- a/extensions/amp-a4a/0.1/refresh-manager.js +++ b/extensions/amp-a4a/0.1/refresh-manager.js @@ -2,7 +2,7 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {devAssert, user, userAssert} from '../../../src/log'; +import {devAssert, user, userAssert} from '#utils/log'; /** * - visibilePercentageMin: The percentage of pixels that need to be on screen diff --git a/extensions/amp-a4a/0.1/signature-verifier.js b/extensions/amp-a4a/0.1/signature-verifier.js index 19056751cef3..e392fcece1ca 100644 --- a/extensions/amp-a4a/0.1/signature-verifier.js +++ b/extensions/amp-a4a/0.1/signature-verifier.js @@ -3,7 +3,7 @@ import {base64DecodeToBytes} from '#core/types/string/base64'; import {Services} from '#service'; -import {dev, devAssert, user} from '../../../src/log'; +import {dev, devAssert, user} from '#utils/log'; /** @visibleForTesting */ export const AMP_SIGNATURE_HEADER = 'AMP-Fast-Fetch-Signature'; diff --git a/extensions/amp-a4a/0.1/template-renderer.js b/extensions/amp-a4a/0.1/template-renderer.js index bbb1863aaa3c..52787c3dea87 100644 --- a/extensions/amp-a4a/0.1/template-renderer.js +++ b/extensions/amp-a4a/0.1/template-renderer.js @@ -1,9 +1,9 @@ +import {devAssert} from '#utils/log'; + import {getAmpAdTemplateHelper} from './amp-ad-template-helper'; import {Renderer} from './amp-ad-type-defs'; import {renderCreativeIntoFriendlyFrame} from './friendly-frame-util'; -import {devAssert} from '../../../src/log'; - /** * @typedef {{ * size: ./amp-ad-type-defs.LayoutInfoDef, diff --git a/extensions/amp-a4a/0.1/test/test-a4a-integration.js b/extensions/amp-a4a/0.1/test/test-a4a-integration.js index 24ff5369fa6a..3efabc7e5864 100644 --- a/extensions/amp-a4a/0.1/test/test-a4a-integration.js +++ b/extensions/amp-a4a/0.1/test/test-a4a-integration.js @@ -13,13 +13,14 @@ import { upgradeOrRegisterElement, } from '#service/custom-element-registry'; +import {loadPromise} from '#utils/event-helper'; + import {createIframePromise} from '#testing/iframe'; import {FetchMock, networkFailure} from './fetch-mock'; import {data as validCSSAmp} from './testdata/valid_css_at_rules_amp.reserialized'; import {MockA4AImpl, TEST_URL} from './utils'; -import {loadPromise} from '../../../../src/event-helper'; import {AMP_SIGNATURE_HEADER} from '../signature-verifier'; // Integration tests for A4A. These stub out accesses to the outside world diff --git a/extensions/amp-a4a/0.1/test/test-amp-a4a.js b/extensions/amp-a4a/0.1/test/test-amp-a4a.js index b0e5b38d37a7..f292fde3e94b 100644 --- a/extensions/amp-a4a/0.1/test/test-amp-a4a.js +++ b/extensions/amp-a4a/0.1/test/test-amp-a4a.js @@ -20,6 +20,9 @@ import {resetScheduledElementForTesting} from '#service/custom-element-registry' import {Extensions} from '#service/extensions-impl'; import {installRealTimeConfigServiceForDoc} from '#service/real-time-config/real-time-config-impl'; +import * as analytics from '#utils/analytics'; +import {dev, user} from '#utils/log'; + import {macroTask} from '#testing/helpers'; import {createIframePromise} from '#testing/iframe'; @@ -28,11 +31,9 @@ import {data as testFragments} from './testdata/test_fragments'; import {data as validCSSAmp} from './testdata/valid_css_at_rules_amp.reserialized'; import {MockA4AImpl, TEST_URL} from './utils'; -import * as analytics from '../../../../src/analytics'; import {cancellation} from '../../../../src/error-reporting'; import * as analyticsExtension from '../../../../src/extension-analytics'; import {FriendlyIframeEmbed} from '../../../../src/friendly-iframe-embed'; -import {dev, user} from '../../../../src/log'; import * as mode from '../../../../src/mode'; import {AmpAdXOriginIframeHandler} from '../../../amp-ad/0.1/amp-ad-xorigin-iframe-handler'; import { diff --git a/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js b/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js index 1cbc03dc5c72..675925520a03 100644 --- a/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js +++ b/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js @@ -1,8 +1,9 @@ import {utf8Encode} from '#core/types/string/bytes'; +import {user} from '#utils/log'; + import {data} from './testdata/valid_css_at_rules_amp.reserialized'; -import {user} from '../../../../src/log'; import {AdResponseType, ValidatorResult} from '../amp-ad-type-defs'; import { CryptographicValidator, diff --git a/extensions/amp-a4a/0.1/test/test-signature-verifier.js b/extensions/amp-a4a/0.1/test/test-signature-verifier.js index 471b23eda143..f087388f8766 100644 --- a/extensions/amp-a4a/0.1/test/test-signature-verifier.js +++ b/extensions/amp-a4a/0.1/test/test-signature-verifier.js @@ -3,7 +3,8 @@ import {base64EncodeFromBytes} from '#core/types/string/base64'; import {utf8Encode} from '#core/types/string/bytes'; -import {dev, user} from '../../../../src/log'; +import {dev, user} from '#utils/log'; + import {SignatureVerifier, VerificationStatus} from '../signature-verifier'; const networkFailure = {throws: new TypeError('Failed to fetch')}; diff --git a/extensions/amp-access-laterpay/0.1/laterpay-impl.js b/extensions/amp-access-laterpay/0.1/laterpay-impl.js index 3f015f9a3b04..c4a24a919df5 100644 --- a/extensions/amp-access-laterpay/0.1/laterpay-impl.js +++ b/extensions/amp-access-laterpay/0.1/laterpay-impl.js @@ -3,9 +3,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {listen} from '#utils/event-helper'; +import {dev, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-access-laterpay-0.1.css'; -import {listen} from '../../../src/event-helper'; -import {dev, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {installStylesForDoc} from '../../../src/style-installer'; diff --git a/extensions/amp-access-laterpay/0.2/laterpay-impl.js b/extensions/amp-access-laterpay/0.2/laterpay-impl.js index 541924477756..dc7ef712094c 100644 --- a/extensions/amp-access-laterpay/0.2/laterpay-impl.js +++ b/extensions/amp-access-laterpay/0.2/laterpay-impl.js @@ -3,9 +3,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {listen} from '#utils/event-helper'; +import {dev, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-access-laterpay-0.2.css'; -import {listen} from '../../../src/event-helper'; -import {dev, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {installStylesForDoc} from '../../../src/style-installer'; diff --git a/extensions/amp-access-poool/0.1/poool-impl.js b/extensions/amp-access-poool/0.1/poool-impl.js index 34735477a652..936b54a53d1a 100644 --- a/extensions/amp-access-poool/0.1/poool-impl.js +++ b/extensions/amp-access-poool/0.1/poool-impl.js @@ -3,8 +3,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {listenFor} from '../../../src/iframe-helper'; -import {dev, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {addParamToUrl, addParamsToUrl} from '../../../src/url'; diff --git a/extensions/amp-access-scroll/0.1/scroll-component.js b/extensions/amp-access-scroll/0.1/scroll-component.js index 07edfb33cca9..09b7a10f0a42 100644 --- a/extensions/amp-access-scroll/0.1/scroll-component.js +++ b/extensions/amp-access-scroll/0.1/scroll-component.js @@ -4,7 +4,7 @@ import {hasOwn} from '#core/types/object'; import {Services} from '#service'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; /** @abstract */ export class ScrollComponent { diff --git a/extensions/amp-access-scroll/0.1/scroll-relay.js b/extensions/amp-access-scroll/0.1/scroll-relay.js index 53896f9b725d..140d7c83eca5 100644 --- a/extensions/amp-access-scroll/0.1/scroll-relay.js +++ b/extensions/amp-access-scroll/0.1/scroll-relay.js @@ -1,6 +1,6 @@ import {listen} from '#core/3p-frame-messaging'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; /** * Provides cross-frame postMessage for scroll frames. diff --git a/extensions/amp-access/0.1/amp-access-client.js b/extensions/amp-access/0.1/amp-access-client.js index 2787ee716843..37232d1a35cc 100644 --- a/extensions/amp-access/0.1/amp-access-client.js +++ b/extensions/amp-access/0.1/amp-access-client.js @@ -2,7 +2,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {dev, devAssert, userAssert} from '../../../src/log'; +import {dev, devAssert, userAssert} from '#utils/log'; + import {getMode} from '../../../src/mode'; import {assertHttpsUrl} from '../../../src/url'; diff --git a/extensions/amp-access/0.1/amp-access-iframe.js b/extensions/amp-access/0.1/amp-access-iframe.js index 7445a5b2dd3e..a466c5b30575 100644 --- a/extensions/amp-access/0.1/amp-access-iframe.js +++ b/extensions/amp-access/0.1/amp-access-iframe.js @@ -6,9 +6,10 @@ import {parseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {dev, userAssert} from '#utils/log'; + import {Messenger} from './iframe-api/messenger'; -import {dev, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {assertHttpsUrl, parseUrlDeprecated} from '../../../src/url'; diff --git a/extensions/amp-access/0.1/amp-access-other.js b/extensions/amp-access/0.1/amp-access-other.js index cbb49b02e506..667f289222a8 100644 --- a/extensions/amp-access/0.1/amp-access-other.js +++ b/extensions/amp-access/0.1/amp-access-other.js @@ -1,4 +1,5 @@ -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; + import {isProxyOrigin} from '../../../src/url'; /** @const {string} */ diff --git a/extensions/amp-access/0.1/amp-access-server-jwt.js b/extensions/amp-access/0.1/amp-access-server-jwt.js index f9f91b03e821..116871395768 100644 --- a/extensions/amp-access/0.1/amp-access-server-jwt.js +++ b/extensions/amp-access/0.1/amp-access-server-jwt.js @@ -6,11 +6,12 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {AccessClientAdapter} from './amp-access-client'; import {JwtHelper} from './jwt'; import {fetchDocument} from '../../../src/document-fetcher'; -import {dev, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import { assertHttpsUrl, diff --git a/extensions/amp-access/0.1/amp-access-server.js b/extensions/amp-access/0.1/amp-access-server.js index b67ac44e55fd..6d1f81505ebc 100644 --- a/extensions/amp-access/0.1/amp-access-server.js +++ b/extensions/amp-access/0.1/amp-access-server.js @@ -6,10 +6,11 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev, devAssert} from '#utils/log'; + import {AccessClientAdapter} from './amp-access-client'; import {fetchDocument} from '../../../src/document-fetcher'; -import {dev, devAssert} from '../../../src/log'; import {isProxyOrigin, removeFragment} from '../../../src/url'; /** @const {string} */ diff --git a/extensions/amp-access/0.1/amp-access-source.js b/extensions/amp-access/0.1/amp-access-source.js index b03105087339..c28af250f88b 100644 --- a/extensions/amp-access/0.1/amp-access-source.js +++ b/extensions/amp-access/0.1/amp-access-source.js @@ -7,6 +7,9 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {dev, user, userAssert} from '#utils/log'; + import {AccessClientAdapter} from './amp-access-client'; import {AccessIframeAdapter} from './amp-access-iframe'; import {AccessOtherAdapter} from './amp-access-other'; @@ -15,8 +18,6 @@ import {AccessServerJwtAdapter} from './amp-access-server-jwt'; import {AccessVendorAdapter} from './amp-access-vendor'; import {getLoginUrl, openLoginDialog} from './login-dialog'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; -import {dev, user, userAssert} from '../../../src/log'; import {assertHttpsUrl} from '../../../src/url'; /** @const */ diff --git a/extensions/amp-access/0.1/amp-access-vendor.js b/extensions/amp-access/0.1/amp-access-vendor.js index 9298b4c5c9d7..ccd54b04f0b3 100644 --- a/extensions/amp-access/0.1/amp-access-vendor.js +++ b/extensions/amp-access/0.1/amp-access-vendor.js @@ -1,7 +1,7 @@ import './access-vendor'; import {Deferred} from '#core/data-structures/promise'; -import {dev, userAssert} from '../../../src/log'; +import {dev, userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-access-vendor'; diff --git a/extensions/amp-access/0.1/amp-access.js b/extensions/amp-access/0.1/amp-access.js index 8eb4abeb5428..ec137dfa6f3c 100644 --- a/extensions/amp-access/0.1/amp-access.js +++ b/extensions/amp-access/0.1/amp-access.js @@ -9,15 +9,16 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {listenOnce} from '#utils/event-helper'; +import {dev, user, userAssert} from '#utils/log'; + import {AmpAccessEvaluator} from './access-expr'; import {AccessVars} from './access-vars'; import {AccessSource, AccessType} from './amp-access-source'; import {CSS} from '../../../build/amp-access-0.1.css'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; import {cancellation} from '../../../src/error-reporting'; -import {listenOnce} from '../../../src/event-helper'; -import {dev, user, userAssert} from '../../../src/log'; import {installStylesForDoc} from '../../../src/style-installer'; import {getSourceOrigin} from '../../../src/url'; diff --git a/extensions/amp-access/0.1/amp-login-done-dialog.js b/extensions/amp-access/0.1/amp-login-done-dialog.js index 3eb82ef6776b..293bf1984a42 100644 --- a/extensions/amp-access/0.1/amp-login-done-dialog.js +++ b/extensions/amp-access/0.1/amp-login-done-dialog.js @@ -1,6 +1,7 @@ import {parseQueryString, tryDecodeUriComponent} from '#core/types/string/url'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; + import {assertAbsoluteHttpOrHttpsUrl} from '../../../src/url'; /** diff --git a/extensions/amp-access/0.1/amp-login-done.js b/extensions/amp-access/0.1/amp-login-done.js index d06def4e1066..a1c2429bc992 100644 --- a/extensions/amp-access/0.1/amp-login-done.js +++ b/extensions/amp-access/0.1/amp-login-done.js @@ -4,12 +4,13 @@ */ import '#polyfills'; -import {onDocumentReady} from '#core/document-ready'; +import {onDocumentReady} from '#core/document/ready'; + +import {initLogConstructor, setReportError} from '#utils/log'; import {LoginDoneDialog} from './amp-login-done-dialog'; import {reportError} from '../../../src/error-reporting'; -import {initLogConstructor, setReportError} from '../../../src/log'; import {bodyAlwaysVisible} from '../../../src/style-installer'; bodyAlwaysVisible(window); diff --git a/extensions/amp-access/0.1/login-dialog.js b/extensions/amp-access/0.1/login-dialog.js index 55bca9313f4c..5f4c6042975b 100644 --- a/extensions/amp-access/0.1/login-dialog.js +++ b/extensions/amp-access/0.1/login-dialog.js @@ -2,9 +2,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {urls} from '../../../src/config'; -import {getData, listen} from '../../../src/event-helper'; -import {dev, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {openWindowDialog} from '../../../src/open-window-dialog'; import {parseUrlDeprecated} from '../../../src/url'; diff --git a/extensions/amp-access/0.1/test/test-amp-access-iframe.js b/extensions/amp-access/0.1/test/test-amp-access-iframe.js index 0eec26b7cc24..a5e593cc68a9 100644 --- a/extensions/amp-access/0.1/test/test-amp-access-iframe.js +++ b/extensions/amp-access/0.1/test/test-amp-access-iframe.js @@ -1,6 +1,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; -import {dev} from '../../../../src/log'; +import {dev} from '#utils/log'; + import {AccessIframeAdapter} from '../amp-access-iframe'; import {Messenger} from '../iframe-api/messenger'; diff --git a/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js b/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js index 25fe923731af..3eb7c6e04e19 100644 --- a/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js +++ b/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js @@ -1,7 +1,8 @@ import * as fakeTimers from '@sinonjs/fake-timers'; +import {isUserErrorMessage} from '#utils/log'; + import * as DocumentFetcher from '../../../../src/document-fetcher'; -import {isUserErrorMessage} from '../../../../src/log'; import {removeFragment, serializeQueryString} from '../../../../src/url'; import {AccessServerJwtAdapter} from '../amp-access-server-jwt'; diff --git a/extensions/amp-accordion/0.1/amp-accordion.js b/extensions/amp-accordion/0.1/amp-accordion.js index a38dae9daaf9..4f2f586d8a9e 100644 --- a/extensions/amp-accordion/0.1/amp-accordion.js +++ b/extensions/amp-accordion/0.1/amp-accordion.js @@ -16,10 +16,11 @@ import {parseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {Animation} from '#utils/animation'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-accordion-0.1.css'; -import {Animation} from '../../../src/animation'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {removeFragment} from '../../../src/url'; const TAG = 'amp-accordion'; diff --git a/extensions/amp-accordion/1.0/amp-accordion.js b/extensions/amp-accordion/1.0/amp-accordion.js index 0508ba0d25a8..11aad3dcc318 100644 --- a/extensions/amp-accordion/1.0/amp-accordion.js +++ b/extensions/amp-accordion/1.0/amp-accordion.js @@ -5,11 +5,12 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {createCustomEvent} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-accordion-1.0.css'; -import {createCustomEvent} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-accordion'; diff --git a/extensions/amp-accordion/1.0/base-element.js b/extensions/amp-accordion/1.0/base-element.js index 8c965ab31fb0..fc03c12b90eb 100644 --- a/extensions/amp-accordion/1.0/base-element.js +++ b/extensions/amp-accordion/1.0/base-element.js @@ -10,6 +10,8 @@ import {forwardRef} from '#preact/compat'; import {useDOMHandle} from '#preact/component'; import {useSlotContext} from '#preact/slot'; +import {devAssert} from '#utils/log'; + import { BentoAccordion, BentoAccordionContent, @@ -17,8 +19,6 @@ import { BentoAccordionSection, } from './component'; -import {devAssert} from '../../../src/log'; - const HEADER_SHIM_PROP = '__AMP_H_SHIM'; const CONTENT_SHIM_PROP = '__AMP_C_SHIM'; const SECTION_POST_RENDER = '__AMP_PR'; diff --git a/extensions/amp-action-macro/0.1/amp-action-macro.js b/extensions/amp-action-macro/0.1/amp-action-macro.js index 2438a3846b21..dd2d74c102e6 100644 --- a/extensions/amp-action-macro/0.1/amp-action-macro.js +++ b/extensions/amp-action-macro/0.1/amp-action-macro.js @@ -2,7 +2,7 @@ import {LayoutPriority} from '#core/dom/layout'; import {Services} from '#service'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-action-macro'; diff --git a/extensions/amp-ad-custom/0.1/amp-ad-custom.js b/extensions/amp-ad-custom/0.1/amp-ad-custom.js index 7ee19def645f..67064c7daedb 100644 --- a/extensions/amp-ad-custom/0.1/amp-ad-custom.js +++ b/extensions/amp-ad-custom/0.1/amp-ad-custom.js @@ -1,6 +1,7 @@ import {Services} from '#service'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; + import {addParamToUrl} from '../../../src/url'; import {AmpAdNetworkBase} from '../../amp-a4a/0.1/amp-ad-network-base'; import { diff --git a/extensions/amp-ad-exit/0.1/amp-ad-exit.js b/extensions/amp-ad-exit/0.1/amp-ad-exit.js index f7a3e21f6687..3b18073842f7 100644 --- a/extensions/amp-ad-exit/0.1/amp-ad-exit.js +++ b/extensions/amp-ad-exit/0.1/amp-ad-exit.js @@ -12,6 +12,9 @@ import {HostServices} from '#inabox/host-services'; import {Services} from '#service'; +import {getData} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {TransportMode, assertConfig, assertVendor} from './config'; import {makeClickDelaySpec} from './filters/click-delay'; import {createFilter} from './filters/factory'; @@ -19,8 +22,6 @@ import {FilterType} from './filters/filter'; import {makeInactiveElementSpec} from './filters/inactive-element'; import {getAmpAdResourceId} from '../../../src/ad-helper'; -import {getData} from '../../../src/event-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {openWindowDialog} from '../../../src/open-window-dialog'; import {getTopWindow} from '../../../src/service-helpers'; diff --git a/extensions/amp-ad-exit/0.1/config.js b/extensions/amp-ad-exit/0.1/config.js index 31e9c70412f0..7803f12af2eb 100644 --- a/extensions/amp-ad-exit/0.1/config.js +++ b/extensions/amp-ad-exit/0.1/config.js @@ -1,6 +1,7 @@ +import {user, userAssert} from '#utils/log'; + import {FilterType} from './filters/filter'; -import {user, userAssert} from '../../../src/log'; import {IFRAME_TRANSPORTS} from '../../amp-analytics/0.1/iframe-transport-vendors'; /** diff --git a/extensions/amp-ad-exit/0.1/filters/click-delay.js b/extensions/amp-ad-exit/0.1/filters/click-delay.js index edc1d5df916c..e822ea2a039e 100644 --- a/extensions/amp-ad-exit/0.1/filters/click-delay.js +++ b/extensions/amp-ad-exit/0.1/filters/click-delay.js @@ -1,6 +1,6 @@ -import {Filter, FilterType} from './filter'; +import {dev, userAssert} from '#utils/log'; -import {dev, userAssert} from '../../../../src/log'; +import {Filter, FilterType} from './filter'; /** @type {string} */ const TAG = 'amp-ad-exit'; diff --git a/extensions/amp-ad-exit/0.1/filters/click-location.js b/extensions/amp-ad-exit/0.1/filters/click-location.js index 7e8b74f3a2cb..fca82153eec8 100644 --- a/extensions/amp-ad-exit/0.1/filters/click-location.js +++ b/extensions/amp-ad-exit/0.1/filters/click-location.js @@ -1,6 +1,6 @@ -import {Filter, FilterType} from './filter'; +import {userAssert} from '#utils/log'; -import {userAssert} from '../../../../src/log'; +import {Filter, FilterType} from './filter'; export class ClickLocationFilter extends Filter { /** diff --git a/extensions/amp-ad-exit/0.1/filters/inactive-element.js b/extensions/amp-ad-exit/0.1/filters/inactive-element.js index 6d1706af9181..6caa99e2c31a 100644 --- a/extensions/amp-ad-exit/0.1/filters/inactive-element.js +++ b/extensions/amp-ad-exit/0.1/filters/inactive-element.js @@ -1,8 +1,8 @@ import {matches} from '#core/dom/query'; -import {Filter, FilterType} from './filter'; +import {dev, userAssert} from '#utils/log'; -import {dev, userAssert} from '../../../../src/log'; +import {Filter, FilterType} from './filter'; /** * A Filter that ignores events originating from elements that match a specified diff --git a/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js b/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js index 9fa8a38b52a9..e2a4e99d1b04 100644 --- a/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js +++ b/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js @@ -1,4 +1,4 @@ -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; /** * Maintains state in between different AdSense slots on the same page. This diff --git a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js index b9f104bacc02..b1d736b4b8b2 100644 --- a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js +++ b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js @@ -50,13 +50,14 @@ import {StoryAdSegmentExp} from '#experiments/story-ad-progress-segment'; import {Services} from '#service'; import {Navigation} from '#service/navigation'; +import {getData} from '#utils/event-helper'; +import {dev, devAssert, user} from '#utils/log'; + import {AdsenseSharedState} from './adsense-shared-state'; import {ResponsiveState} from './responsive-state'; import {getDefaultBootstrapBaseUrl} from '../../../src/3p-frame'; -import {getData} from '../../../src/event-helper'; import {insertAnalyticsElement} from '../../../src/extension-analytics'; -import {dev, devAssert, user} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {AmpA4A} from '../../amp-a4a/0.1/amp-a4a'; import {AMP_SIGNATURE_HEADER} from '../../amp-a4a/0.1/signature-verifier'; diff --git a/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js b/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js index d3b3c70892ce..b6027d34ea56 100644 --- a/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js +++ b/extensions/amp-ad-network-adsense-impl/0.1/responsive-state.js @@ -16,8 +16,8 @@ import {randomlySelectUnsetExperiments} from '#experiments'; import {Services} from '#service'; -import {getData} from '../../../src/event-helper'; -import {dev, devAssert, user} from '../../../src/log'; +import {getData} from '#utils/event-helper'; +import {dev, devAssert, user} from '#utils/log'; const TAG = 'amp-ad-network-adsense-impl'; diff --git a/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js b/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js index 2fa45218ef9f..11679031ce59 100644 --- a/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js +++ b/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js @@ -2,7 +2,8 @@ import {tryResolve} from '#core/data-structures/promise'; import {tryParseJson} from '#core/types/object/json'; import {utf8Decode, utf8Encode} from '#core/types/string/bytes'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; + import {getMode} from '../../../src/mode'; import { AmpA4A, diff --git a/extensions/amp-ad-network-dianomi-impl/0.1/amp-ad-network-dianomi-impl.js b/extensions/amp-ad-network-dianomi-impl/0.1/amp-ad-network-dianomi-impl.js index bc5ac0e54926..fffadfebcb55 100644 --- a/extensions/amp-ad-network-dianomi-impl/0.1/amp-ad-network-dianomi-impl.js +++ b/extensions/amp-ad-network-dianomi-impl/0.1/amp-ad-network-dianomi-impl.js @@ -1,4 +1,5 @@ -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; + import {AmpA4A} from '../../amp-a4a/0.1/amp-a4a'; const REQUEST_PARAM_ID = new RegExp(/^.[0-9]*$/); diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js index b0565b5b2dca..223bddbe478a 100644 --- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js +++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js @@ -76,6 +76,8 @@ import {Services} from '#service'; import {Navigation} from '#service/navigation'; import {RTC_VENDORS} from '#service/real-time-config/callout-vendors'; +import {dev, devAssert, user} from '#utils/log'; + import { FlexibleAdSlotDataTypeDef, getFlexibleAdSlotData, @@ -91,7 +93,6 @@ import { import {getOrCreateAdCid} from '../../../src/ad-cid'; import {isCancellation} from '../../../src/error-reporting'; import {insertAnalyticsElement} from '../../../src/extension-analytics'; -import {dev, devAssert, user} from '../../../src/log'; import {getMode} from '../../../src/mode'; import { AmpA4A, diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js b/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js index 9d01e9993ec7..61f5f6ba927e 100644 --- a/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js +++ b/extensions/amp-ad-network-doubleclick-impl/0.1/flexible-ad-slot-utils.js @@ -2,11 +2,11 @@ import {Layout} from '#core/dom/layout'; import {Services} from '#service'; -import {dev} from '../../../src/log'; import { DomAncestorVisitor, VisitorCallbackTypeDef, -} from '../../../src/utils/dom-ancestor-visitor'; +} from '#utils/dom-ancestor-visitor'; +import {dev} from '#utils/log'; /** @const @enum {number} */ const FULL_WIDTH_SIGNALS = { diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js b/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js index 8a0743e0cb60..ebb9e1dbf82c 100644 --- a/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js +++ b/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js @@ -6,8 +6,9 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {getData} from '../../../src/event-helper'; -import {dev, devAssert, user} from '../../../src/log'; +import {getData} from '#utils/event-helper'; +import {dev, devAssert, user} from '#utils/log'; + import {parseUrlDeprecated} from '../../../src/url'; /** diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js b/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js index a3c128b06f37..b0c801dad44b 100644 --- a/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js +++ b/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js @@ -6,7 +6,8 @@ import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box'; import {isObject} from '#core/types'; import {utf8Encode} from '#core/types/string/bytes'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; + import {RENDERING_TYPE_HEADER, XORIGIN_MODE} from '../../amp-a4a/0.1/amp-a4a'; /** @type {string} */ diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js index c3a9a3972a03..5e511f0a685a 100644 --- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js +++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js @@ -9,8 +9,9 @@ import {utf8Decode, utf8Encode} from '#core/types/string/bytes'; import {Xhr} from '#service/xhr-impl'; +import {devAssert} from '#utils/log'; + import {BaseElement} from '../../../../src/base-element'; -import {devAssert} from '../../../../src/log'; import { AmpA4A, EXPERIMENT_FEATURE_HEADER_NAME, diff --git a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js index 5b5d4699059e..7a62641e199d 100644 --- a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js +++ b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-metadata-transformer.js @@ -1,7 +1,7 @@ import {dict} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; export class AmpAdMetadataTransformer { /** constructor */ diff --git a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js index 423b0fc84354..01e9fc63326a 100644 --- a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js +++ b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js @@ -2,10 +2,11 @@ import {includes} from '#core/types/string'; import {forceExperimentBranch} from '#experiments'; +import {user, userAssert} from '#utils/log'; + import {AmpAdMetadataTransformer} from './amp-ad-metadata-transformer'; import {ExternalReorderHeadTransformer} from './external-reorder-head-transformer'; -import {user, userAssert} from '../../../src/log'; import {AmpA4A} from '../../amp-a4a/0.1/amp-a4a'; const TAG = 'AMP-AD-NETWORK-FAKE-IMPL'; diff --git a/extensions/amp-ad-network-nws-impl/0.1/amp-ad-network-nws-impl.js b/extensions/amp-ad-network-nws-impl/0.1/amp-ad-network-nws-impl.js index 49789c97f00e..c41f9f081a5a 100644 --- a/extensions/amp-ad-network-nws-impl/0.1/amp-ad-network-nws-impl.js +++ b/extensions/amp-ad-network-nws-impl/0.1/amp-ad-network-nws-impl.js @@ -1,8 +1,9 @@ import {removeElement} from '#core/dom'; import {parseJson} from '#core/types/object/json'; +import {dev, devAssert} from '#utils/log'; + import {insertAnalyticsElement} from '../../../src/extension-analytics'; -import {dev, devAssert} from '../../../src/log'; import {AmpA4A} from '../../amp-a4a/0.1/amp-a4a'; const URL = 'https://svr.nws.ai/a4a'; diff --git a/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js b/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js index a31eb0dc0875..eab63fc86193 100644 --- a/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js +++ b/extensions/amp-ad-network-valueimpression-impl/0.1/amp-ad-network-valueimpression-impl.js @@ -10,10 +10,11 @@ import {getBinaryType, isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import {getFlexibleAdSlotData} from './flexible-ad-slot-utils'; import {getOrCreateAdCid} from '../../../src/ad-cid'; -import {dev} from '../../../src/log'; import {AmpA4A} from '../../amp-a4a/0.1/amp-a4a'; import {RefreshManager} from '../../amp-a4a/0.1/refresh-manager'; diff --git a/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js b/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js index 9d01e9993ec7..61f5f6ba927e 100644 --- a/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js +++ b/extensions/amp-ad-network-valueimpression-impl/0.1/flexible-ad-slot-utils.js @@ -2,11 +2,11 @@ import {Layout} from '#core/dom/layout'; import {Services} from '#service'; -import {dev} from '../../../src/log'; import { DomAncestorVisitor, VisitorCallbackTypeDef, -} from '../../../src/utils/dom-ancestor-visitor'; +} from '#utils/dom-ancestor-visitor'; +import {dev} from '#utils/log'; /** @const @enum {number} */ const FULL_WIDTH_SIGNALS = { diff --git a/extensions/amp-ad/0.1/amp-ad-3p-impl.js b/extensions/amp-ad/0.1/amp-ad-3p-impl.js index 5a2bd05685a0..7a07c2d6f392 100644 --- a/extensions/amp-ad/0.1/amp-ad-3p-impl.js +++ b/extensions/amp-ad/0.1/amp-ad-3p-impl.js @@ -16,7 +16,7 @@ import {Services} from '#service'; import {adConfig} from '#ads/_config'; import {clamp} from '#core/math'; import {computedStyle, setStyle} from '#core/dom/style'; -import {dev, devAssert, userAssert} from '../../../src/log'; +import {dev, devAssert, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getAdCid} from '../../../src/ad-cid'; import {getAdContainer, isAdPositionAllowed} from '../../../src/ad-helper'; diff --git a/extensions/amp-ad/0.1/amp-ad-custom.js b/extensions/amp-ad/0.1/amp-ad-custom.js index e75a4124d337..59606e9b3376 100644 --- a/extensions/amp-ad/0.1/amp-ad-custom.js +++ b/extensions/amp-ad/0.1/amp-ad-custom.js @@ -9,7 +9,7 @@ import { } from '#core/dom/query'; import {hasOwn} from '#core/types/object'; import {removeChildren} from '#core/dom'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} Tag name for custom ad implementation. */ export const TAG_AD_CUSTOM = 'amp-ad-custom'; diff --git a/extensions/amp-ad/0.1/amp-ad-ui.js b/extensions/amp-ad/0.1/amp-ad-ui.js index 864da2436f34..c6f839342e88 100644 --- a/extensions/amp-ad/0.1/amp-ad-ui.js +++ b/extensions/amp-ad/0.1/amp-ad-ui.js @@ -1,11 +1,11 @@ import {Services} from '#service'; import {ancestorElementsByTag} from '#core/dom/query'; import {createElementWithAttributes, removeElement} from '#core/dom'; -import {devAssert, user, userAssert} from '../../../src/log'; +import {devAssert, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getAdContainer} from '../../../src/ad-helper'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; import {setStyle, setStyles} from '#core/dom/style'; const TAG = 'amp-ad-ui'; diff --git a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js index d781f4a54757..befe64f76d7c 100644 --- a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js +++ b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js @@ -10,9 +10,9 @@ import { postMessageToWindows, } from '../../../src/iframe-helper'; import {applyFillContent} from '#core/dom/layout'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {dict} from '#core/types/object'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; import {getHtml} from '#core/dom/get-html'; import {isExperimentOn} from '#experiments'; import {isGoogleAdsA4AValidEnvironment} from '#ads/google/a4a/utils'; diff --git a/extensions/amp-ad/0.1/amp-ad.js b/extensions/amp-ad/0.1/amp-ad.js index e1b5f1605b65..ce14144cd815 100644 --- a/extensions/amp-ad/0.1/amp-ad.js +++ b/extensions/amp-ad/0.1/amp-ad.js @@ -20,7 +20,7 @@ import {Services} from '#service'; import {adConfig} from '#ads/_config'; import {getA4ARegistry} from '#ads/_a4a-config'; import {hasOwn} from '#core/types/object'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** * Construct ad network type-specific tag and script name. Note that this diff --git a/extensions/amp-ad/0.1/concurrent-load.js b/extensions/amp-ad/0.1/concurrent-load.js index 89a54ab87023..f32de44ba737 100644 --- a/extensions/amp-ad/0.1/concurrent-load.js +++ b/extensions/amp-ad/0.1/concurrent-load.js @@ -15,7 +15,7 @@ import {Deferred} from '#core/data-structures/promise'; import {Services} from '#service'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; /** * Store loading ads info within window to ensure it can be properly stored diff --git a/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js b/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js index 7f111b4b7a6b..bb6b069b8977 100644 --- a/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js +++ b/extensions/amp-ad/0.1/test/test-legacy-ad-intersection-observer-host.js @@ -2,7 +2,7 @@ import {BaseElement} from '../../../../src/base-element'; import {LegacyAdIntersectionObserverHost} from '../legacy-ad-intersection-observer-host'; import {createAmpElementForTesting} from '../../../../src/custom-element'; import {deserializeMessage} from '#core/3p-frame-messaging'; -import {getIntersectionChangeEntry} from '../../../../src/utils/intersection-observer-3p-host'; +import {getIntersectionChangeEntry} from '#utils/intersection-observer-3p-host'; import {layoutRectLtwh} from '#core/dom/layout/rect'; describes.sandboxed('IntersectionObserverHostForAd', {}, (env) => { diff --git a/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js b/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js index 47b7109eeee0..daf192e05913 100644 --- a/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js +++ b/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js @@ -1,4 +1,4 @@ -import {listen} from '../../../../../src/event-helper'; +import {listen} from '#utils/event-helper'; export class ClickMonitor { /** diff --git a/extensions/amp-addthis/0.1/addthis-utils/pixel.js b/extensions/amp-addthis/0.1/addthis-utils/pixel.js index 571f7d3779ef..c1005ac36e07 100644 --- a/extensions/amp-addthis/0.1/addthis-utils/pixel.js +++ b/extensions/amp-addthis/0.1/addthis-utils/pixel.js @@ -3,7 +3,7 @@ import {Services} from '#service'; import {addParamsToUrl, parseUrlDeprecated} from '../../../../src/url'; import {createElementWithAttributes} from '#core/dom'; import {dict} from '#core/types/object'; -import {getData} from '../../../../src/event-helper'; +import {getData} from '#utils/event-helper'; import {isObject} from '#core/types'; import {parseJson} from '#core/types/object/json'; diff --git a/extensions/amp-addthis/0.1/amp-addthis.js b/extensions/amp-addthis/0.1/amp-addthis.js index afb67d6defdd..fd7fa4983bc7 100644 --- a/extensions/amp-addthis/0.1/amp-addthis.js +++ b/extensions/amp-addthis/0.1/amp-addthis.js @@ -51,10 +51,10 @@ import { import {getOgImage} from './addthis-utils/meta'; import {getWidgetOverload} from './addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode'; import * as mode from '#core/mode'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; import {parseUrlDeprecated} from '../../../src/url'; import {setStyle} from '#core/dom/style'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; // The following items will be shared by all AmpAddThis elements on a page, to // prevent unnecessary HTTP requests, get accurate analytics, etc., and hence diff --git a/extensions/amp-addthis/0.1/post-message-dispatcher.js b/extensions/amp-addthis/0.1/post-message-dispatcher.js index 25485bb15e00..43844dc53f8a 100644 --- a/extensions/amp-addthis/0.1/post-message-dispatcher.js +++ b/extensions/amp-addthis/0.1/post-message-dispatcher.js @@ -1,5 +1,5 @@ import {CONFIGURATION_EVENT, ORIGIN, SHARE_EVENT} from './constants'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; import {isObject} from '#core/types'; import {tryParseJson} from '#core/types/object/json'; diff --git a/extensions/amp-analytics/0.1/activity-impl.js b/extensions/amp-analytics/0.1/activity-impl.js index 27faa3b51ecf..4a363223b0a6 100644 --- a/extensions/amp-analytics/0.1/activity-impl.js +++ b/extensions/amp-analytics/0.1/activity-impl.js @@ -5,7 +5,7 @@ import {Services} from '#service'; import {hasOwn} from '#core/types/object'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; import {registerServiceBuilderForDoc} from '../../../src/service-helpers'; /** diff --git a/extensions/amp-analytics/0.1/amp-analytics.js b/extensions/amp-analytics/0.1/amp-analytics.js index 0f5478a2e26f..8d32973c7dbf 100644 --- a/extensions/amp-analytics/0.1/amp-analytics.js +++ b/extensions/amp-analytics/0.1/amp-analytics.js @@ -20,7 +20,7 @@ import {RequestHandler, expandPostMessage} from './requests'; import {Services} from '#service'; import {SessionManager, sessionServicePromiseForDoc} from './session-manager'; import {Transport} from './transport'; -import {dev, devAssert, user} from '../../../src/log'; +import {dev, devAssert, user} from '#utils/log'; import {dict, hasOwn} from '#core/types/object'; import {expandTemplate} from '#core/types/string'; import {getMode} from '../../../src/mode'; diff --git a/extensions/amp-analytics/0.1/analytics-group.js b/extensions/amp-analytics/0.1/analytics-group.js index 1e310d967945..4d51b48839c5 100644 --- a/extensions/amp-analytics/0.1/analytics-group.js +++ b/extensions/amp-analytics/0.1/analytics-group.js @@ -1,6 +1,6 @@ import {ChunkPriority, chunk} from '../../../src/chunk'; import {Deferred} from '#core/data-structures/promise'; -import {dev, userAssert} from '../../../src/log'; +import {dev, userAssert} from '#utils/log'; import {getMode} from '../../../src/mode'; import {getTrackerKeyName, getTrackerTypesForParentType} from './events'; import {toWin} from '#core/window'; diff --git a/extensions/amp-analytics/0.1/analytics-root.js b/extensions/amp-analytics/0.1/analytics-root.js index 2e6f71e4d934..146f63bca218 100644 --- a/extensions/amp-analytics/0.1/analytics-root.js +++ b/extensions/amp-analytics/0.1/analytics-root.js @@ -5,7 +5,7 @@ import { matches, scopedQuerySelector, } from '#core/dom/query'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {getDataParamsFromAttributes} from '#core/dom'; import {getMode} from '../../../src/mode'; import {isArray} from '#core/types'; diff --git a/extensions/amp-analytics/0.1/config.js b/extensions/amp-analytics/0.1/config.js index 79adeb36c654..5533d550977f 100644 --- a/extensions/amp-analytics/0.1/config.js +++ b/extensions/amp-analytics/0.1/config.js @@ -3,7 +3,7 @@ import {Services} from '#service'; import {assertHttpsUrl} from '../../../src/url'; import {calculateScriptBaseUrl} from '#service/extension-script'; import {deepMerge, dict, hasOwn} from '#core/types/object'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {getChildJsonConfig} from '#core/dom'; import {getMode} from '../../../src/mode'; import {isArray, isObject} from '#core/types'; diff --git a/extensions/amp-analytics/0.1/cookie-writer.js b/extensions/amp-analytics/0.1/cookie-writer.js index f20e76808fd0..40a0d7fdbfde 100644 --- a/extensions/amp-analytics/0.1/cookie-writer.js +++ b/extensions/amp-analytics/0.1/cookie-writer.js @@ -6,7 +6,7 @@ import {Services} from '#service'; import {hasOwn} from '#core/types/object'; import {isCookieAllowed} from './cookie-reader'; import {isObject} from '#core/types'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; import {variableServiceForDoc} from './variables'; const TAG = 'amp-analytics/cookie-writer'; diff --git a/extensions/amp-analytics/0.1/events.js b/extensions/amp-analytics/0.1/events.js index d8728283d650..a9f69abca831 100644 --- a/extensions/amp-analytics/0.1/events.js +++ b/extensions/amp-analytics/0.1/events.js @@ -7,8 +7,8 @@ import { videoAnalyticsCustomEventTypeKey, } from '../../../src/video-interface'; import {deepMerge, dict, hasOwn} from '#core/types/object'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; -import {getData} from '../../../src/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; +import {getData} from '#utils/event-helper'; import {getDataParamsFromAttributes} from '#core/dom'; import {isAmpElement} from '#core/dom/amp-element-helpers'; import {isArray, isEnumValue, isFiniteNumber} from '#core/types'; diff --git a/extensions/amp-analytics/0.1/iframe-transport-message-queue.js b/extensions/amp-analytics/0.1/iframe-transport-message-queue.js index 446fd7d0a677..9422d86509ad 100644 --- a/extensions/amp-analytics/0.1/iframe-transport-message-queue.js +++ b/extensions/amp-analytics/0.1/iframe-transport-message-queue.js @@ -1,6 +1,6 @@ import {IframeTransportEventDef, MessageType} from '#core/3p-frame-messaging'; import {SubscriptionApi} from '../../../src/iframe-helper'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; /** @private @const {string} */ const TAG_ = 'amp-analytics/iframe-transport-message-queue'; diff --git a/extensions/amp-analytics/0.1/iframe-transport.js b/extensions/amp-analytics/0.1/iframe-transport.js index 8a17b2825fc7..97aec3b9f3d3 100644 --- a/extensions/amp-analytics/0.1/iframe-transport.js +++ b/extensions/amp-analytics/0.1/iframe-transport.js @@ -1,6 +1,6 @@ import {IframeTransportMessageQueue} from './iframe-transport-message-queue'; import {createElementWithAttributes} from '#core/dom'; -import {devAssert, user} from '../../../src/log'; +import {devAssert, user} from '#utils/log'; import {getMode} from '../../../src/mode'; import {hasOwn} from '#core/types/object'; import * as mode from '#core/mode'; diff --git a/extensions/amp-analytics/0.1/linker-manager.js b/extensions/amp-analytics/0.1/linker-manager.js index 6a8cea916da3..79da91decf30 100644 --- a/extensions/amp-analytics/0.1/linker-manager.js +++ b/extensions/amp-analytics/0.1/linker-manager.js @@ -9,7 +9,7 @@ import {createLinker} from './linker'; import {dict} from '#core/types/object'; import {getHighestAvailableDomain} from '../../../src/cookies'; import {isObject} from '#core/types'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @const {string} */ const TAG = 'amp-analytics/linker-manager'; diff --git a/extensions/amp-analytics/0.1/linker-reader.js b/extensions/amp-analytics/0.1/linker-reader.js index 59b9b654f18d..48daf448c73d 100644 --- a/extensions/amp-analytics/0.1/linker-reader.js +++ b/extensions/amp-analytics/0.1/linker-reader.js @@ -4,7 +4,7 @@ import {parseLinker} from './linker'; import {parseQueryString} from '#core/types/string/url'; import {removeParamsFromSearch} from '../../../src/url'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; const TAG = 'amp-analytics/linker-reader'; diff --git a/extensions/amp-analytics/0.1/linker.js b/extensions/amp-analytics/0.1/linker.js index c6c8970a57b6..503361c938c0 100644 --- a/extensions/amp-analytics/0.1/linker.js +++ b/extensions/amp-analytics/0.1/linker.js @@ -4,7 +4,7 @@ import { base64UrlEncodeFromString, } from '#core/types/string/base64'; import {crc32} from './crc32'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @const {string} */ const DELIMITER = '*'; diff --git a/extensions/amp-analytics/0.1/requests.js b/extensions/amp-analytics/0.1/requests.js index 7fa8f2c5231f..8b8aea88894f 100644 --- a/extensions/amp-analytics/0.1/requests.js +++ b/extensions/amp-analytics/0.1/requests.js @@ -3,7 +3,7 @@ import {BatchSegmentDef, defaultSerializer} from './transport-serializer'; import {ExpansionOptions, variableServiceForDoc} from './variables'; import {SANDBOX_AVAILABLE_VARS} from './sandbox-vars-allowlist'; import {Services} from '#service'; -import {devAssert, userAssert} from '../../../src/log'; +import {devAssert, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getResourceTiming} from './resource-timing'; import {isArray, isFiniteNumber, isObject} from '#core/types'; diff --git a/extensions/amp-analytics/0.1/resource-timing.js b/extensions/amp-analytics/0.1/resource-timing.js index 6bfa5152839f..91e65eaf806d 100644 --- a/extensions/amp-analytics/0.1/resource-timing.js +++ b/extensions/amp-analytics/0.1/resource-timing.js @@ -1,7 +1,7 @@ import {ExpansionOptions, variableServiceForDoc} from './variables'; import {findIndex} from '#core/types/array'; import {isObject} from '#core/types'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** * A user-supplied JSON object that defines a resource to be reported. It is diff --git a/extensions/amp-analytics/0.1/scroll-manager.js b/extensions/amp-analytics/0.1/scroll-manager.js index 3bce30c8d99b..f21bf1fd4581 100644 --- a/extensions/amp-analytics/0.1/scroll-manager.js +++ b/extensions/amp-analytics/0.1/scroll-manager.js @@ -1,6 +1,6 @@ import {Observable} from '#core/data-structures/observable'; import {Services} from '#service'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; /** * @typedef {{ diff --git a/extensions/amp-analytics/0.1/session-manager.js b/extensions/amp-analytics/0.1/session-manager.js index 4b8dff4c7fed..7bc533077580 100644 --- a/extensions/amp-analytics/0.1/session-manager.js +++ b/extensions/amp-analytics/0.1/session-manager.js @@ -1,13 +1,13 @@ import {Services} from '#service'; -import {dev, user} from '../../../src/log'; +import {dev, user} from '#utils/log'; import { getServicePromiseForDoc, registerServiceBuilderForDoc, } from '../../../src/service-helpers'; import {hasOwn, map} from '#core/types/object'; -import {isDocumentHidden} from '#core/document-visibility'; +import {isDocumentHidden} from '#core/document/visibility'; import {isObject} from '#core/types'; -import {listen} from 'src/event-helper'; +import {listen} from '#utils/event-helper'; /** @const {string} */ const TAG = 'amp-analytics/session-manager'; diff --git a/extensions/amp-analytics/0.1/test/test-analytics-root.js b/extensions/amp-analytics/0.1/test/test-analytics-root.js index 182a8fa96f9b..60de6734a797 100644 --- a/extensions/amp-analytics/0.1/test/test-analytics-root.js +++ b/extensions/amp-analytics/0.1/test/test-analytics-root.js @@ -7,7 +7,7 @@ import { VisibilityManagerForDoc, VisibilityManagerForEmbed, } from '../visibility-manager'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, (env) => { let win; diff --git a/extensions/amp-analytics/0.1/test/test-config.js b/extensions/amp-analytics/0.1/test/test-config.js index 1fad45a05dbc..3664561bdc15 100644 --- a/extensions/amp-analytics/0.1/test/test-config.js +++ b/extensions/amp-analytics/0.1/test/test-config.js @@ -3,7 +3,7 @@ import {Services} from '#service'; import {installDocService} from '#service/ampdoc-impl'; import {map} from '#core/types/object'; import {stubService} from '#testing/test-helper'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin( 'AnalyticsConfig', 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 97a5a282c2d7..203cc23a80ab 100644 --- a/extensions/amp-analytics/0.1/test/test-iframe-transport.js +++ b/extensions/amp-analytics/0.1/test/test-iframe-transport.js @@ -5,7 +5,7 @@ import { import {addParamsToUrl} from '../../../../src/url'; import {expectPostMessage} from '#testing/iframe'; import {urls} from '../../../../src/config'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin('amp-analytics.iframe-transport', {amp: true}, (env) => { let iframeTransport; diff --git a/extensions/amp-analytics/0.1/test/test-requests.js b/extensions/amp-analytics/0.1/test/test-requests.js index f260fcbf7823..e66f2eaa3191 100644 --- a/extensions/amp-analytics/0.1/test/test-requests.js +++ b/extensions/amp-analytics/0.1/test/test-requests.js @@ -1,6 +1,6 @@ import * as ResourceTiming from '../resource-timing'; import * as fakeTimers from '@sinonjs/fake-timers'; -import * as log from '../../../../src/log'; +import * as log from '#utils/log'; import {ExpansionOptions, installVariableServiceForTesting} from '../variables'; import {RequestHandler, expandPostMessage} from '../requests'; import {Services} from '#service'; diff --git a/extensions/amp-analytics/0.1/test/test-session-manager.js b/extensions/amp-analytics/0.1/test/test-session-manager.js index 731536c7be51..874c119d61da 100644 --- a/extensions/amp-analytics/0.1/test/test-session-manager.js +++ b/extensions/amp-analytics/0.1/test/test-session-manager.js @@ -1,4 +1,4 @@ -import * as Listen from '../../../../src/event-helper'; +import * as Listen from '#utils/event-helper'; import { SESSION_MAX_AGE_MILLIS, SESSION_VALUES, @@ -12,7 +12,7 @@ import { registerServiceBuilder, resetServiceForTesting, } from '../../../../src/service-helpers'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin('Session Manager', {amp: true}, (env) => { let win; diff --git a/extensions/amp-analytics/0.1/test/test-transport.js b/extensions/amp-analytics/0.1/test/test-transport.js index 51b56b47f4e8..c14b018c7717 100644 --- a/extensions/amp-analytics/0.1/test/test-transport.js +++ b/extensions/amp-analytics/0.1/test/test-transport.js @@ -6,7 +6,7 @@ import {Transport} from '../transport'; import {getMode} from '../../../../src/mode'; import {installDocService} from '#service/ampdoc-impl'; import {installTimerService} from '#service/timer-impl'; -import {loadPromise} from '../../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; describes.realWin( 'amp-analytics.transport', diff --git a/extensions/amp-analytics/0.1/transport.js b/extensions/amp-analytics/0.1/transport.js index 3a870a5b7862..951043b3575f 100644 --- a/extensions/amp-analytics/0.1/transport.js +++ b/extensions/amp-analytics/0.1/transport.js @@ -15,12 +15,12 @@ import { parseUrlDeprecated, } from '../../../src/url'; import {createPixel} from '../../../src/pixel'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {getAmpAdResourceId} from '../../../src/ad-helper'; import {getMode} from '../../../src/mode'; import {getTopWindow} from '../../../src/service-helpers'; -import {loadPromise} from '../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; import {removeElement} from '#core/dom'; import {toWin} from '#core/window'; import {toggle} from '#core/dom/style'; diff --git a/extensions/amp-analytics/0.1/variables.js b/extensions/amp-analytics/0.1/variables.js index 30acff606e1f..ee89f2318a11 100644 --- a/extensions/amp-analytics/0.1/variables.js +++ b/extensions/amp-analytics/0.1/variables.js @@ -4,7 +4,7 @@ import {TickLabel} from '#core/constants/enums'; import {asyncStringReplace} from '#core/types/string'; import {base64UrlEncodeFromString} from '#core/types/string/base64'; import {cookieReader} from './cookie-reader'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {dev, devAssert, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getActiveExperimentBranches, getExperimentBranch} from '#experiments'; import { diff --git a/extensions/amp-analytics/0.1/visibility-manager.js b/extensions/amp-analytics/0.1/visibility-manager.js index 4507da108832..86a6000ac0c8 100644 --- a/extensions/amp-analytics/0.1/visibility-manager.js +++ b/extensions/amp-analytics/0.1/visibility-manager.js @@ -1,6 +1,6 @@ import {Services} from '#service'; import {VisibilityModel} from './visibility-model'; -import {dev, user} from '../../../src/log'; +import {dev, user} from '#utils/log'; import {dict, map} from '#core/types/object'; import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper'; import {getMinOpacity} from './opacity'; diff --git a/extensions/amp-analytics/0.1/visibility-model.js b/extensions/amp-analytics/0.1/visibility-model.js index ae9da0543779..cef6ddc0291a 100644 --- a/extensions/amp-analytics/0.1/visibility-model.js +++ b/extensions/amp-analytics/0.1/visibility-model.js @@ -1,6 +1,6 @@ import {Deferred} from '#core/data-structures/promise'; import {Observable} from '#core/data-structures/observable'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; import {dict} from '#core/types/object'; /** diff --git a/extensions/amp-anim/0.1/amp-anim.js b/extensions/amp-anim/0.1/amp-anim.js index ff7c94be8a03..333cd1101559 100644 --- a/extensions/amp-anim/0.1/amp-anim.js +++ b/extensions/amp-anim/0.1/amp-anim.js @@ -1,6 +1,6 @@ import * as st from '#core/dom/style'; import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {guaranteeSrcForSrcsetUnsupportedBrowsers} from '#core/dom/img'; import {observeIntersections} from '#core/dom/layout/viewport-observer'; import {propagateAttributes} from '#core/dom/propagate-attributes'; diff --git a/extensions/amp-animation/0.1/amp-animation.js b/extensions/amp-animation/0.1/amp-animation.js index 2268df805573..7345dc558101 100644 --- a/extensions/amp-animation/0.1/amp-animation.js +++ b/extensions/amp-animation/0.1/amp-animation.js @@ -6,13 +6,14 @@ import {isFiniteNumber} from '#core/types'; import {Services} from '#service'; +import {getDetail, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {installWebAnimationsIfNecessary} from './install-polyfill'; import {WebAnimationService} from './web-animation-service'; import {WebAnimationPlayState} from './web-animation-types'; import {Builder} from './web-animations'; -import {getDetail, listen} from '../../../src/event-helper'; -import {dev, userAssert} from '../../../src/log'; import {Pass} from '../../../src/pass'; const TAG = 'amp-animation'; diff --git a/extensions/amp-animation/0.1/runners/native-web-animation-runner.js b/extensions/amp-animation/0.1/runners/native-web-animation-runner.js index 322cbca8015c..3d763e8de26f 100644 --- a/extensions/amp-animation/0.1/runners/native-web-animation-runner.js +++ b/extensions/amp-animation/0.1/runners/native-web-animation-runner.js @@ -1,10 +1,11 @@ import {Observable} from '#core/data-structures/observable'; import {assertDoesNotContainDisplay, setStyles} from '#core/dom/style'; +import {devAssert} from '#utils/log'; + import {AnimationRunner} from './animation-runner'; import {getTotalDuration} from './utils'; -import {devAssert} from '../../../../src/log'; import { WebAnimationDef, WebAnimationPlayState, diff --git a/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js b/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js index f004c8189482..0f04667d5f6d 100644 --- a/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js +++ b/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js @@ -2,11 +2,11 @@ import {assertDoesNotContainDisplay, px, setStyles} from '#core/dom/style'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import {AnimationRunner} from './animation-runner'; import {getTotalDuration} from './utils'; -import {dev} from '../../../../src/log'; - const moduleName = 'amp-animation-worklet'; let workletModulePromise; diff --git a/extensions/amp-animation/0.1/runners/utils.js b/extensions/amp-animation/0.1/runners/utils.js index a8833f9d13d4..3eb884c1feb5 100644 --- a/extensions/amp-animation/0.1/runners/utils.js +++ b/extensions/amp-animation/0.1/runners/utils.js @@ -1,4 +1,4 @@ -import {userAssert} from '../../../../src/log'; +import {userAssert} from '#utils/log'; /** * @param {!Array} requests diff --git a/extensions/amp-animation/0.1/test/test-web-animations.js b/extensions/amp-animation/0.1/test/test-web-animations.js index ac77019b5355..33c16e0877fc 100644 --- a/extensions/amp-animation/0.1/test/test-web-animations.js +++ b/extensions/amp-animation/0.1/test/test-web-animations.js @@ -4,9 +4,10 @@ import {isArray, isObject} from '#core/types'; import {Services} from '#service'; +import {user} from '#utils/log'; + import {poll} from '#testing/iframe'; -import {user} from '../../../../src/log'; import {NativeWebAnimationRunner} from '../runners/native-web-animation-runner'; import {WebAnimationPlayState} from '../web-animation-types'; import {Builder} from '../web-animations'; diff --git a/extensions/amp-animation/0.1/web-animations.js b/extensions/amp-animation/0.1/web-animations.js index 0d0d592e3a4f..0c1efd18015b 100644 --- a/extensions/amp-animation/0.1/web-animations.js +++ b/extensions/amp-animation/0.1/web-animations.js @@ -14,6 +14,8 @@ import {dashToCamelCase} from '#core/types/string'; import {isExperimentOn} from '#experiments'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {parseCss} from './parsers/css-expr'; import {CssNumberNode, CssTimeNode, isVarCss} from './parsers/css-expr-ast'; import {extractKeyframes} from './parsers/keyframes-extractor'; @@ -36,7 +38,6 @@ import { } from './web-animation-types'; import {isInFie} from '../../../src/iframe-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {assertHttpsUrl, resolveRelativeUrl} from '../../../src/url'; diff --git a/extensions/amp-apester-media/0.1/amp-apester-media.js b/extensions/amp-apester-media/0.1/amp-apester-media.js index 522df780efe3..7d021583f99e 100644 --- a/extensions/amp-apester-media/0.1/amp-apester-media.js +++ b/extensions/amp-apester-media/0.1/amp-apester-media.js @@ -14,7 +14,7 @@ * limitations under the License. */ import {CSS} from '../../../build/amp-apester-media-0.1.css'; -import {IntersectionObserver3pHost} from '../../../src/utils/intersection-observer-3p-host'; +import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host'; import {Services} from '#service'; import {addParamsToUrl} from '../../../src/url'; import { @@ -22,7 +22,7 @@ import { getLengthNumeral, isLayoutSizeDefined, } from '#core/dom/layout'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import { extractTags, diff --git a/extensions/amp-apester-media/0.1/monetization/consent-util.js b/extensions/amp-apester-media/0.1/monetization/consent-util.js index 9508af77ae54..21c5946dd65e 100644 --- a/extensions/amp-apester-media/0.1/monetization/consent-util.js +++ b/extensions/amp-apester-media/0.1/monetization/consent-util.js @@ -4,7 +4,7 @@ import { getConsentPolicyState, } from '../../../../src/consent'; -import {dev} from '../../../../src/log'; +import {dev} from '#utils/log'; import {CONSENT_POLICY_STATE} from '#core/constants/consent-state'; diff --git a/extensions/amp-apester-media/0.1/utils.js b/extensions/amp-apester-media/0.1/utils.js index 0695ce075cc8..bf6d54680de7 100644 --- a/extensions/amp-apester-media/0.1/utils.js +++ b/extensions/amp-apester-media/0.1/utils.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import * as events from '../../../src/event-helper'; +import * as events from '#utils/event-helper'; import {isJsonLdScriptTag} from '#core/dom'; import {toArray} from '#core/types/array'; import {tryParseJson} from '#core/types/object/json'; diff --git a/extensions/amp-app-banner/0.1/amp-app-banner.js b/extensions/amp-app-banner/0.1/amp-app-banner.js index 35a0c3056260..450c982e0add 100644 --- a/extensions/amp-app-banner/0.1/amp-app-banner.js +++ b/extensions/amp-app-banner/0.1/amp-app-banner.js @@ -4,8 +4,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-app-banner-0.1.css'; -import {dev, user, userAssert} from '../../../src/log'; import {openWindowDialog} from '../../../src/open-window-dialog'; const TAG = 'amp-app-banner'; diff --git a/extensions/amp-audio/0.1/amp-audio.js b/extensions/amp-audio/0.1/amp-audio.js index 195322169564..ff48229ac0b7 100644 --- a/extensions/amp-audio/0.1/amp-audio.js +++ b/extensions/amp-audio/0.1/amp-audio.js @@ -3,9 +3,10 @@ import {propagateAttributes} from '#core/dom/propagate-attributes'; import {realChildNodes} from '#core/dom/query'; import {tryPlay} from '#core/dom/video'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; -import {listen} from '../../../src/event-helper'; -import {dev} from '../../../src/log'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {listen} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import { EMPTY_METADATA, parseFavicon, diff --git a/extensions/amp-auto-ads/0.1/ad-strategy.js b/extensions/amp-auto-ads/0.1/ad-strategy.js index 3a7b0714c976..f20f35386a92 100644 --- a/extensions/amp-auto-ads/0.1/ad-strategy.js +++ b/extensions/amp-auto-ads/0.1/ad-strategy.js @@ -1,10 +1,10 @@ import {tryResolve} from '#core/data-structures/promise'; +import {user} from '#utils/log'; + import {SizeInfoDef} from './ad-network-config'; import {PlacementState} from './placement'; -import {user} from '../../../src/log'; - /** @const */ const TAG = 'amp-auto-ads'; diff --git a/extensions/amp-auto-ads/0.1/ad-tracker.js b/extensions/amp-auto-ads/0.1/ad-tracker.js index ef82184e08a4..f215818542da 100644 --- a/extensions/amp-auto-ads/0.1/ad-tracker.js +++ b/extensions/amp-auto-ads/0.1/ad-tracker.js @@ -2,9 +2,9 @@ import {endsWith} from '#core/types/string'; import {Services} from '#service'; -import {measurePageLayoutBox} from './measure-page-layout-box'; +import {user} from '#utils/log'; -import {user} from '../../../src/log'; +import {measurePageLayoutBox} from './measure-page-layout-box'; /** @const */ const TAG = 'amp-auto-ads'; diff --git a/extensions/amp-auto-ads/0.1/amp-auto-ads.js b/extensions/amp-auto-ads/0.1/amp-auto-ads.js index 9cc3b165160b..0baaa3fdc9a6 100644 --- a/extensions/amp-auto-ads/0.1/amp-auto-ads.js +++ b/extensions/amp-auto-ads/0.1/amp-auto-ads.js @@ -4,6 +4,8 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import {getAdNetworkConfig} from './ad-network-config'; import {AdStrategy} from './ad-strategy'; import { @@ -15,8 +17,6 @@ import {AnchorAdStrategy} from './anchor-ad-strategy'; import {Attributes, getAttributesFromConfigObj} from './attributes'; import {getPlacementsFromConfigObj} from './placement'; -import {userAssert} from '../../../src/log'; - /** @const */ const TAG = 'amp-auto-ads'; diff --git a/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js b/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js index 389e1fc3bad6..8d979005463d 100644 --- a/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js +++ b/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js @@ -3,7 +3,7 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; const TAG = 'amp-auto-ads'; const STICKY_AD_TAG = 'amp-sticky-ad'; diff --git a/extensions/amp-auto-ads/0.1/attributes.js b/extensions/amp-auto-ads/0.1/attributes.js index 186a1aec690e..261f5f6a5e2e 100644 --- a/extensions/amp-auto-ads/0.1/attributes.js +++ b/extensions/amp-auto-ads/0.1/attributes.js @@ -1,7 +1,7 @@ import {isArray, isObject} from '#core/types'; import {dict} from '#core/types/object'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @const */ const TAG = 'amp-auto-ads'; diff --git a/extensions/amp-auto-ads/0.1/placement.js b/extensions/amp-auto-ads/0.1/placement.js index 14fab0134e7d..d9cdae3b432c 100644 --- a/extensions/amp-auto-ads/0.1/placement.js +++ b/extensions/amp-auto-ads/0.1/placement.js @@ -12,11 +12,11 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {dev, user} from '#utils/log'; + import {Attributes, getAttributesFromConfigObj} from './attributes'; import {measurePageLayoutBox} from './measure-page-layout-box'; -import {dev, user} from '../../../src/log'; - /** @const */ const TAG = 'amp-auto-ads'; diff --git a/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js b/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js index 519d27896d6d..52de8408fb72 100644 --- a/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js +++ b/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js @@ -17,9 +17,10 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {loadPromise} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {AutoLightboxEvents} from '../../../src/auto-lightbox'; -import {loadPromise} from '../../../src/event-helper'; -import {dev} from '../../../src/log'; const TAG = 'amp-auto-lightbox'; diff --git a/extensions/amp-autocomplete/0.1/amp-autocomplete.js b/extensions/amp-autocomplete/0.1/amp-autocomplete.js index e2af88cdc4ee..5a3f3e5718d7 100644 --- a/extensions/amp-autocomplete/0.1/amp-autocomplete.js +++ b/extensions/amp-autocomplete/0.1/amp-autocomplete.js @@ -13,8 +13,8 @@ import { requestForBatchFetch, } from '../../../src/batched-json'; import {addParamToUrl} from '../../../src/url'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev, user, userAssert} from '../../../src/log'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, user, userAssert} from '#utils/log'; import { dict, getValueForExpr, @@ -30,11 +30,7 @@ import {tryParseJson} from '#core/types/object/json'; import {mod} from '#core/math'; import {once} from '#core/types/function'; import {removeChildren, tryFocus} from '#core/dom'; -import { - setupAMPCors, - setupInput, - setupJsonFetchInit, -} from '../../../src/utils/xhr-utils'; +import {setupAMPCors, setupInput, setupJsonFetchInit} from '#utils/xhr-utils'; import {toggle} from '#core/dom/style'; import fuzzysearch from '#third_party/fuzzysearch'; diff --git a/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js b/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js index 6ae2116eaa8c..07d8f10b884e 100644 --- a/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js +++ b/extensions/amp-autocomplete/0.1/autocomplete-binding-inline.js @@ -1,6 +1,6 @@ import {ownProperty} from '#core/types/object'; import {tryFocus} from '#core/dom'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; const TAG = 'amp-autocomplete'; diff --git a/extensions/amp-autocomplete/0.1/autocomplete-binding-single.js b/extensions/amp-autocomplete/0.1/autocomplete-binding-single.js index fcba7249392c..a6a7f0e7f28c 100644 --- a/extensions/amp-autocomplete/0.1/autocomplete-binding-single.js +++ b/extensions/amp-autocomplete/0.1/autocomplete-binding-single.js @@ -1,4 +1,4 @@ -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** * Single implementation of autocomplete. This supports autocompleting diff --git a/extensions/amp-base-carousel/0.1/amp-base-carousel.js b/extensions/amp-base-carousel/0.1/amp-base-carousel.js index 10af0c93c0c5..87a3e92d6214 100644 --- a/extensions/amp-base-carousel/0.1/amp-base-carousel.js +++ b/extensions/amp-base-carousel/0.1/amp-base-carousel.js @@ -10,8 +10,8 @@ import { getResponsiveAttributeValue, } from './responsive-attributes'; import {Services} from '#service'; -import {createCustomEvent, getDetail} from '../../../src/event-helper'; -import {dev, devAssert} from '../../../src/log'; +import {createCustomEvent, getDetail} from '#utils/event-helper'; +import {dev, devAssert} from '#utils/log'; import {dict} from '#core/types/object'; import { dispatchCustomEvent, diff --git a/extensions/amp-base-carousel/0.1/auto-advance.js b/extensions/amp-base-carousel/0.1/auto-advance.js index 5dda604e8299..a1c7f8645f1e 100644 --- a/extensions/amp-base-carousel/0.1/auto-advance.js +++ b/extensions/amp-base-carousel/0.1/auto-advance.js @@ -1,7 +1,7 @@ import {ActionSource} from './action-source'; import {CarouselEvents} from './carousel-events'; import {debounce} from '#core/types/function'; -import {getDetail, listen, listenOnce} from '../../../src/event-helper'; +import {getDetail, listen, listenOnce} from '#utils/event-helper'; const MIN_AUTO_ADVANCE_INTERVAL = 1000; diff --git a/extensions/amp-base-carousel/0.1/carousel-accessibility.js b/extensions/amp-base-carousel/0.1/carousel-accessibility.js index bdb2dba6aea6..9372a25b3b6c 100644 --- a/extensions/amp-base-carousel/0.1/carousel-accessibility.js +++ b/extensions/amp-base-carousel/0.1/carousel-accessibility.js @@ -1,5 +1,5 @@ import {CarouselEvents} from './carousel-events'; -import {getDetail} from '../../../src/event-helper'; +import {getDetail} from '#utils/event-helper'; /** * @typedef {{ diff --git a/extensions/amp-base-carousel/0.1/carousel.js b/extensions/amp-base-carousel/0.1/carousel.js index 523c286e8a2a..568f66edc620 100644 --- a/extensions/amp-base-carousel/0.1/carousel.js +++ b/extensions/amp-base-carousel/0.1/carousel.js @@ -15,9 +15,9 @@ import {CarouselAccessibility} from './carousel-accessibility'; import {CarouselEvents} from './carousel-events'; import {backwardWrappingDistance, forwardWrappingDistance} from './array-util'; import {clamp, mod} from '#core/math'; -import {createCustomEvent, listen, listenOnce} from '../../../src/event-helper'; +import {createCustomEvent, listen, listenOnce} from '#utils/event-helper'; import {debounce} from '#core/types/function'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {dict} from '#core/types/object'; import { getStyle, diff --git a/extensions/amp-base-carousel/0.1/test/test-carousel.js b/extensions/amp-base-carousel/0.1/test/test-carousel.js index f0b804316799..a66474f1b606 100644 --- a/extensions/amp-base-carousel/0.1/test/test-carousel.js +++ b/extensions/amp-base-carousel/0.1/test/test-carousel.js @@ -3,7 +3,7 @@ */ import {Carousel} from '../carousel'; -import {dev} from '../../../../src/log'; +import {dev} from '#utils/log'; import {setInitialDisplay, setStyle, setStyles} from '#core/dom/style'; import {toArray} from '#core/types/array'; diff --git a/extensions/amp-base-carousel/1.0/amp-base-carousel.js b/extensions/amp-base-carousel/1.0/amp-base-carousel.js index 149bc5842b2d..70cef6aca43a 100644 --- a/extensions/amp-base-carousel/1.0/amp-base-carousel.js +++ b/extensions/amp-base-carousel/1.0/amp-base-carousel.js @@ -2,10 +2,10 @@ import {ActionTrust} from '#core/constants/action-constants'; import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-base-carousel-1.0.css'; import {Services} from '#service'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {isExperimentOn} from '#experiments'; import {toWin} from '#core/window'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-base-carousel'; diff --git a/extensions/amp-bind/0.1/amp-state.js b/extensions/amp-bind/0.1/amp-state.js index 4cfe28c45b0a..c0681e2f0a87 100644 --- a/extensions/amp-bind/0.1/amp-state.js +++ b/extensions/amp-bind/0.1/amp-state.js @@ -8,12 +8,13 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, devAssert, userAssert} from '#utils/log'; + import { UrlReplacementPolicy, batchFetchJsonFor, } from '../../../src/batched-json'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev, devAssert, userAssert} from '../../../src/log'; import {getSourceOrigin} from '../../../src/url'; export class AmpState extends AMP.BaseElement { diff --git a/extensions/amp-bind/0.1/bind-expression.js b/extensions/amp-bind/0.1/bind-expression.js index 06bcaa5c43d9..b4e967638aa4 100644 --- a/extensions/amp-bind/0.1/bind-expression.js +++ b/extensions/amp-bind/0.1/bind-expression.js @@ -3,9 +3,10 @@ import {bindParser as parser} from '#build/parsers/bind-expr-impl'; import {isArray, isObject} from '#core/types'; import {dict, hasOwn, map} from '#core/types/object'; +import {devAssert, user} from '#utils/log'; + import {AstNodeType} from './bind-expr-defines'; -import {devAssert, user} from '../../../src/log'; import {getMode} from '../../../src/mode'; const TAG = 'amp-bind'; diff --git a/extensions/amp-bind/0.1/bind-impl.js b/extensions/amp-bind/0.1/bind-impl.js index b8bd26f04d4a..4321c770d01e 100644 --- a/extensions/amp-bind/0.1/bind-impl.js +++ b/extensions/amp-bind/0.1/bind-impl.js @@ -2,6 +2,7 @@ import {RAW_OBJECT_ARGS_KEY} from '#core/constants/action-constants'; import {AmpEvents} from '#core/constants/amp-events'; import {Deferred} from '#core/data-structures/promise'; import {Signals} from '#core/data-structures/signals'; +import {isAmp4Email} from '#core/document/format'; import {iterateCursor} from '#core/dom'; import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers'; import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; @@ -14,14 +15,14 @@ import {deepEquals, parseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {createCustomEvent, getDetail} from '#utils/event-helper'; +import {dev, devAssert, user} from '#utils/log'; + import {BindEvents} from './bind-events'; import {BindValidator} from './bind-validator'; import {ChunkPriority, chunk} from '../../../src/chunk'; import {reportError} from '../../../src/error-reporting'; -import {createCustomEvent, getDetail} from '../../../src/event-helper'; -import {isAmp4Email} from '../../../src/format'; -import {dev, devAssert, user} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {rewriteAttributesForElement} from '../../../src/url-rewrite'; import {invokeWebWorker} from '../../../src/web-worker/amp-worker'; diff --git a/extensions/amp-bind/0.1/bind-validator.js b/extensions/amp-bind/0.1/bind-validator.js index f31d1acd5177..2f06fc02309d 100644 --- a/extensions/amp-bind/0.1/bind-validator.js +++ b/extensions/amp-bind/0.1/bind-validator.js @@ -1,7 +1,7 @@ import {parseSrcset} from '#core/dom/srcset'; import {hasOwn, ownProperty} from '#core/types/object'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; const TAG = 'amp-bind'; diff --git a/extensions/amp-bind/0.1/test/integration/test-bind-impl.js b/extensions/amp-bind/0.1/test/integration/test-bind-impl.js index 8dd8983fdd4a..0e3475e484ad 100644 --- a/extensions/amp-bind/0.1/test/integration/test-bind-impl.js +++ b/extensions/amp-bind/0.1/test/integration/test-bind-impl.js @@ -12,8 +12,9 @@ import {toArray} from '#core/types/array'; import {Services} from '#service'; +import {dev, user} from '#utils/log'; + import {chunkInstanceForTesting} from '../../../../../src/chunk'; -import {dev, user} from '../../../../../src/log'; import {BindEvents} from '../../bind-events'; import {Bind} from '../../bind-impl'; diff --git a/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js b/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js index e228b8586afd..a903b704208d 100644 --- a/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js +++ b/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js @@ -9,10 +9,11 @@ import {parseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {batchFetchJsonFor} from '../../../src/batched-json'; -import {getData, listen} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; import {assertHttpsUrl} from '../../../src/url'; const TAG = 'amp-bodymovin-animation'; diff --git a/extensions/amp-brid-player/0.1/amp-brid-player.js b/extensions/amp-brid-player/0.1/amp-brid-player.js index 3d9d5a52af81..1e5e3bb96d62 100644 --- a/extensions/amp-brid-player/0.1/amp-brid-player.js +++ b/extensions/amp-brid-player/0.1/amp-brid-player.js @@ -14,18 +14,19 @@ import {PauseHelper} from '#core/dom/video/pause-helper'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { getConsentPolicyInfo, getConsentPolicyState, } from '../../../src/consent'; -import {getData, listen} from '../../../src/event-helper'; import { createFrameFor, mutedOrUnmutedEvent, originMatches, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {assertAbsoluteHttpOrHttpsUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js b/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js index b343e182fcc2..f2a4d484c379 100644 --- a/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js +++ b/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js @@ -1,7 +1,8 @@ import '../amp-brid-player'; import {Services} from '#service'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; + import {VideoEvents} from '../../../../src/video-interface'; describes.realWin( diff --git a/extensions/amp-brightcove/0.1/amp-brightcove.js b/extensions/amp-brightcove/0.1/amp-brightcove.js index 0d330a2127e5..ded161f0b8a7 100644 --- a/extensions/amp-brightcove/0.1/amp-brightcove.js +++ b/extensions/amp-brightcove/0.1/amp-brightcove.js @@ -10,7 +10,7 @@ import { objOrParseJson, redispatch, } from '../../../src/iframe-video'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import { dispatchCustomEvent, @@ -27,7 +27,7 @@ import { getConsentPolicySharedData, getConsentPolicyState, } from '../../../src/consent'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; import {isLayoutSizeDefined} from '#core/dom/layout'; diff --git a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js index 2273535bd6a8..231fa3a12e29 100644 --- a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js +++ b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js @@ -5,7 +5,7 @@ import {CONSENT_POLICY_STATE} from '#core/constants/consent-state'; import {CommonSignals} from '#core/constants/common-signals'; import {VideoEvents} from '../../../../src/video-interface'; import {createElementWithAttributes} from '#core/dom'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; import {macroTask} from '#testing/helpers'; import {parseUrlDeprecated} from '../../../../src/url'; import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers'; diff --git a/extensions/amp-brightcove/1.0/amp-brightcove.js b/extensions/amp-brightcove/1.0/amp-brightcove.js index 227803b6a529..cf55a5fb8dff 100644 --- a/extensions/amp-brightcove/1.0/amp-brightcove.js +++ b/extensions/amp-brightcove/1.0/amp-brightcove.js @@ -7,7 +7,7 @@ import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-brightcove-1.0.css'; import {dict} from '#core/types/object'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; import {Services} from '#service'; /** @const {string} */ diff --git a/extensions/amp-byside-content/0.1/amp-byside-content.js b/extensions/amp-byside-content/0.1/amp-byside-content.js index f59daef41252..b2bbb42b2cff 100644 --- a/extensions/amp-byside-content/0.1/amp-byside-content.js +++ b/extensions/amp-byside-content/0.1/amp-byside-content.js @@ -24,9 +24,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-byside-content-0.1.css'; import {listenFor} from '../../../src/iframe-helper'; -import {user, userAssert} from '../../../src/log'; import {addParamsToUrl, assertHttpsUrl} from '../../../src/url'; /** @const {string} */ diff --git a/extensions/amp-call-tracking/0.1/amp-call-tracking.js b/extensions/amp-call-tracking/0.1/amp-call-tracking.js index da92cb62e9f1..46eb227ccc06 100644 --- a/extensions/amp-call-tracking/0.1/amp-call-tracking.js +++ b/extensions/amp-call-tracking/0.1/amp-call-tracking.js @@ -2,7 +2,8 @@ import {Layout, isLayoutSizeDefined} from '#core/dom/layout'; import {Services} from '#service'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; + import {assertHttpsUrl} from '../../../src/url'; const TAG = 'amp-call-tracking'; diff --git a/extensions/amp-carousel/0.1/base-carousel.js b/extensions/amp-carousel/0.1/base-carousel.js index 9be71d031b30..c1616b125319 100644 --- a/extensions/amp-carousel/0.1/base-carousel.js +++ b/extensions/amp-carousel/0.1/base-carousel.js @@ -1,6 +1,6 @@ import {Keys} from '#core/constants/key-codes'; import {Services} from '#service'; -import {isAmp4Email} from '../../../src/format'; +import {isAmp4Email} from '#core/document/format'; import {observeIntersections} from '#core/dom/layout/viewport-observer'; import {toggleAttribute} from '#core/dom'; diff --git a/extensions/amp-carousel/0.1/scrollable-carousel.js b/extensions/amp-carousel/0.1/scrollable-carousel.js index 76aab2e378f9..9784325246d5 100644 --- a/extensions/amp-carousel/0.1/scrollable-carousel.js +++ b/extensions/amp-carousel/0.1/scrollable-carousel.js @@ -1,11 +1,11 @@ import {ActionTrust} from '#core/constants/action-constants'; -import {Animation} from '../../../src/animation'; +import {Animation} from '#utils/animation'; import {BaseCarousel} from './base-carousel'; import {Keys} from '#core/constants/key-codes'; import {Services} from '#service'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {isLayoutSizeFixed} from '#core/dom/layout'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; import {numeric} from '#core/dom/transition'; import {observeIntersections} from '#core/dom/layout/viewport-observer'; import {realChildElements} from '#core/dom/query'; diff --git a/extensions/amp-carousel/0.1/slidescroll.js b/extensions/amp-carousel/0.1/slidescroll.js index 0f1ad9c27f82..05756b45b6b2 100644 --- a/extensions/amp-carousel/0.1/slidescroll.js +++ b/extensions/amp-carousel/0.1/slidescroll.js @@ -1,6 +1,6 @@ import {ActionTrust} from '#core/constants/action-constants'; -import {Animation} from '../../../src/animation'; -import {dev, user, userAssert} from '../../../src/log'; +import {Animation} from '#utils/animation'; +import {dev, user, userAssert} from '#utils/log'; import {Keys} from '#core/constants/key-codes'; import {Services} from '#service'; import {bezierCurve} from '#core/data-structures/curve'; @@ -8,7 +8,7 @@ import { closestAncestorElementBySelector, realChildElements, } from '#core/dom/query'; -import {createCustomEvent, listen} from '../../../src/event-helper'; +import {createCustomEvent, listen} from '#utils/event-helper'; import {dict} from '#core/types/object'; import {dispatchCustomEvent} from '#core/dom'; import {getStyle, setStyle} from '#core/dom/style'; @@ -21,7 +21,7 @@ import { unobserveContentSize, } from '#core/dom/layout/size-observer'; import {observeIntersections} from '#core/dom/layout/viewport-observer'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; +import {triggerAnalyticsEvent} from '#utils/analytics'; import {BaseCarousel} from './base-carousel'; /** @const {string} */ diff --git a/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js b/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js index 62a804406eee..7336412bf626 100644 --- a/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js +++ b/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js @@ -3,7 +3,7 @@ import {ActionService} from '#service/action-impl'; import {ActionTrust} from '#core/constants/action-constants'; import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers'; describes.realWin( 'test-scrollable-carousel', diff --git a/extensions/amp-carousel/0.1/test/test-slidescroll.js b/extensions/amp-carousel/0.1/test/test-slidescroll.js index a9743fc952b7..6df98277e7ab 100644 --- a/extensions/amp-carousel/0.1/test/test-slidescroll.js +++ b/extensions/amp-carousel/0.1/test/test-slidescroll.js @@ -4,7 +4,7 @@ import {ActionTrust} from '#core/constants/action-constants'; import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; import {installResizeObserverStub} from '#testing/resize-observer-stub'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers'; describes.realWin( diff --git a/extensions/amp-carousel/0.2/amp-carousel.js b/extensions/amp-carousel/0.2/amp-carousel.js index d9d09ade58f0..c98468b8e97e 100644 --- a/extensions/amp-carousel/0.2/amp-carousel.js +++ b/extensions/amp-carousel/0.2/amp-carousel.js @@ -10,13 +10,13 @@ import { realChildElements, } from '#core/dom/query'; import {computedStyle} from '#core/dom/style'; -import {createCustomEvent, getDetail, listen} from '../../../src/event-helper'; -import {dev, devAssert, userAssert} from '../../../src/log'; +import {createCustomEvent, getDetail, listen} from '#utils/event-helper'; +import {dev, devAssert, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {dispatchCustomEvent} from '#core/dom'; import {htmlFor} from '#core/dom/static-template'; import {isLayoutSizeDefined} from '#core/dom/layout'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; +import {triggerAnalyticsEvent} from '#utils/analytics'; /** * @enum {string} diff --git a/extensions/amp-carousel/0.2/test/test-type-slides.js b/extensions/amp-carousel/0.2/test/test-type-slides.js index 1ca041a8fbc4..fcae196a6ac0 100644 --- a/extensions/amp-carousel/0.2/test/test-type-slides.js +++ b/extensions/amp-carousel/0.2/test/test-type-slides.js @@ -1,9 +1,9 @@ import '../amp-carousel'; -import * as Listen from '../../../../src/event-helper'; +import * as Listen from '#utils/event-helper'; import {ActionTrust} from '#core/constants/action-constants'; import {CarouselEvents} from '../../../amp-base-carousel/0.1/carousel-events'; import {Services} from '#service'; -import {getDetail, listenOncePromise} from '../../../../src/event-helper'; +import {getDetail, listenOncePromise} from '#utils/event-helper'; /** * @fileoverview Some simple tests for amp-carousel. Most of the functionality diff --git a/extensions/amp-connatix-player/0.1/amp-connatix-player.js b/extensions/amp-connatix-player/0.1/amp-connatix-player.js index 60bd4bcea178..d981034767dc 100644 --- a/extensions/amp-connatix-player/0.1/amp-connatix-player.js +++ b/extensions/amp-connatix-player/0.1/amp-connatix-player.js @@ -15,14 +15,15 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {getData} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import { getConsentMetadata, getConsentPolicyInfo, getConsentPolicySharedData, getConsentPolicyState, } from '../../../src/consent'; -import {getData} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; import {addParamsToUrl} from '../../../src/url'; import {setIsMediaComponent} from '../../../src/video-interface'; diff --git a/extensions/amp-consent/0.1/amp-consent.js b/extensions/amp-consent/0.1/amp-consent.js index 08f52a8419f4..c9cc3579fe9f 100644 --- a/extensions/amp-consent/0.1/amp-consent.js +++ b/extensions/amp-consent/0.1/amp-consent.js @@ -29,9 +29,9 @@ import { getSourceUrl, resolveRelativeUrl, } from '../../../src/url'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {dev, devAssert, user, userAssert} from '#utils/log'; import {dict, hasOwn} from '#core/types/object'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; import {isArray, isEnumValue, isObject} from '#core/types'; import {realChildElements} from '#core/dom/query'; diff --git a/extensions/amp-consent/0.1/consent-config.js b/extensions/amp-consent/0.1/consent-config.js index 36012ea08907..88a2ad8fecf2 100644 --- a/extensions/amp-consent/0.1/consent-config.js +++ b/extensions/amp-consent/0.1/consent-config.js @@ -4,7 +4,7 @@ import {GEO_IN_GROUP} from '../../amp-geo/0.1/amp-geo-in-group'; import {Services} from '#service'; import {childElementByTag} from '#core/dom/query'; import {deepMerge, hasOwn, map} from '#core/types/object'; -import {devAssert, user, userAssert} from '../../../src/log'; +import {devAssert, user, userAssert} from '#utils/log'; import {getChildJsonConfig} from '#core/dom'; import {getConsentStateManager} from './consent-state-manager'; diff --git a/extensions/amp-consent/0.1/consent-info.js b/extensions/amp-consent/0.1/consent-info.js index f9de81962271..23b50f276119 100644 --- a/extensions/amp-consent/0.1/consent-info.js +++ b/extensions/amp-consent/0.1/consent-info.js @@ -1,6 +1,6 @@ import {CONSENT_STRING_TYPE} from '#core/constants/consent-state'; import {deepEquals} from '#core/types/object/json'; -import {dev, user} from '../../../src/log'; +import {dev, user} from '#utils/log'; import {hasOwn, map} from '#core/types/object'; import {isEnumValue, isObject} from '#core/types'; diff --git a/extensions/amp-consent/0.1/consent-policy-manager.js b/extensions/amp-consent/0.1/consent-policy-manager.js index d99ce09400d5..d026c1397a64 100644 --- a/extensions/amp-consent/0.1/consent-policy-manager.js +++ b/extensions/amp-consent/0.1/consent-policy-manager.js @@ -10,7 +10,7 @@ import {getServicePromiseForDoc} from '../../../src/service-helpers'; import {hasOwn, map} from '#core/types/object'; import {isFiniteNumber, isObject} from '#core/types'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; const CONSENT_STATE_MANAGER = 'consentStateManager'; const TAG = 'consent-policy-manager'; diff --git a/extensions/amp-consent/0.1/consent-state-manager.js b/extensions/amp-consent/0.1/consent-state-manager.js index 806c79a606db..6d5387d63c4f 100644 --- a/extensions/amp-consent/0.1/consent-state-manager.js +++ b/extensions/amp-consent/0.1/consent-state-manager.js @@ -15,7 +15,7 @@ import { import {Deferred} from '#core/data-structures/promise'; import {Services} from '#service'; import {assertHttpsUrl} from '../../../src/url'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {expandConsentEndpointUrl, getConsentCID} from './consent-config'; import {hasOwn} from '#core/types/object'; import {once} from '#core/types/function'; diff --git a/extensions/amp-consent/0.1/consent-ui.js b/extensions/amp-consent/0.1/consent-ui.js index 20d409d34d1f..82d82cc96799 100644 --- a/extensions/amp-consent/0.1/consent-ui.js +++ b/extensions/amp-consent/0.1/consent-ui.js @@ -1,12 +1,12 @@ import {Deferred} from '#core/data-structures/promise'; import {Services} from '#service'; import {assertHttpsUrl} from '../../../src/url'; -import {dev, user} from '../../../src/log'; +import {dev, user} from '#utils/log'; import {dict} from '#core/types/object'; import {elementByTag} from '#core/dom/query'; import {expandConsentEndpointUrl} from './consent-config'; import {getConsentStateValue} from './consent-info'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; import {getConsentStateManager} from './consent-state-manager'; import {htmlFor} from '#core/dom/static-template'; import {insertAtStart, removeElement, tryFocus} from '#core/dom'; diff --git a/extensions/amp-consent/0.1/cookie-writer.js b/extensions/amp-consent/0.1/cookie-writer.js index 4a8fa73e2d6d..625cacd80353 100644 --- a/extensions/amp-consent/0.1/cookie-writer.js +++ b/extensions/amp-consent/0.1/cookie-writer.js @@ -7,7 +7,7 @@ import {isInFie} from '../../../src/iframe-helper'; import {isObject} from '#core/types'; import {isProxyOrigin} from '../../../src/url'; import {setCookie} from '../../../src/cookies'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; const TAG = 'amp-consent/cookie-writer'; diff --git a/extensions/amp-consent/0.1/linker-reader.js b/extensions/amp-consent/0.1/linker-reader.js index 3357fe9cf0a5..a5e5a19e1ed5 100644 --- a/extensions/amp-consent/0.1/linker-reader.js +++ b/extensions/amp-consent/0.1/linker-reader.js @@ -1,7 +1,7 @@ import {hasOwn} from '#core/types/object'; import {parseLinker} from './linker'; import {parseQueryString} from '#core/types/string/url'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; const TAG = 'amp-consent/linker-reader'; diff --git a/extensions/amp-consent/0.1/linker.js b/extensions/amp-consent/0.1/linker.js index c6c8970a57b6..503361c938c0 100644 --- a/extensions/amp-consent/0.1/linker.js +++ b/extensions/amp-consent/0.1/linker.js @@ -4,7 +4,7 @@ import { base64UrlEncodeFromString, } from '#core/types/string/base64'; import {crc32} from './crc32'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @const {string} */ const DELIMITER = '*'; diff --git a/extensions/amp-consent/0.1/tcf-api-command-manager.js b/extensions/amp-consent/0.1/tcf-api-command-manager.js index 37841ff004c5..6459506ca05f 100644 --- a/extensions/amp-consent/0.1/tcf-api-command-manager.js +++ b/extensions/amp-consent/0.1/tcf-api-command-manager.js @@ -3,7 +3,7 @@ import {TCF_POST_MESSAGE_API_COMMANDS} from './consent-info'; import {hasOwn, map} from '#core/types/object'; import {isEnumValue, isObject} from '#core/types'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** * Event status is only defined for addEventListener command. diff --git a/extensions/amp-consent/0.1/test/test-amp-consent.js b/extensions/amp-consent/0.1/test/test-amp-consent.js index 94fa91f39ad8..85eaf33cecab 100644 --- a/extensions/amp-consent/0.1/test/test-amp-consent.js +++ b/extensions/amp-consent/0.1/test/test-amp-consent.js @@ -11,7 +11,7 @@ import { import {CONSENT_STRING_TYPE} from '#core/constants/consent-state'; import {ConsentStateManager} from '../consent-state-manager'; import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group'; -import {dev, user} from '../../../../src/log'; +import {dev, user} from '#utils/log'; import {dict} from '#core/types/object'; import {macroTask} from '#testing/helpers'; import { diff --git a/extensions/amp-consent/0.1/test/test-consent-state-manager.js b/extensions/amp-consent/0.1/test/test-consent-state-manager.js index fe083449d04c..24b0aa97445a 100644 --- a/extensions/amp-consent/0.1/test/test-consent-state-manager.js +++ b/extensions/amp-consent/0.1/test/test-consent-state-manager.js @@ -8,7 +8,7 @@ import { import {CONSENT_STRING_TYPE} from '#core/constants/consent-state'; import {ConsentInstance, ConsentStateManager} from '../consent-state-manager'; import {Services} from '#service'; -import {dev} from '../../../../src/log'; +import {dev} from '#utils/log'; import {macroTask} from '#testing/helpers'; import { registerServiceBuilder, diff --git a/extensions/amp-consent/0.1/test/test-consent-ui.js b/extensions/amp-consent/0.1/test/test-consent-ui.js index 74d8d1cd6fac..bf7ad2fc86ab 100644 --- a/extensions/amp-consent/0.1/test/test-consent-ui.js +++ b/extensions/amp-consent/0.1/test/test-consent-ui.js @@ -15,7 +15,7 @@ import { registerServiceBuilder, resetServiceForTesting, } from '../../../../src/service-helpers'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; import {whenCalled} from '#testing/test-helper'; describes.realWin( diff --git a/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js b/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js index ca45f9f966c4..c4aa22314b68 100644 --- a/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js +++ b/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js @@ -1,7 +1,7 @@ import {TcfApiCommandManager} from '../tcf-api-command-manager'; import {macroTask} from '#testing/helpers'; import {mockWindowInterface} from '#testing/test-helper'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin( 'tcf api commands', diff --git a/extensions/amp-dailymotion/0.1/amp-dailymotion.js b/extensions/amp-dailymotion/0.1/amp-dailymotion.js index 89bf99c03019..f41c4e2e553e 100644 --- a/extensions/amp-dailymotion/0.1/amp-dailymotion.js +++ b/extensions/amp-dailymotion/0.1/amp-dailymotion.js @@ -9,7 +9,7 @@ import { originMatches, redispatch, } from '../../../src/iframe-video'; -import {dev, devAssert, userAssert} from '../../../src/log'; +import {dev, devAssert, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {dispatchCustomEvent, getDataParamsFromAttributes} from '#core/dom'; import { @@ -17,7 +17,7 @@ import { fullscreenExit, isFullscreenElement, } from '#core/dom/fullscreen'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; import {isLayoutSizeDefined} from '#core/dom/layout'; import {parseQueryString} from '#core/types/string/url'; diff --git a/extensions/amp-date-countdown/0.1/amp-date-countdown.js b/extensions/amp-date-countdown/0.1/amp-date-countdown.js index 6b746c1e0c51..a8eab7cf652e 100644 --- a/extensions/amp-date-countdown/0.1/amp-date-countdown.js +++ b/extensions/amp-date-countdown/0.1/amp-date-countdown.js @@ -4,7 +4,7 @@ import {isLayoutSizeDefined} from '#core/dom/layout'; import {Services} from '#service'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-date-countdown'; diff --git a/extensions/amp-date-countdown/1.0/amp-date-countdown.js b/extensions/amp-date-countdown/1.0/amp-date-countdown.js index 0f8b84ad458e..c2cf41774feb 100644 --- a/extensions/amp-date-countdown/1.0/amp-date-countdown.js +++ b/extensions/amp-date-countdown/1.0/amp-date-countdown.js @@ -5,9 +5,9 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; -import {BaseElement} from './base-element'; +import {dev, userAssert} from '#utils/log'; -import {dev, userAssert} from '../../../src/log'; +import {BaseElement} from './base-element'; /** @const {string} */ const TAG = 'amp-date-countdown'; diff --git a/extensions/amp-date-display/0.1/amp-date-display.js b/extensions/amp-date-display/0.1/amp-date-display.js index b065768e672a..11589e6b7c4e 100644 --- a/extensions/amp-date-display/0.1/amp-date-display.js +++ b/extensions/amp-date-display/0.1/amp-date-display.js @@ -5,8 +5,9 @@ import {dashToCamelCase} from '#core/types/string'; import {Services} from '#service'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {getTimeZoneName} from '../format'; /** @const {string} */ diff --git a/extensions/amp-date-display/0.1/test/test-amp-date-display.js b/extensions/amp-date-display/0.1/test/test-amp-date-display.js index 268957a242d4..232f127afc95 100644 --- a/extensions/amp-date-display/0.1/test/test-amp-date-display.js +++ b/extensions/amp-date-display/0.1/test/test-amp-date-display.js @@ -4,7 +4,7 @@ import {expect} from 'chai'; import {Services} from '#service'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin( 'amp-date-display', diff --git a/extensions/amp-date-display/1.0/amp-date-display.js b/extensions/amp-date-display/1.0/amp-date-display.js index 15b7861f14a7..3c20b7f30b2f 100644 --- a/extensions/amp-date-display/1.0/amp-date-display.js +++ b/extensions/amp-date-display/1.0/amp-date-display.js @@ -4,9 +4,9 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; -import {BaseElement} from './base-element'; +import {dev, userAssert} from '#utils/log'; -import {dev, userAssert} from '../../../src/log'; +import {BaseElement} from './base-element'; /** @const {string} */ const TAG = 'amp-date-display'; diff --git a/extensions/amp-date-display/1.0/component.js b/extensions/amp-date-display/1.0/component.js index f2eca61ca8d5..9f4a1f9409b8 100644 --- a/extensions/amp-date-display/1.0/component.js +++ b/extensions/amp-date-display/1.0/component.js @@ -5,7 +5,8 @@ import {useMemo} from '#preact'; import {Wrapper, useRenderer} from '#preact/component'; import {useResourcesNotify} from '#preact/utils'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; + import {getTimeZoneName} from '../format'; /** @const {string} */ diff --git a/extensions/amp-date-display/1.0/test/test-amp-date-display.js b/extensions/amp-date-display/1.0/test/test-amp-date-display.js index 3246a9b70df0..cde45a3fc39b 100644 --- a/extensions/amp-date-display/1.0/test/test-amp-date-display.js +++ b/extensions/amp-date-display/1.0/test/test-amp-date-display.js @@ -4,9 +4,9 @@ import {expect} from 'chai'; import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers'; -import {waitFor} from '#testing/test-helper'; +import {user} from '#utils/log'; -import {user} from '../../../../src/log'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-date-display 1.0', diff --git a/extensions/amp-date-display/1.0/test/test-component.js b/extensions/amp-date-display/1.0/test/test-component.js index 28213a78fe29..f4069d115c25 100644 --- a/extensions/amp-date-display/1.0/test/test-component.js +++ b/extensions/amp-date-display/1.0/test/test-component.js @@ -2,7 +2,8 @@ import {mount} from 'enzyme'; import * as Preact from '#preact'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; + import {BentoDateDisplay} from '../component'; describes.sandboxed('DateDisplay 1.0 preact component', {}, (env) => { diff --git a/extensions/amp-date-picker/0.1/amp-date-picker.js b/extensions/amp-date-picker/0.1/amp-date-picker.js index 0a461dccff06..732789d5df8f 100644 --- a/extensions/amp-date-picker/0.1/amp-date-picker.js +++ b/extensions/amp-date-picker/0.1/amp-date-picker.js @@ -17,6 +17,9 @@ import {dashToCamelCase} from '#core/types/string'; import {Services} from '#service'; +import {createCustomEvent, listen} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {DEFAULT_FORMAT, DEFAULT_LOCALE, FORMAT_STRINGS} from './constants'; import {createDateRangePicker} from './date-range-picker'; import {DatesList} from './dates-list'; @@ -25,8 +28,6 @@ import {createSingleDatePicker} from './single-date-picker'; import {CSS} from '../../../build/amp-date-picker-0.1.css'; import {batchFetchJsonFor} from '../../../src/batched-json'; -import {createCustomEvent, listen} from '../../../src/event-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {requireExternal} from '../../../src/module'; /** diff --git a/extensions/amp-delight-player/0.1/amp-delight-player.js b/extensions/amp-delight-player/0.1/amp-delight-player.js index 106fe5f9e134..191309dc5efb 100644 --- a/extensions/amp-delight-player/0.1/amp-delight-player.js +++ b/extensions/amp-delight-player/0.1/amp-delight-player.js @@ -10,6 +10,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {getData, listen, listenOncePromise} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-delight-player-0.1.css'; import { getConsentMetadata, @@ -17,14 +20,12 @@ import { getConsentPolicySharedData, getConsentPolicyState, } from '../../../src/consent'; -import {getData, listen, listenOncePromise} from '../../../src/event-helper'; import { createFrameFor, objOrParseJson, originMatches, redispatch, } from '../../../src/iframe-video'; -import {userAssert} from '../../../src/log'; import {VideoAttributes, VideoEvents} from '../../../src/video-interface'; /** @const */ diff --git a/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js b/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js index 305ea7e47c80..c220f2dccd59 100644 --- a/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js +++ b/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js @@ -1,5 +1,6 @@ import '../amp-delight-player'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; + import {VideoEvents} from '../../../../src/video-interface'; describes.realWin( diff --git a/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js b/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js index 8afb227eda0d..7a556bd3ef85 100644 --- a/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js +++ b/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js @@ -3,11 +3,12 @@ import {Layout, applyFillContent} from '#core/dom/layout'; import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import {TAG as KEY_TAG} from './amp-embedly-key'; import {getIframe} from '../../../src/3p-frame'; import {listenFor} from '../../../src/iframe-helper'; -import {userAssert} from '../../../src/log'; /** * Component tag identifier. diff --git a/extensions/amp-embedly-card/0.1/amp-embedly-key.js b/extensions/amp-embedly-card/0.1/amp-embedly-key.js index 0ef6e752c84e..324d65fd1d92 100644 --- a/extensions/amp-embedly-card/0.1/amp-embedly-key.js +++ b/extensions/amp-embedly-card/0.1/amp-embedly-key.js @@ -1,6 +1,6 @@ import {Layout} from '#core/dom/layout'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ export const TAG = 'amp-embedly-key'; diff --git a/extensions/amp-embedly-card/1.0/amp-embedly-card.js b/extensions/amp-embedly-card/1.0/amp-embedly-card.js index 8bc7324241f2..c6875e8cd2cf 100644 --- a/extensions/amp-embedly-card/1.0/amp-embedly-card.js +++ b/extensions/amp-embedly-card/1.0/amp-embedly-card.js @@ -3,11 +3,11 @@ import {dict} from '#core/types/object'; import {isExperimentOn} from '#experiments'; +import {userAssert} from '#utils/log'; + import {AmpEmbedlyKey, TAG as KEY_TAG} from './amp-embedly-key'; import {BaseElement} from './base-element'; -import {userAssert} from '../../../src/log'; - /** @const {string} */ const TAG = 'amp-embedly-card'; diff --git a/extensions/amp-embedly-card/1.0/amp-embedly-key.js b/extensions/amp-embedly-card/1.0/amp-embedly-key.js index 448159b53783..4de9b953df98 100644 --- a/extensions/amp-embedly-card/1.0/amp-embedly-key.js +++ b/extensions/amp-embedly-card/1.0/amp-embedly-key.js @@ -4,7 +4,7 @@ import {isExperimentOn} from '#experiments'; import {PreactBaseElement} from '#preact/base-element'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ export const TAG = 'amp-embedly-key'; diff --git a/extensions/amp-experiment/0.1/amp-experiment.js b/extensions/amp-experiment/0.1/amp-experiment.js index 5282d0700799..c2de150532bf 100644 --- a/extensions/amp-experiment/0.1/amp-experiment.js +++ b/extensions/amp-experiment/0.1/amp-experiment.js @@ -1,9 +1,10 @@ import {Layout} from '#core/dom/layout'; import {parseJson} from '#core/types/object/json'; +import {dev, devAssert, userAssert} from '#utils/log'; + import {Variants, allocateVariant} from './variant'; -import {dev, devAssert, userAssert} from '../../../src/log'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; const TAG = 'amp-experiment'; diff --git a/extensions/amp-experiment/0.1/variant.js b/extensions/amp-experiment/0.1/variant.js index acd5da8a77e3..1f4039b613a2 100644 --- a/extensions/amp-experiment/0.1/variant.js +++ b/extensions/amp-experiment/0.1/variant.js @@ -4,7 +4,7 @@ import {hasOwn} from '#core/types/object'; import {Services} from '#service'; -import {dev, userAssert} from '../../../src/log'; +import {dev, userAssert} from '#utils/log'; const ATTR_PREFIX = 'amp-x-'; const nameValidator = /^[\w-]+$/; diff --git a/extensions/amp-experiment/1.0/amp-experiment.js b/extensions/amp-experiment/1.0/amp-experiment.js index 5aa675e0aa19..f165a3cad2e1 100644 --- a/extensions/amp-experiment/1.0/amp-experiment.js +++ b/extensions/amp-experiment/1.0/amp-experiment.js @@ -10,10 +10,11 @@ import { originExperimentsForDoc, } from '#service/origin-experiments-impl'; +import {devAssert, user, userAssert} from '#utils/log'; + import {applyExperimentToVariant} from './apply-experiment'; import {ATTR_PREFIX, Variants, allocateVariant} from './variant'; -import {devAssert, user, userAssert} from '../../../src/log'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; const TAG = 'amp-experiment'; diff --git a/extensions/amp-experiment/1.0/apply-experiment.js b/extensions/amp-experiment/1.0/apply-experiment.js index 24aad6106874..dc6bb741f07f 100644 --- a/extensions/amp-experiment/1.0/apply-experiment.js +++ b/extensions/amp-experiment/1.0/apply-experiment.js @@ -1,3 +1,5 @@ +import {user, userAssert} from '#utils/log'; + import { assertMutationRecordFormat, getElementsFromMutationRecordSelector, @@ -7,8 +9,6 @@ import {AttributeMutationDefaultStyle} from './mutation/attribute-mutation-defau import {AttributeMutationDefaultUrl} from './mutation/attribute-mutation-default-url'; import {CharacterDataMutation} from './mutation/character-data-mutation'; -import {user, userAssert} from '../../../src/log'; - const TAG = 'amp-experiment apply-experiment'; /** @const {number} */ diff --git a/extensions/amp-experiment/1.0/mutation-record.js b/extensions/amp-experiment/1.0/mutation-record.js index 880656dbcbcd..fbc17a58d5c5 100644 --- a/extensions/amp-experiment/1.0/mutation-record.js +++ b/extensions/amp-experiment/1.0/mutation-record.js @@ -1,7 +1,7 @@ import {isObject} from '#core/types'; import {toArray} from '#core/types/array'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** * Types of possibile mutations diff --git a/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js b/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js index 8ca3f6ceb3fb..ca8dc43fe058 100644 --- a/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js +++ b/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js @@ -2,9 +2,9 @@ import {isAmpElement} from '#core/dom/amp-element-helpers'; import {assertDoesNotContainDisplay, setStyles} from '#core/dom/style'; import {dict, hasOwn} from '#core/types/object'; -import {assertAttributeMutationFormat} from './mutation'; +import {dev, user} from '#utils/log'; -import {dev, user} from '../../../../src/log'; +import {assertAttributeMutationFormat} from './mutation'; /** @const {RegExp} */ const NON_SPACE_REGEX = /\S/; diff --git a/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-url.js b/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-url.js index b34a6ea97058..b38f35a39e7e 100644 --- a/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-url.js +++ b/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-url.js @@ -1,8 +1,9 @@ import {map} from '#core/types/object'; +import {user} from '#utils/log'; + import {assertAttributeMutationFormat} from './mutation'; -import {user} from '../../../../src/log'; import {assertHttpsUrl} from '../../../../src/url'; const TAG = 'amp-experiment attribute-mutation-default-url'; diff --git a/extensions/amp-experiment/1.0/mutation/mutation.js b/extensions/amp-experiment/1.0/mutation/mutation.js index 5a8e773a1e57..e19b53c35b3f 100644 --- a/extensions/amp-experiment/1.0/mutation/mutation.js +++ b/extensions/amp-experiment/1.0/mutation/mutation.js @@ -1,4 +1,4 @@ -import {userAssert} from '../../../../src/log'; +import {userAssert} from '#utils/log'; /** * Interface for amp-experiment mutations. diff --git a/extensions/amp-experiment/1.0/variant.js b/extensions/amp-experiment/1.0/variant.js index c9a68aaf1bd1..dda7f1397b02 100644 --- a/extensions/amp-experiment/1.0/variant.js +++ b/extensions/amp-experiment/1.0/variant.js @@ -4,7 +4,7 @@ import {hasOwn} from '#core/types/object'; import {Services} from '#service'; -import {dev, userAssert} from '../../../src/log'; +import {dev, userAssert} from '#utils/log'; export const ATTR_PREFIX = 'amp-x-'; const nameValidator = /^[\w-]+$/; diff --git a/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js b/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js index 8dae3d8d6f5e..8d55b42acdb5 100644 --- a/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js +++ b/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js @@ -2,7 +2,7 @@ import {Services} from '#service'; import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader'; import {dashToUnderline} from '#core/types/string'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {isObject} from '#core/types'; import {listenFor} from '../../../src/iframe-helper'; diff --git a/extensions/amp-facebook-like/0.1/amp-facebook-like.js b/extensions/amp-facebook-like/0.1/amp-facebook-like.js index 6a5cd489ef34..f5ab1ae91d90 100644 --- a/extensions/amp-facebook-like/0.1/amp-facebook-like.js +++ b/extensions/amp-facebook-like/0.1/amp-facebook-like.js @@ -1,7 +1,7 @@ import {Services} from '#service'; import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {dashToUnderline} from '#core/types/string'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {isObject} from '#core/types'; import {listenFor} from '../../../src/iframe-helper'; diff --git a/extensions/amp-facebook-page/0.1/amp-facebook-page.js b/extensions/amp-facebook-page/0.1/amp-facebook-page.js index ade793584eaa..be52b0566938 100644 --- a/extensions/amp-facebook-page/0.1/amp-facebook-page.js +++ b/extensions/amp-facebook-page/0.1/amp-facebook-page.js @@ -2,7 +2,7 @@ import {Services} from '#service'; import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {createLoaderLogo} from '../../amp-facebook/0.1/facebook-loader'; import {dashToUnderline} from '#core/types/string'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {isObject} from '#core/types'; import {listenFor} from '../../../src/iframe-helper'; diff --git a/extensions/amp-facebook/0.1/amp-facebook.js b/extensions/amp-facebook/0.1/amp-facebook.js index 7bf22e42c689..7f6ab5e4e25f 100644 --- a/extensions/amp-facebook/0.1/amp-facebook.js +++ b/extensions/amp-facebook/0.1/amp-facebook.js @@ -2,14 +2,14 @@ import {Services} from '#service'; import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {createLoaderLogo} from './facebook-loader'; import {dashToUnderline} from '#core/types/string'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {getMode} from '../../../src/mode'; import {isObject} from '#core/types'; import {listenFor} from '../../../src/iframe-helper'; import {removeElement} from '#core/dom'; import {tryParseJson} from '#core/types/object/json'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; const TYPE = 'facebook'; diff --git a/extensions/amp-facebook/1.0/amp-facebook.js b/extensions/amp-facebook/1.0/amp-facebook.js index 4e0d43b822ef..f196289ffde3 100644 --- a/extensions/amp-facebook/1.0/amp-facebook.js +++ b/extensions/amp-facebook/1.0/amp-facebook.js @@ -4,7 +4,7 @@ import {dashToUnderline} from '#core/types/string'; import {dict} from '#core/types/object'; import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-facebook'; diff --git a/extensions/amp-fit-text/1.0/amp-fit-text.js b/extensions/amp-fit-text/1.0/amp-fit-text.js index 21a5e9428a92..c5ea9604548e 100644 --- a/extensions/amp-fit-text/1.0/amp-fit-text.js +++ b/extensions/amp-fit-text/1.0/amp-fit-text.js @@ -1,7 +1,7 @@ import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-fit-text-1.0.css'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-fit-text'; diff --git a/extensions/amp-font/0.1/amp-font.js b/extensions/amp-font/0.1/amp-font.js index 66175ee9ea66..26357b9ae137 100644 --- a/extensions/amp-font/0.1/amp-font.js +++ b/extensions/amp-font/0.1/amp-font.js @@ -21,9 +21,9 @@ import {isFiniteNumber} from '#core/types'; import {Services} from '#service'; -import {FontLoader} from './fontloader'; +import {user, userAssert} from '#utils/log'; -import {user, userAssert} from '../../../src/log'; +import {FontLoader} from './fontloader'; const TAG = 'amp-font'; diff --git a/extensions/amp-form/0.1/amp-form-textarea.js b/extensions/amp-form/0.1/amp-form-textarea.js index acba239f5ad0..55411c0f6e6a 100644 --- a/extensions/amp-form/0.1/amp-form-textarea.js +++ b/extensions/amp-form/0.1/amp-form-textarea.js @@ -6,8 +6,8 @@ import {throttle} from '#core/types/function'; import {Services} from '#service'; -import {listen, listenOncePromise} from '../../../src/event-helper'; -import {dev, devAssert, user} from '../../../src/log'; +import {listen, listenOncePromise} from '#utils/event-helper'; +import {dev, devAssert, user} from '#utils/log'; const AMP_FORM_TEXTAREA_EXPAND_ATTR = 'autoexpand'; diff --git a/extensions/amp-form/0.1/amp-form.js b/extensions/amp-form/0.1/amp-form.js index 1c08785d5d83..930fa13cf84c 100644 --- a/extensions/amp-form/0.1/amp-form.js +++ b/extensions/amp-form/0.1/amp-form.js @@ -6,6 +6,7 @@ import { } from '#core/constants/async-input'; import {Keys} from '#core/constants/key-codes'; import {Deferred, tryResolve} from '#core/data-structures/promise'; +import {isAmp4Email} from '#core/document/format'; import { createElementWithAttributes, iterateCursor, @@ -27,6 +28,11 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; +import {setupAMPCors, setupInit, setupInput} from '#utils/xhr-utils'; + import {AmpFormTextarea} from './amp-form-textarea'; import {FormDirtiness} from './form-dirtiness'; import {FormEvents} from './form-events'; @@ -40,11 +46,7 @@ import { } from './form-verifiers'; import {CSS} from '../../../build/amp-form-0.1.css'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; -import {createCustomEvent} from '../../../src/event-helper'; import {createFormDataWrapper} from '../../../src/form-data-wrapper'; -import {isAmp4Email} from '../../../src/format'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {SsrTemplateHelper} from '../../../src/ssr-template-helper'; import {installStylesForDoc} from '../../../src/style-installer'; @@ -54,11 +56,6 @@ import { isProxyOrigin, serializeQueryString, } from '../../../src/url'; -import { - setupAMPCors, - setupInit, - setupInput, -} from '../../../src/utils/xhr-utils'; /** @const {string} */ const TAG = 'amp-form'; diff --git a/extensions/amp-form/0.1/form-dirtiness.js b/extensions/amp-form/0.1/form-dirtiness.js index 6bce4afacf2f..6adf070176f2 100644 --- a/extensions/amp-form/0.1/form-dirtiness.js +++ b/extensions/amp-form/0.1/form-dirtiness.js @@ -2,9 +2,10 @@ import {AmpEvents} from '#core/constants/amp-events'; import {isDisabled, isFieldDefault, isFieldEmpty} from '#core/dom/form'; import {dict, map} from '#core/types/object'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {createFormDataWrapper} from '../../../src/form-data-wrapper'; -import {dev} from '../../../src/log'; export const DIRTINESS_INDICATOR_CLASS = 'amp-form-dirty'; diff --git a/extensions/amp-form/0.1/form-proxy.js b/extensions/amp-form/0.1/form-proxy.js index c8215ff76cd6..0d37392c44f0 100644 --- a/extensions/amp-form/0.1/form-proxy.js +++ b/extensions/amp-form/0.1/form-proxy.js @@ -2,7 +2,7 @@ import {toWin} from '#core/window'; import {Services} from '#service'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; /** * denylisted properties. Used mainly fot testing. diff --git a/extensions/amp-form/0.1/form-validators.js b/extensions/amp-form/0.1/form-validators.js index 5a6fee040842..06676ed589ca 100644 --- a/extensions/amp-form/0.1/form-validators.js +++ b/extensions/amp-form/0.1/form-validators.js @@ -3,12 +3,12 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {FormEvents} from './form-events'; import {ValidationBubble} from './validation-bubble'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev} from '../../../src/log'; - /** @const @private {string} */ const VALIDATION_CACHE_PREFIX = '__AMP_VALIDATION_'; diff --git a/extensions/amp-form/0.1/form-verifiers.js b/extensions/amp-form/0.1/form-verifiers.js index 5506f727a787..ea8326011d42 100644 --- a/extensions/amp-form/0.1/form-verifiers.js +++ b/extensions/amp-form/0.1/form-verifiers.js @@ -2,7 +2,7 @@ import {LastAddedResolver} from '#core/data-structures/promise'; import {iterateCursor} from '#core/dom'; import {isFieldDefault} from '#core/dom/form'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; export const FORM_VERIFY_PARAM = '__amp_form_verify'; diff --git a/extensions/amp-form/0.1/test/integration/test-integration-form.js b/extensions/amp-form/0.1/test/integration/test-integration-form.js index c406c2ee48dc..b2ce65cac89a 100644 --- a/extensions/amp-form/0.1/test/integration/test-integration-form.js +++ b/extensions/amp-form/0.1/test/integration/test-integration-form.js @@ -4,10 +4,11 @@ import {Services} from '#service'; import {stubElementsForDoc} from '#service/custom-element-registry'; import {registerExtendedTemplateForDoc} from '#service/template-impl'; +import {listenOncePromise} from '#utils/event-helper'; + import {poll} from '#testing/iframe'; import {installGlobalSubmitListenerForDoc} from '../../../../../src/document-submit'; -import {listenOncePromise} from '../../../../../src/event-helper'; import {AmpMustache} from '../../../../amp-mustache/0.1/amp-mustache'; import {AmpForm, AmpFormService} from '../../amp-form'; diff --git a/extensions/amp-form/0.1/test/test-amp-form-textarea.js b/extensions/amp-form/0.1/test/test-amp-form-textarea.js index d524bff68339..fe0a4daf3a44 100644 --- a/extensions/amp-form/0.1/test/test-amp-form-textarea.js +++ b/extensions/amp-form/0.1/test/test-amp-form-textarea.js @@ -1,7 +1,8 @@ import {Services} from '#service'; +import * as eventHelper from '#utils/event-helper'; + import {CSS} from '../../../../build/amp-form-0.1.css'; -import * as eventHelper from '../../../../src/event-helper'; import {installStylesForDoc} from '../../../../src/style-installer'; import { AmpFormTextarea, diff --git a/extensions/amp-form/0.1/test/test-amp-form.js b/extensions/amp-form/0.1/test/test-amp-form.js index 0bfa6f06abcb..bd851deef9b1 100644 --- a/extensions/amp-form/0.1/test/test-amp-form.js +++ b/extensions/amp-form/0.1/test/test-amp-form.js @@ -13,15 +13,16 @@ import {Services} from '#service'; import {ActionService} from '#service/action-impl'; import {cidServiceForDocForTesting} from '#service/cid-impl'; +import {createCustomEvent} from '#utils/event-helper'; +import {user} from '#utils/log'; +import * as xhrUtils from '#utils/xhr-utils'; + import {whenCalled} from '#testing/test-helper'; -import {createCustomEvent} from '../../../../src/event-helper'; import { createFormDataWrapper, isFormDataWrapper, } from '../../../../src/form-data-wrapper'; -import {user} from '../../../../src/log'; -import * as xhrUtils from '../../../../src/utils/xhr-utils'; import {AmpSelector} from '../../../amp-selector/0.1/amp-selector'; import { AmpForm, diff --git a/extensions/amp-form/0.1/test/test-form-dirtiness.js b/extensions/amp-form/0.1/test/test-form-dirtiness.js index b3135270ac6f..b275c230f4b2 100644 --- a/extensions/amp-form/0.1/test/test-form-dirtiness.js +++ b/extensions/amp-form/0.1/test/test-form-dirtiness.js @@ -3,7 +3,8 @@ import {closestAncestorElementBySelector} from '#core/dom/query'; import {Services} from '#service'; -import {createCustomEvent, getDetail} from '../../../../src/event-helper'; +import {createCustomEvent, getDetail} from '#utils/event-helper'; + import {DIRTINESS_INDICATOR_CLASS, FormDirtiness} from '../form-dirtiness'; function getForm(doc) { diff --git a/extensions/amp-fx-collection/0.1/amp-fx-collection.js b/extensions/amp-fx-collection/0.1/amp-fx-collection.js index 624e5c020ba4..a36297b08fc1 100644 --- a/extensions/amp-fx-collection/0.1/amp-fx-collection.js +++ b/extensions/amp-fx-collection/0.1/amp-fx-collection.js @@ -2,6 +2,9 @@ import {AmpEvents} from '#core/constants/amp-events'; import {iterateCursor} from '#core/dom'; import {tryCallback} from '#core/error'; +import {listen} from '#utils/event-helper'; +import {devAssert} from '#utils/log'; + import { FxBindings, FxObservesSignal, @@ -13,9 +16,6 @@ import { installScrollToggledFx, } from './providers/fx-provider'; -import {listen} from '../../../src/event-helper'; -import {devAssert} from '../../../src/log'; - const TAG = 'amp-fx-collection'; /** diff --git a/extensions/amp-fx-collection/0.1/fx-type.js b/extensions/amp-fx-collection/0.1/fx-type.js index a55ca0c8dbb2..109bd550472c 100644 --- a/extensions/amp-fx-collection/0.1/fx-type.js +++ b/extensions/amp-fx-collection/0.1/fx-type.js @@ -1,4 +1,4 @@ -import {devAssert, user, userAssert} from '../../../src/log'; +import {devAssert, user, userAssert} from '#utils/log'; const TAG = 'amp-fx-collection'; diff --git a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js index 3ca24fc4b05f..d11feba40184 100644 --- a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js +++ b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js @@ -7,7 +7,8 @@ import {mapRange} from '#core/math'; import {Services} from '#service'; -import {userAssert} from '../../../../src/log'; +import {userAssert} from '#utils/log'; + import {FxType} from '../fx-type'; const MAX_MOBILE_WIDTH = 480; diff --git a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js index 2c739d778855..da6a470398ad 100644 --- a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js +++ b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js @@ -6,7 +6,8 @@ import { import {Services} from '#service'; -import {dev, devAssert, userAssert} from '../../../../src/log'; +import {dev, devAssert, userAssert} from '#utils/log'; + import {FxType} from '../fx-type'; /** diff --git a/extensions/amp-fx-collection/0.1/providers/fx-provider.js b/extensions/amp-fx-collection/0.1/providers/fx-provider.js index a1fc1dd0d1e6..ede223ee32c1 100644 --- a/extensions/amp-fx-collection/0.1/providers/fx-provider.js +++ b/extensions/amp-fx-collection/0.1/providers/fx-provider.js @@ -8,6 +8,8 @@ import {Services} from '#service'; import {installPositionObserverServiceForDoc} from '#service/position-observer/position-observer-impl'; import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker'; +import {devAssert} from '#utils/log'; + import {Presets} from './amp-fx-presets'; import { convertEasingKeyword, @@ -19,7 +21,6 @@ import { resolvePercentageToNumber, } from './amp-fx-presets-utils'; -import {devAssert} from '../../../../src/log'; import { getServiceForDoc, registerServiceBuilderForDoc, diff --git a/extensions/amp-fx-collection/0.1/scroll-toggle.js b/extensions/amp-fx-collection/0.1/scroll-toggle.js index f9444d59ff77..32ba82391e49 100644 --- a/extensions/amp-fx-collection/0.1/scroll-toggle.js +++ b/extensions/amp-fx-collection/0.1/scroll-toggle.js @@ -4,7 +4,7 @@ import {once} from '#core/types/function'; import {Services} from '#service'; -import {devAssert, user} from '../../../src/log'; +import {devAssert, user} from '#utils/log'; const TAG = 'amp-fx'; diff --git a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js index 9d437e427bf6..60d6e00f489e 100644 --- a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js +++ b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js @@ -5,8 +5,9 @@ import {setStyle} from '#core/dom/style'; import {Services} from '#service'; +import {dev, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-fx-flying-carpet-0.1.css'; -import {dev, userAssert} from '../../../src/log'; const TAG = 'amp-fx-flying-carpet'; diff --git a/extensions/amp-geo/0.1/amp-geo.js b/extensions/amp-geo/0.1/amp-geo.js index f2d961d67c56..b35ff3cb53fe 100644 --- a/extensions/amp-geo/0.1/amp-geo.js +++ b/extensions/amp-geo/0.1/amp-geo.js @@ -36,11 +36,12 @@ import {Services} from '#service'; * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +import {dev, user, userAssert} from '#utils/log'; + import {GEO_IN_GROUP} from './amp-geo-in-group'; import {US_CA_CODE, ampGeoPresets} from './amp-geo-presets'; import {urls} from '../../../src/config'; -import {dev, user, userAssert} from '../../../src/log'; 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 b1ad8dac849a..bb04e1815dc2 100644 --- a/extensions/amp-geo/0.1/test/test-amp-geo.js +++ b/extensions/amp-geo/0.1/test/test-amp-geo.js @@ -1,8 +1,9 @@ import {Services} from '#service'; import {vsyncForTesting} from '#service/vsync-impl'; +import {user} from '#utils/log'; + import {urls} from '../../../../src/config'; -import {user} from '../../../../src/log'; import {AmpGeo} from '../amp-geo'; import {GEO_IN_GROUP} from '../amp-geo-in-group'; diff --git a/extensions/amp-gfycat/0.1/amp-gfycat.js b/extensions/amp-gfycat/0.1/amp-gfycat.js index a8c19d83b040..4fec74aad5d4 100644 --- a/extensions/amp-gfycat/0.1/amp-gfycat.js +++ b/extensions/amp-gfycat/0.1/amp-gfycat.js @@ -9,8 +9,9 @@ import {propagateAttributes} from '#core/dom/propagate-attributes'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; -import {dev, userAssert} from '../../../src/log'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {addParamsToUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js b/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js index 24e6cc9d6a93..6ebaf6dc4b6e 100644 --- a/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js +++ b/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js @@ -1,5 +1,6 @@ import '../amp-gfycat'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; + import {VideoEvents} from '../../../../src/video-interface'; describes.realWin( diff --git a/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js b/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js index 172d8a3fa940..525d11e6bc09 100644 --- a/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js +++ b/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js @@ -17,7 +17,8 @@ import {propagateAttributes} from '#core/dom/propagate-attributes'; import {Services} from '#service'; -import {dev, userAssert} from '../../../src/log'; +import {dev, userAssert} from '#utils/log'; + import {addParamToUrl} from '../../../src/url'; export const TAG = 'amp-google-document-embed'; diff --git a/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js b/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js index 240a5c8650da..8ca1d0b92439 100644 --- a/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js +++ b/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js @@ -4,8 +4,8 @@ import {scopedQuerySelector} from '#core/dom/query'; import {toArray} from '#core/types/array'; import {dict, hasOwn} from '#core/types/object'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev, user} from '../../../src/log'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, user} from '#utils/log'; /** * CSS class used to deactivate animations. diff --git a/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js b/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js index 5494cd4733f1..ba2e807f0a5a 100644 --- a/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js +++ b/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js @@ -2,6 +2,9 @@ import {ActionTrust} from '#core/constants/action-constants'; import {Services} from '#service'; +import {getDetail} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import { AmpGwdRuntimeService, GWD_SERVICE_NAME, @@ -9,9 +12,7 @@ import { } from './amp-gwd-animation-impl'; import {CSS} from '../../../build/amp-gwd-animation-0.1.css'; -import {getDetail} from '../../../src/event-helper'; import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper'; -import {userAssert} from '../../../src/log'; import { getParentWindowFrameElement, getServiceForDocOrNull, diff --git a/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js b/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js index 04eb55882352..ffac1ce8ab1b 100644 --- a/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js +++ b/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js @@ -1,6 +1,7 @@ import {Services} from '#service'; -import {createCustomEvent} from '../../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; + import {getServiceForDocOrNull} from '../../../../src/service-helpers'; import {GWD_PAGEDECK_ID, TAG, addAction} from '../amp-gwd-animation'; import { diff --git a/extensions/amp-hulu/0.1/amp-hulu.js b/extensions/amp-hulu/0.1/amp-hulu.js index c20b3067c786..48a67756a8ed 100644 --- a/extensions/amp-hulu/0.1/amp-hulu.js +++ b/extensions/amp-hulu/0.1/amp-hulu.js @@ -3,7 +3,8 @@ import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {Services} from '#service'; -import {devAssert, userAssert} from '../../../src/log'; +import {devAssert, userAssert} from '#utils/log'; + import {setIsMediaComponent} from '../../../src/video-interface'; class AmpHulu extends AMP.BaseElement { diff --git a/extensions/amp-iframe/0.1/amp-iframe.js b/extensions/amp-iframe/0.1/amp-iframe.js index 5d1264a60f50..e16cc9e6c311 100644 --- a/extensions/amp-iframe/0.1/amp-iframe.js +++ b/extensions/amp-iframe/0.1/amp-iframe.js @@ -1,7 +1,7 @@ import {playIgnoringError} from '#core/dom/video'; import {AMPDOC_SINGLETON_NAME} from '#core/constants/enums'; import {ActionTrust} from '#core/constants/action-constants'; -import {IntersectionObserver3pHost} from '../../../src/utils/intersection-observer-3p-host'; +import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host'; import { LayoutPriority, applyFillContent, @@ -11,8 +11,8 @@ import {MessageType} from '#core/3p-frame-messaging'; import {PauseHelper} from '#core/dom/video/pause-helper'; import {Services} from '#service'; import {base64EncodeFromBytes} from '#core/types/string/base64'; -import {createCustomEvent, getData, listen} from '../../../src/event-helper'; -import {user, userAssert} from '../../../src/log'; +import {createCustomEvent, getData, listen} from '#utils/event-helper'; +import {user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {endsWith} from '#core/types/string'; import {getConsentDataToForward} from '../../../src/consent'; diff --git a/extensions/amp-iframe/0.1/test/test-amp-iframe.js b/extensions/amp-iframe/0.1/test/test-amp-iframe.js index 4315ae836968..de440a0fa21e 100644 --- a/extensions/amp-iframe/0.1/test/test-amp-iframe.js +++ b/extensions/amp-iframe/0.1/test/test-amp-iframe.js @@ -11,7 +11,7 @@ import {isAdLike} from '../../../../src/iframe-helper'; import {macroTask} from '#testing/helpers'; import {poll} from '#testing/iframe'; import {toggleExperiment} from '#experiments'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; import {whenCalled} from '#testing/test-helper'; /** @const {number} */ diff --git a/extensions/amp-iframe/1.0/amp-iframe.js b/extensions/amp-iframe/1.0/amp-iframe.js index 15300b80b066..ff62c4d7e40d 100644 --- a/extensions/amp-iframe/1.0/amp-iframe.js +++ b/extensions/amp-iframe/1.0/amp-iframe.js @@ -1,6 +1,6 @@ import {BaseElement} from './base-element'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {measureIntersection} from '#core/dom/layout/intersection'; diff --git a/extensions/amp-iframe/1.0/component.js b/extensions/amp-iframe/1.0/component.js index c5c567cb1bee..1046d3b8af93 100644 --- a/extensions/amp-iframe/1.0/component.js +++ b/extensions/amp-iframe/1.0/component.js @@ -8,7 +8,7 @@ import {useMergeRefs} from '#preact/utils'; import { DEFAULT_THRESHOLD, cloneEntryForCrossOrigin, -} from '../../../src/utils/intersection-observer-3p-host'; +} from '#utils/intersection-observer-3p-host'; import {postMessage} from '../../../src/iframe-helper'; import {dict} from '#core/types/object'; diff --git a/extensions/amp-iframely/0.1/amp-iframely.js b/extensions/amp-iframely/0.1/amp-iframely.js index 9f62d3082398..083f47b9c064 100644 --- a/extensions/amp-iframely/0.1/amp-iframely.js +++ b/extensions/amp-iframely/0.1/amp-iframely.js @@ -5,8 +5,9 @@ import {setStyle} from '#core/dom/style'; import {omit} from '#core/types/object'; import {tryParseJson} from '#core/types/object/json'; -import {getData, listen} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {addParamsToUrl} from '../../../src/url'; /** @const {string} */ diff --git a/extensions/amp-ima-video/0.1/amp-ima-video.js b/extensions/amp-ima-video/0.1/amp-ima-video.js index 2722720a1d00..2c4b850c5f26 100644 --- a/extensions/amp-ima-video/0.1/amp-ima-video.js +++ b/extensions/amp-ima-video/0.1/amp-ima-video.js @@ -16,9 +16,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {getData, listen} from '#utils/event-helper'; + import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {getConsentPolicyState} from '../../../src/consent'; -import {getData, listen} from '../../../src/event-helper'; import {addUnsafeAllowAutoplay} from '../../../src/iframe-video'; import {assertHttpsUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js index a865fb7409a5..081da4ed12e0 100644 --- a/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js +++ b/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js @@ -17,9 +17,11 @@ import {WindowInterface} from '#core/window/interface'; import {Services} from '#service'; +import {Animation} from '#utils/animation'; +import {isLoaded} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-image-lightbox-0.1.css'; -import {Animation} from '../../../src/animation'; -import {isLoaded} from '../../../src/event-helper'; import {Gestures} from '../../../src/gesture'; import { DoubletapRecognizer, @@ -27,7 +29,6 @@ import { TapRecognizer, TapzoomRecognizer, } from '../../../src/gesture-recognizers'; -import {dev, userAssert} from '../../../src/log'; import {continueMotion} from '../../../src/motion'; const TAG = 'amp-image-lightbox'; diff --git a/extensions/amp-image-slider/0.1/amp-image-slider.js b/extensions/amp-image-slider/0.1/amp-image-slider.js index 0a4220b602be..2010b71ac992 100644 --- a/extensions/amp-image-slider/0.1/amp-image-slider.js +++ b/extensions/amp-image-slider/0.1/amp-image-slider.js @@ -9,11 +9,12 @@ import {clamp} from '#core/math'; import {Services} from '#service'; +import {listen, loadPromise} from '#utils/event-helper'; +import {dev, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-image-slider-0.1.css'; -import {listen, loadPromise} from '../../../src/event-helper'; import {Gestures} from '../../../src/gesture'; import {SwipeXRecognizer} from '../../../src/gesture-recognizers'; -import {dev, user, userAssert} from '../../../src/log'; const VALID_IMAGE_TAGNAMES = new Set(['AMP-IMG', 'IMG']); diff --git a/extensions/amp-image-viewer/0.1/amp-image-viewer.js b/extensions/amp-image-viewer/0.1/amp-image-viewer.js index 18c204972c58..ab3271e1fd9b 100644 --- a/extensions/amp-image-viewer/0.1/amp-image-viewer.js +++ b/extensions/amp-image-viewer/0.1/amp-image-viewer.js @@ -26,9 +26,11 @@ import {WindowInterface} from '#core/window/interface'; import {Services} from '#service'; +import {Animation} from '#utils/animation'; +import {createCustomEvent, loadPromise} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-image-viewer-0.1.css'; -import {Animation} from '../../../src/animation'; -import {createCustomEvent, loadPromise} from '../../../src/event-helper'; import {Gestures} from '../../../src/gesture'; import { DoubletapRecognizer, @@ -37,7 +39,6 @@ import { TapRecognizer, TapzoomRecognizer, } from '../../../src/gesture-recognizers'; -import {dev, userAssert} from '../../../src/log'; import {continueMotion} from '../../../src/motion'; const PAN_ZOOM_CURVE_ = bezierCurve(0.4, 0, 0.2, 1.4); diff --git a/extensions/amp-imgur/0.1/amp-imgur.js b/extensions/amp-imgur/0.1/amp-imgur.js index 0b182484664e..f4016fe82153 100644 --- a/extensions/amp-imgur/0.1/amp-imgur.js +++ b/extensions/amp-imgur/0.1/amp-imgur.js @@ -19,8 +19,8 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {getData, listen} from '../../../src/event-helper'; -import {user, userAssert} from '../../../src/log'; +import {getData, listen} from '#utils/event-helper'; +import {user, userAssert} from '#utils/log'; const TAG = 'amp-imgur'; diff --git a/extensions/amp-imgur/0.1/test/test-amp-imgur.js b/extensions/amp-imgur/0.1/test/test-amp-imgur.js index 634abfd24a8a..8c91719d61cc 100644 --- a/extensions/amp-imgur/0.1/test/test-amp-imgur.js +++ b/extensions/amp-imgur/0.1/test/test-amp-imgur.js @@ -1,7 +1,7 @@ import '../amp-imgur'; import {createElementWithAttributes, waitForChildPromise} from '#core/dom'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin( 'amp-imgur', diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js index f237e74ddf58..1df12bde4c3a 100644 --- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js +++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-captions.js @@ -3,7 +3,7 @@ import {exponentialFalloff} from './amp-inline-gallery-pagination'; import {isExperimentOn} from '#experiments'; import {isLayoutSizeDefined} from '#core/dom/layout'; import {setImportantStyles} from '#core/dom/style'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; export class AmpInlineGalleryCaptions extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js index 9760a858aa18..c42580a0586d 100644 --- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js +++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-pagination.js @@ -1,7 +1,7 @@ import {InlineGalleryEvents} from './inline-gallery-events'; import {Layout} from '#core/dom/layout'; -import {createCustomEvent} from '../../../src/event-helper'; -import {devAssert} from '../../../src/log'; +import {createCustomEvent} from '#utils/event-helper'; +import {devAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {htmlFor} from '#core/dom/static-template'; import {scopedQuerySelectorAll} from '#core/dom/query'; diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js index c50b2a835e6d..34eb54be44c9 100644 --- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js +++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-slide.js @@ -3,7 +3,7 @@ import {Services} from '#service'; import {htmlFor} from '#core/dom/static-template'; import {isExperimentOn} from '#experiments'; import {toArray} from '#core/types/array'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; export class AmpInlineGallerySlide extends AMP.BaseElement { /** diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js index 4734f8d74ae9..26c8941f3336 100644 --- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js +++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery-thumbnails.js @@ -1,6 +1,6 @@ import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events'; import {InlineGalleryEvents} from './inline-gallery-events'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {dict} from '#core/types/object'; import {htmlFor} from '#core/dom/static-template'; import {isLayoutSizeDefined} from '#core/dom/layout'; diff --git a/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js b/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js index c4e253df60ee..527438fc65ad 100644 --- a/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js +++ b/extensions/amp-inline-gallery/0.1/amp-inline-gallery.js @@ -10,7 +10,7 @@ import {CSS as AmpInlineGalleryThumbnailsCSS} from '../../../build/amp-inline-ga import {CarouselEvents} from '../../amp-base-carousel/0.1/carousel-events'; import {InlineGalleryEvents} from './inline-gallery-events'; import {Layout} from '#core/dom/layout'; -import {getDetail} from '../../../src/event-helper'; +import {getDetail} from '#utils/event-helper'; import {iterateCursor} from '#core/dom'; import {scopedQuerySelector, scopedQuerySelectorAll} from '#core/dom/query'; import {toArray} from '#core/types/array'; diff --git a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js index 881383b96c7b..8c80ad744581 100644 --- a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js +++ b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-pagination.js @@ -3,7 +3,7 @@ import {CarouselContextProp} from '../../amp-base-carousel/1.0/carousel-props'; import {BentoInlineGalleryPagination} from './pagination'; import {PreactBaseElement} from '#preact/base-element'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ export const TAG = 'amp-inline-gallery-pagination'; diff --git a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js index 3069c298a379..f1b2bf31f889 100644 --- a/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js +++ b/extensions/amp-inline-gallery/1.0/amp-inline-gallery-thumbnails.js @@ -4,7 +4,7 @@ import {PreactBaseElement} from '#preact/base-element'; import {CSS as THUMBNAIL_CSS} from './thumbnails.jss'; import {BentoInlineGalleryThumbnails} from './thumbnails'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ export const TAG = 'amp-inline-gallery-thumbnails'; diff --git a/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js b/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js index 18be9efed548..6fb7dfc96846 100644 --- a/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js +++ b/extensions/amp-inline-gallery/1.0/amp-inline-gallery.js @@ -10,7 +10,7 @@ import {BaseElement} from './base-element'; import {Layout} from '#core/dom/layout'; import {CSS as PAGINATION_CSS} from '../../../build/amp-inline-gallery-pagination-1.0.css'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-inline-gallery'; diff --git a/extensions/amp-inputmask/0.1/amp-inputmask.js b/extensions/amp-inputmask/0.1/amp-inputmask.js index 1abc0cbb83a9..197650fddd41 100644 --- a/extensions/amp-inputmask/0.1/amp-inputmask.js +++ b/extensions/amp-inputmask/0.1/amp-inputmask.js @@ -1,9 +1,9 @@ import {AmpEvents} from '#core/constants/amp-events'; import {iterateCursor} from '#core/dom'; -import {TextMask} from './text-mask'; +import {listen} from '#utils/event-helper'; -import {listen} from '../../../src/event-helper'; +import {TextMask} from './text-mask'; const SERVICE = 'inputmask'; const TAG = `amp-${SERVICE}`; diff --git a/extensions/amp-inputmask/0.1/inputmask-custom-alias.js b/extensions/amp-inputmask/0.1/inputmask-custom-alias.js index 15df6561cf55..eaba85071a5a 100644 --- a/extensions/amp-inputmask/0.1/inputmask-custom-alias.js +++ b/extensions/amp-inputmask/0.1/inputmask-custom-alias.js @@ -1,6 +1,6 @@ import {dict} from '#core/types/object'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** * Installs an alias used by amp-inputmask that fixes a problem where diff --git a/extensions/amp-inputmask/0.1/test/integration/utils.js b/extensions/amp-inputmask/0.1/test/integration/utils.js index 7a89352d524a..a197c320cffe 100644 --- a/extensions/amp-inputmask/0.1/test/integration/utils.js +++ b/extensions/amp-inputmask/0.1/test/integration/utils.js @@ -1,4 +1,4 @@ -import {listenOncePromise} from '../../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; export function simulateKeyboardInteraction(win, input, key) { const promise = listenOncePromise(input, 'keypress'); diff --git a/extensions/amp-inputmask/0.1/text-mask.js b/extensions/amp-inputmask/0.1/text-mask.js index a383c85af28f..2ff1d9328967 100644 --- a/extensions/amp-inputmask/0.1/text-mask.js +++ b/extensions/amp-inputmask/0.1/text-mask.js @@ -2,11 +2,11 @@ import {iterateCursor, removeElement} from '#core/dom'; import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import {OutputMode} from './constants'; import {Mask} from './mask-impl'; -import {userAssert} from '../../../src/log'; - const ELEMENT_MASK_PROPERTY = '__amp_inputmask_masked'; const ELEMENT_MASK_OUTPUT_PROPERTY = '__amp_inputmask_hidden'; diff --git a/extensions/amp-instagram/0.1/amp-instagram.js b/extensions/amp-instagram/0.1/amp-instagram.js index 38643963c20c..182b6387ee66 100644 --- a/extensions/amp-instagram/0.1/amp-instagram.js +++ b/extensions/amp-instagram/0.1/amp-instagram.js @@ -27,9 +27,10 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-instagram-0.1.css'; -import {getData, listen} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; export class AmpInstagram extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-instagram/1.0/amp-instagram.js b/extensions/amp-instagram/1.0/amp-instagram.js index f08bbfe35151..8337b90f65a7 100644 --- a/extensions/amp-instagram/1.0/amp-instagram.js +++ b/extensions/amp-instagram/1.0/amp-instagram.js @@ -2,10 +2,11 @@ import {dict} from '#core/types/object'; import {isExperimentOn} from '#experiments'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-instagram-1.0.css'; -import {userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-instagram'; diff --git a/extensions/amp-instagram/1.0/component.js b/extensions/amp-instagram/1.0/component.js index 9e5f1661f5c5..d75963f26443 100644 --- a/extensions/amp-instagram/1.0/component.js +++ b/extensions/amp-instagram/1.0/component.js @@ -7,7 +7,7 @@ import {forwardRef} from '#preact/compat'; import {useValueRef} from '#preact/component'; import {IframeEmbed} from '#preact/component/iframe'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; const NO_HEIGHT_STYLE = dict(); const MATCHES_MESSAGING_ORIGIN = (origin) => 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 c4fbefa370d6..4c9b4a4cce11 100644 --- a/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js +++ b/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js @@ -5,9 +5,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {listen} from '#utils/event-helper'; +import {dev, user, userAssert} from '#utils/log'; + import {urls} from '../../../src/config'; -import {listen} from '../../../src/event-helper'; -import {dev, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {removeFragment} from '../../../src/url'; diff --git a/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js b/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js index 8f9083749a1a..338897febad9 100644 --- a/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js +++ b/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js @@ -1,6 +1,7 @@ import {Services} from '#service'; -import {loadPromise} from '../../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; + import { registerServiceBuilderForDoc, resetServiceForTesting, diff --git a/extensions/amp-izlesene/0.1/amp-izlesene.js b/extensions/amp-izlesene/0.1/amp-izlesene.js index bf3b0461bc11..cb49b3ffc0c5 100644 --- a/extensions/amp-izlesene/0.1/amp-izlesene.js +++ b/extensions/amp-izlesene/0.1/amp-izlesene.js @@ -5,7 +5,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {devAssert, userAssert} from '../../../src/log'; +import {devAssert, userAssert} from '#utils/log'; + import {addParamsToUrl} from '../../../src/url'; import {setIsMediaComponent} from '../../../src/video-interface'; diff --git a/extensions/amp-jwplayer/0.1/amp-jwplayer.js b/extensions/amp-jwplayer/0.1/amp-jwplayer.js index 011c9521c64c..93b00e05d930 100644 --- a/extensions/amp-jwplayer/0.1/amp-jwplayer.js +++ b/extensions/amp-jwplayer/0.1/amp-jwplayer.js @@ -19,12 +19,14 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { getConsentMetadata, getConsentPolicyInfo, getConsentPolicyState, } from '../../../src/consent'; -import {getData, listen} from '../../../src/event-helper'; import {disableScrollingOnIframe} from '../../../src/iframe-helper'; import { addUnsafeAllowAutoplay, @@ -34,7 +36,6 @@ import { objOrParseJson, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {addParamsToUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js b/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js index b920a9454e24..5e5b63c741e0 100644 --- a/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js +++ b/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js @@ -6,7 +6,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; + import {addParamsToUrl} from '../../../src/url'; import {setIsMediaComponent} from '../../../src/video-interface'; diff --git a/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js index f0eea2e11e84..8f29559ee83d 100644 --- a/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js +++ b/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js @@ -20,6 +20,10 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {getData, getDetail, isLoaded, listen} from '#utils/event-helper'; +import {dev, devAssert, userAssert} from '#utils/log'; + import {LightboxCaption, OverflowState} from './lightbox-caption'; import {LightboxControls, LightboxControlsAction} from './lightbox-controls'; import { @@ -35,13 +39,10 @@ import { } from './utils'; import {CSS} from '../../../build/amp-lightbox-gallery-0.1.css'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; import {getElementServiceForDoc} from '../../../src/element-service'; import {reportError} from '../../../src/error-reporting'; -import {getData, getDetail, isLoaded, listen} from '../../../src/event-helper'; import {Gestures} from '../../../src/gesture'; import {SwipeDef, SwipeYRecognizer} from '../../../src/gesture-recognizers'; -import {dev, devAssert, userAssert} from '../../../src/log'; /** @const */ const TAG = 'amp-lightbox-gallery'; diff --git a/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js b/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js index 09175b315a08..1f033030823e 100644 --- a/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js +++ b/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js @@ -1,6 +1,6 @@ import {htmlFor} from '#core/dom/static-template'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; /** * @enum {string} diff --git a/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js b/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js index d77bbcd3d364..6940decef8e6 100644 --- a/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js +++ b/extensions/amp-lightbox-gallery/0.1/lightbox-controls.js @@ -4,8 +4,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {createCustomEvent} from '../../../src/event-helper'; -import {devAssert} from '../../../src/log'; +import {createCustomEvent} from '#utils/event-helper'; +import {devAssert} from '#utils/log'; /** * @enum {string} diff --git a/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js b/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js index f47c01657e29..d12240ab86b7 100644 --- a/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js +++ b/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js @@ -13,6 +13,8 @@ import {map} from '#core/types/object'; import {Services} from '#service'; +import {dev, devAssert, userAssert} from '#utils/log'; + import { LIGHTBOX_THUMBNAIL_AD, LIGHTBOX_THUMBNAIL_UNKNOWN, @@ -23,7 +25,6 @@ import { AutoLightboxEvents, isActionableByTap, } from '../../../../src/auto-lightbox'; -import {dev, devAssert, userAssert} from '../../../../src/log'; const LIGHTBOX_ELIGIBLE_TAGS = new Set(['AMP-IMG', 'IMG']); diff --git a/extensions/amp-lightbox-gallery/0.1/swipe-to-dismiss.js b/extensions/amp-lightbox-gallery/0.1/swipe-to-dismiss.js index 28d4b9d1034b..dc1216a12f08 100644 --- a/extensions/amp-lightbox-gallery/0.1/swipe-to-dismiss.js +++ b/extensions/amp-lightbox-gallery/0.1/swipe-to-dismiss.js @@ -1,10 +1,11 @@ import {setStyle, setStyles} from '#core/dom/style'; +import {listen} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {delayAfterDeferringToEventLoop} from './utils'; -import {listen} from '../../../src/event-helper'; import {SwipeDef} from '../../../src/gesture-recognizers'; -import {dev} from '../../../src/log'; /** * The number of pixels of movement to go from the darkest to lightest overlay diff --git a/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js index 1a597f61c1c1..c1f1b712f2c7 100644 --- a/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js +++ b/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js @@ -1,6 +1,6 @@ -import {poll} from '#testing/iframe'; +import * as analytics from '#utils/analytics'; -import * as analytics from '../../../../../src/analytics'; +import {poll} from '#testing/iframe'; // TODO(cathyxz, #16822): This suite is flaky. describes.sandboxed.configure().skip('amp-lightbox-gallery', function () { diff --git a/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js index 4447a46d1677..eb85009fd4cc 100644 --- a/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js +++ b/extensions/amp-lightbox-gallery/1.0/amp-lightbox-gallery.js @@ -6,11 +6,12 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-lightbox-gallery-1.0.css'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; -import {userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-lightbox-gallery'; diff --git a/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js index 0bce9fb1d0bd..eeaef2ae16c7 100644 --- a/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js +++ b/extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js @@ -8,10 +8,11 @@ import {toggleExperiment} from '#experiments'; import {Services} from '#service/'; import {ActionInvocation} from '#service/action-impl'; +import * as analytics from '#utils/analytics'; + import {poll} from '#testing/iframe'; import {waitFor, whenCalled} from '#testing/test-helper'; -import * as analytics from '../../../../src/analytics'; import {installLightboxGallery} from '../amp-lightbox-gallery'; const TAG = 'amp-lightbox-gallery'; diff --git a/extensions/amp-lightbox/0.1/amp-lightbox.js b/extensions/amp-lightbox/0.1/amp-lightbox.js index f245ee8a49a2..99f336bef864 100644 --- a/extensions/amp-lightbox/0.1/amp-lightbox.js +++ b/extensions/amp-lightbox/0.1/amp-lightbox.js @@ -17,9 +17,9 @@ import { setStyles, toggle, } from '#core/dom/style'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {debounce} from '#core/types/function'; -import {dev, devAssert, user} from '../../../src/log'; +import {dev, devAssert, user} from '#utils/log'; import {dict, hasOwn} from '#core/types/object'; import {getMode} from '../../../src/mode'; import {htmlFor} from '#core/dom/static-template'; diff --git a/extensions/amp-lightbox/1.0/amp-lightbox.js b/extensions/amp-lightbox/1.0/amp-lightbox.js index 46fb604076ef..ae91e48935b9 100644 --- a/extensions/amp-lightbox/1.0/amp-lightbox.js +++ b/extensions/amp-lightbox/1.0/amp-lightbox.js @@ -2,10 +2,10 @@ import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants'; import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-lightbox-1.0.css'; import {Services} from '#service'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {isExperimentOn} from '#experiments'; import {toWin} from '#core/window'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-lightbox'; diff --git a/extensions/amp-link-rewriter/0.1/config-options.js b/extensions/amp-link-rewriter/0.1/config-options.js index ab5b383864d6..4e6d0ed0e19a 100644 --- a/extensions/amp-link-rewriter/0.1/config-options.js +++ b/extensions/amp-link-rewriter/0.1/config-options.js @@ -1,6 +1,6 @@ import {getChildJsonConfig} from '#core/dom'; import {hasOwn} from '#core/types/object'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; /** * @typedef {{output: string, section:Array, attribute:Object, vars:Object}} diff --git a/extensions/amp-list/0.1/amp-list.js b/extensions/amp-list/0.1/amp-list.js index 273724423d20..666dcc4fa507 100644 --- a/extensions/amp-list/0.1/amp-list.js +++ b/extensions/amp-list/0.1/amp-list.js @@ -1,6 +1,7 @@ import {ActionTrust} from '#core/constants/action-constants'; import {AmpEvents} from '#core/constants/amp-events'; import {Deferred} from '#core/data-structures/promise'; +import {isAmp4Email} from '#core/document/format'; import {removeChildren, tryFocus} from '#core/dom'; import { Layout, @@ -29,6 +30,10 @@ import { import {Services} from '#service'; +import {createCustomEvent, listen} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; +import {setupAMPCors, setupInput, setupJsonFetchInit} from '#utils/xhr-utils'; + import {setDOM} from '#third_party/set-dom/set-dom'; import {LoadMoreService} from './service/load-more-service'; @@ -39,18 +44,10 @@ import { batchFetchJsonFor, requestForBatchFetch, } from '../../../src/batched-json'; -import {createCustomEvent, listen} from '../../../src/event-helper'; -import {isAmp4Email} from '../../../src/format'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {Pass} from '../../../src/pass'; import {SsrTemplateHelper} from '../../../src/ssr-template-helper'; import {getSourceOrigin, isAmpScriptUri} from '../../../src/url'; -import { - setupAMPCors, - setupInput, - setupJsonFetchInit, -} from '../../../src/utils/xhr-utils'; /** @const {string} */ const TAG = 'amp-list'; diff --git a/extensions/amp-list/0.1/service/load-more-service.js b/extensions/amp-list/0.1/service/load-more-service.js index d74a063c599b..9705123efab9 100644 --- a/extensions/amp-list/0.1/service/load-more-service.js +++ b/extensions/amp-list/0.1/service/load-more-service.js @@ -2,7 +2,7 @@ import {childElementByAttr} from '#core/dom/query'; import {htmlFor} from '#core/dom/static-template'; import {setStyles} from '#core/dom/style'; -import {dev} from '../../../../src/log'; +import {dev} from '#utils/log'; export class LoadMoreService { /** diff --git a/extensions/amp-live-list/0.1/amp-live-list.js b/extensions/amp-live-list/0.1/amp-live-list.js index 3af8353b6bd1..d94d0aafa2b1 100644 --- a/extensions/amp-live-list/0.1/amp-live-list.js +++ b/extensions/amp-live-list/0.1/amp-live-list.js @@ -2,6 +2,8 @@ import {AmpEvents} from '#core/constants/amp-events'; import {Layout} from '#core/dom/layout'; import {childElementByAttr} from '#core/dom/query'; +import {user, userAssert} from '#utils/log'; + import { AMP_LIVE_LIST_CUSTOM_SLOT_ID, LiveListManager, @@ -9,7 +11,6 @@ import { } from './live-list-manager'; import {CSS} from '../../../build/amp-live-list-0.1.css'; -import {user, userAssert} from '../../../src/log'; /** * @enum {string} diff --git a/extensions/amp-live-list/0.1/live-list-manager.js b/extensions/amp-live-list/0.1/live-list-manager.js index 109759d81365..91543d341e9c 100644 --- a/extensions/amp-live-list/0.1/live-list-manager.js +++ b/extensions/amp-live-list/0.1/live-list-manager.js @@ -1,10 +1,11 @@ import {Services} from '#service'; import {extensionScriptsInNode} from '#service/extension-script'; +import {userAssert} from '#utils/log'; + import {Poller} from './poller'; import {fetchDocument} from '../../../src/document-fetcher'; -import {userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; import {addParamToUrl} from '../../../src/url'; diff --git a/extensions/amp-mathml/1.0/amp-mathml.js b/extensions/amp-mathml/1.0/amp-mathml.js index b1ab79c64e9d..ef0b2072e429 100644 --- a/extensions/amp-mathml/1.0/amp-mathml.js +++ b/extensions/amp-mathml/1.0/amp-mathml.js @@ -2,12 +2,13 @@ import {dict} from '#core/types/object'; import {isExperimentOn} from '#experiments'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {TYPE} from './utils'; import {CSS} from '../../../build/amp-mathml-1.0.css'; import {getBootstrapBaseUrl, getBootstrapUrl} from '../../../src/3p-frame'; -import {userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-mathml'; diff --git a/extensions/amp-mega-menu/0.1/amp-mega-menu.js b/extensions/amp-mega-menu/0.1/amp-mega-menu.js index 09494c772f77..0740404e8282 100644 --- a/extensions/amp-mega-menu/0.1/amp-mega-menu.js +++ b/extensions/amp-mega-menu/0.1/amp-mega-menu.js @@ -14,8 +14,9 @@ import {toArray} from '#core/types/array'; import {Services} from '#service'; +import {dev, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-mega-menu-0.1.css'; -import {dev, userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-mega-menu'; diff --git a/extensions/amp-megaphone/0.1/amp-megaphone.js b/extensions/amp-megaphone/0.1/amp-megaphone.js index 4ae0ccfea0e6..6d6a0229df4d 100644 --- a/extensions/amp-megaphone/0.1/amp-megaphone.js +++ b/extensions/amp-megaphone/0.1/amp-megaphone.js @@ -20,8 +20,9 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {getData, listen} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {addParamsToUrl} from '../../../src/url'; import {setIsMediaComponent} from '../../../src/video-interface'; diff --git a/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js b/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js index 412b386b4c8d..4050aec10413 100644 --- a/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js +++ b/extensions/amp-minute-media-player/0.1/amp-minute-media-player.js @@ -11,7 +11,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { createFrameFor, isJsonOrObj, @@ -20,7 +22,6 @@ import { originMatches, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {addParamsToUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-mowplayer/0.1/amp-mowplayer.js b/extensions/amp-mowplayer/0.1/amp-mowplayer.js index 7a6a5d2179df..d09f5a786125 100644 --- a/extensions/amp-mowplayer/0.1/amp-mowplayer.js +++ b/extensions/amp-mowplayer/0.1/amp-mowplayer.js @@ -12,7 +12,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { createFrameFor, isJsonOrObj, @@ -21,7 +23,6 @@ import { originMatches, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {VideoEvents} from '../../../src/video-interface'; const TAG = 'amp-mowplayer'; diff --git a/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js b/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js index 850c548e4fdc..714f91e3cb61 100644 --- a/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js +++ b/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js @@ -3,7 +3,8 @@ import {createElementWithAttributes} from '#core/dom'; import {Services} from '#service'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; + import {VideoEvents} from '../../../../src/video-interface'; const EXAMPLE_VIDEOID = 'v-myfwarfx4tb'; diff --git a/extensions/amp-mraid/0.1/amp-mraid.js b/extensions/amp-mraid/0.1/amp-mraid.js index 640f1217a2e9..2fc02250bf0e 100644 --- a/extensions/amp-mraid/0.1/amp-mraid.js +++ b/extensions/amp-mraid/0.1/amp-mraid.js @@ -22,10 +22,11 @@ import {HostServices} from '#inabox/host-services'; +import {dev} from '#utils/log'; + import {MraidService} from './mraid-service'; import {urls} from '../../../src/config'; -import {dev} from '../../../src/log'; import {getMode} from '../../../src/mode'; const TAG = 'amp-mraid'; diff --git a/extensions/amp-mustache/0.1/amp-mustache.js b/extensions/amp-mustache/0.1/amp-mustache.js index 07c0437160c1..c5a7bd294776 100644 --- a/extensions/amp-mustache/0.1/amp-mustache.js +++ b/extensions/amp-mustache/0.1/amp-mustache.js @@ -5,7 +5,7 @@ import { sanitizeHtml, sanitizeTagsForTripleMustache, } from '../../../src/sanitizer'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; import mustache from '#third_party/mustache/mustache'; const TAG = 'amp-mustache'; diff --git a/extensions/amp-mustache/0.2/amp-mustache.js b/extensions/amp-mustache/0.2/amp-mustache.js index 5e8e067df46c..da99cd09f52e 100644 --- a/extensions/amp-mustache/0.2/amp-mustache.js +++ b/extensions/amp-mustache/0.2/amp-mustache.js @@ -4,7 +4,7 @@ import {dict} from '#core/types/object'; import {getService, registerServiceBuilder} from '../../../src/service-helpers'; import {iterateCursor, templateContentClone} from '#core/dom'; import {rewriteAttributeValue} from '../../../src/url-rewrite'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; import mustache from '#third_party/mustache/mustache'; const TAG = 'amp-mustache'; diff --git a/extensions/amp-nested-menu/0.1/amp-nested-menu.js b/extensions/amp-nested-menu/0.1/amp-nested-menu.js index 96ba499735d9..019b05475ec3 100644 --- a/extensions/amp-nested-menu/0.1/amp-nested-menu.js +++ b/extensions/amp-nested-menu/0.1/amp-nested-menu.js @@ -10,8 +10,9 @@ import {toArray} from '#core/types/array'; import {Services} from '#service'; +import {dev, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-nested-menu-0.1.css'; -import {dev, userAssert} from '../../../src/log'; const TAG = 'amp-nested-menu'; diff --git a/extensions/amp-next-page/0.1/amp-next-page.js b/extensions/amp-next-page/0.1/amp-next-page.js index 63d22ad79d0d..700394e17b8b 100644 --- a/extensions/amp-next-page/0.1/amp-next-page.js +++ b/extensions/amp-next-page/0.1/amp-next-page.js @@ -12,6 +12,8 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {assertConfig} from './config'; import {NextPageService} from './next-page-service'; @@ -22,7 +24,6 @@ import { } from '../../../src/batched-json'; import {getConsentPolicyState} from '../../../src/consent'; import {fetchDocument} from '../../../src/document-fetcher'; -import {dev, user, userAssert} from '../../../src/log'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; const TAG = 'amp-next-page'; diff --git a/extensions/amp-next-page/0.1/config.js b/extensions/amp-next-page/0.1/config.js index 912dfb42dab0..655e3f10fb24 100644 --- a/extensions/amp-next-page/0.1/config.js +++ b/extensions/amp-next-page/0.1/config.js @@ -2,7 +2,8 @@ import {isArray} from '#core/types'; import {Services} from '#service'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; + import { getSourceOrigin, getSourceUrl, diff --git a/extensions/amp-next-page/0.1/next-page-service.js b/extensions/amp-next-page/0.1/next-page-service.js index 47e79dee7a8b..1875322212fd 100644 --- a/extensions/amp-next-page/0.1/next-page-service.js +++ b/extensions/amp-next-page/0.1/next-page-service.js @@ -8,9 +8,10 @@ import {Services} from '#service'; import {installPositionObserverServiceForDoc} from '#service/position-observer/position-observer-impl'; import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-next-page-0.1.css'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {MultidocManager} from '../../../src/multidoc-manager'; import {getAmpdoc} from '../../../src/service-helpers'; import {installStylesForDoc} from '../../../src/style-installer'; diff --git a/extensions/amp-next-page/1.0/page.js b/extensions/amp-next-page/1.0/page.js index ac65238227eb..c0f3e1e13d25 100644 --- a/extensions/amp-next-page/1.0/page.js +++ b/extensions/amp-next-page/1.0/page.js @@ -1,8 +1,8 @@ import {VisibilityState} from '#core/constants/visibility-state'; -import {ViewportRelativePos} from './visibility-observer'; +import {devAssert} from '#utils/log'; -import {devAssert} from '../../../src/log'; +import {ViewportRelativePos} from './visibility-observer'; /** @enum {number} */ export const PageState = { diff --git a/extensions/amp-next-page/1.0/service.js b/extensions/amp-next-page/1.0/service.js index 20eed3b73783..82f52c1a7c1f 100644 --- a/extensions/amp-next-page/1.0/service.js +++ b/extensions/amp-next-page/1.0/service.js @@ -18,17 +18,18 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {HIDDEN_DOC_CLASS, HostPage, Page, PageState} from './page'; import {validatePage, validateUrl} from './utils'; import VisibilityObserver, {ViewportRelativePos} from './visibility-observer'; import {CSS} from '../../../build/amp-next-page-1.0.css'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; import { UrlReplacementPolicy, batchFetchJsonFor, } from '../../../src/batched-json'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import { parseFavicon, parseOgImage, diff --git a/extensions/amp-next-page/1.0/utils.js b/extensions/amp-next-page/1.0/utils.js index e69b909e6c50..f92256ab29f5 100644 --- a/extensions/amp-next-page/1.0/utils.js +++ b/extensions/amp-next-page/1.0/utils.js @@ -1,4 +1,5 @@ -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; + import { getSourceOrigin, getSourceUrl, diff --git a/extensions/amp-next-page/1.0/visibility-observer.js b/extensions/amp-next-page/1.0/visibility-observer.js index f5ace7c42c10..3a01ebab616c 100644 --- a/extensions/amp-next-page/1.0/visibility-observer.js +++ b/extensions/amp-next-page/1.0/visibility-observer.js @@ -11,7 +11,7 @@ import { PositionObserverFidelity, } from '#service/position-observer/position-observer-worker'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; /** @enum {number} */ export const ViewportRelativePos = { diff --git a/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js b/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js index 88280d63d115..3a4e92336158 100644 --- a/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js +++ b/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js @@ -12,14 +12,15 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {getConsentPolicyInfo} from '../../../src/consent'; -import {getData, listen} from '../../../src/event-helper'; import { createFrameFor, objOrParseJson, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {addParamsToUrl, assertAbsoluteHttpOrHttpsUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js b/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js index 36a2aab3a9f8..d1ebd1d80674 100644 --- a/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js +++ b/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js @@ -1,8 +1,9 @@ import '../amp-nexxtv-player'; import {createElementWithAttributes} from '#core/dom'; +import {listenOncePromise} from '#utils/event-helper'; + import * as consent from '../../../../src/consent'; -import {listenOncePromise} from '../../../../src/event-helper'; import {VideoEvents} from '../../../../src/video-interface'; describes.realWin( diff --git a/extensions/amp-o2-player/0.1/amp-o2-player.js b/extensions/amp-o2-player/0.1/amp-o2-player.js index 4e49ab98f2ab..7460553e84fb 100644 --- a/extensions/amp-o2-player/0.1/amp-o2-player.js +++ b/extensions/amp-o2-player/0.1/amp-o2-player.js @@ -6,12 +6,13 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import { getConsentPolicyInfo, getConsentPolicyState, } from '../../../src/consent'; import {listenFor} from '../../../src/iframe-helper'; -import {userAssert} from '../../../src/log'; import {setIsMediaComponent} from '../../../src/video-interface'; class AmpO2Player extends AMP.BaseElement { diff --git a/extensions/amp-onetap-google/0.1/amp-onetap-google.js b/extensions/amp-onetap-google/0.1/amp-onetap-google.js index fac3af8adaf1..8c817163c4c6 100644 --- a/extensions/amp-onetap-google/0.1/amp-onetap-google.js +++ b/extensions/amp-onetap-google/0.1/amp-onetap-google.js @@ -35,9 +35,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {getData, listen} from '#utils/event-helper'; +import {dev, devAssert, user} from '#utils/log'; + import {CSS} from '../../../build/amp-onetap-google-0.1.css'; -import {getData, listen} from '../../../src/event-helper'; -import {dev, devAssert, user} from '../../../src/log'; import {assertHttpsUrl} from '../../../src/url'; /** @const {string} */ diff --git a/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js b/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js index ee7bb3f48acb..9f2888fe4a22 100644 --- a/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js +++ b/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js @@ -4,11 +4,12 @@ import {createElementWithAttributes, waitForChild} from '#core/dom'; import {Services} from '#service'; import {AmpDoc} from '#service/ampdoc-impl'; +import {loadPromise} from '#utils/event-helper'; +import {user} from '#utils/log'; + import {macroTask} from '#testing/helpers'; import {BaseElement} from '../../../../src/base-element'; -import {loadPromise} from '../../../../src/event-helper'; -import {user} from '../../../../src/log'; import {ACTIONS, SENTINEL} from '../amp-onetap-google'; const TAG = 'amp-onetap-google'; diff --git a/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js b/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js index 4ab662d38fda..e6e52ca849cf 100644 --- a/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js +++ b/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js @@ -11,13 +11,14 @@ import {PauseHelper} from '#core/dom/video/pause-helper'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { createFrameFor, objOrParseJson, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {VideoEvents} from '../../../src/video-interface'; const TAG = 'amp-ooyala-player'; diff --git a/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js b/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js index 7a225b6d823a..87e0c5964a3f 100644 --- a/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js +++ b/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js @@ -4,8 +4,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {createCustomEvent} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; +import {createCustomEvent} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; const TAG = 'amp-orientation-observer'; /** diff --git a/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js index f6313e91598e..3cb2a6cfec55 100644 --- a/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js +++ b/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js @@ -16,9 +16,11 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {Animation} from '#utils/animation'; +import {createCustomEvent, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-pan-zoom-0.1.css'; -import {Animation} from '../../../src/animation'; -import {createCustomEvent, listen} from '../../../src/event-helper'; import {Gestures} from '../../../src/gesture'; import { DoubletapRecognizer, @@ -26,7 +28,6 @@ import { SwipeXYRecognizer, TapRecognizer, } from '../../../src/gesture-recognizers'; -import {dev, userAssert} from '../../../src/log'; import {continueMotion} from '../../../src/motion'; const PAN_ZOOM_CURVE_ = bezierCurve(0.4, 0, 0.2, 1.4); diff --git a/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js index 59bbbfa540fc..00a50455ee8d 100644 --- a/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js +++ b/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js @@ -4,9 +4,9 @@ import {setStyles} from '#core/dom/style'; import {Services} from '#service'; -import {createPointerEvent} from '#testing/test-helper'; +import {listenOncePromise} from '#utils/event-helper'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {createPointerEvent} from '#testing/test-helper'; describes.realWin( 'amp-pan-zoom', diff --git a/extensions/amp-pinterest/0.1/amp-pinterest.js b/extensions/amp-pinterest/0.1/amp-pinterest.js index 5ea387f2f104..e94196a52439 100644 --- a/extensions/amp-pinterest/0.1/amp-pinterest.js +++ b/extensions/amp-pinterest/0.1/amp-pinterest.js @@ -39,12 +39,13 @@ import {htmlFor} from '#core/dom/static-template'; import {Services} from '#service'; +import {user, userAssert} from '#utils/log'; + import {FollowButton} from './follow-button'; import {PinWidget} from './pin-widget'; import {SaveButton} from './save-button'; import {CSS} from '../../../build/amp-pinterest-0.1.css'; -import {user, userAssert} from '../../../src/log'; /** * AMP Pinterest diff --git a/extensions/amp-pinterest/0.1/follow-button.js b/extensions/amp-pinterest/0.1/follow-button.js index f137370404e7..f34482b52e94 100644 --- a/extensions/amp-pinterest/0.1/follow-button.js +++ b/extensions/amp-pinterest/0.1/follow-button.js @@ -1,8 +1,9 @@ import {tryResolve} from '#core/data-structures/promise'; +import {userAssert} from '#utils/log'; + import {Util} from './util'; -import {userAssert} from '../../../src/log'; import {openWindowDialog} from '../../../src/open-window-dialog'; import {assertHttpsUrl} from '../../../src/url'; diff --git a/extensions/amp-pinterest/0.1/pin-widget.js b/extensions/amp-pinterest/0.1/pin-widget.js index 2c0ca07b7c2d..e958c711848f 100644 --- a/extensions/amp-pinterest/0.1/pin-widget.js +++ b/extensions/amp-pinterest/0.1/pin-widget.js @@ -4,9 +4,10 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {user, userAssert} from '#utils/log'; + import {Util} from './util'; -import {user, userAssert} from '../../../src/log'; import {openWindowDialog} from '../../../src/open-window-dialog'; import {assertAbsoluteHttpOrHttpsUrl, assertHttpsUrl} from '../../../src/url'; diff --git a/extensions/amp-pinterest/0.1/save-button.js b/extensions/amp-pinterest/0.1/save-button.js index 04033d161ab1..0cb3d5adb49f 100644 --- a/extensions/amp-pinterest/0.1/save-button.js +++ b/extensions/amp-pinterest/0.1/save-button.js @@ -2,9 +2,10 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {dev, userAssert} from '#utils/log'; + import {Util} from './util'; -import {dev, userAssert} from '../../../src/log'; import {openWindowDialog} from '../../../src/open-window-dialog'; // Popup options diff --git a/extensions/amp-playbuzz/0.1/amp-playbuzz.js b/extensions/amp-playbuzz/0.1/amp-playbuzz.js index 6525d1511c30..d4f4d6c3ddb4 100644 --- a/extensions/amp-playbuzz/0.1/amp-playbuzz.js +++ b/extensions/amp-playbuzz/0.1/amp-playbuzz.js @@ -30,11 +30,12 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import * as events from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {logo, showMoreArrow} from './images'; import * as utils from './utils'; -import * as events from '../../../src/event-helper'; -import {dev, userAssert} from '../../../src/log'; import { assertAbsoluteHttpOrHttpsUrl, parseUrlDeprecated, diff --git a/extensions/amp-playbuzz/0.1/utils.js b/extensions/amp-playbuzz/0.1/utils.js index c341f409c026..2c0ee7529579 100644 --- a/extensions/amp-playbuzz/0.1/utils.js +++ b/extensions/amp-playbuzz/0.1/utils.js @@ -2,7 +2,8 @@ import {rethrowAsync} from '#core/error'; import {dict} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; + import { parseUrlDeprecated, removeFragment, diff --git a/extensions/amp-position-observer/0.1/amp-position-observer.js b/extensions/amp-position-observer/0.1/amp-position-observer.js index 3c804313a33d..6a08c6ecdb17 100644 --- a/extensions/amp-position-observer/0.1/amp-position-observer.js +++ b/extensions/amp-position-observer/0.1/amp-position-observer.js @@ -16,8 +16,8 @@ import {Services} from '#service'; import {installPositionObserverServiceForDoc} from '#service/position-observer/position-observer-impl'; import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; const TAG = 'amp-position-observer'; diff --git a/extensions/amp-powr-player/0.1/amp-powr-player.js b/extensions/amp-powr-player/0.1/amp-powr-player.js index 715eb0dca0a8..c188c9714e72 100644 --- a/extensions/amp-powr-player/0.1/amp-powr-player.js +++ b/extensions/amp-powr-player/0.1/amp-powr-player.js @@ -16,7 +16,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { createFrameFor, isJsonOrObj, @@ -24,7 +26,6 @@ import { objOrParseJson, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {addParamsToUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js b/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js index 7e37b2c6f844..1d3595458df4 100644 --- a/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js +++ b/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js @@ -1,5 +1,6 @@ import '../amp-powr-player'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; + import {parseUrlDeprecated} from '../../../../src/url'; import {VideoEvents} from '../../../../src/video-interface'; diff --git a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js index 595e563c80fd..2e6977e5081a 100644 --- a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js +++ b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js @@ -15,7 +15,7 @@ import { import {CSS} from '../../../build/amp-recaptcha-input-0.1.css'; import {Layout} from '#core/dom/layout'; import {setStyles, toggle} from '#core/dom/style'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const */ const TAG = 'amp-recaptcha-input'; 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 a54101449471..e62752fb00d6 100644 --- a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js +++ b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js @@ -7,13 +7,13 @@ import ampToolboxCacheUrl from '../../../third_party/amp-toolbox-cache-url/dist/ import {Deferred, tryResolve} from '#core/data-structures/promise'; import {Services} from '#service'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getMode} from '../../../src/mode'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; import {getSourceOrigin} from '../../../src/url'; import {listenFor, postMessage} from '../../../src/iframe-helper'; -import {loadPromise} from '../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; import {removeElement} from '#core/dom'; import {setStyle} from '#core/dom/style'; import {urls} from '../../../src/config'; diff --git a/extensions/amp-redbull-player/0.1/amp-redbull-player.js b/extensions/amp-redbull-player/0.1/amp-redbull-player.js index 003934520e24..db04f438a6fe 100644 --- a/extensions/amp-redbull-player/0.1/amp-redbull-player.js +++ b/extensions/amp-redbull-player/0.1/amp-redbull-player.js @@ -9,7 +9,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {disableScrollingOnIframe} from '../../../src/iframe-helper'; import { SandboxOptions, @@ -18,7 +20,6 @@ import { objOrParseJson, originMatches, } from '../../../src/iframe-video'; -import {userAssert} from '../../../src/log'; import {addParamsToUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-reddit/0.1/amp-reddit.js b/extensions/amp-reddit/0.1/amp-reddit.js index 15edcc9dcb78..76f1640b349c 100644 --- a/extensions/amp-reddit/0.1/amp-reddit.js +++ b/extensions/amp-reddit/0.1/amp-reddit.js @@ -2,9 +2,10 @@ import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import {getIframe, preloadBootstrap} from '../../../src/3p-frame'; import {listenFor} from '../../../src/iframe-helper'; -import {userAssert} from '../../../src/log'; const TYPE = 'reddit'; diff --git a/extensions/amp-render/1.0/amp-render.js b/extensions/amp-render/1.0/amp-render.js index 99fb94312fe3..d8bd3a369133 100644 --- a/extensions/amp-render/1.0/amp-render.js +++ b/extensions/amp-render/1.0/amp-render.js @@ -7,7 +7,7 @@ import { import {Layout} from '#core/dom/layout'; import {Services} from '#service'; import {computedStyle, setStyles} from '#core/dom/style'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getSourceOrigin, isAmpScriptUri} from '../../../src/url'; import {toArray} from '#core/types/array'; diff --git a/extensions/amp-render/1.0/test/test-amp-render.js b/extensions/amp-render/1.0/test/test-amp-render.js index f3463c31b6d3..2ee37fda4663 100644 --- a/extensions/amp-render/1.0/test/test-amp-render.js +++ b/extensions/amp-render/1.0/test/test-amp-render.js @@ -4,7 +4,7 @@ import '../../../amp-script/0.1/amp-script'; import '../amp-render'; import * as BatchedJsonModule from '../../../../src/batched-json'; import * as Style from '#core/dom/style'; -import * as log from '../../../../src/log'; +import * as log from '#utils/log'; import {ActionInvocation} from '#service/action-impl'; import {ActionTrust} from '#core/constants/action-constants'; import {Services} from '#service'; diff --git a/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js b/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js index 4723842278e8..740c39b922be 100644 --- a/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js +++ b/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js @@ -2,8 +2,8 @@ import {removeElement} from '#core/dom'; import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {isFiniteNumber, isObject} from '#core/types'; -import {getData, listen} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; export class AmpRiddleQuiz extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-script/0.1/amp-script.js b/extensions/amp-script/0.1/amp-script.js index 1033a13a2eda..5ad482a440eb 100644 --- a/extensions/amp-script/0.1/amp-script.js +++ b/extensions/amp-script/0.1/amp-script.js @@ -13,13 +13,14 @@ import {Purifier} from '#purifier'; import {Services} from '#service'; import {calculateExtensionScriptUrl} from '#service/extension-script'; +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 {getElementServiceForDoc} from '../../../src/element-service'; import {cancellation} from '../../../src/error-reporting'; -import {dev, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {getService, registerServiceBuilder} from '../../../src/service-helpers'; import {rewriteAttributeValue} from '../../../src/url-rewrite'; diff --git a/extensions/amp-script/0.1/test/unit/test-amp-script.js b/extensions/amp-script/0.1/test/unit/test-amp-script.js index c12417a26751..0597444273a8 100644 --- a/extensions/amp-script/0.1/test/unit/test-amp-script.js +++ b/extensions/amp-script/0.1/test/unit/test-amp-script.js @@ -2,9 +2,10 @@ import * as WorkerDOM from '@ampproject/worker-dom/dist/amp-production/main.mjs' import {Services} from '#service'; +import {user} from '#utils/log'; + import {FakeWindow} from '#testing/fake-dom'; -import {user} from '../../../../../src/log'; import { registerServiceBuilderForDoc, resetServiceForTesting, diff --git a/extensions/amp-script/0.1/user-activation-tracker.js b/extensions/amp-script/0.1/user-activation-tracker.js index c972d378349b..dd762f135ad6 100644 --- a/extensions/amp-script/0.1/user-activation-tracker.js +++ b/extensions/amp-script/0.1/user-activation-tracker.js @@ -1,4 +1,4 @@ -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; export const ACTIVATION_TIMEOUT = 5000; // 5 seconds. diff --git a/extensions/amp-selector/0.1/amp-selector.js b/extensions/amp-selector/0.1/amp-selector.js index 8004d2a32975..547ea678b321 100644 --- a/extensions/amp-selector/0.1/amp-selector.js +++ b/extensions/amp-selector/0.1/amp-selector.js @@ -10,9 +10,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-selector-0.1.css'; -import {createCustomEvent} from '../../../src/event-helper'; -import {dev, userAssert} from '../../../src/log'; const TAG = 'amp-selector'; diff --git a/extensions/amp-selector/1.0/amp-selector.js b/extensions/amp-selector/1.0/amp-selector.js index aa1e59134715..b5e37f09b6b0 100644 --- a/extensions/amp-selector/1.0/amp-selector.js +++ b/extensions/amp-selector/1.0/amp-selector.js @@ -6,11 +6,12 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {createCustomEvent} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-selector-1.0.css'; -import {createCustomEvent} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-selector'; diff --git a/extensions/amp-selector/1.0/base-element.js b/extensions/amp-selector/1.0/base-element.js index d7d334245e20..2d73bedc70c7 100644 --- a/extensions/amp-selector/1.0/base-element.js +++ b/extensions/amp-selector/1.0/base-element.js @@ -11,9 +11,9 @@ import * as Preact from '#preact'; import {useCallback, useLayoutEffect, useRef} from '#preact'; import {PreactBaseElement} from '#preact/base-element'; -import {Option, Selector} from './component'; +import {devAssert} from '#utils/log'; -import {devAssert} from '../../../src/log'; +import {Option, Selector} from './component'; export class BaseElement extends PreactBaseElement { /** @override */ diff --git a/extensions/amp-sidebar/0.1/amp-sidebar.js b/extensions/amp-sidebar/0.1/amp-sidebar.js index 0cd49f4179c3..b202cccc216c 100644 --- a/extensions/amp-sidebar/0.1/amp-sidebar.js +++ b/extensions/amp-sidebar/0.1/amp-sidebar.js @@ -11,10 +11,10 @@ import { closestAncestorElementBySelector, realChildElements, } from '#core/dom/query'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {debounce} from '#core/types/function'; -import {descendsFromStory} from '../../../src/utils/story'; -import {dev, devAssert} from '../../../src/log'; +import {descendsFromStory} from '#utils/story'; +import {dev, devAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {handleAutoscroll} from './autoscroll'; import {isRTL, tryFocus} from '#core/dom'; diff --git a/extensions/amp-sidebar/0.1/autoscroll.js b/extensions/amp-sidebar/0.1/autoscroll.js index 51facfc33bcd..df1dcc78f901 100644 --- a/extensions/amp-sidebar/0.1/autoscroll.js +++ b/extensions/amp-sidebar/0.1/autoscroll.js @@ -1,7 +1,7 @@ import {Services} from '#service'; import {computedStyle} from '#core/dom/style'; import {scopedQuerySelector} from '#core/dom/query'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** * Given a container, find the first descendant element with the `autoscroll` diff --git a/extensions/amp-sidebar/0.1/swipe-to-dismiss.js b/extensions/amp-sidebar/0.1/swipe-to-dismiss.js index 4185e3e12c47..08f44fef32b7 100644 --- a/extensions/amp-sidebar/0.1/swipe-to-dismiss.js +++ b/extensions/amp-sidebar/0.1/swipe-to-dismiss.js @@ -1,6 +1,6 @@ import {SwipeDef} from '../../../src/gesture-recognizers'; import {delayAfterDeferringToEventLoop} from './utils'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {setStyles} from '#core/dom/style'; /** diff --git a/extensions/amp-sidebar/0.1/toolbar.js b/extensions/amp-sidebar/0.1/toolbar.js index 4672f855e5f1..7400c962a1d9 100644 --- a/extensions/amp-sidebar/0.1/toolbar.js +++ b/extensions/amp-sidebar/0.1/toolbar.js @@ -1,4 +1,4 @@ -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {handleAutoscroll} from './autoscroll'; import {toggle} from '#core/dom/style'; diff --git a/extensions/amp-sidebar/0.2/amp-sidebar.js b/extensions/amp-sidebar/0.2/amp-sidebar.js index b331bd3d3aee..23c210f7c049 100644 --- a/extensions/amp-sidebar/0.2/amp-sidebar.js +++ b/extensions/amp-sidebar/0.2/amp-sidebar.js @@ -11,10 +11,10 @@ import { closestAncestorElementBySelector, realChildElements, } from '#core/dom/query'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {debounce} from '#core/types/function'; -import {descendsFromStory} from '../../../src/utils/story'; -import {dev, devAssert, userAssert} from '../../../src/log'; +import {descendsFromStory} from '#utils/story'; +import {dev, devAssert, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {handleAutoscroll} from './autoscroll'; import {isExperimentOn} from '#experiments'; diff --git a/extensions/amp-sidebar/0.2/autoscroll.js b/extensions/amp-sidebar/0.2/autoscroll.js index 51facfc33bcd..df1dcc78f901 100644 --- a/extensions/amp-sidebar/0.2/autoscroll.js +++ b/extensions/amp-sidebar/0.2/autoscroll.js @@ -1,7 +1,7 @@ import {Services} from '#service'; import {computedStyle} from '#core/dom/style'; import {scopedQuerySelector} from '#core/dom/query'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** * Given a container, find the first descendant element with the `autoscroll` diff --git a/extensions/amp-sidebar/0.2/swipe-to-dismiss.js b/extensions/amp-sidebar/0.2/swipe-to-dismiss.js index 4185e3e12c47..08f44fef32b7 100644 --- a/extensions/amp-sidebar/0.2/swipe-to-dismiss.js +++ b/extensions/amp-sidebar/0.2/swipe-to-dismiss.js @@ -1,6 +1,6 @@ import {SwipeDef} from '../../../src/gesture-recognizers'; import {delayAfterDeferringToEventLoop} from './utils'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {setStyles} from '#core/dom/style'; /** diff --git a/extensions/amp-sidebar/0.2/toolbar.js b/extensions/amp-sidebar/0.2/toolbar.js index 628b2f64816b..594139cade22 100644 --- a/extensions/amp-sidebar/0.2/toolbar.js +++ b/extensions/amp-sidebar/0.2/toolbar.js @@ -1,4 +1,4 @@ -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {handleAutoscroll} from './autoscroll'; import {toggle} from '#core/dom/style'; diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.js b/extensions/amp-sidebar/1.0/amp-sidebar.js index f80c1511902d..286fb225eceb 100644 --- a/extensions/amp-sidebar/1.0/amp-sidebar.js +++ b/extensions/amp-sidebar/1.0/amp-sidebar.js @@ -1,7 +1,7 @@ import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-sidebar-1.0.css'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; import {Services} from '#service/'; /** @const {string} */ diff --git a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js index 56005e6a0faa..751daff9da3f 100644 --- a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js +++ b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js @@ -1,11 +1,12 @@ import {Observable} from '#core/data-structures/observable'; +import {userAssert} from '#utils/log'; + import {EVENTS, ORIGINAL_URL_ATTRIBUTE} from './constants'; import {LinkReplacementCache} from './link-replacement-cache'; import {TwoStepsResponse} from './two-steps-response'; import {ChunkPriority, chunk} from '../../../../src/chunk'; -import {userAssert} from '../../../../src/log'; /** @typedef {!Array<{anchor: !HTMLElement, replacementUrl: ?string}>}} */ export let AnchorReplacementList; diff --git a/extensions/amp-skimlinks/0.1/skim-options.js b/extensions/amp-skimlinks/0.1/skim-options.js index cf8167c0aac8..c4d09d72933a 100644 --- a/extensions/amp-skimlinks/0.1/skim-options.js +++ b/extensions/amp-skimlinks/0.1/skim-options.js @@ -1,5 +1,7 @@ import {getChildJsonConfig} from '#core/dom'; +import {userAssert} from '#utils/log'; + import { DEFAULT_CONFIG, GLOBAL_DOMAIN_DENYLIST, @@ -8,8 +10,6 @@ import { } from './constants'; import {getNormalizedHostnameFromUrl} from './utils'; -import {userAssert} from '../../../src/log'; - /** * * @param {*} condition diff --git a/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js b/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js index 2d7b2b7adb06..64662931342d 100644 --- a/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js +++ b/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js @@ -1,5 +1,5 @@ import {Deferred} from '#core/data-structures/promise'; -import * as DocumentReady from '#core/document-ready'; +import * as DocumentReady from '#core/document/ready'; import helpersFactory from './helpers'; diff --git a/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js b/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js index 8953e771bc2b..d83d291bc0d1 100644 --- a/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js +++ b/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js @@ -1,7 +1,8 @@ import {AmpEvents} from '#core/constants/amp-events'; +import {createCustomEvent} from '#utils/event-helper'; + import * as chunkModule from '../../../../src/chunk'; -import {createCustomEvent} from '../../../../src/event-helper'; import { ORIGINAL_URL_ATTRIBUTE, PRIORITY_META_TAG_NAME, diff --git a/extensions/amp-slides/0.1/amp-slides.js b/extensions/amp-slides/0.1/amp-slides.js index 06f522f0478b..8f2475e403ec 100644 --- a/extensions/amp-slides/0.1/amp-slides.js +++ b/extensions/amp-slides/0.1/amp-slides.js @@ -1,4 +1,4 @@ -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @private @const {string} */ const TAG = 'amp-slides'; diff --git a/extensions/amp-smartlinks/0.1/amp-smartlinks.js b/extensions/amp-smartlinks/0.1/amp-smartlinks.js index 665d8428d0a1..22fe4a0e8dc2 100644 --- a/extensions/amp-smartlinks/0.1/amp-smartlinks.js +++ b/extensions/amp-smartlinks/0.1/amp-smartlinks.js @@ -3,11 +3,12 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {getData} from '#utils/event-helper'; + import {ENDPOINTS} from './constants'; import {Linkmate} from './linkmate'; import {getConfigOptions} from './linkmate-options'; -import {getData} from '../../../src/event-helper'; import {CustomEventReporterBuilder} from '../../../src/extension-analytics'; import {LinkRewriterManager} from '../../amp-skimlinks/0.1/link-rewriter/link-rewriter-manager'; diff --git a/extensions/amp-smartlinks/0.1/linkmate.js b/extensions/amp-smartlinks/0.1/linkmate.js index 28bd5571266e..fa0f9a90c4f3 100644 --- a/extensions/amp-smartlinks/0.1/linkmate.js +++ b/extensions/amp-smartlinks/0.1/linkmate.js @@ -1,9 +1,10 @@ import {dict} from '#core/types/object'; import {deepEquals} from '#core/types/object/json'; +import {getData} from '#utils/event-helper'; + import {ENDPOINTS} from './constants'; -import {getData} from '../../../src/event-helper'; import {TwoStepsResponse} from '../../amp-skimlinks/0.1/link-rewriter/two-steps-response'; export class Linkmate { diff --git a/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js b/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js index 8c999f75e67f..462eeffc56f8 100644 --- a/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js +++ b/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js @@ -1,4 +1,4 @@ -import * as DocumentReady from '#core/document-ready'; +import * as DocumentReady from '#core/document/ready'; import {Services} from '#service'; diff --git a/extensions/amp-smartlinks/0.1/test/test-linkmate.js b/extensions/amp-smartlinks/0.1/test/test-linkmate.js index 19a2a6ebdf84..55944d36bdc4 100644 --- a/extensions/amp-smartlinks/0.1/test/test-linkmate.js +++ b/extensions/amp-smartlinks/0.1/test/test-linkmate.js @@ -1,4 +1,4 @@ -import * as DocumentReady from '#core/document-ready'; +import * as DocumentReady from '#core/document/ready'; import {Services} from '#service'; diff --git a/extensions/amp-social-share/0.1/amp-social-share.js b/extensions/amp-social-share/0.1/amp-social-share.js index 9e86de0520ce..c830cbc97d41 100644 --- a/extensions/amp-social-share/0.1/amp-social-share.js +++ b/extensions/amp-social-share/0.1/amp-social-share.js @@ -6,10 +6,11 @@ import {parseQueryString} from '#core/types/string/url'; import {Services} from '#service'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {getSocialConfig} from './amp-social-share-config'; import {CSS} from '../../../build/amp-social-share-0.1.css'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {openWindowDialog} from '../../../src/open-window-dialog'; import {addParamsToUrl} from '../../../src/url'; diff --git a/extensions/amp-social-share/1.0/amp-social-share.js b/extensions/amp-social-share/1.0/amp-social-share.js index 84dc128a1003..815be9ce6a29 100644 --- a/extensions/amp-social-share/1.0/amp-social-share.js +++ b/extensions/amp-social-share/1.0/amp-social-share.js @@ -9,11 +9,12 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {getSocialConfig} from './social-share-config'; import {CSS} from '../../../build/amp-social-share-1.0.css'; -import {userAssert} from '../../../src/log'; import {addParamsToUrl} from '../../../src/url'; /** @const {string} */ diff --git a/extensions/amp-soundcloud/0.1/amp-soundcloud.js b/extensions/amp-soundcloud/0.1/amp-soundcloud.js index 64d804dbe2e9..717e69c16cb1 100644 --- a/extensions/amp-soundcloud/0.1/amp-soundcloud.js +++ b/extensions/amp-soundcloud/0.1/amp-soundcloud.js @@ -17,7 +17,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; + import {setIsMediaComponent} from '../../../src/video-interface'; class AmpSoundcloud extends AMP.BaseElement { diff --git a/extensions/amp-soundcloud/1.0/amp-soundcloud.js b/extensions/amp-soundcloud/1.0/amp-soundcloud.js index d1124763cc27..da42b0395d23 100644 --- a/extensions/amp-soundcloud/1.0/amp-soundcloud.js +++ b/extensions/amp-soundcloud/1.0/amp-soundcloud.js @@ -1,8 +1,8 @@ import {isExperimentOn} from '#experiments'; -import {BaseElement} from './base-element'; +import {userAssert} from '#utils/log'; -import {userAssert} from '../../../src/log'; +import {BaseElement} from './base-element'; /** @const {string} */ const TAG = 'amp-soundcloud'; diff --git a/extensions/amp-soundcloud/1.0/component.js b/extensions/amp-soundcloud/1.0/component.js index 5cbd40b45127..96775935cf5c 100644 --- a/extensions/amp-soundcloud/1.0/component.js +++ b/extensions/amp-soundcloud/1.0/component.js @@ -6,7 +6,7 @@ import {useCallback, useEffect, useRef} from '#preact'; import {useValueRef} from '#preact/component'; import {IframeEmbed} from '#preact/component/iframe'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; const MATCHES_MESSAGING_ORIGIN = (origin) => { return origin === 'https://w.soundcloud.com'; diff --git a/extensions/amp-springboard-player/0.1/amp-springboard-player.js b/extensions/amp-springboard-player/0.1/amp-springboard-player.js index fb09aaca8b0b..3a7d7c3b2bf3 100644 --- a/extensions/amp-springboard-player/0.1/amp-springboard-player.js +++ b/extensions/amp-springboard-player/0.1/amp-springboard-player.js @@ -4,7 +4,8 @@ import {PauseHelper} from '#core/dom/video/pause-helper'; import {Services} from '#service'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; + import {setIsMediaComponent} from '../../../src/video-interface'; class AmpSpringboardPlayer extends AMP.BaseElement { diff --git a/extensions/amp-standalone/0.1/amp-standalone.js b/extensions/amp-standalone/0.1/amp-standalone.js index e1eefcf65a96..33b17237b231 100644 --- a/extensions/amp-standalone/0.1/amp-standalone.js +++ b/extensions/amp-standalone/0.1/amp-standalone.js @@ -1,7 +1,8 @@ import {Services} from '#service'; -import {listen} from '../../../src/event-helper'; -import {dev} from '../../../src/log'; +import {listen} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {getWinOrigin} from '../../../src/url'; /** diff --git a/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js b/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js index c45791f2a2b8..40ab43ffa6cb 100644 --- a/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js +++ b/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js @@ -15,8 +15,9 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-sticky-ad-1.0.css'; -import {dev, user, userAssert} from '../../../src/log'; class AmpStickyAd extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-story-360/0.1/amp-story-360.js b/extensions/amp-story-360/0.1/amp-story-360.js index 7f78b2caa77d..97e4d6e4a45d 100644 --- a/extensions/amp-story-360/0.1/amp-story-360.js +++ b/extensions/amp-story-360/0.1/amp-story-360.js @@ -12,11 +12,12 @@ import {htmlFor} from '#core/dom/static-template'; import {Services} from '#service'; import {LocalizedStringId} from '#service/localization/strings'; +import {listenOncePromise} from '#utils/event-helper'; +import {dev, user, userAssert} from '#utils/log'; + import {Matrix, Renderer} from '#third_party/zuho/zuho'; import {CSS} from '../../../build/amp-story-360-0.1.css'; -import {listenOncePromise} from '../../../src/event-helper'; -import {dev, user, userAssert} from '../../../src/log'; import { Action, StateProperty, diff --git a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js index 5836f1e1b056..62d47fdcaf9c 100644 --- a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js +++ b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js @@ -19,6 +19,8 @@ import { import {Services} from '#service'; +import {dev, devAssert, userAssert} from '#utils/log'; + import {getPlacementAlgo} from './algorithm-utils'; import { AnalyticsEvents, @@ -33,7 +35,6 @@ import {CSS} from '../../../build/amp-story-auto-ads-0.1.css'; import {CSS as adBadgeCSS} from '../../../build/amp-story-auto-ads-ad-badge-0.1.css'; import {CSS as progessBarCSS} from '../../../build/amp-story-auto-ads-progress-bar-0.1.css'; import {CSS as sharedCSS} from '../../../build/amp-story-auto-ads-shared-0.1.css'; -import {dev, devAssert, userAssert} from '../../../src/log'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; import { StateProperty, diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js b/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js index ad673228b321..ba5123fcb9ce 100644 --- a/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js +++ b/extensions/amp-story-auto-ads/0.1/story-ad-analytics.js @@ -1,8 +1,8 @@ import {dict} from '#core/types/object'; -import {getUniqueId} from './utils'; +import {triggerAnalyticsEvent} from '#utils/analytics'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; +import {getUniqueId} from './utils'; /** @const {string} */ export const STORY_AD_ANALYTICS = 'story-ad-analytics'; diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-config.js b/extensions/amp-story-auto-ads/0.1/story-ad-config.js index a7d2cef52f15..8413d7b7fc83 100644 --- a/extensions/amp-story-auto-ads/0.1/story-ad-config.js +++ b/extensions/amp-story-auto-ads/0.1/story-ad-config.js @@ -4,7 +4,7 @@ import {parseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-story-auto-ads:config'; diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js b/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js index 303edb435258..30c44328df14 100644 --- a/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js +++ b/extensions/amp-story-auto-ads/0.1/story-ad-page-manager.js @@ -1,5 +1,7 @@ import {findIndex} from '#core/types/array'; +import {devAssert} from '#utils/log'; + import { AnalyticsEvents, AnalyticsVars, @@ -9,7 +11,6 @@ import {ButtonTextFitter} from './story-ad-button-text-fitter'; import {StoryAdLocalization} from './story-ad-localization'; import {StoryAdPage} from './story-ad-page'; -import {devAssert} from '../../../src/log'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; import {getStoreService} from '../../amp-story/1.0/amp-story-store-service'; diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-page.js b/extensions/amp-story-auto-ads/0.1/story-ad-page.js index 938fcdb68217..474afa3e9a21 100644 --- a/extensions/amp-story-auto-ads/0.1/story-ad-page.js +++ b/extensions/amp-story-auto-ads/0.1/story-ad-page.js @@ -19,6 +19,9 @@ import { StoryAdSegmentExp, } from '#experiments/story-ad-progress-segment'; +import {getData, listen} from '#utils/event-helper'; +import {dev, devAssert, userAssert} from '#utils/log'; + import { AnalyticsEvents, AnalyticsVars, @@ -35,10 +38,8 @@ import { } from './story-ad-ui'; import {getFrameDoc, localizeCtaText} from './utils'; -import {getData, listen} from '../../../src/event-helper'; import {Gestures} from '../../../src/gesture'; import {SwipeXRecognizer} from '../../../src/gesture-recognizers'; -import {dev, devAssert, userAssert} from '../../../src/log'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; import {assertConfig} from '../../amp-ad-exit/0.1/config'; import { diff --git a/extensions/amp-story-auto-ads/0.1/story-ad-ui.js b/extensions/amp-story-auto-ads/0.1/story-ad-ui.js index 8be8ceceb28d..9725b6d8d731 100644 --- a/extensions/amp-story-auto-ads/0.1/story-ad-ui.js +++ b/extensions/amp-story-auto-ads/0.1/story-ad-ui.js @@ -4,9 +4,10 @@ import {dict, map} from '#core/types/object'; import {getExperimentBranch} from '#experiments'; import {StoryAdPageOutlink} from '#experiments/story-ad-page-outlink'; +import {dev, user} from '#utils/log'; + import {CSS as attributionCSS} from '../../../build/amp-story-auto-ads-attribution-0.1.css'; import {CSS as ctaButtonCSS} from '../../../build/amp-story-auto-ads-cta-button-0.1.css'; -import {dev, user} from '../../../src/log'; import {openWindowDialog} from '../../../src/open-window-dialog'; import {assertHttpsUrl} from '../../../src/url'; import {createShadowRootWithStyle} from '../../amp-story/1.0/utils'; diff --git a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-analytics.js b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-analytics.js index 135724196ad6..bc47c76ef052 100644 --- a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-analytics.js +++ b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-analytics.js @@ -1,4 +1,5 @@ -import * as analyticsApi from '../../../../src/analytics'; +import * as analyticsApi from '#utils/analytics'; + import { AnalyticsEvents, AnalyticsVars, diff --git a/extensions/amp-story-auto-analytics/0.1/amp-story-auto-analytics.js b/extensions/amp-story-auto-analytics/0.1/amp-story-auto-analytics.js index 728c6254c262..a1ff3a1dd30a 100644 --- a/extensions/amp-story-auto-analytics/0.1/amp-story-auto-analytics.js +++ b/extensions/amp-story-auto-analytics/0.1/amp-story-auto-analytics.js @@ -2,9 +2,9 @@ import {htmlFor} from '#core/dom/static-template'; import {Services} from '#service'; -import {buildGtagConfig} from './auto-analytics-configs'; +import {devAssert} from '#utils/log'; -import {devAssert} from '../../../src/log'; +import {buildGtagConfig} from './auto-analytics-configs'; const buildAutoAnalyticsTemplate = (element) => { const html = htmlFor(element); diff --git a/extensions/amp-story-captions/0.1/amp-story-captions.js b/extensions/amp-story-captions/0.1/amp-story-captions.js index 329ac9edcbbd..d479165b4197 100644 --- a/extensions/amp-story-captions/0.1/amp-story-captions.js +++ b/extensions/amp-story-captions/0.1/amp-story-captions.js @@ -1,10 +1,11 @@ import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {toArray} from '#core/types/array'; +import {listen} from '#utils/event-helper'; + import {TrackRenderer} from './track-renderer'; import {CSS} from '../../../build/amp-story-captions-0.1.css'; -import {listen} from '../../../src/event-helper'; export class AmpStoryCaptions extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-story-captions/0.1/track-renderer.js b/extensions/amp-story-captions/0.1/track-renderer.js index f6045121aaa3..a65b6ff46256 100644 --- a/extensions/amp-story-captions/0.1/track-renderer.js +++ b/extensions/amp-story-captions/0.1/track-renderer.js @@ -2,7 +2,7 @@ import {removeChildren, removeElement} from '#core/dom'; import {setStyles} from '#core/dom/style'; import {toArray} from '#core/types/array'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; // Class used for sections of text in the future (for ASR-style captions). const FUTURE_CUE_SECTION_CLASS = 'amp-story-captions-future'; 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 9cfc2b9b8c77..c7216476e826 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 @@ -3,8 +3,9 @@ import {htmlFor} from '#core/dom/static-template'; import {Services} from '#service'; +import {user, userAssert} from '#utils/log'; + import {urls} from '../../../src/config'; -import {user, userAssert} from '../../../src/log'; import {loadScript} from '../../../src/validator-integration'; /** diff --git a/extensions/amp-story-education/0.1/amp-story-education.js b/extensions/amp-story-education/0.1/amp-story-education.js index 2694b8f1dfc9..b924f92ff8bc 100644 --- a/extensions/amp-story-education/0.1/amp-story-education.js +++ b/extensions/amp-story-education/0.1/amp-story-education.js @@ -8,8 +8,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {LocalizedStringId} from '#service/localization/strings'; +import {dev} from '#utils/log'; + import {CSS} from '../../../build/amp-story-education-0.1.css'; -import {dev} from '../../../src/log'; import {getLocalizationService} from '../../amp-story/1.0/amp-story-localization-service'; import { Action, diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js index 05e1c65e46ea..f824dbca1a98 100644 --- a/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js +++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-abstract.js @@ -27,7 +27,7 @@ import { maybeMakeProxyUrl, } from '../../amp-story/1.0/utils'; import {deduplicateInteractiveIds} from './utils'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {emojiConfetti} from './interactive-confetti'; import {toArray} from '#core/types/array'; diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js index 981c72b10e6a..aee074538cec 100644 --- a/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js +++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-binary-poll.js @@ -4,7 +4,7 @@ import { } from './amp-story-interactive-abstract'; import {CSS} from '../../../build/amp-story-interactive-binary-poll-0.1.css'; import {computedStyle, setStyle} from '#core/dom/style'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {htmlFor} from '#core/dom/static-template'; import {toArray} from '#core/types/array'; diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js index b198b183452a..1d9aa9889959 100644 --- a/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js +++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-img-quiz.js @@ -6,7 +6,7 @@ import {CSS} from '../../../build/amp-story-interactive-img-quiz-0.1.css'; import {CSS as ImgCSS} from '../../../build/amp-story-interactive-img-0.1.css'; import {LocalizedStringId} from '#service/localization/strings'; import {buildImgTemplate} from './utils'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import { getRGBFromCssColorValue, getTextColorForRGB, diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js index dba0083ec7a3..24774e6a0161 100644 --- a/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js +++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-poll.js @@ -4,7 +4,7 @@ import { } from './amp-story-interactive-abstract'; import {CSS} from '../../../build/amp-story-interactive-poll-0.1.css'; import {computedStyle, setStyle} from '#core/dom/style'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {htmlFor} from '#core/dom/static-template'; import {toArray} from '#core/types/array'; diff --git a/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js b/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js index f734a2d84b03..b67dad164732 100644 --- a/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js +++ b/extensions/amp-story-interactive/0.1/amp-story-interactive-results.js @@ -5,7 +5,7 @@ import { import {CSS} from '../../../build/amp-story-interactive-results-0.1.css'; import {StateProperty} from '../../amp-story/1.0/amp-story-store-service'; import {computedStyle, setStyle} from '#core/dom/style'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {htmlFor} from '#core/dom/static-template'; /** diff --git a/extensions/amp-story-interactive/0.1/utils.js b/extensions/amp-story-interactive/0.1/utils.js index 8bafed7c3544..d7bdeea01af4 100644 --- a/extensions/amp-story-interactive/0.1/utils.js +++ b/extensions/amp-story-interactive/0.1/utils.js @@ -1,6 +1,6 @@ import {htmlFor} from '#core/dom/static-template'; import {map} from '#core/types/object'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @private Whether ids are deduplicated or not */ let deduplicatedIds = false; diff --git a/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js b/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js index 8a0219e584e5..0c062aedcb75 100644 --- a/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js +++ b/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js @@ -8,8 +8,9 @@ import {deepEquals} from '#core/types/object/json'; import {Services} from '#service'; +import {dev, user} from '#utils/log'; + import {CSS} from '../../../build/amp-story-panning-media-0.1.css'; -import {dev, user} from '../../../src/log'; import { Action, StateProperty, diff --git a/extensions/amp-story/1.0/amp-story-access.js b/extensions/amp-story/1.0/amp-story-access.js index 9fbe81a20f52..5ca3182d808a 100644 --- a/extensions/amp-story/1.0/amp-story-access.js +++ b/extensions/amp-story/1.0/amp-story-access.js @@ -6,7 +6,7 @@ import { import {Layout} from '#core/dom/layout'; import {closest} from '#core/dom/query'; import {copyChildren, removeChildren} from '#core/dom'; -import {dev, user} from '../../../src/log'; +import {dev, user} from '#utils/log'; import {getStoryAttributeSrc} from './utils'; import {htmlFor} from '#core/dom/static-template'; import {isArray, isObject} from '#core/types'; diff --git a/extensions/amp-story/1.0/amp-story-consent.js b/extensions/amp-story/1.0/amp-story-consent.js index b9ee72c17678..e5282580891d 100644 --- a/extensions/amp-story/1.0/amp-story-consent.js +++ b/extensions/amp-story/1.0/amp-story-consent.js @@ -22,7 +22,7 @@ import { getTextColorForRGB, triggerClickFromLightDom, } from './utils'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {isArray} from '#core/types'; import {isJsonScriptTag} from '#core/dom'; diff --git a/extensions/amp-story/1.0/amp-story-cta-layer.js b/extensions/amp-story/1.0/amp-story-cta-layer.js index 50be17f77250..fcdc9227228d 100644 --- a/extensions/amp-story/1.0/amp-story-cta-layer.js +++ b/extensions/amp-story/1.0/amp-story-cta-layer.js @@ -17,7 +17,7 @@ import {AmpStoryBaseLayer} from './amp-story-base-layer'; import {addAttributesToElement, removeElement} from '#core/dom'; import {dict} from '#core/types/object'; import {matches} from '#core/dom/query'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** * @type {string} diff --git a/extensions/amp-story/1.0/amp-story-draggable-drawer.js b/extensions/amp-story/1.0/amp-story-draggable-drawer.js index 4b7481726ade..50d475552402 100644 --- a/extensions/amp-story/1.0/amp-story-draggable-drawer.js +++ b/extensions/amp-story/1.0/amp-story-draggable-drawer.js @@ -10,11 +10,11 @@ import {LocalizedStringId} from '#service/localization/strings'; import {Services} from '#service'; import {closest} from '#core/dom/query'; import {createShadowRootWithStyle} from './utils'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {getLocalizationService} from './amp-story-localization-service'; import {htmlFor} from '#core/dom/static-template'; import {isAmpElement} from '#core/dom/amp-element-helpers'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; import {resetStyles, setImportantStyles, toggle} from '#core/dom/style'; /** @const {number} */ diff --git a/extensions/amp-story/1.0/amp-story-embedded-component.js b/extensions/amp-story/1.0/amp-story-embedded-component.js index b411a94e02a0..d7ada1ce54d2 100644 --- a/extensions/amp-story/1.0/amp-story-embedded-component.js +++ b/extensions/amp-story/1.0/amp-story-embedded-component.js @@ -23,7 +23,7 @@ import { getSourceOriginForElement, triggerClickFromLightDom, } from './utils'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {dev, devAssert, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getAmpdoc} from '../../../src/service-helpers'; import {getLocalizationService} from './amp-story-localization-service'; diff --git a/extensions/amp-story/1.0/amp-story-form.js b/extensions/amp-story/1.0/amp-story-form.js index 572ea88e12de..955659f62a0d 100644 --- a/extensions/amp-story/1.0/amp-story-form.js +++ b/extensions/amp-story/1.0/amp-story-form.js @@ -1,7 +1,7 @@ import {Action, getStoreService} from './amp-story-store-service'; import {LoadingSpinner} from './loading-spinner'; import {LocalizedStringId} from '#service/localization/strings'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; import {getLocalizationService} from './amp-story-localization-service'; import {htmlFor} from '#core/dom/static-template'; diff --git a/extensions/amp-story/1.0/amp-story-info-dialog.js b/extensions/amp-story/1.0/amp-story-info-dialog.js index d1c33fd9b952..1f259073f845 100644 --- a/extensions/amp-story/1.0/amp-story-info-dialog.js +++ b/extensions/amp-story/1.0/amp-story-info-dialog.js @@ -14,7 +14,7 @@ import {Services} from '#service'; import {assertAbsoluteHttpOrHttpsUrl} from '../../../src/url'; import {closest, matches} from '#core/dom/query'; import {createShadowRootWithStyle, triggerClickFromLightDom} from './utils'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {getAmpdoc} from '../../../src/service-helpers'; import {getLocalizationService} from './amp-story-localization-service'; import {htmlFor} from '#core/dom/static-template'; diff --git a/extensions/amp-story/1.0/amp-story-media-query-service.js b/extensions/amp-story/1.0/amp-story-media-query-service.js index f550664fb201..db464ce4a140 100644 --- a/extensions/amp-story/1.0/amp-story-media-query-service.js +++ b/extensions/amp-story/1.0/amp-story-media-query-service.js @@ -1,5 +1,5 @@ import {Services} from '#service'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {registerServiceBuilder} from '../../../src/service-helpers'; /** diff --git a/extensions/amp-story/1.0/amp-story-open-page-attachment.js b/extensions/amp-story/1.0/amp-story-open-page-attachment.js index f4a531c70c83..6ae9a2d948cf 100644 --- a/extensions/amp-story/1.0/amp-story-open-page-attachment.js +++ b/extensions/amp-story/1.0/amp-story-open-page-attachment.js @@ -4,7 +4,7 @@ import {AttachmentTheme} from './amp-story-page-attachment'; import {LocalizedStringId} from '#service/localization/strings'; import {computedStyle, setImportantStyles} from '#core/dom/style'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {getLocalizationService} from './amp-story-localization-service'; import { getRGBFromCssColorValue, diff --git a/extensions/amp-story/1.0/amp-story-page-attachment.js b/extensions/amp-story/1.0/amp-story-page-attachment.js index 641c4100ac6e..2d8abd8426f3 100644 --- a/extensions/amp-story/1.0/amp-story-page-attachment.js +++ b/extensions/amp-story/1.0/amp-story-page-attachment.js @@ -6,7 +6,7 @@ import {Services} from '#service'; import {StoryAnalyticsEvent, getAnalyticsService} from './story-analytics'; import {buildOutlinkLinkIconElement} from './amp-story-open-page-attachment'; import {closest} from '#core/dom/query'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {getHistoryState} from '#core/window/history'; import {getLocalizationService} from './amp-story-localization-service'; import {getSourceOrigin} from '../../../src/url'; diff --git a/extensions/amp-story/1.0/amp-story-page.js b/extensions/amp-story/1.0/amp-story-page.js index 97e3c361658b..0036ad300dc2 100644 --- a/extensions/amp-story/1.0/amp-story-page.js +++ b/extensions/amp-story/1.0/amp-story-page.js @@ -45,7 +45,7 @@ import { } from '#core/dom/query'; import {createShadowRootWithStyle, setTextBackgroundColor} from './utils'; import {debounce} from '#core/types/function'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {dict} from '#core/types/object'; import {getAmpdoc} from '../../../src/service-helpers'; import {getFriendlyIframeEmbedOptional} from '../../../src/iframe-helper'; @@ -56,7 +56,7 @@ import {getMode} from '../../../src/mode'; import {htmlFor} from '#core/dom/static-template'; import {isExperimentOn} from '#experiments'; import {isPrerenderActivePage} from './prerender-active-page'; -import {listen, listenOnce} from '../../../src/event-helper'; +import {listen, listenOnce} from '#utils/event-helper'; import {CSS as pageAttachmentCSS} from '../../../build/amp-story-open-page-attachment-0.1.css'; import {propagateAttributes} from '#core/dom/propagate-attributes'; import {toggle} from '#core/dom/style'; diff --git a/extensions/amp-story/1.0/amp-story-request-service.js b/extensions/amp-story/1.0/amp-story-request-service.js index 65ecf663f549..324ad90fbfd3 100644 --- a/extensions/amp-story/1.0/amp-story-request-service.js +++ b/extensions/amp-story/1.0/amp-story-request-service.js @@ -3,7 +3,7 @@ import {getChildJsonConfig} from '#core/dom'; import {isProtocolValid} from '../../../src/url'; import {once} from '#core/types/function'; import {registerServiceBuilder} from '../../../src/service-helpers'; -import {user, userAssert} from '../../../src/log'; +import {user, userAssert} from '#utils/log'; /** @private @const {string} */ export const CONFIG_SRC_ATTRIBUTE_NAME = 'src'; diff --git a/extensions/amp-story/1.0/amp-story-share-menu.js b/extensions/amp-story/1.0/amp-story-share-menu.js index 4629460f370d..afb6ae0c8181 100644 --- a/extensions/amp-story/1.0/amp-story-share-menu.js +++ b/extensions/amp-story/1.0/amp-story-share-menu.js @@ -16,7 +16,7 @@ import {Services} from '#service'; import {ShareWidget} from './amp-story-share'; import {closest} from '#core/dom/query'; import {createShadowRootWithStyle} from './utils'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {getAmpdoc} from '../../../src/service-helpers'; import {getLocalizationService} from './amp-story-localization-service'; import {htmlFor} from '#core/dom/static-template'; diff --git a/extensions/amp-story/1.0/amp-story-share.js b/extensions/amp-story/1.0/amp-story-share.js index 52f05efbde21..94c5ba07f7fe 100644 --- a/extensions/amp-story/1.0/amp-story-share.js +++ b/extensions/amp-story/1.0/amp-story-share.js @@ -5,12 +5,12 @@ import { copyTextToClipboard, isCopyingToClipboardSupported, } from '#core/window/clipboard'; -import {dev, devAssert, user} from '../../../src/log'; +import {dev, devAssert, user} from '#utils/log'; import {dict, map} from '#core/types/object'; import {getLocalizationService} from './amp-story-localization-service'; import {getRequestService} from './amp-story-request-service'; import {isObject} from '#core/types'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; import {renderAsElement, renderSimpleTemplate} from './simple-template'; /** diff --git a/extensions/amp-story/1.0/amp-story-store-service.js b/extensions/amp-story/1.0/amp-story-store-service.js index 5e4e176ae079..21012e29882e 100644 --- a/extensions/amp-story/1.0/amp-story-store-service.js +++ b/extensions/amp-story/1.0/amp-story-store-service.js @@ -2,7 +2,7 @@ import {EmbedMode, parseEmbedMode} from './embed-mode'; import {Observable} from '#core/data-structures/observable'; import {Services} from '#service'; import {deepEquals} from '#core/types/object/json'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {hasOwn} from '#core/types/object'; import {registerServiceBuilder} from '../../../src/service-helpers'; diff --git a/extensions/amp-story/1.0/amp-story-system-layer.js b/extensions/amp-story/1.0/amp-story-system-layer.js index ab75c1427027..c1a80a3f1df4 100644 --- a/extensions/amp-story/1.0/amp-story-system-layer.js +++ b/extensions/amp-story/1.0/amp-story-system-layer.js @@ -21,7 +21,7 @@ import { shouldShowStoryUrlInfo, triggerClickFromLightDom, } from './utils'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {dict} from '#core/types/object'; import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; import {getMode} from '../../../src/mode'; diff --git a/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js b/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js index 3055fc06efcb..b9f7e150f3bc 100644 --- a/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js +++ b/extensions/amp-story/1.0/amp-story-viewer-messaging-handler.js @@ -4,7 +4,7 @@ import { getStoreService, } from './amp-story-store-service'; import {AnalyticsVariable, getVariableService} from './variable-service'; -import {dev, user} from '../../../src/log'; +import {dev, user} from '#utils/log'; import {dict} from '#core/types/object'; /** @type {string} */ diff --git a/extensions/amp-story/1.0/amp-story.js b/extensions/amp-story/1.0/amp-story.js index 4c4ef438abd9..47bf72e81ced 100644 --- a/extensions/amp-story/1.0/amp-story.js +++ b/extensions/amp-story/1.0/amp-story.js @@ -70,13 +70,13 @@ import { import {computedStyle, setImportantStyles, toggle} from '#core/dom/style'; import {createPseudoLocale} from '#service/localization/strings'; import {debounce} from '#core/types/function'; -import {dev, devAssert, user} from '../../../src/log'; +import {dev, devAssert, user} from '#utils/log'; import {dict, map} from '#core/types/object'; import {endsWith} from '#core/types/string'; import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; import {findIndex, lastItem, toArray} from '#core/types/array'; import {getConsentPolicyState} from '../../../src/consent'; -import {getDetail} from '../../../src/event-helper'; +import {getDetail} from '#utils/event-helper'; import {getLocalizationService} from './amp-story-localization-service'; import {getMediaQueryService} from './amp-story-media-query-service'; import {getMode, isModeDevelopment} from '../../../src/mode'; diff --git a/extensions/amp-story/1.0/animation-presets.js b/extensions/amp-story/1.0/animation-presets.js index a75afd658998..f4631e1d8103 100644 --- a/extensions/amp-story/1.0/animation-presets.js +++ b/extensions/amp-story/1.0/animation-presets.js @@ -7,7 +7,7 @@ import { whooshIn, } from './animation-presets-utils'; import {px} from '#core/dom/style'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const FULL_BLEED_CATEGORY = 'full-bleed'; diff --git a/extensions/amp-story/1.0/animation.js b/extensions/amp-story/1.0/animation.js index 57cfec7c9102..00d0534f2d63 100644 --- a/extensions/amp-story/1.0/animation.js +++ b/extensions/amp-story/1.0/animation.js @@ -17,7 +17,7 @@ import { WebKeyframesDef, } from './animation-types'; import {assertDoesNotContainDisplay, setStyles} from '#core/dom/style'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {dev, devAssert, user, userAssert} from '#utils/log'; import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; import {getChildJsonConfig} from '#core/dom'; import {map, omit} from '#core/types/object'; diff --git a/extensions/amp-story/1.0/background-blur.js b/extensions/amp-story/1.0/background-blur.js index f15c898918f6..43a7dfc60de1 100644 --- a/extensions/amp-story/1.0/background-blur.js +++ b/extensions/amp-story/1.0/background-blur.js @@ -1,7 +1,7 @@ import {CommonSignals} from '#core/constants/common-signals'; import {scopedQuerySelectorAll} from '#core/dom/query'; import {setImportantStyles} from '#core/dom/style'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers'; /** @const {number} */ diff --git a/extensions/amp-story/1.0/development-ui.js b/extensions/amp-story/1.0/development-ui.js index 7fefd5ce8800..91396ce52c85 100644 --- a/extensions/amp-story/1.0/development-ui.js +++ b/extensions/amp-story/1.0/development-ui.js @@ -1,4 +1,4 @@ -import {LogLevel, dev} from '../../../src/log'; +import {LogLevel, dev} from '#utils/log'; import {Services} from '#service'; import {isArray} from '#core/types'; import {removeChildren} from '#core/dom'; diff --git a/extensions/amp-story/1.0/events.js b/extensions/amp-story/1.0/events.js index 1e818a27c26d..230e3ab8eda1 100644 --- a/extensions/amp-story/1.0/events.js +++ b/extensions/amp-story/1.0/events.js @@ -1,4 +1,4 @@ -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; /** @const {!Object} */ export const EventType = { diff --git a/extensions/amp-story/1.0/jsonld.js b/extensions/amp-story/1.0/jsonld.js index e631ac12e220..c16ea663d852 100644 --- a/extensions/amp-story/1.0/jsonld.js +++ b/extensions/amp-story/1.0/jsonld.js @@ -1,6 +1,6 @@ import {isJsonLdScriptTag} from '#core/dom'; import {tryParseJson} from '#core/types/object/json'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; const TAG = 'getJsonLd'; diff --git a/extensions/amp-story/1.0/live-story-manager.js b/extensions/amp-story/1.0/live-story-manager.js index 3398f90e0e6b..7273323d99cd 100644 --- a/extensions/amp-story/1.0/live-story-manager.js +++ b/extensions/amp-story/1.0/live-story-manager.js @@ -4,7 +4,7 @@ import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; import {dict} from '#core/types/object'; import {lastChildElement} from '#core/dom/query'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** * Property used for storing id of custom slot. This custom slot can be used to diff --git a/extensions/amp-story/1.0/loading-spinner.js b/extensions/amp-story/1.0/loading-spinner.js index b230e522edef..cf00320ba8b8 100644 --- a/extensions/amp-story/1.0/loading-spinner.js +++ b/extensions/amp-story/1.0/loading-spinner.js @@ -1,4 +1,4 @@ -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {dict} from '#core/types/object'; import {renderAsElement} from './simple-template'; diff --git a/extensions/amp-story/1.0/logging.js b/extensions/amp-story/1.0/logging.js index 61c9b015bd75..94e33346964b 100644 --- a/extensions/amp-story/1.0/logging.js +++ b/extensions/amp-story/1.0/logging.js @@ -1,4 +1,4 @@ -import {LogLevel, devAssert} from '../../../src/log'; +import {LogLevel, devAssert} from '#utils/log'; import {scopedQuerySelectorAll} from '#core/dom/query'; import {tryResolve} from '#core/data-structures/promise'; diff --git a/extensions/amp-story/1.0/media-performance-metrics-service.js b/extensions/amp-story/1.0/media-performance-metrics-service.js index f7571fb3ef32..adc9b3a7d654 100644 --- a/extensions/amp-story/1.0/media-performance-metrics-service.js +++ b/extensions/amp-story/1.0/media-performance-metrics-service.js @@ -1,10 +1,7 @@ -import { - MEDIA_LOAD_FAILURE_SRC_PROPERTY, - listen, -} from '../../../src/event-helper'; +import {MEDIA_LOAD_FAILURE_SRC_PROPERTY, listen} from '#utils/event-helper'; import {Services} from '#service'; import {TickLabel} from '#core/constants/enums'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {lastChildElement, matches} from '#core/dom/query'; import {registerServiceBuilder} from '../../../src/service-helpers'; import {toArray} from '#core/types/array'; diff --git a/extensions/amp-story/1.0/media-pool.js b/extensions/amp-story/1.0/media-pool.js index 615429fca16e..efdd550ffb6e 100644 --- a/extensions/amp-story/1.0/media-pool.js +++ b/extensions/amp-story/1.0/media-pool.js @@ -11,11 +11,11 @@ import { UnmuteTask, UpdateSourcesTask, } from './media-tasks'; -import {MEDIA_LOAD_FAILURE_SRC_PROPERTY} from '../../../src/event-helper'; +import {MEDIA_LOAD_FAILURE_SRC_PROPERTY} from '#utils/event-helper'; import {Services} from '#service'; import {Sources} from './sources'; import {ampMediaElementFor} from './utils'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {findIndex} from '#core/types/array'; import {isConnectedNode} from '#core/dom'; import {matches} from '#core/dom/query'; diff --git a/extensions/amp-story/1.0/page-advancement.js b/extensions/amp-story/1.0/page-advancement.js index 0509075a9e94..3ee816735c42 100644 --- a/extensions/amp-story/1.0/page-advancement.js +++ b/extensions/amp-story/1.0/page-advancement.js @@ -12,12 +12,12 @@ import {Services} from '#service'; import {TAPPABLE_ARIA_ROLES} from '#service/action-impl'; import {VideoEvents} from '../../../src/video-interface'; import {closest, matches} from '#core/dom/query'; -import {dev, user} from '../../../src/log'; +import {dev, user} from '#utils/log'; import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; import {getAmpdoc} from '../../../src/service-helpers'; import {hasTapAction, timeStrToMillis} from './utils'; import {interactiveElementsSelectors} from './amp-story-embedded-component'; -import {listenOnce} from '../../../src/event-helper'; +import {listenOnce} from '#utils/event-helper'; /** @private @const {number} */ const HOLD_TOUCH_THRESHOLD_MS = 500; diff --git a/extensions/amp-story/1.0/pagination-buttons.js b/extensions/amp-story/1.0/pagination-buttons.js index 6511f40e3f00..e3ba3469a4a3 100644 --- a/extensions/amp-story/1.0/pagination-buttons.js +++ b/extensions/amp-story/1.0/pagination-buttons.js @@ -7,7 +7,7 @@ import {AdvancementMode} from './story-analytics'; import {EventType, dispatch} from './events'; import {LocalizedStringId} from '#service/localization/strings'; import {Services} from '#service'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {getLocalizationService} from './amp-story-localization-service'; import {htmlFor} from '#core/dom/static-template'; diff --git a/extensions/amp-story/1.0/progress-bar.js b/extensions/amp-story/1.0/progress-bar.js index 59cf73fac649..8f11429fcc4a 100644 --- a/extensions/amp-story/1.0/progress-bar.js +++ b/extensions/amp-story/1.0/progress-bar.js @@ -11,7 +11,7 @@ import { getStoreService, } from './amp-story-store-service'; import {debounce} from '#core/types/function'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {escapeCssSelectorNth} from '#core/dom/css-selectors'; import {getExperimentBranch} from 'src/experiments'; import {hasOwn, map} from '#core/types/object'; diff --git a/extensions/amp-story/1.0/semantic-render.js b/extensions/amp-story/1.0/semantic-render.js index 6a0a44284e9a..0dbe2ba981d1 100644 --- a/extensions/amp-story/1.0/semantic-render.js +++ b/extensions/amp-story/1.0/semantic-render.js @@ -1,6 +1,6 @@ import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; import {dict} from '#core/types/object'; import {includes} from '#core/types/string'; diff --git a/extensions/amp-story/1.0/simple-template.js b/extensions/amp-story/1.0/simple-template.js index 844f888e9759..0480ab124a91 100644 --- a/extensions/amp-story/1.0/simple-template.js +++ b/extensions/amp-story/1.0/simple-template.js @@ -1,6 +1,6 @@ import {LocalizedStringId} from '#service/localization/strings'; // eslint-disable-line no-unused-vars import {createElementWithAttributes} from '#core/dom'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; import {getLocalizationService} from './amp-story-localization-service'; import {hasOwn} from '#core/types/object'; import {isArray} from '#core/types'; diff --git a/extensions/amp-story/1.0/story-analytics.js b/extensions/amp-story/1.0/story-analytics.js index 4588d2f6c710..2ed62cd57dbf 100644 --- a/extensions/amp-story/1.0/story-analytics.js +++ b/extensions/amp-story/1.0/story-analytics.js @@ -4,7 +4,7 @@ import {getDataParamsFromAttributes} from '#core/dom'; import {getVariableService} from './variable-service'; import {map} from '#core/types/object'; import {registerServiceBuilder} from '../../../src/service-helpers'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; +import {triggerAnalyticsEvent} from '#utils/analytics'; /** @const {string} */ export const ANALYTICS_TAG_NAME = '__AMP_ANALYTICS_TAG_NAME__'; diff --git a/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js b/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js index cfe8af623102..7c23d9ff00c6 100644 --- a/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js +++ b/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js @@ -1,4 +1,4 @@ -import * as analyticsApi from '../../../../src/analytics'; +import * as analyticsApi from '#utils/analytics'; import { Action, EmbeddedComponentState, diff --git a/extensions/amp-story/1.0/test/test-history.js b/extensions/amp-story/1.0/test/test-history.js index b03701e02227..3b5a0c814d36 100644 --- a/extensions/amp-story/1.0/test/test-history.js +++ b/extensions/amp-story/1.0/test/test-history.js @@ -1,5 +1,5 @@ import {LOCAL_STORAGE_KEY, getHistoryState, setHistoryState} from '../history'; -import {loadPromise} from '../../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; import {removeElement} from '#core/dom'; describes.realWin('amp-story history', {}, (env) => { diff --git a/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js b/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js index ca2e73913f00..b8aeb328d981 100644 --- a/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js +++ b/extensions/amp-story/1.0/test/test-media-performance-metrics-service.js @@ -1,5 +1,5 @@ import * as fakeTimers from '@sinonjs/fake-timers'; -import {MEDIA_LOAD_FAILURE_SRC_PROPERTY} from '../../../../src/event-helper'; +import {MEDIA_LOAD_FAILURE_SRC_PROPERTY} from '#utils/event-helper'; import {MediaPerformanceMetricsService} from '../media-performance-metrics-service'; import {Services} from '#service'; diff --git a/extensions/amp-story/1.0/test/test-story-analytics.js b/extensions/amp-story/1.0/test/test-story-analytics.js index 56c7ad0cf1c7..50de8cb438a7 100644 --- a/extensions/amp-story/1.0/test/test-story-analytics.js +++ b/extensions/amp-story/1.0/test/test-story-analytics.js @@ -1,4 +1,4 @@ -import * as analytics from '../../../../src/analytics'; +import * as analytics from '#utils/analytics'; import {Action, getStoreService} from '../amp-story-store-service'; import {StoryAnalyticsService} from '../story-analytics'; diff --git a/extensions/amp-story/1.0/utils.js b/extensions/amp-story/1.0/utils.js index 7b132d38fd71..a12620f188f7 100644 --- a/extensions/amp-story/1.0/utils.js +++ b/extensions/amp-story/1.0/utils.js @@ -11,7 +11,7 @@ import { scopedQuerySelectorAll, } from '#core/dom/query'; import {createShadowRoot} from '../../../src/shadow-embed'; -import {dev, user, userAssert} from '../../../src/log'; +import {dev, user, userAssert} from '#utils/log'; import {getMode} from '../../../src/mode'; import {setStyle, toggle} from '#core/dom/style'; diff --git a/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js b/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js index f0ee952a8776..5a30ad87cfec 100644 --- a/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js +++ b/extensions/amp-stream-gallery/0.1/amp-stream-gallery.js @@ -9,8 +9,8 @@ import { getResponsiveAttributeValue, } from '../../amp-base-carousel/0.1/responsive-attributes'; import {Services} from '#service'; -import {createCustomEvent, getDetail} from '../../../src/event-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {createCustomEvent, getDetail} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import { dispatchCustomEvent, diff --git a/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js b/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js index 11dcbf225c90..c9ae9284c976 100644 --- a/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js +++ b/extensions/amp-stream-gallery/0.1/test/test-amp-stream-gallery.js @@ -1,6 +1,6 @@ import '../amp-stream-gallery'; import {CarouselEvents} from '../../../amp-base-carousel/0.1/carousel-events'; -import {getDetail, listenOncePromise} from '../../../../src/event-helper'; +import {getDetail, listenOncePromise} from '#utils/event-helper'; import {setStyle, setStyles} from '#core/dom/style'; import {toArray} from '#core/types/array'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js b/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js index d27c223ea4fb..f2f0af88f7e2 100644 --- a/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js +++ b/extensions/amp-stream-gallery/1.0/amp-stream-gallery.js @@ -2,10 +2,10 @@ import {ActionTrust} from '#core/constants/action-constants'; import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-stream-gallery-1.0.css'; import {Services} from '#service'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {isExperimentOn} from '#experiments'; import {toWin} from '#core/window'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-stream-gallery'; diff --git a/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js b/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js index bc2bd3c9e8cd..f4dc42422bf8 100644 --- a/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js +++ b/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js @@ -6,6 +6,9 @@ import {experimentToggles, isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {getData} from '#utils/event-helper'; +import {devAssert, user, userAssert} from '#utils/log'; + import { AnalyticsEvent, ConfiguredRuntime, @@ -17,8 +20,6 @@ import { import {GaaMeteringRegwall} from '#third_party/subscriptions-project/swg-gaa'; import {CSS} from '../../../build/amp-subscriptions-google-0.1.css'; -import {getData} from '../../../src/event-helper'; -import {devAssert, user, userAssert} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {installStylesForDoc} from '../../../src/style-installer'; import {assertHttpsUrl, parseUrlDeprecated} from '../../../src/url'; diff --git a/extensions/amp-subscriptions/0.1/actions.js b/extensions/amp-subscriptions/0.1/actions.js index deb4bcec7391..4f5ba7c0454f 100644 --- a/extensions/amp-subscriptions/0.1/actions.js +++ b/extensions/amp-subscriptions/0.1/actions.js @@ -1,6 +1,6 @@ import {ActionStatus} from './analytics'; import {assertHttpsUrl} from '../../../src/url'; -import {dev, userAssert} from '../../../src/log'; +import {dev, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {openLoginDialog} from '../../amp-access/0.1/login-dialog'; import {parseQueryString} from '#core/types/string/url'; diff --git a/extensions/amp-subscriptions/0.1/amp-subscriptions.js b/extensions/amp-subscriptions/0.1/amp-subscriptions.js index 2f7517f5cdf3..2bc9557188a5 100644 --- a/extensions/amp-subscriptions/0.1/amp-subscriptions.js +++ b/extensions/amp-subscriptions/0.1/amp-subscriptions.js @@ -21,12 +21,12 @@ import {Services} from '#service'; import {SubscriptionPlatform as SubscriptionPlatformInterface} from './subscription-platform'; import {ViewerSubscriptionPlatform} from './viewer-subscription-platform'; import {ViewerTracker} from './viewer-tracker'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; +import {dev, devAssert, user, userAssert} from '#utils/log'; import {dict, getValueForExpr} from '#core/types/object'; import {getMode} from '../../../src/mode'; import {getWinOrigin} from '../../../src/url'; import {installStylesForDoc} from '../../../src/style-installer'; -import {isStoryDocument} from '../../../src/utils/story'; +import {isStoryDocument} from '#utils/story'; import {localSubscriptionPlatformFactory} from './local-subscription-platform'; import {tryParseJson} from '#core/types/object/json'; diff --git a/extensions/amp-subscriptions/0.1/analytics.js b/extensions/amp-subscriptions/0.1/analytics.js index 565ceaf0ef7b..a8c10bd1baa3 100644 --- a/extensions/amp-subscriptions/0.1/analytics.js +++ b/extensions/amp-subscriptions/0.1/analytics.js @@ -1,6 +1,6 @@ import {dict} from '#core/types/object'; -import {triggerAnalyticsEvent} from '../../../src/analytics'; -import {user} from '../../../src/log'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {user} from '#utils/log'; const TAG = 'amp-subscriptions'; diff --git a/extensions/amp-subscriptions/0.1/doc-impl.js b/extensions/amp-subscriptions/0.1/doc-impl.js index bfcc0e8f1245..6303cad7bd1d 100644 --- a/extensions/amp-subscriptions/0.1/doc-impl.js +++ b/extensions/amp-subscriptions/0.1/doc-impl.js @@ -1,6 +1,6 @@ import {Doc} from '#third_party/subscriptions-project/config'; import {Services} from '#service'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; /** * Adopts config document to ampdoc. diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js index 019b1b375bcd..20a0f53b7459 100644 --- a/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js +++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js @@ -3,7 +3,7 @@ import {Actions} from './actions'; import {LocalSubscriptionPlatformRenderer} from './local-subscription-platform-renderer'; import {UrlBuilder} from './url-builder'; import {closestAncestorElementBySelector} from '#core/dom/query'; -import {dev, userAssert} from '../../../src/log'; +import {dev, userAssert} from '#utils/log'; /** * Surrogate property added to click events marking them as handled by the diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js index 04108f1a0fda..3a5401cc7ea6 100644 --- a/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js +++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js @@ -3,7 +3,7 @@ import {Entitlement} from './entitlement'; import {LocalSubscriptionBasePlatform} from './local-subscription-platform-base'; import {Messenger} from '../../amp-access/0.1/iframe-api/messenger'; import {assertHttpsUrl, parseUrlDeprecated} from '../../../src/url'; -import {devAssert, userAssert} from '../../../src/log'; +import {devAssert, userAssert} from '#utils/log'; import {isArray} from '#core/types'; import {parseJson} from '#core/types/object/json'; import {toggle} from '#core/dom/style'; diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js index 3133d036fd94..c6d96015a53f 100644 --- a/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js +++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js @@ -2,7 +2,7 @@ import {Entitlement} from './entitlement'; import {LocalSubscriptionBasePlatform} from './local-subscription-platform-base'; import {Services} from '#service'; import {addParamToUrl, assertHttpsUrl} from '../../../src/url'; -import {devAssert, userAssert} from '../../../src/log'; +import {devAssert, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {isArray} from '#core/types'; diff --git a/extensions/amp-subscriptions/0.1/metering.js b/extensions/amp-subscriptions/0.1/metering.js index 06ce03476b9e..1a010149e489 100644 --- a/extensions/amp-subscriptions/0.1/metering.js +++ b/extensions/amp-subscriptions/0.1/metering.js @@ -1,4 +1,4 @@ -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @const */ const TAG = 'amp-subscriptions'; diff --git a/extensions/amp-subscriptions/0.1/platform-store.js b/extensions/amp-subscriptions/0.1/platform-store.js index 1a3f6d1ef9c2..b22d7a25aed6 100644 --- a/extensions/amp-subscriptions/0.1/platform-store.js +++ b/extensions/amp-subscriptions/0.1/platform-store.js @@ -2,7 +2,7 @@ import {DEFAULT_SCORE_CONFIG, SubscriptionsScoreFactor} from './constants'; import {Deferred} from '#core/data-structures/promise'; import {Entitlement} from './entitlement'; import {Observable} from '#core/data-structures/observable'; -import {devAssert, user} from '../../../src/log'; +import {devAssert, user} from '#utils/log'; import {dict, hasOwn} from '#core/types/object'; /** @typedef {{platformKey: string, entitlement: (!./entitlement.Entitlement|undefined)}} */ diff --git a/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js b/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js index ca56587ea277..0ec2240ffd56 100644 --- a/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js +++ b/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js @@ -1,4 +1,4 @@ -import * as utilsStory from '../../../../src/utils/story'; +import * as utilsStory from '#utils/story'; import {Entitlement, GrantReason} from '../entitlement'; import {LocalSubscriptionIframePlatform} from '../local-subscription-platform-iframe'; import {LocalSubscriptionRemotePlatform} from '../local-subscription-platform-remote'; diff --git a/extensions/amp-subscriptions/0.1/test/test-analytics.js b/extensions/amp-subscriptions/0.1/test/test-analytics.js index 55c151821d1c..1f5e9e531132 100644 --- a/extensions/amp-subscriptions/0.1/test/test-analytics.js +++ b/extensions/amp-subscriptions/0.1/test/test-analytics.js @@ -1,10 +1,10 @@ -import * as AmpAnalytics from '../../../../src/analytics'; +import * as AmpAnalytics from '#utils/analytics'; import { ActionStatus, SubscriptionAnalytics, SubscriptionAnalyticsEvents, } from '../analytics'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; //--> env.sandbox.stub(ServiceUrl, 'adsUrl', url => serverUrl + url); diff --git a/extensions/amp-subscriptions/0.1/test/test-platform-store.js b/extensions/amp-subscriptions/0.1/test/test-platform-store.js index 67d32b2c2918..99280ac2c5a9 100644 --- a/extensions/amp-subscriptions/0.1/test/test-platform-store.js +++ b/extensions/amp-subscriptions/0.1/test/test-platform-store.js @@ -2,7 +2,7 @@ import {Entitlement, GrantReason} from '../entitlement'; import {PlatformStore} from '../platform-store'; import {SubscriptionPlatform} from '../subscription-platform'; -import {user} from '../../../../src/log'; +import {user} from '#utils/log'; describes.realWin('Platform store', {}, (env) => { let platformStore; diff --git a/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js b/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js index 33a6c4003d6b..e14465626869 100644 --- a/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js +++ b/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js @@ -3,7 +3,7 @@ import {Entitlement, GrantReason} from './entitlement'; import {JwtHelper} from '../../amp-access/0.1/jwt'; import {PageConfig as PageConfigInterface} from '#third_party/subscriptions-project/config'; import {Services} from '#service'; -import {devAssert, user, userAssert} from '../../../src/log'; +import {devAssert, user, userAssert} from '#utils/log'; import {dict} from '#core/types/object'; import {getSourceOrigin, getWinOrigin} from '../../../src/url'; import {localSubscriptionPlatformFactory} from './local-subscription-platform'; diff --git a/extensions/amp-subscriptions/0.1/viewer-tracker.js b/extensions/amp-subscriptions/0.1/viewer-tracker.js index 8a173a0d2226..fa43d59c0971 100644 --- a/extensions/amp-subscriptions/0.1/viewer-tracker.js +++ b/extensions/amp-subscriptions/0.1/viewer-tracker.js @@ -1,7 +1,7 @@ import {Services} from '#service'; import {cancellation} from '../../../src/error-reporting'; -import {dev} from '../../../src/log'; -import {listenOnce} from '../../../src/event-helper'; +import {dev} from '#utils/log'; +import {listenOnce} from '#utils/event-helper'; const TAG = 'local-viewer'; diff --git a/extensions/amp-tiktok/0.1/amp-tiktok.js b/extensions/amp-tiktok/0.1/amp-tiktok.js index eb41f4d6e0ea..b7182958429a 100644 --- a/extensions/amp-tiktok/0.1/amp-tiktok.js +++ b/extensions/amp-tiktok/0.1/amp-tiktok.js @@ -4,7 +4,7 @@ import {Services} from '#service'; import {childElementByAttr, childElementByTag} from '#core/dom/query'; import {createElementWithAttributes, removeElement} from '#core/dom'; import {debounce} from '#core/types/function'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; import {htmlFor} from '#core/dom/static-template'; import {isLayoutSizeDefined} from '#core/dom/layout'; import {px, resetStyles, setStyles} from '#core/dom/style'; diff --git a/extensions/amp-timeago/0.1/amp-timeago.js b/extensions/amp-timeago/0.1/amp-timeago.js index 73068da301f3..76c9358709ed 100644 --- a/extensions/amp-timeago/0.1/amp-timeago.js +++ b/extensions/amp-timeago/0.1/amp-timeago.js @@ -1,9 +1,9 @@ import {isLayoutSizeDefined} from '#core/dom/layout'; import {observeIntersections} from '#core/dom/layout/viewport-observer'; -import {format, getLocale} from './locales'; +import {userAssert} from '#utils/log'; -import {userAssert} from '../../../src/log'; +import {format, getLocale} from './locales'; export class AmpTimeAgo extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-timeago/1.0/amp-timeago.js b/extensions/amp-timeago/1.0/amp-timeago.js index 32464ca525ed..81ee8cc06f46 100644 --- a/extensions/amp-timeago/1.0/amp-timeago.js +++ b/extensions/amp-timeago/1.0/amp-timeago.js @@ -1,8 +1,8 @@ import {isExperimentOn} from '#experiments'; -import {BaseElement} from './base-element'; +import {userAssert} from '#utils/log'; -import {userAssert} from '../../../src/log'; +import {BaseElement} from './base-element'; /** @const {string} */ const TAG = 'amp-timeago'; diff --git a/extensions/amp-truncate-text/0.1/amp-truncate-text.js b/extensions/amp-truncate-text/0.1/amp-truncate-text.js index 0cf57add1963..7d5f3d1bbd39 100644 --- a/extensions/amp-truncate-text/0.1/amp-truncate-text.js +++ b/extensions/amp-truncate-text/0.1/amp-truncate-text.js @@ -10,12 +10,13 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import {createShadowRoot} from './shadow-utils'; import {truncateText} from './truncate-text'; import {CSS} from '../../../build/amp-truncate-text-0.1.css'; import {CSS as ShadowCSS} from '../../../build/amp-truncate-text-shadow-0.1.css'; -import {dev} from '../../../src/log'; /** * TODO(sparhami) List of stuff to do / consider: diff --git a/extensions/amp-truncate-text/0.1/binary-search.js b/extensions/amp-truncate-text/0.1/binary-search.js index 8dcc1c6961b9..7d888c04e2bf 100644 --- a/extensions/amp-truncate-text/0.1/binary-search.js +++ b/extensions/amp-truncate-text/0.1/binary-search.js @@ -1,4 +1,4 @@ -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; /** * When no matching index is found, whether to stop on the next or previous diff --git a/extensions/amp-user-notification/0.1/amp-user-notification.js b/extensions/amp-user-notification/0.1/amp-user-notification.js index db86ca9a7387..073871c10577 100644 --- a/extensions/amp-user-notification/0.1/amp-user-notification.js +++ b/extensions/amp-user-notification/0.1/amp-user-notification.js @@ -9,8 +9,9 @@ import { NotificationUiManager, } from '#service/notification-ui-manager'; +import {dev, user, userAssert} from '#utils/log'; + import {CSS} from '../../../build/amp-user-notification-0.1.css'; -import {dev, user, userAssert} from '../../../src/log'; import { getServicePromiseForDoc, registerServiceBuilderForDoc, diff --git a/extensions/amp-video-docking/0.1/amp-video-docking.js b/extensions/amp-video-docking/0.1/amp-video-docking.js index de6728e9d755..32aba8920a84 100644 --- a/extensions/amp-video-docking/0.1/amp-video-docking.js +++ b/extensions/amp-video-docking/0.1/amp-video-docking.js @@ -18,6 +18,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {createCustomEvent, listen, listenOnce} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {applyBreakpointClassname} from './breakpoints'; import {Controls} from './controls'; import {DirectionX, DirectionY, FLOAT_TOLERANCE, RectDef} from './def'; @@ -35,8 +38,6 @@ import { import {createViewportRect} from './viewport-rect'; import {CSS} from '../../../build/amp-video-docking-0.1.css'; -import {createCustomEvent, listen, listenOnce} from '../../../src/event-helper'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {installStylesForDoc} from '../../../src/style-installer'; import { PlayingStates, diff --git a/extensions/amp-video-docking/0.1/controls.js b/extensions/amp-video-docking/0.1/controls.js index e1bd131c1db9..4e5bbc8c80d2 100644 --- a/extensions/amp-video-docking/0.1/controls.js +++ b/extensions/amp-video-docking/0.1/controls.js @@ -13,13 +13,14 @@ import {once} from '#core/types/function'; import {Services} from '#service'; +import {createCustomEvent, listen} from '#utils/event-helper'; +import {dev, devAssert} from '#utils/log'; + import {applyBreakpointClassname} from './breakpoints'; import {VideoDockingEvents, pointerCoords} from './events'; import {HtmlLiteralTagDef} from './html'; import {Timeout} from './timeout'; -import {createCustomEvent, listen} from '../../../src/event-helper'; -import {dev, devAssert} from '../../../src/log'; import {PlayingStates, VideoEvents} from '../../../src/video-interface'; /** diff --git a/extensions/amp-video-docking/0.1/events.js b/extensions/amp-video-docking/0.1/events.js index d8d29dad3a06..1bf547454a68 100644 --- a/extensions/amp-video-docking/0.1/events.js +++ b/extensions/amp-video-docking/0.1/events.js @@ -1,4 +1,4 @@ -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; /** @enum {string} */ export const VideoDockingEvents = { diff --git a/extensions/amp-video-iframe/0.1/amp-video-iframe.js b/extensions/amp-video-iframe/0.1/amp-video-iframe.js index b7c70b2e3847..fa684d4f5d3f 100644 --- a/extensions/amp-video-iframe/0.1/amp-video-iframe.js +++ b/extensions/amp-video-iframe/0.1/amp-video-iframe.js @@ -14,8 +14,10 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {getData, listen} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {getConsentDataToForward} from '../../../src/consent'; -import {getData, listen} from '../../../src/event-helper'; import { disableScrollingOnIframe, looksLikeTrackingIframe, @@ -27,7 +29,6 @@ import { objOrParseJson, originMatches, } from '../../../src/iframe-video'; -import {dev, devAssert, user, userAssert} from '../../../src/log'; import {addParamsToUrl} from '../../../src/url'; import { MIN_VISIBILITY_RATIO_FOR_AUTOPLAY, diff --git a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js index 6a2abfefab1e..cbb1c407ef3c 100644 --- a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js +++ b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js @@ -4,10 +4,11 @@ import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers'; import {Services} from '#service'; +import {listenOncePromise} from '#utils/event-helper'; + import {macroTask} from '#testing/helpers'; import {installResizeObserverStub} from '#testing/resize-observer-stub'; -import {listenOncePromise} from '../../../../src/event-helper'; import {VideoEvents} from '../../../../src/video-interface'; describes.realWin( diff --git a/extensions/amp-video-iframe/1.0/amp-video-iframe.js b/extensions/amp-video-iframe/1.0/amp-video-iframe.js index 9c7e44703b0f..9e6a8aca46fb 100644 --- a/extensions/amp-video-iframe/1.0/amp-video-iframe.js +++ b/extensions/amp-video-iframe/1.0/amp-video-iframe.js @@ -3,12 +3,13 @@ import {dict} from '#core/types/object'; import {isExperimentOn} from '#experiments'; +import {createCustomEvent} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-video-iframe-1.0.css'; -import {createCustomEvent} from '../../../src/event-helper'; import {postMessageWhenAvailable} from '../../../src/iframe-video'; -import {userAssert} from '../../../src/log'; import {MIN_VISIBILITY_RATIO_FOR_AUTOPLAY} from '../../../src/video-interface'; import {BUBBLE_MESSAGE_EVENTS} from '../amp-video-iframe-api'; diff --git a/extensions/amp-video/0.1/amp-video.js b/extensions/amp-video/0.1/amp-video.js index b5f8d5d67f0b..d392e1437049 100644 --- a/extensions/amp-video/0.1/amp-video.js +++ b/extensions/amp-video/0.1/amp-video.js @@ -12,8 +12,8 @@ import { childElementsByTag, matches, } from '#core/dom/query'; -import {descendsFromStory} from '../../../src/utils/story'; -import {dev, devAssert, user} from '../../../src/log'; +import {descendsFromStory} from '#utils/story'; +import {dev, devAssert, user} from '#utils/log'; import { addAttributesToElement, dispatchCustomEvent, @@ -32,7 +32,7 @@ import {getMode} from '../../../src/mode'; import {htmlFor} from '#core/dom/static-template'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; import {isExperimentOn} from '#experiments'; -import {listen, listenOncePromise} from '../../../src/event-helper'; +import {listen, listenOncePromise} from '#utils/event-helper'; import {mutedOrUnmutedEvent} from '../../../src/iframe-video'; import {propagateAttributes} from '#core/dom/propagate-attributes'; import { diff --git a/extensions/amp-video/0.1/flexible-bitrate.js b/extensions/amp-video/0.1/flexible-bitrate.js index d492fee67743..e96f62a93ab5 100644 --- a/extensions/amp-video/0.1/flexible-bitrate.js +++ b/extensions/amp-video/0.1/flexible-bitrate.js @@ -2,9 +2,9 @@ import {tryPlay} from '#core/dom/video'; import {DomBasedWeakRef} from '#core/data-structures/dom-based-weakref'; import {Services} from '#service'; import {childElement, childElementsByTag} from '#core/dom/query'; -import {dev, devAssert} from '../../../src/log'; +import {dev, devAssert} from '#utils/log'; import {isExperimentOn} from '#experiments'; -import {listen, listenOnce} from '../../../src/event-helper'; +import {listen, listenOnce} from '#utils/event-helper'; import {toArray} from '#core/types/array'; const TAG = 'amp-video'; diff --git a/extensions/amp-video/0.1/test/test-amp-video.js b/extensions/amp-video/0.1/test/test-amp-video.js index 36044a586833..f8bd3943d636 100644 --- a/extensions/amp-video/0.1/test/test-amp-video.js +++ b/extensions/amp-video/0.1/test/test-amp-video.js @@ -6,7 +6,7 @@ import {VisibilityState} from '#core/constants/visibility-state'; import {dispatchCustomEvent} from '#core/dom'; import {installPerformanceService} from '#service/performance-impl'; import {installResizeObserverStub} from '#testing/resize-observer-stub'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; import {toggleExperiment} from '#experiments'; import {xhrServiceForTesting} from '#service/xhr-impl'; diff --git a/extensions/amp-video/0.1/video-cache.js b/extensions/amp-video/0.1/video-cache.js index 97e6637157f8..c34a5f21eee5 100644 --- a/extensions/amp-video/0.1/video-cache.js +++ b/extensions/amp-video/0.1/video-cache.js @@ -7,7 +7,7 @@ import { } from '#core/dom'; import {matches} from '#core/dom/query'; import {toArray} from '#core/types/array'; -import {user} from '../../../src/log'; +import {user} from '#utils/log'; /** @const {!Array} */ const CODECS_IN_ASCENDING_PRIORITY = ['h264', 'vp09']; diff --git a/extensions/amp-video/1.0/amp-video.js b/extensions/amp-video/1.0/amp-video.js index 7e625afc9a47..3a21e4393a93 100644 --- a/extensions/amp-video/1.0/amp-video.js +++ b/extensions/amp-video/1.0/amp-video.js @@ -1,7 +1,7 @@ import {CSS} from '../../../build/amp-video-1.0.css'; import {VideoBaseElement} from './video-base-element'; import {isExperimentOn} from '#experiments'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; /** @const {string} */ const TAG = 'amp-video'; diff --git a/extensions/amp-video/1.0/storybook/VideoIframe.js b/extensions/amp-video/1.0/storybook/VideoIframe.js index f8f3b4ef74d6..0e62a418b42c 100644 --- a/extensions/amp-video/1.0/storybook/VideoIframe.js +++ b/extensions/amp-video/1.0/storybook/VideoIframe.js @@ -21,7 +21,7 @@ import { BentoAccordionSection, } from '../../../amp-accordion/1.0/component'; import {VideoIframe} from '../video-iframe'; -import {createCustomEvent} from '../../../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; import {useCallback} from '#preact'; export default { diff --git a/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js b/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js index dd28eb4b4ae8..1b298b9d51a5 100644 --- a/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js +++ b/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js @@ -4,6 +4,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {FixedLayer} from '#service/fixed-layer'; +import {getData, listen, listenOnce} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {FocusHandler} from './focus-handler'; import { HighlightHandler, @@ -18,8 +21,6 @@ import { } from './messaging/messaging'; import {TouchHandler} from './touch-handler'; -import {getData, listen, listenOnce} from '../../../src/event-helper'; -import {dev} from '../../../src/log'; import {getAmpdoc} from '../../../src/service-helpers'; import {getSourceUrl} from '../../../src/url'; diff --git a/extensions/amp-viewer-integration/0.1/findtext.js b/extensions/amp-viewer-integration/0.1/findtext.js index bdfbca420637..4df27983557d 100644 --- a/extensions/amp-viewer-integration/0.1/findtext.js +++ b/extensions/amp-viewer-integration/0.1/findtext.js @@ -1,6 +1,6 @@ import {computedStyle} from '#core/dom/style'; -import {devAssert} from '../../../src/log'; +import {devAssert} from '#utils/log'; /** * Simple implementation of CircularBuffer. diff --git a/extensions/amp-viewer-integration/0.1/focus-handler.js b/extensions/amp-viewer-integration/0.1/focus-handler.js index b516f81d07b3..41115184f54c 100644 --- a/extensions/amp-viewer-integration/0.1/focus-handler.js +++ b/extensions/amp-viewer-integration/0.1/focus-handler.js @@ -1,6 +1,6 @@ import {dict} from '#core/types/object'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; /** * Forward focus events' related data from the AMP doc to the diff --git a/extensions/amp-viewer-integration/0.1/highlight-handler.js b/extensions/amp-viewer-integration/0.1/highlight-handler.js index a24b8cc21683..d6235533db30 100644 --- a/extensions/amp-viewer-integration/0.1/highlight-handler.js +++ b/extensions/amp-viewer-integration/0.1/highlight-handler.js @@ -1,4 +1,4 @@ -import {whenDocumentReady} from '#core/document-ready'; +import {whenDocumentReady} from '#core/document/ready'; import {moveLayoutRect} from '#core/dom/layout/rect'; import {resetStyles, setInitialDisplay, setStyles} from '#core/dom/style'; import {once} from '#core/types/function'; @@ -8,9 +8,9 @@ import {parseQueryString} from '#core/types/string/url'; import {Services} from '#service'; -import {findSentences, markTextRangeList} from './findtext'; +import {listenOnce} from '#utils/event-helper'; -import {listenOnce} from '../../../src/event-helper'; +import {findSentences, markTextRangeList} from './findtext'; /** * The message name sent by viewers to dismiss highlights. diff --git a/extensions/amp-viewer-integration/0.1/keyboard-handler.js b/extensions/amp-viewer-integration/0.1/keyboard-handler.js index b5aaf4b5fd05..d3668cf4e39b 100644 --- a/extensions/amp-viewer-integration/0.1/keyboard-handler.js +++ b/extensions/amp-viewer-integration/0.1/keyboard-handler.js @@ -1,7 +1,7 @@ import {Keys} from '#core/constants/key-codes'; import {dict} from '#core/types/object'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; /** * The list of keyboard event properites to forward to the viewer. This should diff --git a/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js b/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js index cbaa3fcc7b1a..2addf53285e8 100644 --- a/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js +++ b/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js @@ -1,5 +1,5 @@ import {VisibilityState} from '#core/constants/visibility-state'; -import * as docready from '#core/document-ready'; +import * as docready from '#core/document/ready'; import {layoutRectLtwh} from '#core/dom/layout/rect'; import {Services} from '#service'; diff --git a/extensions/amp-viewer-integration/0.1/touch-handler.js b/extensions/amp-viewer-integration/0.1/touch-handler.js index 198004b9e66c..b6192dea1eeb 100644 --- a/extensions/amp-viewer-integration/0.1/touch-handler.js +++ b/extensions/amp-viewer-integration/0.1/touch-handler.js @@ -1,6 +1,6 @@ import {dict} from '#core/types/object'; -import {listen} from '../../../src/event-helper'; +import {listen} from '#utils/event-helper'; /** * The list of touch event properites to copy. diff --git a/extensions/amp-vimeo/0.1/amp-vimeo.js b/extensions/amp-vimeo/0.1/amp-vimeo.js index 6196112c104e..4d94456968b5 100644 --- a/extensions/amp-vimeo/0.1/amp-vimeo.js +++ b/extensions/amp-vimeo/0.1/amp-vimeo.js @@ -7,7 +7,9 @@ import {once} from '#core/types/function'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import { createFrameFor, isJsonOrObj, @@ -17,7 +19,6 @@ import { postMessageWhenAvailable, redispatch, } from '../../../src/iframe-video'; -import {userAssert} from '../../../src/log'; import {VideoAttributes, VideoEvents} from '../../../src/video-interface'; import { VIMEO_EVENTS, diff --git a/extensions/amp-vimeo/1.0/amp-vimeo.js b/extensions/amp-vimeo/1.0/amp-vimeo.js index 636d9ab15e73..f5ad9dbe2dab 100644 --- a/extensions/amp-vimeo/1.0/amp-vimeo.js +++ b/extensions/amp-vimeo/1.0/amp-vimeo.js @@ -1,9 +1,10 @@ import {isExperimentOn} from '#experiments'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-vimeo-1.0.css'; -import {userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-vimeo'; diff --git a/extensions/amp-vine/0.1/amp-vine.js b/extensions/amp-vine/0.1/amp-vine.js index 6e5855b69ea9..2285918ab5a5 100644 --- a/extensions/amp-vine/0.1/amp-vine.js +++ b/extensions/amp-vine/0.1/amp-vine.js @@ -3,7 +3,7 @@ import {PauseHelper} from '#core/dom/video/pause-helper'; import {Services} from '#service'; -import {userAssert} from '../../../src/log'; +import {userAssert} from '#utils/log'; class AmpVine extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js b/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js index cef3e863f0f0..c7104d4c7c57 100644 --- a/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js +++ b/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js @@ -13,10 +13,11 @@ import {propagateAttributes} from '#core/dom/propagate-attributes'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import {getIframe} from '../../../src/3p-frame'; -import {getData, listen} from '../../../src/event-helper'; import {redispatch} from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {VideoAttributes, VideoEvents} from '../../../src/video-interface'; const TAG = 'amp-viqeo-player'; diff --git a/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js b/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js index dd6ad5fb4b00..78986fc103c7 100644 --- a/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js +++ b/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js @@ -1,6 +1,7 @@ import {Services} from '#service'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; + import {PlayingStates, VideoEvents} from '../../../../src/video-interface'; import AmpViqeoPlayer from '../amp-viqeo-player'; diff --git a/extensions/amp-vk/0.1/amp-vk.js b/extensions/amp-vk/0.1/amp-vk.js index 6ad883637263..b696973005a5 100644 --- a/extensions/amp-vk/0.1/amp-vk.js +++ b/extensions/amp-vk/0.1/amp-vk.js @@ -5,8 +5,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {getData, listen} from '../../../src/event-helper'; -import {userAssert} from '../../../src/log'; +import {getData, listen} from '#utils/event-helper'; +import {userAssert} from '#utils/log'; + import {addParamsToUrl, appendEncodedParamStringToUrl} from '../../../src/url'; /** diff --git a/extensions/amp-web-push/0.1/amp-web-push-config.js b/extensions/amp-web-push/0.1/amp-web-push-config.js index 66d5e489331b..c1da1830570a 100644 --- a/extensions/amp-web-push/0.1/amp-web-push-config.js +++ b/extensions/amp-web-push/0.1/amp-web-push-config.js @@ -16,10 +16,11 @@ import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; +import {dev, user, userAssert} from '#utils/log'; + import {CONFIG_TAG, TAG} from './vars'; import {webPushServiceForDoc} from './web-push-service'; -import {dev, user, userAssert} from '../../../src/log'; import {parseUrlDeprecated} from '../../../src/url'; /** @enum {string} */ diff --git a/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js b/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js index fcc27b627abb..f97d16279a5c 100644 --- a/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js +++ b/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js @@ -16,11 +16,12 @@ import {parseQueryString} from '#core/types/string/url'; +import {initLogConstructor, setReportError, user} from '#utils/log'; + import {TAG} from './vars'; import {WindowMessenger} from './window-messenger'; import {reportError} from '../../../src/error-reporting'; -import {initLogConstructor, setReportError, user} from '../../../src/log'; import {getMode} from '../../../src/mode'; initLogConstructor(); diff --git a/extensions/amp-web-push/0.1/iframehost.js b/extensions/amp-web-push/0.1/iframehost.js index 1baff47df864..554e3f3f6f0f 100644 --- a/extensions/amp-web-push/0.1/iframehost.js +++ b/extensions/amp-web-push/0.1/iframehost.js @@ -16,7 +16,7 @@ import {toggle} from '#core/dom/style'; -import {loadPromise} from '../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; /** @fileoverview * Wraps the creation of an invisible sandboxed IFrame. Exposes a load() method diff --git a/extensions/amp-web-push/0.1/web-push-service.js b/extensions/amp-web-push/0.1/web-push-service.js index afa06cb11fe3..1ea5d80398c3 100644 --- a/extensions/amp-web-push/0.1/web-push-service.js +++ b/extensions/amp-web-push/0.1/web-push-service.js @@ -19,6 +19,8 @@ import {parseQueryString} from '#core/types/string/url'; import {Services} from '#service'; +import {dev, user} from '#utils/log'; + import {WebPushWidgetVisibilities} from './amp-web-push-widget'; import {IFrameHost} from './iframehost'; import { @@ -31,7 +33,6 @@ import { import {WindowMessenger} from './window-messenger'; import {CSS} from '../../../build/amp-web-push-0.1.css'; -import {dev, user} from '../../../src/log'; import {getMode} from '../../../src/mode'; import {openWindowDialog} from '../../../src/open-window-dialog'; import {getServicePromiseForDoc} from '../../../src/service-helpers'; diff --git a/extensions/amp-web-push/0.1/window-messenger.js b/extensions/amp-web-push/0.1/window-messenger.js index 23089b7beba9..89eea5056602 100644 --- a/extensions/amp-web-push/0.1/window-messenger.js +++ b/extensions/amp-web-push/0.1/window-messenger.js @@ -14,10 +14,11 @@ * the License. */ +import {getData} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {TAG} from './vars'; -import {getData} from '../../../src/event-helper'; -import {dev} from '../../../src/log'; import {parseUrlDeprecated} from '../../../src/url'; /** @typedef {{ diff --git a/extensions/amp-wistia-player/0.1/amp-wistia-player.js b/extensions/amp-wistia-player/0.1/amp-wistia-player.js index 753a5e995b4c..9cd213f693e7 100644 --- a/extensions/amp-wistia-player/0.1/amp-wistia-player.js +++ b/extensions/amp-wistia-player/0.1/amp-wistia-player.js @@ -10,7 +10,9 @@ import {isLayoutSizeDefined} from '#core/dom/layout'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { createFrameFor, isJsonOrObj, @@ -19,7 +21,6 @@ import { originMatches, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {VideoEvents} from '../../../src/video-interface'; const TAG = 'amp-wistia-player'; diff --git a/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js b/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js index 12728c0eba3e..60294f3e9aac 100644 --- a/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js +++ b/extensions/amp-wordpress-embed/1.0/amp-wordpress-embed.js @@ -2,9 +2,9 @@ import {dict} from '#core/types/object'; import {isExperimentOn} from '#experiments'; -import {BaseElement} from './base-element'; +import {userAssert} from '#utils/log'; -import {userAssert} from '../../../src/log'; +import {BaseElement} from './base-element'; /** @const {string} */ const TAG = 'amp-wordpress-embed'; diff --git a/extensions/amp-wordpress-embed/1.0/component.js b/extensions/amp-wordpress-embed/1.0/component.js index 6134a9919e65..793382146dad 100644 --- a/extensions/amp-wordpress-embed/1.0/component.js +++ b/extensions/amp-wordpress-embed/1.0/component.js @@ -5,7 +5,8 @@ import {forwardRef} from '#preact/compat'; import {useValueRef} from '#preact/component'; import {IframeEmbed} from '#preact/component/iframe'; -import {getData} from '../../../src/event-helper'; +import {getData} from '#utils/event-helper'; + import {addParamToUrl} from '../../../src/url'; const {useCallback, useEffect, useMemo, useRef, useState} = Preact; diff --git a/extensions/amp-yotpo/0.1/amp-yotpo.js b/extensions/amp-yotpo/0.1/amp-yotpo.js index 17f30b067582..ea9e14381238 100644 --- a/extensions/amp-yotpo/0.1/amp-yotpo.js +++ b/extensions/amp-yotpo/0.1/amp-yotpo.js @@ -3,9 +3,10 @@ import {applyFillContent, isLayoutSizeDefined} from '#core/dom/layout'; import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import {getIframe} from '../../../src/3p-frame'; import {listenFor} from '../../../src/iframe-helper'; -import {userAssert} from '../../../src/log'; export class AmpYotpo extends AMP.BaseElement { /** @param {!AmpElement} element */ diff --git a/extensions/amp-youtube/0.1/amp-youtube.js b/extensions/amp-youtube/0.1/amp-youtube.js index 47f9493a9022..72c4750ca841 100644 --- a/extensions/amp-youtube/0.1/amp-youtube.js +++ b/extensions/amp-youtube/0.1/amp-youtube.js @@ -19,7 +19,9 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; -import {getData, listen} from '../../../src/event-helper'; +import {getData, listen} from '#utils/event-helper'; +import {dev, userAssert} from '#utils/log'; + import { addUnsafeAllowAutoplay, createFrameFor, @@ -29,7 +31,6 @@ import { originMatches, redispatch, } from '../../../src/iframe-video'; -import {dev, userAssert} from '../../../src/log'; import {addParamsToUrl} from '../../../src/url'; import {VideoEvents} from '../../../src/video-interface'; diff --git a/extensions/amp-youtube/0.1/test/test-amp-youtube.js b/extensions/amp-youtube/0.1/test/test-amp-youtube.js index c5bf59472bd1..eb0b3aad962a 100644 --- a/extensions/amp-youtube/0.1/test/test-amp-youtube.js +++ b/extensions/amp-youtube/0.1/test/test-amp-youtube.js @@ -1,9 +1,10 @@ import '../amp-youtube'; import {Services} from '#service'; +import {listenOncePromise} from '#utils/event-helper'; + import {installResizeObserverStub} from '#testing/resize-observer-stub'; -import {listenOncePromise} from '../../../../src/event-helper'; import {VideoEvents} from '../../../../src/video-interface'; const EXAMPLE_VIDEOID = 'mGENRKrdoGY'; diff --git a/extensions/amp-youtube/1.0/amp-youtube.js b/extensions/amp-youtube/1.0/amp-youtube.js index 2d3aa6890357..8a356f3082be 100644 --- a/extensions/amp-youtube/1.0/amp-youtube.js +++ b/extensions/amp-youtube/1.0/amp-youtube.js @@ -1,9 +1,10 @@ import {isExperimentOn} from '#experiments'; +import {userAssert} from '#utils/log'; + import {BaseElement} from './base-element'; import {CSS} from '../../../build/amp-youtube-1.0.css'; -import {userAssert} from '../../../src/log'; /** @const {string} */ const TAG = 'amp-youtube'; diff --git a/src/3p-frame.js b/src/3p-frame.js index 70745a912aad..eedccce8f627 100644 --- a/src/3p-frame.js +++ b/src/3p-frame.js @@ -4,9 +4,10 @@ import * as mode from '#core/mode'; import {dict} from '#core/types/object'; import {tryParseJson} from '#core/types/object/json'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {urls} from './config'; import {getContextMetadata} from './iframe-attributes'; -import {dev, devAssert, user, userAssert} from './log'; import {assertHttpsUrl, parseUrlDeprecated} from './url'; /** @type {!Object} Number of 3p frames on the for that type. */ diff --git a/src/ad-cid.js b/src/ad-cid.js index 6c9489e1768b..e3234294589d 100644 --- a/src/ad-cid.js +++ b/src/ad-cid.js @@ -2,7 +2,7 @@ import {adConfig} from '#ads/_config'; import {Services} from '#service'; -import {dev} from './log'; +import {dev} from '#utils/log'; /** * @param {AMP.BaseElement} adElement diff --git a/src/ad-helper.js b/src/ad-helper.js index 6deadf51b5b1..44701ae9c8e3 100644 --- a/src/ad-helper.js +++ b/src/ad-helper.js @@ -1,6 +1,7 @@ import {computedStyle} from '#core/dom/style'; -import {dev} from './log'; +import {dev} from '#utils/log'; + import {getParentWindowFrameElement} from './service-helpers'; const AD_CONTAINER_PROP = '__AMP__AD_CONTAINER'; diff --git a/src/amp-story-player/amp-story-component-manager.js b/src/amp-story-player/amp-story-component-manager.js index ae5756d95191..1549b87f4f8f 100644 --- a/src/amp-story-player/amp-story-component-manager.js +++ b/src/amp-story-player/amp-story-component-manager.js @@ -1,9 +1,9 @@ +import {initLogConstructor} from '#utils/log'; + import {AmpStoryEntryPoint} from './amp-story-entry-point/amp-story-entry-point-impl'; import {AmpStoryPlayer} from './amp-story-player-impl'; import {AmpStoryPlayerViewportObserver} from './amp-story-player-viewport-observer'; -import {initLogConstructor} from '../log'; - export class AmpStoryComponentManager { /** * @param {!Window} win diff --git a/src/amp-story-player/amp-story-player-impl.js b/src/amp-story-player/amp-story-player-impl.js index 958d67361d50..406e97e5bcce 100644 --- a/src/amp-story-player/amp-story-player-impl.js +++ b/src/amp-story-player/amp-story-player-impl.js @@ -12,13 +12,14 @@ import {dict} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; import {parseQueryString} from '#core/types/string/url'; +import {createCustomEvent, listenOnce} from '#utils/event-helper'; + import {AmpStoryPlayerViewportObserver} from './amp-story-player-viewport-observer'; import {PageScroller} from './page-scroller'; import {cssText} from '../../build/amp-story-player-shadow.css'; import {applySandbox} from '../3p-frame'; import {urls} from '../config'; -import {createCustomEvent, listenOnce} from '../event-helper'; import {getMode} from '../mode'; import { addParamsToUrl, diff --git a/src/amp-story-player/amp-story-player.js b/src/amp-story-player/amp-story-player.js index 62432c077d08..6f455302a1be 100644 --- a/src/amp-story-player/amp-story-player.js +++ b/src/amp-story-player/amp-story-player.js @@ -1,4 +1,4 @@ -import {onDocumentReady} from '#core/document-ready'; +import {onDocumentReady} from '#core/document/ready'; import {AmpStoryComponentManager} from './amp-story-component-manager'; import {AmpStoryPlayer} from './amp-story-player-impl'; diff --git a/src/amp.js b/src/amp.js index c5d2ef731d8e..7e8a6ee7b222 100644 --- a/src/amp.js +++ b/src/amp.js @@ -6,7 +6,7 @@ import './polyfills'; import {TickLabel} from '#core/constants/enums'; -import {whenDocumentComplete} from '#core/document-ready'; +import {whenDocumentComplete} from '#core/document/ready'; import * as mode from '#core/mode'; import {Services} from '#service'; diff --git a/src/auto-lightbox.js b/src/auto-lightbox.js index 4e4eacfac02a..214082f70015 100644 --- a/src/auto-lightbox.js +++ b/src/auto-lightbox.js @@ -1,8 +1,10 @@ +import {isAmphtml} from '#core/document/format'; + import {Services} from '#service'; +import {dev} from '#utils/log'; + import {ChunkPriority, chunk} from './chunk'; -import {isAmphtml} from './format'; -import {dev} from './log'; import {isStoryDocument} from './utils/story'; /** @const @enum {string} */ diff --git a/src/base-element.js b/src/base-element.js index 52bcadb9b098..dc5efbd10918 100644 --- a/src/base-element.js +++ b/src/base-element.js @@ -6,8 +6,9 @@ import {toWin} from '#core/window'; import {Services} from '#service'; -import {getData, listen, loadPromise} from './event-helper'; -import {devAssert, user, userAssert} from './log'; +import {getData, listen, loadPromise} from '#utils/event-helper'; +import {devAssert, user, userAssert} from '#utils/log'; + import {getMode} from './mode'; /** diff --git a/src/base-template.js b/src/base-template.js index b8ad7f2588d2..58d0f88ecfb5 100644 --- a/src/base-template.js +++ b/src/base-template.js @@ -2,7 +2,7 @@ import {isElement} from '#core/types'; import {Services} from '#service'; -import {dev} from './log'; +import {dev} from '#utils/log'; /** * The interface that is implemented by all templates. diff --git a/src/batched-json.js b/src/batched-json.js index e91ecf1a8ba1..d0910ff3d584 100644 --- a/src/batched-json.js +++ b/src/batched-json.js @@ -2,7 +2,8 @@ import {getValueForExpr} from '#core/types/object'; import {Services} from '#service'; -import {user} from './log'; +import {user} from '#utils/log'; + import {assertHttpsUrl} from './url'; /** diff --git a/src/builtins/amp-img/amp-img.js b/src/builtins/amp-img/amp-img.js index 5f27f6758800..16cd3987dcd1 100644 --- a/src/builtins/amp-img/amp-img.js +++ b/src/builtins/amp-img/amp-img.js @@ -10,9 +10,10 @@ import * as mode from '#core/mode'; import {Services} from '#service'; import {registerElement} from '#service/custom-element-registry'; +import {listen} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {BaseElement} from '../../base-element'; -import {listen} from '../../event-helper'; -import {dev} from '../../log'; /** @const {string} */ const TAG = 'amp-img'; diff --git a/src/builtins/amp-pixel/amp-pixel.js b/src/builtins/amp-pixel/amp-pixel.js index 6bf759d6d171..f7b85bf697ec 100644 --- a/src/builtins/amp-pixel/amp-pixel.js +++ b/src/builtins/amp-pixel/amp-pixel.js @@ -1,8 +1,9 @@ import {Services} from '#service'; import {registerElement} from '#service/custom-element-registry'; +import {dev, userAssert} from '#utils/log'; + import {BaseElement} from '../../base-element'; -import {dev, userAssert} from '../../log'; import {createPixel} from '../../pixel'; const TAG = 'amp-pixel'; diff --git a/src/chunk.js b/src/chunk.js index fc6dc1c34b63..f336d9c8b984 100644 --- a/src/chunk.js +++ b/src/chunk.js @@ -2,8 +2,9 @@ import {PriorityQueue} from '#core/data-structures/priority-queue'; import {Services} from '#service'; -import {getData} from './event-helper'; -import {dev} from './log'; +import {getData} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import { getServiceForDoc, registerServiceBuilderForDoc, diff --git a/src/cookies.js b/src/cookies.js index 1dfd2b241b96..2fd8521983e9 100644 --- a/src/cookies.js +++ b/src/cookies.js @@ -1,8 +1,9 @@ import {endsWith} from '#core/types/string'; import {tryDecodeUriComponent} from '#core/types/string/url'; +import {userAssert} from '#utils/log'; + import {urls} from './config'; -import {userAssert} from './log'; import {getSourceOrigin, isProxyOrigin, parseUrlDeprecated} from './url'; const TEST_COOKIE_NAME = '-test-amp-cookie-tmp'; diff --git a/src/format.js b/src/core/document/format.js similarity index 100% rename from src/format.js rename to src/core/document/format.js diff --git a/src/core/document-ready.js b/src/core/document/ready.js similarity index 100% rename from src/core/document-ready.js rename to src/core/document/ready.js diff --git a/src/core/document-visibility.js b/src/core/document/visibility.js similarity index 94% rename from src/core/document-visibility.js rename to src/core/document/visibility.js index 5f47ecc0aa14..408606fbabd1 100644 --- a/src/core/document-visibility.js +++ b/src/core/document/visibility.js @@ -1,5 +1,5 @@ -import {VisibilityState} from './constants/visibility-state'; -import {getVendorJsPropertyName} from './dom/style'; +import {VisibilityState} from '#core/constants/visibility-state'; +import {getVendorJsPropertyName} from '#core/dom/style'; /** * @param {!Document} doc diff --git a/src/custom-element.js b/src/custom-element.js index a8f882e0f38e..d3f80b8f9e90 100644 --- a/src/custom-element.js +++ b/src/custom-element.js @@ -19,6 +19,8 @@ import {Services} from '#service'; import {ResourceState} from '#service/resource'; import {getSchedulerForDoc} from '#service/scheduler'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {startupChunk} from './chunk'; import {shouldBlockOnConsentByMeta} from './consent'; import {ElementStub} from './element-stub'; @@ -29,7 +31,6 @@ import { isCancellation, reportError, } from './error-reporting'; -import {dev, devAssert, user, userAssert} from './log'; import {getMode} from './mode'; import {applyStaticLayout} from './static-layout'; import {getIntersectionChangeEntry} from './utils/intersection-observer-3p-host'; diff --git a/src/document-fetcher.js b/src/document-fetcher.js index eec25024cbc7..03e16ecf8496 100644 --- a/src/document-fetcher.js +++ b/src/document-fetcher.js @@ -2,7 +2,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {user} from './log'; +import {user} from '#utils/log'; + import { assertSuccess, getViewerInterceptResponse, diff --git a/src/document-submit.js b/src/document-submit.js index 88d9902f6578..4c359a2099cd 100644 --- a/src/document-submit.js +++ b/src/document-submit.js @@ -2,7 +2,8 @@ import {ActionTrust} from '#core/constants/action-constants'; import {Services} from '#service'; -import {dev, user, userAssert} from './log'; +import {dev, user, userAssert} from '#utils/log'; + import { SOURCE_ORIGIN_PARAM, assertHttpsUrl, diff --git a/src/element-service.js b/src/element-service.js index ab2859337efe..aeb4f119285e 100644 --- a/src/element-service.js +++ b/src/element-service.js @@ -2,7 +2,8 @@ import * as dom from '#core/dom'; import {extensionScriptInNode} from '#service/extension-script'; -import {userAssert} from './log'; +import {userAssert} from '#utils/log'; + import { getAmpdoc, getService, diff --git a/src/error-reporting.js b/src/error-reporting.js index 10377189e23b..19c521b1fcf9 100644 --- a/src/error-reporting.js +++ b/src/error-reporting.js @@ -14,10 +14,11 @@ import {experimentTogglesOrNull, getBinaryType, isCanary} from '#experiments'; import {Services} from '#service'; -import {triggerAnalyticsEvent} from './analytics'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {isLoadErrorMessage} from '#utils/event-helper'; +import {dev, setReportError} from '#utils/log'; + import {urls} from './config'; -import {isLoadErrorMessage} from './event-helper'; -import {dev, setReportError} from './log'; import {getMode} from './mode'; import {makeBodyVisibleRecovery} from './style-installer'; import {isProxyOrigin} from './url'; diff --git a/src/experiments/index.js b/src/experiments/index.js index 19daba101a28..fde96f791ef4 100644 --- a/src/experiments/index.js +++ b/src/experiments/index.js @@ -10,9 +10,10 @@ import {hasOwn, map} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; import {parseQueryString} from '#core/types/string/url'; +import {dev, user} from '#utils/log'; + import {ExperimentInfoDef} from './experiments.type'; -import {dev, user} from '../log'; import {getMode} from '../mode'; import {getTopWindow} from '../service-helpers'; diff --git a/src/experiments/shame.extern.js b/src/experiments/shame.extern.js index 7e82ec21e6dd..43ae41c74fcd 100644 --- a/src/experiments/shame.extern.js +++ b/src/experiments/shame.extern.js @@ -18,9 +18,9 @@ Logger.prototype.error; /** @type {function(...?)} */ Logger.prototype.assertString; /** @type {function():!Logger} */ -let user$$module$src$log; +let user$$module$src$utils$log; /** @type {function():!Logger} */ -let dev$$module$src$log; +let dev$$module$src$utils$log; /** @type {function():!{test:boolean}} */ let getMode$$module$src$mode; diff --git a/src/extension-analytics.js b/src/extension-analytics.js index f931e0e5da95..b55a4fca024c 100644 --- a/src/extension-analytics.js +++ b/src/extension-analytics.js @@ -6,8 +6,8 @@ import {toWin} from '#core/window'; import {Services} from '#service'; -import {triggerAnalyticsEvent} from './analytics'; -import {devAssert} from './log'; +import {triggerAnalyticsEvent} from '#utils/analytics'; +import {devAssert} from '#utils/log'; /** * Method to create scoped analytics element for any element. diff --git a/src/focus-history.js b/src/focus-history.js index 65b3d2dc32e9..0c806890a3de 100644 --- a/src/focus-history.js +++ b/src/focus-history.js @@ -3,7 +3,7 @@ import {isElement} from '#core/types'; import {Services} from '#service'; -import {dev} from './log'; +import {dev} from '#utils/log'; /** * FocusHistory keeps track of recent focused elements. This history can be diff --git a/src/font-stylesheet-timeout.js b/src/font-stylesheet-timeout.js index 4e75b0464ba6..94213ce64949 100644 --- a/src/font-stylesheet-timeout.js +++ b/src/font-stylesheet-timeout.js @@ -1,4 +1,4 @@ -import {onDocumentReady} from '#core/document-ready'; +import {onDocumentReady} from '#core/document/ready'; import {escapeCssSelectorIdent} from '#core/dom/css-selectors'; import {urls} from './config'; diff --git a/src/friendly-iframe-embed.js b/src/friendly-iframe-embed.js index 9f7ffc758a42..0547fc4bc280 100644 --- a/src/friendly-iframe-embed.js +++ b/src/friendly-iframe-embed.js @@ -2,7 +2,7 @@ import {CommonSignals} from '#core/constants/common-signals'; import {VisibilityState} from '#core/constants/visibility-state'; import {Deferred} from '#core/data-structures/promise'; import {Signals} from '#core/data-structures/signals'; -import {isDocumentReady} from '#core/document-ready'; +import {isDocumentReady} from '#core/document/ready'; import {escapeHtml} from '#core/dom'; import {layoutRectLtwh, moveLayoutRect} from '#core/dom/layout/rect'; import { @@ -26,11 +26,12 @@ import {Services} from '#service'; import {installAmpdocServicesForEmbed} from '#service/core-services'; import {installTimerInEmbedWindow} from '#service/timer-impl'; +import {loadPromise} from '#utils/event-helper'; +import {dev, devAssert, userAssert} from '#utils/log'; + import {urls} from './config'; -import {loadPromise} from './event-helper'; import {FIE_EMBED_PROP} from './iframe-helper'; import {whenContentIniLoad} from './ini-load'; -import {dev, devAssert, userAssert} from './log'; import {getMode} from './mode'; import { disposeServicesForEmbed, diff --git a/src/gesture.js b/src/gesture.js index ff90b8aad7a4..3c8170ff127c 100644 --- a/src/gesture.js +++ b/src/gesture.js @@ -3,7 +3,8 @@ import {supportsPassiveEventListener} from '#core/dom/event-helper-listen'; import {findIndex} from '#core/types/array'; import {toWin} from '#core/window'; -import {devAssert} from './log'; +import {devAssert} from '#utils/log'; + import {Pass} from './pass'; const PROP_ = '__AMP_Gestures'; diff --git a/src/iframe-helper.js b/src/iframe-helper.js index 66bc8ff4c178..dbf65a94ab43 100644 --- a/src/iframe-helper.js +++ b/src/iframe-helper.js @@ -6,8 +6,9 @@ import {remove} from '#core/types/array'; import {dict} from '#core/types/object'; import {tryParseJson} from '#core/types/object/json'; -import {getData} from './event-helper'; -import {dev, devAssert} from './log'; +import {getData} from '#utils/event-helper'; +import {dev, devAssert} from '#utils/log'; + import {parseUrlDeprecated} from './url'; /** diff --git a/src/iframe-video.js b/src/iframe-video.js index 586f42cb66f3..d99f86ed70cc 100644 --- a/src/iframe-video.js +++ b/src/iframe-video.js @@ -7,7 +7,8 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {dev} from './log'; +import {dev} from '#utils/log'; + import {VideoEvents} from './video-interface'; /** @enum {string} */ diff --git a/src/impression.js b/src/impression.js index ca2cd39a3f82..ee82f1c6d3c1 100644 --- a/src/impression.js +++ b/src/impression.js @@ -6,7 +6,8 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; -import {dev, user, userAssert} from './log'; +import {dev, user, userAssert} from '#utils/log'; + import {getMode} from './mode'; import {addParamsToUrl, isProxyOrigin, parseUrlDeprecated} from './url'; diff --git a/src/inabox/inabox-resources.js b/src/inabox/inabox-resources.js index cee1b361af3a..fddd5feaf005 100644 --- a/src/inabox/inabox-resources.js +++ b/src/inabox/inabox-resources.js @@ -7,7 +7,8 @@ import {Services} from '#service'; import {Resource, ResourceState} from '#service/resource'; import {READY_SCAN_SIGNAL} from '#service/resources-interface'; -import {dev} from '../log'; +import {dev} from '#utils/log'; + import {getMode} from '../mode'; import {Pass} from '../pass'; import {registerServiceBuilderForDoc} from '../service-helpers'; diff --git a/src/inabox/inabox-viewport.js b/src/inabox/inabox-viewport.js index 4f9c7cb83718..6165b9635939 100644 --- a/src/inabox/inabox-viewport.js +++ b/src/inabox/inabox-viewport.js @@ -17,10 +17,11 @@ import {Services} from '#service'; import {ViewportBindingDef} from '#service/viewport/viewport-binding-def'; import {ViewportInterface} from '#service/viewport/viewport-interface'; +import {dev} from '#utils/log'; + import {iframeMessagingClientFor} from './inabox-iframe-messaging-client'; import {canInspectWindow} from '../iframe-helper'; -import {dev} from '../log'; import {registerServiceBuilderForDoc} from '../service-helpers'; /** @const {string} */ diff --git a/src/inabox/utils.js b/src/inabox/utils.js index 25d25794d9fb..abf53033279f 100644 --- a/src/inabox/utils.js +++ b/src/inabox/utils.js @@ -1,6 +1,7 @@ import {Services} from '#service'; -import {createCustomEvent} from '../event-helper'; +import {createCustomEvent} from '#utils/event-helper'; + import {whenContentIniLoadMeasure} from '../ini-load'; /** diff --git a/src/input.js b/src/input.js index 922e2e7c2e07..6e7f4bcbd960 100644 --- a/src/input.js +++ b/src/input.js @@ -2,8 +2,9 @@ import {Observable} from '#core/data-structures/observable'; import {Services} from '#service'; -import {listenOnce, listenOncePromise} from './event-helper'; -import {dev} from './log'; +import {listenOnce, listenOncePromise} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {registerServiceBuilder} from './service-helpers'; const TAG_ = 'Input'; diff --git a/src/mediasession-helper.js b/src/mediasession-helper.js index f2ac08a43c1d..7fdb2e205f93 100644 --- a/src/mediasession-helper.js +++ b/src/mediasession-helper.js @@ -3,7 +3,7 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {devAssert, userAssert} from './log'; +import {devAssert, userAssert} from '#utils/log'; /** * @typedef {{ diff --git a/src/module.js b/src/module.js index ee8ddcd033b9..5c525643f2df 100644 --- a/src/module.js +++ b/src/module.js @@ -1,4 +1,4 @@ -import {dev} from './log'; +import {dev} from '#utils/log'; const TAG = 'AMP.require'; diff --git a/src/multidoc-manager.js b/src/multidoc-manager.js index 9a2d1a40868a..056dbe67b0fa 100644 --- a/src/multidoc-manager.js +++ b/src/multidoc-manager.js @@ -8,7 +8,8 @@ import {isArray, isObject} from '#core/types'; import {Services} from '#service'; import {parseExtensionUrl} from '#service/extension-script'; -import {dev, user} from './log'; +import {dev, user} from '#utils/log'; + import {getMode} from './mode'; import { disposeServicesForDoc, diff --git a/src/open-window-dialog.js b/src/open-window-dialog.js index f5aebaf5ea47..c7b8ed69262c 100644 --- a/src/open-window-dialog.js +++ b/src/open-window-dialog.js @@ -1,6 +1,6 @@ import {includes} from '#core/types/string'; -import {dev} from './log'; +import {dev} from '#utils/log'; /** * This method wraps around window's open method. It first tries to execute diff --git a/src/pixel.js b/src/pixel.js index 0eff9f6dc1c5..cb77446b18ef 100644 --- a/src/pixel.js +++ b/src/pixel.js @@ -2,7 +2,7 @@ import {createElementWithAttributes} from '#core/dom'; import {dict} from '#core/types/object'; import {WindowInterface} from '#core/window/interface'; -import {user} from './log'; +import {user} from '#utils/log'; /** @const {string} */ const TAG = 'pixel'; diff --git a/src/polyfills/fetch.js b/src/polyfills/fetch.js index 1e9a904c556d..b6bb997cae0f 100644 --- a/src/polyfills/fetch.js +++ b/src/polyfills/fetch.js @@ -4,7 +4,7 @@ import {hasOwn, map} from '#core/types/object'; import {parseJson} from '#core/types/object/json'; import {utf8Encode} from '#core/types/string/bytes'; -import {dev, user} from '../log'; +import {dev, user} from '#utils/log'; /** @enum {number} Allowed fetch responses. */ const allowedFetchTypes = { diff --git a/src/preconnect.js b/src/preconnect.js index b2e7f7d8b86a..978f72ac9b15 100644 --- a/src/preconnect.js +++ b/src/preconnect.js @@ -3,12 +3,13 @@ * connection before the real request can be made. */ -import {whenDocumentComplete} from '#core/document-ready'; +import {whenDocumentComplete} from '#core/document/ready'; import {htmlFor} from '#core/dom/static-template'; import {Services} from '#service'; -import {dev} from './log'; +import {dev} from '#utils/log'; + import {registerServiceBuilder} from './service-helpers'; import {parseUrlDeprecated} from './url'; diff --git a/src/purifier/index.js b/src/purifier/index.js index c2c00f608101..b13a9109ae1d 100644 --- a/src/purifier/index.js +++ b/src/purifier/index.js @@ -1,8 +1,11 @@ import purify from 'dompurify'; import {devAssertElement} from '#core/assert'; +import {isAmp4Email} from '#core/document/format'; import {removeElement} from '#core/dom'; +import {user} from '#utils/log'; + import { ALLOWLISTED_ATTRS, ALLOWLISTED_ATTRS_BY_TAGS, @@ -15,9 +18,6 @@ import { markElementForDiffing, } from './sanitation'; -import {isAmp4Email} from '../format'; -import {user} from '../log'; - /** @private @const {string} */ const TAG = 'purifier'; diff --git a/src/purifier/sanitation.js b/src/purifier/sanitation.js index d4bafb639ceb..c680a56e6ece 100644 --- a/src/purifier/sanitation.js +++ b/src/purifier/sanitation.js @@ -1,6 +1,6 @@ +import {isAmp4Email} from '#core/document/format'; import {dict, map} from '#core/types/object'; -import {isAmp4Email} from '../format'; import {isUrlAttribute} from '../url-rewrite'; /** @const {string} */ diff --git a/src/render-delaying-services.js b/src/render-delaying-services.js index 041c97a3acd5..dd97baf88d54 100644 --- a/src/render-delaying-services.js +++ b/src/render-delaying-services.js @@ -1,6 +1,7 @@ import {Services} from '#service'; -import {devAssert} from './log'; +import {devAssert} from '#utils/log'; + import {getServicePromise} from './service-helpers'; /** diff --git a/src/runtime.js b/src/runtime.js index 06ebd640180b..3e66671ef338 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -18,17 +18,18 @@ import { stubLegacyElements, } from '#service/extensions-impl'; -import {BaseElement} from './base-element'; -import {startupChunk} from './chunk'; -import {config} from './config'; -import {reportErrorForWin} from './error-reporting'; import { LogLevel, // eslint-disable-line no-unused-vars dev, initLogConstructor, overrideLogLevel, setReportError, -} from './log'; +} from '#utils/log'; + +import {BaseElement} from './base-element'; +import {startupChunk} from './chunk'; +import {config} from './config'; +import {reportErrorForWin} from './error-reporting'; import {getMode} from './mode'; import {MultidocManager} from './multidoc-manager'; import {hasRenderDelayingServices} from './render-delaying-services'; diff --git a/src/sanitizer.js b/src/sanitizer.js index 5594e29412e6..7979282a705b 100644 --- a/src/sanitizer.js +++ b/src/sanitizer.js @@ -1,3 +1,4 @@ +import {isAmp4Email} from '#core/document/format'; import {dict} from '#core/types/object'; import { @@ -11,10 +12,10 @@ import { isValidAttr, } from '#purifier/sanitation'; +import {user} from '#utils/log'; + import {htmlSanitizer} from '#third_party/caja/html-sanitizer'; -import {isAmp4Email} from './format'; -import {user} from './log'; import {rewriteAttributeValue} from './url-rewrite'; /** @private @const {string} */ diff --git a/src/service-helpers.js b/src/service-helpers.js index 4255090a2419..8faa6db2134b 100644 --- a/src/service-helpers.js +++ b/src/service-helpers.js @@ -7,7 +7,7 @@ import {Deferred} from '#core/data-structures/promise'; import {toWin} from '#core/window'; -import {dev, devAssert} from './log'; +import {dev, devAssert} from '#utils/log'; /** * Holds info about a service. diff --git a/src/service/action-impl.js b/src/service/action-impl.js index ff7c2801bfe0..6f8e5bc15f68 100644 --- a/src/service/action-impl.js +++ b/src/service/action-impl.js @@ -5,6 +5,7 @@ import { actionTrustToString, } from '#core/constants/action-constants'; import {Keys} from '#core/constants/key-codes'; +import {isAmp4Email} from '#core/document/format'; import {isEnabled} from '#core/dom'; import {isFiniteNumber} from '#core/types'; import {isArray, toArray} from '#core/types/array'; @@ -14,10 +15,10 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {getDetail} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {reportError} from '../error-reporting'; -import {getDetail} from '../event-helper'; -import {isAmp4Email} from '../format'; -import {dev, devAssert, user, userAssert} from '../log'; import {getMode} from '../mode'; import {registerServiceBuilderForDoc} from '../service-helpers'; diff --git a/src/service/ampdoc-impl.js b/src/service/ampdoc-impl.js index dd0a5d9e316b..ebaf9efbf5b0 100644 --- a/src/service/ampdoc-impl.js +++ b/src/service/ampdoc-impl.js @@ -2,19 +2,20 @@ import {VisibilityState} from '#core/constants/visibility-state'; import {Observable} from '#core/data-structures/observable'; import {Deferred} from '#core/data-structures/promise'; import {Signals} from '#core/data-structures/signals'; -import {isDocumentReady, whenDocumentReady} from '#core/document-ready'; +import {isDocumentReady, whenDocumentReady} from '#core/document/ready'; import { addDocumentVisibilityChangeListener, getDocumentVisibilityState, removeDocumentVisibilityChangeListener, -} from '#core/document-visibility'; +} from '#core/document/visibility'; import {iterateCursor, rootNodeFor, waitForBodyOpenPromise} from '#core/dom'; import {isEnumValue} from '#core/types'; import {map} from '#core/types/object'; import {parseQueryString} from '#core/types/string/url'; import {WindowInterface} from '#core/window/interface'; -import {dev, devAssert} from '../log'; +import {dev, devAssert} from '#utils/log'; + import { disposeServicesForDoc, getParentWindowFrameElement, diff --git a/src/service/cache-cid-api.js b/src/service/cache-cid-api.js index cc6a828c6add..7c6075303c56 100644 --- a/src/service/cache-cid-api.js +++ b/src/service/cache-cid-api.js @@ -2,7 +2,8 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; -import {dev} from '../log'; +import {dev} from '#utils/log'; + import {getSourceOrigin} from '../url'; /** diff --git a/src/service/cid-api.js b/src/service/cid-api.js index 820ad542d992..dd21554a851a 100644 --- a/src/service/cid-api.js +++ b/src/service/cid-api.js @@ -3,8 +3,9 @@ import {WindowInterface} from '#core/window/interface'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import {getCookie, setCookie} from '../cookies'; -import {dev} from '../log'; import {isProxyOrigin, parseUrlDeprecated} from '../url'; const GOOGLE_API_URL = diff --git a/src/service/cid-impl.js b/src/service/cid-impl.js index ac547f33fbfa..490fcf7d515a 100644 --- a/src/service/cid-impl.js +++ b/src/service/cid-impl.js @@ -18,12 +18,13 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {CacheCidApi} from './cache-cid-api'; import {GoogleCidApi, TokenStatus} from './cid-api'; import {ViewerCidApi} from './viewer-cid-api'; import {getCookie, setCookie} from '../cookies'; -import {dev, user, userAssert} from '../log'; import { getServiceForDoc, registerServiceBuilderForDoc, diff --git a/src/service/core-services.js b/src/service/core-services.js index 41ff6ef4c9b3..1021765aa0f5 100644 --- a/src/service/core-services.js +++ b/src/service/core-services.js @@ -4,6 +4,8 @@ import {installPixel} from '#builtins/amp-pixel/amp-pixel'; import {installInaboxResourcesServiceForDoc} from '#inabox/inabox-resources'; +import {devAssert} from '#utils/log'; + import {installActionServiceForDoc} from './action-impl'; import {installBatchedXhrService} from './batched-xhr-impl'; import {installCidService} from './cid-impl'; @@ -30,7 +32,6 @@ import {installXhrService} from './xhr-impl'; import {installGlobalSubmitListenerForDoc} from '../document-submit'; import {installInputService} from '../input'; -import {devAssert} from '../log'; import {installPreconnectService} from '../preconnect'; import { adoptServiceFactoryForEmbedDoc, diff --git a/src/service/crypto-impl.js b/src/service/crypto-impl.js index f9dbe190d253..eb708bafd1e7 100644 --- a/src/service/crypto-impl.js +++ b/src/service/crypto-impl.js @@ -3,7 +3,8 @@ import {stringToBytes, utf8Encode} from '#core/types/string/bytes'; import {Services} from '#service'; -import {dev, devAssert, user} from '../log'; +import {dev, devAssert, user} from '#utils/log'; + import {getService, registerServiceBuilder} from '../service-helpers'; /** @const {string} */ diff --git a/src/service/custom-element-registry.js b/src/service/custom-element-registry.js index 547cf06a02be..8a4e8b2ed2ab 100644 --- a/src/service/custom-element-registry.js +++ b/src/service/custom-element-registry.js @@ -1,5 +1,7 @@ import {Services} from '#service'; +import {userAssert} from '#utils/log'; + import {extensionScriptsInNode} from './extension-script'; import { @@ -9,7 +11,6 @@ import { } from '../custom-element'; import {ElementStub} from '../element-stub'; import {reportError} from '../error-reporting'; -import {userAssert} from '../log'; /** @type {!WeakMap} */ const docInitializedMap = new WeakMap(); diff --git a/src/service/extensions-impl.js b/src/service/extensions-impl.js index 19ac24de9f60..7eaed9a3a067 100644 --- a/src/service/extensions-impl.js +++ b/src/service/extensions-impl.js @@ -4,6 +4,8 @@ import {map} from '#core/types/object'; import {Services} from '#service'; +import {dev, devAssert, user} from '#utils/log'; + import { copyElementToChildWindow, stubElementIfNotKnown, @@ -12,7 +14,6 @@ import { import {createExtensionScript, getExtensionScripts} from './extension-script'; import {registerExtendedTemplateForDoc} from './template-impl'; -import {dev, devAssert, user} from '../log'; import {getMode} from '../mode'; import { registerServiceBuilder, diff --git a/src/service/fixed-layer.js b/src/service/fixed-layer.js index 5de187d4d57f..21316003c6c9 100644 --- a/src/service/fixed-layer.js +++ b/src/service/fixed-layer.js @@ -16,8 +16,9 @@ import {endsWith} from '#core/types/string'; import {Services} from '#service'; -import {Animation} from '../animation'; -import {dev, user} from '../log'; +import {Animation} from '#utils/animation'; +import {dev, user} from '#utils/log'; + import {getMode} from '../mode'; import {Pass} from '../pass'; diff --git a/src/service/hidden-observer-impl.js b/src/service/hidden-observer-impl.js index bec71bef2e68..d57b7c21db1c 100644 --- a/src/service/hidden-observer-impl.js +++ b/src/service/hidden-observer-impl.js @@ -1,6 +1,7 @@ import {Observable} from '#core/data-structures/observable'; -import {devAssert} from '../log'; +import {devAssert} from '#utils/log'; + import {registerServiceBuilderForDoc} from '../service-helpers'; /** diff --git a/src/service/history-impl.js b/src/service/history-impl.js index 01915327fdc8..ebf66b044e09 100644 --- a/src/service/history-impl.js +++ b/src/service/history-impl.js @@ -4,7 +4,8 @@ import {getHistoryState} from '#core/window/history'; import {Services} from '#service'; -import {dev, devAssert} from '../log'; +import {dev, devAssert} from '#utils/log'; + import {getMode} from '../mode'; import { getService, diff --git a/src/service/mutator-impl.js b/src/service/mutator-impl.js index 7639b26a877b..b4ea6d54fadb 100644 --- a/src/service/mutator-impl.js +++ b/src/service/mutator-impl.js @@ -6,11 +6,12 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import {MutatorInterface} from './mutator-interface'; import {Resource} from './resource'; import {FocusHistory} from '../focus-history'; -import {dev} from '../log'; import {registerServiceBuilderForDoc} from '../service-helpers'; const FOUR_FRAME_DELAY_ = 70; diff --git a/src/service/navigation.js b/src/service/navigation.js index dd461eccd3d5..301f761f5485 100644 --- a/src/service/navigation.js +++ b/src/service/navigation.js @@ -7,8 +7,9 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {getExtraParamsUrl, shouldAppendExtraParams} from '../impression'; -import {dev, user, userAssert} from '../log'; import {getMode} from '../mode'; import {openWindowDialog} from '../open-window-dialog'; import {registerServiceBuilderForDoc} from '../service-helpers'; diff --git a/src/service/origin-experiments-impl.js b/src/service/origin-experiments-impl.js index 001a563b28a6..5fb71fc43b37 100644 --- a/src/service/origin-experiments-impl.js +++ b/src/service/origin-experiments-impl.js @@ -3,7 +3,8 @@ import {bytesToString, stringToBytes} from '#core/types/string/bytes'; import {Services} from '#service'; -import {user} from '../log'; +import {user} from '#utils/log'; + import { getServiceForDoc, registerServiceBuilderForDoc, diff --git a/src/service/owners-impl.js b/src/service/owners-impl.js index 293ad155ff5f..a830c6bb6ea5 100644 --- a/src/service/owners-impl.js +++ b/src/service/owners-impl.js @@ -2,10 +2,11 @@ import {isArray} from '#core/types'; import {Services} from '#service'; +import {devAssert} from '#utils/log'; + import {OwnersInterface} from './owners-interface'; import {Resource} from './resource'; -import {devAssert} from '../log'; import {registerServiceBuilderForDoc} from '../service-helpers'; /** diff --git a/src/service/performance-impl.js b/src/service/performance-impl.js index f6a2be0fa4c5..989b84403f74 100644 --- a/src/service/performance-impl.js +++ b/src/service/performance-impl.js @@ -1,7 +1,7 @@ import {TickLabel} from '#core/constants/enums'; import {VisibilityState} from '#core/constants/visibility-state'; import {Signals} from '#core/data-structures/signals'; -import {whenDocumentComplete, whenDocumentReady} from '#core/document-ready'; +import {whenDocumentComplete, whenDocumentReady} from '#core/document/ready'; import {layoutRectLtwh} from '#core/dom/layout/rect'; import {computedStyle} from '#core/dom/style'; import {debounce} from '#core/types/function'; @@ -9,12 +9,13 @@ import {dict, map} from '#core/types/object'; import {Services} from '#service'; -import {createCustomEvent} from '../event-helper'; +import {createCustomEvent} from '#utils/event-helper'; +import {dev, devAssert} from '#utils/log'; +import {isStoryDocument} from '#utils/story'; + import {whenContentIniLoad} from '../ini-load'; -import {dev, devAssert} from '../log'; import {getMode} from '../mode'; import {getService, registerServiceBuilder} from '../service-helpers'; -import {isStoryDocument} from '../utils/story'; /** * Maximum number of tick events we allow to accumulate in the performance diff --git a/src/service/position-observer/position-observer-impl.js b/src/service/position-observer/position-observer-impl.js index e660bd9275ee..235cd2807ba7 100644 --- a/src/service/position-observer/position-observer-impl.js +++ b/src/service/position-observer/position-observer-impl.js @@ -2,12 +2,13 @@ import {debounce} from '#core/types/function'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import { PositionObserverFidelity, // eslint-disable-line no-unused-vars PositionObserverWorker, } from './position-observer-worker'; -import {dev} from '../../log'; import {registerServiceBuilderForDoc} from '../../service-helpers'; /** @const @private */ diff --git a/src/service/position-observer/position-observer-worker.js b/src/service/position-observer/position-observer-worker.js index 07bfab3a96ff..d71ad5f32347 100644 --- a/src/service/position-observer/position-observer-worker.js +++ b/src/service/position-observer/position-observer-worker.js @@ -7,7 +7,7 @@ import { import {Services} from '#service'; -import {devAssert} from '../../log'; +import {devAssert} from '#utils/log'; /** @enum {number} */ export const PositionObserverFidelity = { diff --git a/src/service/real-time-config/real-time-config-impl.js b/src/service/real-time-config/real-time-config-impl.js index 088b014c33ce..6f0f28f0098e 100644 --- a/src/service/real-time-config/real-time-config-impl.js +++ b/src/service/real-time-config/real-time-config-impl.js @@ -4,10 +4,11 @@ import {tryParseJson} from '#core/types/object/json'; import {Services} from '#service'; +import {dev, user, userAssert} from '#utils/log'; + import {RTC_VENDORS} from './callout-vendors'; import {isCancellation} from '../../error-reporting'; -import {dev, user, userAssert} from '../../log'; import {getMode} from '../../mode'; import {registerServiceBuilderForDoc} from '../../service-helpers'; import {isAmpScriptUri} from '../../url'; diff --git a/src/service/resource.js b/src/service/resource.js index 54b0ea4062fd..f24ddfc4e0c2 100644 --- a/src/service/resource.js +++ b/src/service/resource.js @@ -12,12 +12,13 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {dev, devAssert} from '#utils/log'; + import { cancellation, isBlockedByConsent, reportError, } from '../error-reporting'; -import {dev, devAssert} from '../log'; const TAG = 'Resource'; const RESOURCE_PROP_ = '__AMP__RESOURCE'; diff --git a/src/service/resources-impl.js b/src/service/resources-impl.js index b706ad3e96f2..63bd9e0e852b 100644 --- a/src/service/resources-impl.js +++ b/src/service/resources-impl.js @@ -10,15 +10,16 @@ import {dict} from '#core/types/object'; import {Services} from '#service'; +import {listen, loadPromise} from '#utils/event-helper'; +import {dev, devAssert} from '#utils/log'; + import {Resource, ResourceState} from './resource'; import {READY_SCAN_SIGNAL, ResourcesInterface} from './resources-interface'; import {TaskQueue} from './task-queue'; import {startupChunk} from '../chunk'; import {isBlockedByConsent, reportError} from '../error-reporting'; -import {listen, loadPromise} from '../event-helper'; import {FocusHistory} from '../focus-history'; -import {dev, devAssert} from '../log'; import {Pass} from '../pass'; import {registerServiceBuilderForDoc} from '../service-helpers'; import {getSourceUrl} from '../url'; diff --git a/src/service/standard-actions-impl.js b/src/service/standard-actions-impl.js index d80fd803ac18..ed5be2b2a002 100644 --- a/src/service/standard-actions-impl.js +++ b/src/service/standard-actions-impl.js @@ -7,7 +7,8 @@ import {toWin} from '#core/window'; import {Services} from '#service'; -import {dev, user, userAssert} from '../log'; +import {dev, user, userAssert} from '#utils/log'; + import {getAmpdoc, registerServiceBuilderForDoc} from '../service-helpers'; /** diff --git a/src/service/storage-impl.js b/src/service/storage-impl.js index 2ca9dec92342..5d1c6b96f3c4 100644 --- a/src/service/storage-impl.js +++ b/src/service/storage-impl.js @@ -3,7 +3,8 @@ import {parseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {dev, devAssert} from '../log'; +import {dev, devAssert} from '#utils/log'; + import {registerServiceBuilderForDoc} from '../service-helpers'; import {getSourceOrigin} from '../url'; diff --git a/src/service/task-queue.js b/src/service/task-queue.js index 4184b7dff031..ac45e3d756f9 100644 --- a/src/service/task-queue.js +++ b/src/service/task-queue.js @@ -1,4 +1,4 @@ -import {devAssert} from '../log'; +import {devAssert} from '#utils/log'; /** * The internal structure for the task. diff --git a/src/service/template-impl.js b/src/service/template-impl.js index 9267b7a0b918..e73a77e19834 100644 --- a/src/service/template-impl.js +++ b/src/service/template-impl.js @@ -2,7 +2,8 @@ import {Deferred} from '#core/data-structures/promise'; import {rootNodeFor} from '#core/dom'; import {scopedQuerySelector} from '#core/dom/query'; -import {userAssert} from '../log'; +import {userAssert} from '#utils/log'; + import { getServiceForDoc, registerServiceBuilderForDoc, diff --git a/src/service/timer-impl.js b/src/service/timer-impl.js index 2ffa50123036..69781442b3ef 100644 --- a/src/service/timer-impl.js +++ b/src/service/timer-impl.js @@ -1,5 +1,6 @@ +import {user} from '#utils/log'; + import {reportError} from '../error-reporting'; -import {user} from '../log'; import {getMode} from '../mode'; import { registerServiceBuilder, diff --git a/src/service/url-expander/expander.js b/src/service/url-expander/expander.js index 1a38ae7a41cb..8a0b9d61c720 100644 --- a/src/service/url-expander/expander.js +++ b/src/service/url-expander/expander.js @@ -3,7 +3,7 @@ import {rethrowAsync} from '#core/error'; import {hasOwn} from '#core/types/object'; import {trimStart} from '#core/types/string'; -import {user} from '../../log'; +import {user} from '#utils/log'; /** @private @const {string} */ const PARSER_IGNORE_FLAG = '`'; diff --git a/src/service/url-replacements-impl.js b/src/service/url-replacements-impl.js index b0e32d4fe12a..86adc855a311 100644 --- a/src/service/url-replacements-impl.js +++ b/src/service/url-replacements-impl.js @@ -5,6 +5,8 @@ import {WindowInterface} from '#core/window/interface'; import {Services} from '#service'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {Expander} from './url-expander/expander'; import { AsyncResolverDef, @@ -17,7 +19,6 @@ import { } from './variable-source'; import {getTrackImpressionPromise} from '../impression'; -import {dev, devAssert, user, userAssert} from '../log'; import { installServiceInEmbedDoc, registerServiceBuilderForDoc, diff --git a/src/service/variable-source.js b/src/service/variable-source.js index 52f0c81ff531..4b3ce9c38e01 100644 --- a/src/service/variable-source.js +++ b/src/service/variable-source.js @@ -1,11 +1,11 @@ -import {whenDocumentComplete} from '#core/document-ready'; +import {isAmp4Email} from '#core/document/format'; +import {whenDocumentComplete} from '#core/document/ready'; import {isFiniteNumber} from '#core/types'; import {Services} from '#service'; -import {loadPromise} from '../event-helper'; -import {isAmp4Email} from '../format'; -import {devAssert} from '../log'; +import {loadPromise} from '#utils/event-helper'; +import {devAssert} from '#utils/log'; /** @typedef {string|number|boolean|undefined|null} */ export let ResolverReturnDef; diff --git a/src/service/video-manager-impl.js b/src/service/video-manager-impl.js index 9562fb75650a..515c3702a6b4 100644 --- a/src/service/video-manager-impl.js +++ b/src/service/video-manager-impl.js @@ -15,12 +15,18 @@ import {dict, map} from '#core/types/object'; import {Services} from '#service'; +import { + createCustomEvent, + getData, + listen, + listenOnce, +} from '#utils/event-helper'; +import {dev, devAssert, user, userAssert} from '#utils/log'; + import {VideoSessionManager} from './video-session-manager'; import {renderIcon, renderInteractionOverlay} from './video/autoplay'; import {installAutoplayStylesForDoc} from './video/install-autoplay-styles'; -import {createCustomEvent, getData, listen, listenOnce} from '../event-helper'; -import {dev, devAssert, user, userAssert} from '../log'; import { EMPTY_METADATA, parseFavicon, diff --git a/src/service/video/autoplay.js b/src/service/video/autoplay.js index bde8e51f2f3b..6aee3d437fbb 100644 --- a/src/service/video/autoplay.js +++ b/src/service/video/autoplay.js @@ -1,7 +1,7 @@ import {removeElement} from '#core/dom'; import {htmlFor} from '#core/dom/static-template'; -import {dev} from '../../log'; +import {dev} from '#utils/log'; /** * @param {!Element} node diff --git a/src/service/viewer-impl.js b/src/service/viewer-impl.js index b7a492a41bda..309b8f640f68 100644 --- a/src/service/viewer-impl.js +++ b/src/service/viewer-impl.js @@ -12,12 +12,13 @@ import {parseQueryString} from '#core/types/string/url'; import {Services} from '#service'; +import {listen} from '#utils/event-helper'; +import {dev, devAssert} from '#utils/log'; + import {ViewerInterface} from './viewer-interface'; import {urls} from '../config'; import {reportError} from '../error-reporting'; -import {listen} from '../event-helper'; -import {dev, devAssert} from '../log'; import {registerServiceBuilderForDoc} from '../service-helpers'; import { getSourceOrigin, diff --git a/src/service/viewport/viewport-binding-ios-embed-wrapper.js b/src/service/viewport/viewport-binding-ios-embed-wrapper.js index 1b24e9fcf48b..2e4238770d19 100644 --- a/src/service/viewport/viewport-binding-ios-embed-wrapper.js +++ b/src/service/viewport/viewport-binding-ios-embed-wrapper.js @@ -1,5 +1,5 @@ import {Observable} from '#core/data-structures/observable'; -import {whenDocumentReady} from '#core/document-ready'; +import {whenDocumentReady} from '#core/document/ready'; import {waitForBodyOpen} from '#core/dom'; import {layoutRectLtwh} from '#core/dom/layout/rect'; import {computedStyle, px, setImportantStyles} from '#core/dom/style'; @@ -8,13 +8,13 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import { ViewportBindingDef, marginBottomOfLastChild, } from './viewport-binding-def'; -import {dev} from '../../log'; - const TAG_ = 'Viewport'; /** diff --git a/src/service/viewport/viewport-binding-natural.js b/src/service/viewport/viewport-binding-natural.js index 2aea9cd8d069..4b0121809047 100644 --- a/src/service/viewport/viewport-binding-natural.js +++ b/src/service/viewport/viewport-binding-natural.js @@ -4,13 +4,13 @@ import {computedStyle, px, setImportantStyles} from '#core/dom/style'; import {Services} from '#service'; +import {dev} from '#utils/log'; + import { ViewportBindingDef, marginBottomOfLastChild, } from './viewport-binding-def'; -import {dev} from '../../log'; - const TAG_ = 'Viewport'; /** diff --git a/src/service/viewport/viewport-impl.js b/src/service/viewport/viewport-impl.js index ff2246a58c05..7c8566b463ff 100644 --- a/src/service/viewport/viewport-impl.js +++ b/src/service/viewport/viewport-impl.js @@ -17,14 +17,15 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {Animation} from '#utils/animation'; +import {dev, devAssert} from '#utils/log'; + import {ViewportBindingDef} from './viewport-binding-def'; import {ViewportBindingIosEmbedWrapper_} from './viewport-binding-ios-embed-wrapper'; import {ViewportBindingNatural_} from './viewport-binding-natural'; import {ViewportInterface} from './viewport-interface'; -import {Animation} from '../../animation'; import {getFriendlyIframeEmbedOptional} from '../../iframe-helper'; -import {dev, devAssert} from '../../log'; import {getMode} from '../../mode'; import { getParentWindowFrameElement, diff --git a/src/service/vsync-impl.js b/src/service/vsync-impl.js index bccd058648aa..7bdfdd4b1c0f 100644 --- a/src/service/vsync-impl.js +++ b/src/service/vsync-impl.js @@ -3,15 +3,16 @@ import { addDocumentVisibilityChangeListener, isDocumentHidden, removeDocumentVisibilityChangeListener, -} from '#core/document-visibility'; +} from '#core/document/visibility'; import {rethrowAsync} from '#core/error'; import {Services} from '#service'; +import {dev, devAssert} from '#utils/log'; + import {installTimerService} from './timer-impl'; import {cancellation} from '../error-reporting'; -import {dev, devAssert} from '../log'; import {Pass} from '../pass'; import {getService, registerServiceBuilder} from '../service-helpers'; diff --git a/src/service/xhr-impl.js b/src/service/xhr-impl.js index dbfffca868dd..36c1cf601cbb 100644 --- a/src/service/xhr-impl.js +++ b/src/service/xhr-impl.js @@ -2,10 +2,7 @@ import {parseJson} from '#core/types/object/json'; import {Services} from '#service'; -import {isFormDataWrapper} from '../form-data-wrapper'; -import {dev, user} from '../log'; -import {getService, registerServiceBuilder} from '../service-helpers'; -import {getCorsUrl, parseUrlDeprecated} from '../url'; +import {dev, user} from '#utils/log'; import { assertSuccess, getViewerInterceptResponse, @@ -13,7 +10,11 @@ import { setupInit, setupInput, setupJsonFetchInit, -} from '../utils/xhr-utils'; +} from '#utils/xhr-utils'; + +import {isFormDataWrapper} from '../form-data-wrapper'; +import {getService, registerServiceBuilder} from '../service-helpers'; +import {getCorsUrl, parseUrlDeprecated} from '../url'; /** * A service that polyfills Fetch API for use within AMP. diff --git a/src/shadow-embed.js b/src/shadow-embed.js index 0fd126b603dd..b08be323568e 100644 --- a/src/shadow-embed.js +++ b/src/shadow-embed.js @@ -11,9 +11,10 @@ import {toWin} from '#core/window'; import {Services} from '#service'; +import {dev, devAssert} from '#utils/log'; + import {ShadowCSS} from '#third_party/webcomponentsjs/ShadowCSS'; -import {dev, devAssert} from './log'; import {installCssTransformer} from './style-installer'; import {DomWriterBulk, DomWriterStreamer} from './utils/dom-writer'; diff --git a/src/ssr-template-helper.js b/src/ssr-template-helper.js index e2f3fd9e5a12..d2d941574a94 100644 --- a/src/ssr-template-helper.js +++ b/src/ssr-template-helper.js @@ -1,7 +1,8 @@ import {isArray} from '#core/types'; import {dict} from '#core/types/object'; -import {userAssert} from './log'; +import {userAssert} from '#utils/log'; + import {toStructuredCloneable} from './utils/xhr-utils'; /** diff --git a/src/standalone.js b/src/standalone.js index 2c5cf93a2d96..ecadb2acf833 100644 --- a/src/standalone.js +++ b/src/standalone.js @@ -1,7 +1,8 @@ +import {isAmphtml} from '#core/document/format'; + import {Services} from '#service'; import {ChunkPriority, chunk} from './chunk'; -import {isAmphtml} from './format'; /** * @param {!./service/ampdoc-impl.AmpDoc} ampdoc diff --git a/src/style-installer.js b/src/style-installer.js index e2eb84a7d7e3..4762cfd29a83 100644 --- a/src/style-installer.js +++ b/src/style-installer.js @@ -7,7 +7,8 @@ import {map} from '#core/types/object'; import {Services} from '#service'; -import {dev, devAssert} from './log'; +import {dev, devAssert} from '#utils/log'; + import {waitForServices} from './render-delaying-services'; import {getAmpdoc} from './service-helpers'; diff --git a/src/url-rewrite.js b/src/url-rewrite.js index 9daa88bdbd9b..ed6f753f6cc8 100644 --- a/src/url-rewrite.js +++ b/src/url-rewrite.js @@ -1,7 +1,8 @@ import {parseSrcset} from '#core/dom/srcset'; +import {user} from '#utils/log'; + import {urls} from './config'; -import {user} from './log'; import { checkCorsUrl, getSourceUrl, diff --git a/src/url.js b/src/url.js index 9a47a809b6a3..91db92062ee0 100644 --- a/src/url.js +++ b/src/url.js @@ -5,8 +5,9 @@ import {dict, hasOwn} from '#core/types/object'; import {endsWith} from '#core/types/string'; import {parseQueryString} from '#core/types/string/url'; +import {userAssert} from '#utils/log'; + import {urls} from './config'; -import {userAssert} from './log'; const SERVING_TYPE_PREFIX = new Set([ // No viewer diff --git a/src/analytics.js b/src/utils/analytics.js similarity index 100% rename from src/analytics.js rename to src/utils/analytics.js diff --git a/src/animation.js b/src/utils/animation.js similarity index 99% rename from src/animation.js rename to src/utils/animation.js index 5991ce32e9f8..68d464e7ab28 100644 --- a/src/animation.js +++ b/src/utils/animation.js @@ -4,7 +4,7 @@ import {TimestampDef} from '#core/types/date'; import {Services} from '#service'; -import {dev} from './log'; +import {dev} from '#utils/log'; const TAG_ = 'Animation'; diff --git a/src/utils/dom-ancestor-visitor.js b/src/utils/dom-ancestor-visitor.js index d25b7b745634..99fa31943657 100644 --- a/src/utils/dom-ancestor-visitor.js +++ b/src/utils/dom-ancestor-visitor.js @@ -1,7 +1,7 @@ import {devAssert, devAssertElement} from '#core/assert'; import {computedStyle} from '#core/dom/style'; -import {dev} from '../log'; +import {dev} from '#utils/log'; /** @typedef { * function(!Element, !Object): * diff --git a/src/utils/dom-writer.js b/src/utils/dom-writer.js index 320151d5722d..766bf05ca84b 100644 --- a/src/utils/dom-writer.js +++ b/src/utils/dom-writer.js @@ -4,7 +4,7 @@ import {childElementsByTag} from '#core/dom/query'; import {Services} from '#service'; -import {dev} from '../log'; +import {dev} from '#utils/log'; /** * Takes as an input a text stream, parses it and incrementally reconstructs diff --git a/src/event-helper.js b/src/utils/event-helper.js similarity index 99% rename from src/event-helper.js rename to src/utils/event-helper.js index 992ee54f1a41..8fe4ae08a99f 100644 --- a/src/event-helper.js +++ b/src/utils/event-helper.js @@ -2,7 +2,7 @@ import {internalListenImplementation} from '#core/dom/event-helper-listen'; import {lastChildElement} from '#core/dom/query'; import * as mode from '#core/mode'; -import {user} from './log'; +import {user} from '#utils/log'; /** @const {string} */ const LOAD_FAILURE_PREFIX = 'Failed to load:'; diff --git a/src/log.js b/src/utils/log.js similarity index 99% rename from src/log.js rename to src/utils/log.js index 3ea8619a71ef..c53be165f9c8 100644 --- a/src/log.js +++ b/src/utils/log.js @@ -16,8 +16,8 @@ import {isArray, isString} from '#core/types'; import {once} from '#core/types/function'; import {getHashParams} from '#core/types/string/url'; -import {urls} from './config'; -import {getMode} from './mode'; +import {urls} from '../config'; +import {getMode} from '../mode'; const noop = () => {}; diff --git a/src/utils/xhr-utils.js b/src/utils/xhr-utils.js index 41cca589ffaa..28405299f56d 100644 --- a/src/utils/xhr-utils.js +++ b/src/utils/xhr-utils.js @@ -6,8 +6,9 @@ import {isExperimentOn} from '#experiments'; import {Services} from '#service'; +import {user} from '#utils/log'; + import {isFormDataWrapper} from '../form-data-wrapper'; -import {user} from '../log'; import {getMode} from '../mode'; import { getCorsUrl, diff --git a/src/validator-integration.js b/src/validator-integration.js index 743b31a9a9f9..2e9309365c4c 100644 --- a/src/validator-integration.js +++ b/src/validator-integration.js @@ -1,7 +1,8 @@ import {getHashParams} from '#core/types/string/url'; +import {loadPromise} from '#utils/event-helper'; + import {urls} from './config'; -import {loadPromise} from './event-helper'; import {isModeDevelopment} from './mode'; /** diff --git a/src/video-iframe-integration.js b/src/video-iframe-integration.js index 8fc6bab6ac27..e3bbfea091f4 100644 --- a/src/video-iframe-integration.js +++ b/src/video-iframe-integration.js @@ -6,7 +6,8 @@ import {once} from '#core/types/function'; import {dict} from '#core/types/object'; import {tryParseJson} from '#core/types/object/json'; -import {getData, listen} from './event-helper'; +import {getData, listen} from '#utils/event-helper'; + import {getMode} from './mode'; /** @fileoverview Entry point for documents inside an . */ diff --git a/src/web-worker/amp-worker.js b/src/web-worker/amp-worker.js index d8e3f708c857..df6b11e7c757 100644 --- a/src/web-worker/amp-worker.js +++ b/src/web-worker/amp-worker.js @@ -3,7 +3,8 @@ import {devAssert} from '#core/assert'; import {Services} from '#service'; import {calculateEntryPointScriptUrl} from '#service/extension-script'; -import {dev} from '../log'; +import {dev} from '#utils/log'; + import {ModeDef, getMode} from '../mode'; import {getService, registerServiceBuilder} from '../service-helpers'; diff --git a/src/web-worker/web-worker.js b/src/web-worker/web-worker.js index b4033ce25093..35f65d0fae57 100644 --- a/src/web-worker/web-worker.js +++ b/src/web-worker/web-worker.js @@ -8,10 +8,11 @@ import './web-worker-polyfills'; 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 {reportError} from '../error-reporting'; -import {dev, initLogConstructor, setReportError} from '../log'; initLogConstructor(); setReportError(reportError); diff --git a/test/integration/builtins/test-amp-img.js b/test/integration/builtins/test-amp-img.js index 0a6cb6e4ab8f..0928ccfe6de3 100644 --- a/test/integration/builtins/test-amp-img.js +++ b/test/integration/builtins/test-amp-img.js @@ -1,8 +1,8 @@ import {AmpEvents} from '#core/constants/amp-events'; -import {createFixtureIframe, expectBodyToBecomeVisible} from '#testing/iframe'; +import {createCustomEvent} from '#utils/event-helper'; -import {createCustomEvent} from '../../../src/event-helper'; +import {createFixtureIframe, expectBodyToBecomeVisible} from '#testing/iframe'; describes.sandboxed('Rendering of amp-img', {}, () => { const timeout = window.ampTestRuntimeConfig.mochaTimeout; diff --git a/test/integration/test-amp-ad-3p.js b/test/integration/test-amp-ad-3p.js index 44d4d267adc8..e75885e0d3d9 100644 --- a/test/integration/test-amp-ad-3p.js +++ b/test/integration/test-amp-ad-3p.js @@ -3,9 +3,9 @@ import {layoutRectLtwh} from '#core/dom/layout/rect'; import {Services} from '#service'; import {installPlatformService} from '#service/platform-impl'; -import {createFixtureIframe, poll} from '#testing/iframe'; +import {createCustomEvent} from '#utils/event-helper'; -import {createCustomEvent} from '../../src/event-helper'; +import {createFixtureIframe, poll} from '#testing/iframe'; const IFRAME_HEIGHT = 3000; function createFixture() { diff --git a/test/integration/test-video-manager.js b/test/integration/test-video-manager.js index f425336e9468..ae92a768d5b7 100644 --- a/test/integration/test-video-manager.js +++ b/test/integration/test-video-manager.js @@ -6,9 +6,10 @@ import {toArray} from '#core/types/array'; import {Services} from '#service'; import {installVideoManagerForDoc} from '#service/video-manager-impl'; +import {listenOncePromise} from '#utils/event-helper'; + import {runVideoPlayerIntegrationTests} from './test-video-players-helper'; -import {listenOncePromise} from '../../src/event-helper'; import {PlayingStates, VideoEvents} from '../../src/video-interface'; // TODO(dvoytenko): These tests time out when run with the prod AMP config. diff --git a/test/integration/test-video-players-helper.js b/test/integration/test-video-players-helper.js index 3919cf0eedeb..37d65264d385 100644 --- a/test/integration/test-video-players-helper.js +++ b/test/integration/test-video-players-helper.js @@ -5,13 +5,14 @@ import {toggleExperiment} from '#experiments'; import {Services} from '#service'; +import {getData, listenOncePromise} from '#utils/event-helper'; + import { createFixtureIframe, expectBodyToBecomeVisible, poll, } from '#testing/iframe'; -import {getData, listenOncePromise} from '../../src/event-helper'; import { VideoAnalyticsEvents, VideoEvents, diff --git a/test/integration/test-visibility-states.js b/test/integration/test-visibility-states.js index 3040311e89c6..8c49b598a6fe 100644 --- a/test/integration/test-visibility-states.js +++ b/test/integration/test-visibility-states.js @@ -4,7 +4,7 @@ import {getVendorJsPropertyName} from '#core/dom/style'; import {Services} from '#service'; -import {createCustomEvent} from '../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; const t = describes.sandboxed .configure() diff --git a/test/unit/builtins/test-amp-img.js b/test/unit/builtins/test-amp-img.js index e492c0f56224..b08164391b26 100644 --- a/test/unit/builtins/test-amp-img.js +++ b/test/unit/builtins/test-amp-img.js @@ -8,10 +8,11 @@ import {Layout, LayoutPriority} from '#core/dom/layout'; import {Services} from '#service'; +import {createCustomEvent} from '#utils/event-helper'; + import {createIframePromise} from '#testing/iframe'; import {BaseElement} from '../../../src/base-element'; -import {createCustomEvent} from '../../../src/event-helper'; describes.sandboxed('amp-img', {}, (env) => { let sandbox; diff --git a/test/unit/core/test-document-ready.js b/test/unit/core/document/test-ready.js similarity index 99% rename from test/unit/core/test-document-ready.js rename to test/unit/core/document/test-ready.js index 16c2784d16fa..cdcd08399e29 100644 --- a/test/unit/core/test-document-ready.js +++ b/test/unit/core/document/test-ready.js @@ -3,7 +3,7 @@ import { onDocumentReady, whenDocumentComplete, whenDocumentReady, -} from '#core/document-ready'; +} from '#core/document/ready'; import {Services} from '#service'; diff --git a/test/unit/core/test-document-visibility.js b/test/unit/core/document/test-visibility.js similarity index 98% rename from test/unit/core/test-document-visibility.js rename to test/unit/core/document/test-visibility.js index f9a91db2d51b..c41b6fd0fb7c 100644 --- a/test/unit/core/test-document-visibility.js +++ b/test/unit/core/document/test-visibility.js @@ -3,7 +3,7 @@ import { getDocumentVisibilityState, isDocumentHidden, removeDocumentVisibilityChangeListener, -} from '#core/document-visibility'; +} from '#core/document/visibility'; describes.sandboxed('document-visibility', {}, (env) => { let doc; diff --git a/test/unit/core/dom/test-dom.js b/test/unit/core/dom/test-dom.js index 91a0ba375c30..a91b45a7dc9c 100644 --- a/test/unit/core/dom/test-dom.js +++ b/test/unit/core/dom/test-dom.js @@ -3,7 +3,7 @@ import {setScopeSelectorSupportedForTesting} from '#core/dom/css-selectors'; import {matches} from '#core/dom/query'; import {setShadowDomSupportedVersionForTesting} from '#core/dom/web-components'; -import {loadPromise} from '../../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; describes.sandboxed('DOM helpers', {}, (env) => { afterEach(() => { diff --git a/test/unit/core/dom/test-query.js b/test/unit/core/dom/test-query.js index 143127868902..dc1007aac7c8 100644 --- a/test/unit/core/dom/test-query.js +++ b/test/unit/core/dom/test-query.js @@ -4,7 +4,7 @@ import * as query from '#core/dom/query'; import {isElement} from '#core/types'; import {toArray} from '#core/types/array'; -import {loadPromise} from '../../../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; /** Helper to execute test cases with and without the polyfills. */ function itWithPolyfill(description, testFn) { diff --git a/test/unit/core/test-error.js b/test/unit/core/test-error.js index 70325ac2b637..427da66ffb77 100644 --- a/test/unit/core/test-error.js +++ b/test/unit/core/test-error.js @@ -6,7 +6,7 @@ import { } from '#core/error'; import {isUserErrorMessage} from '#core/error/message-helpers'; -import {setReportError, user} from '../../../src/log'; +import {setReportError, user} from '#utils/log'; describes.sandboxed('errors', {}, (env) => { describe('rethrowAsync', () => { diff --git a/test/unit/core/window/test-history.js b/test/unit/core/window/test-history.js index 291562d63974..be657be4020b 100644 --- a/test/unit/core/window/test-history.js +++ b/test/unit/core/window/test-history.js @@ -8,7 +8,8 @@ import { } from '#service/history-impl'; import {installTimerService} from '#service/timer-impl'; -import {listenOncePromise} from '../../../../src/event-helper'; +import {listenOncePromise} from '#utils/event-helper'; + import {parseUrlDeprecated} from '../../../../src/url'; describes.fakeWin( diff --git a/test/unit/test-3p-environment.js b/test/unit/test-3p-environment.js index 339b211b9039..f5f483d58306 100644 --- a/test/unit/test-3p-environment.js +++ b/test/unit/test-3p-environment.js @@ -4,9 +4,9 @@ import {manageWin, setInViewportForTesting} from '#3p/environment'; import {Services} from '#service'; -import {createIframePromise} from '#testing/iframe'; +import {loadPromise} from '#utils/event-helper'; -import {loadPromise} from '../../src/event-helper'; +import {createIframePromise} from '#testing/iframe'; describes.sandboxed('3p environment', {}, () => { let testWin; diff --git a/test/unit/test-action.js b/test/unit/test-action.js index cb4859d7da5f..e1a923e4eac9 100644 --- a/test/unit/test-action.js +++ b/test/unit/test-action.js @@ -15,9 +15,9 @@ import { } from '#service/action-impl'; import {AmpDocSingle} from '#service/ampdoc-impl'; -import {whenCalled} from '#testing/test-helper'; +import {createCustomEvent} from '#utils/event-helper'; -import {createCustomEvent} from '../../src/event-helper'; +import {whenCalled} from '#testing/test-helper'; /** * @return {!ActionService} diff --git a/test/unit/test-amp-story-player.js b/test/unit/test-amp-story-player.js index 40ca6d7e0c3d..7544bd17e85f 100644 --- a/test/unit/test-amp-story-player.js +++ b/test/unit/test-amp-story-player.js @@ -1,12 +1,13 @@ import {Messaging} from '@ampproject/viewer-messaging'; import {expect} from 'chai'; +import {createCustomEvent, listenOncePromise} from '#utils/event-helper'; + import {macroTask} from '#testing/helpers'; import {AmpStoryComponentManager} from '../../src/amp-story-player/amp-story-component-manager'; import {AmpStoryPlayer} from '../../src/amp-story-player/amp-story-player-impl'; import {PageScroller} from '../../src/amp-story-player/page-scroller'; -import {createCustomEvent, listenOncePromise} from '../../src/event-helper'; describes.realWin('AmpStoryPlayer', {amp: false}, (env) => { let win; diff --git a/test/unit/test-ampdoc.js b/test/unit/test-ampdoc.js index 34aaa5f19dbe..52f7838187a7 100644 --- a/test/unit/test-ampdoc.js +++ b/test/unit/test-ampdoc.js @@ -1,5 +1,5 @@ import {Signals} from '#core/data-structures/signals'; -import * as docready from '#core/document-ready'; +import * as docready from '#core/document/ready'; import * as dom from '#core/dom'; import { ShadowDomVersion, diff --git a/test/unit/test-base-element.js b/test/unit/test-base-element.js index fcdd2a7c55cd..8badd41ceaac 100644 --- a/test/unit/test-base-element.js +++ b/test/unit/test-base-element.js @@ -5,9 +5,10 @@ import {layoutRectLtwh} from '#core/dom/layout/rect'; import {Services} from '#service'; import {Resource} from '#service/resource'; +import {listenOncePromise} from '#utils/event-helper'; + import {BaseElement} from '../../src/base-element'; import {createAmpElementForTesting} from '../../src/custom-element'; -import {listenOncePromise} from '../../src/event-helper'; describes.realWin('BaseElement', {amp: true}, (env) => { let win, doc; diff --git a/test/unit/test-batched-json.js b/test/unit/test-batched-json.js index f16b17290662..624710b5f3b4 100644 --- a/test/unit/test-batched-json.js +++ b/test/unit/test-batched-json.js @@ -1,7 +1,8 @@ import {Services} from '#service'; +import {user} from '#utils/log'; + import {UrlReplacementPolicy, batchFetchJsonFor} from '../../src/batched-json'; -import {user} from '../../src/log'; describes.sandboxed('batchFetchJsonFor', {}, (env) => { // Fakes. diff --git a/test/unit/test-error-reporting.js b/test/unit/test-error-reporting.js index 0950d859ecdf..5934f2b74f7f 100644 --- a/test/unit/test-error-reporting.js +++ b/test/unit/test-error-reporting.js @@ -2,7 +2,9 @@ import {resetExperimentTogglesForTesting, toggleExperiment} from '#experiments'; import {Services} from '#service'; -import * as analytics from '../../src/analytics'; +import * as analytics from '#utils/analytics'; +import {user, userAssert} from '#utils/log'; + import { blockedByConsentError, cancellation, @@ -15,7 +17,6 @@ import { reportErrorToAnalytics, reportErrorToServerOrViewer, } from '../../src/error-reporting'; -import {user, userAssert} from '../../src/log'; import {getRtvVersionForTesting} from '../../src/mode'; describes.fakeWin('installErrorReporting', {}, (env) => { diff --git a/test/unit/test-extension-script.js b/test/unit/test-extension-script.js index 43835fcec4db..0a9c52206d07 100644 --- a/test/unit/test-extension-script.js +++ b/test/unit/test-extension-script.js @@ -7,7 +7,7 @@ import { parseExtensionUrl, } from '#service/extension-script'; -import {initLogConstructor, resetLogConstructorForTesting} from '../../src/log'; +import {initLogConstructor, resetLogConstructorForTesting} from '#utils/log'; describes.sandboxed('Extension Location', {}, () => { describe('get correct script source', () => { diff --git a/test/unit/test-extensions.js b/test/unit/test-extensions.js index 4d550be7fc42..46fd57a3794c 100644 --- a/test/unit/test-extensions.js +++ b/test/unit/test-extensions.js @@ -9,9 +9,10 @@ import { } from '#service/template-impl'; import {installTimerService} from '#service/timer-impl'; +import {dev} from '#utils/log'; + import {BaseElement} from '../../src/base-element'; import {ElementStub} from '../../src/element-stub'; -import {dev} from '../../src/log'; import {getServiceForDoc} from '../../src/service-helpers'; class AmpTest extends BaseElement {} diff --git a/test/unit/test-fixed-layer.js b/test/unit/test-fixed-layer.js index 9d89963370e1..a496420433a9 100644 --- a/test/unit/test-fixed-layer.js +++ b/test/unit/test-fixed-layer.js @@ -9,10 +9,10 @@ import {installPlatformService} from '#service/platform-impl'; import {installTimerService} from '#service/timer-impl'; import {installViewerServiceForDoc} from '#service/viewer-impl'; -import {FakeMutationObserver, FakeWindow} from '#testing/fake-dom'; +import {Animation} from '#utils/animation'; +import {user} from '#utils/log'; -import {Animation} from '../../src/animation'; -import {user} from '../../src/log'; +import {FakeMutationObserver, FakeWindow} from '#testing/fake-dom'; describes.sandboxed('FixedLayer', {}, (env) => { let parentApi; diff --git a/test/unit/test-friendly-iframe-embed.js b/test/unit/test-friendly-iframe-embed.js index 116203407ef6..b2607fbaaa8c 100644 --- a/test/unit/test-friendly-iframe-embed.js +++ b/test/unit/test-friendly-iframe-embed.js @@ -8,12 +8,13 @@ import {AmpDocFie} from '#service/ampdoc-impl'; import {resetScheduledElementForTesting} from '#service/custom-element-registry'; import {installExtensionsService} from '#service/extensions-impl'; +import {loadPromise} from '#utils/event-helper'; + import {FakeWindow} from '#testing/fake-dom'; import {isAnimationNone} from '#testing/test-helper'; import {BaseElement} from '../../src/base-element'; import {ElementStub} from '../../src/element-stub'; -import {loadPromise} from '../../src/event-helper'; import { FriendlyIframeEmbed, Installers, diff --git a/test/unit/test-impression.js b/test/unit/test-impression.js index 32753c0dc74f..3fc85676d859 100644 --- a/test/unit/test-impression.js +++ b/test/unit/test-impression.js @@ -6,6 +6,8 @@ import {toggleExperiment} from '#experiments'; import {Services} from '#service'; +import {dev, user} from '#utils/log'; + import {macroTask} from '#testing/helpers'; import { @@ -16,7 +18,6 @@ import { resetTrackImpressionPromiseForTesting, shouldAppendExtraParams, } from '../../src/impression'; -import {dev, user} from '../../src/log'; describes.realWin('impression', {amp: true}, (env) => { let window, document; diff --git a/test/unit/test-intersection-observer-polyfill.js b/test/unit/test-intersection-observer-polyfill.js index 4a75dcbb63e0..ea5d88300dad 100644 --- a/test/unit/test-intersection-observer-polyfill.js +++ b/test/unit/test-intersection-observer-polyfill.js @@ -7,7 +7,7 @@ import { IntersectionObserver3pHost, getIntersectionChangeEntry, intersectionRatio, -} from '../../src/utils/intersection-observer-3p-host'; +} from '#utils/intersection-observer-3p-host'; const fakeAmpDoc = { getRootNode: () => { diff --git a/test/unit/test-origin-experiments.js b/test/unit/test-origin-experiments.js index 4fe92ca23642..b7a25342280f 100644 --- a/test/unit/test-origin-experiments.js +++ b/test/unit/test-origin-experiments.js @@ -3,7 +3,7 @@ import {bytesToString} from '#core/types/string/bytes'; import {Services} from '#service'; import {OriginExperiments, TokenMaster} from '#service/origin-experiments-impl'; -import {user} from '../../src/log'; +import {user} from '#utils/log'; describes.fakeWin('OriginExperiments', {amp: true}, (env) => { const TAG = 'OriginExperiments'; diff --git a/test/unit/test-real-time-config.js b/test/unit/test-real-time-config.js index 404e6f25df68..e54b87c79a73 100644 --- a/test/unit/test-real-time-config.js +++ b/test/unit/test-real-time-config.js @@ -13,8 +13,9 @@ import { } from '#service/real-time-config/real-time-config-impl'; import {Xhr} from '#service/xhr-impl'; +import {dev, user} from '#utils/log'; + import {cancellation} from '../../src/error-reporting'; -import {dev, user} from '../../src/log'; describes.realWin('real-time-config service', {amp: true}, (env) => { let element; diff --git a/test/unit/test-resources.js b/test/unit/test-resources.js index 7f04cb637a5b..2ecdb4da0fa5 100644 --- a/test/unit/test-resources.js +++ b/test/unit/test-resources.js @@ -10,7 +10,7 @@ import {AmpDocSingle} from '#service/ampdoc-impl'; import {Resource, ResourceState} from '#service/resource'; import {ResourcesImpl} from '#service/resources-impl'; -import {loadPromise} from '../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; /*eslint "google-camelcase/google-camelcase": 0*/ describes.realWin('Resources', {amp: true}, (env) => { diff --git a/test/unit/test-service.js b/test/unit/test-service.js index fed135f46537..4ac08b4cefc6 100644 --- a/test/unit/test-service.js +++ b/test/unit/test-service.js @@ -1,4 +1,5 @@ -import {loadPromise} from '../../src/event-helper'; +import {loadPromise} from '#utils/event-helper'; + import { adoptServiceFactoryForEmbedDoc, adoptServiceForEmbedDoc, diff --git a/test/unit/test-shadow-embed.js b/test/unit/test-shadow-embed.js index 03e7ddf433bf..414f154316de 100644 --- a/test/unit/test-shadow-embed.js +++ b/test/unit/test-shadow-embed.js @@ -7,6 +7,8 @@ import {toArray} from '#core/types/array'; import {AmpDocShadow} from '#service/ampdoc-impl'; +import {DomWriterBulk, DomWriterStreamer} from '#utils/dom-writer'; + import { createShadowDomWriter, createShadowRoot, @@ -17,7 +19,6 @@ import { setShadowDomStreamingSupportedForTesting, } from '../../src/shadow-embed'; import {installStylesForDoc} from '../../src/style-installer'; -import {DomWriterBulk, DomWriterStreamer} from '../../src/utils/dom-writer'; describes.sandboxed('shadow-embed', {}, (env) => { afterEach(() => { diff --git a/test/unit/test-standard-actions.js b/test/unit/test-standard-actions.js index 11e9603a9cad..62b33ef832e7 100644 --- a/test/unit/test-standard-actions.js +++ b/test/unit/test-standard-actions.js @@ -11,9 +11,9 @@ import { getAutofocusElementForShowAction, } from '#service/standard-actions-impl'; -import {macroTask} from '#testing/helpers'; +import {user} from '#utils/log'; -import {user} from '../../src/log'; +import {macroTask} from '#testing/helpers'; describes.sandboxed('StandardActions', {}, (env) => { let standardActions; diff --git a/test/unit/test-storage.js b/test/unit/test-storage.js index d618ecb98942..90ef382daf50 100644 --- a/test/unit/test-storage.js +++ b/test/unit/test-storage.js @@ -6,7 +6,7 @@ import { ViewerStorageBinding, } from '#service/storage-impl'; -import {dev} from '../../src/log'; +import {dev} from '#utils/log'; describes.sandboxed('Storage', {}, (env) => { let storage; diff --git a/test/unit/test-url-replacements.js b/test/unit/test-url-replacements.js index eb56eb80e671..ae5f962e440e 100644 --- a/test/unit/test-url-replacements.js +++ b/test/unit/test-url-replacements.js @@ -14,13 +14,14 @@ import { installUrlReplacementsServiceForDoc, } from '#service/url-replacements-impl'; +import {user} from '#utils/log'; + import {createIframePromise} from '#testing/iframe'; import {mockWindowInterface, stubServiceForDoc} from '#testing/test-helper'; import {installActivityServiceForTesting} from '../../extensions/amp-analytics/0.1/activity-impl'; import {setCookie} from '../../src/cookies'; import * as trackPromise from '../../src/impression'; -import {user} from '../../src/log'; import {registerServiceBuilder} from '../../src/service-helpers'; import {parseUrlDeprecated} from '../../src/url'; diff --git a/test/unit/test-validator-integration.js b/test/unit/test-validator-integration.js index 5889c761606a..94354843303d 100644 --- a/test/unit/test-validator-integration.js +++ b/test/unit/test-validator-integration.js @@ -2,7 +2,8 @@ * @fileoverview Description of this file. */ -import * as eventHelper from '../../src/event-helper'; +import * as eventHelper from '#utils/event-helper'; + import * as mode from '../../src/mode'; import {loadScript, maybeValidate} from '../../src/validator-integration'; diff --git a/test/unit/test-video-analytics-percentage-tracker.js b/test/unit/test-video-analytics-percentage-tracker.js index a134b43a5239..d828d35658d1 100644 --- a/test/unit/test-video-analytics-percentage-tracker.js +++ b/test/unit/test-video-analytics-percentage-tracker.js @@ -5,7 +5,8 @@ import { PERCENTAGE_INTERVAL, } from '#service/video-manager-impl'; -import {createCustomEvent} from '../../src/event-helper'; +import {createCustomEvent} from '#utils/event-helper'; + import {PlayingStates, VideoEvents} from '../../src/video-interface'; describes.fakeWin( diff --git a/test/unit/test-viewer.js b/test/unit/test-viewer.js index 599a9e8e309c..d69d9b0ff0ff 100644 --- a/test/unit/test-viewer.js +++ b/test/unit/test-viewer.js @@ -7,7 +7,8 @@ import {installPlatformService} from '#service/platform-impl'; import {installTimerService} from '#service/timer-impl'; import {ViewerImpl} from '#service/viewer-impl'; -import {dev} from '../../src/log'; +import {dev} from '#utils/log'; + import {parseUrlDeprecated, removeFragment} from '../../src/url'; describes.sandboxed('Viewer', {}, (env) => { diff --git a/test/unit/test-viewport-binding.js b/test/unit/test-viewport-binding.js index 19e972bcd6c2..ee3d527e95e4 100644 --- a/test/unit/test-viewport-binding.js +++ b/test/unit/test-viewport-binding.js @@ -1,4 +1,4 @@ -import {whenDocumentReady} from '#core/document-ready'; +import {whenDocumentReady} from '#core/document/ready'; import {toggleExperiment} from '#experiments'; diff --git a/test/unit/test-viewport.js b/test/unit/test-viewport.js index 7671008802c6..82b46a4ee6ff 100644 --- a/test/unit/test-viewport.js +++ b/test/unit/test-viewport.js @@ -20,8 +20,9 @@ import { } from '#service/viewport/viewport-impl'; import {installVsyncService} from '#service/vsync-impl'; -import {loadPromise} from '../../src/event-helper'; -import {dev} from '../../src/log'; +import {loadPromise} from '#utils/event-helper'; +import {dev} from '#utils/log'; + import {getMode} from '../../src/mode'; import {setParentWindow} from '../../src/service-helpers'; diff --git a/test/unit/test-xhr.js b/test/unit/test-xhr.js index 67c850ca0b51..39d69b6c56f3 100644 --- a/test/unit/test-xhr.js +++ b/test/unit/test-xhr.js @@ -7,11 +7,12 @@ import {fetchPolyfill} from '#polyfills/fetch'; import {Services} from '#service'; import {xhrServiceForTesting} from '#service/xhr-impl'; +import {user} from '#utils/log'; +import {assertSuccess} from '#utils/xhr-utils'; + import {getCookie} from '../../src/cookies'; import {createFormDataWrapper} from '../../src/form-data-wrapper'; -import {user} from '../../src/log'; import * as mode from '../../src/mode'; -import {assertSuccess} from '../../src/utils/xhr-utils'; // TODO(jridgewell, #11827): Make this test work on Safari. describes.sandboxed diff --git a/test/unit/test-analytics.js b/test/unit/utils/test-analytics.js similarity index 94% rename from test/unit/test-analytics.js rename to test/unit/utils/test-analytics.js index 3c175acbb0f6..a00af13a4d6d 100644 --- a/test/unit/test-analytics.js +++ b/test/unit/utils/test-analytics.js @@ -1,11 +1,12 @@ import {Services} from '#service'; -import {triggerAnalyticsEvent} from '../../src/analytics'; +import {triggerAnalyticsEvent} from '#utils/analytics'; + import { getServiceForDoc, registerServiceBuilderForDoc, resetServiceForTesting, -} from '../../src/service-helpers'; +} from '../../../src/service-helpers'; describes.realWin( 'analytics', diff --git a/test/unit/test-animation.js b/test/unit/utils/test-animation.js similarity index 99% rename from test/unit/test-animation.js rename to test/unit/utils/test-animation.js index 0355d721058d..c1fb4a5cf90d 100644 --- a/test/unit/test-animation.js +++ b/test/unit/utils/test-animation.js @@ -1,4 +1,4 @@ -import {Animation} from '../../src/animation'; +import {Animation} from '#utils/animation'; describes.sandboxed('Animation', {}, (env) => { let vsync; diff --git a/test/unit/utils/test-display-observer.js b/test/unit/utils/test-display-observer.js index 871ce3499aeb..60997f5a1f0b 100644 --- a/test/unit/utils/test-display-observer.js +++ b/test/unit/utils/test-display-observer.js @@ -7,7 +7,7 @@ import { registerContainer, unobserveDisplay, unregisterContainer, -} from '../../../src/utils/display-observer'; +} from '#utils/display-observer'; describes.realWin('display-observer', {amp: true}, (env) => { let win, doc, ampdoc; diff --git a/test/unit/utils/test-dom-ancestor-visitor.js b/test/unit/utils/test-dom-ancestor-visitor.js index 58a850fe82e5..bb89a107c528 100644 --- a/test/unit/utils/test-dom-ancestor-visitor.js +++ b/test/unit/utils/test-dom-ancestor-visitor.js @@ -1,4 +1,4 @@ -import {DomAncestorVisitor} from '../../../src/utils/dom-ancestor-visitor'; +import {DomAncestorVisitor} from '#utils/dom-ancestor-visitor'; describes.realWin('#DomAncestorVisitor', {amp: true}, (env) => { let doc, win; diff --git a/test/unit/utils/test-dom-transform-stream.js b/test/unit/utils/test-dom-transform-stream.js index b4d98dd37141..330d17df9447 100644 --- a/test/unit/utils/test-dom-transform-stream.js +++ b/test/unit/utils/test-dom-transform-stream.js @@ -1,6 +1,6 @@ -import {macroTask} from '#testing/helpers'; +import {DomTransformStream} from '#utils/dom-tranform-stream'; -import {DomTransformStream} from '../../../src/utils/dom-tranform-stream'; +import {macroTask} from '#testing/helpers'; describes.fakeWin('DomTransformStream', {amp: true}, (env) => { async function flush() { diff --git a/test/unit/utils/test-dom-writer.js b/test/unit/utils/test-dom-writer.js index 8f37972c97c8..eaf865f04a2b 100644 --- a/test/unit/utils/test-dom-writer.js +++ b/test/unit/utils/test-dom-writer.js @@ -1,4 +1,4 @@ -import {DomWriterBulk, DomWriterStreamer} from '../../../src/utils/dom-writer'; +import {DomWriterBulk, DomWriterStreamer} from '#utils/dom-writer'; describes.fakeWin('DomWriterStreamer', {amp: true}, (env) => { describe diff --git a/test/unit/test-event-helper.js b/test/unit/utils/test-event-helper.js similarity index 99% rename from test/unit/test-event-helper.js rename to test/unit/utils/test-event-helper.js index 2d2278ccb24f..d6fdd370ce84 100644 --- a/test/unit/test-event-helper.js +++ b/test/unit/utils/test-event-helper.js @@ -14,7 +14,7 @@ import { listenOnce, listenOncePromise, loadPromise, -} from '../../src/event-helper'; +} from '#utils/event-helper'; describes.sandboxed('EventHelper', {}, (env) => { function getEvent(name, target) { diff --git a/test/unit/test-log.js b/test/unit/utils/test-log.js similarity index 99% rename from test/unit/test-log.js rename to test/unit/utils/test-log.js index d99b9b52d972..dabd369d915e 100644 --- a/test/unit/test-log.js +++ b/test/unit/utils/test-log.js @@ -12,7 +12,7 @@ import { setReportError, user, userAssert, -} from '../../src/log'; +} from '#utils/log'; describes.sandboxed('Logging', {}, (env) => { const RETURNS_FINE = () => LogLevel.FINE; diff --git a/test/unit/utils/test-xhr-utils.js b/test/unit/utils/test-xhr-utils.js index 8fa7a5c7909e..f342091b85d6 100644 --- a/test/unit/utils/test-xhr-utils.js +++ b/test/unit/utils/test-xhr-utils.js @@ -7,7 +7,7 @@ import { setupAMPCors, setupInit, setupJsonFetchInit, -} from '../../../src/utils/xhr-utils'; +} from '#utils/xhr-utils'; describes.sandboxed('utils/xhr-utils', {}, (env) => { describe('setupAMPCors', () => { diff --git a/test/unit/web-worker/test-amp-worker.js b/test/unit/web-worker/test-amp-worker.js index 4e33791d9a6e..1b2278924483 100644 --- a/test/unit/web-worker/test-amp-worker.js +++ b/test/unit/web-worker/test-amp-worker.js @@ -1,7 +1,8 @@ import {Services} from '#service'; import {installXhrService} from '#service/xhr-impl'; -import {dev} from '../../../src/log'; +import {dev} from '#utils/log'; + import {getMode} from '../../../src/mode'; import { ampWorkerForTesting, diff --git a/testing/async-errors.js b/testing/async-errors.js index 08e8ec9c83bc..dc2e7754d1e1 100644 --- a/testing/async-errors.js +++ b/testing/async-errors.js @@ -4,13 +4,14 @@ import sinon from 'sinon'; // eslint-disable-line local/no-import import * as coreError from '#core/error'; +import {setReportError} from '#utils/log'; + import { expectedAsyncErrors, indexOfExpectedMessage, } from './console-logging-setup'; import {reportError} from '../src/error-reporting'; -import {setReportError} from '../src/log'; let rethrowAsyncSandbox; diff --git a/testing/iframe.js b/testing/iframe.js index 23ee9b5a3b51..0c8fe08824c0 100644 --- a/testing/iframe.js +++ b/testing/iframe.js @@ -11,6 +11,8 @@ import { } from '#service/core-services'; import {installExtensionsService} from '#service/extensions-impl'; +import {dev} from '#utils/log'; + import {FakeLocation} from './fake-dom'; import {cssText as ampDocCss} from '../build/ampdoc.css'; @@ -18,7 +20,6 @@ import {cssText as ampSharedCss} from '../build/ampshared.css'; import {BindEvents} from '../extensions/amp-bind/0.1/bind-events'; import {FormEvents} from '../extensions/amp-form/0.1/form-events'; import {parseIfNeeded} from '../src/iframe-helper'; -import {dev} from '../src/log'; let iframeCount = 0; diff --git a/tools/experiments/experiments.js b/tools/experiments/experiments.js index b0ccd89921f8..c38f729d1c6c 100644 --- a/tools/experiments/experiments.js +++ b/tools/experiments/experiments.js @@ -3,11 +3,11 @@ import '#service/timer-impl'; import {Deferred} from '#core/data-structures/promise'; import {EXPERIMENTS} from './experiments-config'; import {SameSite, getCookie, setCookie} from '../../src/cookies'; -import {devAssert, initLogConstructor, setReportError} from '../../src/log'; +import {devAssert, initLogConstructor, setReportError} from '#utils/log'; import {getMode} from '../../src/mode'; import {isExperimentOn, toggleExperiment} from '#experiments'; -import {listenOnce} from '../../src/event-helper'; -import {onDocumentReady} from '#core/document-ready'; +import {listenOnce} from '#utils/event-helper'; +import {onDocumentReady} from '#core/document/ready'; import {parseUrlDeprecated} from '../../src/url'; //TODO(@cramforce): For type. Replace with forward declaration. import {reportError} from '../../src/error-reporting'; diff --git a/tsconfig.json b/tsconfig.json index adee7a8c187f..a9d151cabc95 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,6 +24,8 @@ "#purifier/*": ["./src/purifier/*"], "#service": ["./src/service"], "#service/*": ["./src/service/*"], + "#utils": ["./src/utils"], + "#utils/*": ["./src/utils/*"], "#test/*": ["./test/*"], "#testing/*": ["./testing/*"],