fix(astrojs/cloudflare): SSR split file renaming misses ts endpoints #7555
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🦋 Changeset detectedLatest commit: 45c39e5 The changes in this PR will be included in the next version bump. Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
github-actions
bot
added
the
pkg: integration
ematipico
requested changes
Jul 3, 2023
github-actions
bot
added
feat: markdown
alexanderniebuhr
changed the title
alexanderniebuhr
changed the title
alexanderniebuhr
commented
Jul 5, 2023
| return (runtimeEnv.env as unknown & { | ||
| ASSETS: { | ||
| fetch: typeof fetch; | ||
| }; |
There was a problem hiding this comment.
this is already done for advanced mode but was missing for directroy mode. please also note that I'll remove the type assertion on the Astro.locals PR, where I refactored the EventContext typing
alexanderniebuhr
commented
Jul 5, 2023
Comment on lines
+138
to
171
| for (const outputFile of outputFiles) { | ||
|
|
||
| // split the path into an array | ||
| const path = outputFile.split(sep); | ||
|
|
||
| // replace dynamic path with [path] | ||
| const pathWithDynamics = path.map((segment) => segment.replace(/(\_)(\w+)(\_)/g, (_, __, prop) => { | ||
| return `[${prop}]`; | ||
| })); | ||
|
|
||
| // replace nested dynamic path with [[path]] | ||
| const pathWithNestedDynamics = pathWithDynamics.map((segment) => segment.replace(/(\_\-\-\-)(\w+)(\_)/g, (_, __, prop) => { | ||
| return `[[${prop}]]`; | ||
| })) | ||
|
|
||
| // remove original file extension | ||
| const pathReversed = pathWithNestedDynamics.reverse(); | ||
| pathReversed[0] = pathReversed[0] | ||
| .replace('entry.', '') | ||
| .replace(/(.*)\.(\w+)\.(\w+)$/g, (_, fileName, oldExt, newExt) => { | ||
| return `${fileName}.${newExt}`; | ||
| }) | ||
|
|
||
| const finalSegments = pathReversed.reverse(); | ||
| const finalDirPath = finalSegments.slice(0, -1).join('/'); | ||
| const finalPath = finalSegments.join('/'); | ||
|
|
||
| const newDirUrl = new URL(finalDirPath, functionsUrl); | ||
| await fs.promises.mkdir(newDirUrl, { recursive: true }) | ||
|
|
||
| const oldFileUrl = new URL(`$astro/${outputFile}`, outputUrl); | ||
| const newFileUrl = new URL(finalPath, functionsUrl); | ||
| await fs.promises.rename(oldFileUrl, newFileUrl); | ||
| } |
There was a problem hiding this comment.
This loop has a lot of memory allocation, let me know if I should consolidate the steps into more abstract steps?
@ematipico @matthewp
fix bug for cloudflare assets redirect fix bug for cloudflare assets redirect fix bug for cloudflare assets redirect fix bug for cloudflare assets redirect fix bug for cloudflare assets redirect fix bug for cloudflare assets redirect fix bug for cloudflare assets redirect fix bug for cloudflare assets redirect
|
had to redo the PR, due to git history conflicts: #7568 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
tsendpoint files are not renamed to .js after bundle stepTesting
Docs