Skip to content

Commit eac6954

Browse files
authored
fix: should remain process.env.NODE_ENV as is by default (#174)
1 parent ccd5299 commit eac6954

File tree

7 files changed

+63
-11
lines changed

7 files changed

+63
-11
lines changed

e2e/cases/auto-external/index.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ test('auto external false should works', async () => {
5454

5555
// dts should bundled
5656
expect(dts.entries.esm).toContain('export declare function oraPromise');
57-
5857
expect(dts.entries.cjs).toContain('export declare function oraPromise');
5958
});
6059

e2e/cases/define/index.test.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,15 @@ test('source.define', async () => {
55
const fixturePath = __dirname;
66
const { entries } = await buildAndGetResults(fixturePath);
77

8-
expect(entries.esm).not.toContain('console.info(VERSION)');
9-
expect(entries.esm).toContain('1.0.0');
8+
expect(entries.esm0).not.toContain('console.info(VERSION)');
9+
expect(entries.esm0).toContain('console.info("1.0.0")');
10+
expect(entries.esm0).toContain('console.info(process.env.NODE_ENV)');
11+
12+
expect(entries.esm1).not.toContain('console.info(VERSION)');
13+
expect(entries.esm1).toContain('console.info("1.0.0")');
14+
expect(entries.esm1).toContain('console.info(process.ENV.MY_CUSTOM_ENV)');
1015

1116
expect(entries.cjs).not.toContain('console.info(VERSION)');
12-
expect(entries.cjs).toContain('1.0.0');
17+
expect(entries.cjs).toContain('console.info("1.0.0")');
18+
expect(entries.cjs).toContain('console.info(process.env.NODE_ENV)');
1319
});

e2e/cases/define/rslib.config.ts

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,48 @@ import { generateBundleCjsConfig, generateBundleEsmConfig } from '@e2e/helper';
22
import { defineConfig } from '@rslib/core';
33

44
export default defineConfig({
5-
lib: [generateBundleEsmConfig(), generateBundleCjsConfig()],
5+
lib: [
6+
generateBundleEsmConfig({
7+
source: {
8+
define: {
9+
VERSION: JSON.stringify('1.0.0'),
10+
},
11+
},
12+
output: {
13+
distPath: {
14+
root: './dist/esm/0',
15+
},
16+
},
17+
}),
18+
generateBundleEsmConfig({
19+
source: {
20+
define: {
21+
VERSION: JSON.stringify('1.0.0'),
22+
'process.env.NODE_ENV': 'process.ENV.MY_CUSTOM_ENV',
23+
},
24+
},
25+
output: {
26+
distPath: {
27+
root: './dist/esm/1',
28+
},
29+
},
30+
}),
31+
generateBundleCjsConfig({
32+
source: {
33+
define: {
34+
VERSION: JSON.stringify('1.0.0'),
35+
},
36+
},
37+
output: {
38+
distPath: {
39+
root: './dist/cjs/0',
40+
},
41+
},
42+
}),
43+
],
644
source: {
745
entry: {
846
index: './src/index.ts',
947
},
10-
define: {
11-
VERSION: JSON.stringify('1.0.0'),
12-
},
1348
},
1449
});

e2e/cases/define/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
console.info(VERSION);
2+
console.info(process.env.NODE_ENV); // Should remain as is.

e2e/scripts/shared.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,16 @@ export async function getResults(
111111
}
112112

113113
// Only applied in bundle mode, a shortcut to get single entry result
114-
if (libConfig.bundle !== false && fileSet.length === 1) {
115-
entries[key] = content[fileSet[0]!]!;
116-
entryFiles[key] = fileSet[0]!;
114+
if (libConfig.bundle !== false && fileSet.length) {
115+
let entryFile = '';
116+
if (fileSet.length === 1) {
117+
entryFile = fileSet[0]!;
118+
} else {
119+
entryFile = fileSet.find((file) => file.includes('index'))!;
120+
}
121+
122+
entries[key] = content[entryFile]!;
123+
entryFiles[key] = entryFile;
117124
}
118125
}
119126

packages/core/src/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ export async function createConstantRsbuildConfig(): Promise<RsbuildConfig> {
297297
rspack: {
298298
optimization: {
299299
moduleIds: 'named',
300+
nodeEnv: false,
300301
},
301302
experiments: {
302303
rspackFuture: {

packages/core/tests/__snapshots__/config.test.ts.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
6969
},
7070
"optimization": {
7171
"moduleIds": "named",
72+
"nodeEnv": false,
7273
},
7374
"resolve": {
7475
"extensionAlias": {
@@ -210,6 +211,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
210211
},
211212
"optimization": {
212213
"moduleIds": "named",
214+
"nodeEnv": false,
213215
},
214216
"resolve": {
215217
"extensionAlias": {
@@ -334,6 +336,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
334336
},
335337
"optimization": {
336338
"moduleIds": "named",
339+
"nodeEnv": false,
337340
},
338341
"resolve": {
339342
"extensionAlias": {

0 commit comments

Comments
 (0)