better mapping for edge and fix pages (#1411)

mrhenry · Jan 14, 2023 · b52632d · b52632d
1 parent 8257e98
commit b52632d
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 20 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: cache core-web-tests
         id: cache-core-web-tests
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           path: packages/core-web-tests/dist
           key: cache--core-web-tests--${{ env.commit-sha }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core-web-generator/lib/generate.js b/packages/core-web-generator/lib/generate.js
diff --git a/packages/core-web-generator/lib/generate.js.map b/packages/core-web-generator/lib/generate.js.map
diff --git a/packages/core-web-generator/src/generate.ts b/packages/core-web-generator/src/generate.ts
@@ -151,11 +151,15 @@ async function gen(feature: string, mapping: Array<Feature>, aliases: Array<Feat
 			version = version.trim();
 
 			if ((browser === 'edge' || browser === 'edge_mob') && version === '*') {
-				version = '<79'
+				if (meta.browsers['chrome'] && semver.satisfies('79.0.0', meta.browsers['chrome'])) {
+					version = meta.browsers['chrome']
+				} else {
+					version = '<79';
+				}
 			}
 
 			if (browser === 'android' && version === '*') {
-				version = '<4.4'
+				version = '<4.4';
 			}
 
 			// Must parse as a semver range.

diff --git a/packages/core-web/__mapping.js b/packages/core-web/__mapping.js
diff --git a/packages/core-web/lib/__mapping.js b/packages/core-web/lib/__mapping.js
diff --git a/packages/core-web/lib/__mapping.js.map b/packages/core-web/lib/__mapping.js.map
diff --git a/packages/pages/lib/browser-compat/templates/polyfill-card.js b/packages/pages/lib/browser-compat/templates/polyfill-card.js
@@ -3,6 +3,7 @@ const cssTags = require('../../css/to-html');
 const siteFooter = require('../../landing/templates/site-footer');
 const path = require('path');
 const { dotsWBR, dotsZeroWidthSpace } = require('./dots-wbr');
+const he = require('he');
 
 module.exports = function polyfillCardHTML(assetMap, feature, sitemap) {
 	return html`<!DOCTYPE html>
@@ -213,15 +214,15 @@ function notes(feature) {
 			list = feature.polyfillio.notes.map((note) => {
 				return html`
 				<li>
-					${note}
+					${he.encode(note)}
 				</li>
 				`;
 			});
 		} else {
 			list.push(
 				html`
 				<li>
-					${feature.polyfillio.notes}
+					${he.encode(feature.polyfillio.notes)}
 				</li>
 				`
 			)
@@ -298,9 +299,9 @@ function browsers(feature) {
 			list.push(
 				html`
 					<li>
-						<div style="display: flex;justify-content: space-between; max-width: 220px;">
+						<div style="display: flex; justify-content: space-between; max-width: 220px;">
 							<div>${prettyBrowser(browser)}:</div>
-							<div>${version}</div>
+							<div>${he.encode(version)}</div>
 						</div>
 					</li>
 				`