fix: support puppeteer 1.6.x

Author: patrickhulce

lib/index.ts

@@ -16,13 +16,11 @@ function mapArgument(argument: any, index: number): any {
     : argument
 }
 
-const delegateFnToExecuteInPage = `
-function evaluateInPage(container, fnName, ...args) {
-  ${domLibraryAsString}
+const delegateFnBodyToExecuteInPage = `
+  ${domLibraryAsString};
 
-  const mappedArgs = args.map(${mapArgument.toString()})
-  return __dom_testing_library__[fnName](container, ...mappedArgs)
-}
+  const mappedArgs = args.map(${mapArgument.toString()});
+  return __dom_testing_library__[fnName](container, ...mappedArgs);
 `
 
 type DOMReturnType = ElementHandle | ElementHandle[] | null
@@ -90,7 +88,10 @@ function createDelegateFor<T = DOMReturnType>(
     // @ts-ignore
     const containerHandle: ElementHandle = contextFn ? contextFn.apply(this, args) : this
     // @ts-ignore
-    const evaluateFn: EvaluateFn = {toString: () => delegateFnToExecuteInPage}
+    const evaluateFn: EvaluateFn = new Function(
+      'container, fnName, ...args',
+      delegateFnBodyToExecuteInPage,
+    )
 
     // Convert RegExp to a special format since they don't serialize well
     let argsToForward = args.map(arg => (arg instanceof RegExp ? convertRegExp(arg) : arg))

package.json

@@ -51,7 +51,7 @@
     "@types/puppeteer": "^1.3.4",
     "generate-export-aliases": "^1.1.0",
     "jest": "^23.1.0",
-    "puppeteer": "^1.5.0",
+    "puppeteer": "^1.6.0",
     "rollup": "^0.61.1",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-node-resolve": "^3.3.0",

test/__snapshots__/extend.test.ts.snap

@@ -20,7 +20,7 @@ exports[`lib/extend.ts should handle the get* method failures 1`] = `
     at getAllByTitle <stack>:X:X)
     at firstResultOrNull <stack>:X:X)
     at Object.getByTitle <stack>:X:X)
-    at evaluateInPage <stack>:X:X)"
+    at anonymous <stack>:X:X)"
 `;
 
 exports[`lib/extend.ts should handle the get* methods 1`] = `"<input type=\\"text\\" data-testid=\\"testid-text-input\\">"`;

yarn.lock

@@ -3781,9 +3781,9 @@ punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
 
-puppeteer@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.5.0.tgz#e35db3f3ba3d41013feb65be02bdaa727ec7b8ec"
+puppeteer@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.6.0.tgz#b6b6bd6a063a0b7591258613ec89a135f2cf8f2e"
   dependencies:
     debug "^3.1.0"
     extract-zip "^1.6.6"