Skip to content

Commit b52632d

Browse files
authored
better mapping for edge and fix pages (#1411)
1 parent 8257e98 commit b52632d

File tree

13 files changed

+49
-20
lines changed

13 files changed

+49
-20
lines changed

.github/workflows/build-and-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: cache core-web-tests
3636
id: cache-core-web-tests
37-
uses: actions/[email protected].2
37+
uses: actions/[email protected].3
3838
with:
3939
path: packages/core-web-tests/dist
4040
key: cache--core-web-tests--${{ env.commit-sha }}

package-lock.json

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core-web-generator/lib/generate.js

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core-web-generator/lib/generate.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core-web-generator/src/generate.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,15 @@ async function gen(feature: string, mapping: Array<Feature>, aliases: Array<Feat
151151
version = version.trim();
152152

153153
if ((browser === 'edge' || browser === 'edge_mob') && version === '*') {
154-
version = '<79'
154+
if (meta.browsers['chrome'] && semver.satisfies('79.0.0', meta.browsers['chrome'])) {
155+
version = meta.browsers['chrome']
156+
} else {
157+
version = '<79';
158+
}
155159
}
156160

157161
if (browser === 'android' && version === '*') {
158-
version = '<4.4'
162+
version = '<4.4';
159163
}
160164

161165
// Must parse as a semver range.

packages/core-web/__mapping.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core-web/lib/__mapping.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core-web/lib/__mapping.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/pages/lib/browser-compat/templates/polyfill-card.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const cssTags = require('../../css/to-html');
33
const siteFooter = require('../../landing/templates/site-footer');
44
const path = require('path');
55
const { dotsWBR, dotsZeroWidthSpace } = require('./dots-wbr');
6+
const he = require('he');
67

78
module.exports = function polyfillCardHTML(assetMap, feature, sitemap) {
89
return html`<!DOCTYPE html>
@@ -213,15 +214,15 @@ function notes(feature) {
213214
list = feature.polyfillio.notes.map((note) => {
214215
return html`
215216
<li>
216-
${note}
217+
${he.encode(note)}
217218
</li>
218219
`;
219220
});
220221
} else {
221222
list.push(
222223
html`
223224
<li>
224-
${feature.polyfillio.notes}
225+
${he.encode(feature.polyfillio.notes)}
225226
</li>
226227
`
227228
)
@@ -298,9 +299,9 @@ function browsers(feature) {
298299
list.push(
299300
html`
300301
<li>
301-
<div style="display: flex;justify-content: space-between; max-width: 220px;">
302+
<div style="display: flex; justify-content: space-between; max-width: 220px;">
302303
<div>${prettyBrowser(browser)}:</div>
303-
<div>${version}</div>
304+
<div>${he.encode(version)}</div>
304305
</div>
305306
</li>
306307
`

0 commit comments

Comments
 (0)