Skip to content

Commit 5aafa97

Browse files
dwyfrequencydwyfrequency
committed
Fix conflict
1 parent 7ef5568 commit 5aafa97

File tree

35 files changed

+135
-99
lines changed

35 files changed

+135
-99
lines changed

‎packages/analytics-compat/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@
2424
"@firebase/app-compat": "0.x"
2525
},
2626
"devDependencies": {
27+
<<<<<<< HEAD
2728
"@firebase/app-compat": "0.1.37",
2829
"rollup": "2.72.1",
30+
=======
31+
"@firebase/app-compat": "0.1.36",
32+
"rollup": "2.79.1",
33+
>>>>>>> f51379262 (Update rollup deps)
2934
"@rollup/plugin-json": "4.1.0",
30-
"rollup-plugin-typescript2": "0.31.2",
35+
"rollup-plugin-typescript2": "0.34.1",
3136
"typescript": "4.2.2"
3237
},
3338
"repository": {

‎packages/analytics/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
"license": "Apache-2.0",
5050
"devDependencies": {
5151
"@firebase/app": "0.8.2",
52-
"rollup": "2.72.1",
52+
"rollup": "2.79.1",
5353
"@rollup/plugin-commonjs": "21.1.0",
5454
"@rollup/plugin-json": "4.1.0",
5555
"@rollup/plugin-node-resolve": "13.3.0",
56-
"rollup-plugin-typescript2": "0.31.2",
56+
"rollup-plugin-typescript2": "0.34.1",
5757
"typescript": "4.2.2"
5858
},
5959
"repository": {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,17 @@
4444
},
4545
"license": "Apache-2.0",
4646
"devDependencies": {
47+
<<<<<<< HEAD
4748
"@firebase/app-compat": "0.1.37",
4849
"rollup": "2.72.1",
50+
=======
51+
"@firebase/app-compat": "0.1.36",
52+
"rollup": "2.79.1",
53+
>>>>>>> f51379262 (Update rollup deps)
4954
"@rollup/plugin-commonjs": "21.1.0",
5055
"@rollup/plugin-json": "4.1.0",
5156
"@rollup/plugin-node-resolve": "13.3.0",
52-
"rollup-plugin-typescript2": "0.31.2",
57+
"rollup-plugin-typescript2": "0.34.1",
5358
"typescript": "4.2.2"
5459
},
5560
"repository": {

‎packages/app-check/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,17 @@
4545
},
4646
"license": "Apache-2.0",
4747
"devDependencies": {
48+
<<<<<<< HEAD
4849
"@firebase/app": "0.8.2",
4950
"rollup": "2.72.1",
51+
=======
52+
"@firebase/app": "0.8.1",
53+
"rollup": "2.79.1",
54+
>>>>>>> f51379262 (Update rollup deps)
5055
"@rollup/plugin-commonjs": "21.1.0",
5156
"@rollup/plugin-json": "4.1.0",
5257
"@rollup/plugin-node-resolve": "13.3.0",
53-
"rollup-plugin-typescript2": "0.31.2",
58+
"rollup-plugin-typescript2": "0.34.1",
5459
"typescript": "4.2.2"
5560
},
5661
"repository": {

‎packages/app-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
"tslib": "^2.1.0"
4848
},
4949
"devDependencies": {
50-
"rollup": "2.72.1",
50+
"rollup": "2.79.1",
5151
"@rollup/plugin-json": "4.1.0",
5252
"rollup-plugin-replace": "2.2.0",
53-
"rollup-plugin-typescript2": "0.31.2",
53+
"rollup-plugin-typescript2": "0.34.1",
5454
"typescript": "4.2.2"
5555
},
5656
"repository": {

‎packages/app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
"license": "Apache-2.0",
4848
"devDependencies": {
4949
"@rollup/plugin-json": "4.1.0",
50-
"rollup": "2.72.1",
50+
"rollup": "2.79.1",
5151
"rollup-plugin-replace": "2.2.0",
52-
"rollup-plugin-typescript2": "0.31.2",
52+
"rollup-plugin-typescript2": "0.34.1",
5353
"typescript": "4.2.2"
5454
},
5555
"repository": {

‎packages/auth-compat/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"@rollup/plugin-commonjs": "21.1.0",
3030
"@rollup/plugin-json": "4.1.0",
3131
"@rollup/plugin-node-resolve": "13.3.0",
32-
"rollup": "2.72.1",
32+
"rollup": "2.79.1",
3333
"rollup-plugin-replace": "2.2.0",
3434
"rollup-plugin-sourcemaps": "0.6.3",
35-
"rollup-plugin-typescript2": "0.31.2",
35+
"rollup-plugin-typescript2": "0.34.1",
3636
"rollup-plugin-uglify": "6.0.4",
3737
"typescript": "4.2.2"
3838
},

‎packages/auth-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
"devDependencies": {
5959
"@firebase/app-compat": "0.1.37",
6060
"@rollup/plugin-json": "4.1.0",
61-
"rollup": "2.72.1",
61+
"rollup": "2.79.1",
6262
"rollup-plugin-replace": "2.2.0",
63-
"rollup-plugin-typescript2": "0.31.2",
63+
"rollup-plugin-typescript2": "0.34.1",
6464
"typescript": "4.2.2"
6565
},
6666
"repository": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"cordova-ios": "6.2.0",
1515
"cordova-plugin-whitelist": "1.3.5",
1616
"cordova-universal-links-plugin": "1.2.1",
17-
"rollup": "2.72.1"
17+
"rollup": "2.79.1"
1818
},
1919
"cordova": {
2020
"plugins": {

‎packages/auth/demo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
"license": "Apache-2.0",
2727
"devDependencies": {
2828
"@rollup/plugin-strip": "2.1.0",
29-
"rollup": "2.72.1",
29+
"rollup": "2.79.1",
3030
"@rollup/plugin-json": "4.1.0",
3131
"rollup-plugin-replace": "2.2.0",
3232
"rollup-plugin-terser": "7.0.2",
33-
"rollup-plugin-typescript2": "0.31.2",
33+
"rollup-plugin-typescript2": "0.34.1",
3434
"rollup-plugin-uglify": "6.0.4",
3535
"@rollup/plugin-node-resolve": "13.3.0",
3636
"lerna": "4.0.0"

‎packages/auth/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
"@rollup/plugin-json": "4.1.0",
116116
"@rollup/plugin-strip": "2.1.0",
117117
"chromedriver": "98.0.1",
118-
"rollup": "2.72.1",
118+
"rollup": "2.79.1",
119119
"rollup-plugin-sourcemaps": "0.6.3",
120-
"rollup-plugin-typescript2": "0.31.2",
120+
"rollup-plugin-typescript2": "0.34.1",
121121
"typescript": "4.2.2"
122122
},
123123
"repository": {

‎packages/component/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
},
3838
"license": "Apache-2.0",
3939
"devDependencies": {
40-
"rollup": "2.72.1",
41-
"rollup-plugin-typescript2": "0.31.2",
40+
"rollup": "2.79.1",
41+
"rollup-plugin-typescript2": "0.34.1",
4242
"typescript": "4.2.2"
4343
},
4444
"repository": {

‎packages/database/package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,15 @@
5353
"tslib": "^2.1.0"
5454
},
5555
"devDependencies": {
56+
<<<<<<< HEAD
5657
"@firebase/app": "0.8.2",
5758
"rollup": "2.72.1",
5859
"rollup-plugin-typescript2": "0.31.2",
60+
=======
61+
"@firebase/app": "0.8.1",
62+
"rollup": "2.79.1",
63+
"rollup-plugin-typescript2": "0.34.1",
64+
>>>>>>> f51379262 (Update rollup deps)
5965
"typescript": "4.2.2"
6066
},
6167
"repository": {

‎packages/firebase/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,12 @@
289289
"@firebase/util": "1.7.2"
290290
},
291291
"devDependencies": {
292-
"rollup": "2.72.1",
292+
"rollup": "2.79.1",
293293
"@rollup/plugin-commonjs": "21.1.0",
294294
"@rollup/plugin-node-resolve": "13.3.0",
295295
"rollup-plugin-sourcemaps": "0.6.3",
296296
"rollup-plugin-terser": "7.0.2",
297-
"rollup-plugin-typescript2": "0.31.2",
297+
"rollup-plugin-typescript2": "0.34.1",
298298
"rollup-plugin-uglify": "6.0.4",
299299
"gulp": "4.0.2",
300300
"gulp-sourcemaps": "3.0.0",

‎packages/firestore-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
"devDependencies": {
5353
"@firebase/app-compat": "0.1.37",
5454
"@types/eslint": "7.29.0",
55-
"rollup": "2.72.1",
55+
"rollup": "2.79.1",
5656
"rollup-plugin-sourcemaps": "0.6.3",
5757
"rollup-plugin-terser": "7.0.2",
58-
"rollup-plugin-typescript2": "0.31.2",
58+
"rollup-plugin-typescript2": "0.34.1",
5959
"@rollup/plugin-node-resolve": "13.3.0",
6060
"ts-node": "10.9.1",
6161
"typescript": "4.2.2"

‎packages/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@
103103
"chai-exclude": "2.1.0",
104104
"json-stable-stringify": "1.0.1",
105105
"protobufjs": "6.11.3",
106-
"rollup": "2.72.1",
106+
"rollup": "2.79.1",
107107
"rollup-plugin-copy": "3.4.0",
108108
"rollup-plugin-copy-assets": "2.0.3",
109109
"rollup-plugin-replace": "2.2.0",
110110
"rollup-plugin-sourcemaps": "0.6.3",
111111
"rollup-plugin-terser": "7.0.2",
112-
"rollup-plugin-typescript2": "0.31.2",
112+
"rollup-plugin-typescript2": "0.34.1",
113113
"ts-node": "10.9.1",
114114
"typescript": "4.2.2"
115115
},

‎packages/functions-compat/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,15 @@
2727
"@firebase/app-compat": "0.x"
2828
},
2929
"devDependencies": {
30+
<<<<<<< HEAD
3031
"@firebase/app-compat": "0.1.37",
3132
"rollup": "2.72.1",
33+
=======
34+
"@firebase/app-compat": "0.1.36",
35+
"rollup": "2.79.1",
36+
>>>>>>> f51379262 (Update rollup deps)
3237
"@rollup/plugin-json": "4.1.0",
33-
"rollup-plugin-typescript2": "0.31.2",
38+
"rollup-plugin-typescript2": "0.34.1",
3439
"typescript": "4.2.2"
3540
},
3641
"repository": {

‎packages/functions/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,15 @@
4646
"@firebase/app": "0.x"
4747
},
4848
"devDependencies": {
49+
<<<<<<< HEAD
4950
"@firebase/app": "0.8.2",
5051
"rollup": "2.72.1",
52+
=======
53+
"@firebase/app": "0.8.1",
54+
"rollup": "2.79.1",
55+
>>>>>>> f51379262 (Update rollup deps)
5156
"@rollup/plugin-json": "4.1.0",
52-
"rollup-plugin-typescript2": "0.31.2",
57+
"rollup-plugin-typescript2": "0.34.1",
5358
"typescript": "4.2.2"
5459
},
5560
"repository": {

‎packages/installations-compat/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,17 @@
4545
"url": "https://github.com/firebase/firebase-js-sdk/issues"
4646
},
4747
"devDependencies": {
48+
<<<<<<< HEAD
4849
"@firebase/app-compat": "0.1.37",
4950
"rollup": "2.72.1",
51+
=======
52+
"@firebase/app-compat": "0.1.36",
53+
"rollup": "2.79.1",
54+
>>>>>>> f51379262 (Update rollup deps)
5055
"@rollup/plugin-commonjs": "21.1.0",
5156
"@rollup/plugin-json": "4.1.0",
5257
"@rollup/plugin-node-resolve": "13.3.0",
53-
"rollup-plugin-typescript2": "0.31.2",
58+
"rollup-plugin-typescript2": "0.34.1",
5459
"rollup-plugin-uglify": "6.0.4",
5560
"typescript": "4.2.2"
5661
},

‎packages/installations/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,17 @@
5050
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5151
},
5252
"devDependencies": {
53+
<<<<<<< HEAD
5354
"@firebase/app": "0.8.2",
5455
"rollup": "2.72.1",
56+
=======
57+
"@firebase/app": "0.8.1",
58+
"rollup": "2.79.1",
59+
>>>>>>> f51379262 (Update rollup deps)
5560
"@rollup/plugin-commonjs": "21.1.0",
5661
"@rollup/plugin-json": "4.1.0",
5762
"@rollup/plugin-node-resolve": "13.3.0",
58-
"rollup-plugin-typescript2": "0.31.2",
63+
"rollup-plugin-typescript2": "0.34.1",
5964
"rollup-plugin-uglify": "6.0.4",
6065
"typescript": "4.2.2"
6166
},

‎packages/logger/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"tslib": "^2.1.0"
3737
},
3838
"devDependencies": {
39-
"rollup": "2.72.1",
40-
"rollup-plugin-typescript2": "0.31.2",
39+
"rollup": "2.79.1",
40+
"rollup-plugin-typescript2": "0.34.1",
4141
"typescript": "4.2.2"
4242
},
4343
"repository": {

‎packages/messaging-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"devDependencies": {
4848
"@firebase/app-compat": "0.1.37",
4949
"@rollup/plugin-json": "4.1.0",
50-
"rollup-plugin-typescript2": "0.31.2",
50+
"rollup-plugin-typescript2": "0.34.1",
5151
"ts-essentials": "9.3.0",
5252
"typescript": "4.2.2"
5353
},

‎packages/messaging/package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,15 @@
6262
"tslib": "^2.1.0"
6363
},
6464
"devDependencies": {
65+
<<<<<<< HEAD
6566
"@firebase/app": "0.8.2",
6667
"rollup": "2.72.1",
6768
"rollup-plugin-typescript2": "0.31.2",
69+
=======
70+
"@firebase/app": "0.8.1",
71+
"rollup": "2.79.1",
72+
"rollup-plugin-typescript2": "0.34.1",
73+
>>>>>>> f51379262 (Update rollup deps)
6874
"@rollup/plugin-json": "4.1.0",
6975
"ts-essentials": "9.3.0",
7076
"typescript": "4.2.2"

‎packages/performance-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
"tslib": "^2.1.0"
4848
},
4949
"devDependencies": {
50-
"rollup": "2.72.1",
50+
"rollup": "2.79.1",
5151
"@rollup/plugin-json": "4.1.0",
5252
"rollup-plugin-replace": "2.2.0",
53-
"rollup-plugin-typescript2": "0.31.2",
53+
"rollup-plugin-typescript2": "0.34.1",
5454
"typescript": "4.2.2",
5555
"@firebase/app-compat": "0.1.37"
5656
},

‎packages/performance/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,15 @@
4747
},
4848
"license": "Apache-2.0",
4949
"devDependencies": {
50+
<<<<<<< HEAD
5051
"@firebase/app": "0.8.2",
5152
"rollup": "2.72.1",
53+
=======
54+
"@firebase/app": "0.8.1",
55+
"rollup": "2.79.1",
56+
>>>>>>> f51379262 (Update rollup deps)
5257
"@rollup/plugin-json": "4.1.0",
53-
"rollup-plugin-typescript2": "0.31.2",
58+
"rollup-plugin-typescript2": "0.34.1",
5459
"typescript": "4.2.2"
5560
},
5661
"repository": {

‎packages/remote-config-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
"tslib": "^2.1.0"
4747
},
4848
"devDependencies": {
49-
"rollup": "2.72.1",
49+
"rollup": "2.79.1",
5050
"@rollup/plugin-json": "4.1.0",
5151
"rollup-plugin-replace": "2.2.0",
52-
"rollup-plugin-typescript2": "0.31.2",
52+
"rollup-plugin-typescript2": "0.34.1",
5353
"typescript": "4.2.2",
5454
"@firebase/app-compat": "0.1.37"
5555
},

‎packages/remote-config/package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,15 @@
4949
},
5050
"license": "Apache-2.0",
5151
"devDependencies": {
52+
<<<<<<< HEAD
5253
"@firebase/app": "0.8.2",
5354
"rollup": "2.72.1",
5455
"rollup-plugin-typescript2": "0.31.2",
56+
=======
57+
"@firebase/app": "0.8.1",
58+
"rollup": "2.79.1",
59+
"rollup-plugin-typescript2": "0.34.1",
60+
>>>>>>> f51379262 (Update rollup deps)
5561
"typescript": "4.2.2"
5662
},
5763
"repository": {

0 commit comments

Comments
 (0)