Skip to content

Commit c171e42

Browse files
committed
chore(worker): move worker exports into separate files
Closes angular#91
1 parent 596bd36 commit c171e42

File tree

5 files changed

+27
-18
lines changed

5 files changed

+27
-18
lines changed

src/angularfire2.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
AngularFire,
1515
FirebaseObjectObservable,
1616
FIREBASE_PROVIDERS,
17-
WORKER_APP_FIREBASE_PROVIDERS,
1817
FirebaseAuth,
1918
FirebaseUrl,
2019
FirebaseRef,

src/angularfire2.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ import {
1616
FirebaseAuthState
1717
} from './providers/auth_backend';
1818
import {FirebaseSdkAuthBackend} from './providers/firebase_sdk_auth_backend';
19-
import {WebWorkerFirebaseAuth} from './providers/web_workers/worker/auth';
20-
import {MessageBasedFirebaseAuth} from './providers/web_workers/ui/auth';
2119

2220
@Injectable()
2321
export class AngularFire {
@@ -41,7 +39,7 @@ function getAbsUrl (root:string, url:string) {
4139
return url;
4240
}
4341

44-
const COMMON_PROVIDERS: any[] = [
42+
export const COMMON_PROVIDERS: any[] = [
4543
provide(FirebaseRef, {
4644
useFactory: (url:string) => new Firebase(url),
4745
deps: [FirebaseUrl]}),
@@ -57,19 +55,6 @@ export const FIREBASE_PROVIDERS:any[] = [
5755
})
5856
];
5957

60-
export const WORKER_APP_FIREBASE_PROVIDERS: any[] = [
61-
COMMON_PROVIDERS,
62-
provide(AuthBackend, {useClass: WebWorkerFirebaseAuth})
63-
];
64-
65-
export const WORKER_RENDER_FIREBASE_PROVIDERS: any[] = [
66-
COMMON_PROVIDERS,
67-
provide(FirebaseSdkAuthBackend, {
68-
useFactory: (ref: Firebase) => new FirebaseSdkAuthBackend(ref, true),
69-
deps: [FirebaseRef]
70-
}),
71-
MessageBasedFirebaseAuth
72-
];
7358
/**
7459
* Used to define the default Firebase root location to be
7560
* used throughout an application.
@@ -91,7 +76,6 @@ export {
9176
}
9277

9378
export {FirebaseUrl, FirebaseRef, FirebaseAuthConfig} from './tokens';
94-
export {MessageBasedFirebaseAuth} from './providers/web_workers/ui/auth';
9579

9680
// Helps Angular-CLI automatically add providers
9781
export default {

src/angularfire2_worker_app.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import {provide} from 'angular2/core';
2+
import {COMMON_PROVIDERS} from './angularfire2';
3+
import {AuthBackend} from './providers/auth_backend';
4+
import {WebWorkerFirebaseAuth} from './providers/web_workers/worker/auth';
5+
6+
export const WORKER_APP_FIREBASE_PROVIDERS: any[] = [
7+
COMMON_PROVIDERS,
8+
provide(AuthBackend, {useClass: WebWorkerFirebaseAuth})
9+
];

src/angularfire2_worker_render.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import {provide} from 'angular2/core';
2+
import {COMMON_PROVIDERS} from './angularfire2';
3+
import {FirebaseSdkAuthBackend} from './providers/firebase_sdk_auth_backend';
4+
import {WebWorkerFirebaseAuth} from './providers/web_workers/worker/auth';
5+
import {FirebaseRef} from './tokens';
6+
import {MessageBasedFirebaseAuth} from './providers/web_workers/ui/auth';
7+
8+
export const WORKER_RENDER_FIREBASE_PROVIDERS: any[] = [
9+
COMMON_PROVIDERS,
10+
provide(FirebaseSdkAuthBackend, {
11+
useFactory: (ref: Firebase) => new FirebaseSdkAuthBackend(ref, true),
12+
deps: [FirebaseRef]
13+
}),
14+
MessageBasedFirebaseAuth
15+
];

tsconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
},
1414
"files": [
1515
"src/angularfire2.ts",
16+
"src/angularfire2_worker_app.ts",
17+
"src/angularfire2_worker_render.ts",
1618
"src/angularfire2.spec.ts",
1719
"src/utils/absolute_path_resolver.ts",
1820
"src/utils/firebase_list_factory.spec.ts",

0 commit comments

Comments
 (0)