From 6b59f7a4da93986acf9a2965e35f98ad146ff052 Mon Sep 17 00:00:00 2001
From: "Kristian D. Dimitrov" <kddimitrov@progress.com>
Date: Fri, 18 Oct 2019 18:52:22 +0300
Subject: [PATCH] fix: exclude scoped theame from external plugins

---
 lib/constants.ts                                             | 2 ++
 .../livesync/playground/preview-app-plugins-service.ts       | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/constants.ts b/lib/constants.ts
index 014c1eae9f..1f23c5c110 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -10,6 +10,8 @@ export const NATIVESCRIPT_KEY_NAME = "nativescript";
 export const NODE_MODULES_FOLDER_NAME = "node_modules";
 export const TNS_MODULES_FOLDER_NAME = "tns_modules";
 export const TNS_CORE_MODULES_NAME = "tns-core-modules";
+export const TNS_CORE_THEME_NAME = "nativescript-theme-core";
+export const SCOPED_TNS_CORE_THEME_NAME = "@nativescript/theme";
 export const WEBPACK_PLUGIN_NAME = "nativescript-dev-webpack";
 export const TNS_CORE_MODULES_WIDGETS_NAME = "tns-core-modules-widgets";
 export const TNS_ANDROID_RUNTIME_NAME = "tns-android";
diff --git a/lib/services/livesync/playground/preview-app-plugins-service.ts b/lib/services/livesync/playground/preview-app-plugins-service.ts
index 7a7bdd13f4..89eec630ed 100644
--- a/lib/services/livesync/playground/preview-app-plugins-service.ts
+++ b/lib/services/livesync/playground/preview-app-plugins-service.ts
@@ -4,7 +4,7 @@ import * as util from "util";
 import { Device } from "nativescript-preview-sdk";
 import { PluginComparisonMessages } from "./preview-app-constants";
 import { NODE_MODULES_DIR_NAME } from "../../../common/constants";
-import { PLATFORMS_DIR_NAME, PACKAGE_JSON_FILE_NAME } from "../../../constants";
+import { PLATFORMS_DIR_NAME, PACKAGE_JSON_FILE_NAME, TNS_CORE_THEME_NAME, SCOPED_TNS_CORE_THEME_NAME } from "../../../constants";
 
 export class PreviewAppPluginsService implements IPreviewAppPluginsService {
 	constructor(private $errors: IErrors,
@@ -41,10 +41,11 @@ export class PreviewAppPluginsService implements IPreviewAppPluginsService {
 
 	public getExternalPlugins(device: Device): string[] {
 		const devicePlugins = this.getDevicePlugins(device);
+		const themeNamesArray = [TNS_CORE_THEME_NAME, SCOPED_TNS_CORE_THEME_NAME];
 		const result = _.keys(devicePlugins)
 			// The core theme links are custom and
 			// should be handled by webpack during build.
-			.filter(plugin => plugin !== "nativescript-theme-core");
+			.filter(plugin => themeNamesArray.indexOf(plugin) === -1);
 
 		return result;
 	}