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

Commit d8546dc

Browse files
author
Stanislav Panferov
committed
fix(*): exclude package.json files from program
1 parent 43cdc6d commit d8546dc

File tree

4 files changed

+31
-6
lines changed

4 files changed

+31
-6
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@
5151
"grunt-shell": "^1.1.2",
5252
"grunt-ts": "^3.0.0",
5353
"load-grunt-tasks": "^0.6.0",
54-
"typescript": "^1.8.0-dev.20151123"
54+
"typescript": "^1.8.0-dev.20151202"
5555
}
5656
}

src/checker-runtime.ts

+20-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { ICompilerOptions, ICompilerInfo, IFile } from './host';
22
import makeResolver from './resolver';
33
import * as colors from 'colors';
44
import * as path from 'path';
5+
import * as fs from 'fs';
56

67
require('babel-polyfill');
78

@@ -85,10 +86,26 @@ export class Host implements ts.LanguageServiceHost {
8586
}
8687

8788
getScriptSnapshot(fileName) {
88-
let file = env.files[fileName];
89-
if (file) {
90-
return env.compiler.ScriptSnapshot.fromString(file.text);
89+
let fileName_ = path.normalize(fileName);
90+
let file = env.files[fileName_];
91+
92+
if (!file) {
93+
try {
94+
file = {
95+
version: 0,
96+
text: fs.readFileSync(fileName, { encoding: 'utf8' }).toString()
97+
}
98+
99+
if (path.basename(fileName) !== 'package.json') {
100+
env.files[fileName_] = file;
101+
}
102+
}
103+
catch (e) {
104+
return;
105+
}
91106
}
107+
108+
return env.compiler.ScriptSnapshot.fromString(file.text);
92109
}
93110

94111
getCurrentDirectory() {

src/host.ts

+9-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,15 @@ export class Host implements ts.LanguageServiceHost {
9898
let file = this.state.getFile(fileName);
9999
if (!file) {
100100
try {
101-
this.state.readFileAndUpdateSync(fileName);
102-
file = this.state.getFile(fileName);
101+
let text = this.state.readFileSync(fileName);
102+
file = {
103+
version: 0,
104+
text
105+
};
106+
107+
if (path.basename(fileName) !== 'package.json') {
108+
file = this.state.addFile(fileName, text);
109+
}
103110
}
104111
catch (e) {
105112
return;

tscommand-fffeebc0.tmp.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"/Users/panferov-s/Workspace/awesome-typescript-loader/src/cache.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/checker-runtime.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/checker.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/defines.d.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/deps.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/helpers.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/host.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/index.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/instance.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/resolver.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/tsconfig-utils.ts" "/Users/panferov-s/Workspace/awesome-typescript-loader/src/.baseDir.ts" --sourcemap --removeComments --preserveConstEnums --target ES6 --module commonjs --outDir dist

0 commit comments

Comments
 (0)