Skip to content

Commit ee20493

Browse files
dlarocquedlarocque
authored
Merge 7380ecb into 09ba48f 
2 parents 09ba48f + 7380ecb commit ee20493

File tree

101 files changed

+609
-1353
lines changed

Some content is hidden

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

101 files changed

+609
-1353
lines changed

‎.changeset/little-cows-tie.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
'@firebase/installations-compat': patch
3+
'@firebase/remote-config-compat': patch
4+
'@firebase/performance-compat': patch
5+
'@firebase/rules-unit-testing': patch
6+
'@firebase/webchannel-wrapper': patch
7+
'@firebase/analytics-compat': patch
8+
'@firebase/app-check-compat': patch
9+
'@firebase/firestore-compat': patch
10+
'@firebase/functions-compat': patch
11+
'@firebase/messaging-compat': patch
12+
'@firebase/database-compat': patch
13+
'@firebase/storage-compat': patch
14+
'@firebase/installations': patch
15+
'@firebase/remote-config': patch
16+
'@firebase/auth-compat': patch
17+
'@firebase/performance': patch
18+
'@firebase/app-compat': patch
19+
'@firebase/analytics': patch
20+
'@firebase/app-check': patch
21+
'@firebase/component': patch
22+
'@firebase/firestore': patch
23+
'@firebase/functions': patch
24+
'@firebase/messaging': patch
25+
'@firebase/database': patch
26+
'firebase': patch
27+
'@firebase/template': patch
28+
'@firebase/vertexai-preview': patch
29+
'@firebase/storage': patch
30+
'@firebase/logger': patch
31+
'@firebase/auth': patch
32+
'@firebase/util': patch
33+
'@firebase/app': patch
34+
---
35+
36+
Remove ES5 bundles. The minimum required ES version is now ES2017.

‎config/tsconfig.base.json

+3-11
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,16 @@
55
"importHelpers": true,
66
"strict": true,
77
"lib": [
8-
"es5",
98
"dom",
10-
"es2015.promise",
11-
"es2015.symbol",
12-
"es2015.iterable",
13-
"es2015.collection",
14-
"es2015.symbol.wellknown",
15-
"es2015.core",
16-
"es2017.object",
17-
"es2017.string",
18-
"ESNext.WeakRef",
9+
"es2017",
10+
"esnext.WeakRef",
1911
],
2012
"module": "ES2015",
2113
"moduleResolution": "node",
2214
"resolveJsonModule": true,
2315
"esModuleInterop": true,
2416
"sourceMap": true,
25-
"target": "es5",
17+
"target": "es2017",
2618
"typeRoots": [
2719
"../node_modules/@types"
2820
],

‎e2e/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module.exports = function (config) {
8282
'resolveJsonModule': true,
8383
'esModuleInterop': true,
8484
'sourceMap': true,
85-
'target': 'es5',
85+
'target': 'es2017',
8686
'importHelpers': true,
8787
'noEmitOnError': true
8888
}

‎integration/compat-interop/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"moduleResolution": "node",
99
"noImplicitAny": true,
1010
"outDir": "dist",
11-
"target": "ES5",
11+
"target": "es2017",
1212
"sourceMap": true,
1313
"esModuleInterop": true
1414
},

‎integration/firebase/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"moduleResolution": "node",
99
"noImplicitAny": true,
1010
"outDir": "dist",
11-
"target": "ES5",
11+
"target": "es2017",
1212
"sourceMap": true,
1313
"esModuleInterop": true
1414
},

‎packages/analytics-compat/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
"main": "dist/index.cjs.js",
77
"browser": "dist/esm/index.esm2017.js",
88
"module": "dist/esm/index.esm2017.js",
9-
"esm5": "dist/esm/index.esm.js",
109
"exports": {
1110
".": {
1211
"types": "./dist/src/index.d.ts",
1312
"require": "./dist/index.cjs.js",
14-
"esm5": "./dist/esm/index.esm.js",
1513
"default": "./dist/esm/index.esm2017.js"
1614
},
1715
"./package.json": "./package.json"

‎packages/analytics-compat/rollup.config.js

+21-39
Original file line numberDiff line numberDiff line change
@@ -25,51 +25,33 @@ const deps = Object.keys(
2525
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
2626
);
2727

28-
const es5BuildPlugins = [
28+
const buildPlugins = [
2929
typescriptPlugin({
3030
typescript
3131
}),
32-
json()
33-
];
34-
35-
const es2017BuildPlugins = [
36-
typescriptPlugin({
37-
typescript,
38-
tsconfigOverride: {
39-
compilerOptions: {
40-
target: 'es2017'
41-
}
42-
}
43-
}),
4432
json({ preferConst: true })
4533
];
4634

47-
const esmBuilds = [
48-
{
49-
input: 'src/index.ts',
50-
output: {
51-
file: pkg.browser,
52-
format: 'es',
53-
sourcemap: true
54-
},
55-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
56-
plugins: [...es2017BuildPlugins, emitModulePackageFile()]
35+
const esmBuild = {
36+
input: 'src/index.ts',
37+
output: {
38+
file: pkg.browser,
39+
format: 'es',
40+
sourcemap: true
5741
},
58-
{
59-
input: 'src/index.ts',
60-
output: { file: pkg.esm5, format: 'es', sourcemap: true },
61-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
62-
plugins: [...es5BuildPlugins, emitModulePackageFile()]
63-
}
64-
];
42+
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
43+
plugins: [...buildPlugins, emitModulePackageFile()]
44+
};
6545

66-
const cjsBuilds = [
67-
{
68-
input: 'src/index.ts',
69-
output: { file: pkg.main, format: 'cjs', sourcemap: true },
70-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
71-
plugins: es5BuildPlugins
72-
}
73-
];
46+
const cjsBuild = {
47+
input: 'src/index.ts',
48+
output: {
49+
file: pkg.main,
50+
format: 'cjs',
51+
sourcemap: true
52+
},
53+
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
54+
plugins: buildPlugins
55+
};
7456

75-
export default [...esmBuilds, ...cjsBuilds];
57+
export default [esmBuild, cjsBuild];

‎packages/analytics/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
"main": "dist/index.cjs.js",
77
"browser": "dist/esm/index.esm2017.js",
88
"module": "dist/esm/index.esm2017.js",
9-
"esm5": "dist/esm/index.esm.js",
109
"exports": {
1110
".": {
1211
"types": "./dist/analytics-public.d.ts",
1312
"require": "./dist/index.cjs.js",
14-
"esm5": "./dist/esm/index.esm.js",
1513
"default": "./dist/esm/index.esm2017.js"
1614
},
1715
"./package.json": "./package.json"

‎packages/analytics/rollup.config.js

+9-27
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,17 @@ const deps = [
2727
...Object.keys(Object.assign({}, pkg.peerDependencies, pkg.dependencies))
2828
];
2929

30-
const es5BuildPlugins = [
30+
const buildPlugins = [
3131
typescriptPlugin({
3232
typescript
3333
}),
34-
json()
35-
];
36-
37-
const es2017BuildPlugins = [
38-
typescriptPlugin({
39-
typescript,
40-
tsconfigOverride: {
41-
compilerOptions: {
42-
target: 'es2017'
43-
}
44-
}
45-
}),
4634
json({ preferConst: true })
4735
];
4836

4937
/**
5038
* ESM builds
5139
*/
5240
const esmBuilds = [
53-
{
54-
input: 'src/index.ts',
55-
output: [{ file: pkg.esm5, format: 'es', sourcemap: true }],
56-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
57-
plugins: [
58-
...es5BuildPlugins,
59-
replace(generateBuildTargetReplaceConfig('esm', 5)),
60-
emitModulePackageFile()
61-
]
62-
},
6341
{
6442
input: 'src/index.ts',
6543
output: {
@@ -69,7 +47,7 @@ const esmBuilds = [
6947
},
7048
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
7149
plugins: [
72-
...es2017BuildPlugins,
50+
...buildPlugins,
7351
replace(generateBuildTargetReplaceConfig('esm', 2017)),
7452
emitModulePackageFile()
7553
]
@@ -82,11 +60,15 @@ const esmBuilds = [
8260
const cjsBuilds = [
8361
{
8462
input: 'src/index.ts',
85-
output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
63+
output: {
64+
file: pkg.main,
65+
format: 'cjs',
66+
sourcemap: true
67+
},
8668
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
8769
plugins: [
88-
...es5BuildPlugins,
89-
replace(generateBuildTargetReplaceConfig('cjs', 5))
70+
...buildPlugins,
71+
replace(generateBuildTargetReplaceConfig('cjs', 2017))
9072
]
9173
}
9274
];

‎packages/analytics/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function registerAnalytics(): void {
6666
);
6767

6868
registerVersion(name, version);
69-
// BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
69+
// BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
7070
registerVersion(name, version, '__BUILD_TARGET__');
7171

7272
function internalFactory(

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

-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
"main": "dist/index.cjs.js",
77
"browser": "dist/esm/index.esm2017.js",
88
"module": "dist/esm/index.esm2017.js",
9-
"esm5": "dist/esm/index.esm.js",
109
"exports": {
1110
".": {
1211
"types": "./dist/src/index.d.ts",
1312
"require": "./dist/index.cjs.js",
14-
"esm5": "./dist/esm/index.esm.js",
1513
"default": "./dist/esm/index.esm2017.js"
1614
},
1715
"./package.json": "./package.json"

‎packages/app-check-compat/rollup.config.js

+8-22
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,14 @@ const deps = Object.keys(
2525
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
2626
);
2727

28-
const es5BuildPlugins = [
28+
const buildPlugins = [
2929
typescriptPlugin({
3030
typescript
3131
}),
32-
json()
33-
];
34-
35-
const es2017BuildPlugins = [
36-
typescriptPlugin({
37-
typescript,
38-
tsconfigOverride: {
39-
compilerOptions: {
40-
target: 'es2017'
41-
}
42-
}
43-
}),
4432
json({ preferConst: true })
4533
];
4634

4735
const esmBuilds = [
48-
{
49-
input: 'src/index.ts',
50-
output: { file: pkg.esm5, format: 'es', sourcemap: true },
51-
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
52-
plugins: [...es5BuildPlugins, emitModulePackageFile()]
53-
},
5436
{
5537
input: 'src/index.ts',
5638
output: {
@@ -59,16 +41,20 @@ const esmBuilds = [
5941
sourcemap: true
6042
},
6143
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
62-
plugins: [...es2017BuildPlugins, emitModulePackageFile()]
44+
plugins: [...buildPlugins, emitModulePackageFile()]
6345
}
6446
];
6547

6648
const cjsBuilds = [
6749
{
6850
input: 'src/index.ts',
69-
output: { file: pkg.main, format: 'cjs', sourcemap: true },
51+
output: {
52+
file: pkg.main,
53+
format: 'cjs',
54+
sourcemap: true
55+
},
7056
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
71-
plugins: es5BuildPlugins
57+
plugins: buildPlugins
7258
}
7359
];
7460

‎packages/app-check/package.json

-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
"main": "dist/index.cjs.js",
77
"browser": "dist/esm/index.esm2017.js",
88
"module": "dist/esm/index.esm2017.js",
9-
"esm5": "dist/esm/index.esm.js",
109
"exports": {
1110
".": {
1211
"types": "./dist/app-check-public.d.ts",
1312
"require": "./dist/index.cjs.js",
14-
"esm5": "./dist/esm/index.esm.js",
1513
"default": "./dist/esm/index.esm2017.js"
1614
},
1715
"./package.json": "./package.json"

0 commit comments

Comments
 (0)