From a7bd622b60d1b024f4ae0124f907cbf0f67a4983 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Tue, 2 Mar 2021 22:01:29 +0100 Subject: [PATCH] chore: cleanup loaders --- packages/webpack5/src/loaders/apply-css-loader/index.ts | 4 ++-- packages/webpack5/src/loaders/css2json-loader/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/webpack5/src/loaders/apply-css-loader/index.ts b/packages/webpack5/src/loaders/apply-css-loader/index.ts index 966f894a2..78bb7c8ba 100644 --- a/packages/webpack5/src/loaders/apply-css-loader/index.ts +++ b/packages/webpack5/src/loaders/apply-css-loader/index.ts @@ -28,7 +28,7 @@ export default function loader(content, map) { ` : ``; - if (hasLoader('apply-css-loader')) { + if (hasLoader('css2json-loader')) { content = dedent` ${content} const { addTaggedAdditionalCSS } = require("@nativescript/core/ui/styling/style-scope"); @@ -53,5 +53,5 @@ export default function loader(content, map) { this.emitWarning(new Error(cssLoaderWarning)); } - this.callback(null, content, map); + this.callback(null, content, null); } diff --git a/packages/webpack5/src/loaders/css2json-loader/index.ts b/packages/webpack5/src/loaders/css2json-loader/index.ts index 677a5195e..7e5fe1b22 100644 --- a/packages/webpack5/src/loaders/css2json-loader/index.ts +++ b/packages/webpack5/src/loaders/css2json-loader/index.ts @@ -36,7 +36,7 @@ export default function loader(content: string, map: any) { this.callback( null, code, //`${dependencies.join('\n')}module.exports = ${str};`, - null + map ); }