Skip to content

Commit 52bceca

Browse files
committed
chore: rename main module from angularfire to angularfire2
1 parent 2e85666 commit 52bceca

9 files changed

+39
-19
lines changed

angularfire2.ts

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* This is only necessary in order
3+
* to make angularfire2 importable inside the
4+
* generated bundle, instead of angularfire2/angularfire2
5+
*/
6+
export * from './angularfire2/angularfire2';

package.json

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"name": "angularfire2",
3-
"version": "2.0.0-alpha.6",
3+
"version": "2.0.0-alpha.7",
44
"description": "",
5-
"main": "./dist/angularfire.js",
5+
"main": "./dist/angularfire2.js",
66
"scripts": {
77
"test": "npm run build; karma start",
88
"build": "rm -rf dist; tsc && cp package.json README.md LICENSE .npmignore dist/",
9-
"postbuild": "./node_modules/.bin/json -I -f ./dist/package.json -e 'this.main=\"angularfire.js\"'",
9+
"postbuild": "node tools/rewrite-published-package.js",
1010
"install_webdriver": "webdriver-manager update",
11-
"install_typings": "typings install"
11+
"install_typings": "typings install",
12+
"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"
1213
},
1314
"keywords": [
1415
"angular2",
@@ -26,14 +27,15 @@
2627
},
2728
"homepage": "https://github.com/angular/indy#readme",
2829
"dependencies": {
29-
"angular2": "2.0.0-beta.3",
30+
"angular2": "2.0.0-beta.6",
3031
"firebase": "2.4.0",
31-
"gulp": "^3.9.0",
3232
"rxjs": "5.0.0-beta.0"
3333
},
3434
"devDependencies": {
3535
"es6-module-loader": "^0.17.10",
36+
"es6-shim": "^0.33.13",
3637
"firebase-server": "^0.5.2",
38+
"gulp": "^3.9.0",
3739
"gulp-jasmine": "^2.2.1",
3840
"gulp-typescript": "^2.10.0",
3941
"http-server": "^0.8.5",
@@ -49,11 +51,12 @@
4951
"protractor": "3.0.0",
5052
"reflect-metadata": "0.1.2",
5153
"systemjs": "^0.19.16",
54+
"systemjs-builder": "^0.15.7",
5255
"traceur": "0.0.96",
5356
"tsd": "^0.6.5",
54-
"typescript": "1.7.5",
57+
"typescript": "^1.7.5",
5558
"typings": "^0.6.2",
56-
"zone.js": "0.5.10"
59+
"zone.js": "0.5.14"
5760
},
58-
"typings": "angularfire.d.ts"
61+
"typings": "angularfire2.d.ts"
5962
}

src/angularfire.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
FirebaseUrl,
1515
FirebaseRef,
1616
defaultFirebase
17-
} from './angularfire';
17+
} from './angularfire2';
1818

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

File renamed without changes.

src/providers/auth.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
FirebaseAuthState,
1010
FirebaseAuthDataGithub,
1111
AuthProviders
12-
} from '../angularfire';
12+
} from '../angularfire2';
1313
import * as Firebase from 'firebase';
1414

1515
describe('FirebaseAuth', () => {

src/providers/firebase_list.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88

99
import * as Firebase from 'firebase';
1010
import {FirebaseList} from './firebase_list';
11-
import {FirebaseUrl, FirebaseObservable} from '../angularfire';
11+
import {FirebaseUrl, FirebaseObservable} from '../angularfire2';
1212

1313
// Get rid of this when angular/angular#6928 is released
1414
enableProdMode();

src/providers/firebase_list.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Provider} from 'angular2/core';
2-
import {FirebaseUrl} from '../angularfire';
2+
import {FirebaseUrl} from '../angularfire2';
33
import {Observer} from 'rxjs/Observer';
44
import {FirebaseObservable} from '../utils/firebase_observable';
55
import {absolutePathResolver} from '../utils/absolute_path_resolver';

tools/rewrite-published-package.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* Rewrite the package.json that gets published to npm.
3+
* * Change main to point to angularfire.js instead of dist/angularfire.js
4+
* * Change angular2 to be a peer dependency
5+
*/
6+
var fs = require('fs');
7+
var srcPackage = require('../package.json');
8+
var outPackage = Object.assign({}, srcPackage, {
9+
peerDependencies: srcPackage.dependencies,
10+
main: "angularfire2.js"
11+
});
12+
delete outPackage.dependencies;
13+
14+
fs.writeFileSync('./dist/package.json', JSON.stringify(outPackage, null, 2));

tsconfig.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@
1111
"declaration": true,
1212
"removeComments": true
1313
},
14-
"exclude": [
15-
"test",
16-
"node_modules",
17-
"typings/main",
18-
"typings/main.d.ts",
19-
"dist"
14+
"files": [
15+
"src/angularfire2.ts",
16+
"typings/main.d.ts"
2017
]
2118
}

0 commit comments

Comments
 (0)