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 node6 support for Object.entries and URL object (#548)

Browse Source 
This patch introduces a polyfill for Object.entries which is missing in Node 6
This commit is contained in:
JoelEinbinder 2017-08-25 15:13:59 -07:00 committed by Andrey Lushnikov
parent 4e3b6a1f57
commit 2c4dfbfd88
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/NetworkManager.js
View File

@ -16,7 +16,7 @@
const EventEmitter = require('events'); const EventEmitter = require('events');
const helper = require('./helper'); const helper = require('./helper');
const Multimap = require('./Multimap'); const Multimap = require('./Multimap');
const {URL} = require('url'); const url = require('url');
class NetworkManager extends EventEmitter { class NetworkManager extends EventEmitter {
/** /**
@ -356,13 +356,13 @@ function generateRequestHash(request) {
} }
/** /**
* @param {string} url * @param {string} urlString
* @return {string} * @return {string}
*/ */
function removeURLHash(url) { function removeURLHash(urlString) {
const urlObject = new URL(url); const urlObject = url.parse(urlString);
urlObject.hash = ''; urlObject.hash = '';
return urlObject.toString(); return url.format(urlObject);
} }
NetworkManager.Events = { NetworkManager.Events = {

5
lib/helper.js
View File

@ -218,4 +218,9 @@ class Helper {
} }
} }
// Polyfill from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries
if (!Object.entries)
Object.entries = obj => Object.keys(obj).map(key => [key, obj[key]]);
module.exports = Helper; module.exports = Helper;

2
utils/ESTreeWalker.js
View File

@ -76,7 +76,7 @@ ESTreeWalker.SkipSubtree = {};
/** @enum {!Array.<string>} */ /** @enum {!Array.<string>} */
ESTreeWalker._walkOrder = { ESTreeWalker._walkOrder = {
'AwaitExpression': ['arguments'], 'AwaitExpression': ['argument'],
'ArrayExpression': ['elements'], 'ArrayExpression': ['elements'],
'ArrowFunctionExpression': ['params', 'body'], 'ArrowFunctionExpression': ['params', 'body'],
'AssignmentExpression': ['left', 'right'], 'AssignmentExpression': ['left', 'right'],

2
utils/node6-transform/TransformAsyncFunctions.js
View File

@ -53,7 +53,7 @@ const asyncToGenerator = fn => {
function transformAsyncFunctions(text) { function transformAsyncFunctions(text) {
const edits = []; const edits = [];
const ast = esprima.parseScript(text, {range: true}); const ast = esprima.parseScript(text, {range: true, tolerant: true});
const walker = new ESTreeWalker(node => { const walker = new ESTreeWalker(node => {
if (node.type === 'FunctionExpression' || node.type === 'FunctionDeclaration' || node.type === 'ArrowFunctionExpression') if (node.type === 'FunctionExpression' || node.type === 'FunctionDeclaration' || node.type === 'ArrowFunctionExpression')
onFunction(node); onFunction(node);

6
utils/node6-transform/test/test.js
View File

@ -64,4 +64,10 @@ describe('TransformAsyncFunctions', function() {
expect(output instanceof Promise).toBe(true); expect(output instanceof Promise).toBe(true);
output.then(result => expect(result).toBe(123)).then(done); output.then(result => expect(result).toBe(123)).then(done);
}); });
it('should work with double await', function(done) {
const input = `async function f(){ return 23 + await Promise.resolve(50 + await Promise.resolve(50)); } f();`;
const output = eval(transformAsyncFunctions(input));
expect(output instanceof Promise).toBe(true);
output.then(result => expect(result).toBe(123)).then(done);
});
}); });