chore(build): authentication build

Author: davideast

.gitignore

@@ -6,4 +6,6 @@ typings/
 npm-debug.log
 .idea/
 .vscode/settings.json
-angularfire2-*.tgz
+angularfire2-*.tgz
+*.ngfactory.ts
+*.ngsummary.json

src/auth/auth.module.ts

@@ -1,7 +1,7 @@
 import { NgModule, NgZone } from '@angular/core';
 import * as firebase from 'firebase/app';
 import 'firebase/auth';
-import { FirebaseApp, AngularFireModule } from '../core';
+import { FirebaseApp, AngularFireModule } from 'angularfire2';
 import { AngularFireAuth } from './auth';
 
 export function _getAngularFireAuth(app: FirebaseApp) {

src/auth/auth.ts

@@ -1,12 +1,12 @@
 import * as firebase from 'firebase/app';
-import * as utils from '../utils';
 import 'firebase/auth';
 import { Injectable, NgZone } from '@angular/core';
-import { Auth } from '../interfaces';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { observeOn } from 'rxjs/operator/observeOn';
-import { FirebaseApp } from '../core';
+import { FirebaseApp, ZoneScheduler } from 'angularfire2';
+
+export type Auth = firebase.auth.Auth;
 
 @Injectable()
 export class AngularFireAuth {
@@ -47,7 +47,7 @@ export function FirebaseAuthStateObservable(app: FirebaseApp): Observable<fireba
       () => observer.complete()
     );
   });
-  return observeOn.call(authState, new utils.ZoneScheduler(Zone.current));
+  return observeOn.call(authState, new ZoneScheduler(Zone.current));
 }
 
 /**
@@ -63,5 +63,5 @@ export function FirebaseIdTokenObservable(app: FirebaseApp): Observable<firebase
       () => observer.complete()
     )
   });
-  return observeOn.call(idToken, new utils.ZoneScheduler(Zone.current));
+  return observeOn.call(idToken, new ZoneScheduler(Zone.current));
 }

src/auth/package.json

@@ -1 +1,30 @@
-{ "main": "../bundles/angularfire2.umd.js" }
+{
+  "name": "angularfire2/auth",
+  "version": "ANGULARFIRE2_VERSION",
+  "description": "The auth module",
+  "main": "../bundles/auth.umd.js",
+  "module": "index.js",
+  "es2015": "./es2015/index.js",
+  "keywords": [
+    "angular",
+    "firebase",
+    "rxjs"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/angular/angularfire2.git"
+  },
+  "author": "angular,firebase",
+  "license": "MIT",
+  "peerDependencies": {
+    "angularfire2": "ANGULARFIRE2_VERSION",
+    "@angular/common": "ANGULAR_VERSION",
+    "@angular/core": "ANGULAR_VERSION",
+    "@angular/platform-browser": "ANGULAR_VERSION",
+    "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
+    "firebase": "FIREBASE_VERSION",
+    "rxjs": "RXJS_VERSION",
+    "zone.js": "ZONEJS_VERSION"
+  },
+  "typings": "index.d.ts"
+}

src/auth/tsconfig-build.json

@@ -1,30 +1,36 @@
 {
   "compilerOptions": {
+    "baseUrl": ".",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "module": "es2015",
     "target": "es2015",
     "noImplicitAny": false,
-    "outDir": "../../dist/packages/auth",
+    "outDir": "../../dist/packages-dist/auth/es2015",
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "declaration": true,
+    "declaration": false,
     "removeComments": true,
     "strictNullChecks": true,
     "lib": [
       "es2015",
       "dom"
     ],
     "skipLibCheck": true,
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "paths": {
+      "angularfire2": ["../../dist/packages-dist"]
+    }
   },
   "files": [
     "index.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "enableSummariesForJit": false
   }
 }
+

src/auth/tsconfig-esm.json

@@ -1,7 +1,8 @@
 {
-  "extends": "tsconfig-build.json",
+  "extends": "./tsconfig-build.json",
   "compilerOptions": {
     "target": "es5",
-    "outDir": "../../dist/packages-dist/auth"
+    "outDir": "../../dist/packages-dist/auth",
+    "declaration": true
   }
 }

src/core/angularfire2.ts

@@ -34,4 +34,20 @@ export class AngularFireModule {
   }
 }
 
+import { Subscription } from 'rxjs/Subscription';
+import { Scheduler } from 'rxjs/Scheduler';
+import { queue } from 'rxjs/scheduler/queue';
+
+/**
+ * TODO: remove this scheduler once Rx has a more robust story for working
+ * with zones.
+ */
+export class ZoneScheduler {
+  constructor(public zone: Zone) {}
+
+  schedule(...args): Subscription {
+    return <Subscription>this.zone.run(() => queue.schedule.apply(queue, args));
+  }
+}
+
 export { FirebaseApp, FirebaseAppName, FirebaseAppConfigToken };

src/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angularfire2",
-  "version": "4.0.0-rc.1",
+  "version": "ANGULARFIRE2_VERSION",
   "description": "The core module",
   "main": "./bundles/core.umd.js",
   "module": "index.js",
@@ -17,13 +17,13 @@
   "author": "angular,firebase",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/common": "^4.0.0",
-    "@angular/core": "^4.0.0",
-    "@angular/platform-browser": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^4.0.0",
-    "firebase": "^4.0.0",
-    "rxjs": "^5.0.1",
-    "zone.js": "^0.8.0"
+    "@angular/common": "ANGULAR_VERSION",
+    "@angular/core": "ANGULAR_VERSION",
+    "@angular/platform-browser": "ANGULAR_VERSION",
+    "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
+    "firebase": "FIREBASE_VERSION",
+    "rxjs": "RXJS_VERSION",
+    "zone.js": "ZONEJS_VERSION"
   },
   "typings": "index.d.ts"
 }

src/interfaces.ts

@@ -86,4 +86,3 @@ export type DatabaseReference = firebase.database.Reference;
 export type DatabaseQuery = firebase.database.Query;
 export type QueryReference = DatabaseReference | DatabaseQuery;
 export type PathReference = QueryReference | string;
-export type Auth = firebase.auth.Auth;

src/utils.ts

@@ -122,15 +122,3 @@ export function getRef(app: FirebaseApp, pathRef: PathReference): DatabaseRefere
   }
   return app.database().ref(path);
 }
-
-/**
- * TODO: remove this scheduler once Rx has a more robust story for working
- * with zones.
- */
-export class ZoneScheduler {
-  constructor(public zone: Zone) {}
-
-  schedule(...args): Subscription {
-    return <Subscription>this.zone.run(() => queue.schedule.apply(queue, args));
-  }
-}

tools/build.js

@@ -1,8 +1,39 @@
 const { rollup } = require('rollup');
 const { spawn } = require('child_process');
 const { Observable } = require('rxjs');
-const { copy, rename, readdirSync } = require('fs-extra');
+const { copy } = require('fs-extra');
 
+// Rollup globals
+const GLOBALS = {
+  'rxjs/Observable': 'Rx',
+  'rxjs/Subject': 'Rx',
+  'rxjs/Observer': 'Rx',
+  'rxjs/Subscription': 'Rx',
+  'rxjs/observable/merge': 'Rx.Observable',
+  'rxjs/operator/share': 'Rx.Observable.prototype',
+  'rxjs/operator/observeOn': 'Rx.Observable.prototype',
+  'rxjs/operator': 'Rx.Observable.prototype',
+  '@angular/core': 'ng.core',
+  '@angular/compiler': 'ng.compiler',
+  '@angular/platform-browser': 'ng.platformBrowser',
+  'firebase/auth': 'firebase',
+  'firebase/app': 'firebase',
+  'firebase/database': 'firebase',
+  'rxjs/scheduler/queue': 'Rx.Scheduler',
+  '@angular/core/testing': 'ng.core.testing',
+  'angularfire2': 'angularfire2'
+};
+
+// constants for running typescript commands
+const TSC = 'node_modules/.bin/tsc';
+const NGC = 'node_modules/.bin/ngc';
+const TSC_ARGS = (name, config = 'build') => [`-p`, `${process.cwd()}/src/${name}/tsconfig-${config}.json`];
+
+/**
+ * Create an Observable of a spawned child process.
+ * @param {string} command 
+ * @param {string[]} args 
+ */
 function spawnObservable(command, args) {
   return Observable.create(observer => {
     const cmd = spawn(command, args);
@@ -13,7 +44,7 @@ function spawnObservable(command, args) {
   });
 }
 
-function createUmd(name) {
+function createUmd(name, globals) {
   // core module is angularfire2 the rest are angularfire2.feature
   const moduleName = name === 'core' ? 'angularfire2' : `angularfire2.${name}`;
   // core is at the root and the rest are in their own folders
@@ -23,11 +54,15 @@ function createUmd(name) {
     .then(bundle => {
       const result = bundle.generate({
         format: 'umd',
+        external: Object.keys(globals),
+        globals,
         moduleName
       });
       return bundle.write({
         format: 'umd',
-        dest: `${process.cwd()}/dist/bundles/${name}.umd.js`,
+        dest: `${process.cwd()}/dist/packages-dist/bundles/${name}.umd.js`,
+        external: Object.keys(globals),
+        globals,
         moduleName
       });
     });
@@ -55,23 +90,25 @@ function copyPackage(moduleName) {
   return copy(getSrcPackageFile(moduleName), getDestPackageFile(moduleName));
 }
 
-// constants for running typescript commands
-const TSC = 'node_modules/.bin/tsc';
-const NGC = 'node_modules/.bin/ngc';
-const TSC_ARGS = (name, config = 'build') => [`-p`, `${process.cwd()}/src/${name}/tsconfig-${config}.json`];
-
-function buildModule(name) {
-  // Run tsc on module (TS -> ES2015)
-  const es2015$ = spawnObservable(TSC, TSC_ARGS(name));
-  const esm$ = spawnObservable(TSC, TSC_ARGS(name, 'esm'));
+function buildModule(name, globals) {
+  const es2015$ = spawnObservable(NGC, TSC_ARGS(name));
+  const esm$ = spawnObservable(NGC, TSC_ARGS(name, 'esm'));
   return Observable
     .forkJoin(es2015$, esm$)
-    .mergeMap(() => Observable.from(createUmd(name)))
-    .mergeMap(() => Observable.from(copyPackage(name)));
+    .switchMap(() => Observable.from(createUmd(name, globals)))
+    .switchMap(() => Observable.from(copyPackage(name)));
+}
+
+function buildLibrary(globals) {
+  const core$ = buildModule('core', globals);
+  const auth$ = buildModule('auth', globals);
+  return Observable
+    .forkJoin(core$)
+    .switchMapTo(auth$);
 }
 
-buildModule('core').subscribe(
-  data => { console.log(data) },
-  err => { console.log(err) },
+const $lib = buildLibrary(GLOBALS).subscribe(
+  data => { console.log('data', data) },
+  err => { console.log('err', err) },
   () => { console.log('complete') }
 );