♻️ Remove version from legacy mode object (#35624)

* Remove `version` from legacy mode object * Restore version to mode-object for now * Remove version entirely * Lint fixes * Fix transformer test fixtures * Fix test
ampproject · Aug 12, 2021 · 87d5d14 · 87d5d14
1 parent 00b8e7e
commit 87d5d14
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 11 deletions.
diff --git a/...ns/babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/nomodule/input.js b/...ns/babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/nomodule/input.js
@@ -20,7 +20,6 @@ const test = getMode().test;
 const localDev = getMode().localDev;
 const minified = getMode().minified;
 const development = getMode().development;
-const version = getMode().version;
 
 function foo() {
   if (getMode().development == false) {

diff --git a/.../babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/nomodule/output.mjs b/.../babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/nomodule/output.mjs
@@ -18,7 +18,6 @@ const test = false;
 const localDev = false;
 const minified = true;
 const development = false;
-const version = "$internalRuntimeVersion$";
 
 function foo() {
   if (false == false) {

diff --git a/...s/babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/transform/input.js b/...s/babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/transform/input.js
@@ -21,7 +21,6 @@ const test = getMode().test;
 const localDev = getMode().localDev;
 const minified = getMode().minified;
 const development = getMode().development;
-const version = getMode().version;
 const namespaceVersion = mode.version();
 
 function foo() {

diff --git a/...babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/transform/output.mjs b/...babel-plugin-amp-mode-transformer/test/fixtures/transform-assertions/transform/output.mjs
@@ -19,7 +19,6 @@ const test = false;
 const localDev = false;
 const minified = true;
 const development = false;
-const version = "$internalRuntimeVersion$";
 const namespaceVersion = "$internalRuntimeVersion$";
 
 function foo() {

diff --git a/extensions/amp-script/0.1/amp-script.js b/extensions/amp-script/0.1/amp-script.js
@@ -289,9 +289,9 @@ export class AmpScript extends AMP.BaseElement {
       const folder = mode.isMinified() ? 'current-min' : 'current';
       iframeUrl = `/dist.3p/${folder}/amp-script-proxy-iframe.html`;
     } else {
-      iframeUrl = `${urls.thirdParty}/${
-        getMode().version
-      }/amp-script-proxy-iframe.html`;
+      iframeUrl = `${
+        urls.thirdParty
+      }/${mode.version()}/amp-script-proxy-iframe.html`;
     }
 
     // @see src/main-thread/configuration.WorkerDOMConfiguration in worker-dom.

diff --git a/src/mode-object.js b/src/mode-object.js
@@ -29,7 +29,6 @@ export function getModeObject(opt_win) {
     esm: IS_ESM,
     test: getMode(opt_win).test,
     log: getMode(opt_win).log,
-    version: getMode(opt_win).version,
     rtvVersion: getMode(opt_win).rtvVersion,
   };
 }
diff --git a/src/mode.js b/src/mode.js
@@ -23,7 +23,6 @@ import {parseQueryString} from '#core/types/string/url';
  *   development: boolean,
  *   test: boolean,
  *   log: (string|undefined),
- *   version: string,
  *   rtvVersion: string,
  *   runtime: (null|string|undefined),
  *   a4aId: (null|string|undefined),
@@ -76,7 +75,6 @@ function getMode_(win) {
     geoOverride: hashQuery['amp-geo'],
     test: coreMode.isTest(win),
     log: parseInt(hashQuery['log'], 10),
-    version: coreMode.version(),
     rtvVersion: getRtvVersion(win),
   };
 }

diff --git a/test/unit/3p/test-3p-frame.js b/test/unit/3p/test-3p-frame.js
@@ -227,7 +227,6 @@ describes.realWin('3p-frame', {amp: true}, (env) => {
               'localDev': true,
               'development': false,
               'test': false,
-              'version': '$internalRuntimeVersion$',
               'esm': false,
             },
             'canary': false,