Skip to content

Commit 91786e1

Browse files
committed
Fix reading settings
1 parent c2fd6fe commit 91786e1

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function findTSDefinition(location) {
2121
}
2222

2323
function createProject() {
24-
return ts.createProject('lib/tsconfig.json', {});
24+
return ts.createProject('lib/tsconfig.json');
2525
}
2626

2727
var tsProject = createProject();

lib/main.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function getTypeScript(typescript: typeof ts) {
4545
}
4646
}
4747

48-
function checkAndNormalizeSettings(settings: compile.Settings = {}): compile.Settings {
48+
function checkAndNormalizeSettings(settings: compile.Settings): compile.Settings {
4949
const { declarationFiles, noExternalResolve, sortOutput, typescript, ...standardSettings } = settings;
5050

5151
if (settings.sourceRoot !== undefined) {
@@ -152,6 +152,7 @@ module compile {
152152
if (fileNameOrSettings !== undefined) {
153153
if (typeof fileNameOrSettings === 'string') {
154154
fileName = fileNameOrSettings;
155+
if (settings === undefined) settings = {};
155156
} else {
156157
settings = fileNameOrSettings || {};
157158
}

release/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ function getTypeScript(typescript) {
4343
}
4444
}
4545
function checkAndNormalizeSettings(settings) {
46-
if (settings === void 0) { settings = {}; }
4746
var declarationFiles = settings.declarationFiles, noExternalResolve = settings.noExternalResolve, sortOutput = settings.sortOutput, typescript = settings.typescript, standardSettings = __rest(settings, ["declarationFiles", "noExternalResolve", "sortOutput", "typescript"]);
4847
if (settings.sourceRoot !== undefined) {
4948
console.warn('gulp-typescript: sourceRoot isn\'t supported any more. Use sourceRoot option of gulp-sourcemaps instead.');
@@ -89,6 +88,8 @@ function reportErrors(errors, typescript, ignore) {
8988
if (fileNameOrSettings !== undefined) {
9089
if (typeof fileNameOrSettings === 'string') {
9190
fileName = fileNameOrSettings;
91+
if (settings === undefined)
92+
settings = {};
9293
}
9394
else {
9495
settings = fileNameOrSettings || {};

0 commit comments

Comments
 (0)