🏗♻️ Reorganize files in the amphtml root directory

.eslintrc

@@ -135,7 +135,7 @@
     "notice/notice": [2,
       {
         "mustMatch": "Copyright 20\\d{2} The AMP HTML Authors\\.",
-        "templateFile": "LICENSE-TEMPLATE.txt",
+        "templateFile": "build-system/common/LICENSE-TEMPLATE.txt",
         "messages": {
           "whenFailedToMatch": "Missing or incorrect license header"
         }

OWNERS.yaml

@@ -6,7 +6,7 @@
 - "?jridgewell"
 - "**/validator-*.{protoascii,html,out}": "#ampproject/wg-caching"
 - "*.md": ampproject/wg-outreach
-- "{.*,{{babel,bundles}.config,gulpfile}.js,renovate.json}": ampproject/wg-infra
+- "{.*,babel.config.js,gulpfile.js}": ampproject/wg-infra
 - "{package.json,yarn.lock}":
   - ampproject/wg-infra
   - ampproject/wg-runtime
@@ -20,7 +20,7 @@
 # use is complete.
 
 # Though this gives me the ability to approve changes to owners files, I do not
-# currently have merge access; the owners check is currently non-blocking; and 
+# currently have merge access; the owners check is currently non-blocking; and
 # I run and maintain the owners bot application.
 
 # TODO(#24685): Remove this once most owners files have been update and/or the

bundles.config.js → build-system/compile/bundles.config.js

@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 'use strict';
-/* global exports, process, require */
 
 const colors = require('ansi-colors');
 const log = require('fancy-log');
 
-const {
-  VERSION: internalRuntimeVersion,
-} = require('./build-system/compile/internal-version');
+const {VERSION: internalRuntimeVersion} = require('./internal-version');
 
 /**
  * @enum {string}

build-system/compile/single-pass.js

@@ -41,7 +41,7 @@ const {
   extensionBundles,
   altMainBundles,
   TYPES,
-} = require('../../bundles.config');
+} = require('./bundles.config');
 const {
   gulpClosureCompile,
   handleSinglePassCompilerError,

build-system/pr-check/build-targets.js

@@ -58,7 +58,8 @@ const targetMatchers = [
     targets: ['CACHES_JSON'],
     func: file => {
       return (
-        file == 'build-system/tasks/json-check.js' || file == 'caches.json'
+        file == 'build-system/tasks/json-check.js' ||
+        file == 'build-system/global-configs/caches.json'
       );
     },
   },

build-system/server/lazy-build.js

@@ -19,7 +19,7 @@ const {
   getExtensionsToBuild,
 } = require('../tasks/extension-helpers');
 const {doBuildJs} = require('../tasks/helpers');
-const {jsBundles} = require('../../bundles.config');
+const {jsBundles} = require('../compile/bundles.config');
 
 const extensionBundles = {};
 maybeInitializeExtensions(extensionBundles, /* includeLatest */ true);

build-system/tasks/extension-helpers.js

@@ -23,7 +23,7 @@ const {
   extensionAliasBundles,
   extensionBundles,
   verifyExtensionBundles,
-} = require('../../bundles.config');
+} = require('../compile/bundles.config');
 const {compileJs, mkdirSync} = require('./helpers');
 const {endBuildStep} = require('./helpers');
 const {isTravisBuild} = require('../common/travis');
@@ -127,8 +127,8 @@ function declareExtension(
 }
 
 /**
- * Initializes all extensions from bundles.config.js if not already done and
- * populates the given extensions object.
+ * Initializes all extensions from build-system/compile/bundles.config.js if not
+ * already done and populates the given extensions object.
  * @param {?Object} extensionsObject
  * @param {?boolean} includeLatest
  */

build-system/tasks/helpers.js

@@ -35,7 +35,7 @@ const wrappers = require('../compile/compile-wrappers');
 const {
   VERSION: internalRuntimeVersion,
 } = require('../compile/internal-version');
-const {altMainBundles, jsBundles} = require('../../bundles.config');
+const {altMainBundles, jsBundles} = require('../compile/bundles.config');
 const {applyConfig, removeConfig} = require('./prepend-global/index.js');
 const {closureCompile} = require('../compile/compile');
 const {thirdPartyFrames} = require('../test-configs/config');

build-system/tasks/json-check.js

@@ -23,20 +23,23 @@ const {jsonGlobs} = require('../test-configs/config');
 
 const expectedCaches = ['cloudflare', 'google'];
 
+const cachesJsonPath = 'build-system/global-configs/caches.json';
+
 /**
- * Fail if caches.json is missing some expected caches.
+ * Fail if build-system/global-configs/caches.json is missing some expected
+ * caches.
  * @return {!Promise}
  */
 async function cachesJson() {
-  return gulp.src(['caches.json']).pipe(
+  return gulp.src([cachesJsonPath]).pipe(
     through2.obj(function(file) {
       let obj;
       try {
         obj = JSON.parse(file.contents.toString());
       } catch (e) {
         log(
           colors.yellow(
-            'Could not parse caches.json. ' +
+            `Could not parse ${cachesJsonPath}. ` +
               'This is most likely a fatal error that ' +
               'will be found by checkValidJson'
           )
@@ -50,7 +53,9 @@ async function cachesJson() {
       for (const cache of expectedCaches) {
         if (!foundCaches.includes(cache)) {
           log(
-            colors.red('Missing expected cache "' + cache + '" in caches.json')
+            colors.red(
+              'Missing expected cache "' + cache + `" in ${cachesJsonPath}`
+            )
           );
           process.exitCode = 1;
         }

contributing/building-an-amp-extension.md

@@ -745,8 +745,8 @@ Also consider contributing to
 ## Updating build configs
 
 In order for your element to build correctly you would need to make few
-changes to bundles.config.js to tell it about your extension, its files and
-its examples. You will need to add an entry in the `extensionBundles` array.
+changes to [`build-system/compile/bundles.config.js`](../build-system/compile/bundles.config.js) to tell it about your
+extension, its files and its examples. You will need to add an entry in the `extensionBundles` array.
 
 ```javascript
 exports.extensionBundles = [

extensions/amp-geo/amp-geo.md

@@ -227,7 +227,7 @@ The `amp-geo` JavaScript file is served with a 30-minute cache lifetime (`Cache-
 
 The `amp-geo` component supports pre-rendering. If the document is served from the publisher origin and it already contains a class matching `amp-iso-country-*` `amp-geo` respects that value. `amp-geo` will use the supplied country and configuration to supply data to cooperating AMP extensions (e.g., `amp-consent`). If a pre-rendered country code is detected, the document will not be modified by  `amp-geo` to add classes for country group or `amp-state`.
 
-However, if the document is served via one of the [AMP caches](https://github.com/ampproject/amphtml/blob/master/caches.json), `amp-geo` removes and replaces any supplied geolocation classes and, if the `AmpBind` configuration key is true, updates `<amp-state id="ampGeo">` accordingly. This allows publishers to use their own geolocation code when the document is served directly from their origin while retaining dynamic configuration when served from a cache.
+However, if the document is served via one of the [AMP caches](https://github.com/ampproject/amphtml/blob/master/build-system/global-configs/caches.json), `amp-geo` removes and replaces any supplied geolocation classes and, if the `AmpBind` configuration key is true, updates `<amp-state id="ampGeo">` accordingly. This allows publishers to use their own geolocation code when the document is served directly from their origin while retaining dynamic configuration when served from a cache.
 
 Caches that wish to pre-render `amp-geo` should [open an issue](https://github.com/ampproject/amphtml/issues/new) requesting to be removed from the pre-render override.
 

spec/amp-cache-guidelines.md

@@ -98,7 +98,7 @@ For resources (i.e., HTML, images, fonts) that are larger than 12 MB, you may no
 
 ## Guidelines: Adding a new cache to the AMP ecosystem
 
-* Add the details of your cache to [caches.json](../caches.json).
+* Add the details of your cache to [caches.json](../build-system/global-configs/caches.json).
   * Some tools use the deployed version of this file (<https://cdn.ampproject.org/caches.json>) to automatically generate appropriate CORS headers as described at [CORS Security in AMP Guidelines](https://github.com/ampproject/amphtml/blob/master/spec/amp-cors-requests.md#cors-security-in-amp).
 * Handle dynamically generated components:
   * [`<amp-geo>`](../extensions/amp-geo/amp-geo.md) — at delivery time, the string `{{AMP_ISO_COUNTRY_HOTPATCH}}` in [`amp-geo.js`](../extensions/amp-geo/0.1/amp-geo.js) is replaced by a string consisting of the user's ISO country code followed by exactly 26 spaces (to avoid breaking map files).

spec/amp-cache-transform.md

@@ -98,7 +98,7 @@ For each identifier:
     prefetching intermediary, and therefore its subresource URLs needn't be (but
     may be) rewritten.
  4. Otherwise, if the identifier is an `id` from the list in
-    [caches.json](../caches.json), then the SXG should have its subresource URLs
+    [caches.json](../build-system/global-configs/caches.json), then the SXG should have its subresource URLs
     rewritten. That `id`'s corresponding `cacheDomain` indicates the
     fully-qualified domain name that forms the basis for the URL rewrites.
  5. Otherwise, the identifier is invalid and cannot be satisfied. The server