Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
'unused-imports'
],
'parserOptions': {
'ecmaVersion': 2017,
'ecmaVersion': 2020,
'sourceType': 'module'
},
'overrides': [
Expand Down
4 changes: 2 additions & 2 deletions config/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"strict": true,
"lib": [
"dom",
"es2017",
"es2020",
"esnext.WeakRef",
],
"module": "ES2015",
"moduleResolution": "node",
"resolveJsonModule": true,
"esModuleInterop": true,
"sourceMap": true,
"target": "es2017",
"target": "es2020",
"typeRoots": [
"../node_modules/@types"
],
Expand Down
11 changes: 1 addition & 10 deletions config/webpack.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = {
options: {
compilerOptions: {
module: 'commonjs',
target: 'es2017',
target: 'es2020',
downlevelIteration: true,
resolveJsonModule: true
}
Expand All @@ -56,15 +56,6 @@ module.exports = {
use: 'source-map-loader',
enforce: 'pre'
},
{
test: /\.tsx?$/,
use: {
loader: 'istanbul-instrumenter-loader',
options: { esModules: true }
},
enforce: 'post',
exclude: [/\.test\.ts$/, /\btest(ing)?\//]
},
{
test: /\.js$/,
include: [/node_modules\/chai-as-promised/],
Expand Down
2 changes: 1 addition & 1 deletion integration/compat-interop/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"moduleResolution": "node",
"noImplicitAny": true,
"outDir": "dist",
"target": "es2017",
"target": "es2020",
"sourceMap": true,
"esModuleInterop": true
},
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
"http-server": "14.1.1",
"indexeddbshim": "10.1.0",
"inquirer": "8.2.6",
"istanbul-instrumenter-loader": "3.0.1",
"js-yaml": "4.1.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.2.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/ai/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"node": ">=18.0.0"
},
"main": "dist/index.cjs.js",
"browser": "dist/esm/index.esm2017.js",
"module": "dist/esm/index.esm2017.js",
"browser": "dist/esm/index.esm.js",
"module": "dist/esm/index.esm.js",
"exports": {
".": {
"types": "./dist/ai-public.d.ts",
Expand All @@ -18,9 +18,9 @@
},
"browser": {
"require": "./dist/index.cjs.js",
"import": "./dist/esm/index.esm2017.js"
"import": "./dist/esm/index.esm.js"
},
"default": "./dist/esm/index.esm2017.js"
"default": "./dist/esm/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/ai/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const buildPlugins = [
'integration'
],
compilerOptions: {
target: 'es2017'
target: 'es2020'
}
}
}),
Expand All @@ -57,7 +57,7 @@ const browserBuilds = [
plugins: [
...buildPlugins,
replace({
...generateBuildTargetReplaceConfig('esm', 2017),
...generateBuildTargetReplaceConfig('esm', 2020),
__PACKAGE_VERSION__: pkg.version
}),
emitModulePackageFile()
Expand All @@ -74,7 +74,7 @@ const browserBuilds = [
plugins: [
...buildPlugins,
replace({
...generateBuildTargetReplaceConfig('cjs', 2017),
...generateBuildTargetReplaceConfig('cjs', 2020),
__PACKAGE_VERSION__: pkg.version
})
],
Expand All @@ -93,7 +93,7 @@ const nodeBuilds = [
plugins: [
...buildPlugins,
replace({
...generateBuildTargetReplaceConfig('esm', 2017)
...generateBuildTargetReplaceConfig('esm', 2020)
})
],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
Expand All @@ -108,7 +108,7 @@ const nodeBuilds = [
plugins: [
...buildPlugins,
replace({
...generateBuildTargetReplaceConfig('cjs', 2017)
...generateBuildTargetReplaceConfig('cjs', 2020)
})
],
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
Expand Down
2 changes: 1 addition & 1 deletion packages/ai/src/index.node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function registerAI(): void {
);

registerVersion(name, version, 'node');
// BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
// BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
registerVersion(name, version, '__BUILD_TARGET__');
}

Expand Down
2 changes: 1 addition & 1 deletion packages/ai/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function registerAI(): void {
);

registerVersion(name, version);
// BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
// BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
registerVersion(name, version, '__BUILD_TARGET__');
}

Expand Down
6 changes: 3 additions & 3 deletions packages/analytics-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"description": "",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/index.cjs.js",
"browser": "dist/esm/index.esm2017.js",
"module": "dist/esm/index.esm2017.js",
"browser": "dist/esm/index.esm.js",
"module": "dist/esm/index.esm.js",
"exports": {
".": {
"types": "./dist/src/index.d.ts",
"require": "./dist/index.cjs.js",
"default": "./dist/esm/index.esm2017.js"
"default": "./dist/esm/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"description": "A analytics package for new firebase packages",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/index.cjs.js",
"browser": "dist/esm/index.esm2017.js",
"module": "dist/esm/index.esm2017.js",
"browser": "dist/esm/index.esm.js",
"module": "dist/esm/index.esm.js",
"exports": {
".": {
"types": "./dist/analytics-public.d.ts",
"require": "./dist/index.cjs.js",
"default": "./dist/esm/index.esm2017.js"
"default": "./dist/esm/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const esmBuilds = [
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
plugins: [
...buildPlugins,
replace(generateBuildTargetReplaceConfig('esm', 2017)),
replace(generateBuildTargetReplaceConfig('esm', 2020)),
emitModulePackageFile()
]
}
Expand All @@ -73,7 +73,7 @@ const cjsBuilds = [
external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
plugins: [
...buildPlugins,
replace(generateBuildTargetReplaceConfig('cjs', 2017))
replace(generateBuildTargetReplaceConfig('cjs', 2020))
]
}
];
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function registerAnalytics(): void {
);

registerVersion(name, version);
// BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
// BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
registerVersion(name, version, '__BUILD_TARGET__');

function internalFactory(
Expand Down
6 changes: 3 additions & 3 deletions packages/app-check-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"description": "A compat App Check package for new firebase packages",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/index.cjs.js",
"browser": "dist/esm/index.esm2017.js",
"module": "dist/esm/index.esm2017.js",
"browser": "dist/esm/index.esm.js",
"module": "dist/esm/index.esm.js",
"exports": {
".": {
"types": "./dist/src/index.d.ts",
"require": "./dist/index.cjs.js",
"default": "./dist/esm/index.esm2017.js"
"default": "./dist/esm/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/app-check/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"description": "The App Check component of the Firebase JS SDK",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/index.cjs.js",
"browser": "dist/esm/index.esm2017.js",
"module": "dist/esm/index.esm2017.js",
"browser": "dist/esm/index.esm.js",
"module": "dist/esm/index.esm.js",
"exports": {
".": {
"types": "./dist/app-check-public.d.ts",
"require": "./dist/index.cjs.js",
"default": "./dist/esm/index.esm2017.js"
"default": "./dist/esm/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/app-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"description": "The primary entrypoint to the Firebase JS SDK",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/index.cjs.js",
"browser": "dist/esm/index.esm2017.js",
"module": "dist/esm/index.esm2017.js",
"browser": "dist/esm/index.esm.js",
"module": "dist/esm/index.esm.js",
"lite": "dist/index.lite.js",
"exports": {
".": {
"types": "./dist/app-compat-public.d.ts",
"require": "./dist/index.cjs.js",
"lite": "./dist/index.lite.js",
"default": "./dist/esm/index.esm2017.js"
"default": "./dist/esm/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"description": "The primary entrypoint to the Firebase JS SDK",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/index.cjs.js",
"browser": "dist/esm/index.esm2017.js",
"module": "dist/esm/index.esm2017.js",
"browser": "dist/esm/index.esm.js",
"module": "dist/esm/index.esm.js",
"react-native": "dist/index.cjs.js",
"exports": {
".": {
"types": "./dist/app-public.d.ts",
"require": "./dist/index.cjs.js",
"react-native": "./dist/index.cjs.js",
"default": "./dist/esm/index.esm2017.js"
"default": "./dist/esm/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/app/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const esmBuilds = [
plugins: [
...buildPlugins,
replace({
...generateBuildTargetReplaceConfig('esm', 2017),
...generateBuildTargetReplaceConfig('esm', 2020),
'__RUNTIME_ENV__': ''
}),
emitModulePackageFile()
Expand All @@ -74,7 +74,7 @@ const cjsBuilds = [
plugins: [
...buildPlugins,
replace({
...generateBuildTargetReplaceConfig('cjs', 2017),
...generateBuildTargetReplaceConfig('cjs', 2020),
'__RUNTIME_ENV__': 'node'
})
]
Expand Down
6 changes: 4 additions & 2 deletions packages/app/src/heartbeatService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,10 @@ describe('HeartbeatServiceImpl', () => {
expect(emptyHeaders).to.equal('');
});
it(`triggerHeartbeat() doesn't throw even if code errors`, async () => {
//@ts-expect-error Ensure this doesn't match
heartbeatService._heartbeatsCache?.lastSentHeartbeatDate = 50;
if (heartbeatService._heartbeatsCache) {
//@ts-expect-error Ensure this doesn't match
heartbeatService._heartbeatsCache.lastSentHeartbeatDate = 50;
}
//@ts-expect-error Ensure you can't .push() to this
heartbeatService._heartbeatsCache.heartbeats = 50;
const warnStub = stub(console, 'warn');
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/registerCoreComponents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function registerCoreComponents(variant?: string): void {

// Register `app` package.
registerVersion(name, version, variant);
// BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
// BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
registerVersion(name, version, '__BUILD_TARGET__');
// Register platform SDK identifier (no version).
registerVersion('fire-js', '');
Expand Down
8 changes: 4 additions & 4 deletions packages/auth-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "FirebaseAuth compatibility package that uses API style compatible with Firebase@8 and prior versions",
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
"main": "dist/index.node.cjs.js",
"browser": "dist/index.esm2017.js",
"module": "dist/index.esm2017.js",
"browser": "dist/index.esm.js",
"module": "dist/index.esm.js",
"exports": {
".": {
"types": "./dist/auth-compat/index.d.ts",
Expand All @@ -16,9 +16,9 @@
},
"browser": {
"require": "./dist/index.cjs.js",
"import": "./dist/index.esm2017.js"
"import": "./dist/index.esm.js"
},
"default": "./dist/index.esm2017.js"
"default": "./dist/index.esm.js"
},
"./package.json": "./package.json"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/api-extractor.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "../../config/api-extractor.json",
"mainEntryPointFilePath": "<projectFolder>/dist/esm2017/index.d.ts",
"mainEntryPointFilePath": "<projectFolder>/dist/esm/index.d.ts",
"dtsRollup": {
"enabled": true,
"untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/demo/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ const workerPlugins = [
tsconfigOverride: {
compilerOptions: {
declaration: false,
target: 'es2017',
target: 'es2020',
lib: [
// TODO: remove this
'dom',
'es2017',
'es2020',
'webworker'
]
}
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/demo/src/worker/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"extends": "../../../config/tsconfig.base.json",
"compilerOptions": {
"outDir": "dist",
"target": "es2017",
"target": "es2020",
"lib": [
"es2017",
"es2020",
"webworker"
]
},
Expand Down
6 changes: 3 additions & 3 deletions packages/auth/internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "@firebase/auth/internal",
"description": "An internal version of the Auth SDK for use in the compatibility layer",
"main": "../dist/node/internal.js",
"module": "../dist/esm2017/internal.js",
"browser": "../dist/esm2017/internal.js",
"typings": "../dist/esm2017/internal/index.d.ts",
"module": "../dist/esm/internal.js",
"browser": "../dist/esm/internal.js",
"typings": "../dist/esm/internal/index.d.ts",
"private": true,
"engines": {
"node": ">=18.0.0"
Expand Down
Loading
Loading