From 9f8e5582d54529edd89748664f59ddea523fecfe Mon Sep 17 00:00:00 2001
From: Anna Claire Fields <58918237+franklovefrank@users.noreply.github.com>
Date: Tue, 28 Apr 2026 14:58:39 +0200
Subject: [PATCH] Fix metrics pages broken by Yarn 4 migration (#33190)

GitOrigin-RevId: 9bb3462248a16bfab425f6ebc884e9210d872b9c
---
 services/web/webpack.config.js | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/services/web/webpack.config.js b/services/web/webpack.config.js
index b6251e3405..7bd7b2c247 100644
--- a/services/web/webpack.config.js
+++ b/services/web/webpack.config.js
@@ -217,19 +217,7 @@ module.exports = {
           // Compiles Sass to CSS
           {
             loader: 'sass-loader',
-            options: {
-              api: 'modern',
-              sourceMap: true, // sourceMap: true is required for resolve-url-loader
-              sassOptions: {
-                silenceDeprecations: [
-                  // TODO: import can't be fixed until we switch to bootstrap 6
-                  'import',
-                  'global-builtin',
-                  'color-functions',
-                  'if-function',
-                ],
-              },
-            },
+            options: { sourceMap: true }, // sourceMap: true is required for resolve-url-loader
           },
         ],
       },
@@ -328,6 +316,9 @@ module.exports = {
         __dirname,
         './modules/writefull/frontend/js/integration/src/'
       ),
+      // Ensure all packages use the same jQuery instance (prevents duplicate
+      // copies from Yarn hoisting breaking jQuery plugins like daterangepicker)
+      jquery: require.resolve('jquery'),
     },
     // symlinks: false, // enable this while using `npm link`
     extensions: ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs', '.json'],