chore(deps): switch to browserslist-to-es-version (#2763)

web-infra-dev · Jul 2, 2024 · e0a1f8d · e0a1f8d
1 parent bb2a11d
commit e0a1f8d
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 170 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -64,6 +64,7 @@
     "@types/node": "18.x",
     "@types/on-finished": "2.3.4",
     "@types/ws": "^8.5.10",
+    "browserslist-to-es-version": "^1.0.0",
     "commander": "^12.1.0",
     "connect": "3.7.0",
     "connect-history-api-fallback": "^2.0.0",

diff --git a/packages/core/src/plugins/target.ts b/packages/core/src/plugins/target.ts
@@ -1,4 +1,4 @@
-import { browserslistToESVersion } from '@rsbuild/shared';
+import * as toESVersion from 'browserslist-to-es-version';
 import type { RsbuildPlugin } from '../types';
 
 export const pluginTarget = (): RsbuildPlugin => ({
@@ -14,7 +14,7 @@ export const pluginTarget = (): RsbuildPlugin => ({
         }
 
         const { browserslist } = environment;
-        const esVersion = browserslistToESVersion(browserslist);
+        const esVersion = toESVersion.browserslistToESVersion(browserslist);
 
         if (target === 'web-worker') {
           chain.target(['webworker', `es${esVersion}`]);

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -25,6 +25,7 @@
       "rspack-manifest-plugin": ["./compiled/rspack-manifest-plugin"],
       "webpack-dev-middleware": ["./compiled/webpack-dev-middleware"],
       "launch-editor-middleware": ["./compiled/launch-editor-middleware"],
+      "browserslist-to-es-version": ["./compiled/browserslist-to-es-version"],
       "connect-history-api-fallback": [
         "./compiled/connect-history-api-fallback"
       ]

diff --git a/packages/plugin-check-syntax/package.json b/packages/plugin-check-syntax/package.json
@@ -29,6 +29,7 @@
   "dependencies": {
     "@rsbuild/shared": "workspace:*",
     "acorn": "^8.12.0",
+    "browserslist-to-es-version": "^1.0.0",
     "htmlparser2": "9.1.0",
     "source-map": "^0.7.4"
   },

diff --git a/packages/plugin-check-syntax/src/CheckSyntaxPlugin.ts b/packages/plugin-check-syntax/src/CheckSyntaxPlugin.ts
@@ -1,8 +1,8 @@
 import fs from 'node:fs';
 import { resolve } from 'node:path';
 import type { Rspack } from '@rsbuild/core';
-import { browserslistToESVersion } from '@rsbuild/shared';
 import { parse } from 'acorn';
+import { browserslistToESVersion } from 'browserslist-to-es-version';
 import {
   checkIsExcludeSource,
   generateError,

diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
@@ -1,4 +1,3 @@
-import browserslist from '../compiled/browserslist/index.js';
 import deepmerge from '../compiled/deepmerge/index.js';
 import color from '../compiled/picocolors/index.js';
 import RspackChain from '../compiled/rspack-chain/index.js';
@@ -9,77 +8,6 @@ export * from './types';
 // RegExp
 export const SCRIPT_REGEX: RegExp = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/;
 
-enum ESVersion {
-  es5 = 5,
-  es2015 = 2015,
-  es2016 = 2016,
-  es2017 = 2017,
-  es2018 = 2018,
-}
-
-// the minimal version for [es2015, es2016, es2017, es2018]
-const ES_VERSIONS_MAP: Record<string, number[]> = {
-  chrome: [51, 52, 57, 64],
-  edge: [15, 15, 15, 79],
-  safari: [10, 10.3, 11, 16.4],
-  firefox: [54, 54, 54, 78],
-  opera: [38, 39, 44, 51],
-  samsung: [5, 6.2, 6.2, 8.2],
-};
-
-const renameBrowser = (name: string) => {
-  return name === 'ios_saf' ? 'safari' : name;
-};
-
-export function browserslistToESVersion(browsers: string[]): ESVersion {
-  const projectBrowsers = browserslist(browsers, {
-    ignoreUnknownVersions: true,
-  });
-
-  let esVersion: ESVersion = ESVersion.es2018;
-
-  for (const item of projectBrowsers) {
-    const pairs = item.split(' ');
-
-    // skip invalid item
-    if (pairs.length < 2) {
-      continue;
-    }
-
-    const browser = renameBrowser(pairs[0]);
-    const version = Number(pairs[1].split('-')[0]);
-
-    // ignore unknown version
-    if (Number.isNaN(version)) {
-      continue;
-    }
-
-    // IE / Android 4.x ~ 5.x only supports es5
-    if (browser === 'ie' || (browser === 'android' && version < 6)) {
-      esVersion = ESVersion.es5;
-      break;
-    }
-
-    // skip unknown browsers
-    const versions = ES_VERSIONS_MAP[browser];
-    if (!versions) {
-      continue;
-    }
-
-    if (version < versions[0]) {
-      esVersion = Math.min(ESVersion.es5, esVersion);
-    } else if (version < versions[1]) {
-      esVersion = Math.min(ESVersion.es2015, esVersion);
-    } else if (version < versions[2]) {
-      esVersion = Math.min(ESVersion.es2016, esVersion);
-    } else if (version < versions[3]) {
-      esVersion = Math.min(ESVersion.es2017, esVersion);
-    }
-  }
-
-  return esVersion;
-}
-
 export { color, deepmerge };
 
 export type Colors = Omit<

diff --git a/packages/shared/tests/getBrowserslist.test.ts b/packages/shared/tests/getBrowserslist.test.ts