From f3a96ac3fed0300778cc39885b6fc87728921261 Mon Sep 17 00:00:00 2001
From: Alex Rudenko <OrKoN@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:04:57 +0200
Subject: [PATCH] fix: remove overescaping (#598)

---
 __snapshots__/SchemaUtils.test.ts.js |  6 +++---
 package-lock.json                    | 15 +--------------
 package.json                         |  1 -
 rollup.config.cjs                    |  9 +--------
 src/SchemaUtils.ts                   |  5 +----
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/__snapshots__/SchemaUtils.test.ts.js b/__snapshots__/SchemaUtils.test.ts.js
index ee6832ab..00dd5c21 100644
--- a/__snapshots__/SchemaUtils.test.ts.js
+++ b/__snapshots__/SchemaUtils.test.ts.js
@@ -13,13 +13,13 @@ exports[
 exports[
   'SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text") 1'
 ] = `
-::-p-text(my\\ text\\ \\(\\"my\\ text\\"\\))
+::-p-text(my text \\(\\"my text\\"\\))
 `;
 
 exports[
   'SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text"),aria/Test my test[role="button"] 1'
 ] = `
-::-p-text(my\\ text\\ \\(\\"my\\ text\\"\\)) >>>> ::-p-aria(Test\\ my\\ test\\[role\\=\\"button\\"\\])
+::-p-text(my text \\(\\"my text\\"\\)) >>>> ::-p-aria(Test my test[role=\\"button\\"])
 `;
 
 exports[
@@ -49,5 +49,5 @@ exports[
 exports[
   'SchemaUtils Selectors selectorToPElementSelector should convert xpath///*[@id="id"] 1'
 ] = `
-::-p-xpath(\\/\\/\\*\\[\\@id\\=\\"id\\"\\])
+::-p-xpath(//*[@id=\\"id\\"])
 `;
diff --git a/package-lock.json b/package-lock.json
index fdd2877b..94594062 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "@puppeteer/replay",
-      "version": "2.12.1",
+      "version": "2.12.2",
       "license": "Apache-2.0",
       "dependencies": {
         "cli-table3": "0.6.3",
@@ -33,7 +33,6 @@
         "c8": "7.12.0",
         "chai": "4.3.6",
         "cross-env": "7.0.3",
-        "cssesc": "3.0.0",
         "eslint": "8.25.0",
         "eslint-config-google": "0.14.0",
         "eslint-config-prettier": "8.5.0",
@@ -1725,18 +1724,6 @@
       "integrity": "sha512-N3ASg0C4kNPUaNxt1XAvzHIVuzdtr8KLgfk1O8WDyimp1GisPAHESupArO2ieHk9QWbrJ/WkQODyh21Ps/xhxw==",
       "dev": true
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/data-uri-to-buffer": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz",
diff --git a/package.json b/package.json
index 15b6813e..78ec4475 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,6 @@
     "c8": "7.12.0",
     "chai": "4.3.6",
     "cross-env": "7.0.3",
-    "cssesc": "3.0.0",
     "eslint": "8.25.0",
     "eslint-config-google": "0.14.0",
     "eslint-config-prettier": "8.5.0",
diff --git a/rollup.config.cjs b/rollup.config.cjs
index dd54038b..10717231 100644
--- a/rollup.config.cjs
+++ b/rollup.config.cjs
@@ -1,6 +1,5 @@
 const typescript = require('@rollup/plugin-typescript').default;
 const { nodeResolve } = require('@rollup/plugin-node-resolve').default;
-const commonjs = require('@rollup/plugin-commonjs').default;
 const dts = require('rollup-plugin-dts').default;
 const pkg = require('./package.json');
 
@@ -20,13 +19,7 @@ module.exports = [
       },
     ],
     external: Object.keys(pkg.peerDependencies),
-    plugins: [
-      typescript({ module: 'NodeNext' }),
-      commonjs(),
-      nodeResolve({
-        resolveOnly: ['cssesc'],
-      }),
-    ],
+    plugins: [typescript({ module: 'NodeNext' })],
   },
   {
     input: 'src/main.ts',
diff --git a/src/SchemaUtils.ts b/src/SchemaUtils.ts
index d1f60099..d60635e2 100644
--- a/src/SchemaUtils.ts
+++ b/src/SchemaUtils.ts
@@ -44,7 +44,6 @@ import {
   WaitForExpressionStep,
 } from './Schema.js';
 import { AssertedEventType, StepType } from './Schema.js';
-import cssesc from 'cssesc';
 
 export function assertAllStepTypesAreHandled(s: never): never;
 export function assertAllStepTypesAreHandled(s: Step): never {
@@ -633,9 +632,7 @@ export function selectorToPElementSelector(selector: string[] | string) {
   }
 
   function escape(input: string) {
-    return cssesc(input, {
-      isIdentifier: true,
-    });
+    return input.replace(/['"()]/g, `\\$&`);
   }
 
   const result = selector.map((s) => {