Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.

D.ts #29

Merged
merged 2 commits into from
Sep 27, 2016
Merged

D.ts #29

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/ngc.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
module.exports = {

include: [
'./**/*.d.ts',
'./app/app.module.ts',
'./app/main.prod.ts'
]
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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)",
Expand Down Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/ngc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 6 additions & 4 deletions src/tsc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -161,7 +163,7 @@ export interface TsConfig {
outDir: string;
target: string;
};
files: string[];
include: string[];
exclude: string[];
}

Expand Down
2 changes: 1 addition & 1 deletion src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}


Expand Down