♻️ amp lint --fix: sort/order (ampproject#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.
henel677 · Jan 12, 2022 · 8c34f2d · 8c34f2d
1 parent cb17f8a
commit 8c34f2d
Show file tree

Hide file tree

Showing 493 changed files with 2,849 additions and 1,846 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -299,9 +299,7 @@ module.exports = {
     ],
     'sort-destructure-keys/sort-destructure-keys': 2,
     'import/order': [
-      // Disabled for now, so individual folders can opt-in one PR at a time and
-      // minimize disruption/merge conflicts
-      0,
+      2,
       {
         // Split up imports groups with exactly one newline
         'newlines-between': 'always',
@@ -460,8 +458,8 @@ module.exports = {
       },
     },
     {
-      'files': ['3p/**/*.js', 'src/**/*.js', 'test/**/*.js', 'testing/**/*.js'],
-      'rules': {'import/order': 2},
+      'files': ['build-system/**/*.js'],
+      'rules': {'import/order': 0},
     },
     {
       'files': ['src/preact/**', 'extensions/**/1.0/**', '**/storybook/**'],

diff --git a/ads/alp/handler.js b/ads/alp/handler.js
@@ -1,15 +1,17 @@
+import {closest} from '#core/dom/query';
+import {dict} from '#core/types/object';
+import {parseQueryString} from '#core/types/string/url';
+
+import {dev} from '#utils/log';
+
+import {urls} from '../../src/config';
+import {openWindowDialog} from '../../src/open-window-dialog';
 import {
   addParamToUrl,
   isLocalhostOrigin,
   isProxyOrigin,
   parseUrlDeprecated,
 } from '../../src/url';
-import {closest} from '#core/dom/query';
-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';
-import {urls} from '../../src/config';
 
 /**
  * Install a click listener that transforms navigation to the AMP cache

diff --git a/ads/alp/install-alp.js b/ads/alp/install-alp.js
@@ -1,7 +1,9 @@
 // Utility file that generates URLs suitable for AMP's impression tracking.
 
 import {initLogConstructor, setReportError} from '#utils/log';
+
 import {installAlpClickHandler, warmupStatic} from './handler';
+
 import {reportError} from '../../src/error-reporting';
 
 initLogConstructor();

diff --git a/ads/google/a4a/experiment-utils.js b/ads/google/a4a/experiment-utils.js
@@ -1,10 +1,11 @@
-import {addExperimentIdToElement} from './traffic-experiments';
 import {
   forceExperimentBranch,
   getExperimentBranch,
   randomlySelectUnsetExperiments,
 } from '#experiments';
 
+import {addExperimentIdToElement} from './traffic-experiments';
+
 /**
  * Attempts to select into experiment and forces branch if selected.
  * @param {!Window} win

diff --git a/ads/google/a4a/test/test-traffic-experiments.js b/ads/google/a4a/test/test-traffic-experiments.js
@@ -1,13 +1,13 @@
-import {
-  AMP_EXPERIMENT_ATTRIBUTE,
-  EXPERIMENT_ATTRIBUTE,
-} from '#ads/google/a4a/utils';
 import {
   addAmpExperimentIdToElement,
   addExperimentIdToElement,
   isInExperiment,
   validateExperimentIds,
 } from '#ads/google/a4a/traffic-experiments';
+import {
+  AMP_EXPERIMENT_ATTRIBUTE,
+  EXPERIMENT_ATTRIBUTE,
+} from '#ads/google/a4a/utils';
 
 describes.sandboxed('all-traffic-experiments-tests', {}, () => {
   describe('#validateExperimentIds', () => {

diff --git a/ads/google/a4a/test/test-utils.js b/ads/google/a4a/test/test-utils.js
@@ -1,7 +1,8 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
+
 import '../../../../extensions/amp-ad/0.1/amp-ad-ui';
 import '../../../../extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler';
-import * as IniLoad from '../../../../src/ini-load';
+import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 import {
   AMP_EXPERIMENT_ATTRIBUTE,
   EXPERIMENT_ATTRIBUTE,
@@ -24,19 +25,25 @@ import {
   maybeInsertOriginTrialToken,
   mergeExperimentIds,
 } from '#ads/google/a4a/utils';
+
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
-import {GEO_IN_GROUP} from '../../../../extensions/amp-geo/0.1/amp-geo-in-group';
-import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
-import {Services} from '#service';
-import {buildUrl} from '#ads/google/a4a/shared/url-builder';
 import {createElementWithAttributes} from '#core/dom';
-import {createIframePromise} from '#testing/iframe';
+
+import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
 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 '#utils/log';
 
+import {createIframePromise} from '#testing/iframe';
+
+import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
+import {GEO_IN_GROUP} from '../../../../extensions/amp-geo/0.1/amp-geo-in-group';
+import * as IniLoad from '../../../../src/ini-load';
+
 function setupForAdTesting(fixture) {
   installDocService(fixture.win, /* isSingleDoc */ true);
   installExtensionsService(fixture.win);

diff --git a/ads/google/a4a/traffic-experiments.js b/ads/google/a4a/traffic-experiments.js
@@ -6,13 +6,15 @@
  * impacts on click-throughs.
  */
 
+import {parseQueryString} from '#core/types/string/url';
+
+import {Services} from '#service';
+
 import {
   AMP_EXPERIMENT_ATTRIBUTE,
   EXPERIMENT_ATTRIBUTE,
   mergeExperimentIds,
 } from './utils';
-import {Services} from '#service';
-import {parseQueryString} from '#core/types/string/url';
 
 /** @typedef {{
  *    control: string,

diff --git a/ads/google/a4a/utils.js b/ads/google/a4a/utils.js
@@ -1,21 +1,26 @@
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
+import {createElementWithAttributes} from '#core/dom';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 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 '#utils/log';
+import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
+import * as mode from '#core/mode';
 import {dict} from '#core/types/object';
+import {parseJson} from '#core/types/object/json';
+
 import {getBinaryType, isExperimentOn, toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
+import {getTimingDataSync} from '#service/variable-source';
+
+import {dev, devAssert, user} from '#utils/log';
+
+import {buildUrl} from './shared/url-builder';
+
+import {GEO_IN_GROUP} from '../../../extensions/amp-geo/0.1/amp-geo-in-group';
+import {getOrCreateAdCid} from '../../../src/ad-cid';
 import {getConsentPolicyState} from '../../../src/consent';
 import {getMeasuredResources} from '../../../src/ini-load';
 import {getMode} from '../../../src/mode';
-import {getOrCreateAdCid} from '../../../src/ad-cid';
-import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
-import {getTimingDataSync} from '#service/variable-source';
-import * as mode from '#core/mode';
-import {parseJson} from '#core/types/object/json';
-import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
-import {createElementWithAttributes} from '#core/dom';
 
 /** @type {string}  */
 const AMP_ANALYTICS_HEADER = 'X-AmpAnalytics';

diff --git a/ads/google/ima/ima-video.js b/ads/google/ima/ima-video.js
@@ -1,12 +1,16 @@
+import {loadScript} from '#3p/3p';
+
 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 '#utils/event-helper';
 import {htmlFor, htmlRefs, svgFor} from '#core/dom/static-template';
+import {camelCaseToTitleCase, setStyle, toggle} from '#core/dom/style';
 import {isArray, isObject} from '#core/types';
-import {loadScript} from '#3p/3p';
 import {throttle} from '#core/types/function';
 import {tryParseJson} from '#core/types/object/json';
+
+import {getData} from '#utils/event-helper';
+
+import {ImaPlayerData} from './ima-player-data';
+
 // Source for this constant is css/amp-ima-video-iframe.css
 import {cssText} from '../../../build/amp-ima-video-iframe.css';
 

diff --git a/ads/google/utils.js b/ads/google/utils.js
@@ -1,10 +1,11 @@
+import {user} from '#utils/log';
+
 import {
   ExternalCorePubVars,
   MIN_PUB_CONTROL_WIDTH_OF_DESKTOP,
   getAutoConfig,
   getPubControlConfig,
 } from './a4a/shared/content-recommendation';
-import {user} from '#utils/log';
 
 /**
  * Approved height for AdSense full-width responsive ads.

diff --git a/ads/inabox/frame-overlay-helper.js b/ads/inabox/frame-overlay-helper.js
@@ -1,10 +1,11 @@
 import {layoutRectFromDomRect, layoutRectLtwh} from '#core/dom/layout/rect';
+import {resetStyles, setImportantStyles} from '#core/dom/style';
+
 import {
   centerFrameUnderVsyncMutate,
   collapseFrameUnderVsyncMutate,
   expandFrameUnderVsyncMutate,
 } from './full-overlay-frame-helper';
-import {resetStyles, setImportantStyles} from '#core/dom/style';
 import {restrictedVsync, timer} from './util';
 
 const CENTER_TRANSITION_TIME_MS = 150;

diff --git a/ads/inabox/inabox-host.js b/ads/inabox/inabox-host.js
@@ -3,9 +3,11 @@
  * its embed AMP content (such as an ad created in AMP).
  */
 
-import {InaboxMessagingHost} from './inabox-messaging-host';
-import {dev, initLogConstructor, setReportError, user} from '#utils/log';
 import {getData} from '#utils/event-helper';
+import {dev, initLogConstructor, setReportError, user} from '#utils/log';
+
+import {InaboxMessagingHost} from './inabox-messaging-host';
+
 import {reportError} from '../../src/error-reporting';
 
 /** @const {string} */

diff --git a/ads/inabox/inabox-messaging-host.js b/ads/inabox/inabox-messaging-host.js
@@ -3,13 +3,16 @@ import {
   deserializeMessage,
   serializeMessage,
 } from '#core/3p-frame-messaging';
-import {canInspectWindow} from '../../src/iframe-helper';
-import {dev, devAssert} from '#utils/log';
 import {dict} from '#core/types/object';
+
 import {getData} from '#utils/event-helper';
+import {dev, devAssert} from '#utils/log';
+
 import {getFrameOverlayManager} from './frame-overlay-manager';
 import {getPositionObserver} from './position-observer';
 
+import {canInspectWindow} from '../../src/iframe-helper';
+
 /** @const */
 const TAG = 'InaboxMessagingHost';
 

diff --git a/ads/inabox/position-observer.js b/ads/inabox/position-observer.js
@@ -1,9 +1,9 @@
+import {Observable} from '#core/data-structures/observable';
 import {
   layoutRectFromDomRect,
   layoutRectLtwh,
   moveLayoutRect,
 } from '#core/dom/layout/rect';
-import {Observable} from '#core/data-structures/observable';
 import {throttle} from '#core/types/function';
 
 /**

diff --git a/ads/vendors/_fakedelayed_.js b/ads/vendors/_fakedelayed_.js
@@ -1,6 +1,7 @@
-import {setStyles} from '#core/dom/style';
 import {validateData, writeScript} from '#3p/3p';
 
+import {setStyles} from '#core/dom/style';
+
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/vendors/_ping_.js b/ads/vendors/_ping_.js
@@ -1,6 +1,7 @@
-import {dev, devAssert, userAssert} from '#utils/log';
 import {validateData} from '#3p/3p';
 
+import {dev, devAssert, userAssert} from '#utils/log';
+
 /**
  * A fake ad network integration that is mainly used for testing
  * and demo purposes. This implementation gets stripped out in compiled

diff --git a/ads/vendors/a9.js b/ads/vendors/a9.js
@@ -1,5 +1,6 @@
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData, writeScript} from '#3p/3p';
+
+import {hasOwn} from '#core/types/object';
 import {parseJson} from '#core/types/object/json';
 
 const mandatoryParams = [],

diff --git a/ads/vendors/adincube.js b/ads/vendors/adincube.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/vendors/admixer.js b/ads/vendors/admixer.js
@@ -1,6 +1,7 @@
-import {tryParseJson} from '#core/types/object/json';
 import {validateData, writeScript} from '#3p/3p';
 
+import {tryParseJson} from '#core/types/object/json';
+
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/vendors/adocean.js b/ads/vendors/adocean.js
@@ -1,5 +1,6 @@
-import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {computeInMasterFrame, validateData, writeScript} from '#3p/3p';
+
+import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';
 import {parseJson} from '#core/types/object/json';
 
 /**

diff --git a/ads/vendors/adplugg.js b/ads/vendors/adplugg.js
@@ -1,6 +1,7 @@
-import {hasOwn} from '#core/types/object';
 import {loadScript, validateData} from '#3p/3p';
 
+import {hasOwn} from '#core/types/object';
+
 /**
  * Make an AdPlugg iframe.
  * @param {!Window} global

diff --git a/ads/vendors/adspirit.js b/ads/vendors/adspirit.js
@@ -1,6 +1,7 @@
-import {setStyles} from '#core/dom/style';
 import {validateData} from '#3p/3p';
 
+import {setStyles} from '#core/dom/style';
+
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/vendors/adventive.js b/ads/vendors/adventive.js
@@ -1,7 +1,9 @@
-import {addParamsToUrl} from '../../src/url';
+import {loadScript, validateData, writeScript} from '#3p/3p';
+
 import {dict, hasOwn} from '#core/types/object';
 import {endsWith} from '#core/types/string';
-import {loadScript, validateData, writeScript} from '#3p/3p';
+
+import {addParamsToUrl} from '../../src/url';
 
 /**
  * @param {!Window} global

diff --git a/ads/vendors/adverticum.js b/ads/vendors/adverticum.js
@@ -1,5 +1,6 @@
-import {setStyle} from '#core/dom/style';
 import {validateData, writeScript} from '#3p/3p';
+
+import {setStyle} from '#core/dom/style';
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/vendors/appnexus.js b/ads/vendors/appnexus.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData, writeScript} from '#3p/3p';
+
 import {setStyles} from '#core/dom/style';
 
 const APPNEXUS_AST_URL = 'https://acdn.adnxs.com/ast/ast.js';

diff --git a/ads/vendors/blade.js b/ads/vendors/blade.js
@@ -1,4 +1,5 @@
 import {loadScript, validateData} from '#3p/3p';
+
 import {tryParseJson} from '#core/types/object/json';
 
 /**

diff --git a/ads/vendors/cedato.js b/ads/vendors/cedato.js
@@ -1,7 +1,9 @@
-import {parseUrlDeprecated} from '../../src/url';
-import {setStyles} from '#core/dom/style';
 import {validateData} from '#3p/3p';
 
+import {setStyles} from '#core/dom/style';
+
+import {parseUrlDeprecated} from '../../src/url';
+
 /**
  * @param {!Window} global
  * @param {!Object} data

diff --git a/ads/vendors/connatix.js b/ads/vendors/connatix.js
@@ -1,6 +1,7 @@
+import {validateData} from '#3p/3p';
+
 import {hasOwn} from '#core/types/object';
 import {tryParseJson} from '#core/types/object/json';
-import {validateData} from '#3p/3p';
 
 /**
  * @param {!Window} global