Merged packagr

Author: jamesdaniels

.gitignore

@@ -14,4 +14,6 @@ angularfire2-*.tgz
 yarn-error.log
 *.bak
 package-lock.json
-test/ng-build/**/yarn.lock
+test/ng-build/**/yarn.lock
+tools/build.js
+coverage

.npmignore

@@ -1,3 +1,2 @@
 *.spec.*
-bundles/test.umd.js
 test-config.*

.nvmrc

@@ -0,0 +1 @@
+lts/*

.travis.yml

@@ -38,10 +38,4 @@ install:
       fi
     fi
 
-script:
-  - yarn build
-  - |
-    ./node_modules/.bin/karma start --single-run --browsers ChromeHeadlessTravis --reporters mocha &&
-    yarn test:node &&
-    node tools/run-typings-test.js &&
-    bash ./test/ng-build/build.sh
+script: yarn build && yarn test:all

angular.json

@@ -0,0 +1,42 @@
+{
+    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+    "version": 1,
+    "newProjectRoot": ".",
+    "projects": {
+      "angularfire": {
+        "projectType": "library",
+        "root": "src",
+        "sourceRoot": "src",
+        "prefix": "angularfire",
+        "architect": {
+          "build": {
+            "builder": "@angular-devkit/build-ng-packagr:build",
+            "options": {
+              "tsConfig": "tsconfig.json",
+              "project": "src/package.json"
+            }
+          },
+          "test": {
+            "builder": "@angular-devkit/build-angular:karma",
+            "options": {
+              "main": "src/test.ts",
+              "tsConfig": "tsconfig.spec.json",
+              "karmaConfig": "karma.conf.js"
+            }
+          },
+          "lint": {
+            "builder": "@angular-devkit/build-angular:tslint",
+            "options": {
+              "tsConfig": [
+                "tsconfig.json",
+                "tsconfig.spec.json"
+              ],
+              "exclude": [
+                "**/node_modules/**"
+              ]
+            }
+          }
+        }
+      }},
+    "defaultProject": "angularfire"
+  }

angularfire2.ts

@@ -1,72 +1,37 @@
-// Karma configuration
-module.exports = function(config) {
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+module.exports = function (config) {
   config.set({
-
     basePath: '',
-
-    frameworks: ['jasmine'],
-
-    files: [
-      // Polyfills.
-      'node_modules/es6-shim/es6-shim.js',
-
-      'node_modules/reflect-metadata/Reflect.js',
-
-      // Zone.js dependencies
-      'node_modules/zone.js/dist/zone.js',
-      'node_modules/zone.js/dist/proxy.js',
-      'node_modules/zone.js/dist/sync-test.js',
-      'node_modules/zone.js/dist/jasmine-patch.js',
-      'node_modules/zone.js/dist/async-test.js',
-      'node_modules/zone.js/dist/fake-async-test.js',
-
-      'node_modules/rxjs/bundles/rxjs.umd.{js,map}',
-
-      ...getAngularFiles(['core','common','compiler','platform-browser','platform-browser-dynamic']),
-
-      'karma-test-shim.js',
-      'node_modules/firebase/firebase-app.js',
-      'node_modules/firebase/firebase-auth.js',
-      'node_modules/firebase/firebase-database.js',
-      'node_modules/firebase/firebase-firestore.js',
-      'node_modules/firebase/firebase-functions.js',
-      'node_modules/firebase/firebase-performance.js',
-      'node_modules/firebase/firebase-storage.js',
-      'dist/packages-dist/bundles/core.umd.{js,map}',
-      'dist/packages-dist/bundles/auth.umd.{js,map}',
-      'dist/packages-dist/bundles/analytics.umd.{js,map}',
-      'dist/packages-dist/bundles/auth-guard.umd.{js,map}',
-      'dist/packages-dist/bundles/database.umd.{js,map}',
-      'dist/packages-dist/bundles/firestore.umd.{js,map}',
-      'dist/packages-dist/bundles/functions.umd.{js,map}',
-      'dist/packages-dist/bundles/messaging.umd.{js,map}',
-      'dist/packages-dist/bundles/remote-config.umd.{js,map}',
-      'dist/packages-dist/bundles/storage.umd.{js,map}',
-      'dist/packages-dist/bundles/performance.umd.{js,map}',
-      'dist/packages-dist/bundles/database-deprecated.umd.{js,map}',
-      'dist/packages-dist/bundles/test.umd.{js,map}',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
-
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: `${process.cwd()}/coverage`,
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true
+    },
+    reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    reporters: ['mocha'],
-    browsers: ['ChromeHeadless'],
+    browsers: ['Chrome', 'ChromeHeadless'],
     singleRun: false,
+    restartOnFileChange: true,
     customLaunchers: {
       ChromeHeadlessTravis: {
         base: 'ChromeHeadless',
         flags: ['--no-sandbox']
       }
     },
-  })
+  });
 };
-
-function getAngularFiles(packages) {
-  return packages.reduce((files, pkg) => {
-    files.push(`node_modules/@angular/${pkg}/bundles/${pkg}.umd.js`);
-    files.push(`node_modules/@angular/${pkg}/bundles/${pkg}-testing.umd.js`);
-    return files;
-  }, []);
-}

karma-test-shim.js

@@ -4,16 +4,16 @@
   "description": "The official library of Firebase and Angular.",
   "private": true,
   "scripts": {
-    "test": "npm run build && karma start --single-run && npm run test:node",
-    "test:node": "jasmine 'dist/packages-dist/schematics/**/*[sS]pec.js'",
-    "test:watch": "concurrently \"npm run build:watch\" \"npm run delayed_karma\"",
-    "test:debug": "npm run build && karma start",
-    "karma": "karma start",
-    "test:universal": "npm run build && cp -R dist/packages-dist test/universal-test/node_modules/angularfire2 && cd test/universal-test && npm run prerender",
-    "delayed_karma": "sleep 10 && karma start",
-    "build": "rimraf dist && node tools/build.js && npm pack ./dist/packages-dist",
-    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1",
-    "build:wrapper": "npm i --prefix wrapper && npm run --prefix wrapper build && npm pack ./dist/wrapper-dist"
+    "test": "npx ng test",
+    "test:headless": "npx ng test --watch=false --browsers=ChromeHeadless",
+    "lint": "npx ng lint",
+    "test:node": "npx tsc -p tsconfig.jasmine.json && node -r tsconfig-paths/register ./tools/jasmine.js",
+    "test:typings": "node ./tools/run-typings-test.js",
+    "test:build": "bash ./test/ng-build/build.sh",
+    "test:universal": "cp -R dist/packages-dist test/universal-test/node_modules/angularfire2 && cd test/universal-test && npm run prerender",
+    "test:all": "npm run test:headless && npm run test:node && npm run test:typings && npm run test:build",
+    "build": "tsc tools/build.ts; node ./tools/build.js",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1"
   },
   "schematics": "./dist/packages-dist/collection.json",
   "builders": "./dist/packages-dist/builders.json",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/angular/angularfire2#readme",
   "dependencies": {
-    "@angular-devkit/architect": "^0.900.0-0 || ^0.900.0 || ^10.0.0-0",
+    "@angular-devkit/architect": "^0.900.0-0 || ^0.900.0",
     "@angular-devkit/core": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
     "@angular-devkit/schematics": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
     "@angular/common": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
@@ -61,43 +61,41 @@
     "@angular/animations": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
     "@angular/compiler-cli": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
     "@angular/platform-server": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
+    "@angular-devkit/build-angular": "^0.900.0-0 || ^0.900.0",
+    "@angular-devkit/build-ng-packagr": "^0.900.0-0 || ^0.900.0",
+    "@angular/cli": "^8.0.3",
+    "@types/fs-extra": "^7.0.0",
+    "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",
-    "@types/jasmine": "^2.5.36",
+    "@types/jasmine": "^3.3.13",
     "@types/request": "0.0.30",
+    "codelyzer": "^5.0.0",
     "concurrently": "^2.2.0",
     "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",
-    "gzip-size": "^4.0.0",
-    "http-server": "^0.8.5",
-    "jasmine": "^2.4.1",
-    "jasmine-core": "^2.4.1",
-    "json": "^9.0.3",
-    "karma": "^2.0.0",
+    "fs-extra": "^8.0.1",
+    "gzip-size": "^5.1.1",
+    "jasmine": "^3.4.0",
+    "jasmine-core": "^3.4.0",
+    "karma": "^4.1.0",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-firefox-launcher": "^1.1.0",
-    "karma-jasmine": "^0.3.6",
-    "karma-mocha-reporter": "^2.0.2",
-    "karma-systemjs": "^0.10.0",
+    "karma-coverage-istanbul-reporter": "^2.0.5",
+    "karma-jasmine": "^2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.2",
     "ncp": "^2.0.0",
-    "parse5": "^1.3.2",
+    "ng-packagr": "^5.3.0",
     "pretty-size": "^2.0.0",
     "protractor": "3.0.0",
     "reflect-metadata": "0.1.2",
     "rimraf": "^2.5.4",
-    "rollup": "^0.64.1",
-    "rollup-plugin-node-resolve": "^3.3.0",
-    "rollup-watch": "^4.3.1",
     "schematics-utilities": "^1.1.1",
     "shelljs": "^0.8.0",
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",
-    "typescript": "~3.6.4"
+    "typescript": "~3.6.4",
+    "tsconfig-paths": "^3.8.0",
+    "tsickle": "^0.35.0",
+    "tslint": "^5.17.0"
   },
   "typings": "index.d.ts"
 }

karma.conf.js

@@ -1,8 +1,10 @@
 {
-  "name": "@angular/fire/analytics",
-  "main": "../bundles/analytics.umd.js",
-  "module": "index.js",
-  "es2015": "./es2015/index.js",
-  "typings": "index.d.ts",
-  "sideEffects": false
-}
+  "ngPackage": {
+    "lib": {
+      "umdModuleIds": {
+        "firebase/app": "firebase"
+      },
+      "entryFile": "public_api.ts"
+    }
+  }
+}

package.json

@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, AngularFireModule } from '@angular/fire';
-import { COMMON_CONFIG } from './test-config';
+import { COMMON_CONFIG } from '../test-config';
 import { AngularFireAuthModule } from '@angular/fire/auth';
 import { AngularFireAuthGuardModule, AngularFireAuthGuard } from '@angular/fire/auth-guard';
 import { RouterModule, Router } from '@angular/router';