Skip to content

Commit 694d036

Browse files
committed
Update the NPM version, add some minor fixes and remove demo
This is part of the effort to create an official TypeScript compiler: Urigo/angular2-meteor#89 Urigo/angular2-meteor#90 Urigo/angular2-meteor#102
1 parent 57e7023 commit 694d036

File tree

11 files changed

+6
-105
lines changed

11 files changed

+6
-105
lines changed

demo/.meteor/.finished-upgraders

Lines changed: 0 additions & 12 deletions
This file was deleted.

demo/.meteor/.id

Lines changed: 0 additions & 7 deletions
This file was deleted.

demo/.meteor/packages

Lines changed: 0 additions & 23 deletions
This file was deleted.

demo/.meteor/platforms

Lines changed: 0 additions & 2 deletions
This file was deleted.

demo/.meteor/release

Lines changed: 0 additions & 1 deletion
This file was deleted.

demo/demo.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

demo/packages/compiler/package.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

demo/packages/compiler/ts_handler.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

demo/tsconfig.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

package.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Package.describe({
77
});
88

99
Npm.depends({
10-
'meteor-typescript': '0.5.2',
10+
'meteor-typescript': '0.5.7',
1111
'async': '1.4.0'
1212
});
1313

typescript.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ TypeScript = {
66
validateOptions(options) {
77
if (! options) return;
88

9-
meteorTS.convertOptionsOrThrow(options);
9+
meteorTS.validateAndConvertOptions(options);
1010
},
1111

1212
// Extra options are the same compiler options
1313
// but passed in the compiler constructor.
1414
validateExtraOptions(options) {
1515
if (! options) return;
1616

17-
meteorTS.convertOptionsOrThrow({
17+
meteorTS.validateAndConvertOptions({
1818
compilerOptions: options
1919
});
2020
},
@@ -24,15 +24,9 @@ TypeScript = {
2424
getCompilerOptions(options, extraOptions) {
2525
let compilerOptions = options ||
2626
meteorTS.getDefaultOptions().compilerOptions;
27-
compilerOptions = _.clone(options);
28-
29-
if (extraOptions) {
30-
for (let option in extraOptions) {
31-
if (extraOptions.hasOwnProperty(option)) {
32-
compilerOptions[option] = extraOptions[option];
33-
}
34-
}
35-
}
27+
compilerOptions = _.clone(compilerOptions);
28+
29+
_.extend(compilerOptions, extraOptions);
3630

3731
return compilerOptions;
3832
},

0 commit comments

Comments
 (0)