Skip to content

Commit

Permalink
chore: rename main module from angularfire to angularfire2
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffbcross committed Feb 12, 2016
1 parent 2e85666 commit 52bceca
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 19 deletions.
6 changes: 6 additions & 0 deletions angularfire2.ts
@@ -0,0 +1,6 @@
/**
* This is only necessary in order
* to make angularfire2 importable inside the
* generated bundle, instead of angularfire2/angularfire2
*/
export * from './angularfire2/angularfire2';
21 changes: 12 additions & 9 deletions package.json
@@ -1,14 +1,15 @@
{
"name": "angularfire2",
"version": "2.0.0-alpha.6",
"version": "2.0.0-alpha.7",
"description": "",
"main": "./dist/angularfire.js",
"main": "./dist/angularfire2.js",
"scripts": {
"test": "npm run build; karma start",
"build": "rm -rf dist; tsc && cp package.json README.md LICENSE .npmignore dist/",
"postbuild": "./node_modules/.bin/json -I -f ./dist/package.json -e 'this.main=\"angularfire.js\"'",
"postbuild": "node tools/rewrite-published-package.js",
"install_webdriver": "webdriver-manager update",
"install_typings": "typings install"
"install_typings": "typings install",
"build_bundle": "cp -r src angularfire2 && tsc typings/main.d.ts angularfire2.ts --rootDir . --module system -t es5 --outFile dist/bundles/angularfire2.js --moduleResolution node --emitDecoratorMetadata --experimentalDecorators"
},
"keywords": [
"angular2",
Expand All @@ -26,14 +27,15 @@
},
"homepage": "https://github.com/angular/indy#readme",
"dependencies": {
"angular2": "2.0.0-beta.3",
"angular2": "2.0.0-beta.6",
"firebase": "2.4.0",
"gulp": "^3.9.0",
"rxjs": "5.0.0-beta.0"
},
"devDependencies": {
"es6-module-loader": "^0.17.10",
"es6-shim": "^0.33.13",
"firebase-server": "^0.5.2",
"gulp": "^3.9.0",
"gulp-jasmine": "^2.2.1",
"gulp-typescript": "^2.10.0",
"http-server": "^0.8.5",
Expand All @@ -49,11 +51,12 @@
"protractor": "3.0.0",
"reflect-metadata": "0.1.2",
"systemjs": "^0.19.16",
"systemjs-builder": "^0.15.7",
"traceur": "0.0.96",
"tsd": "^0.6.5",
"typescript": "1.7.5",
"typescript": "^1.7.5",
"typings": "^0.6.2",
"zone.js": "0.5.10"
"zone.js": "0.5.14"
},
"typings": "angularfire.d.ts"
"typings": "angularfire2.d.ts"
}
2 changes: 1 addition & 1 deletion src/angularfire.spec.ts
Expand Up @@ -14,7 +14,7 @@ import {
FirebaseUrl,
FirebaseRef,
defaultFirebase
} from './angularfire';
} from './angularfire2';

const testUrl = 'http://localhost.firebaseio.test:5000/';

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/providers/auth.spec.ts
Expand Up @@ -9,7 +9,7 @@ import {
FirebaseAuthState,
FirebaseAuthDataGithub,
AuthProviders
} from '../angularfire';
} from '../angularfire2';
import * as Firebase from 'firebase';

describe('FirebaseAuth', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/providers/firebase_list.spec.ts
Expand Up @@ -8,7 +8,7 @@ import {

import * as Firebase from 'firebase';
import {FirebaseList} from './firebase_list';
import {FirebaseUrl, FirebaseObservable} from '../angularfire';
import {FirebaseUrl, FirebaseObservable} from '../angularfire2';

// Get rid of this when angular/angular#6928 is released
enableProdMode();
Expand Down
2 changes: 1 addition & 1 deletion src/providers/firebase_list.ts
@@ -1,5 +1,5 @@
import {Provider} from 'angular2/core';
import {FirebaseUrl} from '../angularfire';
import {FirebaseUrl} from '../angularfire2';
import {Observer} from 'rxjs/Observer';
import {FirebaseObservable} from '../utils/firebase_observable';
import {absolutePathResolver} from '../utils/absolute_path_resolver';
Expand Down
14 changes: 14 additions & 0 deletions tools/rewrite-published-package.js
@@ -0,0 +1,14 @@
/**
* Rewrite the package.json that gets published to npm.
* * Change main to point to angularfire.js instead of dist/angularfire.js
* * Change angular2 to be a peer dependency
*/
var fs = require('fs');
var srcPackage = require('../package.json');
var outPackage = Object.assign({}, srcPackage, {
peerDependencies: srcPackage.dependencies,
main: "angularfire2.js"
});
delete outPackage.dependencies;

fs.writeFileSync('./dist/package.json', JSON.stringify(outPackage, null, 2));
9 changes: 3 additions & 6 deletions tsconfig.json
Expand Up @@ -11,11 +11,8 @@
"declaration": true,
"removeComments": true
},
"exclude": [
"test",
"node_modules",
"typings/main",
"typings/main.d.ts",
"dist"
"files": [
"src/angularfire2.ts",
"typings/main.d.ts"
]
}

0 comments on commit 52bceca

Please sign in to comment.