Skip to content

Commit 8c34f2d

Browse files
samourisamouri
authored
♻️ amp lint --fix: sort/order (#37353)
* import order: remove exceptions from eslintrc - build-system still can't use import/order because its all unfixable require statements * amp lint --fix * manual-ish fixes.
1 parent cb17f8a commit 8c34f2d

File tree

493 files changed

+2849
-1846
lines changed

Some content is hidden

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

493 files changed

+2849
-1846
lines changed

‎.eslintrc.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,7 @@ module.exports = {
299299
],
300300
'sort-destructure-keys/sort-destructure-keys': 2,
301301
'import/order': [
302-
// Disabled for now, so individual folders can opt-in one PR at a time and
303-
// minimize disruption/merge conflicts
304-
0,
302+
2,
305303
{
306304
// Split up imports groups with exactly one newline
307305
'newlines-between': 'always',
@@ -460,8 +458,8 @@ module.exports = {
460458
},
461459
},
462460
{
463-
'files': ['3p/**/*.js', 'src/**/*.js', 'test/**/*.js', 'testing/**/*.js'],
464-
'rules': {'import/order': 2},
461+
'files': ['build-system/**/*.js'],
462+
'rules': {'import/order': 0},
465463
},
466464
{
467465
'files': ['src/preact/**', 'extensions/**/1.0/**', '**/storybook/**'],

‎ads/alp/handler.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1+
import {closest} from '#core/dom/query';
2+
import {dict} from '#core/types/object';
3+
import {parseQueryString} from '#core/types/string/url';
4+
5+
import {dev} from '#utils/log';
6+
7+
import {urls} from '../../src/config';
8+
import {openWindowDialog} from '../../src/open-window-dialog';
19
import {
210
addParamToUrl,
311
isLocalhostOrigin,
412
isProxyOrigin,
513
parseUrlDeprecated,
614
} from '../../src/url';
7-
import {closest} from '#core/dom/query';
8-
import {dev} from '#utils/log';
9-
import {dict} from '#core/types/object';
10-
import {openWindowDialog} from '../../src/open-window-dialog';
11-
import {parseQueryString} from '#core/types/string/url';
12-
import {urls} from '../../src/config';
1315

1416
/**
1517
* Install a click listener that transforms navigation to the AMP cache

‎ads/alp/install-alp.js

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

33
import {initLogConstructor, setReportError} from '#utils/log';
4+
45
import {installAlpClickHandler, warmupStatic} from './handler';
6+
57
import {reportError} from '../../src/error-reporting';
68

79
initLogConstructor();

‎ads/google/a4a/experiment-utils.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import {addExperimentIdToElement} from './traffic-experiments';
21
import {
32
forceExperimentBranch,
43
getExperimentBranch,
54
randomlySelectUnsetExperiments,
65
} from '#experiments';
76

7+
import {addExperimentIdToElement} from './traffic-experiments';
8+
89
/**
910
* Attempts to select into experiment and forces branch if selected.
1011
* @param {!Window} win

‎ads/google/a4a/test/test-traffic-experiments.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import {
2-
AMP_EXPERIMENT_ATTRIBUTE,
3-
EXPERIMENT_ATTRIBUTE,
4-
} from '#ads/google/a4a/utils';
51
import {
62
addAmpExperimentIdToElement,
73
addExperimentIdToElement,
84
isInExperiment,
95
validateExperimentIds,
106
} from '#ads/google/a4a/traffic-experiments';
7+
import {
8+
AMP_EXPERIMENT_ATTRIBUTE,
9+
EXPERIMENT_ATTRIBUTE,
10+
} from '#ads/google/a4a/utils';
1111

1212
describes.sandboxed('all-traffic-experiments-tests', {}, () => {
1313
describe('#validateExperimentIds', () => {

‎ads/google/a4a/test/test-utils.js

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import * as fakeTimers from '@sinonjs/fake-timers';
2+
23
import '../../../../extensions/amp-ad/0.1/amp-ad-ui';
34
import '../../../../extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler';
4-
import * as IniLoad from '../../../../src/ini-load';
5+
import {buildUrl} from '#ads/google/a4a/shared/url-builder';
56
import {
67
AMP_EXPERIMENT_ATTRIBUTE,
78
EXPERIMENT_ATTRIBUTE,
@@ -24,19 +25,25 @@ import {
2425
maybeInsertOriginTrialToken,
2526
mergeExperimentIds,
2627
} from '#ads/google/a4a/utils';
28+
2729
import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
28-
import {GEO_IN_GROUP} from '../../../../extensions/amp-geo/0.1/amp-geo-in-group';
29-
import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
30-
import {Services} from '#service';
31-
import {buildUrl} from '#ads/google/a4a/shared/url-builder';
3230
import {createElementWithAttributes} from '#core/dom';
33-
import {createIframePromise} from '#testing/iframe';
31+
32+
import {toggleExperiment} from '#experiments';
33+
34+
import {Services} from '#service';
3435
import {installDocService} from '#service/ampdoc-impl';
3536
import {installExtensionsService} from '#service/extensions-impl';
3637
import {installXhrService} from '#service/xhr-impl';
37-
import {toggleExperiment} from '#experiments';
38+
3839
import {user} from '#utils/log';
3940

41+
import {createIframePromise} from '#testing/iframe';
42+
43+
import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
44+
import {GEO_IN_GROUP} from '../../../../extensions/amp-geo/0.1/amp-geo-in-group';
45+
import * as IniLoad from '../../../../src/ini-load';
46+
4047
function setupForAdTesting(fixture) {
4148
installDocService(fixture.win, /* isSingleDoc */ true);
4249
installExtensionsService(fixture.win);

‎ads/google/a4a/traffic-experiments.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
* impacts on click-throughs.
77
*/
88

9+
import {parseQueryString} from '#core/types/string/url';
10+
11+
import {Services} from '#service';
12+
913
import {
1014
AMP_EXPERIMENT_ATTRIBUTE,
1115
EXPERIMENT_ATTRIBUTE,
1216
mergeExperimentIds,
1317
} from './utils';
14-
import {Services} from '#service';
15-
import {parseQueryString} from '#core/types/string/url';
1618

1719
/** @typedef {{
1820
* control: string,

‎ads/google/a4a/utils.js

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
2+
import {createElementWithAttributes} from '#core/dom';
3+
import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
24
import {DomFingerprint} from '#core/dom/fingerprint';
3-
import {GEO_IN_GROUP} from '../../../extensions/amp-geo/0.1/amp-geo-in-group';
4-
import {Services} from '#service';
5-
import {buildUrl} from './shared/url-builder';
6-
import {dev, devAssert, user} from '#utils/log';
5+
import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
6+
import * as mode from '#core/mode';
77
import {dict} from '#core/types/object';
8+
import {parseJson} from '#core/types/object/json';
9+
810
import {getBinaryType, isExperimentOn, toggleExperiment} from '#experiments';
11+
12+
import {Services} from '#service';
13+
import {getTimingDataSync} from '#service/variable-source';
14+
15+
import {dev, devAssert, user} from '#utils/log';
16+
17+
import {buildUrl} from './shared/url-builder';
18+
19+
import {GEO_IN_GROUP} from '../../../extensions/amp-geo/0.1/amp-geo-in-group';
20+
import {getOrCreateAdCid} from '../../../src/ad-cid';
921
import {getConsentPolicyState} from '../../../src/consent';
1022
import {getMeasuredResources} from '../../../src/ini-load';
1123
import {getMode} from '../../../src/mode';
12-
import {getOrCreateAdCid} from '../../../src/ad-cid';
13-
import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
14-
import {getTimingDataSync} from '#service/variable-source';
15-
import * as mode from '#core/mode';
16-
import {parseJson} from '#core/types/object/json';
17-
import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
18-
import {createElementWithAttributes} from '#core/dom';
1924

2025
/** @type {string} */
2126
const AMP_ANALYTICS_HEADER = 'X-AmpAnalytics';

‎ads/google/ima/ima-video.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1+
import {loadScript} from '#3p/3p';
2+
13
import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
2-
import {ImaPlayerData} from './ima-player-data';
3-
import {camelCaseToTitleCase, setStyle, toggle} from '#core/dom/style';
4-
import {getData} from '#utils/event-helper';
54
import {htmlFor, htmlRefs, svgFor} from '#core/dom/static-template';
5+
import {camelCaseToTitleCase, setStyle, toggle} from '#core/dom/style';
66
import {isArray, isObject} from '#core/types';
7-
import {loadScript} from '#3p/3p';
87
import {throttle} from '#core/types/function';
98
import {tryParseJson} from '#core/types/object/json';
9+
10+
import {getData} from '#utils/event-helper';
11+
12+
import {ImaPlayerData} from './ima-player-data';
13+
1014
// Source for this constant is css/amp-ima-video-iframe.css
1115
import {cssText} from '../../../build/amp-ima-video-iframe.css';
1216

‎ads/google/utils.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import {user} from '#utils/log';
2+
13
import {
24
ExternalCorePubVars,
35
MIN_PUB_CONTROL_WIDTH_OF_DESKTOP,
46
getAutoConfig,
57
getPubControlConfig,
68
} from './a4a/shared/content-recommendation';
7-
import {user} from '#utils/log';
89

910
/**
1011
* Approved height for AdSense full-width responsive ads.

‎ads/inabox/frame-overlay-helper.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import {layoutRectFromDomRect, layoutRectLtwh} from '#core/dom/layout/rect';
2+
import {resetStyles, setImportantStyles} from '#core/dom/style';
3+
24
import {
35
centerFrameUnderVsyncMutate,
46
collapseFrameUnderVsyncMutate,
57
expandFrameUnderVsyncMutate,
68
} from './full-overlay-frame-helper';
7-
import {resetStyles, setImportantStyles} from '#core/dom/style';
89
import {restrictedVsync, timer} from './util';
910

1011
const CENTER_TRANSITION_TIME_MS = 150;

‎ads/inabox/inabox-host.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
* its embed AMP content (such as an ad created in AMP).
44
*/
55

6-
import {InaboxMessagingHost} from './inabox-messaging-host';
7-
import {dev, initLogConstructor, setReportError, user} from '#utils/log';
86
import {getData} from '#utils/event-helper';
7+
import {dev, initLogConstructor, setReportError, user} from '#utils/log';
8+
9+
import {InaboxMessagingHost} from './inabox-messaging-host';
10+
911
import {reportError} from '../../src/error-reporting';
1012

1113
/** @const {string} */

‎ads/inabox/inabox-messaging-host.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ import {
33
deserializeMessage,
44
serializeMessage,
55
} from '#core/3p-frame-messaging';
6-
import {canInspectWindow} from '../../src/iframe-helper';
7-
import {dev, devAssert} from '#utils/log';
86
import {dict} from '#core/types/object';
7+
98
import {getData} from '#utils/event-helper';
9+
import {dev, devAssert} from '#utils/log';
10+
1011
import {getFrameOverlayManager} from './frame-overlay-manager';
1112
import {getPositionObserver} from './position-observer';
1213

14+
import {canInspectWindow} from '../../src/iframe-helper';
15+
1316
/** @const */
1417
const TAG = 'InaboxMessagingHost';
1518

‎ads/inabox/position-observer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import {Observable} from '#core/data-structures/observable';
12
import {
23
layoutRectFromDomRect,
34
layoutRectLtwh,
45
moveLayoutRect,
56
} from '#core/dom/layout/rect';
6-
import {Observable} from '#core/data-structures/observable';
77
import {throttle} from '#core/types/function';
88

99
/**

‎ads/vendors/_fakedelayed_.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {setStyles} from '#core/dom/style';
21
import {validateData, writeScript} from '#3p/3p';
32

3+
import {setStyles} from '#core/dom/style';
4+
45
/**
56
* @param {!Window} global
67
* @param {!Object} data

‎ads/vendors/_ping_.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {dev, devAssert, userAssert} from '#utils/log';
21
import {validateData} from '#3p/3p';
32

3+
import {dev, devAssert, userAssert} from '#utils/log';
4+
45
/**
56
* A fake ad network integration that is mainly used for testing
67
* and demo purposes. This implementation gets stripped out in compiled

‎ads/vendors/a9.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import {hasOwn} from '#core/types/object';
21
import {loadScript, validateData, writeScript} from '#3p/3p';
2+
3+
import {hasOwn} from '#core/types/object';
34
import {parseJson} from '#core/types/object/json';
45

56
const mandatoryParams = [],

‎ads/vendors/adincube.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {hasOwn} from '#core/types/object';
21
import {loadScript, validateData} from '#3p/3p';
32

3+
import {hasOwn} from '#core/types/object';
4+
45
/**
56
* @param {!Window} global
67
* @param {!Object} data

‎ads/vendors/admixer.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {tryParseJson} from '#core/types/object/json';
21
import {validateData, writeScript} from '#3p/3p';
32

3+
import {tryParseJson} from '#core/types/object/json';
4+
45
/**
56
* @param {!Window} global
67
* @param {!Object} data

‎ads/vendors/adocean.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
21
import {computeInMasterFrame, validateData, writeScript} from '#3p/3p';
2+
3+
import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
34
import {parseJson} from '#core/types/object/json';
45

56
/**

‎ads/vendors/adplugg.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {hasOwn} from '#core/types/object';
21
import {loadScript, validateData} from '#3p/3p';
32

3+
import {hasOwn} from '#core/types/object';
4+
45
/**
56
* Make an AdPlugg iframe.
67
* @param {!Window} global

‎ads/vendors/adspirit.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import {setStyles} from '#core/dom/style';
21
import {validateData} from '#3p/3p';
32

3+
import {setStyles} from '#core/dom/style';
4+
45
/**
56
* @param {!Window} global
67
* @param {!Object} data

‎ads/vendors/adventive.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import {addParamsToUrl} from '../../src/url';
1+
import {loadScript, validateData, writeScript} from '#3p/3p';
2+
23
import {dict, hasOwn} from '#core/types/object';
34
import {endsWith} from '#core/types/string';
4-
import {loadScript, validateData, writeScript} from '#3p/3p';
5+
6+
import {addParamsToUrl} from '../../src/url';
57

68
/**
79
* @param {!Window} global

‎ads/vendors/adverticum.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import {setStyle} from '#core/dom/style';
21
import {validateData, writeScript} from '#3p/3p';
2+
3+
import {setStyle} from '#core/dom/style';
34
/**
45
* @param {!Window} global
56
* @param {!Object} data

‎ads/vendors/appnexus.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {loadScript, validateData, writeScript} from '#3p/3p';
2+
23
import {setStyles} from '#core/dom/style';
34

45
const APPNEXUS_AST_URL = 'https://acdn.adnxs.com/ast/ast.js';

‎ads/vendors/blade.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {loadScript, validateData} from '#3p/3p';
2+
23
import {tryParseJson} from '#core/types/object/json';
34

45
/**

‎ads/vendors/cedato.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import {parseUrlDeprecated} from '../../src/url';
2-
import {setStyles} from '#core/dom/style';
31
import {validateData} from '#3p/3p';
42

3+
import {setStyles} from '#core/dom/style';
4+
5+
import {parseUrlDeprecated} from '../../src/url';
6+
57
/**
68
* @param {!Window} global
79
* @param {!Object} data

‎ads/vendors/connatix.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import {validateData} from '#3p/3p';
2+
13
import {hasOwn} from '#core/types/object';
24
import {tryParseJson} from '#core/types/object/json';
3-
import {validateData} from '#3p/3p';
45

56
/**
67
* @param {!Window} global

0 commit comments

Comments
 (0)