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

fix(*): fix windows path logic, fixes #9 #11

Merged
merged 1 commit into from
May 8, 2015
Merged
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
16 changes: 11 additions & 5 deletions dist/host.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/host.js.map

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions src/host.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,13 @@ export class State {
});
}

var source = this.program.getSourceFile(fileName);
var normalizedFileName = this.normalizePath(fileName);
var source = this.program.getSourceFile(normalizedFileName);
if (!source) {
this.updateProgram();
source = this.program.getSourceFile(fileName);
source = this.program.getSourceFile(normalizedFileName);
if (!source) {
throw new Error(`File ${fileName} was not found in program`);
throw new Error(`File ${normalizedFileName} was not found in program`);
}
}

Expand Down Expand Up @@ -213,7 +214,7 @@ export class State {

this.dependencies.clearDependencies(fileName);

var flow = (!!this.files[fileName]) ?
var flow = this.hasFile(fileName) ?
Promise.resolve(false) :
this.readFileAndUpdate(fileName);

Expand Down Expand Up @@ -314,6 +315,10 @@ export class State {
}
}

hasFile(fileName: string): boolean {
return this.files.hasOwnProperty(fileName);
}

readFile(fileName: string): Promise<string> {
var readFile = Promise.promisify(this.fs.readFile.bind(this.fs));
return readFile(fileName).then(function (buf) {
Expand All @@ -339,6 +344,10 @@ export class State {
return this.updateFile(fileName, text, checked);
}

normalizePath(path: string): string {
return (<any>this.ts).normalizePath(path)
}

resolve(resolver: Resolver, fileName: string, defPath: string): Promise<string> {
var result;

Expand Down
3 changes: 2 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ function compiler(webpack: WebPack, text: string): void {

var instance = ensureInstance(webpack, options, instanceName);

var state = instance.tsState;

var callback = webpack.async();
var fileName = webpack.resourcePath;
var resolver = <host.Resolver>Promise.promisify(webpack.resolve);
Expand All @@ -103,7 +105,6 @@ function compiler(webpack: WebPack, text: string): void {
clear: webpack.clearDependencies.bind(webpack)
};

var state = instance.tsState;

// Here we receive information about what files were changed.
// The way is hacky, maybe we can find something better.
Expand Down