From 61c1a34110147dd67538ece410083a8e5b99438c Mon Sep 17 00:00:00 2001
From: Adam Laycock <adam@arcath.net>
Date: Fri, 1 Apr 2022 18:23:38 +0100
Subject: [PATCH] feat: support react 18 (#167)

---
 .github/workflows/validate.yml |  2 +-
 package.json                   | 15 ++++++++-------
 src/__tests__/index.js         |  6 +++---
 src/client.js                  |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index c3f4d11..61a01f2 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -16,7 +16,7 @@ jobs:
     if: ${{ !contains(github.head_ref, 'all-contributors') }}
     strategy:
       matrix:
-        node: [12, 14]
+        node: [12, 14, 16]
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs
diff --git a/package.json b/package.json
index 028ebbd..5cbd8c4 100644
--- a/package.json
+++ b/package.json
@@ -53,21 +53,22 @@
     "esbuild": "0.11.x || 0.12.x || 0.13.x || 0.14.x"
   },
   "devDependencies": {
-    "@testing-library/react": "^12.1.2",
-    "@types/jsdom": "^16.2.13",
+    "@testing-library/react": "^13.0.0",
+    "@types/jsdom": "^16.2.14",
     "@types/mdx": "^2.0.1",
     "@types/react": "^17.0.34",
     "@types/react-dom": "^17.0.11",
-    "@types/uuid": "^8.3.1",
+    "@types/uuid": "^8.3.4",
+    "babel-eslint": "^10.1.0",
     "c8": "^7.10.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.13.13",
-    "jsdom": "^18.1.0",
+    "esbuild": "^0.14.29",
+    "jsdom": "^19.0.0",
     "kcd-scripts": "^11.2.2",
     "left-pad": "^1.3.0",
     "mdx-test-data": "^1.0.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
     "remark-mdx-images": "^1.0.3",
     "typescript": "^4.4.3",
     "uvu": "^0.5.2"
diff --git a/src/__tests__/index.js b/src/__tests__/index.js
index 6f78d09..7eacc6a 100644
--- a/src/__tests__/index.js
+++ b/src/__tests__/index.js
@@ -151,7 +151,7 @@ import Demo from './demo'
     }).catch(e => e)
   )
 
-  assert.match(error.message, `error: Could not resolve "./demo"`)
+  assert.match(error.message, `ERROR: Could not resolve "./demo"`)
 })
 
 test('gives a handy error when importing a module that cannot be found', async () => {
@@ -173,7 +173,7 @@ import Demo from './demo'
   assert.equal(
     error.message,
     `Build failed with 1 error:
-demo.tsx:1:7: error: Could not resolve "./blah-blah"`,
+demo.tsx:1:7: ERROR: Could not resolve "./blah-blah"`,
   )
 })
 
@@ -195,7 +195,7 @@ import Demo from './demo.blah'
 
   assert.match(
     error.message,
-    `error: [plugin: inMemory] Invalid loader: "blah" (valid: js, jsx, ts, tsx, css, json, text, base64, dataurl, file, binary)`,
+    `ERROR: [plugin: inMemory] Invalid loader value: "blah"`,
   )
 })
 
diff --git a/src/client.js b/src/client.js
index b89688f..af99d0e 100644
--- a/src/client.js
+++ b/src/client.js
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import * as _jsx_runtime from 'react/jsx-runtime.js'
+import * as _jsx_runtime from 'react/jsx-runtime'
 import * as ReactDOM from 'react-dom'
 
 /**