🏗 Share utility to convert amp- names to bento- (#36359)

Closes #36351
ampproject · Oct 14, 2021 · 759e265 · 759e265
1 parent 5fed125
commit 759e265
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/build-system/tasks/bento-helpers.js b/build-system/tasks/bento-helpers.js
@@ -0,0 +1,9 @@
+/**
+ * @param {string} name
+ * @return {string}
+ */
+function getBentoName(name) {
+  return `bento-${name.replace(/^amp-/, '')}`;
+}
+
+module.exports = {getBentoName};
diff --git a/build-system/tasks/css/bento-css.js b/build-system/tasks/css/bento-css.js
@@ -1,5 +1,6 @@
 const CssSelectorTokenizer = require('css-selector-tokenizer');
 const postcss = require('postcss');
+const {getBentoName} = require('../bento-helpers');
 
 /**
  * @param {string} selector
@@ -14,8 +15,7 @@ function renameTagNamesInSelector(selector) {
       continue;
     }
     if (node.type === 'element') {
-      // TODO(https://go.amp.dev/issue/36351): Use shared utility function
-      node.name = node.name.replace(/^amp-/, 'bento-');
+      node.name = getBentoName(node.name);
     }
     if (Array.isArray(node.nodes)) {
       nodes.push(...node.nodes);

diff --git a/build-system/tasks/extension-helpers.js b/build-system/tasks/extension-helpers.js
@@ -28,6 +28,7 @@ const {
 const {analyticsVendorConfigs} = require('./analytics-vendor-configs');
 const {compileJison} = require('./compile-jison');
 const {cyan, green, red} = require('kleur/colors');
+const {getBentoName} = require('./bento-helpers');
 const {isCiBuild} = require('../common/ci');
 const {jsifyCssAsync} = require('./css/jsify-css');
 const {jssOptions} = require('../babel-config/jss-config');
@@ -625,7 +626,7 @@ async function buildExtensionCss(extDir, name, version, options) {
  * @return {!Promise}
  */
 async function buildBentoCss(name, version, minifiedAmpCss) {
-  const bentoName = name.replace(/^amp-/, 'bento-');
+  const bentoName = getBentoName(name);
   const renamedCss = await renameSelectorsToBentoTagNames(minifiedAmpCss);
   await fs.outputFile(`build/${bentoName}-${version}.css`, renamedCss);
   await fs.outputFile(`dist/v0/${bentoName}-${version}.css`, renamedCss);
@@ -713,7 +714,7 @@ function buildBinaries(extDir, binaries, options) {
  * @return {!Promise}
  */
 async function buildBentoExtensionJs(dir, name, options) {
-  const bentoName = name.replace(/^amp-/, 'bento-');
+  const bentoName = getBentoName(name);
   return buildExtensionJs(dir, bentoName, {
     ...options,
     wrapper: 'none',