Skip to content

fix: align esX browserslist expression to caniuse #1280

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 21, 2025
Merged

fix: align esX browserslist expression to caniuse #1280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
113 changes: 52 additions & 61 deletions packages/core/src/utils/syntax.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@ const RSPACK_TARGET_UNLISTED_MODERN_ECMA_VERSIONS: EcmaScriptVersion[] = [
] satisfies EcmaScriptVersion[];

/**
* The esX to browserslist mapping is transformed from esbuild:
* https://github.com/evanw/esbuild/blob/main/internal/compat/js_table.go
* It does not completely align with the browserslist query of Rsbuild now:
* The esX to browserslist mapping is transformed from
* https://github.com/rspack-contrib/browserslist-to-es-version
* TODO: align with Rsbuild, we may should align with SWC
*/
export const ESX_TO_BROWSERSLIST: Record<
FixedEcmaVersions,
Expand All @@ -63,90 +60,84 @@ export const ESX_TO_BROWSERSLIST: Record<
safari: '3.1.0',
},
es6: {
chrome: '63.0.0',
edge: '79.0.0',
firefox: '67.0.0',
ios: '13.0.0',
node: '13.2.0',
opera: '50.0.0',
safari: '13.0.0',
chrome: '51.0.0',
edge: '15.0.0',
firefox: '54.0.0',
safari: '10.0.0',
opera: '38.0.0',
samsung: '5.0.0',
},
es2015: {
chrome: '63.0.0',
edge: '79.0.0',
firefox: '67.0.0',
ios: '13.0.0',
node: '13.2.0',
opera: '50.0.0',
safari: '13.0.0',
chrome: '51.0.0',
edge: '15.0.0',
firefox: '54.0.0',
safari: '10.0.0',
opera: '38.0.0',
samsung: '5.0.0',
},
es2016: {
chrome: '63.0.0',
edge: '79.0.0',
firefox: '67.0.0',
ios: '13.0.0',
node: '13.2.0',
opera: '50.0.0',
safari: '13.0.0',
chrome: '52.0.0',
edge: '15.0.0',
firefox: '54.0.0',
safari: '10.3.0',
opera: '39.0.0',
samsung: '6.2.0',
},
es2017: {
chrome: '63.0.0',
edge: '79.0.0',
firefox: '67.0.0',
ios: '13.0.0',
node: '13.2.0',
opera: '50.0.0',
safari: '13.0.0',
chrome: '57.0.0',
edge: '15.0.0',
firefox: '54.0.0',
safari: '11.0.0',
opera: '44.0.0',
samsung: '6.2.0',
},
es2018: {
chrome: '64.0.0',
edge: '79.0.0',
firefox: '78.0.0',
ios: '16.4.0',
node: '13.2.0',
opera: '51.0.0',
safari: '16.4.0',
opera: '51.0.0',
samsung: '8.2.0',
},
es2019: {
chrome: '66.0.0',
chrome: '73.0.0',
edge: '79.0.0',
firefox: '78.0.0',
ios: '16.4.0',
node: '13.2.0',
opera: '53.0.0',
safari: '16.4.0',
safari: '17.0.0',
opera: '60.0.0',
samsung: '11.1.0',
},
es2020: {
chrome: '91.0.0',
edge: '91.0.0',
chrome: '80.0.0',
edge: '80.0.0',
firefox: '80.0.0',
ios: '16.4.0',
node: '16.1.0',
opera: '77.0.0',
safari: '16.4.0',
safari: '17.0.0',
opera: '67.0.0',
samsung: '13.0.0',
},
es2021: {
chrome: '91.0.0',
edge: '91.0.0',
chrome: '85.0.0',
edge: '85.0.0',
firefox: '80.0.0',
ios: '16.4.0',
node: '16.1.0',
opera: '77.0.0',
safari: '16.4.0',
safari: '17.0.0',
opera: '71.0.0',
samsung: '14.0.0',
},
es2022: {
chrome: '91.0.0',
chrome: '94.0.0',
edge: '94.0.0',
firefox: '93.0.0',
ios: '16.4.0',
node: '16.11.0',
safari: '16.4.0',
safari: '17.0.0',
opera: '80.0.0',
samsung: '17.0.0',
},
es2023: {
chrome: '91.0.0',
firefox: '93.0.0',
ios: '16.4.0',
node: '16.11.0',
safari: '16.4.0',
chrome: '110.0.0',
edge: '110.0.0',
firefox: '115.0.0',
safari: '17.0.0',
opera: '96.0.0',
samsung: '21.0.0',
},
es2024: calcEsnextBrowserslistByTarget,
esnext: calcEsnextBrowserslistByTarget,
Expand Down
13 changes: 6 additions & 7 deletions packages/core/tests/config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,13 +419,12 @@ describe('syntax', () => {
composedRsbuildConfig[0]!.config.output?.overrideBrowserslist,
).toMatchInlineSnapshot(`
[
"chrome >= 63.0.0",
"edge >= 79.0.0",
"firefox >= 67.0.0",
"ios >= 13.0.0",
"node >= 13.2.0",
"opera >= 50.0.0",
"safari >= 13.0.0",
"chrome >= 51.0.0",
"edge >= 15.0.0",
"firefox >= 54.0.0",
"safari >= 10.0.0",
"opera >= 38.0.0",
"samsung >= 5.0.0",
]
`);
});
Expand Down
18 changes: 8 additions & 10 deletions packages/core/tests/syntax.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,12 @@ describe('transformSyntaxToBrowserslist', () => {
transformSyntaxToBrowserslist('es2015', 'web'),
).toMatchInlineSnapshot(`
[
"chrome >= 63.0.0",
"edge >= 79.0.0",
"firefox >= 67.0.0",
"ios >= 13.0.0",
"node >= 13.2.0",
"opera >= 50.0.0",
"safari >= 13.0.0",
"chrome >= 51.0.0",
"edge >= 15.0.0",
"firefox >= 54.0.0",
"safari >= 10.0.0",
"opera >= 38.0.0",
"samsung >= 5.0.0",
]
`);

Expand All @@ -91,10 +90,9 @@ describe('transformSyntaxToBrowserslist', () => {
"chrome >= 64.0.0",
"edge >= 79.0.0",
"firefox >= 78.0.0",
"ios >= 16.4.0",
"node >= 13.2.0",
"opera >= 51.0.0",
"safari >= 16.4.0",
"opera >= 51.0.0",
"samsung >= 8.2.0",
]
`);

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/cli/build/build.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ describe('build command', async () => {
const files = await globContentJSON(path.join(fixturePath, 'dist'));
expect(files).toMatchInlineSnapshot(`
{
"<ROOT>/tests/integration/cli/build/no-config/dist/a/index.js": "const withoutConfig = 1000;
"<ROOT>/tests/integration/cli/build/no-config/dist/a/index.js": "var withoutConfig = 1000;
export { withoutConfig };
",
}
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/syntax/__fixtures__/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ export class Foo {
}

export function foo(options: unknown = {}): void {
console.log(options);
const a = {};
const b = { ...a, b: 1 };
console.log(options, b);
}
64 changes: 60 additions & 4 deletions tests/integration/syntax/__snapshots__/index.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ exports[`should downgrade class private method by default 1`] = `
#bar() {}
}
function foo(options = {}) {
console.log(options);
const a = {};
const b = {
...a,
b: 1
};
console.log(options, b);
}
export { Foo, foo };
"
Expand All @@ -26,6 +31,48 @@ function _class_private_method_init(obj, privateSet) {
_check_private_redeclaration(obj, privateSet);
privateSet.add(obj);
}
function _define_property(obj, key, value) {
if (key in obj) Object.defineProperty(obj, key, {
value: value,
enumerable: true,
configurable: true,
writable: true
});
else obj[key] = value;
return obj;
}
function _object_spread(target) {
for(var i = 1; i < arguments.length; i++){
var source = null != arguments[i] ? arguments[i] : {};
var ownKeys = Object.keys(source);
if ("function" == typeof Object.getOwnPropertySymbols) ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
}));
ownKeys.forEach(function(key) {
_define_property(target, key, source[key]);
});
}
return target;
}
function src_ownKeys(object, enumerableOnly) {
var keys = Object.keys(object);
if (Object.getOwnPropertySymbols) {
var symbols = Object.getOwnPropertySymbols(object);
if (enumerableOnly) symbols = symbols.filter(function(sym) {
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
});
keys.push.apply(keys, symbols);
}
return keys;
}
function _object_spread_props(target, source) {
source = null != source ? source : {};
if (Object.getOwnPropertyDescriptors) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
else src_ownKeys(Object(source)).forEach(function(key) {
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
});
return target;
}
var _bar = /*#__PURE__*/ new WeakSet();
class Foo {
constructor(){
Expand All @@ -35,8 +82,12 @@ class Foo {
}
function bar() {}
function foo() {
let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
console.log(options);
var options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
var a = {};
var b = _object_spread_props(_object_spread({}, a), {
b: 1
});
console.log(options, b);
}
export { Foo, foo };
"
Expand All @@ -50,7 +101,12 @@ exports[`should downgrade class private method with output.syntax config 2`] = `
#bar() {}
}
function foo(options = {}) {
console.log(options);
const a = {};
const b = {
...a,
b: 1
};
console.log(options, b);
}
export { Foo, foo };
"
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/syntax/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ test('should downgrade class private method with output.syntax config', async ()

expect(entries.esm0).toMatchSnapshot();
expect(entries.esm0).not.toContain('#bar');
expect(entries.esm0).not.toContain('...a');

expect(entries.esm1).toMatchSnapshot();
expect(entries.esm1).toContain('#bar');
expect(entries.esm1).toContain('...a');

expect(entries.cjs0).toContain('#bar');
expect(entries.cjs0).toContain('()=>{'); // test webpack runtime arrow function
Expand Down
Loading