From 98051c7db209ef747ce86a045230d4f52a3d3a3c Mon Sep 17 00:00:00 2001
From: Sander <info@mesander.com>
Date: Thu, 30 Mar 2023 21:31:39 +0200
Subject: [PATCH] fix(ct): solid type checking (#22102)

---
 package-lock.json                             | 35 +++++++++++++------
 packages/playwright-ct-solid/package.json     |  2 +-
 tests/components/ct-solid/package.json        |  2 +-
 .../ct-solid/src/components/Counter.tsx       |  4 +--
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad79b92276..1811b7449e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5277,6 +5277,14 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/seroval": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/seroval/-/seroval-0.5.1.tgz",
+      "integrity": "sha512-ZfhQVB59hmIauJG5Ydynupy8KHyr5imGNtdDhbZG68Ufh1Ynkv9KOYOAABf71oVbQxJ8VkWnMHAjEHE7fWkH5g==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "dev": true,
@@ -5366,11 +5374,12 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.6.10",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.6.10.tgz",
-      "integrity": "sha512-Sf0e6PQCEFkFtbPq0L+93Ua81YQOefBEbvDJ0YXT92b6Lzw0k7UvzSd2l1BbYM+yzE3UmepU1tyMDc/3nIByjA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.7.0.tgz",
+      "integrity": "sha512-tLG68KWlVRgzYeAW003G3E70emZqTcqCKJR9QoGr0rcuiLIuKrlUoezT8jLME1YSl3Wfu35jzgeY10iLEY4YQQ==",
       "dependencies": {
-        "csstype": "^3.1.0"
+        "csstype": "^3.1.0",
+        "seroval": "^0.5.0"
       }
     },
     "node_modules/solid-refresh": {
@@ -6229,7 +6238,7 @@
         "playwright": "cli.js"
       },
       "devDependencies": {
-        "solid-js": "^1.6.10"
+        "solid-js": "^1.7.0"
       },
       "engines": {
         "node": ">=14"
@@ -7173,7 +7182,7 @@
       "version": "file:packages/playwright-ct-solid",
       "requires": {
         "@playwright/test": "1.33.0-next",
-        "solid-js": "^1.6.10",
+        "solid-js": "^1.7.0",
         "vite": "^4.2.1",
         "vite-plugin-solid": "^2.6.1"
       }
@@ -9822,6 +9831,11 @@
         }
       }
     },
+    "seroval": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/seroval/-/seroval-0.5.1.tgz",
+      "integrity": "sha512-ZfhQVB59hmIauJG5Ydynupy8KHyr5imGNtdDhbZG68Ufh1Ynkv9KOYOAABf71oVbQxJ8VkWnMHAjEHE7fWkH5g=="
+    },
     "shebang-command": {
       "version": "2.0.0",
       "dev": true,
@@ -9879,11 +9893,12 @@
       }
     },
     "solid-js": {
-      "version": "1.6.10",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.6.10.tgz",
-      "integrity": "sha512-Sf0e6PQCEFkFtbPq0L+93Ua81YQOefBEbvDJ0YXT92b6Lzw0k7UvzSd2l1BbYM+yzE3UmepU1tyMDc/3nIByjA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.7.0.tgz",
+      "integrity": "sha512-tLG68KWlVRgzYeAW003G3E70emZqTcqCKJR9QoGr0rcuiLIuKrlUoezT8jLME1YSl3Wfu35jzgeY10iLEY4YQQ==",
       "requires": {
-        "csstype": "^3.1.0"
+        "csstype": "^3.1.0",
+        "seroval": "^0.5.0"
       }
     },
     "solid-refresh": {
diff --git a/packages/playwright-ct-solid/package.json b/packages/playwright-ct-solid/package.json
index 4058326b24..0902da202b 100644
--- a/packages/playwright-ct-solid/package.json
+++ b/packages/playwright-ct-solid/package.json
@@ -31,7 +31,7 @@
     "@playwright/test": "1.33.0-next"
   },
   "devDependencies": {
-    "solid-js": "^1.6.10"
+    "solid-js": "^1.7.0"
   },
   "bin": {
     "playwright": "./cli.js"
diff --git a/tests/components/ct-solid/package.json b/tests/components/ct-solid/package.json
index 02aa735a53..063342cc61 100644
--- a/tests/components/ct-solid/package.json
+++ b/tests/components/ct-solid/package.json
@@ -11,7 +11,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@solidjs/router": "^0.5.0",
+    "@solidjs/router": "^0.8.2",
     "solid-js": "^1.4.7"
   },
   "devDependencies": {
diff --git a/tests/components/ct-solid/src/components/Counter.tsx b/tests/components/ct-solid/src/components/Counter.tsx
index 6b35eddcec..c9bc132307 100644
--- a/tests/components/ct-solid/src/components/Counter.tsx
+++ b/tests/components/ct-solid/src/components/Counter.tsx
@@ -11,8 +11,8 @@ import { createSignal } from "solid-js";
  export default function Counter(props: CounterProps) {
   const [remountCount, setRemountCount] = createSignal(_remountCount++);
   return <div onClick={() => props.onClick?.('hello')}>
-     <div data-testid="props">{ props.count }</div>
-     <div data-testid="remount-count">{ remountCount }</div>
+     <div data-testid="props">{props.count}</div>
+     <div data-testid="remount-count">{remountCount()}</div>
      { props.children }
    </div>
  }