diff --git a/app.tsx b/app.tsx index f70f32a..1381490 100644 --- a/app.tsx +++ b/app.tsx @@ -5,10 +5,10 @@ console.log(React.useId) export function App(){ - //const [countGet, countSet] = React.useState(0); + const [countGet, countSet] = React.useState(0); return <> -
lol hey 12121
+
lol hey!

more

} diff --git a/deno.json b/deno.json index b6f22c2..1802e64 100644 --- a/deno.json +++ b/deno.json @@ -16,7 +16,7 @@ "@preact/signals":"npm:@preact/signals", "signals-original": "npm:@preact/signals", - "react-original": "npm:react" + "react-original": "npm:react/jsx-runtime" } } diff --git a/hmr/hmr-jsx-runtime.tsx b/hmr/hmr-jsx-runtime.tsx deleted file mode 100644 index f995ec6..0000000 --- a/hmr/hmr-jsx-runtime.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import Default from "react-jsx-runtime-original"; -const jsx = Default.jsx; -const jsxs = Default.jsxs; -const Fragment = Default.Fragment; -console.log("run is", Default); -export { jsx, jsxs, Fragment }; \ No newline at end of file diff --git a/hmr/hmr-react.tsx b/hmr/hmr-react.tsx index 1a07059..6a64980 100644 --- a/hmr/hmr-react.tsx +++ b/hmr/hmr-react.tsx @@ -1,7 +1,9 @@ -import * as ReactOriginal from "react-original"; +import * as ReactOriginal from "npm:react"; + const ReactParts = ReactOriginal.default ? ReactOriginal.default : ReactOriginal; + /* Each custom component is secretly modified to have an extra state and id. @@ -175,5 +177,5 @@ const ProxyReducer =(inReducer:(inState:Storelike, inAction:string)=>Storelike, export * from "react-original"; const Fragment = ReactParts.Fragment -export {ProxyCreate as createElement, ProxyCreate as jsx, Fragment, ProxyState as useState, ProxyReducer as useReducer }; -export default {...ReactParts, createElement:ProxyCreate, jsx:ProxyCreate, Fragment, useState:ProxyState, useReducer:ProxyReducer}; \ No newline at end of file +export {ProxyCreate as createElement, ProxyCreate as jsx, ProxyCreate as jsxs, Fragment, ProxyState as useState, ProxyReducer as useReducer }; +export default {...ReactParts, createElement:ProxyCreate, jsx:ProxyCreate, jsxs:ProxyCreate, Fragment, useState:ProxyState, useReducer:ProxyReducer}; \ No newline at end of file diff --git a/server.ts b/server.ts index 35e56a5..f1444c8 100644 --- a/server.ts +++ b/server.ts @@ -65,11 +65,10 @@ for(const key in denoBody.imports) } } -denoBody.imports["react-jsx-runtime-original"] = `${denoBody.imports[denoBody.compilerOptions.jsxImportSource]}/jsx-runtime`; -denoBody.imports["react/jsx-runtime"] = "/^/hmr/hmr-jsx-runtime.tsx"; +denoBody.imports["react/jsx-runtime"] = "/>/hmr/hmr-react.tsx"; +denoBody.imports["react-original"] = denoBody.imports[denoBody.compilerOptions.jsxImportSource]+"/jsx-runtime"; +denoBody.imports["react"] = "/>/hmr/hmr-react.tsx"; -denoBody.imports["react-original"] = denoBody.imports[denoBody.compilerOptions.jsxImportSource]; -denoBody.imports["react"] = "/^/hmr/hmr-react.tsx"; // denoBody.imports["react-original"] = denoBody.imports["react"]; // denoBody.imports["react-jsx-runtime-original"] = denoBody.imports[denoBody.compilerOptions.jsxImportSource]+"/jsx-runtime";