patch from #284 for svelte 5

testing-library · Jan 23, 2024 · 67bbafa · 67bbafa
1 parent c0ff791
commit 67bbafa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "contributors:generate": "all-contributors generate"
   },
   "peerDependencies": {
-    "svelte": "^3 || ^4"
+    "svelte": "^3 || ^4 || ^5"
   },
   "dependencies": {
     "@testing-library/dom": "^9.3.1"
@@ -77,7 +77,7 @@
     "lint-staged": "^13.2.3",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.0.0",
-    "svelte": "^4.0.1",
+    "svelte": "^5",
     "vite": "^4.3.9",
     "vitest": "^0.33.0"
   },

diff --git a/src/pure.js b/src/pure.js
@@ -1,9 +1,9 @@
 import {
   fireEvent as dtlFireEvent,
   getQueriesForElement,
-  prettyDOM
+  prettyDOM,
 } from '@testing-library/dom'
-import { tick } from 'svelte'
+import { tick, createRoot } from 'svelte'
 
 const containerCache = new Set()
 const componentCache = new Set()
@@ -14,13 +14,13 @@ const svelteComponentOptions = [
   'props',
   'hydrate',
   'intro',
-  'context'
+  'context',
 ]
 
 const render = (
   Component,
   { target, ...options } = {},
-  { container, queries } = {}
+  { container, queries } = {},
 ) => {
   container = container || document.body
   target = target || container.appendChild(document.createElement('div'))
@@ -29,13 +29,13 @@ const render = (
 
   const checkProps = (options) => {
     const isProps = !Object.keys(options).some((option) =>
-      svelteComponentOptions.includes(option)
+      svelteComponentOptions.includes(option),
     )
 
     // Check if any props and Svelte options were accidentally mixed.
     if (!isProps) {
       const unrecognizedOptions = Object.keys(options).filter(
-        (option) => !svelteComponentOptions.includes(option)
+        (option) => !svelteComponentOptions.includes(option),
       )
 
       if (unrecognizedOptions.length > 0) {
@@ -54,42 +54,35 @@ const render = (
     return { props: options }
   }
 
-  let component = new ComponentConstructor({
+  let component = createRoot(ComponentConstructor, {
     target,
-    ...checkProps(options)
+    ...checkProps(options),
+    ondestroy: () => componentCache.delete(component),
   })
 
   containerCache.add({ container, target, component })
   componentCache.add(component)
 
-  component.$$.on_destroy.push(() => {
-    componentCache.delete(component)
-  })
-
   return {
     container,
     component,
     debug: (el = container) => console.log(prettyDOM(el)),
     rerender: (options) => {
       if (componentCache.has(component)) component.$destroy()
 
-      // eslint-disable-next-line no-new
-      component = new ComponentConstructor({
+      component = createRoot(ComponentConstructor, {
         target,
-        ...checkProps(options)
+        ...checkProps(options),
+        ondestroy: () => componentCache.delete(component),
       })
 
       containerCache.add({ container, target, component })
       componentCache.add(component)
-
-      component.$$.on_destroy.push(() => {
-        componentCache.delete(component)
-      })
     },
     unmount: () => {
       if (componentCache.has(component)) component.$destroy()
     },
-    ...getQueriesForElement(container, queries)
+    ...getQueriesForElement(container, queries),
   }
 }