temp

Author: erwinmombay

package-lock.json

@@ -55,6 +55,7 @@
     "jest": "27.0.6",
     "jimp": "0.16.1",
     "js-beautify": "1.14.0",
+    "json5": "2.2.0",
     "karma": "6.3.4",
     "karma-chrome-launcher": "3.1.0",
     "karma-jasmine": "4.0.1",

package.json

@@ -17,8 +17,10 @@
 
 const URL_COMPONENT_VERSIONS =
   'https://raw.githubusercontent.com/ampproject/amphtml/main/build-system/compile/bundles.config.extensions.json';
+const URL_COMPONENT_LATEST_VERSIONS = 'https://raw.githubusercontent.com/ampproject/amphtml/main/build-system/compile/bundles.legacy-latest-versions.jsonc';
 const validatorRulesProvider = require('@ampproject/toolbox-validator-rules');
 const {MaxAge} = require('@ampproject/toolbox-core');
+const JSON5 = require('json5');
 let fallbackRuntime;
 
 try {
@@ -111,15 +113,29 @@ async function fetchComponentVersionsFromCache_(config, runtimeParameters) {
 async function fetchComponentVersions_(config, runtimeParameters) {
   // Strip the leading two chars from the version identifier to get the release tag
   const releaseTag = runtimeParameters.ampRuntimeVersion.substring(2);
+  console.log('releaseTag', releaseTag);
   const componentConfigUrl = `https://raw.githubusercontent.com/ampproject/amphtml/${releaseTag}/build-system/compile/bundles.config.extensions.json`;
+  const componentLatestVersionsUrl = `https://raw.githubusercontent.com/ampproject/amphtml/${releaseTag}/build-system/compile/bundles.legacy-latest-versions.jsonc`;
 
-  const response = await config.fetch(componentConfigUrl);
-  if (!response.ok) {
+  const configResponse = await config.fetch(componentConfigUrl);
+  const latestVersionsConfigResponse = await config.fetch(componentLatestVersionsUrl);
+  if (!configResponse.ok) {
+    console.log('a');
+    debugger;
+    throw new Error(
+      `Failed fetching latest component versions from ${URL_COMPONENT_VERSIONS} with status: ${configResponse.status}`
+    );
+  }
+  if (!latestVersionsConfig.ok) {
+    console.log('b');
+    debugger;
     throw new Error(
-      `Failed fetching latest component versions from ${URL_COMPONENT_VERSIONS} with status: ${response.status}`
+      `Failed fetching latest component versions from ${URL_COMPONENT_LATEST_VERSIONS} with status: ${latestVersionsConfig.status}`
     );
   }
-  return response.json();
+  console.log('c');
+  debugger;
+  return configResponse.json();
 }
 
 /**

packages/optimizer/lib/fetchRuntimeParameters.js

@@ -141,23 +141,7 @@ class AutoExtensionImporter {
     if (!this.componentVersions) {
       this.componentVersions = {};
       for (const component of params.componentVersions) {
-        if (Array.isArray(component.version)) {
-          // If version is an array then we need to find the highest value.
-          // Note we need to preserve the "stringy"ness of these versions
-          // so make sure we don't do any coercion or casting of the value
-          // we assign.
-          this.componentVersions[component.name] = component.version.reduce((prev, cur) => {
-            return Number(prev) > Number(cur) ? prev : cur;
-          });
-        } else {
-          this.componentVersions[component.name] =
-            Number(component.version) >
-            // Make sure to guard if the entry doesn't exist yet. We default
-            // comparing to 0.
-            Number(this.componentVersions[component.name] || 0)
-              ? component.version
-              : this.componentVersions[component.name];
-        }
+        this.componentVersions[component.name] = component.latestVersion;
       }
     }
     if (!this.extensionSpec_) {