Skip to content
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

fix: request full-reload only when file-routes.json is added/changed #2289

Merged
merged 2 commits into from
Apr 3, 2024
Merged
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
9 changes: 6 additions & 3 deletions packages/ts/file-router/src/vite-plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,15 @@ export default function vitePluginFileSystemRouter({

const changeListener = (file: string): void => {
if (!file.startsWith(dir)) {
if (file === fileURLToPath(runtimeUrls.json)) {
server.hot.send({ type: 'full-reload' });
}
return;
}

generateRuntimeFiles(_viewsDir, runtimeUrls, extensions, _logger)
.then(() => server.hot.send({ type: 'full-reload' }))
.catch((e: unknown) => _logger.error(String(e)));
generateRuntimeFiles(_viewsDir, runtimeUrls, extensions, _logger).catch((e: unknown) =>
_logger.error(String(e)),
);
};

server.watcher.on('add', changeListener);
Expand Down
59 changes: 59 additions & 0 deletions packages/ts/file-router/test/vite-plugin/vite-plugin.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import { EventEmitter } from 'node:events';
import { fileURLToPath, pathToFileURL } from 'node:url';
import { expect, use } from '@esm-bundle/chai';
import chaiAsPromised from 'chai-as-promised';
import sinon from 'sinon';
import sinonChai from 'sinon-chai';
import vitePluginFileSystemRouter from '../../src/vite-plugin';

use(chaiAsPromised);
use(sinonChai);

describe('@vaadin/hilla-file-router', () => {
describe('vite-plugin', () => {
const rootDir = pathToFileURL('/path/to/project/');
const outDir = new URL('dist/', rootDir);
const viewsDir = new URL('frontend/views/', rootDir);
const generatedDir = new URL('frontend/generated/', rootDir);
const watcher = new EventEmitter();
const mockServer = {
hot: {
send: sinon.spy(),
},
watcher,
};
const plugin = vitePluginFileSystemRouter({ isDevMode: true });
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error: the configResolved method could be either a function or an object.
plugin.configResolved({
logger: { info: sinon.spy() },
root: fileURLToPath(rootDir),
build: { outDir: fileURLToPath(outDir) },
});
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error: the configResolved method could be either a function or an object.
plugin.configureServer(mockServer);

beforeEach(() => {
sinon.resetHistory();
});

it('should send full-reload only when file-routes.json is added', () => {
expect(mockServer.hot.send).to.not.be.called;
mockServer.watcher.emit('add', fileURLToPath(new URL('file-routes.json', generatedDir)));
expect(mockServer.hot.send).to.be.calledWith({ type: 'full-reload' });
});

it('should send full-reload only when file-routes.json changes', () => {
expect(mockServer.hot.send).to.not.be.called;
mockServer.watcher.emit('change', fileURLToPath(new URL('file-routes.json', generatedDir)));
expect(mockServer.hot.send).to.be.calledWith({ type: 'full-reload' });
});

it('should not send full-reload when other files change', () => {
expect(mockServer.hot.send).to.not.be.called;
mockServer.watcher.emit('change', fileURLToPath(new URL('file.tsx', viewsDir)));
expect(mockServer.hot.send).to.not.be.called;
});
});
});
Loading