Skip to content
This repository was archived by the owner on Jul 4, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,095 changes: 1,764 additions & 3,331 deletions astro/package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"preview": "astro preview"
},
"dependencies": {
"@astrojs/tailwind": "^2.1.3",
"@storyblok/astro": "2.0.3",
"astro": "^1.9.2",
"tailwindcss": "3.2.4"
"@astrojs/tailwind": "^3.0.1",
"@storyblok/astro": "2.0.9",
"astro": "^2.0.16",
"tailwindcss": "3.2.7"
},
"devDependencies": {
"@vitejs/plugin-basic-ssl": "^0.1.2"
"@vitejs/plugin-basic-ssl": "^1.0.1"
}
}
1 change: 1 addition & 0 deletions astro/src/env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="astro/client" />
2 changes: 1 addition & 1 deletion nuxtjs-3
Submodule nuxtjs-3 updated 3 files
+3 −2 nuxt.config.js
+3,813 −3,256 package-lock.json
+5 −5 package.json
7 changes: 4 additions & 3 deletions remix/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"extends": ["@remix-run/eslint-config", "@remix-run/eslint-config/node"]
}
/** @type {import('eslint').Linter.Config} */
module.exports = {
extends: ["@remix-run/eslint-config", "@remix-run/eslint-config/node"],
};
20 changes: 19 additions & 1 deletion remix/app/entry.client.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
import { RemixBrowser } from "@remix-run/react";
import { startTransition, StrictMode } from "react";
import { hydrateRoot } from "react-dom/client";

hydrateRoot(document, <RemixBrowser />);
function hydrate() {
startTransition(() => {
hydrateRoot(
document,
<StrictMode>
<RemixBrowser />
</StrictMode>
);
});
}

if (typeof requestIdleCallback === "function") {
requestIdleCallback(hydrate);
} else {
// Safari doesn't support requestIdleCallback
// https://caniuse.com/requestidlecallback
setTimeout(hydrate, 1);
}
73 changes: 68 additions & 5 deletions remix/app/entry.server.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { PassThrough } from "stream";

import { Response } from "@remix-run/node";
import { RemixServer } from "@remix-run/react";
import isbot from "isbot";
import { renderToPipeableStream } from "react-dom/server";

const ABORT_DELAY = 5000;
Expand All @@ -11,15 +12,77 @@ export default function handleRequest(
responseStatusCode,
responseHeaders,
remixContext
) {
return isbot(request.headers.get("user-agent"))
? handleBotRequest(
request,
responseStatusCode,
responseHeaders,
remixContext
)
: handleBrowserRequest(
request,
responseStatusCode,
responseHeaders,
remixContext
);
}

function handleBotRequest(
request,
responseStatusCode,
responseHeaders,
remixContext
) {
return new Promise((resolve, reject) => {
let didError = false;

const { pipe, abort } = renderToPipeableStream(
<RemixServer context={remixContext} url={request.url} />,
{
onAllReady() {
const body = new PassThrough();

responseHeaders.set("Content-Type", "text/html");

resolve(
new Response(body, {
headers: responseHeaders,
status: didError ? 500 : responseStatusCode,
})
);

pipe(body);
},
onShellError(error) {
reject(error);
},
onError(error) {
didError = true;

console.error(error);
},
}
);

setTimeout(abort, ABORT_DELAY);
});
}

function handleBrowserRequest(
request,
responseStatusCode,
responseHeaders,
remixContext
) {
return new Promise((resolve, reject) => {
let didError = false;

let { pipe, abort } = renderToPipeableStream(
const { pipe, abort } = renderToPipeableStream(
<RemixServer context={remixContext} url={request.url} />,
{
onShellReady: () => {
let body = new PassThrough();
onShellReady() {
const body = new PassThrough();

responseHeaders.set("Content-Type", "text/html");

Expand All @@ -32,10 +95,10 @@ export default function handleRequest(

pipe(body);
},
onShellError: (err) => {
onShellError(err) {
reject(err);
},
onError: (error) => {
onError(error) {
didError = true;

console.error(error);
Expand Down
5 changes: 0 additions & 5 deletions remix/app/root.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,12 @@ export default function App() {
<html lang="en">
<head>
<Meta />

<Links />
</head>

<body>
<Outlet />

<ScrollRestoration />

<Scripts />

<LiveReload />
</body>
</html>
Expand Down
Loading