Skip to content

Commit 3a725fd

Browse files
committed
support outFile 🌹
closes #886 #883
1 parent e38e62b commit 3a725fd

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

dist/main/atom/onSaveHandler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function handle(event) {
1313
mainPanelView_1.show();
1414
parent.getProjectFileDetails({ filePath: event.filePath }).then(function (fileDetails) {
1515
if (fileDetails.project.compileOnSave
16-
&& !fileDetails.project.compilerOptions.out
16+
&& !fileDetails.project.compilerOptions.outFile
1717
&& !fileDetails.project.buildOnSave) {
1818
textUpdated.then(function () { return parent.emitFile({ filePath: event.filePath }); })
1919
.then(function (res) {

dist/main/lang/modules/building.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ var dts = require("../../tsconfig/dts-generator");
208208
function emitDts(proj) {
209209
if (!proj.projectFile.project)
210210
return;
211-
if (proj.projectFile.project.compilerOptions.out)
211+
if (proj.projectFile.project.compilerOptions.outFile)
212212
return;
213213
if (!proj.projectFile.project.package)
214214
return;

dist/main/lang/projectService.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function build(query) {
4848
projectCache_1.consistentPath(query);
4949
var proj = projectCache_1.getOrCreateProject(query.filePath);
5050
var filesToEmit = proj.projectFile.project.files.filter(function (fte) { return !fte.toLowerCase().endsWith('.json'); });
51-
filesToEmit = proj.projectFile.project.compilerOptions.out ? [filesToEmit[0]] : filesToEmit;
51+
filesToEmit = proj.projectFile.project.compilerOptions.outFile ? [filesToEmit[0]] : filesToEmit;
5252
var totalCount = filesToEmit.length;
5353
var builtCount = 0;
5454
var errorCount = 0;

dist/main/tsconfig/tsconfig.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ function rawToTsCompilerOptions(jsonOptions, projectDir) {
150150
compilerOptions.rootDir = path.resolve(projectDir, compilerOptions.rootDir);
151151
}
152152
if (compilerOptions.out !== undefined) {
153-
compilerOptions.out = path.resolve(projectDir, compilerOptions.out);
153+
compilerOptions.outFile = path.resolve(projectDir, compilerOptions.out);
154154
}
155155
if (compilerOptions.outFile !== undefined) {
156-
compilerOptions.out = path.resolve(projectDir, compilerOptions.outFile);
156+
compilerOptions.outFile = path.resolve(projectDir, compilerOptions.outFile);
157157
}
158158
return compilerOptions;
159159
}

lib/main/atom/onSaveHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function handle(event: { filePath: string; editor: AtomCore.IEditor }) {
3131
// Compile on save
3232
parent.getProjectFileDetails({ filePath: event.filePath }).then(fileDetails => {
3333
if (fileDetails.project.compileOnSave
34-
&& !fileDetails.project.compilerOptions.out
34+
&& !fileDetails.project.compilerOptions.outFile
3535
&& !fileDetails.project.buildOnSave) {
3636

3737
textUpdated.then(() => parent.emitFile({ filePath: event.filePath }))

lib/main/lang/modules/building.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ import dts = require("../../tsconfig/dts-generator");
261261
export function emitDts(proj: project.Project) {
262262

263263
if (!proj.projectFile.project) return;
264-
if (proj.projectFile.project.compilerOptions.out) return;
264+
if (proj.projectFile.project.compilerOptions.outFile) return;
265265
if (!proj.projectFile.project.package) return;
266266
if (!proj.projectFile.project.package.directory) return;
267267
if (!proj.projectFile.project.package.definition) return;

lib/main/lang/projectService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export function build(query: BuildQuery): Promise<BuildResponse> {
104104

105105
let filesToEmit = proj.projectFile.project.files.filter(fte => !fte.toLowerCase().endsWith('.json'));
106106
/** I am assuming there was at least one file. How else would we even get here? */
107-
filesToEmit = proj.projectFile.project.compilerOptions.out ? [filesToEmit[0]] : filesToEmit;
107+
filesToEmit = proj.projectFile.project.compilerOptions.outFile ? [filesToEmit[0]] : filesToEmit;
108108

109109
let totalCount = filesToEmit.length;
110110
var builtCount = 0;

lib/main/tsconfig/tsconfig.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,12 @@ function rawToTsCompilerOptions(jsonOptions: CompilerOptions, projectDir: string
309309
}
310310

311311
if (compilerOptions.out !== undefined) {
312-
compilerOptions.out = path.resolve(projectDir, compilerOptions.out);
312+
// Till out is removed. Support by just copying it to `outFile`
313+
compilerOptions.outFile = path.resolve(projectDir, compilerOptions.out);
313314
}
314315

315316
if (compilerOptions.outFile !== undefined) {
316-
// Till out is removed. Support outFile by just copying it to `out`
317-
compilerOptions.out = path.resolve(projectDir, compilerOptions.outFile);
317+
compilerOptions.outFile = path.resolve(projectDir, compilerOptions.outFile);
318318
}
319319

320320
return compilerOptions;

0 commit comments

Comments
 (0)