Handle empty src attributes (#1254)

sebastianbenz · web-flow · commit 4790509ed75f · 2021-07-12T11:11:47.000+02:00
Fixes #1253
diff --git a/packages/optimizer/lib/HtmlDomHelper.js b/packages/optimizer/lib/HtmlDomHelper.js
@@ -39,7 +39,11 @@ function findMetaViewport(head) {
  */
 function findRuntimeScript(head) {
   for (let node = head.firstChild; node !== null; node = node.nextSibling) {
-    if (node.tagName === 'script' && node.attribs.src.match(/^https:\/\/.+\/v0(\.js|\.mjs)$/)) {
+    if (
+      node.tagName === 'script' &&
+      node.attribs.src &&
+      node.attribs.src.match(/^https:\/\/.+\/v0(\.js|\.mjs)$/)
+    ) {
       return node;
     }
   }
diff --git a/packages/optimizer/spec/lib/HtmlDomHelper.test.js b/packages/optimizer/spec/lib/HtmlDomHelper.test.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const {findMetaViewport} = require('../../lib/HtmlDomHelper');
+const {findMetaViewport, findRuntimeScript} = require('../../lib/HtmlDomHelper');
 const treeParser = require('../../lib/TreeParser');
 const {firstChildByTag} = require('../../lib/NodeUtils');
 
@@ -54,3 +54,37 @@ test('findMetaViewport returns the correct tag', async () => {
   const result = findMetaViewport(head);
   expect(result).toEqual(head.children[3]);
 });
+
+test('findRuntimeScript returns runtime v0.mjs', async () => {
+  const root = await treeParser.parse(`<html><head>
+            <meta charset="utf-8">
+            <script async src="https://cdn.ampproject.org/v0.mjs"></script>
+          </head></html>`);
+  const html = firstChildByTag(root, 'html');
+  const head = firstChildByTag(html, 'head');
+  const result = findRuntimeScript(head);
+  expect(result).toEqual(head.children[3]);
+});
+
+test('findRuntimeScript returns runtime v0.js', async () => {
+  const root = await treeParser.parse(`<html><head>
+            <meta charset="utf-8">
+            <script async src="https://cdn.ampproject.org/v0.js"></script>
+          </head></html>`);
+  const html = firstChildByTag(root, 'html');
+  const head = firstChildByTag(html, 'head');
+  const result = findRuntimeScript(head);
+  expect(result).toEqual(head.children[3]);
+});
+
+test('findRuntimeScript ignores empty src', async () => {
+  const root = await treeParser.parse(`<html><head>
+  <meta charset="utf-8">
+  <script id="amp-access" type="application/json"></script>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head></html>`);
+  const html = firstChildByTag(root, 'html');
+  const head = firstChildByTag(html, 'head');
+  const result = findRuntimeScript(head);
+  expect(result).toEqual(head.children[5]);
+});

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,11 @@ function findMetaViewport(head) {`
`39`	`39`	`*/`
`40`	`40`	`function findRuntimeScript(head) {`
`41`	`41`	`for (let node = head.firstChild; node !== null; node = node.nextSibling) {`
`42`		`- if (node.tagName === 'script' && node.attribs.src.match(/^https:\/\/.+\/v0(\.js\|\.mjs)$/)) {`
	`42`	`+ if (`
	`43`	`+ node.tagName === 'script' &&`
	`44`	`+ node.attribs.src &&`
	`45`	`+ node.attribs.src.match(/^https:\/\/.+\/v0(\.js\|\.mjs)$/)`
	`46`	`+ ) {`
`43`	`47`	`return node;`
`44`	`48`	`}`
`45`	`49`	`}`