fix(modules): core module build

Author: davideast

src/core/package.json

@@ -2,9 +2,9 @@
   "name": "angularfire2",
   "version": "4.0.0-rc.1",
   "description": "The core module",
-  "main": "../../bundles/core.umd.js",
-  "module": "index.es5.js",
-  "es2015": "index.js",
+  "main": "./bundles/core.umd.js",
+  "module": "index.js",
+  "es2015": "es2015/index.js",
   "keywords": [
     "angular",
     "firebase",

src/core/tsconfig-build.json

@@ -5,11 +5,11 @@
     "module": "es2015",
     "target": "es2015",
     "noImplicitAny": false,
-    "outDir": "../../dist/packages/core",
+    "outDir": "../../dist/packages-dist/es2015",
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "declaration": true,
+    "declaration": false,
     "removeComments": true,
     "strictNullChecks": true,
     "lib": [

src/core/tsconfig-esm.json

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

tools/build.js

@@ -1,57 +1,76 @@
-// TS -> ES2015 -> ES5 -> UMD
-
-// tsc -> tsc -p -> rollup
-
 const { rollup } = require('rollup');
 const { spawn } = require('child_process');
 const { Observable } = require('rxjs');
-const { copy } = require('fs-extra');
+const { copy, rename, readdirSync } = require('fs-extra');
 
 function spawnObservable(command, args) {
   return Observable.create(observer => {
     const cmd = spawn(command, args);
-    observer.next('');
+    observer.next(''); // hack to kick things off, not every command will have a stdout
     cmd.stdout.on('data', (data) => { observer.next(data.toString('utf8')); });
     cmd.stderr.on('data', (data) => { observer.error(data.toString('utf8')); });
     cmd.on('close', (data) => { observer.complete(); });
   });
 }
 
-function createUmd(module) {
-  return rollup({
-    entry: `${process.cwd()}/dist/packages/${module}/index.js`
-  })
+function createUmd(name) {
+  // 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',
-        moduleName: 'angularfire2'
+        moduleName
       });
       return bundle.write({
         format: 'umd',
-        dest: `${process.cwd()}/dist/bundles/${module}.umd.js`,
-        moduleName: 'angularfire2'
+        dest: `${process.cwd()}/dist/bundles/${name}.umd.js`,
+        moduleName
       });
     });
 }
 
-function getSrcPackageFile(module) {
-  return `${process.cwd()}/src/${module}/package.json`;
+function getSrcPackageFile(moduleName) {
+  const PATHS = {
+    core: `${process.cwd()}/src/core/package.json`,
+    auth: `${process.cwd()}/src/auth/package.json`,
+    database: `${process.cwd()}/src/database/package.json`
+  };
+  return PATHS[moduleName];
+}
+
+function getDestPackageFile(moduleName) {
+  const PATHS = {
+    core: `${process.cwd()}/dist/packages-dist/package.json`,
+    auth: `${process.cwd()}/dist/packages-dist/auth/package.json`,
+    database: `${process.cwd()}/dist/packages-dist/database/package.json`
+  };
+  return PATHS[moduleName];
 }
 
-function getDestPackageFile(module) {
-  return `${process.cwd()}/dist/packages/${module}/package.json`;
+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) {
-  const module$ = spawnObservable('node_modules/.bin/tsc', [`-p`, `${process.cwd()}/src/${name}/tsconfig-build.json`]);
-  // Run tsc -> copy files -> run rollup
-  return module$
-    .mergeMap(() => {
-      return Observable.from(copy(getSrcPackageFile(name), getDestPackageFile(name)))
-    })
-    .mergeMap(() => {
-      return Observable.from(createUmd(name))
-    });
+  // Run tsc on module (TS -> ES2015)
+  return spawnObservable(TSC, TSC_ARGS(name))
+    // Copy package.json to dist/pacakges/modulename/package.json
+    // Run tsc but for ES5 target and ES2015 imports, exports to dist/packages-dist
+    // (this is for rollup)
+    .concatMap(() => spawnObservable(TSC, TSC_ARGS(name, 'esm')))
+    .concatMap(() => Observable.from(copyPackage(name)))
+    .debounceTime(2000)
+    // Use rollup to build UMD bundle to dist/bundles`
+    .concatMap(() => Observable.from(createUmd(name)));
 }
 
 buildModule('core').subscribe(