From b3b6ada8ce5d6cfdd9f6020338997f7e55066192 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Mon, 18 Oct 2021 21:24:36 +0200 Subject: [PATCH] feat(webpack): apply-css-loader query options --- .../src/loaders/apply-css-loader/index.ts | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/webpack5/src/loaders/apply-css-loader/index.ts b/packages/webpack5/src/loaders/apply-css-loader/index.ts index 78bb7c8ba..c25e3fe42 100644 --- a/packages/webpack5/src/loaders/apply-css-loader/index.ts +++ b/packages/webpack5/src/loaders/apply-css-loader/index.ts @@ -16,6 +16,13 @@ export default function loader(content, map) { const tagCode = this.mode === 'development' ? `, ${JSON.stringify(this.resourcePath)}` : ''; + const options = Object.assign( + { + apply: true, + }, + this.query + ); + const hmrCode = this.hot ? dedent` if(module.hot) { @@ -29,15 +36,20 @@ export default function loader(content, map) { : ``; if (hasLoader('css2json-loader')) { - content = dedent` - ${content} + const applyCode = options.apply + ? dedent` const { addTaggedAdditionalCSS } = require("@nativescript/core/ui/styling/style-scope"); addTaggedAdditionalCSS(___CSS2JSON_LOADER_EXPORT___${tagCode}) + ` + : ``; + content = dedent` + ${content} + ${applyCode} ${hmrCode} `; } else if (hasLoader('css-loader')) { - content = dedent` - ${content} + const applyCode = options.apply + ? dedent` const { addTaggedAdditionalCSS } = require("@nativescript/core/ui/styling/style-scope"); if (___CSS_LOADER_EXPORT___ && typeof ___CSS_LOADER_EXPORT___.forEach === "function") { ___CSS_LOADER_EXPORT___.forEach(cssExport => { @@ -47,6 +59,11 @@ export default function loader(content, map) { } }); } + ` + : ``; + content = dedent` + ${content} + ${applyCode} ${hmrCode} `; } else {