Skip to content

Commit b6d1550

Browse files
authored
♻️ Move files into #core, #utils to enable tsc typechecking (ampproject#36277)
* Add #utils path alias * Move format/analytics/animation/event-hepler/log into #util/core * update imports of log => #utils/log * update imports of format => #core/document/format * Update imports of event-helper * Update imports of analytics * Update imports of animation * lint autofix * Update forbidden-terms * Move #core/document-{ready,visibility} to #core/document/{ready,visibility} * Update imports of #core/document-{ready,visibility} * Fix imports in #core/document/visibility * Move test files to reflect new structure * Lint fixes * Lint fixes to babel plugins * Fix babel plugin paths * Fix babel plugin paths * Fix dep-check config * Fix type-check shame * Typo
1 parent 4d1be4e commit b6d1550

File tree

665 files changed

+1235
-958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

665 files changed

+1235
-958
lines changed

Diff for: 3p/3d-gltf/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import {listenParent, nonSensitiveDataPostMessage} from '#3p/messaging';
66
import {dict} from '#core/types/object';
77
import {parseJson} from '#core/types/object/json';
88

9-
import GltfViewer from './viewer';
9+
import {user} from '#utils/log';
1010

11-
import {user} from '../../src/log';
11+
import GltfViewer from './viewer';
1212

1313
const seq = (taskA, taskB) => (cb) => taskA(() => taskB(cb));
1414
const parallel = (taskA, taskB) => (cb) => {

Diff for: 3p/3p.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {rethrowAsync} from '#core/error';
99
import {isArray} from '#core/types';
1010
import {hasOwn, map} from '#core/types/object';
1111

12-
import {devAssert, userAssert} from '../src/log';
12+
import {devAssert, userAssert} from '#utils/log';
1313

1414
/** @typedef {function(!Window, !Object)} */
1515
let ThirdPartyFunctionDef;

Diff for: 3p/ampcontext-integration.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {dict} from '#core/types/object';
22

3+
import {dev, user, userAssert} from '#utils/log';
4+
35
import {computeInMasterFrame} from './3p';
46
import {AbstractAmpContext} from './ampcontext';
57

6-
import {dev, user, userAssert} from '../src/log';
7-
88
/**
99
* Returns the "master frame" for all widgets of a given type.
1010
* This frame should be used to e.g. fetch scripts that can

Diff for: 3p/ampcontext-lib.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// src/polyfills.js must be the first import.
22
import './polyfills';
33

4-
import {AmpContext} from './ampcontext';
4+
import {initLogConstructor, setReportError} from '#utils/log';
55

6-
import {initLogConstructor, setReportError} from '../src/log';
6+
import {AmpContext} from './ampcontext';
77

88
initLogConstructor();
99

Diff for: 3p/ampcontext.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import {isObject} from '#core/types';
55
import {dict, map} from '#core/types/object';
66
import {tryParseJson} from '#core/types/object/json';
77

8+
import {dev, devAssert} from '#utils/log';
9+
810
import {IframeMessagingClient} from './iframe-messaging-client';
911

10-
import {dev, devAssert} from '../src/log';
1112
import {parseUrlDeprecated} from '../src/url';
1213

1314
export class AbstractAmpContext {

Diff for: 3p/bodymovinanimation.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import {tryPlay} from '#core/dom/video';
33
import {dict} from '#core/types/object';
44
import {parseJson} from '#core/types/object/json';
55

6-
import {loadScript} from './3p';
6+
import {getData} from '#utils/event-helper';
77

8-
import {getData} from '../src/event-helper';
8+
import {loadScript} from './3p';
99

1010
const libSourceUrl = dict({
1111
'canvas':

Diff for: 3p/facebook.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import {isEnumValue} from '#core/types/enum';
33
import {dict} from '#core/types/object';
44
import {dashToUnderline} from '#core/types/string';
55

6-
import {loadScript} from './3p';
6+
import {devAssert} from '#utils/log';
77

8-
import {devAssert} from '../src/log';
8+
import {loadScript} from './3p';
99

1010
/** @const @enum {string} */
1111
export const FacebookEmbedType = {

Diff for: 3p/frame-metadata.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {once} from '#core/types/function';
22
import {dict} from '#core/types/object';
33
import {parseJson} from '#core/types/object/json';
44

5-
import {dev} from '../src/log';
5+
import {dev} from '#utils/log';
6+
67
import {getMode} from '../src/mode';
78
import {parseUrlDeprecated} from '../src/url';
89

Diff for: 3p/github.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {writeScript} from './3p';
1+
import {userAssert} from '#utils/log';
22

3-
import {userAssert} from '../src/log';
3+
import {writeScript} from './3p';
44

55
/**
66
* Get the correct script for the gist.

Diff for: 3p/iframe-messaging-client.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import {
77
import {Observable} from '#core/data-structures/observable';
88
import {dict, map} from '#core/types/object';
99

10-
import {getData} from '../src/event-helper';
11-
import {dev} from '../src/log';
10+
import {getData} from '#utils/event-helper';
11+
import {dev} from '#utils/log';
12+
1213
import {getMode} from '../src/mode';
1314

1415
export class IframeMessagingClient {

Diff for: 3p/iframe-transport-client-lib.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// src/polyfills.js must be the first import.
22
import './polyfills';
33

4-
import {IframeTransportClient} from './iframe-transport-client';
4+
import {initLogConstructor, setReportError} from '#utils/log';
55

6-
import {initLogConstructor, setReportError} from '../src/log';
6+
import {IframeTransportClient} from './iframe-transport-client';
77

88
initLogConstructor();
99
// TODO(alanorozco): Refactor src/error.reportError so it does not contain big

Diff for: 3p/iframe-transport-client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {IframeTransportEventDef, MessageType} from '#core/3p-frame-messaging';
22
import {tryParseJson} from '#core/types/object/json';
33

4-
import {IframeMessagingClient} from './iframe-messaging-client';
4+
import {dev, devAssert, user, userAssert} from '#utils/log';
55

6-
import {dev, devAssert, user, userAssert} from '../src/log';
6+
import {IframeMessagingClient} from './iframe-messaging-client';
77

88
/** @private @const {string} */
99
const TAG_ = 'iframe-transport-client';

Diff for: 3p/integration-lib.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ import {dict} from '#core/types/object';
33
import {parseJson} from '#core/types/object/json';
44
import {endsWith} from '#core/types/string';
55

6+
import {
7+
initLogConstructor,
8+
isUserErrorMessage,
9+
setReportError,
10+
userAssert,
11+
} from '#utils/log';
12+
613
import {run, setExperimentToggles} from './3p';
714
import {IntegrationAmpContext} from './ampcontext-integration';
815
import {installEmbedStateListener, manageWin} from './environment';
916
import {getAmpConfig, getEmbedType, getLocation} from './frame-metadata';
1017

1118
import {urls} from '../src/config';
12-
import {
13-
initLogConstructor,
14-
isUserErrorMessage,
15-
setReportError,
16-
userAssert,
17-
} from '../src/log';
1819
import {getSourceUrl, isProxyOrigin, parseUrlDeprecated} from '../src/url';
1920

2021
/**

Diff for: 3p/integration.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import './polyfills';
1313
import {draw3p, init} from './integration-lib';
1414
import {getMode} from '../src/mode';
1515
import {register} from './3p';
16-
import {user} from 'src/log';
16+
import {user} from '#utils/log';
1717

1818
// 3P - please keep in alphabetic order
1919
import {beopinion} from './beopinion';

Diff for: 3p/mathml.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {setStyle} from '#core/dom/style';
22

3-
import {writeScript} from './3p';
3+
import {userAssert} from '#utils/log';
44

5-
import {userAssert} from '../src/log';
5+
import {writeScript} from './3p';
66

77
/**
88
* Get the correct script for the mathml formula.

Diff for: 3p/messaging.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {parseJson} from '#core/types/object/json';
22

3-
import {getData} from '../src/event-helper';
3+
import {getData} from '#utils/event-helper';
44

55
/**
66
* Send messages to parent frame. These should not contain user data.

Diff for: 3p/recaptcha.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ import './polyfills';
44
import {dict, hasOwn} from '#core/types/object';
55
import {parseJson} from '#core/types/object/json';
66

7-
import {loadScript} from './3p';
8-
import {IframeMessagingClient} from './iframe-messaging-client';
9-
107
import {
118
dev,
129
devAssert,
1310
initLogConstructor,
1411
setReportError,
1512
user,
16-
} from '../src/log';
13+
} from '#utils/log';
14+
15+
import {loadScript} from './3p';
16+
import {IframeMessagingClient} from './iframe-messaging-client';
17+
1718
import {isProxyOrigin, parseUrlDeprecated} from '../src/url';
1819
import ampToolboxCacheUrl from '../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm';
1920

Diff for: 3p/viqeoplayer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {tryPlay} from '#core/dom/video';
22
import {tryDecodeUriComponent} from '#core/types/string/url';
33

4-
import {loadScript} from './3p';
4+
import {getData} from '#utils/event-helper';
55

6-
import {getData} from '../src/event-helper';
6+
import {loadScript} from './3p';
77

88
/**
99
* @param {Window} global

Diff for: ads/alp/handler.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
parseUrlDeprecated,
66
} from '../../src/url';
77
import {closest} from '#core/dom/query';
8-
import {dev} from '../../src/log';
8+
import {dev} from '#utils/log';
99
import {dict} from '#core/types/object';
1010
import {openWindowDialog} from '../../src/open-window-dialog';
1111
import {parseQueryString} from '#core/types/string/url';

Diff for: ads/alp/install-alp.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Utility file that generates URLs suitable for AMP's impression tracking.
22

3-
import {initLogConstructor, setReportError} from '../../src/log';
3+
import {initLogConstructor, setReportError} from '#utils/log';
44
import {installAlpClickHandler, warmupStatic} from './handler';
55
import {reportError} from '../../src/error-reporting';
66

Diff for: ads/google/a4a/test/test-utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {installDocService} from '#service/ampdoc-impl';
3535
import {installExtensionsService} from '#service/extensions-impl';
3636
import {installXhrService} from '#service/xhr-impl';
3737
import {toggleExperiment} from '#experiments';
38-
import {user} from '../../../../src/log';
38+
import {user} from '#utils/log';
3939

4040
function setupForAdTesting(fixture) {
4141
installDocService(fixture.win, /* isSingleDoc */ true);

Diff for: ads/google/a4a/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {DomFingerprint} from '#core/dom/fingerprint';
33
import {GEO_IN_GROUP} from '../../../extensions/amp-geo/0.1/amp-geo-in-group';
44
import {Services} from '#service';
55
import {buildUrl} from './shared/url-builder';
6-
import {dev, devAssert, user} from '../../../src/log';
6+
import {dev, devAssert, user} from '#utils/log';
77
import {dict} from '#core/types/object';
88
import {getBinaryType, isExperimentOn, toggleExperiment} from '#experiments';
99
import {getConsentPolicyState} from '../../../src/consent';

Diff for: ads/google/doubleclick.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {dev} from '../../src/log';
1+
import {dev} from '#utils/log';
22

33
const TAG = 'DOUBLECLICK - DEPRECATED';
44
/**

Diff for: ads/google/ima/ima-video.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
22
import {ImaPlayerData} from './ima-player-data';
33
import {camelCaseToTitleCase, setStyle, toggle} from '#core/dom/style';
4-
import {getData} from '../../../src/event-helper';
4+
import {getData} from '#utils/event-helper';
55
import {htmlFor, htmlRefs, svgFor} from '#core/dom/static-template';
66
import {isArray, isObject} from '#core/types';
77
import {loadScript} from '#3p/3p';

Diff for: ads/google/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
getAutoConfig,
55
getPubControlConfig,
66
} from './a4a/shared/content-recommendation';
7-
import {user} from '../../src/log';
7+
import {user} from '#utils/log';
88

99
/**
1010
* Approved height for AdSense full-width responsive ads.

Diff for: ads/inabox/inabox-host.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import {InaboxMessagingHost} from './inabox-messaging-host';
7-
import {dev, initLogConstructor, setReportError, user} from '../../src/log';
8-
import {getData} from '../../src/event-helper';
7+
import {dev, initLogConstructor, setReportError, user} from '#utils/log';
8+
import {getData} from '#utils/event-helper';
99
import {reportError} from '../../src/error-reporting';
1010

1111
/** @const {string} */

Diff for: ads/inabox/inabox-messaging-host.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import {
44
serializeMessage,
55
} from '#core/3p-frame-messaging';
66
import {canInspectWindow} from '../../src/iframe-helper';
7-
import {dev, devAssert} from '../../src/log';
7+
import {dev, devAssert} from '#utils/log';
88
import {dict} from '#core/types/object';
9-
import {getData} from '../../src/event-helper';
9+
import {getData} from '#utils/event-helper';
1010
import {getFrameOverlayManager} from './frame-overlay-manager';
1111
import {getPositionObserver} from './position-observer';
1212

Diff for: ads/vendors/_ping_.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {dev, devAssert, userAssert} from '../../src/log';
1+
import {dev, devAssert, userAssert} from '#utils/log';
22
import {validateData} from '#3p/3p';
33

44
/**

Diff for: ads/vendors/criteo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {dev} from '../../src/log';
1+
import {dev} from '#utils/log';
22
import {loadScript} from '#3p/3p';
33

44
/* global Criteo: false */

Diff for: ads/vendors/csa.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {devAssert} from '../../src/log';
1+
import {devAssert} from '#utils/log';
22
import {getStyle, setStyle, setStyles} from '#core/dom/style';
33
import {loadScript, validateData} from '#3p/3p';
44
import {tryParseJson} from '#core/types/object/json';

Diff for: ads/vendors/netletix.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {addParamsToUrl, assertHttpsUrl} from '../../src/url';
2-
import {dev} from '../../src/log';
2+
import {dev} from '#utils/log';
33
import {dict} from '#core/types/object';
44
import {loadScript, validateData, writeScript} from '#3p/3p';
55

Diff for: ads/vendors/promoteiq.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {loadScript, validateData} from '#3p/3p';
22
import {parseJson} from '#core/types/object/json';
3-
import {user} from '../../src/log';
3+
import {user} from '#utils/log';
44

55
const TAG = 'PROMOTEIQ';
66
const mandatoryDataFields = ['src', 'params', 'sfcallback'];

Diff for: ads/vendors/yieldbot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {getMultiSizeDimensions} from '#ads/google/utils';
22
import {loadScript, validateData} from '#3p/3p';
33
import {rethrowAsync} from '#core/error';
4-
import {user} from '../../src/log';
4+
import {user} from '#utils/log';
55

66
/**
77
* @param {!Window} global

Diff for: build-system/babel-plugins/babel-plugin-transform-dev-methods/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = function () {
5757
resolve(dirname(state.file.opts.filename), source.value)
5858
);
5959

60-
if (filepath.endsWith('src/log')) {
60+
if (filepath.endsWith('utils/log')) {
6161
const propertyMapped = calleeToPropertiesMap.get(
6262
specifier.imported.name
6363
);
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import {dev, user} from '../../../../../../../src/log';
1+
import {dev, user} from '#utils/log';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import { dev, user } from '../../../../../../../src/log';
1+
import { dev, user } from '#utils/log';

Diff for: build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/input.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {dev, user} from '../../../../../../../src/log';
1+
import {dev, user} from '#utils/log';
22

33
dev().info(
44
TAG,
@@ -47,4 +47,4 @@ class Foo {
4747
dev().error(TAG, 'Should not be removed');
4848
user().error('Should not be removed');
4949
}
50-
}
50+
}

Diff for: build-system/babel-plugins/babel-plugin-transform-dev-methods/test/fixtures/transform-assertions/imported-both-usage/output.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { dev, user } from '../../../../../../../src/log';
1+
import { dev, user } from '#utils/log';
22
dev().info;
33
user().fine;
44

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import {dev} from '../../../../../../../src/log';
1+
import {dev} from '#utils/log';
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import { dev } from '../../../../../../../src/log';
1+
import { dev } from '#utils/log';

0 commit comments

Comments
 (0)