Skip to content

Commit 4a6ea59

Browse files
author
Brian Chen
committed
Merge branch 'master' into bc/remove-null-check
2 parents 0842b65 + 4b540f9 commit 4a6ea59

File tree

143 files changed

+1691
-1551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+1691
-1551
lines changed

.changeset/clean-toes-pump.md

-6
This file was deleted.

.changeset/early-elephants-learn.md

-5
This file was deleted.

.changeset/funny-ties-ring.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
"@firebase/app": patch
3+
"@firebase/auth": patch
4+
"@firebase/component": patch
5+
"@firebase/database": patch
6+
"firebase": major
7+
"@firebase/firestore": patch
8+
"@firebase/functions": patch
9+
"@firebase/performance": patch
10+
"@firebase/remote-config": patch
11+
"rxfire": patch
12+
"@firebase/util": patch
13+
---
14+
15+
Point browser field to esm build. Now you need to use default import instead of namespace import to import firebase.
16+
17+
Before this change
18+
```
19+
import * as firebase from 'firebase/app';
20+
```
21+
22+
After this change
23+
```
24+
import firebase from 'firebase/app';
25+
```

.changeset/long-hornets-scream.md

-5
This file was deleted.

.changeset/ninety-kings-agree.md

-5
This file was deleted.

.changeset/silent-brooms-search.md

-5
This file was deleted.

.changeset/silver-dolls-wave.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"firebase": major
3+
"@firebase/firestore": major
4+
---
5+
6+
This releases removes all input validation. Please use our TypeScript types to validate API usage.

.changeset/stupid-dots-grab.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/util": patch
3+
---
4+
5+
Write template data to a new `customData` field in` FirebaseError` instead of writing to the error object itself to avoid overwriting existing fields.

.changeset/yellow-turkeys-lay.md

-11
This file was deleted.

config/webpack.test.js

+19-2
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,30 @@ module.exports = {
7474
]
7575
}
7676
}
77+
},
78+
{
79+
test: /\.js$/,
80+
include: function (modulePath) {
81+
const match = /node_modules\/@firebase.*/.test(modulePath);
82+
if (match) {
83+
console.log('modulePath', modulePath, match);
84+
}
85+
return match;
86+
},
87+
use: {
88+
loader: 'babel-loader',
89+
options: {
90+
plugins: ['@babel/plugin-transform-modules-commonjs']
91+
}
92+
}
7793
}
7894
]
7995
},
8096
resolve: {
8197
modules: ['node_modules', path.resolve(__dirname, '../../node_modules')],
82-
mainFields: ['browser', 'main', 'module'],
83-
extensions: ['.js', '.ts']
98+
mainFields: ['browser', 'module', 'main'],
99+
extensions: ['.js', '.ts'],
100+
symlinks: false
84101
},
85102
plugins: [
86103
new webpack.NormalModuleReplacementPlugin(

integration/firebase/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
88
},
99
"devDependencies": {
10-
"firebase": "7.23.0",
11-
"@babel/core": "7.11.6",
12-
"@babel/preset-env": "7.11.5",
10+
"firebase": "7.24.0",
1311
"@types/chai": "4.2.13",
1412
"@types/mocha": "7.0.2",
1513
"chai": "4.2.0",

integration/firebase/test/namespace.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
import * as firebase from 'firebase';
18+
import firebase from 'firebase';
1919
import * as namespaceDefinition from './namespaceDefinition.json';
2020
import validateNamespace from './validator';
2121

integration/firestore/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@firebase/app": "0.6.11",
18-
"@firebase/firestore": "1.17.3",
18+
"@firebase/firestore": "1.18.0",
1919
"@types/mocha": "7.0.2",
2020
"gulp": "4.0.2",
2121
"gulp-filter": "6.0.0",

integration/messaging/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "7.23.0",
12+
"firebase": "7.24.0",
1313
"chai": "4.2.0",
1414
"chromedriver": "86.0.0",
1515
"express": "4.17.1",

lerna.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"lerna": "3.10.5",
32
"version": "independent",
43
"npmClient": "yarn",
54
"packages": [

package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"api-report": "lerna run --scope @firebase/*-exp api-report",
5353
"docgen:exp": "ts-node-script scripts/exp/docgen.ts",
5454
"postinstall": "yarn --cwd repo-scripts/changelog-generator build",
55-
"sa": "ts-node-script repo-scripts/size-analysis/analysis.ts"
55+
"sa": "ts-node-script repo-scripts/size-analysis/cli.ts"
5656
},
5757
"repository": {
5858
"type": "git",
@@ -67,8 +67,8 @@
6767
"devDependencies": {
6868
"@changesets/changelog-github": "0.2.7",
6969
"@changesets/cli": "2.11.0",
70-
"@microsoft/api-documenter": "7.9.10",
71-
"@microsoft/api-extractor": "7.10.4",
70+
"api-documenter-me": "0.1.0",
71+
"api-extractor-me": "0.1.0",
7272
"@types/chai": "4.2.13",
7373
"@types/chai-as-promised": "7.1.3",
7474
"@types/child-process-promise": "2.2.1",
@@ -87,6 +87,9 @@
8787
"@typescript-eslint/eslint-plugin-tslint": "4.4.1",
8888
"@typescript-eslint/parser": "4.4.1",
8989
"babel-loader": "8.1.0",
90+
"@babel/core": "7.11.6",
91+
"@babel/preset-env": "7.11.5",
92+
"@babel/plugin-transform-modules-commonjs": "7.12.1",
9093
"chai": "4.2.0",
9194
"chai-as-promised": "7.1.1",
9295
"chalk": "4.1.0",

packages-exp/auth-exp/src/api/index.test.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ describe('api/_performApiRequest', () => {
284284
assert.fail('Call should have failed');
285285
} catch (e) {
286286
expect(e.code).to.eq(`auth/${AuthErrorCode.NEED_CONFIRMATION}`);
287-
expect(e._tokenResponse).to.eql({
287+
expect((e as FirebaseError).customData!._tokenResponse).to.eql({
288288
needConfirmation: true,
289289
idToken: 'id-token'
290290
});
@@ -314,7 +314,9 @@ describe('api/_performApiRequest', () => {
314314
assert.fail('Call should have failed');
315315
} catch (e) {
316316
expect(e.code).to.eq(`auth/${AuthErrorCode.CREDENTIAL_ALREADY_IN_USE}`);
317-
expect(e._tokenResponse).to.eql(response);
317+
expect((e as FirebaseError).customData!._tokenResponse).to.eql(
318+
response
319+
);
318320
}
319321
});
320322

@@ -343,8 +345,10 @@ describe('api/_performApiRequest', () => {
343345
assert.fail('Call should have failed');
344346
} catch (e) {
345347
expect(e.code).to.eq(`auth/${AuthErrorCode.EMAIL_EXISTS}`);
346-
expect(e.email).to.eq('[email protected]');
347-
expect(e.phoneNumber).to.eq('+1555-this-is-a-number');
348+
expect((e as FirebaseError).customData!.email).to.eq('[email protected]');
349+
expect((e as FirebaseError).customData!.phoneNumber).to.eq(
350+
'+1555-this-is-a-number'
351+
);
348352
}
349353
});
350354
});

packages-exp/auth-exp/src/api/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ function makeTaggedError(
251251
}
252252

253253
const error = AUTH_ERROR_FACTORY.create(code, errorParams);
254-
(error as TaggedWithTokenResponse)._tokenResponse = response;
254+
255+
// We know customData is defined on error because errorParams is defined
256+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = response;
255257
return error;
256258
}

packages-exp/auth-exp/src/core/action_code_url.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ function parseDeepLink(url: string): string {
7676
return iOSDoubleDeepLink || iOSDeepLink || doubleDeepLink || link || url;
7777
}
7878

79-
/**
80-
* {@inheritDoc @firebase/auth-types-exp#ActionCodeURL}
81-
*
79+
/**
80+
* {@inheritDoc @firebase/auth-types-exp#ActionCodeURL}
81+
*
8282
* @public
8383
*/
8484
export class ActionCodeURL implements externs.ActionCodeURL {
@@ -129,9 +129,9 @@ export class ActionCodeURL implements externs.ActionCodeURL {
129129
}
130130
}
131131

132-
/**
133-
* {@inheritDoc @firebase/auth-types-exp#ActionCodeURL.parseLink}
134-
*
132+
/**
133+
* {@inheritDoc @firebase/auth-types-exp#ActionCodeURL.parseLink}
134+
*
135135
* @public
136136
*/
137137
export function parseActionCodeURL(link: string): externs.ActionCodeURL | null {

packages-exp/auth-exp/src/core/providers/facebook.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('src/core/providers/facebook', () => {
5959
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
6060
appName: 'foo'
6161
});
62-
(error as TaggedWithTokenResponse)._tokenResponse = {
62+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
6363
...TEST_ID_TOKEN_RESPONSE,
6464
oauthAccessToken: 'access-token'
6565
};

packages-exp/auth-exp/src/core/providers/facebook.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class FacebookAuthProvider extends OAuthProvider {
4848
error: FirebaseError
4949
): externs.OAuthCredential | null {
5050
return FacebookAuthProvider.credentialFromTaggedObject(
51-
error as TaggedWithTokenResponse
51+
(error.customData || {}) as TaggedWithTokenResponse
5252
);
5353
}
5454

packages-exp/auth-exp/src/core/providers/github.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('src/core/providers/github', () => {
5959
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
6060
appName: 'foo'
6161
});
62-
(error as TaggedWithTokenResponse)._tokenResponse = {
62+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
6363
...TEST_ID_TOKEN_RESPONSE,
6464
oauthAccessToken: 'access-token'
6565
};

packages-exp/auth-exp/src/core/providers/github.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class GithubAuthProvider extends OAuthProvider {
4848
error: FirebaseError
4949
): externs.OAuthCredential | null {
5050
return GithubAuthProvider.credentialFromTaggedObject(
51-
error as TaggedWithTokenResponse
51+
(error.customData || {}) as TaggedWithTokenResponse
5252
);
5353
}
5454

packages-exp/auth-exp/src/core/providers/google.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('src/core/providers/google', () => {
6262
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
6363
appName: 'foo'
6464
});
65-
(error as TaggedWithTokenResponse)._tokenResponse = {
65+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
6666
...TEST_ID_TOKEN_RESPONSE,
6767
oauthAccessToken: 'access-token',
6868
oauthIdToken: 'id-token'

packages-exp/auth-exp/src/core/providers/google.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class GoogleAuthProvider extends OAuthProvider {
5353
error: FirebaseError
5454
): externs.OAuthCredential | null {
5555
return GoogleAuthProvider.credentialFromTaggedObject(
56-
error as TaggedWithTokenResponse
56+
(error.customData || {}) as TaggedWithTokenResponse
5757
);
5858
}
5959

packages-exp/auth-exp/src/core/providers/twitter.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ describe('src/core/providers/twitter', () => {
7979
const error = AUTH_ERROR_FACTORY.create(AuthErrorCode.NEED_CONFIRMATION, {
8080
appName: 'foo'
8181
});
82-
(error as TaggedWithTokenResponse)._tokenResponse = {
82+
(error.customData! as TaggedWithTokenResponse)._tokenResponse = {
8383
...TEST_ID_TOKEN_RESPONSE,
8484
oauthAccessToken: 'access-token',
8585
oauthTokenSecret: 'token-secret'

packages-exp/auth-exp/src/core/providers/twitter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class TwitterAuthProvider extends OAuthProvider {
6767
error: FirebaseError
6868
): externs.OAuthCredential | null {
6969
return TwitterAuthProvider.credentialFromTaggedObject(
70-
error as TaggedWithTokenResponse
70+
(error.customData || {}) as TaggedWithTokenResponse
7171
);
7272
}
7373

0 commit comments

Comments
 (0)