From 3aa05c6241b9a87aa3fc6ee1111c69c9ff2adad2 Mon Sep 17 00:00:00 2001
From: Harry Yu <harry@wanderlog.com>
Date: Thu, 23 Mar 2023 15:38:03 -0700
Subject: [PATCH 1/3] Fix `yarn strapi build` to use admin package
 .browserslistrc

---
 packages/core/admin/webpack.config.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/admin/webpack.config.js b/packages/core/admin/webpack.config.js
index e87de0aa58..4256a0509a 100644
--- a/packages/core/admin/webpack.config.js
+++ b/packages/core/admin/webpack.config.js
@@ -9,6 +9,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { ESBuildMinifyPlugin } = require('esbuild-loader');
 const WebpackBar = require('webpackbar');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+const browserslist = require('browserslist');
 const browserslistToEsbuild = require('browserslist-to-esbuild');
 
 const alias = require('./webpack.alias');
@@ -52,7 +53,10 @@ module.exports = ({
 
   const excludeRegex = createPluginsExcludePath(pluginsPath);
 
-  const buildTarget = browserslistToEsbuild();
+  // Ensure we use the config in this directory, even if run with a different
+  // working directory
+  const browserslistConfig = browserslist.loadConfig({ path: __dirname });
+  const buildTarget = browserslistToEsbuild(browserslistConfig);
 
   return {
     mode: isProduction ? 'production' : 'development',

From 501bf0bf72079d2eb623d223f0389dfc4b666f0b Mon Sep 17 00:00:00 2001
From: Harry Yu <harry@wanderlog.com>
Date: Fri, 24 Mar 2023 18:12:05 -0700
Subject: [PATCH 2/3] Add browserslist to package.json with same version

---
 packages/core/admin/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index 2a55c6b81a..46b628c6df 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -61,6 +61,7 @@
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.0.2",
     "bcryptjs": "2.4.3",
+    "browserslist": "^4.17.3",
     "browserslist-to-esbuild": "1.2.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.1",

From b01d0fa22e07df824ebb4efb2b93bb68ab73766e Mon Sep 17 00:00:00 2001
From: Josh <37798644+joshuaellis@users.noreply.github.com>
Date: Tue, 18 Apr 2023 08:45:27 +0100
Subject: [PATCH 3/3] chore: update yarn.lock

---
 yarn.lock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yarn.lock b/yarn.lock
index d4ac2ad050..b2030813f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7003,6 +7003,7 @@ __metadata:
     babel-loader: ^9.1.2
     babel-plugin-styled-components: 2.0.2
     bcryptjs: 2.4.3
+    browserslist: ^4.17.3
     browserslist-to-esbuild: 1.2.0
     chalk: ^4.1.2
     chokidar: ^3.5.1