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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## Added
- Add rspack dev server support. #TINY-12824

## 15.0.4 - 2025-10-22

## Changed
Expand Down
10 changes: 9 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
standardProperties()

timestamps {
tinyPods.node(tag: '20') {
tinyPods.node(
tag: '20',
resourceRequestMemory: '2Gi',
resourceLimitMemory: '2Gi'
) {
stage("clean") {
exec('yarn clean')
}
Expand All @@ -27,6 +31,10 @@ timestamps {
// Testing
stage("bedrock testing") {
bedrockRemoteBrowsers(
testContainer: [
resourceRequestMemory: '2Gi',
resourceLimitMemory: '2Gi',
],
platforms: [
[ browser: 'chrome', provider: 'aws', buckets: 2 ],
[ browser: 'firefox', provider: 'aws', buckets: 2 ],
Expand Down
5 changes: 3 additions & 2 deletions modules/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
"@ephox/bedrock-runner": "^15.0.2",
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
"@lambdatest/node-tunnel": "^4.0.4",
"@rspack/core": "^1.5.2",
"@rspack/dev-server": "^1.1.4",
"@wdio/globals": "^8.14.1",
"async": "^3.0.0",
"chalk": "^4.1.1",
Expand All @@ -44,11 +46,10 @@
"mkdirp": "^1.0.0",
"portfinder": "^1.0.25",
"recursive-readdir-sync": "^1.0.6",
"rollup": "^2.0.0",
"rollup-plugin-typescript2": "^0.24.0",
"serve-static": "^1.10.2",
"source-map-loader": "^3.0.0",
"split2": "^4.2.0",
"ts-checker-rspack-plugin": "^1.1.5",
"ts-loader": "^9.0.0",
"tsconfig-paths-webpack-plugin": "^3.2.0",
"webdriverio": "^8.0.0",
Expand Down
9 changes: 6 additions & 3 deletions modules/server/src/main/ts/BedrockManual.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import { Attempt } from './bedrock/core/Attempt';
import * as Version from './bedrock/core/Version';
import * as RunnerRoutes from './bedrock/server/RunnerRoutes';
import * as Webpack from './bedrock/compiler/Webpack';
import * as Rspack from './bedrock/compiler/Rspack';
import { BedrockManualSettings } from './bedrock/core/Settings';
import { ExitCodes } from './bedrock/util/ExitCodes';
import * as SettingsResolver from './bedrock/core/SettingsResolver';
import { DevServerServeSettings } from './bedrock/compiler/Types';

export const go = (bedrockManualSettings: BedrockManualSettings): void => {
console.log('bedrock-manual ' + Version.get() + ' starting...');
Expand All @@ -14,7 +16,7 @@ export const go = (bedrockManualSettings: BedrockManualSettings): void => {
const routes = RunnerRoutes.generate('manual', settings.projectdir, settings.basedir, settings.config, settings.bundler, settings.testfiles, settings.chunk, 0, settings.singleTimeout, true, basePage, settings.coverage, settings.polyfills);

routes.then(async (runner) => {
const serveSettings: Webpack.WebpackServeSettings = {
const serveSettings: DevServerServeSettings = {
...settings,
// There is no driver for manual mode.
driver: Attempt.failed('There is no webdriver for manual mode'),
Expand All @@ -23,11 +25,12 @@ export const go = (bedrockManualSettings: BedrockManualSettings): void => {
// sticky session is used by auto mode only
stickyFirstSession: false,
// reset mouse position will never work on manual
skipResetMousePosition: true
skipResetMousePosition: true,
};

try {
const service = await Webpack.devserver(serveSettings);
const devServer = settings.bundler === 'rspack' ? Rspack.devserver : Webpack.devserver;
Comment thread
shanmen-tiny marked this conversation as resolved.
const service = await devServer(serveSettings);
service.enableHud();
console.log('bedrock-manual ' + Version.get() + ' available at: http://localhost:' + service.port);
} catch (err) {
Expand Down
4 changes: 2 additions & 2 deletions modules/server/src/main/ts/bedrock/cli/ClOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ export const bundler: ClOption = {
type: String,
required: false,
defaultValue: 'webpack',
description: 'DISABLED: The name bundler to use webpack/rollup (forced webpack in this build)',
description: 'Specify the bundler (webpack, rspack).',
validate: Extraction.inSet([
'webpack',
'rollup'
'rspack'
])
};

Expand Down
10 changes: 8 additions & 2 deletions modules/server/src/main/ts/bedrock/compiler/Compiler.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
import * as fs from 'fs';
import * as Webpack from '../compiler/Webpack';
import * as Rspack from '../compiler/Rspack';

export interface Compiler {
readonly generate: () => Promise<Buffer | string>;
}

export const compile = (tsConfigFile: string, scratchDir: string, basedir: string, exitOnCompileError: boolean, files: string[], coverage: string[], polyfills: string[]): Compiler => {
export const compile = (bundler: 'webpack' | 'rspack', tsConfigFile: string, scratchDir: string, basedir: string, exitOnCompileError: boolean, files: string[], coverage: string[], polyfills: string[]): Compiler => {
const getCompileFunc = () => {
return Webpack.compile;
switch (bundler) {
case 'rspack':
return Rspack.compile;
case 'webpack':
return Webpack.compile;
}
};

const generate = async (): Promise<Buffer | string> => {
Expand Down
72 changes: 0 additions & 72 deletions modules/server/src/main/ts/bedrock/compiler/Rollup.ts

This file was deleted.

Loading
Loading