chore(build): fix tests with new build

davideast · davideast · commit 38b3b2a30951 · 2017-08-04T09:39:22.000-06:00
diff --git a/.npmignore b/.npmignore
@@ -1,2 +1 @@
 *.spec.*
-
diff --git a/karma.conf.js b/karma.conf.js
@@ -26,7 +26,8 @@ module.exports = function(config) {
 
       'karma-test-shim.js',
       'node_modules/firebase/firebase.js',
-      'dist/bundles/test-root.umd.{js,map}',
+      'dist/packages-dist/bundles/core.umd.{js,map}',
+      'dist/packages-dist/bundles/test.umd.{js,map}',
     ],
 
     port: 9876,
diff --git a/package.json b/package.json
@@ -1,17 +1,17 @@
 {
   "name": "angularfire2",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.2",
   "description": "",
   "main": "bundles/angularfire2.umd.js",
   "module": "index.js",
   "scripts": {
-    "test": "npm run build && karma start --single-run",
+    "test": "karma start --single-run",
     "test:watch": "concurrently \"npm run build:watch\" \"npm run delayed_karma\"",
     "test:debug": "npm run build && karma start",
     "delayed_karma": "sleep 10 && karma start",
     "delayed_rollup": "sleep 5 && rollup --watch -c rollup.test.config.js",
     "build:watch": "rm -rf dist && concurrently \"tsc -w\" \"npm run delayed_rollup\"",
-    "build": "rm -rf dist && tsc && rollup -c rollup.test.config.js",
+    "build": "rm -rf dist && node tools/build.js",
     "build_npm": "rm -rf dist && ngc -p tsconfig.publish.es6.json && rollup -c rollup.publish.config.js && npm run postbuild_npm",
     "build_e2e": "rm -rf dist-test && npm run build && tsc -p test/ && cp test/e2e/firebase_object/index.html dist-test/e2e/firebase_object/ && cp test/e2e/firebase_list/index.html dist-test/e2e/firebase_list/ && cp test/e2e/auth/index.html dist-test/e2e/auth/",
     "postbuild_npm": "cp package.json README.md .npmignore dist/ && npm run rewrite_npm_package",
@@ -74,6 +74,7 @@
     "reflect-metadata": "0.1.2",
     "rimraf": "^2.5.4",
     "rollup": "^0.35.11",
+    "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-watch": "^2.5.0",
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
diff --git a/rollup.test.config.js b/rollup.test.config.js
@@ -4,6 +4,6 @@ export default {
   entry: 'dist/test-root.js',
   dest: 'dist/bundles/test-root.umd.js',
   format: 'umd',
-  moduleName: 'angularFire2.test',
+  moduleName: 'angularfire2.test',
   globals
 }
diff --git a/src/auth/index.spec.ts b/src/auth/index.spec.ts
@@ -0,0 +1 @@
+import './auth.spec';
diff --git a/src/auth/tsconfig-build.json b/src/auth/tsconfig-build.json
@@ -25,6 +25,7 @@
   },
   "files": [
     "index.ts",
+    "index.spec.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/auth/tsconfig-test.json b/src/auth/tsconfig-test.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig-build.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "angularfire2": ["../../dist/packages-dist"]
+    }
+  },
+  "files": [
+    "index.spec.ts"
+  ]
+}
diff --git a/src/core/angularfire2.spec.ts b/src/core/angularfire2.spec.ts
@@ -1,7 +1,7 @@
 import * as firebase from 'firebase/app';
 import { TestBed, inject, withModule, async } from '@angular/core/testing';
 import { ReflectiveInjector, Provider, PlatformRef, NgModule, Compiler, ApplicationRef, CompilerFactory } from '@angular/core';
-import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from './angularfire2';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
 import { Subscription } from 'rxjs/Subscription';
 import { COMMON_CONFIG } from './test-config';
 import { BrowserModule } from '@angular/platform-browser';
diff --git a/src/core/index.spec.ts b/src/core/index.spec.ts
@@ -0,0 +1 @@
+import './angularfire2.spec';
diff --git a/src/core/tsconfig-test.json b/src/core/tsconfig-test.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig-esm.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "angularfire2": ["../../dist/packages-dist"]
+    }
+  },
+  "files": [
+    "index.spec.ts"
+  ]
+}
diff --git a/src/database/firebase_list_factory.spec.ts b/src/database/firebase_list_factory.spec.ts
@@ -578,8 +578,8 @@ describe('FirebaseListFactory', () => {
 
     it('should call off on all events when disposed', (done: any) => {
       const questionRef = app.database().ref().child('questions');
-      let firebaseSpy = spyOn(questionRef, 'off').and.callThrough();
       subscription = FirebaseListFactory(questionRef).subscribe(_ => {
+        let firebaseSpy = spyOn(questionRef, 'off').and.callThrough();
         expect(firebaseSpy).not.toHaveBeenCalled();
         subscription.unsubscribe();
         expect(firebaseSpy).toHaveBeenCalled();
diff --git a/src/database/index.spec.ts b/src/database/index.spec.ts
@@ -0,0 +1,5 @@
+import './firebase_list_factory.spec';
+import './firebase_object_factory.spec';
+import './firebase_list_observable.spec';
+import './firebase_object_observable.spec';
+import './query_observable.spec';
diff --git a/src/database/tsconfig-build.json b/src/database/tsconfig-build.json
@@ -25,6 +25,7 @@
   },
   "files": [
     "index.ts",
+    "index.spec.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/database/tsconfig-test.json b/src/database/tsconfig-test.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig-build.json",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "angularfire2": ["../../dist/packages-dist"]
+    }
+  },
+  "files": [
+    "index.spec.ts"
+  ]
+}
diff --git a/src/root.spec.js b/src/root.spec.js
@@ -0,0 +1,8 @@
+// These paths are written to use the dist build
+export * from './packages-dist/angularfire2.spec';
+export * from './packages-dist/database/firebase_list_factory.spec';
+export * from './packages-dist/database/firebase_object_factory.spec';
+export * from './packages-dist/database/firebase_list_observable.spec';
+export * from './packages-dist/database/firebase_object_observable.spec';
+export * from './packages-dist/database/query_observable.spec';
+export * from './packages-dist/auth/auth.spec';
diff --git a/src/test-root.ts b/src/test-root.ts
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "angularfire2": ["./core"],
+      "angularfire2/auth": ["./auth"],
+      "angularfire2/database": ["./database"]
+    }
+  }
+}
diff --git a/tools/build.js b/tools/build.js
@@ -4,9 +4,11 @@ const { Observable } = require('rxjs');
 const { copy, readFileSync, writeFile } = require('fs-extra');
 const { prettySize } = require('pretty-size');
 const gzipSize = require('gzip-size');
+const resolve = require('rollup-plugin-node-resolve');
 
 // Rollup globals
 const GLOBALS = {
+  'rxjs': 'Rx',
   'rxjs/Observable': 'Rx',
   'rxjs/Subject': 'Rx',
   'rxjs/Observer': 'Rx',
@@ -18,8 +20,14 @@ const GLOBALS = {
   'rxjs/operator/combineLatest': 'Rx.Observable.prototype',
   'rxjs/operator/merge': 'Rx.Observable.prototype',
   'rxjs/operator/map': 'Rx.Observable.prototype',
+  'rxjs/observable/of': 'Rx.Observable',
   'rxjs/operator/auditTime': 'Rx.Observable.prototype',
   'rxjs/operator/switchMap': 'Rx.Observable.prototype',
+  'rxjs/operator/do': 'Rx.Observable.prototype',
+  'rxjs/operator/skip': 'Rx.Observable.prototype',
+  'rxjs/operator/take': 'Rx.Observable.prototype',
+  'rxjs/operator/toArray': 'Rx.Observable.prototype',
+  'rxjs/operator/toPromise': 'Rx.Observable.prototype',
   'rxjs/operator': 'Rx.Observable.prototype',
   '@angular/core': 'ng.core',
   '@angular/compiler': 'ng.compiler',
@@ -29,7 +37,9 @@ const GLOBALS = {
   'firebase/database': 'firebase',
   'rxjs/scheduler/queue': 'Rx.Scheduler',
   '@angular/core/testing': 'ng.core.testing',
-  'angularfire2': 'angularfire2'
+  'angularfire2': 'angularfire2',
+  'angularfire2/auth': 'angularfire2.auth',
+  'angularfire2/database': 'angularfire2.database'
 };
 
 // Map of dependency versions across all packages
@@ -45,6 +55,7 @@ const VERSIONS = {
 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`];
+const TSC_TEST_ARGS = [`-p`, `${process.cwd()}/src/tsconfig-test.json`];
 
 /**
  * Create an Observable of a spawned child process.
@@ -61,33 +72,53 @@ function spawnObservable(command, args) {
   });
 }
 
+function generateBundle(entry, { dest, globals, moduleName }) {
+  return rollup({ entry }).then(bundle => {
+    return bundle.write({
+      format: 'umd',
+      external: Object.keys(globals),
+      plugins: [resolve()],
+      dest,
+      globals,
+      moduleName,
+    });
+  });
+}
+
 /**
- * Create a UMD bundle given a module name
+ * Create a UMD bundle given a module name.
  * @param {string} name 
  * @param {Object} globals 
  */
 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
-  const entry = name === 'core' ? `${process.cwd()}/dist/packages-dist/index.js` : 
-    `${process.cwd()}/dist/packages-dist/${name}/index.js`;
-  return rollup({ entry })
-    .then(bundle => {
-      const result = bundle.generate({
-        format: 'umd',
-        external: Object.keys(globals),
-        globals,
-        moduleName
-      });
-      return bundle.write({
-        format: 'umd',
-        dest: `${process.cwd()}/dist/packages-dist/bundles/${name}.umd.js`,
-        external: Object.keys(globals),
-        globals,
-        moduleName
-      });
-    });
+  const MODULE_NAMES = {
+    core: 'angularfire2',
+    auth: 'angularfire2.auth',
+    database: 'angularfire2.database',
+  };
+  const ENTRIES = {
+    core: `${process.cwd()}/dist/packages-dist/index.js`,
+    auth: `${process.cwd()}/dist/packages-dist/auth/index.js`,
+    database: `${process.cwd()}/dist/packages-dist/database/index.js`,
+  };
+  const moduleName = MODULE_NAMES[name];
+  const entry = ENTRIES[name];
+  return generateBundle(entry, {
+    dest: `${process.cwd()}/dist/packages-dist/bundles/${name}.umd.js`,
+    globals,
+    moduleName
+  });
+}
+
+function createTestUmd(globals) {
+  const entry = `${process.cwd()}/dist/root.spec.js`;
+  const moduleName = 'angularfire2.test';
+  return generateBundle(entry, {
+    dest: `${process.cwd()}/dist/packages-dist/bundles/test.umd.js`,
+    globals,
+    moduleName
+  });
 }
 
 /**
@@ -133,7 +164,7 @@ function replaceVersionsObservable(name, versions) {
     });
     const outPath = getDestPackageFile(name);
     writeFile(outPath, pkg, err => {
-      if(err) {
+      if (err) {
         observer.error(err);
       } else {
         observer.next(pkg);
@@ -147,6 +178,10 @@ function copyPackage(moduleName) {
   return copy(getSrcPackageFile(moduleName), getDestPackageFile(moduleName));
 }
 
+function copyRootTest() {
+  return copy(`${process.cwd()}/src/root.spec.js`, `${process.cwd()}/dist/root.spec.js`);
+}
+
 function measure(module, gzip = true) {
   const path = `${process.cwd()}/dist/packages-dist/bundles/${module}.umd.js`;
   const file = readFileSync(path);
@@ -157,18 +192,19 @@ function measure(module, gzip = true) {
 function buildModule(name, globals) {
   const es2015$ = spawnObservable(NGC, TSC_ARGS(name));
   const esm$ = spawnObservable(NGC, TSC_ARGS(name, 'esm'));
+  const test$ = spawnObservable(TSC, TSC_ARGS(name, 'test'));
   return Observable
-    .forkJoin(es2015$, esm$)
+    .forkJoin(es2015$, esm$, test$)
     .switchMap(() => Observable.from(createUmd(name, globals)))
     .switchMap(() => replaceVersionsObservable(name, VERSIONS));
 }
 
-function buildLibrary(globals) {
+function buildModules(globals) {
   const core$ = buildModule('core', globals);
   const auth$ = buildModule('auth', globals);
   const db$ = buildModule('database', globals);
   return Observable
-    .forkJoin(core$)
+    .forkJoin(core$, Observable.from(copyRootTest()))
     .switchMapTo(auth$)
     .switchMapTo(db$)
     .do(() => {
@@ -180,7 +216,14 @@ function buildLibrary(globals) {
     });
 }
 
-const $lib = buildLibrary(GLOBALS).subscribe(
+function buildLibrary(globals) {
+  const modules$ = buildModules(globals);
+  return Observable
+    .forkJoin(modules$)
+    .switchMap(() => Observable.from(createTestUmd(globals)));
+}
+
+buildLibrary(GLOBALS).subscribe(
   data => { console.log('data', data) },
   err => { console.log('err', err) },
   () => { console.log('complete') }
diff --git a/tools/run-typings-test.js b/tools/run-typings-test.js
@@ -28,7 +28,7 @@ ncp(pathToTestSrcFolder, pathToTestFolder, () => {
   const samplePackage = require(`${pathToTestFolder}/package.sample.json`);
 
   fs.writeFileSync(`${pathToTestFolder}/package.json`, JSON.stringify(samplePackage, null, 2)
-    .replace('{{ANGULARFIRE_VERSION}}', path.resolve(__dirname, '../dist'))
+    .replace('{{ANGULARFIRE_VERSION}}', path.resolve(__dirname, '../dist/packages-dist'))
     .replace('{{FIREBASE_VERSION}}', rootPackage.dependencies.firebase)
     .replace('{{RXJS_VERSION}}', rootPackage.dependencies.rxjs)
     .replace('{{ZONE_VERSION}}', rootPackage.devDependencies['zone.js'])
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ export default {`
`4`	`4`	`entry: 'dist/test-root.js',`
`5`	`5`	`dest: 'dist/bundles/test-root.umd.js',`
`6`	`6`	`format: 'umd',`
`7`		`- moduleName: 'angularFire2.test',`
	`7`	`+ moduleName: 'angularfire2.test',`
`8`	`8`	`globals`
`9`	`9`	`}`