diff --git a/examples/file-structure-domain-driven-v1/auth/pages/login/index.page.jsx b/examples/file-structure-domain-driven-v1/auth/pages/login/+Page.jsx similarity index 78% rename from examples/file-structure-domain-driven-v1/auth/pages/login/index.page.jsx rename to examples/file-structure-domain-driven-v1/auth/pages/login/+Page.jsx index c8b2221239..414df7f76a 100644 --- a/examples/file-structure-domain-driven-v1/auth/pages/login/index.page.jsx +++ b/examples/file-structure-domain-driven-v1/auth/pages/login/+Page.jsx @@ -1,6 +1,6 @@ -import React from 'react' +export default Page -export { Page } +import React from 'react' function Page() { return <>Login page diff --git a/examples/file-structure-domain-driven-v1/auth/pages/signup/index.page.jsx b/examples/file-structure-domain-driven-v1/auth/pages/signup/+Page.jsx similarity index 78% rename from examples/file-structure-domain-driven-v1/auth/pages/signup/index.page.jsx rename to examples/file-structure-domain-driven-v1/auth/pages/signup/+Page.jsx index c7aeb216e2..fe298cf640 100644 --- a/examples/file-structure-domain-driven-v1/auth/pages/signup/index.page.jsx +++ b/examples/file-structure-domain-driven-v1/auth/pages/signup/+Page.jsx @@ -1,6 +1,6 @@ -import React from 'react' +export default Page -export { Page } +import React from 'react' function Page() { return <>Signup page diff --git a/examples/file-structure-domain-driven-v1/marketing/+config.js b/examples/file-structure-domain-driven-v1/marketing/+config.js new file mode 100644 index 0000000000..0a63a4facd --- /dev/null +++ b/examples/file-structure-domain-driven-v1/marketing/+config.js @@ -0,0 +1,3 @@ +export default { + filesystemRoutingRoot: '/' +} diff --git a/examples/file-structure-domain-driven-v1/marketing/_default.page.route.js b/examples/file-structure-domain-driven-v1/marketing/_default.page.route.js deleted file mode 100644 index 515c6ad860..0000000000 --- a/examples/file-structure-domain-driven-v1/marketing/_default.page.route.js +++ /dev/null @@ -1 +0,0 @@ -export const filesystemRoutingRoot = '/' diff --git a/examples/file-structure-domain-driven-v1/marketing/pages/about/index.page.jsx b/examples/file-structure-domain-driven-v1/marketing/pages/about/+Page.jsx similarity index 78% rename from examples/file-structure-domain-driven-v1/marketing/pages/about/index.page.jsx rename to examples/file-structure-domain-driven-v1/marketing/pages/about/+Page.jsx index 10ecac3874..1902c059a8 100644 --- a/examples/file-structure-domain-driven-v1/marketing/pages/about/index.page.jsx +++ b/examples/file-structure-domain-driven-v1/marketing/pages/about/+Page.jsx @@ -1,6 +1,6 @@ -import React from 'react' +export default Page -export { Page } +import React from 'react' function Page() { return <>About page diff --git a/examples/file-structure-domain-driven-v1/marketing/pages/index/index.page.jsx b/examples/file-structure-domain-driven-v1/marketing/pages/index/+Page.jsx similarity index 77% rename from examples/file-structure-domain-driven-v1/marketing/pages/index/index.page.jsx rename to examples/file-structure-domain-driven-v1/marketing/pages/index/+Page.jsx index 04f31ce5e0..e46f40a695 100644 --- a/examples/file-structure-domain-driven-v1/marketing/pages/index/index.page.jsx +++ b/examples/file-structure-domain-driven-v1/marketing/pages/index/+Page.jsx @@ -1,6 +1,6 @@ -import React from 'react' +export default Page -export { Page } +import React from 'react' function Page() { return <>Welcome diff --git a/examples/file-structure-domain-driven-v1/product/pages/index/index.page.jsx b/examples/file-structure-domain-driven-v1/product/pages/index/+Page.jsx similarity index 84% rename from examples/file-structure-domain-driven-v1/product/pages/index/index.page.jsx rename to examples/file-structure-domain-driven-v1/product/pages/index/+Page.jsx index f7374921ba..d5c6f80dc6 100644 --- a/examples/file-structure-domain-driven-v1/product/pages/index/index.page.jsx +++ b/examples/file-structure-domain-driven-v1/product/pages/index/+Page.jsx @@ -1,6 +1,6 @@ -import React from 'react' +export default Page -export { Page } +import React from 'react' function Page({ routeParams }) { return <>Product {routeParams.productId} diff --git a/examples/file-structure-domain-driven-v1/product/pages/index/index.page.route.js b/examples/file-structure-domain-driven-v1/product/pages/index/+route.js similarity index 100% rename from examples/file-structure-domain-driven-v1/product/pages/index/index.page.route.js rename to examples/file-structure-domain-driven-v1/product/pages/index/+route.js diff --git a/examples/file-structure-domain-driven-v1/product/pages/list/index.page.jsx b/examples/file-structure-domain-driven-v1/product/pages/list/+Page.jsx similarity index 95% rename from examples/file-structure-domain-driven-v1/product/pages/list/index.page.jsx rename to examples/file-structure-domain-driven-v1/product/pages/list/+Page.jsx index 5c4e097a19..d0ba595a3e 100644 --- a/examples/file-structure-domain-driven-v1/product/pages/list/index.page.jsx +++ b/examples/file-structure-domain-driven-v1/product/pages/list/+Page.jsx @@ -1,6 +1,6 @@ -import React from 'react' +export default Page -export { Page } +import React from 'react' function Page() { return ( diff --git a/examples/file-structure-domain-driven-v1/product/pages/list/index.page.server.js b/examples/file-structure-domain-driven-v1/product/pages/list/+onBeforePrerenderStart.js similarity index 63% rename from examples/file-structure-domain-driven-v1/product/pages/list/index.page.server.js rename to examples/file-structure-domain-driven-v1/product/pages/list/+onBeforePrerenderStart.js index e203aee43b..b433678c55 100644 --- a/examples/file-structure-domain-driven-v1/product/pages/list/index.page.server.js +++ b/examples/file-structure-domain-driven-v1/product/pages/list/+onBeforePrerenderStart.js @@ -1,5 +1,5 @@ -export { prerender } +export default onBeforePrerenderStart -function prerender() { +function onBeforePrerenderStart() { return [{ url: '/product/starship', url: '/product/mac-studio', url: '/product/แจ็คเก็ตเดนิม' }] } diff --git a/examples/file-structure-domain-driven-v1/product/pages/list/index.page.route.js b/examples/file-structure-domain-driven-v1/product/pages/list/+route.js similarity index 100% rename from examples/file-structure-domain-driven-v1/product/pages/list/index.page.route.js rename to examples/file-structure-domain-driven-v1/product/pages/list/+route.js diff --git a/examples/file-structure-domain-driven-v1/renderer/+config.js b/examples/file-structure-domain-driven-v1/renderer/+config.js new file mode 100644 index 0000000000..a0ada37d93 --- /dev/null +++ b/examples/file-structure-domain-driven-v1/renderer/+config.js @@ -0,0 +1,5 @@ +export default { + clientRouting: true, + hydrationCanBeAborted: true, + passToClient: ['routeParams'] +} diff --git a/examples/file-structure-domain-driven-v1/renderer/_default.page.client.jsx b/examples/file-structure-domain-driven-v1/renderer/+onRenderClient.jsx similarity index 79% rename from examples/file-structure-domain-driven-v1/renderer/_default.page.client.jsx rename to examples/file-structure-domain-driven-v1/renderer/+onRenderClient.jsx index d7f2de6422..f016251848 100644 --- a/examples/file-structure-domain-driven-v1/renderer/_default.page.client.jsx +++ b/examples/file-structure-domain-driven-v1/renderer/+onRenderClient.jsx @@ -1,13 +1,11 @@ -export { render } -export const clientRouting = true -export const hydrationCanBeAborted = true +export default onRenderClient import React from 'react' import ReactDOM from 'react-dom/client' import { PageLayout } from './PageLayout' let root -async function render(pageContext) { +async function onRenderClient(pageContext) { const { Page, routeParams } = pageContext const page = ( diff --git a/examples/file-structure-domain-driven-v1/renderer/_default.page.server.jsx b/examples/file-structure-domain-driven-v1/renderer/+onRenderHtml.jsx similarity index 84% rename from examples/file-structure-domain-driven-v1/renderer/_default.page.server.jsx rename to examples/file-structure-domain-driven-v1/renderer/+onRenderHtml.jsx index f8171408f4..9d01dbeddb 100644 --- a/examples/file-structure-domain-driven-v1/renderer/_default.page.server.jsx +++ b/examples/file-structure-domain-driven-v1/renderer/+onRenderHtml.jsx @@ -1,14 +1,11 @@ +export default onRenderHtml + import ReactDOMServer from 'react-dom/server' import React from 'react' import { escapeInject, dangerouslySkipEscape } from 'vite-plugin-ssr/server' import { PageLayout } from './PageLayout' -export { render } -export { passToClient } - -const passToClient = ['routeParams'] - -function render(pageContext) { +function onRenderHtml(pageContext) { const { Page, routeParams } = pageContext const pageHtml = ReactDOMServer.renderToString(