Fix for #9673 #9680
Fix for #9673 #9680
Conversation
🦋 Changeset detectedLatest commit: 84f8d68 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: astro
Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
| return JSON.stringify( | ||
| `${isRelativePath(normalizedConfigPath) ? '' : './'}${ | ||
| normalizedConfigPath.endsWith('.ts') | ||
| ? normalizedConfigPath.replace(/\.ts$/, '') |
There was a problem hiding this comment.
If this always resolves to a file that ends with .ts or .js then we can simplify normalizeConfigPath a bit by moving that .js at the end of the returned string here, so the line ends up being:
? normalizedConfigPath.replace(/\.ts$/, ".js")
There was a problem hiding this comment.
Fair point. I believe .mjs would be possible, and this change would silently leave the .mjs extension without changing it. I'd prefer that to be the case
There was a problem hiding this comment.
I’ll update the PR with the simplified code, then. Thank you!
|
|
||
| return JSON.stringify( | ||
| `${isRelativePath(normalizedConfigPath) ? '' : './'}${ | ||
| normalizedConfigPath.endsWith('.ts') |
There was a problem hiding this comment.
There are also .d.ts files. Are they covered by this check on purpose?
There was a problem hiding this comment.
AFAIK it should not be .d.ts? So is it worth handling this case?
There was a problem hiding this comment.
If we never get .d.ts and is always .ts then we can update this to replace .ts with .js simplifying the code a bit:
function normalizeConfigPath(from: string, to: string) {
const normalizedConfigPath = path.relative(from, to);
return `"${
isRelativePath(normalizedConfigPath) ? "" : "./"
}${normalizedConfigPath.replace(/\.ts$/, ".js")}"`;
}There was a problem hiding this comment.
If we never get .d.ts
That's what I not sure about (I am not familiar with this part of the code). So maybe keeping the code as is better.
There was a problem hiding this comment.
Ah, this looks like the loader for src/content/config.ts correct? If so, we only support .ts and .js. .d.ts shouldn't be possible 👍
* i18n(domains): validation and updated logic (#9099) * feat(i18n): domain with lookup table (#9112) * chore: add changelog, fix types and enable experimental support in node/vercel * rebase and update lock file * chore: fix failing test * Apply suggestions from code review Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> Co-authored-by: Matthew Phillips <matthew@skypack.dev> * Update .changeset/tidy-carrots-jump.md Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> * wip * chore: rebase, conflicts and tests * update lock file * chore: correct configuration * chore: correct configuration * fix: regressions * chore: fix conflicts and add more tests * chore: add more validation * chore: more tests and add more restrictions * fix changeset * change and revert adapters * add another restriction * lock file update * Update packages/astro/src/@types/astro.ts Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> * Update packages/astro/src/@types/astro.ts Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com> * wat * fix syntax error * fix config example * Fix for #9673 (#9680) * Fix for #9673 * 🦋 add changeset file * Update breezy-plants-smoke.md Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * ⚡️ simplified normalizeConfigPath --------- Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> * Fix env var replacement for export const prerender (#9807) * feat(alpinejs): allow customizing the Alpine instance (#9751) * feat(alpinejs): allows customzing the Alpine instance * chore: add e2e tests * fix: rename script * Update index.ts * fix: lockfile * [ci] format * chore: use correct lock file * chore: rebase * fix regressions in tests * fix regressions in tests * fix build * add description * fix missing types * chore: fix tests, again :D * eslint * Update packages/astro/src/@types/astro.ts Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com> * chore: address feedback * chore: fix regressions * chore: refactor naming * Update packages/astro/src/core/app/index.ts Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com> * chore: address feedback * update lock file * chore: infer routing from options, not strategy * merge from main * merge from main * Experimental support in vercel adapter * Update packages/astro/src/@types/astro.ts Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> * Update packages/astro/src/@types/astro.ts Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> * Update .changeset/tidy-carrots-jump.md Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> * better changesets * Updates both experimental.i18nDomains and i18ndomains for experimental strategy * fix link syntax * consistent tabs/spaces * Update packages/astro/src/@types/astro.ts Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> * apply suggestion --------- Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> Co-authored-by: Matthew Phillips <matthew@skypack.dev> Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com> Co-authored-by: Lou Cyx <git@lou.cx> Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev> Co-authored-by: Florian Lefebvre <ematipico@users.noreply.github.com> Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
Changes
Closes #9673
.jsto the end of theconfigPathfor types, making it work for verbatim modules in TypeScript.Testing
Ran all the tests with no errors reported. I didn't add tests because I didn't think they were needed, but if you think otherwise, I'll need guidance on testing different TSConfigs on a given file.
Docs
Docs don't need to be updated. This is a fix for users with verbatim modules in TypeScript, but it works the same for users without that setting.