From 1b12b51f51e2b990232b9c77e1154fd334f1c98b Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Fri, 7 Jul 2023 07:18:55 -0700
Subject: [PATCH] Merge pull request #13727 from
 overleaf/mf-upgrade-less-latest

upgrade `less-loader on tool/storybook & services/web directory

Upgrade less-loader on tools/storybook to the latest version to fix npm dependency resolution problem.

The less-loader from storybook seems to be conflicting with the less-loader from web services. Web services recently have their webpack loaders updated, which probably causing this error: #13148

To make sure web also have the same version, the less-loader in web is also upgraded.

GitOrigin-RevId: a6449f5d4fcf0516e6f5c1bdb483a0bf433fe347
---
 package-lock.json         | 62 +++++++++------------------------------
 services/web/package.json |  2 +-
 2 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index eccc5c9a3a..18a71973ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27055,6 +27055,7 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
       "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "dev": true,
       "engines": {
         "node": ">= 8"
       }
@@ -27376,13 +27377,9 @@
       }
     },
     "node_modules/less-loader": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",
-      "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",
-      "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4"
-      },
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.3.tgz",
+      "integrity": "sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==",
       "engines": {
         "node": ">= 14.15.0"
       },
@@ -41672,7 +41669,7 @@
         "karma-requirejs": "^1.1.0",
         "karma-webpack": "^5.0.0",
         "less": "^3.11.1",
-        "less-loader": "^11.1.0",
+        "less-loader": "^11.1.3",
         "mensch": "^0.3.4",
         "mini-css-extract-plugin": "^2.7.5",
         "mocha": "^10.2.0",
@@ -42953,29 +42950,10 @@
         "@storybook/react-webpack5": "^7.0.12",
         "@storybook/theming": "^7.0.12",
         "less": "3.13.1",
-        "less-loader": "^10.2.0",
+        "less-loader": "^11.1.3",
         "storybook": "^7.0.12",
         "worker-loader": "^3.0.8"
       }
-    },
-    "tools/storybook/node_modules/less-loader": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.2.0.tgz",
-      "integrity": "sha512-AV5KHWvCezW27GT90WATaDnfXBv99llDbtaj4bshq6DvAihMdNjaPDcUMa6EXKLRF+P2opFenJp89BXg91XLYg==",
-      "dependencies": {
-        "klona": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "less": "^3.5.0 || ^4.0.0",
-        "webpack": "^5.0.0"
-      }
     }
   },
   "dependencies": {
@@ -50136,19 +50114,9 @@
         "@storybook/react-webpack5": "^7.0.12",
         "@storybook/theming": "^7.0.12",
         "less": "3.13.1",
-        "less-loader": "^10.2.0",
+        "less-loader": "^11.1.3",
         "storybook": "^7.0.12",
         "worker-loader": "^3.0.8"
-      },
-      "dependencies": {
-        "less-loader": {
-          "version": "10.2.0",
-          "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.2.0.tgz",
-          "integrity": "sha512-AV5KHWvCezW27GT90WATaDnfXBv99llDbtaj4bshq6DvAihMdNjaPDcUMa6EXKLRF+P2opFenJp89BXg91XLYg==",
-          "requires": {
-            "klona": "^2.0.4"
-          }
-        }
       }
     },
     "@overleaf/stream-utils": {
@@ -50707,7 +50675,7 @@
         "karma-requirejs": "^1.1.0",
         "karma-webpack": "^5.0.0",
         "less": "^3.11.1",
-        "less-loader": "^11.1.0",
+        "less-loader": "^11.1.3",
         "lodash": "^4.17.19",
         "lru-cache": "^7.10.1",
         "mailchimp-api-v3": "^1.12.0",
@@ -65808,7 +65776,8 @@
     "klona": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
-      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA=="
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "dev": true
     },
     "knex": {
       "version": "2.4.0",
@@ -66057,13 +66026,10 @@
       }
     },
     "less-loader": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",
-      "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",
-      "dev": true,
-      "requires": {
-        "klona": "^2.0.4"
-      }
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.3.tgz",
+      "integrity": "sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==",
+      "requires": {}
     },
     "leven": {
       "version": "3.1.0",
diff --git a/services/web/package.json b/services/web/package.json
index 2485b46830..27feb2f156 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -321,7 +321,7 @@
     "karma-requirejs": "^1.1.0",
     "karma-webpack": "^5.0.0",
     "less": "^3.11.1",
-    "less-loader": "^11.1.0",
+    "less-loader": "^11.1.3",
     "mensch": "^0.3.4",
     "mini-css-extract-plugin": "^2.7.5",
     "mocha": "^10.2.0",