From c98c40871f746c2abe101ad6308352c4d19308db Mon Sep 17 00:00:00 2001 From: Alasdair McLeay Date: Sun, 30 Oct 2022 15:53:42 +0000 Subject: [PATCH] Upgrade to 28a574ea8 --- package-lock.json | 145 +++++++++++++++++---------------------- package.json | 12 ++-- server/api.server.js | 2 +- src/Cache.client.js | 2 +- src/NoteEditor.client.js | 2 +- src/Root.client.js | 5 +- 6 files changed, 74 insertions(+), 94 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e259ce..51fbbbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,13 +22,13 @@ "marked": "^1.2.5", "nodemon": "^2.0.6", "pg": "^8.5.1", - "react": "0.0.0-experimental-0cc724c77-20211125", - "react-dom": "0.0.0-experimental-0cc724c77-20211125", + "react": "0.0.0-experimental-28a574ea8-20221027", + "react-dom": "0.0.0-experimental-28a574ea8-20221027", "react-error-boundary": "^3.1.0", - "react-fetch": "0.0.0-experimental-0cc724c77-20211125", - "react-fs": "0.0.0-experimental-0cc724c77-20211125", - "react-pg": "0.0.0-experimental-0cc724c77-20211125", - "react-server-dom-webpack": "0.0.0-experimental-0cc724c77-20211125", + "react-fetch": "0.0.0-experimental-28a574ea8-20221027", + "react-fs": "0.0.0-experimental-28a574ea8-20221027", + "react-pg": "0.0.0-experimental-28a574ea8-20221027", + "react-server-dom-webpack": "0.0.0-experimental-28a574ea8-20221027", "resolve": "1.12.0", "rimraf": "^3.0.2", "sanitize-html": "^2.2.0", @@ -3949,14 +3949,6 @@ "boolbase": "~1.0.0" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -4481,28 +4473,26 @@ } }, "node_modules/react": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react/-/react-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-8jVo1Rew40qblTTRkVm6ksk4YZ0rG30nwyXwDnnPEszQaUp+dXfEFsoxnSGElroECC2dx4Gg3a6kFsmrBYaF5Q==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react/-/react-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-pNyQIRa0WKuFQgLViiYrhRK2qkttHb0SN8aaGtLNNidHZHT2fhOUfk95Dy75NqeZ9QdJC0fzX53ZEEGyi9w0nA==", "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "loose-envify": "^1.1.0" }, "engines": { "node": ">=0.10.0" } }, "node_modules/react-dom": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-VAaAcGgIVGHX8nOjwQNLEFNI1ONyxsPvKgZ3ywJjEEo5leMDCuYzu+AC2kn1wyyd/4SsI0FOogbpaTcnLMgoUg==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-OmJszRTvJ/sQ98heHC/yvMJPT+YYr7T/7RFUlBvqHGEN0nBteGZwGpubJoX1ndkCRJSDfUtS/xEz4LIHI1o/oQ==", "dependencies": { "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "scheduler": "0.0.0-experimental-0cc724c77-20211125" + "scheduler": "0.0.0-experimental-28a574ea8-20221027" }, "peerDependencies": { - "react": "0.0.0-experimental-0cc724c77-20211125" + "react": "0.0.0-experimental-28a574ea8-20221027" } }, "node_modules/react-error-boundary": { @@ -4526,46 +4516,45 @@ } }, "node_modules/react-fetch": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-fetch/-/react-fetch-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-N5GUVfYw2bXlmOqgG8dLH0xGPqAor9Z9ad0IrVu0S32QmBPl9yXauYHzM4oytxH5G1ZmU+MFSJo+33kZRZ9Glg==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-fetch/-/react-fetch-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-D1L4lYJTKtFDU8ZDVpQSklmDP8mLbiNBCKjXE2ZvhFE7EP1jE7Mf5L9w+ksdsQncWXY7/nhWcOr4SxUIkg6bLA==", "peerDependencies": { - "react": "0.0.0-experimental-0cc724c77-20211125" + "react": "0.0.0-experimental-28a574ea8-20221027" } }, "node_modules/react-fs": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-fs/-/react-fs-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-roicZi1CKU6vvmod8yAULUu+BXbmqTrQaC2WpPahD6ju0ohPIkSaU0M43kSvNmkoq4Wc2EtwPplkHPfnur9Aww==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-fs/-/react-fs-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-khMzG5+kvRfBiFq0cAGGGn+zi/3OBt6Rs0UdOoAhHB5xObVjHuse/0++nDFyDiz7gETH5Ycd9c3pzEoWFktDwA==", "peerDependencies": { - "react": "0.0.0-experimental-0cc724c77-20211125" + "react": "0.0.0-experimental-28a574ea8-20221027" } }, "node_modules/react-pg": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-pg/-/react-pg-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-RpS8P5NTipUAuBnmtrTHnptaPWxGVP1gBrrMQWb2cTRfSvcx02Kp9GRuAiUDuWWtHuUiHOI0oYBxmRcdkvPwuA==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-pg/-/react-pg-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-ItA+3RlRZRBaCbMKl6gIO3JPCNI/YtIbsW6Iy/fpIBjDw1zT1JgivXobD1FSkCR5AII6pDSTLxBxElb8puB5QA==", "peerDependencies": { "pg": "*", - "react": "0.0.0-experimental-0cc724c77-20211125" + "react": "0.0.0-experimental-28a574ea8-20221027" } }, "node_modules/react-server-dom-webpack": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-HAb7dM16mkMqBQRctT5+AkhXML8STWNLJVS3VgQUuTcl28f+Mch6OKw4yaSPayptGJ0EsTkoi6XiUf5cz2vUeQ==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-t5fIigzaBsD2fi6KSDqI7WVfq/VpGTjP1XaCm54Y8CLgXc9Bi9aAThv9WvlNU8CqhBrD79jOENbeHRg79krHzw==", "dependencies": { "acorn": "^6.2.1", "loose-envify": "^1.1.0", - "neo-async": "^2.6.1", - "object-assign": "^4.1.1" + "neo-async": "^2.6.1" }, "engines": { "node": ">=0.10.0" }, "peerDependencies": { - "react": "0.0.0-experimental-0cc724c77-20211125", - "react-dom": "0.0.0-experimental-0cc724c77-20211125", + "react": "0.0.0-experimental-28a574ea8-20221027", + "react-dom": "0.0.0-experimental-28a574ea8-20221027", "webpack": "^5.59.0" } }, @@ -5044,12 +5033,11 @@ } }, "node_modules/scheduler": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-JcvQnsZuiqkRI+uekA9cgAVOHccuBxzOdTqPs3FAInrnZO9OhufomeTKIXuFQwjwZ5DYstOSZax/QnKVXCJFbw==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-kROq0epNu6oZFh0YcTKWDcMgkVb77xxHLuiL7/ehwAUv5wgFjckMIrhSvmYm5fCiKBX0zi1Bc/m6ukxBLcTv4Q==", "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "loose-envify": "^1.1.0" } }, "node_modules/schema-utils": { @@ -9422,11 +9410,6 @@ "boolbase": "~1.0.0" } }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -9829,22 +9812,20 @@ } }, "react": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react/-/react-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-8jVo1Rew40qblTTRkVm6ksk4YZ0rG30nwyXwDnnPEszQaUp+dXfEFsoxnSGElroECC2dx4Gg3a6kFsmrBYaF5Q==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react/-/react-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-pNyQIRa0WKuFQgLViiYrhRK2qkttHb0SN8aaGtLNNidHZHT2fhOUfk95Dy75NqeZ9QdJC0fzX53ZEEGyi9w0nA==", "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "loose-envify": "^1.1.0" } }, "react-dom": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-VAaAcGgIVGHX8nOjwQNLEFNI1ONyxsPvKgZ3ywJjEEo5leMDCuYzu+AC2kn1wyyd/4SsI0FOogbpaTcnLMgoUg==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-OmJszRTvJ/sQ98heHC/yvMJPT+YYr7T/7RFUlBvqHGEN0nBteGZwGpubJoX1ndkCRJSDfUtS/xEz4LIHI1o/oQ==", "requires": { "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "scheduler": "0.0.0-experimental-0cc724c77-20211125" + "scheduler": "0.0.0-experimental-28a574ea8-20221027" } }, "react-error-boundary": { @@ -9866,32 +9847,31 @@ } }, "react-fetch": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-fetch/-/react-fetch-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-N5GUVfYw2bXlmOqgG8dLH0xGPqAor9Z9ad0IrVu0S32QmBPl9yXauYHzM4oytxH5G1ZmU+MFSJo+33kZRZ9Glg==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-fetch/-/react-fetch-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-D1L4lYJTKtFDU8ZDVpQSklmDP8mLbiNBCKjXE2ZvhFE7EP1jE7Mf5L9w+ksdsQncWXY7/nhWcOr4SxUIkg6bLA==", "requires": {} }, "react-fs": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-fs/-/react-fs-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-roicZi1CKU6vvmod8yAULUu+BXbmqTrQaC2WpPahD6ju0ohPIkSaU0M43kSvNmkoq4Wc2EtwPplkHPfnur9Aww==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-fs/-/react-fs-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-khMzG5+kvRfBiFq0cAGGGn+zi/3OBt6Rs0UdOoAhHB5xObVjHuse/0++nDFyDiz7gETH5Ycd9c3pzEoWFktDwA==", "requires": {} }, "react-pg": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-pg/-/react-pg-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-RpS8P5NTipUAuBnmtrTHnptaPWxGVP1gBrrMQWb2cTRfSvcx02Kp9GRuAiUDuWWtHuUiHOI0oYBxmRcdkvPwuA==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-pg/-/react-pg-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-ItA+3RlRZRBaCbMKl6gIO3JPCNI/YtIbsW6Iy/fpIBjDw1zT1JgivXobD1FSkCR5AII6pDSTLxBxElb8puB5QA==", "requires": {} }, "react-server-dom-webpack": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-HAb7dM16mkMqBQRctT5+AkhXML8STWNLJVS3VgQUuTcl28f+Mch6OKw4yaSPayptGJ0EsTkoi6XiUf5cz2vUeQ==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-t5fIigzaBsD2fi6KSDqI7WVfq/VpGTjP1XaCm54Y8CLgXc9Bi9aAThv9WvlNU8CqhBrD79jOENbeHRg79krHzw==", "requires": { "acorn": "^6.2.1", "loose-envify": "^1.1.0", - "neo-async": "^2.6.1", - "object-assign": "^4.1.1" + "neo-async": "^2.6.1" } }, "read-pkg": { @@ -10270,12 +10250,11 @@ } }, "scheduler": { - "version": "0.0.0-experimental-0cc724c77-20211125", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.0.0-experimental-0cc724c77-20211125.tgz", - "integrity": "sha512-JcvQnsZuiqkRI+uekA9cgAVOHccuBxzOdTqPs3FAInrnZO9OhufomeTKIXuFQwjwZ5DYstOSZax/QnKVXCJFbw==", + "version": "0.0.0-experimental-28a574ea8-20221027", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.0.0-experimental-28a574ea8-20221027.tgz", + "integrity": "sha512-kROq0epNu6oZFh0YcTKWDcMgkVb77xxHLuiL7/ehwAUv5wgFjckMIrhSvmYm5fCiKBX0zi1Bc/m6ukxBLcTv4Q==", "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "loose-envify": "^1.1.0" } }, "schema-utils": { diff --git a/package.json b/package.json index a9bee0e..dd4edf1 100644 --- a/package.json +++ b/package.json @@ -20,13 +20,13 @@ "marked": "^1.2.5", "nodemon": "^2.0.6", "pg": "^8.5.1", - "react": "0.0.0-experimental-0cc724c77-20211125", - "react-dom": "0.0.0-experimental-0cc724c77-20211125", + "react": "0.0.0-experimental-28a574ea8-20221027", + "react-dom": "0.0.0-experimental-28a574ea8-20221027", "react-error-boundary": "^3.1.0", - "react-fetch": "0.0.0-experimental-0cc724c77-20211125", - "react-fs": "0.0.0-experimental-0cc724c77-20211125", - "react-pg": "0.0.0-experimental-0cc724c77-20211125", - "react-server-dom-webpack": "0.0.0-experimental-0cc724c77-20211125", + "react-fetch": "0.0.0-experimental-28a574ea8-20221027", + "react-fs": "0.0.0-experimental-28a574ea8-20221027", + "react-pg": "0.0.0-experimental-28a574ea8-20221027", + "react-server-dom-webpack": "0.0.0-experimental-28a574ea8-20221027", "resolve": "1.12.0", "rimraf": "^3.0.2", "sanitize-html": "^2.2.0", diff --git a/server/api.server.js b/server/api.server.js index aa7af68..8c4cfc4 100644 --- a/server/api.server.js +++ b/server/api.server.js @@ -22,7 +22,7 @@ const express = require('express'); const compress = require('compression'); const {readFileSync} = require('fs'); const {unlink, writeFile} = require('fs').promises; -const {renderToPipeableStream} = require('react-server-dom-webpack/writer'); +const {renderToPipeableStream} = require('react-server-dom-webpack/server'); const path = require('path'); const {Pool} = require('pg'); const React = require('react'); diff --git a/src/Cache.client.js b/src/Cache.client.js index 8a506b5..5c54ba2 100644 --- a/src/Cache.client.js +++ b/src/Cache.client.js @@ -7,7 +7,7 @@ */ import {unstable_getCacheForType, unstable_useCacheRefresh} from 'react'; -import {createFromFetch} from 'react-server-dom-webpack'; +import {createFromFetch} from 'react-server-dom-webpack/client'; function createResponseCache() { return new Map(); diff --git a/src/NoteEditor.client.js b/src/NoteEditor.client.js index e8b86dc..3972ced 100644 --- a/src/NoteEditor.client.js +++ b/src/NoteEditor.client.js @@ -7,7 +7,7 @@ */ import {useState, useTransition} from 'react'; -import {createFromReadableStream} from 'react-server-dom-webpack'; +import {createFromReadableStream} from 'react-server-dom-webpack/client'; import NotePreview from './NotePreview'; import {useRefresh} from './Cache.client'; diff --git a/src/Root.client.js b/src/Root.client.js index 2820a80..a8aa2e2 100644 --- a/src/Root.client.js +++ b/src/Root.client.js @@ -6,7 +6,7 @@ * */ -import {useState, Suspense} from 'react'; +import {useState, Suspense, use} from 'react'; import {ErrorBoundary} from 'react-error-boundary'; import {useServerResponse} from './Cache.client'; @@ -29,9 +29,10 @@ function Content() { searchText: '', }); const response = useServerResponse(location); + return ( - {response.readRoot()} + {use(response)} ); }