Skip to content

Commit 433d772

Browse files
authored
update meteor-typescript and enhance logs (#1915)
1 parent 5bbc69a commit 433d772

File tree

27 files changed

+3556
-3709
lines changed

27 files changed

+3556
-3709
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package.describe({
22
name: 'angular-compilers',
3-
version: '0.3.1_2',
3+
version: '0.3.2',
44
summary: 'Rollup, AOT, SCSS, HTML and TypeScript compilers for Angular Meteor',
55
git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-compilers',
66
documentation: 'README.md'
@@ -14,15 +14,15 @@ Package.registerBuildPlugin({
1414
use: [
1515
// Uses an external packages to get the actual compilers
1616
17-
18-
19-
17+
18+
19+
2020
]
2121
});
2222

23-
Package.onUse(function(api) {
23+
Package.onUse(function (api) {
2424
api.versionsFrom('1.6.1');
2525

2626
// Required in order to register plugins
2727
api.use('isobuild:[email protected]');
28-
});
28+
});
Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
'use strict';
2-
3-
import {
4-
AngularTsCompiler
5-
} from 'meteor/angular-typescript-compiler';
6-
7-
import {
8-
AngularHtmlCompiler
9-
} from 'meteor/angular-html-compiler';
10-
11-
import {
12-
AngularScssCompiler
13-
} from 'meteor/angular-scss-compiler';
14-
15-
let templateExtension = 'html';
16-
17-
if(process.env.BLAZE){
18-
templateExtension = 'ng.html';
19-
}
20-
21-
let aot = ((process.env.NODE_ENV == 'production') && (process.env.AOT != '0')) || process.env.AOT == '1';
22-
let rollup = (process.env.ROLLUP == '1');
23-
let compiler, compilerCli;
24-
try{
25-
if(aot){
26-
compiler = require('@angular/compiler');
27-
compilerCli = require('@angular/compiler-cli');
28-
}
29-
}catch(e){
30-
console.log('@angular/compiler and @angular/compiler-cli must be installed for AOT compilation!');
31-
console.log('AOT compilation disabled!');
32-
console.log('Ignore this if you are using AngularJS 1.X');
33-
aot = false;
34-
rollup = false;
35-
}
36-
37-
38-
Plugin.registerCompiler({
39-
extensions: ['ts', 'tsx'],
40-
filenames: ['tsconfig.json']
41-
}, () => new AngularTsCompiler({
42-
aot,
43-
rollup,
44-
compiler,
45-
compilerCli
46-
}));
47-
Plugin.registerCompiler({
48-
extensions: [templateExtension]
49-
}, () => new AngularHtmlCompiler({
50-
aot
51-
}));
52-
Plugin.registerCompiler({
53-
extensions: ['scss']
54-
}, () => new AngularScssCompiler({
55-
aot
56-
}));
1+
'use strict';
2+
3+
import {
4+
AngularTsCompiler
5+
} from 'meteor/angular-typescript-compiler';
6+
7+
import {
8+
AngularHtmlCompiler
9+
} from 'meteor/angular-html-compiler';
10+
11+
import {
12+
AngularScssCompiler
13+
} from 'meteor/angular-scss-compiler';
14+
15+
let templateExtension = 'html';
16+
17+
if(process.env.BLAZE){
18+
templateExtension = 'ng.html';
19+
}
20+
21+
let aot = ((process.env.NODE_ENV == 'production') && (process.env.AOT != '0')) || process.env.AOT == '1';
22+
let rollup = (process.env.ROLLUP == '1');
23+
let compiler, compilerCli;
24+
try{
25+
if(aot){
26+
compiler = require('@angular/compiler');
27+
compilerCli = require('@angular/compiler-cli');
28+
}
29+
}catch(e){
30+
console.log('@angular/compiler and @angular/compiler-cli must be installed for AOT compilation!');
31+
console.log('AOT compilation disabled!');
32+
console.log('Ignore this if you are using AngularJS 1.X');
33+
aot = false;
34+
rollup = false;
35+
}
36+
37+
38+
Plugin.registerCompiler({
39+
extensions: ['ts', 'tsx'],
40+
filenames: ['tsconfig.json']
41+
}, () => new AngularTsCompiler({
42+
aot,
43+
rollup,
44+
compiler,
45+
compilerCli
46+
}));
47+
Plugin.registerCompiler({
48+
extensions: [templateExtension]
49+
}, () => new AngularHtmlCompiler({
50+
aot
51+
}));
52+
Plugin.registerCompiler({
53+
extensions: ['scss']
54+
}, () => new AngularScssCompiler({
55+
aot
56+
}));
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Package.describe({
2-
name: 'angular-html-compiler',
3-
version: '0.3.1_2',
4-
summary: 'Angular Html Compiler Package',
5-
git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-html-compiler',
6-
documentation: null
7-
});
8-
9-
Npm.depends({
10-
'cheerio': '0.22.0'
11-
});
12-
13-
Package.onUse(function(api) {
14-
api.versionsFrom('1.6.1');
15-
api.use([
16-
'ecmascript'
17-
], 'server');
18-
api.mainModule('index.js', 'server');
19-
});
1+
Package.describe({
2+
name: 'angular-html-compiler',
3+
version: '0.3.2',
4+
summary: 'Angular Html Compiler Package',
5+
git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-html-compiler',
6+
documentation: null
7+
});
8+
9+
Npm.depends({
10+
'cheerio': '0.22.0'
11+
});
12+
13+
Package.onUse(function (api) {
14+
api.versionsFrom('1.6.1');
15+
api.use([
16+
'ecmascript'
17+
], 'server');
18+
api.mainModule('index.js', 'server');
19+
});
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Package.describe({
2-
name: 'angular-scss-compiler',
3-
version: '0.3.1_2',
4-
summary: 'Angular Scss Compiler Package',
5-
git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-scss-compiler',
6-
documentation: null
7-
});
8-
9-
Npm.depends({
10-
'node-sass': '4.9.0'
11-
});
12-
13-
Package.onUse(function(api) {
14-
api.versionsFrom('1.6');
15-
api.use([
16-
'ecmascript'
17-
], 'server');
18-
api.mainModule('index.js', 'server');
19-
});
1+
Package.describe({
2+
name: 'angular-scss-compiler',
3+
version: '0.3.2',
4+
summary: 'Angular Scss Compiler Package',
5+
git: 'https://github.com/Urigo/angular-meteor/tree/master/atmosphere-packages/angular-scss-compiler',
6+
documentation: null
7+
});
8+
9+
Npm.depends({
10+
'node-sass': '4.9.0'
11+
});
12+
13+
Package.onUse(function (api) {
14+
api.versionsFrom('1.6');
15+
api.use([
16+
'ecmascript'
17+
], 'server');
18+
api.mainModule('index.js', 'server');
19+
});

0 commit comments

Comments
 (0)