fix(modules): WIP repacking of modules

davideast · davideast · commit d3871cb1eb1a · 2017-08-04T09:39:22.000-06:00
diff --git a/package.json b/package.json
@@ -52,6 +52,7 @@
     "conventional-changelog-cli": "^1.2.0",
     "es6-module-loader": "^0.17.10",
     "es6-shim": "^0.35.0",
+    "fs-extra": "^4.0.0",
     "gulp": "^3.9.0",
     "gulp-jasmine": "^2.2.1",
     "gulp-typescript": "^2.10.0",
diff --git a/src/angularfire2_worker_app.ts b/src/angularfire2_worker_app.ts
diff --git a/src/angularfire2_worker_render.ts b/src/angularfire2_worker_render.ts
diff --git a/src/app/index.ts b/src/app/index.ts
diff --git a/src/app/package.json b/src/app/package.json
diff --git a/src/auth.ts b/src/auth.ts
diff --git a/src/auth/auth.module.ts b/src/auth/auth.module.ts
@@ -1,8 +1,7 @@
 import { NgModule, NgZone } from '@angular/core';
 import * as firebase from 'firebase/app';
 import 'firebase/auth';
-import { FirebaseApp } from '../app/index';
-import { AngularFireModule } from '../angularfire2';
+import { FirebaseApp, AngularFireModule } from '../core';
 import { AngularFireAuth } from './auth';
 
 export function _getAngularFireAuth(app: FirebaseApp) {
diff --git a/src/auth/auth.spec.ts b/src/auth/auth.spec.ts
@@ -7,7 +7,7 @@ import { TestBed, inject } from '@angular/core/testing';
 import { _do } from 'rxjs/operator/do';
 import { take } from 'rxjs/operator/take';
 import { skip } from 'rxjs/operator/skip';
-import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '../angularfire2';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '../core';
 import { AngularFireAuth } from './auth';
 import { AngularFireAuthModule } from './auth.module';
 import { COMMON_CONFIG } from '../test-config';
diff --git a/src/auth/auth.ts b/src/auth/auth.ts
@@ -6,7 +6,7 @@ import { Auth } from '../interfaces';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { observeOn } from 'rxjs/operator/observeOn';
-import { FirebaseApp } from '../app/index';
+import { FirebaseApp } from '../core';
 
 @Injectable()
 export class AngularFireAuth {
diff --git a/src/auth/index.ts b/src/auth/index.ts
@@ -0,0 +1,2 @@
+export * from './auth';
+export * from './auth.module';
diff --git a/src/auth/tsconfig-build.json b/src/auth/tsconfig-build.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "es2015",
+    "target": "es2015",
+    "noImplicitAny": false,
+    "outDir": "../../dist/packages/auth",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "declaration": true,
+    "removeComments": true,
+    "strictNullChecks": true,
+    "lib": [
+      "es2015",
+      "dom"
+    ],
+    "skipLibCheck": true,
+    "moduleResolution": "node"
+  },
+  "files": [
+    "index.ts",
+    "../../node_modules/zone.js/dist/zone.js.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true
+  }
+}
diff --git a/src/auth/tsconfig-esm.json b/src/auth/tsconfig-esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "tsconfig-build.json",
+  "compilerOptions": {
+    "target": "es5",
+    "outDir": "../../dist/packages-dist/auth"
+  }
+}
diff --git a/src/core/angularfire2.spec.ts b/src/core/angularfire2.spec.ts
@@ -3,7 +3,7 @@ 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 { Subscription } from 'rxjs/Subscription';
-import { COMMON_CONFIG } from './test-config';
+import { COMMON_CONFIG } from '../test-config';
 import { BrowserModule } from '@angular/platform-browser';
 
 describe('angularfire', () => {
diff --git a/src/core/angularfire2.ts b/src/core/angularfire2.ts
@@ -1,9 +1,16 @@
 import * as firebase from 'firebase/app';
-import * as utils from './utils';
-import { FirebaseAppConfigToken, FirebaseApp, _firebaseAppFactory } from './app/index';
-import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts, FirebaseAppConfig } from './interfaces';
+import { FirebaseAppConfigToken, FirebaseApp, _firebaseAppFactory } from './firebase.app.module';
 import { Injectable, InjectionToken, OpaqueToken, NgModule } from '@angular/core';
 
+export interface FirebaseAppConfig {
+  apiKey?: string;
+  authDomain?: string;
+  databaseURL?: string;
+  storageBucket?: string;
+  messagingSenderId?: string;
+  projectId?: string;
+}
+
 const FirebaseAppName = new InjectionToken<string>('FirebaseAppName');
 
 export const FirebaseAppProvider = {
@@ -27,4 +34,4 @@ export class AngularFireModule {
   }
 }
 
-export { FirebaseApp, FirebaseAppName, FirebaseAppConfigToken, FirebaseAppConfig };
+export { FirebaseApp, FirebaseAppName, FirebaseAppConfigToken };
diff --git a/src/core/firebase.app.module.ts b/src/core/firebase.app.module.ts
@@ -1,5 +1,5 @@
 import { InjectionToken, } from '@angular/core';
-import { FirebaseAppConfig } from '../interfaces';
+import { FirebaseAppConfig } from './';
 import * as firebase from 'firebase/app';
 
 export const FirebaseAppConfigToken = new InjectionToken<FirebaseAppConfig>('FirebaseAppConfigToken');
diff --git a/src/core/index.ts b/src/core/index.ts
@@ -0,0 +1 @@
+export * from './angularfire2';
diff --git a/src/core/package.json b/src/core/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "angularfire2",
+  "version": "4.0.0-rc.1",
+  "description": "The core module",
+  "main": "../../bundles/core.umd.js",
+  "module": "index.es5.js",
+  "es2015": "index.js",
+  "keywords": [
+    "angular",
+    "firebase",
+    "rxjs"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/angular/angularfire2.git"
+  },
+  "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"
+  },
+  "typings": "index.d.ts"
+}
diff --git a/src/core/tsconfig-build.json b/src/core/tsconfig-build.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "es2015",
+    "target": "es2015",
+    "noImplicitAny": false,
+    "outDir": "../../dist/packages/core",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "declaration": true,
+    "removeComments": true,
+    "strictNullChecks": true,
+    "lib": [
+      "es2015",
+      "dom"
+    ],
+    "skipLibCheck": true,
+    "moduleResolution": "node"
+  },
+  "files": [
+    "index.ts",
+    "../../node_modules/zone.js/dist/zone.js.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true
+  }
+}
diff --git a/src/core/tsconfig-esm.json b/src/core/tsconfig-esm.json
@@ -0,0 +1,7 @@
+{
+  "extends": "tsconfig-build.json",
+  "compilerOptions": {
+    "target": "es5",
+    "outDir": "../../dist/packages-dist/core"
+  }
+}
diff --git a/src/database.ts b/src/database.ts
diff --git a/src/database/database.module.ts b/src/database/database.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import * as firebase from 'firebase/app';
 import 'firebase/database';
-import { AngularFireModule, FirebaseApp } from '../angularfire2';
+import { AngularFireModule, FirebaseApp } from '../core';
 import { AngularFireDatabase } from './database';
 
 export function _getAngularFireDatabase(app: FirebaseApp) {
diff --git a/src/database/database.ts b/src/database/database.ts
@@ -1,7 +1,7 @@
 import * as firebase from 'firebase/app';
 import 'firebase/database';
 import { Inject, Injectable } from '@angular/core';
-import { FirebaseAppConfigToken, FirebaseAppConfig, FirebaseApp } from '../angularfire2';
+import { FirebaseAppConfigToken, FirebaseAppConfig, FirebaseApp } from '../core';
 import { FirebaseListFactory } from './firebase_list_factory';
 import { FirebaseListObservable } from './firebase_list_observable';
 import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts, PathReference } from '../interfaces';
diff --git a/src/database/index.ts b/src/database/index.ts
@@ -0,0 +1,7 @@
+export * from './database';
+export * from './firebase_list_factory';
+export * from './firebase_list_observable';
+export * from './firebase_object_factory';
+export * from './firebase_object_observable';
+export * from './query_observable';
+export * from './database.module';
diff --git a/src/database/tsconfig-build.json b/src/database/tsconfig-build.json
diff --git a/src/index.ts b/src/index.ts
diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -1,15 +1,6 @@
 import * as firebase from 'firebase/app';
 import { Observable } from 'rxjs/Observable';
 
-export interface FirebaseAppConfig {
-  apiKey?: string;
-  authDomain?: string;
-  databaseURL?: string;
-  storageBucket?: string;
-  messagingSenderId?: string;
-  projectId?: string;
-}
-
 export interface FirebaseOperationCases {
   stringCase: () => firebase.Promise<void>;
   firebaseCase?: () => firebase.Promise<void>;
@@ -95,4 +86,4 @@ 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;
+export type Auth = firebase.auth.Auth;
diff --git a/src/test-root.ts b/src/test-root.ts
@@ -1,4 +1,4 @@
-import './angularfire2.spec';
+import './core/angularfire2.spec';
 import './database/firebase_list_factory.spec';
 import './database/firebase_object_factory.spec';
 import './database/firebase_list_observable.spec';
diff --git a/tools/build.js b/tools/build.js
@@ -0,0 +1,61 @@
+// 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');
+
+function spawnObservable(command, args) {
+  return Observable.create(observer => {
+    const cmd = spawn(command, args);
+    observer.next('');
+    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`
+  })
+    .then(bundle => {
+      const result = bundle.generate({
+        format: 'umd',
+        moduleName: 'angularfire2'
+      });
+      return bundle.write({
+        format: 'umd',
+        dest: `${process.cwd()}/dist/bundles/${module}.umd.js`,
+        moduleName: 'angularfire2'
+      });
+    });
+}
+
+function getSrcPackageFile(module) {
+  return `${process.cwd()}/src/${module}/package.json`;
+}
+
+function getDestPackageFile(module) {
+  return `${process.cwd()}/dist/packages/${module}/package.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))
+    });
+}
+
+buildModule('core').subscribe(
+  data => { console.log(data) },
+  err => { console.log(err) },
+  () => { console.log('complete') }
+);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './auth';`
	`2`	`+export * from './auth.module';`