From df38cfb2213431b2773a7175af047adf67919a5b Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Mon, 9 Nov 2015 14:58:59 +0200
Subject: [PATCH] Fix dts file exclusion problems when packing tns-core-modules
 package.

Exclude unneeded stuff like apps, node_modules, .baseDir.ts
---
 gruntfile.js  | 17 +++++++++--------
 tsconfig.json | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index d82386379..de86c4858 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -217,15 +217,16 @@ module.exports = function(grunt) {
             },
             definitionFiles: {
                 src: [
-                    localCfg.srcDir + "/**/*.d.ts",
+                    "**/*.d.ts",
                     //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
-                    "!" + localCfg.srcDir + "/apps/**",
-                    "!" + localCfg.srcDir + "/node-tests/**",
-                    "!" + localCfg.srcDir + "/org.nativescript.widgets.d.ts",
-                    "!" + localCfg.srcDir + "/android17.d.ts",
-                    "!" + localCfg.srcDir + "/**/*.android.d.ts",
-                    "!" + localCfg.srcDir + "/ios.d.ts",
-                    "!" + localCfg.srcDir + "/**/*.ios.d.ts",
+                    "!apps/**",
+                    "!ts-apps/**",
+                    "!node-tests/**",
+                    "!org.nativescript.widgets.d.ts",
+                    "!android17.d.ts",
+                    "!**/*.android.d.ts",
+                    "!ios.d.ts",
+                    "!**/*.ios.d.ts",
                 ].concat(localCfg.defaultExcludes),
                 dest: localCfg.outModulesDir + "/",
                 expand: true,
diff --git a/tsconfig.json b/tsconfig.json
index 3d365f768..84f94ffbd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -87,14 +87,10 @@
         "apps/perf-tests/ApplicationLoadTimeAndFPS/mainPage.ts",
         "apps/perf-tests/ApplicationSize/app.ts",
         "apps/perf-tests/ApplicationSize/mainPage.ts",
-        "apps/perf-tests/common.d.ts",
-        "apps/perf-tests/common.ts",
         "apps/perf-tests/ComplexObjectGraphMemoryTest/app.ts",
         "apps/perf-tests/ComplexObjectGraphMemoryTest/mainPage.ts",
         "apps/perf-tests/ControlCreationSpeedTest/app.ts",
         "apps/perf-tests/ControlCreationSpeedTest/mainPage.ts",
-        "apps/perf-tests/controls-page.d.ts",
-        "apps/perf-tests/controls-page.ts",
         "apps/perf-tests/LargeObjectArrayMemoryLeakTest/app.ts",
         "apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts",
         "apps/perf-tests/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.android.ts",
@@ -102,8 +98,6 @@
         "apps/perf-tests/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.ios.ts",
         "apps/perf-tests/LargeObjectArrayMemoryTest/app.ts",
         "apps/perf-tests/LargeObjectArrayMemoryTest/mainPage.ts",
-        "apps/perf-tests/nav-page.d.ts",
-        "apps/perf-tests/nav-page.ts",
         "apps/perf-tests/NavigationMemoryLeakTest/app.ts",
         "apps/perf-tests/NavigationMemoryLeakTest/mainPage.ts",
         "apps/perf-tests/NavigationTest/app.ts",
@@ -120,6 +114,12 @@
         "apps/perf-tests/SpeedTests/tests-native.ios.ts",
         "apps/perf-tests/SpeedTests/tests.d.ts",
         "apps/perf-tests/SpeedTests/tests.ts",
+        "apps/perf-tests/common.d.ts",
+        "apps/perf-tests/common.ts",
+        "apps/perf-tests/controls-page.d.ts",
+        "apps/perf-tests/controls-page.ts",
+        "apps/perf-tests/nav-page.d.ts",
+        "apps/perf-tests/nav-page.ts",
         "apps/pickers-demo/app.ts",
         "apps/pickers-demo/main-page.ts",
         "apps/pickers-demo/model.ts",
@@ -142,6 +142,7 @@
         "apps/template-settings/view-model.ts",
         "apps/template-tab-navigation/app.ts",
         "apps/template-tab-navigation/main-page.ts",
+        "apps/tests/TKUnit.ts",
         "apps/tests/app/app.ts",
         "apps/tests/app/location-example.ts",
         "apps/tests/app/mainPage.ts",
@@ -215,13 +216,12 @@
         "apps/tests/testRunner.ts",
         "apps/tests/text/formatted-string-tests.ts",
         "apps/tests/timer-tests.ts",
-        "apps/tests/TKUnit.ts",
         "apps/tests/trace-tests.ts",
         "apps/tests/ui-test.ts",
+        "apps/tests/ui/action-bar/ActionBar_NumberAsText.ts",
         "apps/tests/ui/action-bar/action-bar-tests-common.ts",
         "apps/tests/ui/action-bar/action-bar-tests.android.ts",
         "apps/tests/ui/action-bar/action-bar-tests.ios.ts",
-        "apps/tests/ui/action-bar/ActionBar_NumberAsText.ts",
         "apps/tests/ui/activity-indicator/activity-indicator-tests.ts",
         "apps/tests/ui/animation/animation-tests.ts",
         "apps/tests/ui/bindable-tests.ts",
@@ -333,6 +333,7 @@
         "apps/ui-tests-app/bindings/xmlbasics.ts",
         "apps/ui-tests-app/css/background.ts",
         "apps/ui-tests-app/css/styles.ts",
+        "apps/ui-tests-app/css/text-decoration.ts",
         "apps/ui-tests-app/dialogs/dialogs.ts",
         "apps/ui-tests-app/dialogs/view-model.ts",
         "apps/ui-tests-app/font/button.ts",
@@ -666,4 +667,4 @@
         "xml/xml.d.ts",
         "xml/xml.ts"
     ]
-}
+}
\ No newline at end of file