Merge pull request #29 from driftyco/d.ts

D.ts

Author: danbucholtz

config/ngc.config.js

@@ -2,6 +2,7 @@
 module.exports = {
 
   include: [
+    './**/*.d.ts',
     './app/app.module.ts',
     './app/main.prod.ts'
   ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ionic/app-scripts",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "Scripts for Ionic Projects",
   "homepage": "http//ionicframework.com/",
   "author": "Ionic Team <[email protected]> (http://ionic.io)",
@@ -46,6 +46,8 @@
     "@types/node": "6.0.38",
     "@types/uglify-js": "2.0.27",
     "jasmine": "^2.5.2",
+    "tslint": "3.15.1",
+    "tslint-ionic-rules": "0.0.5",
     "typescript": "^2.0.3"
   },
   "repository": {

src/ngc.ts

@@ -90,7 +90,7 @@ function createTmpTsConfig(context: BuildContext, ngcConfig: NgcConfig) {
   tsConfig.compilerOptions.target = 'es5';
 
   // force where to look for ts files
-  tsConfig.files = ngcConfig.include;
+  tsConfig.include = ngcConfig.include;
 
   // save the modified copy into the tmp directory
   outputJsonSync(getTmpTsConfigPath(context), tsConfig);

src/tsc.ts

@@ -38,8 +38,10 @@ function runTsc(context: BuildContext, options: BuildOptions) {
     const files: string[] = [];
     if (options.isProd) {
       files.push(join(context.srcDir, context.mainEntryProd));
+      files.push(join(context.srcDir, '**', '*.d.ts'));
     } else {
       files.push(join(context.srcDir, context.mainEntryDev));
+      files.push(join(context.srcDir, '**', '*.d.ts'));
     }
 
     const tmpTsConfigPath = createTmpTsConfig(context, files);
@@ -111,10 +113,10 @@ function createTmpTsConfig(context: BuildContext, files: string[]) {
   tsConfig.compilerOptions.outDir = context.tmpDir;
 
   // force what files to include
-  if (Array.isArray(tsConfig.files)) {
-    tsConfig.files = tsConfig.files.concat(files);
+  if (Array.isArray(tsConfig.include)) {
+    tsConfig.include = tsConfig.include.concat(files);
   } else {
-    tsConfig.files = files;
+    tsConfig.include = files;
   }
 
   const tmpTsConfigPath = getTmpTsConfigPath(context);
@@ -161,7 +163,7 @@ export interface TsConfig {
     outDir: string;
     target: string;
   };
-  files: string[];
+  include: string[];
   exclude: string[];
 }
 

src/util.ts

@@ -203,7 +203,7 @@ export function getNodeBinExecutable(context: BuildContext, cmd: string) {
 
 
 export function isTsFilename(filename: string) {
-  return (filename.length > 3) && (filename.substr(filename.length - 3) === '.ts') && (filename.substr(filename.length - 5) !== '.d.ts');
+  return (filename.length > 3) && (filename.substr(filename.length - 3) === '.ts');
 }