github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(devicedescriptors): fix UA in DeviceDescriptors (#2741)

Browse Source 
This patch:
- updates `utils/fetch_devices.js` script to format UAs for Chrome UAs
  and to add iPhone 6/7/8 as separate devices.
- re-generates `DeviceDescriptors.js` with the new script

Fixes #2730.
This commit is contained in:
Andrey Lushnikov
2018-06-14 13:55:09 -07:00
committed by GitHub
parent ddfdaf97c5
commit cd8d750628
2 changed files with 182 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
utils/fetch_devices.js
View File

@@ -18,6 +18,7 @@
const util = require('util');
const fs = require('fs');
const path = require('path');
const puppeteer = require('..');
const DEVICES_URL = 'https://raw.githubusercontent.com/ChromeDevTools/devtools-frontend/master/front_end/emulated_devices/module.json';
const template = `/**
@@ -37,7 +38,7 @@ const template = `/**
*/
module.exports = %s;
for (let device of module.exports)
for (const device of module.exports)
module.exports[device.name] = device;
`;
@@ -71,6 +72,9 @@ if (!outputPath) {
main(url);
async function main(url) {
const browser = await puppeteer.launch();
const chromeVersion = (await browser.version()).split('/').pop();
await browser.close();
console.log('GET ' + url);
const text = await httpGET(url);
let json = null;
@@ -83,11 +87,22 @@ async function main(url) {
const devicePayloads = json.extensions.filter(extension => extension.type === 'emulated-device').map(extension => extension.device);
let devices = [];
for (const payload of devicePayloads) {
const device = createDevice(payload, false);
const landscape = createDevice(payload, true);
devices.push(device);
if (landscape.viewport.width !== device.viewport.width || landscape.viewport.height !== device.viewport.height)
devices.push(landscape);
let names = [];
if (payload.title === 'iPhone 6/7/8')
names = ['iPhone 6', 'iPhone 7', 'iPhone 8'];
else if (payload.title === 'iPhone 6/7/8 Plus')
names = ['iPhone 6 Plus', 'iPhone 7 Plus', 'iPhone 8 Plus'];
else if (payload.title === 'iPhone 5/SE')
names = ['iPhone 5', 'iPhone SE'];
else
names = [payload.title];
for (const name of names) {
const device = createDevice(chromeVersion, name, payload, false);
const landscape = createDevice(chromeVersion, name, payload, true);
devices.push(device);
if (landscape.viewport.width !== device.viewport.width || landscape.viewport.height !== device.viewport.height)
devices.push(landscape);
}
}
devices = devices.filter(device => device.viewport.isMobile);
devices.sort((a, b) => a.name.localeCompare(b.name));
@@ -100,16 +115,18 @@ async function main(url) {
}
/**
* @param {string} chromeVersion
* @param {string} deviceName
* @param {*} descriptor
* @param {boolean} landscape
* @return {!Object}
*/
function createDevice(descriptor, landscape) {
function createDevice(chromeVersion, deviceName, descriptor, landscape) {
const devicePayload = loadFromJSONV1(descriptor);
const viewportPayload = landscape ? devicePayload.horizontal : devicePayload.vertical;
return {
name: descriptor.title + (landscape ? ' landscape' : ''),
userAgent: devicePayload.userAgent,
name: deviceName + (landscape ? ' landscape' : ''),
userAgent: devicePayload.userAgent.includes('%s') ? util.format(devicePayload.userAgent, chromeVersion) : devicePayload.userAgent,
viewport: {
width: viewportPayload.width,
height: viewportPayload.height,