Skip to content

Commit 7b790a3

Browse files
committed
chore(build): fix check-format
1 parent e189208 commit 7b790a3

5 files changed

Lines changed: 22 additions & 18 deletions

File tree

Brocfile-js_cjs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ var typescriptTree = new TypescriptCompiler(modulesTree, {
5959
target: 'ES5',
6060
sourceMap: true,
6161
mapRoot: '', /* force sourcemaps to use relative path */
62-
module: /*system.js*/'commonjs',
62+
module: /*system.js*/ 'commonjs',
6363
allowNonTsExtensions: false,
6464
typescript: require('typescript'),
65-
//declarationFiles: true,
65+
// declarationFiles: true,
6666
noEmitOnError: true,
6767
outDir: 'angular2'
6868
});

Brocfile-js_dev.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ var es6DevTree = new TraceurCompiler(modulesTree, '.es6', '.map', {
2323
});
2424

2525
// Call Traceur again to lower the ES6 build tree to ES5
26-
var es5DevTree = new TraceurCompiler(es6DevTree, '.js', '.js.map', {modules: 'instantiate', sourceMaps: true});
26+
var es5DevTree =
27+
new TraceurCompiler(es6DevTree, '.js', '.js.map', {modules: 'instantiate', sourceMaps: true});
2728

2829
// Now we add a few more files to the es6 tree that Traceur should not see
2930
['angular2', 'benchmarks', 'benchmarks_external', 'benchpress', 'examples', 'rtts_assert'].forEach(

Brocfile-js_prod.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ var es6ProdTree = new TraceurCompiler(modulesTree, '.es6', '.map', {
2323
});
2424

2525
// Call Traceur again to lower the ES6 build tree to ES5
26-
var es5ProdTree = new TraceurCompiler(es6ProdTree, '.js', '.js.map', {modules: 'instantiate', sourceMaps: true});
26+
var es5ProdTree =
27+
new TraceurCompiler(es6ProdTree, '.js', '.js.map', {modules: 'instantiate', sourceMaps: true});
2728

2829
// Now we add a few more files to the es6 tree that Traceur should not see
2930
['angular2', 'benchmarks', 'benchmarks_external', 'benchpress', 'examples', 'rtts_assert'].forEach(
30-
function(destDir) {
31-
var extras = new Funnel('tools/build', {files: ['es5build.js'], destDir: destDir});
32-
es6ProdTree = mergeTrees([es6ProdTree, extras]);
33-
});
31+
function(destDir) {
32+
var extras = new Funnel('tools/build', {files: ['es5build.js'], destDir: destDir});
33+
es6ProdTree = mergeTrees([es6ProdTree, extras]);
34+
});
3435

3536
var vendorScriptsTree = flatten(new Funnel('.', {
3637
files: [
@@ -46,9 +47,9 @@ var vendorScriptsTree = flatten(new Funnel('.', {
4647
]
4748
}));
4849
var vendorScripts_benchmark =
49-
new Funnel('tools/build/snippets', {files: ['url_params_to_form.js'], destDir: '/'});
50+
new Funnel('tools/build/snippets', {files: ['url_params_to_form.js'], destDir: '/'});
5051
var vendorScripts_benchmarks_external =
51-
new Funnel('node_modules/angular', {files: ['angular.js'], destDir: '/'});
52+
new Funnel('node_modules/angular', {files: ['angular.js'], destDir: '/'});
5253

5354
var servingTrees = [];
5455
function copyVendorScriptsTo(destDir) {
@@ -58,7 +59,7 @@ function copyVendorScriptsTo(destDir) {
5859
}
5960
if (destDir.indexOf('benchmarks_external') > -1) {
6061
servingTrees.push(
61-
new Funnel(vendorScripts_benchmarks_external, {srcDir: '/', destDir: destDir}));
62+
new Funnel(vendorScripts_benchmarks_external, {srcDir: '/', destDir: destDir}));
6263
}
6364
}
6465

@@ -85,7 +86,7 @@ htmlTree = replace(htmlTree, {
8586
});
8687
// TODO(broccoli): are these needed here, if not loaded by a script tag??
8788
['benchmarks/src', 'benchmarks_external/src', 'examples/src/benchpress'].forEach(
88-
copyVendorScriptsTo);
89+
copyVendorScriptsTo);
8990

9091
var scripts = mergeTrees(servingTrees, {overwrite: true});
9192
var css = new Funnel(modulesTree, {include: ["**/*.css"]});
@@ -100,4 +101,5 @@ htmlTree = mergeTrees([htmlTree, scripts, polymer, css]);
100101

101102
es5ProdTree = mergeTrees([es5ProdTree, htmlTree]);
102103

103-
module.exports = mergeTrees([stew.mv(es6ProdTree, 'js/prod/es6'), stew.mv(es5ProdTree, 'js/prod/es5')]);
104+
module.exports =
105+
mergeTrees([stew.mv(es6ProdTree, 'js/prod/es6'), stew.mv(es5ProdTree, 'js/prod/es5')]);

modules/angular2/globals.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ declare var assert: any;
66
declare var global: Window;
77
type int = number;
88

9-
interface List<T> extends Array<T> {}
9+
interface List<T> extends Array<T> {
10+
}
1011

1112
interface Window {
1213
Object: typeof Object;

modules/angular2/traceur-runtime.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ interface String {
99
* same as the corresponding elements of this object (converted to a String) starting at
1010
* position. Otherwise returns false.
1111
*/
12-
startsWith(searchString: string, position ?: number): boolean;
12+
startsWith(searchString: string, position?: number): boolean;
1313
}
1414

1515
interface NumberConstructor {
@@ -29,14 +29,14 @@ interface Array<T> {
2929
* @param end index to stop filling the array at. If end is negative, it is treated as
3030
* length+end.
3131
*/
32-
fill(value: T, start ?: number, end ?: number): T[];
32+
fill(value: T, start?: number, end?: number): T[];
3333
}
3434

3535
// Copied from lib.dom.d.ts and modified
3636
interface Map<K, V> {
3737
clear(): void;
3838
delete (key: K): boolean;
39-
forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg ?: any): void;
39+
forEach(callbackfn: (value: V, index: K, map: Map<K, V>) => void, thisArg?: any): void;
4040
get(key: K): V;
4141
has(key: K): boolean;
4242
set(key: K, value: V): Map<K, V>;
@@ -54,7 +54,7 @@ interface Set<T> {
5454
add(value: T): Set<T>;
5555
clear(): void;
5656
delete (value: T): boolean;
57-
forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg ?: any): void;
57+
forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
5858
has(value: T): boolean;
5959
size: number;
6060
}

0 commit comments

Comments
 (0)