javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1063 from NativeScript/hdeshev/dts-package-fixes

Browse Source 
Fix dts file exclusion problems when packing tns-core-modules package.
This commit is contained in:
Hristo Deshev
2015-11-09 16:14:09 +02:00
parent 815ba28c4c df38cfb221
commit b763b25dbb
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gruntfile.js
View File

@ -217,15 +217,16 @@ module.exports = function(grunt) {
}, },
definitionFiles: { definitionFiles: {
src: [ 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! //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
"!" + localCfg.srcDir + "/apps/**", "!apps/**",
"!" + localCfg.srcDir + "/node-tests/**", "!ts-apps/**",
"!" + localCfg.srcDir + "/org.nativescript.widgets.d.ts", "!node-tests/**",
"!" + localCfg.srcDir + "/android17.d.ts", "!org.nativescript.widgets.d.ts",
"!" + localCfg.srcDir + "/**/*.android.d.ts", "!android17.d.ts",
"!" + localCfg.srcDir + "/ios.d.ts", "!**/*.android.d.ts",
"!" + localCfg.srcDir + "/**/*.ios.d.ts", "!ios.d.ts",
"!**/*.ios.d.ts",
].concat(localCfg.defaultExcludes), ].concat(localCfg.defaultExcludes),
dest: localCfg.outModulesDir + "/", dest: localCfg.outModulesDir + "/",
expand: true, expand: true,

19
tsconfig.json
View File

@ -87,14 +87,10 @@
"apps/perf-tests/ApplicationLoadTimeAndFPS/mainPage.ts", "apps/perf-tests/ApplicationLoadTimeAndFPS/mainPage.ts",
"apps/perf-tests/ApplicationSize/app.ts", "apps/perf-tests/ApplicationSize/app.ts",
"apps/perf-tests/ApplicationSize/mainPage.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/app.ts",
"apps/perf-tests/ComplexObjectGraphMemoryTest/mainPage.ts", "apps/perf-tests/ComplexObjectGraphMemoryTest/mainPage.ts",
"apps/perf-tests/ControlCreationSpeedTest/app.ts", "apps/perf-tests/ControlCreationSpeedTest/app.ts",
"apps/perf-tests/ControlCreationSpeedTest/mainPage.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/app.ts",
"apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts", "apps/perf-tests/LargeObjectArrayMemoryLeakTest/mainPage.ts",
"apps/perf-tests/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.android.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/LargeObjectArrayMemoryLeakTest/native-calls-wrapper.ios.ts",
"apps/perf-tests/LargeObjectArrayMemoryTest/app.ts", "apps/perf-tests/LargeObjectArrayMemoryTest/app.ts",
"apps/perf-tests/LargeObjectArrayMemoryTest/mainPage.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/app.ts",
"apps/perf-tests/NavigationMemoryLeakTest/mainPage.ts", "apps/perf-tests/NavigationMemoryLeakTest/mainPage.ts",
"apps/perf-tests/NavigationTest/app.ts", "apps/perf-tests/NavigationTest/app.ts",
@ -120,6 +114,12 @@
"apps/perf-tests/SpeedTests/tests-native.ios.ts", "apps/perf-tests/SpeedTests/tests-native.ios.ts",
"apps/perf-tests/SpeedTests/tests.d.ts", "apps/perf-tests/SpeedTests/tests.d.ts",
"apps/perf-tests/SpeedTests/tests.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/app.ts",
"apps/pickers-demo/main-page.ts", "apps/pickers-demo/main-page.ts",
"apps/pickers-demo/model.ts", "apps/pickers-demo/model.ts",
@ -142,6 +142,7 @@
"apps/template-settings/view-model.ts", "apps/template-settings/view-model.ts",
"apps/template-tab-navigation/app.ts", "apps/template-tab-navigation/app.ts",
"apps/template-tab-navigation/main-page.ts", "apps/template-tab-navigation/main-page.ts",
"apps/tests/TKUnit.ts",
"apps/tests/app/app.ts", "apps/tests/app/app.ts",
"apps/tests/app/location-example.ts", "apps/tests/app/location-example.ts",
"apps/tests/app/mainPage.ts", "apps/tests/app/mainPage.ts",
@ -215,13 +216,12 @@
"apps/tests/testRunner.ts", "apps/tests/testRunner.ts",
"apps/tests/text/formatted-string-tests.ts", "apps/tests/text/formatted-string-tests.ts",
"apps/tests/timer-tests.ts", "apps/tests/timer-tests.ts",
"apps/tests/TKUnit.ts",
"apps/tests/trace-tests.ts", "apps/tests/trace-tests.ts",
"apps/tests/ui-test.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-common.ts",
"apps/tests/ui/action-bar/action-bar-tests.android.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/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/activity-indicator/activity-indicator-tests.ts",
"apps/tests/ui/animation/animation-tests.ts", "apps/tests/ui/animation/animation-tests.ts",
"apps/tests/ui/bindable-tests.ts", "apps/tests/ui/bindable-tests.ts",
@ -333,6 +333,7 @@
"apps/ui-tests-app/bindings/xmlbasics.ts", "apps/ui-tests-app/bindings/xmlbasics.ts",
"apps/ui-tests-app/css/background.ts", "apps/ui-tests-app/css/background.ts",
"apps/ui-tests-app/css/styles.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/dialogs.ts",
"apps/ui-tests-app/dialogs/view-model.ts", "apps/ui-tests-app/dialogs/view-model.ts",
"apps/ui-tests-app/font/button.ts", "apps/ui-tests-app/font/button.ts",
@ -666,4 +667,4 @@
"xml/xml.d.ts", "xml/xml.d.ts",
"xml/xml.ts" "xml/xml.ts"
] ]
} }