diff --git a/patches/zombie-vm-timeout.patch b/patches/zombie-vm-timeout.patch index dcc62d7d4..27313611a 100644 --- a/patches/zombie-vm-timeout.patch +++ b/patches/zombie-vm-timeout.patch @@ -1,11 +1,11 @@ ---- src/drivers/npm/node_modules/zombie/lib/document.js 2018-04-20 14:36:04.097829977 +1000 -+++ src/drivers/npm/node_modules/zombie/lib/document.js 2018-04-20 14:34:25.699317000 +1000 -@@ -281,7 +281,7 @@ - // The current window, postMessage and window.close need this +--- src/drivers/npm/node_modules/zombie/lib/document.js ++++ src/drivers/npm/node_modules/zombie/lib/document.js +@@ -247,7 +247,7 @@ function setupWindow(window, args) { browser._windowInScope = window; - var result = undefined; -- if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, window, { filename: filename });else if (code) result = code.call(window); -+ if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, window, { filename: filename, timeout: 1000 });else if (code) result = code.call(window); + let result; + if (typeof code == 'buffer' || code instanceof Buffer) code = code.toString(); +- if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, context, { filename });else if (code) result = code.call(window); ++ if (typeof code === 'string' || code instanceof String) result = VM.runInContext(code, context, { filename, timeout: 1000 });else if (code) result = code.call(window); browser.emit('evaluated', code, result, filename); return result; } catch (error) { diff --git a/src/apps.json b/src/apps.json index 9e36e8546..08d944d7e 100644 --- a/src/apps.json +++ b/src/apps.json @@ -107,13 +107,27 @@ }, "website": "http://awstats.sourceforge.net" }, - "Accelerated Mobile Pages": { + "AMP": { "cats": [ 12 ], - "html": "]* (?:amp|⚡)", + "html": "]* (?:amp|⚡)[^-]", "icon": "Accelerated-Mobile-Pages.svg", - "website": "https://www.ampproject.org" + "website": "https://www.amp.dev" + }, + "AMP Plugin": { + "cats": [ + 1, + 5 + ], + "icon": "Accelerated-Mobile-Pages.svg", + "implies": [ + "WordPress" + ], + "meta": { + "generator": "^AMP Plugin v(\\d+\\.\\d+.*)$\\;version:\\1" + }, + "website": "https://amp-wp.org" }, "Azure": { "cats": [ @@ -304,12 +318,17 @@ ], "html": [ "