Skip to content

Commit 3b254b8

Browse files
authored
Update to Firebase JS 10 compat (firebase#1032)
1 parent 2b29ba6 commit 3b254b8

File tree

7 files changed

+2005
-2612
lines changed

7 files changed

+2005
-2612
lines changed

README.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ for a more in-depth example, showcasing a Single Page Application mode.
182182
<head>
183183
<meta charset="UTF-8">
184184
<title>Sample FirebaseUI App</title>
185-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-app-compat.js"></script>
186-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-auth-compat.js"></script>
185+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-app-compat.js"></script>
186+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-auth-compat.js"></script>
187187
<!-- *******************************************************************************************
188188
* TODO(DEVELOPER): Paste the initialization snippet from this dialog box:
189189
* Firebase Console > Project Settings > Add App > Web.
@@ -257,8 +257,8 @@ Here is how you would track the Auth state across all your pages:
257257
<head>
258258
<meta charset="UTF-8">
259259
<title>Sample FirebaseUI App</title>
260-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-app-compat.js"></script>
261-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-auth-compat.js"></script>
260+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-app-compat.js"></script>
261+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-auth-compat.js"></script>
262262
<!-- *******************************************************************************************
263263
* TODO(DEVELOPER): Paste the initialization snippet from:
264264
* Firebase Console > Overview > Add Firebase to your web app. *
@@ -1338,8 +1338,8 @@ FirebaseUI is displayed.
13381338
<head>
13391339
<meta charset="UTF-8">
13401340
<title>Sample FirebaseUI App</title>
1341-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-app-compat.js"></script>
1342-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-auth-compat.js"></script>
1341+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-app-compat.js"></script>
1342+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-auth-compat.js"></script>
13431343
<!-- *******************************************************************************************
13441344
* TODO(DEVELOPER): Paste the initialization snippet from:
13451345
* Firebase Console > Overview > Add Firebase to your web app. *
@@ -1934,13 +1934,13 @@ can verify in the [demo app](https://fir-ui-demo-84a6c.firebaseapp.com/)).
19341934

19351935
### 6.0.0
19361936

1937-
FirebaseUI-web v6.0.0 is intended to be used alongside Firebase JS SDK v9 compat.
1937+
FirebaseUI-web v6.0.0 is intended to be used alongside Firebase JS SDK v9 or v10 [compat](https://firebase.google.com/docs/web/modular-upgrade#about_the_namespaced_compat_libraries).
19381938

19391939
If using the CDN, change your Firebase imports to:
19401940

19411941
```html
1942-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-app-compat.js"></script>
1943-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-auth-compat.js"></script>
1942+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-app-compat.js"></script>
1943+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-auth-compat.js"></script>
19441944
```
19451945

19461946
If NPM:

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"out"
2323
],
2424
"dependencies": {
25-
"firebase": "^9.1.3"
25+
"firebase": "^9.1.3 || ^10.0.0"
2626
}
2727
}

buildtools/run_tests.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ if [[ $1 = "--saucelabs" ]]; then
8686
else
8787
echo "Using Headless Chrome."
8888
# Updates Selenium Webdriver.
89-
GOOGLE_CHROME_VERSION=$(google-chrome --product-version || echo 'latest')
89+
90+
# TODO(jhuleatt) this is failing when `google-chrome --product-version` returns Chrome 115.0.5790.110
91+
# so for now, hard code latest
92+
# GOOGLE_CHROME_VERSION=$(google-chrome --product-version || echo 'latest')
93+
GOOGLE_CHROME_VERSION=$(echo 'latest')
9094
echo "$PROTRACTOR_BIN_PATH/webdriver-manager update --versions.chrome=$GOOGLE_CHROME_VERSION --gecko=false"
9195
$PROTRACTOR_BIN_PATH/webdriver-manager update --versions.chrome=$GOOGLE_CHROME_VERSION --gecko=false
9296
# Start Selenium Webdriver.

demo/public/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<meta charset="UTF-8">
55
<title>FirebaseUI Auth Demo</title>
66
<link rel="manifest" href="manifest.json">
7-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-app-compat.js"></script>
8-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-auth-compat.js"></script>
7+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-app-compat.js"></script>
8+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-auth-compat.js"></script>
99
<script src="config.js"></script>
1010
<script src="common.js"></script>
1111
<link href="style.css" rel="stylesheet" type="text/css" media="screen" />

demo/public/widget.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>FirebaseUI Auth Demo</title>
6-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-app-compat.js"></script>
7-
<script src="https://www.gstatic.com/firebasejs/9.13.0/firebase-auth-compat.js"></script>
6+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-app-compat.js"></script>
7+
<script src="https://www.gstatic.com/firebasejs/10.0.0/firebase-auth-compat.js"></script>
88
<script src="config.js"></script>
99
<script src="common.js"></script>
1010
<script src="dist/firebaseui.js"></script>

0 commit comments

Comments
 (0)