Skip to content

Commit 280be6d

Browse files
Feiyang1Feiyang1
committed
Merge branch 'master' into release
2 parents 15610b6 + 890f4f8 commit 280be6d

File tree

40 files changed

+158
-142
lines changed

40 files changed

+158
-142
lines changed

‎common/api-review/database.api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ export class DataSnapshot {
4444
val(): any;
4545
}
4646

47+
export { EmulatorMockTokenOptions }
48+
4749
// @public
4850
export function enableLogging(enabled: boolean, persistent?: boolean): any;
4951

‎common/api-review/storage.api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export function _dataFromString(format: StringFormat, stringData: string): Strin
2929
// @public
3030
export function deleteObject(ref: StorageReference): Promise<void>;
3131

32+
export { EmulatorMockTokenOptions }
33+
3234
// @internal (undocumented)
3335
export class _FbsBlob {
3436
constructor(data: Blob | Uint8Array | ArrayBuffer, elideCopy?: boolean);

‎config/webpack.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module.exports = {
8282
{
8383
test: /\.js$/,
8484
include: function (modulePath) {
85-
const match = /node_modules\/@firebase.*/.test(modulePath) && !modulePath.includes('-compat');
85+
const match = /node_modules\/@firebase.*/.test(modulePath);
8686
return match;
8787
},
8888
use: {

‎packages/database-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test",
2222
"test:browser": "karma start --single-run",
2323
"test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file src/index.node.ts --config ../../config/mocharc.node.js",
24-
"add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../database/dist/public.d.ts -o dist/database-compat/src/index.d.ts -a -r FirebaseDatabase:types.FirebaseDatabase -r Query:types.Query -r Reference:types.Reference -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/database"
24+
"add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../database/dist/public.d.ts -o dist/database-compat/src/index.d.ts -a -r Database:types.FirebaseDatabase -r Query:types.Query -r DatabaseReference:types.Reference -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/database"
2525
},
2626
"peerDependencies": {
2727
"@firebase/app-compat": "0.x"

‎packages/database/src/api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
export {
1919
Database,
20+
EmulatorMockTokenOptions,
2021
enableLogging,
2122
getDatabase,
2223
goOffline,

‎packages/database/src/api/Database.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949

5050
import { ReferenceImpl } from './Reference_impl';
5151

52+
export { EmulatorMockTokenOptions } from '@firebase/util';
5253
/**
5354
* This variable is also defined in the firebase Node.js Admin SDK. Before
5455
* modifying this definition, consult the definition in:

‎packages/firebase/analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/analytics",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/analytics/index.d.ts"
77
}

‎packages/firebase/app-check/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/app-check",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/app-check/index.d.ts"
77
}

‎packages/firebase/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/app",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/app/index.d.ts"
77
}

‎packages/firebase/auth/cordova/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/auth/cordova",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/auth/cordova/index.d.ts"
77
}

‎packages/firebase/auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/auth",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/auth/index.d.ts"
77
}

‎packages/firebase/auth/react-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/auth/react-native",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/auth/react-native/index.d.ts"
77
}

‎packages/firebase/compat/analytics/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/compat/analytics",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/compat/analytics/index.d.ts"
77
}

‎packages/firebase/compat/app-check/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/compat/app-check",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/compat/app-check/index.d.ts"
77
}

‎packages/firebase/compat/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/compat/app",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "../index.d.ts"
77
}

‎packages/firebase/compat/auth/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/compat/auth",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/compat/auth/index.d.ts"
77
}

‎packages/firebase/compat/database/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/compat/database",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/compat/database/index.d.ts"
77
}

‎packages/firebase/compat/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/compat/firestore",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/compat/firestore/index.d.ts"
77
}

‎packages/firebase/compat/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "firebase/compat/functions",
33
"main": "dist/index.cjs.js",
44
"browser": "dist/index.esm.js",
5-
"module": "dist/index.mjs",
5+
"module": "dist/index.esm.js",
66
"typings": "dist/compat/functions/index.d.ts"
77
}

0 commit comments

Comments
 (0)