Merge pull request desktop#19060 from robertcrockett/development

Upgrading sass-loader Package to Latest Version

app/test/setup-test-framework.ts

@@ -1,7 +1,8 @@
 // set test timeout to 10s
 jest.setTimeout(10000)
 
-import 'jest-extended'
+import * as matchers from 'jest-extended'
+expect.extend(matchers)
 
 delete process.env['LOCAL_GIT_DIRECTORY']
 delete process.env['GIT_EXEC_PATH']

app/webpack.development.ts

@@ -57,7 +57,7 @@ const rendererConfig = merge({}, common.renderer, config, {
         use: [
           'style-loader',
           { loader: 'css-loader', options: { sourceMap: true } },
-          'sass-loader?sourceMap',
+          { loader: 'sass-loader', options: { sourceMap: true } },
         ],
       },
     ],
@@ -79,7 +79,7 @@ const crashConfig = merge({}, common.crash, config, {
         use: [
           'style-loader',
           { loader: 'css-loader', options: { sourceMap: true } },
-          'sass-loader?sourceMap',
+          { loader: 'sass-loader', options: { sourceMap: true } },
         ],
       },
     ],

package.json

@@ -84,7 +84,7 @@
     "jest": "^29.7.0",
     "jest-diff": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-extended": "^0.11.2",
+    "jest-extended": "^4.0.2",
     "klaw-sync": "^3.0.0",
     "legal-eagle": "0.16.0",
     "mini-css-extract-plugin": "^2.5.3",
@@ -93,7 +93,7 @@
     "prettier": "^2.6.0",
     "rimraf": "^2.5.2",
     "sass": "^1.27.0",
-    "sass-loader": "^10.0.3",
+    "sass-loader": "^16.0.0",
     "semver": "^5.7.2",
     "split2": "^3.2.2",
     "style-loader": "^3.3.1",