From 8bc1a43630052155e937cb8e09fe8317b93fde01 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Mon, 18 Oct 2021 21:27:52 +0200 Subject: [PATCH] fix: also account for apply in dispose code --- .../webpack5/src/loaders/apply-css-loader/index.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/webpack5/src/loaders/apply-css-loader/index.ts b/packages/webpack5/src/loaders/apply-css-loader/index.ts index c25e3fe42..fb9c59ea9 100644 --- a/packages/webpack5/src/loaders/apply-css-loader/index.ts +++ b/packages/webpack5/src/loaders/apply-css-loader/index.ts @@ -23,13 +23,19 @@ export default function loader(content, map) { this.query ); + const disposeCode = options.apply + ? dedent` + const { removeTaggedAdditionalCSS } = require("@nativescript/core/ui/styling/style-scope"); + removeTaggedAdditionalCSS(${tag}) + ` + : ``; + const hmrCode = this.hot ? dedent` if(module.hot) { module.hot.accept() module.hot.dispose(() => { - const { removeTaggedAdditionalCSS } = require("@nativescript/core/ui/styling/style-scope"); - removeTaggedAdditionalCSS(${tag}) + ${disposeCode} }) } `