Skip to content

Commit 6955576

Browse files
johnpapajohnpapa
committed
Merge pull request johnpapa#12 from johnpapa/fixes
Fixes
2 parents efc6b5e + ac5b6af commit 6955576

File tree

7 files changed

+1691
-60
lines changed

7 files changed

+1691
-60
lines changed

‎gulp.config.js‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ module.exports = function() {
1414
ignorePath: '../..'
1515
};
1616
var nodeModules = 'node_modules';
17-
var typings = './typings/';
1817

1918
var config = {
2019
/**
@@ -24,33 +23,17 @@ module.exports = function() {
2423
// All typescript settings
2524
ts: {
2625
// all typescript that we want to vet
27-
allts: [
28-
'./src/**/*.ts',
29-
'./*.ts'
30-
],
26+
// allts: [
27+
// './src/**/*.ts',
28+
// './*.ts'
29+
// ],
3130
clientts: [
3231
'./src/client/**/*.ts'
3332
],
3433
serverts: [
3534
'./src/server/**/*.ts'
36-
],
37-
defs: typings + '**/*.ts',
38-
output: '.tmp',
39-
refs: typings + 'app.d.ts',
40-
appRefs: '.tmp/typings/app-dts/',
41-
transformFn: function (filepath) {
42-
return '/// <reference path="..' + filepath + '" />';
43-
},
44-
tscOptions: {
45-
target: 'ES5',
46-
declarationFiles: true,
47-
noExternalResolve: true,
48-
module: 'commonjs',
49-
noImplicitAny: true,
50-
removeComments: false,
51-
sortOutput: true
52-
},
53-
typings: typings
35+
]
36+
// output: '.tmp'
5437
},
5538

5639
// all javascript that we want to vet

‎gulpfile.js‎

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -48,30 +48,7 @@ gulp.task('default', ['help']);
4848
//});
4949

5050
/**
51-
* Creates the app.d.ts file with all references to *.ts files
52-
* Not needed if we use the `files: undefined` in tsconfig.json
53-
*/
54-
//gulp.task('ts-create-refs', function () {
55-
// var source = gulp.src(config.ts.allts, { read: false });
56-
// var injectOptions = {
57-
// starttag: '//{',
58-
// endtag: '//}',
59-
// transform: config.ts.transformFn
60-
// };
61-
//
62-
// fs.writeFile(config.ts.refs, '//{\n//}', function(err) {
63-
// if(err) { return log(err); }
64-
// log('The file was saved!');
65-
// });
66-
//
67-
// return gulp.src(config.ts.refs)
68-
// .pipe($.inject(source, injectOptions))
69-
// .pipe($.if(args.verbose, $.print()))
70-
// .pipe(gulp.dest(config.ts.typings));
71-
//});
72-
73-
/**
74-
* Watch TypeScript and recompile and create refs
51+
* Watch TypeScript and recompile
7552
*/
7653
gulp.task('ts-watcher', ['ts-watcher-client', 'ts-watcher-server']);
7754

@@ -85,15 +62,14 @@ gulp.task('ts-watcher-server', function() {
8562

8663
/**
8764
* Compiles *.js files, sourcemaps,
88-
* and optionally d.ts files (if passed --dts)
8965
*/
90-
gulp.task('ts-compile', ['ts-compile-client', 'ts-compile-server']);
66+
gulp.task('tsc', ['tsc-client', 'tsc-server']);
9167

92-
gulp.task('ts-compile-client', function(done) {
68+
gulp.task('tsc-client', function(done) {
9369
runTSC('src/client', done);
9470
});
9571

96-
gulp.task('ts-compile-server', function(done) {
72+
gulp.task('tsc-server', function(done) {
9773
runTSC('src/server', done);
9874
});
9975

@@ -459,6 +435,11 @@ gulp.task('bump', function() {
459435
.pipe(gulp.dest(config.root));
460436
});
461437

438+
/**
439+
* Optimize the code and re-load browserSync
440+
*/
441+
gulp.task('browserSyncReload', ['optimize'], browserSync.reload);
442+
462443
////////////////
463444

464445
/**
@@ -588,7 +569,7 @@ function startBrowserSync(isDev, specRunner) {
588569
gulp.watch([config.less], ['styles'])
589570
.on('change', changeEvent);
590571
} else {
591-
gulp.watch([].concat(config.less, config.js, config.html), ['optimize', browserSync.reload])
572+
gulp.watch([config.less, config.js, config.html], ['browserSyncReload'])
592573
.on('change', changeEvent);
593574
}
594575

‎typings/angularjs/angular-mocks.d.ts‎

Lines changed: 236 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,236 @@
1+
// Type definitions for Angular JS 1.3 (ngMock, ngMockE2E module)
2+
// Project: http://angularjs.org
3+
// Definitions by: Diego Vilar <http://github.com/diegovilar>
4+
// Definitions: https://github.com/borisyankov/DefinitelyTyped
5+
6+
/// <reference path="angular.d.ts" />
7+
8+
declare module "angular-mocks/ngMock" {
9+
var _: string;
10+
export = _;
11+
}
12+
13+
declare module "angular-mocks/ngAnimateMock" {
14+
var _: string;
15+
export = _;
16+
}
17+
18+
///////////////////////////////////////////////////////////////////////////////
19+
// functions attached to global object (window)
20+
///////////////////////////////////////////////////////////////////////////////
21+
declare var module: (...modules: any[]) => any;
22+
declare var inject: (...fns: Function[]) => any;
23+
24+
///////////////////////////////////////////////////////////////////////////////
25+
// ngMock module (angular-mocks.js)
26+
///////////////////////////////////////////////////////////////////////////////
27+
declare module angular {
28+
29+
///////////////////////////////////////////////////////////////////////////
30+
// AngularStatic
31+
// We reopen it to add the MockStatic definition
32+
///////////////////////////////////////////////////////////////////////////
33+
interface IAngularStatic {
34+
mock: IMockStatic;
35+
}
36+
37+
interface IMockStatic {
38+
// see http://docs.angularjs.org/api/angular.mock.dump
39+
dump(obj: any): string;
40+
41+
// see http://docs.angularjs.org/api/angular.mock.inject
42+
inject(...fns: Function[]): any;
43+
inject(...inlineAnnotatedConstructor: any[]): any; // this overload is undocumented, but works
44+
45+
// see http://docs.angularjs.org/api/angular.mock.module
46+
module(...modules: any[]): any;
47+
48+
// see http://docs.angularjs.org/api/angular.mock.TzDate
49+
TzDate(offset: number, timestamp: number): Date;
50+
TzDate(offset: number, timestamp: string): Date;
51+
}
52+
53+
///////////////////////////////////////////////////////////////////////////
54+
// ExceptionHandlerService
55+
// see http://docs.angularjs.org/api/ngMock.$exceptionHandler
56+
// see http://docs.angularjs.org/api/ngMock.$exceptionHandlerProvider
57+
///////////////////////////////////////////////////////////////////////////
58+
interface IExceptionHandlerProvider extends IServiceProvider {
59+
mode(mode: string): void;
60+
}
61+
62+
///////////////////////////////////////////////////////////////////////////
63+
// TimeoutService
64+
// see http://docs.angularjs.org/api/ngMock.$timeout
65+
// Augments the original service
66+
///////////////////////////////////////////////////////////////////////////
67+
interface ITimeoutService {
68+
flush(delay?: number): void;
69+
flushNext(expectedDelay?: number): void;
70+
verifyNoPendingTasks(): void;
71+
}
72+
73+
///////////////////////////////////////////////////////////////////////////
74+
// IntervalService
75+
// see http://docs.angularjs.org/api/ngMock.$interval
76+
// Augments the original service
77+
///////////////////////////////////////////////////////////////////////////
78+
interface IIntervalService {
79+
flush(millis?: number): number;
80+
}
81+
82+
///////////////////////////////////////////////////////////////////////////
83+
// LogService
84+
// see http://docs.angularjs.org/api/ngMock.$log
85+
// Augments the original service
86+
///////////////////////////////////////////////////////////////////////////
87+
interface ILogService {
88+
assertEmpty(): void;
89+
reset(): void;
90+
}
91+
92+
interface ILogCall {
93+
logs: string[];
94+
}
95+
96+
///////////////////////////////////////////////////////////////////////////
97+
// HttpBackendService
98+
// see http://docs.angularjs.org/api/ngMock.$httpBackend
99+
///////////////////////////////////////////////////////////////////////////
100+
interface IHttpBackendService {
101+
flush(count?: number): void;
102+
resetExpectations(): void;
103+
verifyNoOutstandingExpectation(): void;
104+
verifyNoOutstandingRequest(): void;
105+
106+
expect(method: string, url: string, data?: string, headers?: Object): mock.IRequestHandler;
107+
expect(method: string, url: string, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
108+
expect(method: string, url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
109+
expect(method: string, url: string, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
110+
expect(method: string, url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
111+
expect(method: string, url: string, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
112+
expect(method: string, url: string, data?: Object, headers?: Object): mock.IRequestHandler;
113+
expect(method: string, url: string, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
114+
expect(method: string, url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
115+
expect(method: string, url: RegExp, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
116+
expect(method: string, url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
117+
expect(method: string, url: RegExp, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
118+
expect(method: string, url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
119+
expect(method: string, url: RegExp, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
120+
expect(method: string, url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
121+
expect(method: string, url: RegExp, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
122+
123+
expectDELETE(url: string, headers?: Object): mock.IRequestHandler;
124+
expectDELETE(url: RegExp, headers?: Object): mock.IRequestHandler;
125+
expectGET(url: string, headers?: Object): mock.IRequestHandler;
126+
expectGET(url: RegExp, headers?: Object): mock.IRequestHandler;
127+
expectHEAD(url: string, headers?: Object): mock.IRequestHandler;
128+
expectHEAD(url: RegExp, headers?: Object): mock.IRequestHandler;
129+
expectJSONP(url: string): mock.IRequestHandler;
130+
expectJSONP(url: RegExp): mock.IRequestHandler;
131+
132+
expectPATCH(url: string, data?: string, headers?: Object): mock.IRequestHandler;
133+
expectPATCH(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
134+
expectPATCH(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
135+
expectPATCH(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
136+
expectPATCH(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
137+
expectPATCH(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
138+
expectPATCH(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
139+
expectPATCH(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
140+
141+
expectPOST(url: string, data?: string, headers?: Object): mock.IRequestHandler;
142+
expectPOST(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
143+
expectPOST(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
144+
expectPOST(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
145+
expectPOST(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
146+
expectPOST(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
147+
expectPOST(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
148+
expectPOST(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
149+
150+
expectPUT(url: string, data?: string, headers?: Object): mock.IRequestHandler;
151+
expectPUT(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
152+
expectPUT(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
153+
expectPUT(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
154+
expectPUT(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
155+
expectPUT(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
156+
expectPUT(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
157+
expectPUT(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
158+
159+
when(method: string, url: string, data?: string, headers?: Object): mock.IRequestHandler;
160+
when(method: string, url: string, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
161+
when(method: string, url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
162+
when(method: string, url: string, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
163+
when(method: string, url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
164+
when(method: string, url: string, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
165+
when(method: string, url: string, data?: Object, headers?: Object): mock.IRequestHandler;
166+
when(method: string, url: string, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
167+
when(method: string, url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
168+
when(method: string, url: RegExp, data?: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
169+
when(method: string, url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
170+
when(method: string, url: RegExp, data?: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
171+
when(method: string, url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
172+
when(method: string, url: RegExp, data?: (data: string) => boolean, headers?: (object: Object) => boolean): mock.IRequestHandler;
173+
when(method: string, url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
174+
when(method: string, url: RegExp, data?: Object, headers?: (object: Object) => boolean): mock.IRequestHandler;
175+
176+
whenDELETE(url: string, headers?: Object): mock.IRequestHandler;
177+
whenDELETE(url: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
178+
whenDELETE(url: RegExp, headers?: Object): mock.IRequestHandler;
179+
whenDELETE(url: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
180+
181+
whenGET(url: string, headers?: Object): mock.IRequestHandler;
182+
whenGET(url: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
183+
whenGET(url: RegExp, headers?: Object): mock.IRequestHandler;
184+
whenGET(url: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
185+
186+
whenHEAD(url: string, headers?: Object): mock.IRequestHandler;
187+
whenHEAD(url: string, headers?: (object: Object) => boolean): mock.IRequestHandler;
188+
whenHEAD(url: RegExp, headers?: Object): mock.IRequestHandler;
189+
whenHEAD(url: RegExp, headers?: (object: Object) => boolean): mock.IRequestHandler;
190+
191+
whenJSONP(url: string): mock.IRequestHandler;
192+
whenJSONP(url: RegExp): mock.IRequestHandler;
193+
194+
whenPATCH(url: string, data?: string, headers?: Object): mock.IRequestHandler;
195+
whenPATCH(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
196+
whenPATCH(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
197+
whenPATCH(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
198+
whenPATCH(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
199+
whenPATCH(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
200+
whenPATCH(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
201+
whenPATCH(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
202+
203+
whenPOST(url: string, data?: string, headers?: Object): mock.IRequestHandler;
204+
whenPOST(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
205+
whenPOST(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
206+
whenPOST(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
207+
whenPOST(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
208+
whenPOST(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
209+
whenPOST(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
210+
whenPOST(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
211+
212+
whenPUT(url: string, data?: string, headers?: Object): mock.IRequestHandler;
213+
whenPUT(url: string, data?: RegExp, headers?: Object): mock.IRequestHandler;
214+
whenPUT(url: string, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
215+
whenPUT(url: string, data?: Object, headers?: Object): mock.IRequestHandler;
216+
whenPUT(url: RegExp, data?: string, headers?: Object): mock.IRequestHandler;
217+
whenPUT(url: RegExp, data?: RegExp, headers?: Object): mock.IRequestHandler;
218+
whenPUT(url: RegExp, data?: (data: string) => boolean, headers?: Object): mock.IRequestHandler;
219+
whenPUT(url: RegExp, data?: Object, headers?: Object): mock.IRequestHandler;
220+
}
221+
222+
export module mock {
223+
224+
// returned interface by the the mocked HttpBackendService expect/when methods
225+
interface IRequestHandler {
226+
respond(func: Function): void;
227+
respond(status: number, data?: any, headers?: any): void;
228+
respond(data: any, headers?: any): void;
229+
230+
// Available wehn ngMockE2E is loaded
231+
passThrough(): void;
232+
}
233+
234+
}
235+
236+
}

‎typings/express/express.d.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,19 +537,19 @@ declare module "express" {
537537
sendFile(path: string, options: any, fn: Errback): void;
538538

539539
/**
540-
* deprecated, use sendFile instead.
540+
* @deprecated Use sendFile instead.
541541
*/
542542
sendfile(path: string): void;
543543
/**
544-
* deprecated, use sendFile instead.
544+
* @deprecated Use sendFile instead.
545545
*/
546546
sendfile(path: string, options: any): void;
547547
/**
548-
* deprecated, use sendFile instead.
548+
* @deprecated Use sendFile instead.
549549
*/
550550
sendfile(path: string, fn: Errback): void;
551551
/**
552-
* deprecated, use sendFile instead.
552+
* @deprecated Use sendFile instead.
553553
*/
554554
sendfile(path: string, options: any, fn: Errback): void;
555555

0 commit comments

Comments
 (0)