From 368360ca71733ddb1d895258d97bb394f8c873c7 Mon Sep 17 00:00:00 2001 From: James Daniels Date: Fri, 7 Sep 2018 13:51:15 -0700 Subject: [PATCH 1/4] chore(): angularfire2 shim --- .gitignore | 1 + package.json | 5 ++-- wrapper/package.json | 23 +++++++++++++++++++ wrapper/src/README.md | 1 + wrapper/src/auth/index.ts | 1 + wrapper/src/auth/package.json | 16 +++++++++++++ wrapper/src/database-deprecated/index.ts | 7 ++++++ wrapper/src/database-deprecated/package.json | 16 +++++++++++++ wrapper/src/database/index.ts | 1 + wrapper/src/database/package.json | 16 +++++++++++++ wrapper/src/firebase-node/index.ts | 1 + wrapper/src/firebase-node/package.json | 16 +++++++++++++ wrapper/src/firestore/index.ts | 1 + wrapper/src/firestore/package.json | 16 +++++++++++++ wrapper/src/functions/index.ts | 1 + wrapper/src/functions/package.json | 16 +++++++++++++ wrapper/src/index.ts | 1 + wrapper/src/messaging/index.ts | 1 + wrapper/src/messaging/package.json | 16 +++++++++++++ wrapper/src/package.json | 18 +++++++++++++++ wrapper/src/storage/index.ts | 1 + wrapper/src/storage/package.json | 16 +++++++++++++ wrapper/tsconfig.json | 24 ++++++++++++++++++++ wrapper/yarn.lock | 11 +++++++++ 24 files changed, 224 insertions(+), 2 deletions(-) create mode 100644 wrapper/package.json create mode 100644 wrapper/src/README.md create mode 100644 wrapper/src/auth/index.ts create mode 100644 wrapper/src/auth/package.json create mode 100644 wrapper/src/database-deprecated/index.ts create mode 100644 wrapper/src/database-deprecated/package.json create mode 100644 wrapper/src/database/index.ts create mode 100644 wrapper/src/database/package.json create mode 100644 wrapper/src/firebase-node/index.ts create mode 100644 wrapper/src/firebase-node/package.json create mode 100644 wrapper/src/firestore/index.ts create mode 100644 wrapper/src/firestore/package.json create mode 100644 wrapper/src/functions/index.ts create mode 100644 wrapper/src/functions/package.json create mode 100644 wrapper/src/index.ts create mode 100644 wrapper/src/messaging/index.ts create mode 100644 wrapper/src/messaging/package.json create mode 100644 wrapper/src/package.json create mode 100644 wrapper/src/storage/index.ts create mode 100644 wrapper/src/storage/package.json create mode 100644 wrapper/tsconfig.json create mode 100644 wrapper/yarn.lock diff --git a/.gitignore b/.gitignore index c6bb2f06c..2c621823c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ angularfire2-*.tgz .DS_Store yarn-error.log *.bak +package-lock.json \ No newline at end of file diff --git a/package.json b/package.json index 9a7b5769f..13edbc979 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,9 @@ "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": "rm -rf dist && node tools/build.js", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1" + "build": "rm -rf dist && node tools/build.js && npm run build:wrapper", + "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1", + "build:wrapper": "npm i --prefix wrapper && VERSION=5.0.0 npm run --prefix wrapper build" }, "keywords": [ "angular", diff --git a/wrapper/package.json b/wrapper/package.json new file mode 100644 index 000000000..0805a8049 --- /dev/null +++ b/wrapper/package.json @@ -0,0 +1,23 @@ +{ + "name": "angularfire2", + "version": "5.0.0", + "description": "The core module", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "scripts": { + "build": "rm -rf ../dist/wrapper-dist && tsc -p ./tsconfig.json && rsync -a --include '*.json' --include '*.md' --include '*/' --exclude '*' ./src/ ../dist/wrapper-dist/ && sed -i -- 's/ANGULARFIRE2_VERSION/'\"$VERSION\"'/g' ../dist/wrapper-dist/*.json && sed -i -- 's/ANGULARFIRE2_VERSION/'\"$VERSION\"'/g' ../dist/wrapper-dist/**/*.json && rm ../dist/wrapper-dist/*.json-- && rm ../dist/wrapper-dist/**/*.json--" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "^5.0.0" + }, + "typings": "index.d.ts", + "devDependencies": { + "typescript": "^3.0.3" + } +} diff --git a/wrapper/src/README.md b/wrapper/src/README.md new file mode 100644 index 000000000..dd25e308b --- /dev/null +++ b/wrapper/src/README.md @@ -0,0 +1 @@ +This package has moved, we're now at [@angular/fire](https://www.npmjs.com/package/@angular/fire). \ No newline at end of file diff --git a/wrapper/src/auth/index.ts b/wrapper/src/auth/index.ts new file mode 100644 index 000000000..2bab9ef93 --- /dev/null +++ b/wrapper/src/auth/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/auth'; \ No newline at end of file diff --git a/wrapper/src/auth/package.json b/wrapper/src/auth/package.json new file mode 100644 index 000000000..a5c160c9e --- /dev/null +++ b/wrapper/src/auth/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/auth", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/src/database-deprecated/index.ts b/wrapper/src/database-deprecated/index.ts new file mode 100644 index 000000000..53091549a --- /dev/null +++ b/wrapper/src/database-deprecated/index.ts @@ -0,0 +1,7 @@ +"use strict"; +function __export(m) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; +} +Object.defineProperty(exports, "__esModule", { value: true }); +__export(require("@angular/fire/database-deprecated")); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHVEQUFrRCJ9 \ No newline at end of file diff --git a/wrapper/src/database-deprecated/package.json b/wrapper/src/database-deprecated/package.json new file mode 100644 index 000000000..75a6e9273 --- /dev/null +++ b/wrapper/src/database-deprecated/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/database-deprecated", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/src/database/index.ts b/wrapper/src/database/index.ts new file mode 100644 index 000000000..9d2ce419a --- /dev/null +++ b/wrapper/src/database/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/database'; \ No newline at end of file diff --git a/wrapper/src/database/package.json b/wrapper/src/database/package.json new file mode 100644 index 000000000..f86940448 --- /dev/null +++ b/wrapper/src/database/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/database", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/src/firebase-node/index.ts b/wrapper/src/firebase-node/index.ts new file mode 100644 index 000000000..7b3d6f0cc --- /dev/null +++ b/wrapper/src/firebase-node/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/firebase-node'; \ No newline at end of file diff --git a/wrapper/src/firebase-node/package.json b/wrapper/src/firebase-node/package.json new file mode 100644 index 000000000..bc43e1d92 --- /dev/null +++ b/wrapper/src/firebase-node/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/firebase-node", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/src/firestore/index.ts b/wrapper/src/firestore/index.ts new file mode 100644 index 000000000..53c25d285 --- /dev/null +++ b/wrapper/src/firestore/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/firestore'; \ No newline at end of file diff --git a/wrapper/src/firestore/package.json b/wrapper/src/firestore/package.json new file mode 100644 index 000000000..65834f86c --- /dev/null +++ b/wrapper/src/firestore/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/firestore", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/src/functions/index.ts b/wrapper/src/functions/index.ts new file mode 100644 index 000000000..fbae283a8 --- /dev/null +++ b/wrapper/src/functions/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/functions'; \ No newline at end of file diff --git a/wrapper/src/functions/package.json b/wrapper/src/functions/package.json new file mode 100644 index 000000000..ee0124fae --- /dev/null +++ b/wrapper/src/functions/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/functions", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/src/index.ts b/wrapper/src/index.ts new file mode 100644 index 000000000..5e341e311 --- /dev/null +++ b/wrapper/src/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/storage'; \ No newline at end of file diff --git a/wrapper/src/messaging/index.ts b/wrapper/src/messaging/index.ts new file mode 100644 index 000000000..91da221e3 --- /dev/null +++ b/wrapper/src/messaging/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/messaging'; \ No newline at end of file diff --git a/wrapper/src/messaging/package.json b/wrapper/src/messaging/package.json new file mode 100644 index 000000000..b24d0060e --- /dev/null +++ b/wrapper/src/messaging/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/messaging", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/src/package.json b/wrapper/src/package.json new file mode 100644 index 000000000..cddc57183 --- /dev/null +++ b/wrapper/src/package.json @@ -0,0 +1,18 @@ +{ + "name": "angularfire2", + "version": "ANGULARFIRE2_VERSION", + "description": "The core module", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" + } + \ No newline at end of file diff --git a/wrapper/src/storage/index.ts b/wrapper/src/storage/index.ts new file mode 100644 index 000000000..5e341e311 --- /dev/null +++ b/wrapper/src/storage/index.ts @@ -0,0 +1 @@ +export * from '@angular/fire/storage'; \ No newline at end of file diff --git a/wrapper/src/storage/package.json b/wrapper/src/storage/package.json new file mode 100644 index 000000000..1c8b2517d --- /dev/null +++ b/wrapper/src/storage/package.json @@ -0,0 +1,16 @@ +{ + "name": "angularfire2/storage", + "version": "ANGULARFIRE2_VERSION", + "main": "index.js", + "keywords": [], + "repository": { + "type": "git", + "url": "git+https://github.com/angular/angularfire2.git" + }, + "author": "angular,firebase", + "license": "MIT", + "dependencies": { + "@angular/fire": "ANGULARFIRE2_VERSION" + }, + "typings": "index.d.ts" +} diff --git a/wrapper/tsconfig.json b/wrapper/tsconfig.json new file mode 100644 index 000000000..c7bd250c3 --- /dev/null +++ b/wrapper/tsconfig.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "declaration": true, + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "module": "commonjs", + "moduleResolution": "node", + "strictNullChecks": true, + "noImplicitAny": false, + "noFallthroughCasesInSwitch": true, + "rootDir": "./src", + "inlineSourceMap": true, + "lib": ["es5", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"], + "skipDefaultLibCheck": true, + "skipLibCheck": true, + "target": "es2015", + "outDir": "../dist/wrapper-dist" + }, + "exclude": [ + "node_modules/**/*", + ] +} + \ No newline at end of file diff --git a/wrapper/yarn.lock b/wrapper/yarn.lock new file mode 100644 index 000000000..d0bc6ea08 --- /dev/null +++ b/wrapper/yarn.lock @@ -0,0 +1,11 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@angular/fire@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@angular/fire/-/fire-5.0.0.tgz#2f07bd7b429d4752badbd53c15a9a3848009e2d5" + +typescript@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8" From f7225cac90939031c19e222ab801cda64ee79618 Mon Sep 17 00:00:00 2001 From: James Daniels Date: Fri, 7 Sep 2018 14:19:56 -0700 Subject: [PATCH 2/4] Wrong reference --- wrapper/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrapper/src/index.ts b/wrapper/src/index.ts index 5e341e311..055574239 100644 --- a/wrapper/src/index.ts +++ b/wrapper/src/index.ts @@ -1 +1 @@ -export * from '@angular/fire/storage'; \ No newline at end of file +export * from '@angular/fire'; \ No newline at end of file From d65168b9ce1facc0f3ae517854447aea7cf2dcf7 Mon Sep 17 00:00:00 2001 From: James Daniels Date: Fri, 7 Sep 2018 15:05:05 -0700 Subject: [PATCH 3/4] Adding angularfire keywords to @angular/fire --- src/core/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/package.json b/src/core/package.json index 999ffaf63..4eb8e1fdc 100644 --- a/src/core/package.json +++ b/src/core/package.json @@ -8,7 +8,9 @@ "keywords": [ "angular", "firebase", - "rxjs" + "rxjs", + "angularfire", + "angularfire2" ], "repository": { "type": "git", From 900d3abf3546433341705eb3bff2af7c24a88cc8 Mon Sep 17 00:00:00 2001 From: James Daniels Date: Fri, 7 Sep 2018 18:20:03 -0700 Subject: [PATCH 4/4] Dont make add wrapper to build --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13edbc979..d89c01721 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "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": "rm -rf dist && node tools/build.js && npm run build:wrapper", + "build": "rm -rf dist && node tools/build.js", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1", "build:wrapper": "npm i --prefix wrapper && VERSION=5.0.0 npm run --prefix wrapper build" },