Skip to content

Commit 4f19e98

Browse files
authored
chore: rename serviceWorker environment name to workerSSR (#6210)
1 parent 8247b7d commit 4f19e98

File tree

9 files changed

+20
-14
lines changed

9 files changed

+20
-14
lines changed

.changeset/hot-jobs-occur.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@modern-js/app-tools': patch
3+
'@modern-js/uni-builder': patch
4+
---
5+
6+
chore: rename serviceWorker environment name to workerSSR

packages/cli/uni-builder/src/shared/plugins/environmentDefaults.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const pluginEnvironmentDefaults = (
5858
// https://github.com/web-infra-dev/rsbuild/issues/2956
5959
api.modifyRsbuildConfig({
6060
handler: config => {
61-
const environmentNameOrder = ['web', 'node', 'serviceWorker'];
61+
const environmentNameOrder = ['web', 'node', 'workerSSR'];
6262

6363
config.environments = Object.fromEntries(
6464
Object.entries(config.environments!).sort((a1, a2) =>

packages/cli/uni-builder/src/shared/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import browserslist from 'browserslist';
88

99
export const RUNTIME_CHUNK_NAME = 'builder-runtime';
1010

11-
export const SERVICE_WORKER_ENVIRONMENT_NAME = 'serviceWorker';
11+
export const SERVICE_WORKER_ENVIRONMENT_NAME = 'workerSSR';
1212

1313
export const JS_REGEX = /\.(?:js|mjs|cjs|jsx)$/;
1414

packages/cli/uni-builder/tests/__snapshots__/default.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3303,7 +3303,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when serv
33033303
},
33043304
],
33053305
},
3306-
"name": "serviceWorker",
3306+
"name": "workerSSR",
33073307
"optimization": {
33083308
"minimize": true,
33093309
"minimizer": [
@@ -3374,7 +3374,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when serv
33743374
ProgressPlugin {
33753375
"_args": [
33763376
{
3377-
"prefix": "serviceWorker",
3377+
"prefix": "workerSSR",
33783378
},
33793379
],
33803380
"affectedHooks": undefined,

packages/cli/uni-builder/tests/__snapshots__/environment.test.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2233,7 +2233,7 @@ exports[`uni-builder environment compat > should generator environment config co
22332233
},
22342234
],
22352235
},
2236-
"name": "serviceWorker",
2236+
"name": "workerSSR",
22372237
"optimization": {
22382238
"minimize": false,
22392239
"splitChunks": false,
@@ -2269,7 +2269,7 @@ exports[`uni-builder environment compat > should generator environment config co
22692269
ProgressPlugin {
22702270
"_args": [
22712271
{
2272-
"prefix": "serviceWorker",
2272+
"prefix": "workerSSR",
22732273
},
22742274
],
22752275
"affectedHooks": undefined,

packages/cli/uni-builder/tests/default.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe('uni-builder rspack', () => {
7777
bundlerType: 'rspack',
7878
config: {
7979
environments: {
80-
serviceWorker: {
80+
workerSSR: {
8181
output: {
8282
target: 'web-worker',
8383
},

packages/cli/uni-builder/tests/environment.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('uni-builder environment compat', () => {
1616
target: 'node',
1717
},
1818
},
19-
serviceWorker: {
19+
workerSSR: {
2020
output: {
2121
target: 'web-worker',
2222
},
@@ -33,7 +33,7 @@ describe('uni-builder environment compat', () => {
3333
expect(bundlerConfigs.map(c => c.name)).toEqual([
3434
'web',
3535
'node',
36-
'serviceWorker',
36+
'workerSSR',
3737
]);
3838

3939
expect(bundlerConfigs).toMatchSnapshot();

packages/runtime/plugin-runtime/src/cli/ssr/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const ssrBuilderPlugin = (modernAPI: PluginAPI<AppTools>): RsbuildPlugin => ({
4848
setup(api) {
4949
api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig }) => {
5050
const isServerEnvironment =
51-
config.output.target === 'node' || name === 'serviceWorker';
51+
config.output.target === 'node' || name === 'workerSSR';
5252
const userConfig = modernAPI.useResolvedConfigContext();
5353

5454
const useLoadablePlugin =

packages/solutions/app-tools/tests/builder/__snapshots__/index.test.ts.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ exports[`create builder Options test create builder environments config 2`] = `
6060

6161
exports[`create builder Options test create builder environments config 3`] = `
6262
{
63-
"serviceWorker": {
63+
"web": {
6464
"output": {
65-
"target": "web-worker",
65+
"target": "web",
6666
},
6767
"source": {
6868
"entry": {
@@ -76,9 +76,9 @@ exports[`create builder Options test create builder environments config 3`] = `
7676
},
7777
},
7878
},
79-
"web": {
79+
"workerSSR": {
8080
"output": {
81-
"target": "web",
81+
"target": "web-worker",
8282
},
8383
"source": {
8484
"entry": {

0 commit comments

Comments
 (0)