Skip to content
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
32 changes: 15 additions & 17 deletions e2e/cases/lazy-compilation/add-initial-chunk/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
import { dev } from '@e2e/helper';
import { dev, rspackOnlyTest } from '@e2e/helper';
import { expect, test } from '@playwright/test';

// https://github.com/web-infra-dev/rspack/issues/6633
// TODO: failed to run this case after updating playwright
// https://github.com/web-infra-dev/rsbuild/pull/4331
test.skip('should render pages correctly when using lazy compilation and add new initial chunk', async ({
page,
}) => {
// TODO fix this case on Windows
if (process.platform === 'win32') {
test.skip();
}
rspackOnlyTest(
'should render pages correctly when using lazy compilation and add new initial chunk',
async ({ page }) => {
if (process.platform === 'win32') {
test.skip();
}

const rsbuild = await dev({
cwd: __dirname,
page,
});
const rsbuild = await dev({
cwd: __dirname,
page,
});

await expect(page.locator('#test')).toHaveText('Hello World!');
await rsbuild.close();
});
await expect(page.locator('#test')).toHaveText('Hello World!');
await rsbuild.close();
},
);
54 changes: 26 additions & 28 deletions e2e/cases/lazy-compilation/basic/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
import { dev, expectPoll, gotoPage } from '@e2e/helper';
import { dev, expectPoll, gotoPage, rspackOnlyTest } from '@e2e/helper';
import { expect, test } from '@playwright/test';

// TODO: failed to run this case after updating playwright
// https://github.com/web-infra-dev/rsbuild/pull/4331
test.skip('should render pages correctly when using lazy compilation', async ({
page,
}) => {
// TODO fix this case on Windows
if (process.platform === 'win32') {
test.skip();
}
rspackOnlyTest(
'should render pages correctly when using lazy compilation',
async ({ page }) => {
if (process.platform === 'win32') {
test.skip();
}

const rsbuild = await dev({
cwd: __dirname,
});
const rsbuild = await dev({
cwd: __dirname,
});

await gotoPage(page, rsbuild, 'page1');
await expect(page.locator('#test')).toHaveText('Page 1');
await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('building src/page1/index.js')),
).toBeTruthy();
expect(
rsbuild.logs.some((log) => log.includes('building src/page2/index.js')),
).toBeFalsy();
await gotoPage(page, rsbuild, 'page1');
await expect(page.locator('#test')).toHaveText('Page 1');
await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('building src/page1/index.js')),
).toBeTruthy();
expect(
rsbuild.logs.some((log) => log.includes('building src/page2/index.js')),
).toBeFalsy();

await gotoPage(page, rsbuild, 'page2');
await expect(page.locator('#test')).toHaveText('Page 2');
await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('building src/page2/index.js')),
).toBeTruthy();
await gotoPage(page, rsbuild, 'page2');
await expect(page.locator('#test')).toHaveText('Page 2');
await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('building src/page2/index.js')),
).toBeTruthy();

await rsbuild.close();
});
await rsbuild.close();
},
);
46 changes: 23 additions & 23 deletions e2e/cases/lazy-compilation/dynamic-import/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
import { dev, expectPoll, gotoPage } from '@e2e/helper';
import { dev, expectPoll, gotoPage, rspackOnlyTest } from '@e2e/helper';
import { expect, test } from '@playwright/test';

// TODO: failed to run this case after updating playwright
// https://github.com/web-infra-dev/rsbuild/pull/4331
test.skip('should lazy compile dynamic imported modules', async ({ page }) => {
// TODO fix this case on Windows
if (process.platform === 'win32') {
test.skip();
}
rspackOnlyTest(
'should lazy compile dynamic imported modules',
async ({ page }) => {
if (process.platform === 'win32') {
test.skip();
}

const rsbuild = await dev({
cwd: __dirname,
});
const rsbuild = await dev({
cwd: __dirname,
});

await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('built in ')),
).toBeTruthy();
expect(
rsbuild.logs.some((log) => log.includes('building src/foo.js')),
).toBeFalsy();
await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('built in ')),
).toBeTruthy();
expect(
rsbuild.logs.some((log) => log.includes('building src/foo.js')),
).toBeFalsy();

await gotoPage(page, rsbuild, 'index');
await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('building src/foo.js')),
).toBeTruthy();
await gotoPage(page, rsbuild, 'index');
await expectPoll(() =>
rsbuild.logs.some((log) => log.includes('building src/foo.js')),
).toBeTruthy();

await rsbuild.close();
});
await rsbuild.close();
},
);
4 changes: 1 addition & 3 deletions e2e/cases/lazy-compilation/port-placeholder/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { dev, expectPoll, gotoPage } from '@e2e/helper';
import { expect, test } from '@playwright/test';

// TODO: failed to run this case after updating playwright
// https://github.com/web-infra-dev/rsbuild/pull/4331
// TODO: fixme
test.skip('should replace port placeholder with actual port', async ({
page,
}) => {
// TODO fix this case on Windows
if (process.platform === 'win32') {
test.skip();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"postcss-loader": "8.1.1",
"prebundle": "1.3.3",
"reduce-configs": "^1.1.0",
"rsbuild-dev-middleware": "0.2.0",
"rsbuild-dev-middleware": "0.3.0",
"rslog": "^1.2.7",
"rspack-chain": "^1.2.6",
"rspack-manifest-plugin": "5.0.3",
Expand Down
8 changes: 8 additions & 0 deletions packages/core/src/server/compilationManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ export class CompilationManager {
: compiler.outputFileSystem) || fs;
}

/**
* Call `compiler.watch()` to start compiling.
*/
public watch(): void {
this.middleware.watch();
}

public async close(): Promise<void> {
// socketServer close should before app close
await this.socketServer.close();
Expand Down Expand Up @@ -213,6 +220,7 @@ export class CompilationManager {
};

wrapper.close = middleware.close;
wrapper.watch = middleware.watch;

// wrap rsbuild-dev-middleware to handle HTML file(without publicPath)
// maybe we should serve HTML file by sirv
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/server/compilationMiddleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export type CompilationMiddlewareOptions = {

export type CompilationMiddleware = Middleware & {
close: (callback: (err: Error | null | undefined) => void) => any;
watch: () => void;
};

/**
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/server/devServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,9 @@ export async function createDevServer<
}
}

// start watching
compilationManager?.watch();

logger.debug('create dev server done');

return devServerAPI;
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading