Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react/src/plugin-islands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export function islandsPlugin(
},

configureServer(server) {
islandManifest.configureServer(server);
watchPagesForRescan(server, pagesDir, root, (scan: PageScanResult) => {
pageScan = scan;
});
Expand Down
1 change: 1 addition & 0 deletions packages/solid/src/plugin-islands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export function islandsPlugin(
},

configureServer(server) {
islandManifest.configureServer(server);
watchPagesForRescan(server, pagesDir, root, (scan: PageScanResult) => {
pageScan = scan;
});
Expand Down
1 change: 1 addition & 0 deletions packages/svelte/src/plugin-islands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export function islandsPlugin(
},

configureServer(server) {
islandManifest.configureServer(server);
watchPagesForRescan(server, pagesDir, root, (scan: PageScanResult) => {
pageScan = scan;
});
Expand Down
18 changes: 18 additions & 0 deletions packages/void/src/pages/islands-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ export type IslandManifest = {
* build may load the islands client entry before their transforms run.
*/
registerPages(pageScan: PageScanResult, pagesDir: string): void;
/**
* Invalidate the dev islands client entry when a page transform records a
* new island, so the next page load hydrates it without a server restart.
*/
configureServer(server: ViteDevServer): void;
};

/** `extensions` are tried, in order, for an island import without one. */
Expand All @@ -92,6 +97,7 @@ export function createIslandManifest(
extensions: ReadonlyArray<string>,
): IslandManifest {
const entries = new Map<string, IslandEntry>();
let server: ViteDevServer | null = null;

function register(
specifier: string,
Expand All @@ -103,7 +109,16 @@ export function createIslandManifest(
return { absPath, islandId: specifier };
}
const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, '');
const isNew = entries.get(islandId)?.componentPath !== absPath;
entries.set(islandId, { componentPath: absPath, islandId, hydrate });
if (isNew && server) {
for (const env of Object.values(server.environments)) {
const mod = env.moduleGraph.getModuleById('\0' + ISLANDS_CLIENT_ENTRY_ID);
if (mod) {
env.moduleGraph.invalidateModule(mod);
}
}
}
return { absPath, islandId };
}

Expand All @@ -127,6 +142,9 @@ export function createIslandManifest(
}
}
},
configureServer(devServer) {
server = devServer;
},
};
}

Expand Down
1 change: 1 addition & 0 deletions packages/vue/src/plugin-islands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export function islandsPlugin(
},

configureServer(server) {
islandManifest.configureServer(server);
watchPagesForRescan(server, pagesDir, root, (scan: PageScanResult) => {
pageScan = scan;
});
Expand Down
63 changes: 63 additions & 0 deletions packages/vue/test/integration/island-dev-client-entry.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { cpSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
import { join } from 'node:path';
import vue from '@vitejs/plugin-vue';
import { createServer } from 'vite';
import { expect, it } from 'vite-plus/test';
import { islandsPlugin } from '../../src/plugin-islands.ts';

const COUNTER = `<script setup>
import { ref } from "vue";
const count = ref(0);
</script>
<template><button @click="count++">Count {{ count }}</button></template>
`;

it('adds an island imported after the dev server loaded the islands client entry', async () => {
const root = mkdtempSync(join(import.meta.dirname, '__tmp_island_dev_client_entry_'));
const pages = join(root, 'pages');
mkdirSync(pages);
mkdirSync(join(root, 'components'));
writeFileSync(join(root, 'components/Counter.vue'), COUNTER);
writeFileSync(
join(pages, 'index.island.vue'),
`<script setup>
import Counter from "../components/Counter.vue" with { island: "load" };
</script>
<template><Counter /></template>
`,
);

const server = await createServer({
root,
configFile: false,
cacheDir: join(root, '.vite'),
logLevel: 'silent',
plugins: [vue(), ...islandsPlugin(pages)],
server: { ws: false, watch: null },
});
try {
const { client, ssr } = server.environments;
const before = await client.transformRequest('virtual:void-islands-client');
expect(before?.code).toContain('components/Counter');
expect(before?.code).not.toContain('components/Second');

cpSync(join(root, 'components/Counter.vue'), join(root, 'components/Second.vue'));
writeFileSync(
join(pages, 'index.island.vue'),
`<script setup>
import Counter from "../components/Counter.vue" with { island: "load" };
import Second from "../components/Second.vue" with { island: "load" };
</script>
<template><Counter /><Second /></template>
`,
);
// Rendering the edited page registers the new island.
await ssr.transformRequest('/pages/index.island.vue');

const after = await client.transformRequest('virtual:void-islands-client');
expect(after?.code).toContain('components/Second');
} finally {
await server.close();
rmSync(root, { recursive: true, force: true });
}
});
Loading