amp optimizer to support ampjs.org (not enabled as default)

ampproject · May 23, 2024 · 76522bd · 76522bd
1 parent 39795ea
commit 76522bd
Show file tree

Hide file tree

Showing 18 changed files with 293 additions and 208 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/optimizer/lib/AmpConstants.js b/packages/optimizer/lib/AmpConstants.js
@@ -21,7 +21,8 @@ const AMP_STORY_DVH_POLYFILL_ATTR = 'amp-story-dvh-polyfill';
 
 module.exports = {
   AMP_TAGS: ['amp', '⚡', '⚡4ads', 'amp4ads', '⚡4email', 'amp4email'],
-  AMP_CACHE_HOST: 'https://cdn.ampproject.org',
+  AMP_CACHE_HOSTS: ['https://cdn.ampproject.org', 'https://ampjs.org'],
+  DEFAULT_AMP_CACHE_HOST: 'https://cdn.ampproject.org',
   AMP_VALIDATION_RULES_URL: 'https://cdn.ampproject.org/v0/validator.json',
   AMP_FORMATS: ['AMP', 'AMP4EMAIL', 'AMP4ADS'],
   AMP_RUNTIME_CSS_PATH: '/v0.css',

diff --git a/packages/optimizer/lib/RuntimeHostHelper.js b/packages/optimizer/lib/RuntimeHostHelper.js
@@ -15,10 +15,10 @@
  */
 'use strict';
 
-const {AMP_CACHE_HOST, appendRuntimeVersion} = require('./AmpConstants.js');
+const {DEFAULT_AMP_CACHE_HOST, appendRuntimeVersion} = require('./AmpConstants.js');
 
 function calculateHost({
-  ampUrlPrefix = AMP_CACHE_HOST,
+  ampUrlPrefix = DEFAULT_AMP_CACHE_HOST,
   ampRuntimeVersion,
   lts = false,
   rtv = false,