Merge pull request #198 from Shopify/fd-fix-public-assets
fix: run Hydrogen middleware after Vite handles static assets
This commit is contained in:
Fran Dios
GitHub
commit
b1b5ba2ad8
|
|
@ -7,7 +7,7 @@ export default function ({ifFeature}: TemplateOptions) {
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
|
||||
${ifFeature(
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Hydrogen App</title>
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
|
@ -7,6 +7,7 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
|||
|
||||
## Unreleased
|
||||
|
||||
- fix: let Vite handle public assets in development
|
||||
- fix: new lines in hydration request break JSON.parse
|
||||
- fix(#201): normalize POSIX separators to support windows
|
||||
- fix: scroll to top on app first load
|
||||
|
|
|
|||
|
|
@ -141,9 +141,8 @@ function shouldInterceptRequest(
|
|||
isReactHydrationRequest: boolean
|
||||
) {
|
||||
return (
|
||||
(/text\/html|application\/hydrogen/.test(request.headers['accept'] ?? '') ||
|
||||
isReactHydrationRequest) &&
|
||||
request.url !== '/favicon.ico'
|
||||
/text\/html|application\/hydrogen/.test(request.headers['accept'] ?? '') ||
|
||||
isReactHydrationRequest
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,19 +25,20 @@ export default (
|
|||
return await server.transformIndexHtml(url, indexHtml);
|
||||
}
|
||||
|
||||
server.middlewares.use(
|
||||
hydrogenMiddleware({
|
||||
dev: true,
|
||||
shopifyConfig,
|
||||
indexTemplate: getIndexTemplate,
|
||||
getServerEntrypoint: async () =>
|
||||
await server.ssrLoadModule(resolve('./src/entry-server')),
|
||||
devServer: server,
|
||||
cache: pluginOptions?.devCache
|
||||
? (new InMemoryCache() as unknown as Cache)
|
||||
: undefined,
|
||||
})
|
||||
);
|
||||
return () =>
|
||||
server.middlewares.use(
|
||||
hydrogenMiddleware({
|
||||
dev: true,
|
||||
shopifyConfig,
|
||||
indexTemplate: getIndexTemplate,
|
||||
getServerEntrypoint: async () =>
|
||||
await server.ssrLoadModule(resolve('./src/entry-server')),
|
||||
devServer: server,
|
||||
cache: pluginOptions?.devCache
|
||||
? (new InMemoryCache() as unknown as Cache)
|
||||
: undefined,
|
||||
})
|
||||
);
|
||||
},
|
||||
} as Plugin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Hydrogen App</title>
|
||||
</head>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
|
@ -2,7 +2,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Hydrogen App</title>
|
||||
</head>
|
||||
|
|
|
|||
15
packages/playground/server-components/public/favicon.svg
Normal file
15
packages/playground/server-components/public/favicon.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<svg width="410" height="404" viewBox="0 0 410 404" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M399.641 59.5246L215.643 388.545C211.844 395.338 202.084 395.378 198.228 388.618L10.5817 59.5563C6.38087 52.1896 12.6802 43.2665 21.0281 44.7586L205.223 77.6824C206.398 77.8924 207.601 77.8904 208.776 77.6763L389.119 44.8058C397.439 43.2894 403.768 52.1434 399.641 59.5246Z" fill="url(#paint0_linear)"/>
|
||||
<path d="M292.965 1.5744L156.801 28.2552C154.563 28.6937 152.906 30.5903 152.771 32.8664L144.395 174.33C144.198 177.662 147.258 180.248 150.51 179.498L188.42 170.749C191.967 169.931 195.172 173.055 194.443 176.622L183.18 231.775C182.422 235.487 185.907 238.661 189.532 237.56L212.947 230.446C216.577 229.344 220.065 232.527 219.297 236.242L201.398 322.875C200.278 328.294 207.486 331.249 210.492 326.603L212.5 323.5L323.454 102.072C325.312 98.3645 322.108 94.137 318.036 94.9228L279.014 102.454C275.347 103.161 272.227 99.746 273.262 96.1583L298.731 7.86689C299.767 4.27314 296.636 0.855181 292.965 1.5744Z" fill="url(#paint1_linear)"/>
|
||||
<defs>
|
||||
<linearGradient id="paint0_linear" x1="6.00017" y1="32.9999" x2="235" y2="344" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#41D1FF"/>
|
||||
<stop offset="1" stop-color="#BD34FE"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear" x1="194.651" y1="8.81818" x2="236.076" y2="292.989" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#FFEA83"/>
|
||||
<stop offset="0.0833333" stop-color="#FFDD35"/>
|
||||
<stop offset="1" stop-color="#FFA800"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
Loading…
Reference in a new issue