Bump node-sass to 6.0.1 (#109930) (#110543)

Co-authored-by: Jonathan Budzenski <[email protected]>
elastic · Aug 31, 2021 · d92391d · d92391d
1 parent a1d2f75
commit d92391d
Show file tree

Hide file tree

Showing 7 changed files with 1,196 additions and 1,111 deletions.
diff --git a/package.json b/package.json
@@ -790,7 +790,7 @@
     "multimatch": "^4.0.0",
     "mutation-observer": "^1.0.3",
     "ncp": "^2.0.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.1",
     "null-loader": "^3.0.0",
     "nyc": "^15.0.1",
     "oboe": "^2.1.4",
@@ -810,7 +810,7 @@
     "regenerate": "^1.4.0",
     "resolve": "^1.7.1",
     "rxjs-marbles": "^5.0.6",
-    "sass-loader": "^8.0.2",
+    "sass-loader": "^10.2.0",
     "sass-resources-loader": "^2.0.1",
     "selenium-webdriver": "^4.0.0-alpha.7",
     "serve-static": "1.14.1",

diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -157,14 +157,14 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
                 {
                   loader: 'sass-loader',
                   options: {
-                    prependData(loaderContext: webpack.loader.LoaderContext) {
+                    additionalData(content: string, loaderContext: webpack.loader.LoaderContext) {
                       return `@import ${stringifyRequest(
                         loaderContext,
                         Path.resolve(
                           worker.repoRoot,
                           `src/core/public/core_app/styles/_globals_${theme}.scss`
                         )
-                      )};\n`;
+                      )};\n${content}`;
                     },
                     webpackImporter: false,
                     implementation: require('node-sass'),