Skip to content

Use compiler enum than magic number #362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Use compiler enum than magic number #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58fc3a1
Use compiler enum than magic number
HerringtonDarkholme Nov 8, 2016
7bd57c7
use compiler over typescript
HerringtonDarkholme Nov 16, 2016
b3d2fc0
Merge branch 'master' of github.com:TypeStrong/ts-loader
HerringtonDarkholme Nov 16, 2016
5d9c321
Merge branch 'master' of github.com:TypeStrong/ts-loader
HerringtonDarkholme Nov 16, 2016
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
8 changes: 4 additions & 4 deletions src/compilerSetup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ export function getCompilerOptions(
});

// if `module` is not specified and not using ES6 target, default to CJS module output
if ((!compilerOptions.module) && compilerOptions.target !== 2 /* ES6 */) {
compilerOptions.module = 1; /* CommonJS */
} else if (compilerCompatible && semver.lt(compiler.version, '1.7.3-0') && compilerOptions.target === 2 /* ES6 */) {
if ((!compilerOptions.module) && compilerOptions.target !== compiler.ScriptTarget.ES6) {
compilerOptions.module = compiler.ModuleKind.CommonJS;
} else if (compilerCompatible && semver.lt(compiler.version, '1.7.3-0') && compilerOptions.target === compiler.ScriptTarget.ES6) {
// special handling for TS 1.6 and target: es6
compilerOptions.module = 0 /* None */;
compilerOptions.module = compiler.ModuleKind.None;
}

return compilerOptions;
Expand Down
4 changes: 2 additions & 2 deletions src/servicesHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ function makeServicesHost(
const { compiler, compilerOptions, files } = instance;

const newLine =
compilerOptions.newLine === 0 /* CarriageReturnLineFeed */ ? constants.CarriageReturnLineFeed :
compilerOptions.newLine === 1 /* LineFeed */ ? constants.LineFeed :
compilerOptions.newLine === compiler.NewLineKind.CarriageReturnLineFeed ? constants.CarriageReturnLineFeed :
compilerOptions.newLine === compiler.NewLineKind.LineFeed ? constants.LineFeed :
constants.EOL;

// make a (sync) resolver that follows webpack's rules
Expand Down