♻️🏗 Allow dead-code-eliminating config.urls

3p/integration-lib.js

@@ -14,7 +14,7 @@ import {IntegrationAmpContext} from './ampcontext-integration';
 import {installEmbedStateListener, manageWin} from './environment';
 import {getAmpConfig, getEmbedType, getLocation} from './frame-metadata';
 
-import {urls} from '../src/config';
+import * as urls from '../src/config/urls';
 import {getSourceUrl, isProxyOrigin, parseUrlDeprecated} from '../src/url';
 
 /**

ads/alp/handler.js

@@ -3,7 +3,7 @@ import {parseQueryString} from '#core/types/string/url';
 
 import {dev} from '#utils/log';
 
-import {urls} from '../../src/config';
+import * as urls from '../../src/config/urls';
 import {openWindowDialog} from '../../src/open-window-dialog';
 import {
   addParamToUrl,

build-system/babel-config/minified-config.js

@@ -26,6 +26,7 @@ function getMinifiedConfig(buildFor = 'preact') {
 
   const plugins = [
     'optimize-objstr',
+    './build-system/babel-plugins/babel-plugin-deep-pure',
     './build-system/babel-plugins/babel-plugin-mangle-object-values',
     './build-system/babel-plugins/babel-plugin-jsx-style-object',
     getImportResolverPlugin(buildFor),

build-system/babel-plugins/babel-plugin-deep-pure/index.js

@@ -0,0 +1,84 @@
+const pureFnName = 'pure';
+const pureFnImportSource = '#core/types/pure';
+
+/**
+ * Deeply adds #__PURE__ comments to an expression passed to a function named
+ * `pure()`.
+ * @return {import('@babel/core').PluginObj}
+ */
+module.exports = function () {
+  /**
+   * @param {import('@babel/core').NodePath<import('@babel/types').CallExpression>} path
+   * @return {boolean}
+   */
+  function isPureFnCallExpression(path) {
+    return (
+      path.node.arguments.length === 1 &&
+      path.get('callee').isIdentifier({name: pureFnName})
+    );
+  }
+
+  /** @param {import('@babel/core').NodePath} path */
+  function addPureComment(path) {
+    path.addComment('leading', ' #__PURE__ ');
+  }
+
+  /** @param {import('@babel/core').NodePath<import('@babel/types').CallExpression>} path */
+  function replaceWithFirstArgument(path) {
+    path.replaceWith(path.node.arguments[0]);
+  }
+
+  /**
+   * @param {null | undefined | import('@babel/core').NodePath} path
+   * @return {path is import('@babel/types').ImportSpecifier}
+   */
+  function isPureFnImportSpecifier(path) {
+    if (!path?.isImportSpecifier()) {
+      return false;
+    }
+    const {parentPath} = path;
+    return (
+      parentPath.isImportDeclaration() &&
+      parentPath.get('source').isStringLiteral({value: pureFnImportSource})
+    );
+  }
+
+  return {
+    name: 'deep-pure',
+    visitor: {
+      Program: {
+        enter(path) {
+          const pureFnBinding = path.scope.getBinding(pureFnName);
+          if (isPureFnImportSpecifier(pureFnBinding?.path)) {
+            pureFnBinding?.path.remove();
+          } else {
+            path.skip();
+          }
+        },
+      },
+      CallExpression(path) {
+        if (isPureFnCallExpression(path)) {
+          path.traverse({
+            NewExpression(path) {
+              addPureComment(path);
+            },
+            CallExpression(path) {
+              if (isPureFnCallExpression(path)) {
+                replaceWithFirstArgument(path);
+              } else {
+                addPureComment(path);
+              }
+            },
+            MemberExpression(path) {
+              throw path.buildCodeFrameError(
+                `${pureFnName}() expressions cannot contain member expressions`
+              );
+            },
+          });
+          replaceWithFirstArgument(path);
+        }
+        path.skip();
+      },
+    },
+  };
+};

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/input.mjs

@@ -0,0 +1,2 @@
+import {pure} from '#core/types/pure';
+pure(error.memberExpression);

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/error-member-expression/options.json

@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "../../../.."
+  ],
+  "throws": "pure() expressions cannot contain member expressions"
+}

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/input.mjs

@@ -0,0 +1,4 @@
+import {pure} from 'something other than #core/types/pure';
+const ignored = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/options.json

@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-import-source/output.mjs

@@ -0,0 +1,2 @@
+import { pure } from 'something other than #core/types/pure';
+const ignored = pure(foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo'));

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/input.mjs

@@ -0,0 +1,4 @@
+const pure = (v) => v;
+const ignored = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/options.json

@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/ignored-not-import/output.mjs

@@ -0,0 +1,3 @@
+const pure = v => v;
+
+const ignored = pure(foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo'));

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform/input.mjs

@@ -0,0 +1,6 @@
+import {pure} from '#core/types/pure';
+const ignored = foo();
+const a = pure(
+  foo() || new Bar() || pure(pure(foo('bar', bar(), new Baz())) || 'foo')
+);
+const b = pure('foo');

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform/options.json

@@ -0,0 +1,5 @@
+{
+  "plugins": [
+    "../../../.."
+  ]
+}

build-system/babel-plugins/babel-plugin-deep-pure/test/fixtures/transform/transform/output.mjs

@@ -0,0 +1,4 @@
+import '#core/types/pure';
+const ignored = foo();
+const a = /* #__PURE__ */foo() || /* #__PURE__ */new Bar() || /* #__PURE__ */foo('bar', /* #__PURE__ */bar(), /* #__PURE__ */new Baz()) || 'foo';
+const b = 'foo';

build-system/babel-plugins/babel-plugin-deep-pure/test/index.js

@@ -0,0 +1,3 @@
+const runner = require('@babel/helper-plugin-test-runner').default;
+
+runner(__dirname);

build-system/eslint-rules/no-export-side-effect.js

@@ -11,7 +11,12 @@ module.exports = function (context) {
               return declarator.init;
             })
             .filter(function (init) {
-              return init && /(?:Call|New)Expression/.test(init.type);
+              return (
+                init &&
+                /(?:Call|New)Expression/.test(init.type) &&
+                // Allow pure()
+                init.callee?.name !== 'pure'
+              );
             })
             .forEach(function (init) {
               context.report({

build-system/eslint-rules/no-import-rename.js

@@ -30,6 +30,7 @@ const imports = {
     'setStyles',
   ],
   '#core/types/enum': ['mangleObjectValues'],
+  '#core/types/pure': ['pure'],
   '#experiments': ['isExperimentOn'],
   '#utils/log': ['user', 'dev'],
   '#preact/utils': ['propName', 'tabindexFromProps'],

build-system/test-configs/dep-check-config.js

@@ -79,7 +79,7 @@ exports.rules = [
     allowlist: [
       '3p/**->src/utils/log.js',
       '3p/**->src/url.js',
-      '3p/**->src/config.js',
+      '3p/**->src/config/urls.js',
       '3p/**->src/mode.js',
       '3p/polyfills.js->src/polyfills/math-sign.js',
       '3p/polyfills.js->src/polyfills/object-assign.js',

build-system/test-configs/forbidden-terms.js

@@ -633,7 +633,7 @@ const forbiddenTermsGlobal = {
       'build-system/tasks/build.js',
       'build-system/tasks/default-task.js',
       'build-system/tasks/dist.js',
-      'src/config.js',
+      'src/config/urls.js',
       'src/experiments/index.js',
       'src/mode.js',
       'src/core/mode/test.js',
@@ -922,7 +922,7 @@ const forbiddenTermsSrcInclusive = {
   '(cdn|3p)\\.ampproject\\.': {
     message:
       'The CDN domain should typically not be hardcoded in source ' +
-      'code. Use a property of urls from src/config.js instead.',
+      'code. Use urls from src/config/urls.js instead.',
     allowlist: [
       'ads/_a4a-config.js',
       'build-system/server/amp4test.js',
@@ -936,7 +936,7 @@ const forbiddenTermsSrcInclusive = {
       'build-system/tasks/performance/helpers.js',
       'src/3p-frame.js',
       'src/amp-story-player/amp-story-player-impl.js',
-      'src/config.js',
+      'src/config/urls.js',
       'testing/local-amp-chrome-extension/background.js',
       'tools/experiments/experiments.js',
       'validator/js/engine/htmlparser-interface.js',

extensions/amp-a4a/0.1/amp-ad-template-helper.js

@@ -6,7 +6,7 @@ import {Services} from '#service';
 
 import {devAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {
   getServiceForDoc,

extensions/amp-a4a/0.1/amp-ad-utils.js

@@ -6,7 +6,7 @@ import {parseExtensionUrl} from '#service/extension-script';
 
 import {dev} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {isSecureUrlDeprecated} from '../../../src/url';
 
 const TAG = 'amp-ad-util';

extensions/amp-a4a/0.1/head-validation.js

@@ -5,7 +5,7 @@ import {includes} from '#core/types/string';
 import {Services} from '#service';
 import {parseExtensionUrl} from '#service/extension-script';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {preloadFriendlyIframeEmbedExtensions} from '../../../src/friendly-iframe-embed';
 import {getMode} from '../../../src/mode';
 

extensions/amp-a4a/0.1/template-validator.js

@@ -10,7 +10,7 @@ import {
   mergeExtensionsMetadata,
 } from './amp-ad-utils';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {preloadFriendlyIframeEmbedExtensions} from '../../../src/friendly-iframe-embed';
 
 /** @const {string} */

extensions/amp-access/0.1/login-dialog.js

@@ -3,7 +3,7 @@ import {Services} from '#service';
 import {getData, listen} from '#utils/event-helper';
 import {dev, userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {openWindowDialog} from '../../../src/open-window-dialog';
 import {parseUrlDeprecated} from '../../../src/url';

extensions/amp-ad-network-fake-impl/0.1/external-reorder-head-transformer.js

@@ -1,6 +1,6 @@
 import {endsWith} from '#core/types/string';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 
 export class ExternalReorderHeadTransformer {
   /** constructor */

extensions/amp-analytics/0.1/iframe-transport.js

@@ -7,7 +7,7 @@ import {devAssert, user} from '#utils/log';
 
 import {IframeTransportMessageQueue} from './iframe-transport-message-queue';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 /**

extensions/amp-analytics/0.1/test/test-iframe-transport.js

@@ -2,7 +2,7 @@ import {user} from '#utils/log';
 
 import {expectPostMessage} from '#testing/iframe';
 
-import {urls} from '../../../../src/config';
+import * as urls from '../../../../src/config/urls';
 import {addParamsToUrl} from '../../../../src/url';
 import {
   IframeTransport,

extensions/amp-cache-url/0.1/amp-cache-url.js

@@ -1,6 +1,6 @@
 import * as ampToolboxCacheUrl from '@ampproject/toolbox-cache-url';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 
 export class AmpCacheUrlService {
   /**

extensions/amp-geo/0.1/amp-geo.js

@@ -41,7 +41,7 @@ import {dev, user, userAssert} from '#utils/log';
 import {GEO_IN_GROUP} from './amp-geo-in-group';
 import {ampGeoPresets} from './amp-geo-presets';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 /** @const */

extensions/amp-geo/0.1/test/test-amp-geo.js

@@ -3,7 +3,7 @@ import {vsyncForTesting} from '#service/vsync-impl';
 
 import {user} from '#utils/log';
 
-import {urls} from '../../../../src/config';
+import * as urls from '../../../../src/config/urls';
 import {AmpGeo} from '../amp-geo';
 import {GEO_IN_GROUP} from '../amp-geo-in-group';
 

extensions/amp-iframe/0.1/amp-iframe.js

@@ -25,7 +25,7 @@ import {IntersectionObserver3pHost} from '#utils/intersection-observer-3p-host';
 import {user, userAssert} from '#utils/log';
 
 import {isAdPositionAllowed} from '../../../src/ad-helper';
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getConsentDataToForward} from '../../../src/consent';
 import {
   isAdLike,

extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js

@@ -7,7 +7,7 @@ import {Services} from '#service';
 import {listen} from '#utils/event-helper';
 import {dev, user, userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 import {removeFragment} from '../../../src/url';
 

extensions/amp-mraid/0.1/amp-mraid.js

@@ -26,7 +26,7 @@ import {dev} from '#utils/log';
 
 import {MraidService} from './mraid-service';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getMode} from '../../../src/mode';
 
 const TAG = 'amp-mraid';

extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js

@@ -13,7 +13,7 @@ import {Services} from '#service';
 import {loadPromise} from '#utils/event-helper';
 import {dev, devAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {listenFor, postMessage} from '../../../src/iframe-helper';
 import {getMode} from '../../../src/mode';
 import {getServicePromiseForDoc} from '../../../src/service-helpers';

extensions/amp-script/0.1/amp-script.js

@@ -22,7 +22,7 @@ import {dev, user, userAssert} from '#utils/log';
 import {UserActivationTracker} from './user-activation-tracker';
 
 import {CSS} from '../../../build/amp-script-0.1.css';
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {getElementServiceForDoc} from '../../../src/element-service';
 import {cancellation} from '../../../src/error-reporting';
 import {getMode} from '../../../src/mode';

extensions/amp-story-dev-tools/0.1/amp-story-dev-tools-tab-debug.js

@@ -5,7 +5,7 @@ import {Services} from '#service';
 
 import {userAssert} from '#utils/log';
 
-import {urls} from '../../../src/config';
+import * as urls from '../../../src/config/urls';
 import {loadScript} from '../../../src/validator-integration';
 
 /**

src/3p-frame.js

@@ -5,7 +5,7 @@ import {tryParseJson} from '#core/types/object/json';
 
 import {dev, devAssert, user, userAssert} from '#utils/log';
 
-import {urls} from './config';
+import * as urls from './config/urls';
 import {getContextMetadata} from './iframe-attributes';
 import {assertHttpsUrl, parseUrlDeprecated} from './url';
 

src/amp-story-player/amp-story-player-impl.js

@@ -20,7 +20,7 @@ import {PageScroller} from './page-scroller';
 
 import {cssText} from '../../build/amp-story-player-shadow.css';
 import {applySandbox} from '../3p-frame';
-import {urls} from '../config';
+import * as urls from '../config/urls';
 import {getMode} from '../mode';
 import {
   addParamsToUrl,