fix: Improve Static Server Reliability #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Draft

lilnasy wants to merge 2 commits into NuroDev:main

from lilnasy:fix-images

Draft

fix: Improve Static Server Reliability #11

lilnasy wants to merge 2 commits into NuroDev:main from lilnasy:fix-images

Conversation

lilnasy

Copy link

@lilnasy lilnasy commented Dec 23, 2024

Changes

Closes Cannot serve .webp image in mdx #4
Astro SSR manifest is not exactly public API. If it works it works, but if it doesn't we should use something else.
In this case, optimized images are not included in the "assets" list, which the adapter relied upon.
Updated the logic to read the client directory on server boot and use the found files instead of the assets list in the SSR manifest.

image

NuroDev

NuroDev requested changes

Dec 23, 2024

View reviewed changes

package/package.json Show resolved Hide resolved

package/src/index.ts Outdated Show resolved Hide resolved

package/src/server/index.ts Outdated Show resolved Hide resolved

package/src/server/index.ts

};

}

async function getStaticAssets(clientDir: string) {

Copy link

Owner

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

async function getStaticAssets(clientDir: string) {

async function getStaticAssets(clientDir: string): Promise<Set<string>> {

package/src/server/index.ts

return client;

}

function prependForwardSlash(pth: string) {

Copy link

Owner

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

function prependForwardSlash(pth: string) {

function prependForwardSlash(pth: string): string {

package/src/server/index.ts

return pth.startsWith('/') ? pth : '/' + pth;

}

function appendForwardSlash(pth: string) {

Copy link

Owner

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

function appendForwardSlash(pth: string) {

function appendForwardSlash(pth: string): string {

package/src/server/index.ts

* Copyright of withastro/adapters contributors, Reproduced under MIT License

function resolveClientDir(options: InternalOptions) {

Copy link

Owner

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

function resolveClientDir(options: InternalOptions) {

function resolveClientDir(options: InternalOptions): string {

package/src/server/index.ts

const serverURLRaw = new URL(options.server);

const rel = path.relative(url.fileURLToPath(serverURLRaw), url.fileURLToPath(clientURLRaw));

// walk up the parent folders until you find the one that is the root of the server entry folder. This is how we find the client folder relatively.

Copy link

Owner

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

// walk up the parent folders until you find the one that is the root of the server entry folder. This is how we find the client folder relatively.

// Walk up the parent folders until you find the one that is the root of the server entry folder. This is how we find the client folder relatively.

package/src/types.ts Show resolved Hide resolved

@NuroDev

Copy link

Owner

NuroDev commented Dec 23, 2024

It also seems you have based this branch off of your branch used for #10 so the 2 you've put 2 PR's into 1.

@lilnasy lilnasy force-pushed the fix-images branch from 850dacc to 392defc Compare

December 23, 2024 23:52

lilnasy added 2 commits

December 24, 2024 13:05

@lilnasy


 fix: improve static server reliability

fa1c549

@lilnasy


 workaround incorrect types

d4626bd

@lilnasy lilnasy force-pushed the fix-images branch from 392defc to d4626bd Compare

December 24, 2024 13:06

@lilnasy lilnasy marked this pull request as draft

January 18, 2025 16:13

@lilnasy

Copy link

Author

lilnasy commented Jan 18, 2025 •

edited

Loading

Marking as draft because it depends on types being corrected in #10.

Labels

None yet

2 participants

@lilnasy @NuroDev

fix: Improve Static Server Reliability #11

Are you sure you want to change the base?

fix: Improve Static Server Reliability #11

Uh oh!

Conversation

@lilnasy lilnasy commented Dec 23, 2024

Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

Uh oh!

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

Uh oh!

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

Uh oh!

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

Uh oh!

@NuroDev NuroDev Dec 23, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

NuroDev commented Dec 23, 2024

Uh oh!

lilnasy commented Jan 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

lilnasy commented Jan 18, 2025 •

edited

Loading