Skip to content

Commit

Permalink
Ignore outDir when isolatedModules is set, fix #260
Browse files Browse the repository at this point in the history
  • Loading branch information
ivogabe committed May 5, 2016
1 parent df15f06 commit 009b021
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/output.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import * as tsApi from './tsapi';
import * as reporter from './reporter';
import * as project from './project';
import { VinylFile, RawSourceMap } from './types';
import { ProjectCompiler } from "./compiler";

export interface OutputFile {
fileName: string;
Expand Down Expand Up @@ -176,14 +177,14 @@ export class Output {
let root: string;
if (this.project.singleOutput) {
root = file.original.gulp.base;
} else if (this.project.options.outDir !== undefined) {
} else if (this.project.options.outDir !== undefined && this.project.compiler instanceof ProjectCompiler) {
root = file.original.gulp.cwd + '/';
} else {
root = '';
}

let base: string;
if (this.project.options.outDir !== undefined) {
if (this.project.options.outDir !== undefined && this.project.compiler instanceof ProjectCompiler) {
base = path.resolve(file.original.gulp.cwd, this.project.options.outDir) + '/';
} else {
base = file.original.gulp.base;
Expand Down

0 comments on commit 009b021

Please sign in to comment.