Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

fix(integration api): improve module resolution (#10060)

Browse source 
* fix(integration api): improve module resolution

* add changeset
This commit is contained in:
Arsh 2024-02-09 08:22:04 -07:00 • committed by GitHub
parent 989ea63bb2
commit 1810309e65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/tough-shirts-allow.md Normal file
View file

@ -0,0 +1,5 @@
---
"astro": patch
---
Fixes an issue where custom client directives added by integrations broke builds with a custom root.

7
packages/astro/src/core/client-directive/build.ts
View file

@ -1,9 +1,10 @@
import { build } from 'esbuild';
import { fileURLToPath } from 'node:url';
/**
* Build a client directive entrypoint into code that can directly run in a `<script>` tag.
*/
export async function buildClientDirectiveEntrypoint(name: string, entrypoint: string) {
export async function buildClientDirectiveEntrypoint(name: string, entrypoint: string, root: URL) {
const stringifiedName = JSON.stringify(name);
const stringifiedEntrypoint = JSON.stringify(entrypoint);
@ -17,9 +18,9 @@ import directive from ${stringifiedEntrypoint};
(self.Astro || (self.Astro = {}))[${stringifiedName}] = directive;
window.dispatchEvent(new Event('astro:' + ${stringifiedName}));`,
resolveDir: process.cwd(),
resolveDir: fileURLToPath(root),
},
absWorkingDir: process.cwd(),
absWorkingDir: fileURLToPath(root),
format: 'iife',
minify: true,
bundle: true,

3
packages/astro/src/integrations/index.ts
View file

@ -153,7 +153,8 @@ export async function runHookConfigSetup({
`The "${integration.name}" integration is trying to add the "${name}" client directive, but it already exists.`
);
}
addedClientDirectives.set(name, buildClientDirectiveEntrypoint(name, entrypoint));
// TODO: this should be performed after astro:config:done
addedClientDirectives.set(name, buildClientDirectiveEntrypoint(name, entrypoint, settings.config.root));
},
addMiddleware: ({ order, entrypoint }) => {
if (typeof updatedSettings.middlewares[order] === 'undefined') {