diff --git a/config/.eslintrc.js b/config/.eslintrc.js index 57243a3e2a4..8212432f841 100644 --- a/config/.eslintrc.js +++ b/config/.eslintrc.js @@ -31,7 +31,7 @@ module.exports = { 'unused-imports' ], 'parserOptions': { - 'ecmaVersion': 2017, + 'ecmaVersion': 2020, 'sourceType': 'module' }, 'overrides': [ diff --git a/config/tsconfig.base.json b/config/tsconfig.base.json index adbd2e44072..ce58a6d700b 100644 --- a/config/tsconfig.base.json +++ b/config/tsconfig.base.json @@ -6,7 +6,7 @@ "strict": true, "lib": [ "dom", - "es2017", + "es2020", "esnext.WeakRef", ], "module": "ES2015", @@ -14,7 +14,7 @@ "resolveJsonModule": true, "esModuleInterop": true, "sourceMap": true, - "target": "es2017", + "target": "es2020", "typeRoots": [ "../node_modules/@types" ], diff --git a/config/webpack.test.js b/config/webpack.test.js index 30e3985fe3d..cc739313779 100644 --- a/config/webpack.test.js +++ b/config/webpack.test.js @@ -44,7 +44,7 @@ module.exports = { options: { compilerOptions: { module: 'commonjs', - target: 'es2017', + target: 'es2020', downlevelIteration: true, resolveJsonModule: true } @@ -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/], diff --git a/integration/compat-interop/tsconfig.json b/integration/compat-interop/tsconfig.json index 735f3df7fbd..c986fcaf8a7 100644 --- a/integration/compat-interop/tsconfig.json +++ b/integration/compat-interop/tsconfig.json @@ -8,7 +8,7 @@ "moduleResolution": "node", "noImplicitAny": true, "outDir": "dist", - "target": "es2017", + "target": "es2020", "sourceMap": true, "esModuleInterop": true }, diff --git a/package.json b/package.json index 30b6b09a003..ce2c5847573 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/ai/package.json b/packages/ai/package.json index 9a2251543e4..d03f6dc332d 100644 --- a/packages/ai/package.json +++ b/packages/ai/package.json @@ -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", @@ -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" }, diff --git a/packages/ai/rollup.config.js b/packages/ai/rollup.config.js index 3b155335898..7ebbff4f2f5 100644 --- a/packages/ai/rollup.config.js +++ b/packages/ai/rollup.config.js @@ -39,7 +39,7 @@ const buildPlugins = [ 'integration' ], compilerOptions: { - target: 'es2017' + target: 'es2020' } } }), @@ -57,7 +57,7 @@ const browserBuilds = [ plugins: [ ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('esm', 2017), + ...generateBuildTargetReplaceConfig('esm', 2020), __PACKAGE_VERSION__: pkg.version }), emitModulePackageFile() @@ -74,7 +74,7 @@ const browserBuilds = [ plugins: [ ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('cjs', 2017), + ...generateBuildTargetReplaceConfig('cjs', 2020), __PACKAGE_VERSION__: pkg.version }) ], @@ -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}/`)) @@ -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}/`)) diff --git a/packages/ai/src/index.node.ts b/packages/ai/src/index.node.ts index 1908e65b1cd..bb05fdcea45 100644 --- a/packages/ai/src/index.node.ts +++ b/packages/ai/src/index.node.ts @@ -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__'); } diff --git a/packages/ai/src/index.ts b/packages/ai/src/index.ts index 8451d68bbf0..6ad1f2e3f08 100644 --- a/packages/ai/src/index.ts +++ b/packages/ai/src/index.ts @@ -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__'); } diff --git a/packages/analytics-compat/package.json b/packages/analytics-compat/package.json index 1e51c81fefa..ef13d21343e 100644 --- a/packages/analytics-compat/package.json +++ b/packages/analytics-compat/package.json @@ -4,13 +4,13 @@ "description": "", "author": "Firebase (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" }, diff --git a/packages/analytics/package.json b/packages/analytics/package.json index b118e706316..0627556deed 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -4,13 +4,13 @@ "description": "A analytics package for new firebase packages", "author": "Firebase (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" }, diff --git a/packages/analytics/rollup.config.js b/packages/analytics/rollup.config.js index 529858f147f..f119da4bd5f 100644 --- a/packages/analytics/rollup.config.js +++ b/packages/analytics/rollup.config.js @@ -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() ] } @@ -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)) ] } ]; diff --git a/packages/analytics/src/index.ts b/packages/analytics/src/index.ts index f79725db7bd..7fa2e8fa10b 100644 --- a/packages/analytics/src/index.ts +++ b/packages/analytics/src/index.ts @@ -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( diff --git a/packages/app-check-compat/package.json b/packages/app-check-compat/package.json index ab20d3a585a..eb2af822b52 100644 --- a/packages/app-check-compat/package.json +++ b/packages/app-check-compat/package.json @@ -4,13 +4,13 @@ "description": "A compat App Check package for new firebase packages", "author": "Firebase (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" }, diff --git a/packages/app-check/package.json b/packages/app-check/package.json index 2c8e1e8e6e1..caea78cc3bc 100644 --- a/packages/app-check/package.json +++ b/packages/app-check/package.json @@ -4,13 +4,13 @@ "description": "The App Check component of the Firebase JS SDK", "author": "Firebase (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" }, diff --git a/packages/app-compat/package.json b/packages/app-compat/package.json index 6f7b7ccc706..bed5553a39c 100644 --- a/packages/app-compat/package.json +++ b/packages/app-compat/package.json @@ -4,15 +4,15 @@ "description": "The primary entrypoint to the Firebase JS SDK", "author": "Firebase (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" }, diff --git a/packages/app/package.json b/packages/app/package.json index c11f5039310..7fbcff0bdcf 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -4,15 +4,15 @@ "description": "The primary entrypoint to the Firebase JS SDK", "author": "Firebase (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" }, diff --git a/packages/app/rollup.config.js b/packages/app/rollup.config.js index 8314734a746..0e916a43b26 100644 --- a/packages/app/rollup.config.js +++ b/packages/app/rollup.config.js @@ -54,7 +54,7 @@ const esmBuilds = [ plugins: [ ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('esm', 2017), + ...generateBuildTargetReplaceConfig('esm', 2020), '__RUNTIME_ENV__': '' }), emitModulePackageFile() @@ -74,7 +74,7 @@ const cjsBuilds = [ plugins: [ ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('cjs', 2017), + ...generateBuildTargetReplaceConfig('cjs', 2020), '__RUNTIME_ENV__': 'node' }) ] diff --git a/packages/app/src/heartbeatService.test.ts b/packages/app/src/heartbeatService.test.ts index 57f97ec7468..caebba457c3 100644 --- a/packages/app/src/heartbeatService.test.ts +++ b/packages/app/src/heartbeatService.test.ts @@ -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'); diff --git a/packages/app/src/registerCoreComponents.ts b/packages/app/src/registerCoreComponents.ts index f0141dbf155..f84445714f3 100644 --- a/packages/app/src/registerCoreComponents.ts +++ b/packages/app/src/registerCoreComponents.ts @@ -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', ''); diff --git a/packages/auth-compat/package.json b/packages/auth-compat/package.json index f681fa63538..c56195cf991 100644 --- a/packages/auth-compat/package.json +++ b/packages/auth-compat/package.json @@ -4,8 +4,8 @@ "description": "FirebaseAuth compatibility package that uses API style compatible with Firebase@8 and prior versions", "author": "Firebase (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", @@ -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" }, diff --git a/packages/auth/api-extractor.json b/packages/auth/api-extractor.json index f7279fcac15..8b44b43f4d1 100644 --- a/packages/auth/api-extractor.json +++ b/packages/auth/api-extractor.json @@ -1,6 +1,6 @@ { "extends": "../../config/api-extractor.json", - "mainEntryPointFilePath": "/dist/esm2017/index.d.ts", + "mainEntryPointFilePath": "/dist/esm/index.d.ts", "dtsRollup": { "enabled": true, "untrimmedFilePath": "/dist/.d.ts", diff --git a/packages/auth/demo/rollup.config.js b/packages/auth/demo/rollup.config.js index ce6a2893210..d71d9aa58e3 100644 --- a/packages/auth/demo/rollup.config.js +++ b/packages/auth/demo/rollup.config.js @@ -31,11 +31,11 @@ const workerPlugins = [ tsconfigOverride: { compilerOptions: { declaration: false, - target: 'es2017', + target: 'es2020', lib: [ // TODO: remove this 'dom', - 'es2017', + 'es2020', 'webworker' ] } diff --git a/packages/auth/demo/src/worker/tsconfig.json b/packages/auth/demo/src/worker/tsconfig.json index 1081b12233f..3d05a4350c7 100644 --- a/packages/auth/demo/src/worker/tsconfig.json +++ b/packages/auth/demo/src/worker/tsconfig.json @@ -2,9 +2,9 @@ "extends": "../../../config/tsconfig.base.json", "compilerOptions": { "outDir": "dist", - "target": "es2017", + "target": "es2020", "lib": [ - "es2017", + "es2020", "webworker" ] }, diff --git a/packages/auth/internal/package.json b/packages/auth/internal/package.json index 4ecfdccbd20..1a67791cfaf 100644 --- a/packages/auth/internal/package.json +++ b/packages/auth/internal/package.json @@ -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" diff --git a/packages/auth/package.json b/packages/auth/package.json index c6411b4bd3b..4dc43b98ea3 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -5,10 +5,10 @@ "author": "Firebase (https://firebase.google.com/)", "main": "dist/node/index.js", "react-native": "dist/rn/index.js", - "browser": "dist/esm2017/index.js", - "module": "dist/esm2017/index.js", + "browser": "dist/esm/index.js", + "module": "dist/esm/index.js", "cordova": "dist/cordova/index.js", - "web-extension": "dist/web-extension-esm2017/index.js", + "web-extension": "dist/web-extension-esm/index.js", "webworker": "dist/index.webworker.js", "exports": { ".": { @@ -32,19 +32,19 @@ }, "browser": { "require": "./dist/browser-cjs/index.js", - "import": "./dist/esm2017/index.js" + "import": "./dist/esm/index.js" }, - "default": "./dist/esm2017/index.js" + "default": "./dist/esm/index.js" }, "./cordova": { "types": "./dist/cordova/auth-cordova-public.d.ts", "default": "./dist/cordova/index.js" }, "./web-extension": { - "types:": "./dist/web-extension-esm2017/auth-web-extension-public.d.ts", - "import": "./dist/web-extension-esm2017/index.js", + "types:": "./dist/web-extension-esm/auth-web-extension-public.d.ts", + "import": "./dist/web-extension-esm/index.js", "require": "./dist/web-extension-cjs/index.js", - "default": "./dist/web-extension-esm2017/index.js" + "default": "./dist/web-extension-esm/index.js" }, "./internal": { "types": "./dist/internal/index.d.ts", @@ -63,15 +63,15 @@ }, "browser": { "require": "./dist/browser-cjs/internal.js", - "import": "./dist/esm2017/internal.js" + "import": "./dist/esm/internal.js" }, "web-extension": { "types:": "./dist/web-extension-cjs/internal/index.d.ts", - "import": "./dist/web-extension-esm2017/internal.js", + "import": "./dist/web-extension-esm/internal.js", "require": "./dist/web-extension-cjs/internal.js", - "default": "./dist/web-extension-esm2017/internal.js" + "default": "./dist/web-extension-esm/internal.js" }, - "default": "./dist/esm2017/internal.js" + "default": "./dist/esm/internal.js" }, "./package.json": "./package.json" }, diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js index 01ca456e0ac..bef5b696ca2 100644 --- a/packages/auth/rollup.config.js +++ b/packages/auth/rollup.config.js @@ -61,13 +61,13 @@ const browserBuilds = [ internal: 'internal/index.ts' }, output: { - dir: 'dist/esm2017', + dir: 'dist/esm', format: 'es', sourcemap: true }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) }, @@ -79,7 +79,7 @@ const browserBuilds = [ output: [{ dir: 'dist/browser-cjs', format: 'cjs', sourcemap: true }], plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) } @@ -92,13 +92,13 @@ const browserWebExtensionBuilds = [ internal: 'internal/index.ts' }, output: { - dir: 'dist/web-extension-esm2017', + dir: 'dist/web-extension-esm', format: 'es', sourcemap: true }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) @@ -111,7 +111,7 @@ const browserWebExtensionBuilds = [ output: [{ dir: 'dist/web-extension-cjs', format: 'cjs', sourcemap: true }], plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) } @@ -127,7 +127,7 @@ const nodeBuilds = [ plugins: [ nodeAliasPlugin, ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) }, @@ -140,7 +140,7 @@ const nodeBuilds = [ plugins: [ nodeAliasPlugin, ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) @@ -159,7 +159,7 @@ const cordovaBuild = { }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: id => [...deps, 'cordova'].some(dep => id === dep || id.startsWith(`${dep}/`)) @@ -173,7 +173,7 @@ const rnBuild = { output: [{ dir: 'dist/rn', format: 'cjs', sourcemap: true }], plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: id => [...deps, 'react-native'].some( @@ -200,12 +200,12 @@ const webWorkerBuild = { lib: [ // Remove dom after we figure out why navigator stuff doesn't exist 'dom', - 'es2017', + 'es2020', 'webworker' ] } }), - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) }; diff --git a/packages/auth/src/core/auth/register.ts b/packages/auth/src/core/auth/register.ts index 9d0d6b4559d..4d7688e9804 100644 --- a/packages/auth/src/core/auth/register.ts +++ b/packages/auth/src/core/auth/register.ts @@ -130,6 +130,6 @@ export function registerAuth(clientPlatform: ClientPlatform): void { ); registerVersion(name, version, getVersionForPlatform(clientPlatform)); - // 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__'); } diff --git a/packages/auth/web-extension/api-extractor.json b/packages/auth/web-extension/api-extractor.json index d12063c69b5..111018d32ad 100644 --- a/packages/auth/web-extension/api-extractor.json +++ b/packages/auth/web-extension/api-extractor.json @@ -1,13 +1,13 @@ { "extends": "../../../config/api-extractor.json", - "mainEntryPointFilePath": "/dist/web-extension-esm2017/index.web-extension.d.ts", + "mainEntryPointFilePath": "/dist/web-extension-esm/index.web-extension.d.ts", "apiReport": { "enabled": false }, "dtsRollup": { "enabled": true, - "untrimmedFilePath": "/dist/web-extension-esm2017/.d.ts", - "publicTrimmedFilePath": "/dist/web-extension-esm2017/-public.d.ts" + "untrimmedFilePath": "/dist/web-extension-esm/.d.ts", + "publicTrimmedFilePath": "/dist/web-extension-esm/-public.d.ts" }, "docModel": { "enabled": true, diff --git a/packages/auth/web-extension/package.json b/packages/auth/web-extension/package.json index f3882a4f1d0..2b1b9ec599a 100644 --- a/packages/auth/web-extension/package.json +++ b/packages/auth/web-extension/package.json @@ -2,7 +2,7 @@ "name": "@firebase/auth-web-extension", "description": "A Chrome-Manifest-v3-specific build of the Firebase Auth JS SDK", "main": "../dist/web-extension-cjs/index.js", - "browser": "../dist/web-extension-esm2017/index.js", - "module": "../dist/web-extension-esm2017/index.js", - "typings": "../dist/web-extension-esm2017/auth-web-extension-public.d.ts" + "browser": "../dist/web-extension-esm/index.js", + "module": "../dist/web-extension-esm/index.js", + "typings": "../dist/web-extension-esm/auth-web-extension-public.d.ts" } \ No newline at end of file diff --git a/packages/component/package.json b/packages/component/package.json index 941d80f00bc..9bc11a5784b 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -4,13 +4,13 @@ "description": "Firebase Component Platform", "author": "Firebase (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/index.d.ts", "require": "./dist/index.cjs.js", - "default": "./dist/esm/index.esm2017.js" + "default": "./dist/esm/index.esm.js" }, "./package.json": "./package.json" }, diff --git a/packages/data-connect/package.json b/packages/data-connect/package.json index 7b5f7e2dc2d..ef169dfa5ff 100644 --- a/packages/data-connect/package.json +++ b/packages/data-connect/package.json @@ -4,8 +4,8 @@ "description": "", "author": "Firebase (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/public.d.ts", @@ -15,9 +15,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" }, diff --git a/packages/data-connect/rollup.config.js b/packages/data-connect/rollup.config.js index ab0119ca5d2..7b004c0a421 100644 --- a/packages/data-connect/rollup.config.js +++ b/packages/data-connect/rollup.config.js @@ -59,7 +59,7 @@ const browserBuilds = [ ], plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], treeshake: { moduleSideEffects: false @@ -76,7 +76,7 @@ const browserBuilds = [ }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], treeshake: { moduleSideEffects: false @@ -96,7 +96,7 @@ const nodeBuilds = [ }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], treeshake: { moduleSideEffects: false @@ -113,7 +113,7 @@ const nodeBuilds = [ }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ], treeshake: { diff --git a/packages/data-connect/src/register.ts b/packages/data-connect/src/register.ts index 53b44f4e43d..badebf2a29b 100644 --- a/packages/data-connect/src/register.ts +++ b/packages/data-connect/src/register.ts @@ -58,6 +58,6 @@ export function registerDataConnect(variant?: string): void { ).setMultipleInstances(true) ); registerVersion(name, version, variant); - // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation + // BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation registerVersion(name, version, '__BUILD_TARGET__'); } diff --git a/packages/database-compat/package.json b/packages/database-compat/package.json index 1a5d6f79313..01a42da2a20 100644 --- a/packages/database-compat/package.json +++ b/packages/database-compat/package.json @@ -4,8 +4,8 @@ "description": "The Realtime Database component of the Firebase JS SDK.", "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.js", - "browser": "dist/index.esm2017.js", - "module": "dist/index.esm2017.js", + "browser": "dist/index.esm.js", + "module": "dist/index.esm.js", "license": "Apache-2.0", "typings": "dist/database-compat/src/index.d.ts", "files": [ @@ -22,9 +22,9 @@ }, "browser": { "require": "./dist/index.js", - "import": "./dist/index.esm2017.js" + "import": "./dist/index.esm.js" }, - "default": "./dist/index.esm2017.js" + "default": "./dist/index.esm.js" }, "./standalone": { "types": "./dist/database-compat/src/index.standalone.d.ts", diff --git a/packages/database/package.json b/packages/database/package.json index cfc197da0e3..ce7811adfe4 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -4,8 +4,8 @@ "description": "", "author": "Firebase (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", "standalone": "dist/index.standalone.js", "exports": { ".": { @@ -17,9 +17,9 @@ "standalone": "./dist/index.standalone.js", "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" }, diff --git a/packages/database/rollup.config.js b/packages/database/rollup.config.js index bdd6b8ae36c..165195229c9 100644 --- a/packages/database/rollup.config.js +++ b/packages/database/rollup.config.js @@ -59,7 +59,7 @@ const browserBuilds = [ ], plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], treeshake: { moduleSideEffects: false @@ -78,7 +78,7 @@ const browserBuilds = [ ], plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], treeshake: { moduleSideEffects: false @@ -98,7 +98,7 @@ const nodeBuilds = [ }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], treeshake: { moduleSideEffects: false @@ -115,7 +115,7 @@ const nodeBuilds = [ }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ], treeshake: { diff --git a/packages/database/src/register.ts b/packages/database/src/register.ts index 9322368526b..c54f52b5a3e 100644 --- a/packages/database/src/register.ts +++ b/packages/database/src/register.ts @@ -47,6 +47,6 @@ export function registerDatabase(variant?: string): void { ).setMultipleInstances(true) ); 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__'); } diff --git a/packages/firestore-compat/package.json b/packages/firestore-compat/package.json index 81b0aede4ce..7d446495832 100644 --- a/packages/firestore-compat/package.json +++ b/packages/firestore-compat/package.json @@ -5,8 +5,8 @@ "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.node.cjs.js", "react-native": "dist/index.rn.js", - "browser": "dist/index.esm2017.js", - "module": "dist/index.esm2017.js", + "browser": "dist/index.esm.js", + "module": "dist/index.esm.js", "exports": { ".": { "types": "./dist/src/index.d.ts", @@ -17,9 +17,9 @@ "react-native": "./dist/index.rn.js", "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" }, diff --git a/packages/firestore-compat/rollup.config.js b/packages/firestore-compat/rollup.config.js index c85af11225f..e265d3e31b7 100644 --- a/packages/firestore-compat/rollup.config.js +++ b/packages/firestore-compat/rollup.config.js @@ -25,12 +25,12 @@ const util = require('../firestore/rollup.shared'); const deps = Object.keys({ ...pkg.peerDependencies, ...pkg.dependencies }); -const es2017Plugins = [ +const es2020Plugins = [ typescriptPlugin({ typescript, tsconfigOverride: { compilerOptions: { - target: 'es2017' + target: 'es2020' } }, transformers: [util.removeAssertTransformer] @@ -46,7 +46,7 @@ const browserBuilds = [ format: 'es', sourcemap: true }, - plugins: es2017Plugins, + plugins: es2020Plugins, external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) }, { @@ -58,7 +58,7 @@ const browserBuilds = [ sourcemap: true } ], - plugins: es2017Plugins, + plugins: es2020Plugins, external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) } ]; @@ -71,7 +71,7 @@ const nodeBuilds = [ format: 'cjs', sourcemap: true }, - plugins: es2017Plugins, + plugins: es2020Plugins, external: deps }, { @@ -81,7 +81,7 @@ const nodeBuilds = [ format: 'es', sourcemap: true }, - plugins: [...es2017Plugins, emitModulePackageFile()], + plugins: [...es2020Plugins, emitModulePackageFile()], external: deps } ]; @@ -94,7 +94,7 @@ const rnBuilds = [ format: 'es', sourcemap: true }, - plugins: es2017Plugins, + plugins: es2020Plugins, external: deps } ]; diff --git a/packages/firestore/lite/package.json b/packages/firestore/lite/package.json index ef362535fdb..b5f50e4afa9 100644 --- a/packages/firestore/lite/package.json +++ b/packages/firestore/lite/package.json @@ -3,9 +3,9 @@ "description": "A lite version of the Firestore SDK", "main": "../dist/lite/index.node.cjs.js", "main-esm": "../dist/lite/index.node.mjs", - "module": "../dist/lite/index.browser.esm2017.js", - "browser": "../dist/lite/index.browser.esm2017.js", - "react-native": "../dist/lite/index.rn.esm2017.js", + "module": "../dist/lite/index.browser.esm.js", + "browser": "../dist/lite/index.browser.esm.js", + "react-native": "../dist/lite/index.rn.esm.js", "typings": "../dist/lite/index.d.ts", "private": true, "engines": { diff --git a/packages/firestore/package.json b/packages/firestore/package.json index 1c6bc39c06f..519243487c2 100644 --- a/packages/firestore/package.json +++ b/packages/firestore/package.json @@ -70,9 +70,9 @@ "react-native": "./dist/index.rn.js", "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" }, "./lite": { "types": "./dist/lite/index.d.ts", @@ -80,20 +80,20 @@ "require": "./dist/lite/index.node.cjs.js", "import": "./dist/lite/index.node.mjs" }, - "react-native": "./dist/lite/index.rn.esm2017.js", + "react-native": "./dist/lite/index.rn.esm.js", "browser": { "require": "./dist/lite/index.cjs.js", - "import": "./dist/lite/index.browser.esm2017.js" + "import": "./dist/lite/index.browser.esm.js" }, - "default": "./dist/lite/index.browser.esm2017.js" + "default": "./dist/lite/index.browser.esm.js" }, "./package.json": "./package.json" }, "main": "dist/index.node.cjs.js", "main-esm": "dist/index.node.mjs", "react-native": "dist/index.rn.js", - "browser": "dist/index.esm2017.js", - "module": "dist/index.esm2017.js", + "browser": "dist/index.esm.js", + "module": "dist/index.esm.js", "license": "Apache-2.0", "files": [ "dist", diff --git a/packages/firestore/rollup.config.debug.js b/packages/firestore/rollup.config.debug.js index a8823820d1d..10b2870e18b 100644 --- a/packages/firestore/rollup.config.debug.js +++ b/packages/firestore/rollup.config.debug.js @@ -25,9 +25,9 @@ import pkg from './package.json'; // This rollup configuration creates a single non-minified build for browser // testing. You can test code changes by running `yarn build:debug`. This -// creates the file "dist/index.esm2017.js" that you can use in your sample +// creates the file "dist/index.esm.js" that you can use in your sample // app as a replacement for -// "node_modules/@firebase/firestore/dist/index.esm2017.js". +// "node_modules/@firebase/firestore/dist/index.esm.js". const browserPlugins = function () { return [ @@ -35,7 +35,7 @@ const browserPlugins = function () { typescript, tsconfigOverride: { compilerOptions: { - target: 'es2017' + target: 'es2020' } }, cacheDir: tmp.dirSync(), diff --git a/packages/firestore/rollup.config.js b/packages/firestore/rollup.config.js index f9a29bef742..5fa616bca80 100644 --- a/packages/firestore/rollup.config.js +++ b/packages/firestore/rollup.config.js @@ -97,7 +97,7 @@ const allBuilds = [ cacheDir: tmp.dirSync() }), sourcemaps(), - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: util.resolveNodeExterns, treeshake: { @@ -114,7 +114,7 @@ const allBuilds = [ }, plugins: [ sourcemaps(), - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: util.resolveNodeExterns, treeshake: { @@ -137,7 +137,7 @@ const allBuilds = [ moduleSideEffects: false } }, - // Convert es2017 build to cjs + // Convert es2020 build to cjs { input: pkg['browser'], output: [ @@ -149,14 +149,14 @@ const allBuilds = [ ], plugins: [ sourcemaps(), - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false } }, - // es2017 build with build target reporting + // es2020 build with build target reporting { input: pkg['browser'], output: [ @@ -168,7 +168,7 @@ const allBuilds = [ ], plugins: [ sourcemaps(), - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: util.resolveBrowserExterns, treeshake: { @@ -186,7 +186,7 @@ const allBuilds = [ plugins: [ alias(util.generateAliasConfig('rn')), ...browserPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: util.resolveBrowserExterns, treeshake: { diff --git a/packages/firestore/rollup.config.lite.js b/packages/firestore/rollup.config.lite.js index 9ff4d57a8d8..5ea2225f364 100644 --- a/packages/firestore/rollup.config.lite.js +++ b/packages/firestore/rollup.config.lite.js @@ -93,7 +93,7 @@ const allBuilds = [ }), json(), sourcemaps(), - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: util.resolveNodeExterns, treeshake: { @@ -110,7 +110,7 @@ const allBuilds = [ }, plugins: [ sourcemaps(), - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: util.resolveNodeExterns, treeshake: { @@ -140,7 +140,7 @@ const allBuilds = [ moduleSideEffects: false } }, - // Convert es2017 build to CJS + // Convert es2020 build to CJS { input: path.resolve('./lite', pkg.browser), output: [ @@ -152,14 +152,14 @@ const allBuilds = [ ], plugins: [ sourcemaps(), - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: util.resolveBrowserExterns, treeshake: { moduleSideEffects: false } }, - // Browser es2017 build + // Browser es2020 build { input: path.resolve('./lite', pkg.browser), output: [ @@ -171,7 +171,7 @@ const allBuilds = [ ], plugins: [ sourcemaps(), - replace(generateBuildTargetReplaceConfig('esm', 2017)) + replace(generateBuildTargetReplaceConfig('esm', 2020)) ], external: util.resolveBrowserExterns, treeshake: { @@ -190,7 +190,7 @@ const allBuilds = [ alias(util.generateAliasConfig('rn_lite')), ...browserPlugins, replace({ - ...generateBuildTargetReplaceConfig('esm', 2017), + ...generateBuildTargetReplaceConfig('esm', 2020), '__RUNTIME_ENV__': 'rn' }) ], diff --git a/packages/firestore/rollup.shared.js b/packages/firestore/rollup.shared.js index 728f03df2fe..99adca9096e 100644 --- a/packages/firestore/rollup.shared.js +++ b/packages/firestore/rollup.shared.js @@ -33,8 +33,8 @@ const pkg = require('./package.json'); // This file contains shared utilities for Firestore's rollup builds. // Firestore is released in a number of different build configurations: -// - Browser builds that support persistence in ES2017 CJS and ESM formats. -// - In-memory Browser builds that support persistence in ES2017 CJS and ESM +// - Browser builds that support persistence in ES2020 CJS and ESM formats. +// - In-memory Browser builds that support persistence in ES2020 CJS and ESM // formats. // - A NodeJS build that supports persistence (to be used with an IndexedDb // shim) @@ -46,7 +46,7 @@ const pkg = require('./package.json'); // We use two different rollup pipelines to take advantage of tree shaking, // as Rollup does not support tree shaking for TypeScript classes transpiled // down to ES5 (see https://bit.ly/340P23U). The build pipeline in this file -// produces tree-shaken ES2017 builds that are consumed by the ES5 builds in +// produces tree-shaken ES2020 builds that are consumed by the ES5 builds in // `rollup.config.es.js`. // // All browser builds rely on Terser's property name mangling to reduce code @@ -240,7 +240,7 @@ exports.applyPrebuilt = function (name = 'prebuilt.js') { }); }; -exports.es2017Plugins = function (platform, mangled = false) { +exports.es2020Plugins = function (platform, mangled = false) { if (mangled) { return [ alias(generateAliasConfig(platform)), @@ -265,7 +265,7 @@ exports.es2017Plugins = function (platform, mangled = false) { } }; -exports.es2017PluginsCompat = function ( +exports.es2020PluginsCompat = function ( platform, pathTransformer, mangled = false diff --git a/packages/firestore/scripts/build-bundle.js b/packages/firestore/scripts/build-bundle.js index f8ba283a5a8..89153e74540 100644 --- a/packages/firestore/scripts/build-bundle.js +++ b/packages/firestore/scripts/build-bundle.js @@ -14,4 +14,4 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */var __awaiter=this&&this.__awaiter||function(thisArg,_arguments,P,generator){function adopt(value){return value instanceof P?value:new P((function(resolve){resolve(value)}))}return new(P||(P=Promise))((function(resolve,reject){function fulfilled(value){try{step(generator.next(value))}catch(e){reject(e)}}function rejected(value){try{step(generator["throw"](value))}catch(e){reject(e)}}function step(result){result.done?resolve(result.value):adopt(result.value).then(fulfilled,rejected)}step((generator=generator.apply(thisArg,_arguments||[])).next())}))};var __generator=this&&this.__generator||function(thisArg,body){var _={label:0,sent:function(){if(t[0]&1)throw t[1];return t[1]},trys:[],ops:[]},f,y,t,g;return g={next:verb(0),throw:verb(1),return:verb(2)},typeof Symbol==="function"&&(g[Symbol.iterator]=function(){return this}),g;function verb(n){return function(v){return step([n,v])}}function step(op){if(f)throw new TypeError("Generator is already executing.");while(g&&(g=0,op[0]&&(_=0)),_)try{if(f=1,y&&(t=op[0]&2?y["return"]:op[0]?y["throw"]||((t=y["return"])&&t.call(y),0):y.next)&&!(t=t.call(y,op[1])).done)return t;if(y=0,t)op=[op[0]&2,t.value];switch(op[0]){case 0:case 1:t=op;break;case 4:_.label++;return{value:op[1],done:false};case 5:_.label++;y=op[1];op=[0];continue;case 7:op=_.ops.pop();_.trys.pop();continue;default:if(!(t=_.trys,t=t.length>0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1]0&&t[t.length-1])&&(op[0]===6||op[0]===2)){_=0;continue}if(op[0]===3&&(!t||op[1]>t[0]&&op[1] { typescriptPlugin({ tsconfigOverride: { compilerOptions: { - target: 'es2017' + target: 'es2020' } }, transformers: [util.removeAssertTransformer] diff --git a/packages/firestore/src/register.ts b/packages/firestore/src/register.ts index 82b450b3834..7ec6aae5c30 100644 --- a/packages/firestore/src/register.ts +++ b/packages/firestore/src/register.ts @@ -61,6 +61,6 @@ export function registerFirestore( ).setMultipleInstances(true) ); 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__'); } diff --git a/packages/functions-compat/package.json b/packages/functions-compat/package.json index 2c261c8f82b..6fa6b8e45b2 100644 --- a/packages/functions-compat/package.json +++ b/packages/functions-compat/package.json @@ -4,20 +4,20 @@ "description": "", "author": "Firebase (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", "node": { "require": "./dist/index.cjs.js", - "import": "./dist/esm/index.esm2017.js" + "import": "./dist/esm/index.esm.js" }, "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" }, diff --git a/packages/functions/package.json b/packages/functions/package.json index e7ff5930fa6..62a63f5ce38 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -4,20 +4,20 @@ "description": "", "author": "Firebase (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/functions-public.d.ts", "node": { - "import": "./dist/esm/index.esm2017.js", + "import": "./dist/esm/index.esm.js", "require": "./dist/index.cjs.js" }, "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" }, diff --git a/packages/functions/rollup.config.js b/packages/functions/rollup.config.js index 06899e7224c..797c263e3b8 100644 --- a/packages/functions/rollup.config.js +++ b/packages/functions/rollup.config.js @@ -49,7 +49,7 @@ const builds = [ external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ] }, @@ -63,7 +63,7 @@ const builds = [ external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ] } ]; diff --git a/packages/functions/src/config.ts b/packages/functions/src/config.ts index 8dfadb52b54..ab596a1cbc0 100644 --- a/packages/functions/src/config.ts +++ b/packages/functions/src/config.ts @@ -65,6 +65,6 @@ export function registerFunctions(variant?: string): void { ); 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__'); } diff --git a/packages/installations-compat/package.json b/packages/installations-compat/package.json index b84a1bd2199..6dab5586392 100644 --- a/packages/installations-compat/package.json +++ b/packages/installations-compat/package.json @@ -3,13 +3,13 @@ "version": "0.2.18", "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.cjs.js", - "module": "dist/esm/index.esm2017.js", - "browser": "dist/esm/index.esm2017.js", + "module": "dist/esm/index.esm.js", + "browser": "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" }, diff --git a/packages/installations/package.json b/packages/installations/package.json index 949d8441e02..318843e1e1a 100644 --- a/packages/installations/package.json +++ b/packages/installations/package.json @@ -3,13 +3,13 @@ "version": "0.6.18", "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.cjs.js", - "module": "dist/esm/index.esm2017.js", - "browser": "dist/esm/index.esm2017.js", + "module": "dist/esm/index.esm.js", + "browser": "dist/esm/index.esm.js", "exports": { ".": { "types": "./dist/installations-public.d.ts", "require": "./dist/index.cjs.js", - "default": "./dist/esm/index.esm2017.js" + "default": "./dist/esm/index.esm.js" }, "./package.json": "./package.json" }, diff --git a/packages/installations/rollup.config.js b/packages/installations/rollup.config.js index bf2b61f73f0..694a1383787 100644 --- a/packages/installations/rollup.config.js +++ b/packages/installations/rollup.config.js @@ -46,7 +46,7 @@ const esmBuild = { external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ] }; @@ -61,7 +61,7 @@ const cjsBuild = { external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ] }; diff --git a/packages/installations/src/index.ts b/packages/installations/src/index.ts index 5a70ef10846..d56056ac189 100644 --- a/packages/installations/src/index.ts +++ b/packages/installations/src/index.ts @@ -31,5 +31,5 @@ export * from './interfaces/public-types'; registerInstallations(); 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__'); diff --git a/packages/logger/package.json b/packages/logger/package.json index f8661d3fdf7..dd492c36915 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -4,12 +4,12 @@ "description": "A logger package for use in the Firebase JS SDK", "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.cjs.js", - "module": "dist/esm/index.esm2017.js", + "module": "dist/esm/index.esm.js", "exports": { ".": { "types": "./dist/index.d.ts", "require": "./dist/index.cjs.js", - "default": "./dist/esm/index.esm2017.js" + "default": "./dist/esm/index.esm.js" }, "./package.json": "./package.json" }, diff --git a/packages/messaging-compat/package.json b/packages/messaging-compat/package.json index 1265e7171b4..517bd5a2304 100644 --- a/packages/messaging-compat/package.json +++ b/packages/messaging-compat/package.json @@ -5,13 +5,13 @@ "description": "", "author": "Firebase (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" }, diff --git a/packages/messaging-compat/tsconfig.json b/packages/messaging-compat/tsconfig.json index 90f9c26f657..4ec5372577b 100644 --- a/packages/messaging-compat/tsconfig.json +++ b/packages/messaging-compat/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "outDir": "dist", "noUnusedLocals": true, - "lib": ["dom", "es2017"], + "lib": ["dom", "es2020"], "downlevelIteration": true }, "exclude": ["dist/**/*"] diff --git a/packages/messaging/package.json b/packages/messaging/package.json index 19c096e398b..7dd640fdb16 100644 --- a/packages/messaging/package.json +++ b/packages/messaging/package.json @@ -4,21 +4,21 @@ "description": "", "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.cjs.js", - "browser": "dist/esm/index.esm2017.js", - "module": "dist/esm/index.esm2017.js", - "sw": "dist/esm/index.sw.esm2017.js", + "browser": "dist/esm/index.esm.js", + "module": "dist/esm/index.esm.js", + "sw": "dist/esm/index.sw.esm.js", "sw-main": "dist/index.sw.cjs", "exports": { ".": { "types": "./dist/index-public.d.ts", "require": "./dist/index.cjs.js", - "module": "./dist/esm/index.esm2017.js", - "default": "./dist/esm/index.esm2017.js" + "module": "./dist/esm/index.esm.js", + "default": "./dist/esm/index.esm.js" }, "./sw": { "types": "./dist/sw/index-public.d.ts", "require": "./dist/index.sw.cjs", - "default": "./dist/esm/index.sw.esm2017.js" + "default": "./dist/esm/index.sw.esm.js" }, "./package.json": "./package.json" }, diff --git a/packages/messaging/rollup.config.js b/packages/messaging/rollup.config.js index 9342be135f2..0c51c683294 100644 --- a/packages/messaging/rollup.config.js +++ b/packages/messaging/rollup.config.js @@ -48,7 +48,7 @@ const esmBuilds = [ }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) @@ -76,7 +76,7 @@ const cjsBuilds = [ }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) }, @@ -91,7 +91,7 @@ const cjsBuilds = [ output: { file: pkg['sw-main'], format: 'cjs', sourcemap: true }, plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ], external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)) } diff --git a/packages/messaging/src/helpers/register.ts b/packages/messaging/src/helpers/register.ts index ef28cd2edad..60f1dd0fe8c 100644 --- a/packages/messaging/src/helpers/register.ts +++ b/packages/messaging/src/helpers/register.ts @@ -104,7 +104,7 @@ export function registerMessagingInWindow(): 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__'); } diff --git a/packages/messaging/sw/package.json b/packages/messaging/sw/package.json index 472e37684bc..9a076664821 100644 --- a/packages/messaging/sw/package.json +++ b/packages/messaging/sw/package.json @@ -3,6 +3,6 @@ "description": "", "author": "Firebase (https://firebase.google.com/)", "main": "../dist/index.sw.cjs", - "module": "../dist/esm/index.sw.esm2017.js", + "module": "../dist/esm/index.sw.esm.js", "typings": "../dist/src/index.sw.d.ts" } diff --git a/packages/messaging/tsconfig.json b/packages/messaging/tsconfig.json index 90f9c26f657..4ec5372577b 100644 --- a/packages/messaging/tsconfig.json +++ b/packages/messaging/tsconfig.json @@ -3,7 +3,7 @@ "compilerOptions": { "outDir": "dist", "noUnusedLocals": true, - "lib": ["dom", "es2017"], + "lib": ["dom", "es2020"], "downlevelIteration": true }, "exclude": ["dist/**/*"] diff --git a/packages/performance-compat/package.json b/packages/performance-compat/package.json index 32b4d19c8d7..9ce60ab51af 100644 --- a/packages/performance-compat/package.json +++ b/packages/performance-compat/package.json @@ -4,13 +4,13 @@ "description": "The compatibility package of Firebase Performance", "author": "Firebase (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" }, diff --git a/packages/performance-compat/rollup.config.js b/packages/performance-compat/rollup.config.js index e52495c401e..b96fe548483 100644 --- a/packages/performance-compat/rollup.config.js +++ b/packages/performance-compat/rollup.config.js @@ -30,7 +30,7 @@ const buildPlugins = [ typescript, tsconfigOverride: { compilerOptions: { - target: 'es2017' + target: 'es2020' } } }), diff --git a/packages/performance/package.json b/packages/performance/package.json index 4cd59811127..4bf4f3e4c5d 100644 --- a/packages/performance/package.json +++ b/packages/performance/package.json @@ -4,13 +4,13 @@ "description": "Firebase performance for web", "author": "Firebase (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" }, diff --git a/packages/performance/rollup.config.js b/packages/performance/rollup.config.js index 006dcf54337..ef30405c02c 100644 --- a/packages/performance/rollup.config.js +++ b/packages/performance/rollup.config.js @@ -44,7 +44,7 @@ const esmBuild = { external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ] }; @@ -59,7 +59,7 @@ const cjsBuild = { external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ] }; diff --git a/packages/performance/src/index.ts b/packages/performance/src/index.ts index 4ccb499b368..7ccc73ee6e9 100644 --- a/packages/performance/src/index.ts +++ b/packages/performance/src/index.ts @@ -137,7 +137,7 @@ function registerPerformance(): void { new Component('performance', factory, ComponentType.PUBLIC) ); 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__'); } diff --git a/packages/remote-config-compat/package.json b/packages/remote-config-compat/package.json index da128fa1aa0..bf827f52c7f 100644 --- a/packages/remote-config-compat/package.json +++ b/packages/remote-config-compat/package.json @@ -4,13 +4,13 @@ "description": "The compatibility package of Remote Config", "author": "Firebase (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" }, diff --git a/packages/remote-config-compat/rollup.config.js b/packages/remote-config-compat/rollup.config.js index e52495c401e..b96fe548483 100644 --- a/packages/remote-config-compat/rollup.config.js +++ b/packages/remote-config-compat/rollup.config.js @@ -30,7 +30,7 @@ const buildPlugins = [ typescript, tsconfigOverride: { compilerOptions: { - target: 'es2017' + target: 'es2020' } } }), diff --git a/packages/remote-config/package.json b/packages/remote-config/package.json index 97c1fb27aa6..ef94a90c53b 100644 --- a/packages/remote-config/package.json +++ b/packages/remote-config/package.json @@ -4,13 +4,13 @@ "description": "The Remote Config package of the Firebase JS SDK", "author": "Firebase (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/remote-config-public.d.ts", "require": "./dist/index.cjs.js", - "default": "./dist/esm/index.esm2017.js" + "default": "./dist/esm/index.esm.js" }, "./package.json": "./package.json" }, diff --git a/packages/remote-config/rollup.config.js b/packages/remote-config/rollup.config.js index d8eb3abd315..8c7b834bf96 100644 --- a/packages/remote-config/rollup.config.js +++ b/packages/remote-config/rollup.config.js @@ -52,7 +52,7 @@ const esmBuild = { external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('esm', 2017)), + replace(generateBuildTargetReplaceConfig('esm', 2020)), emitModulePackageFile() ] }; @@ -67,7 +67,7 @@ const cjsBuild = { external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)), plugins: [ ...buildPlugins, - replace(generateBuildTargetReplaceConfig('cjs', 2017)) + replace(generateBuildTargetReplaceConfig('cjs', 2020)) ] }; diff --git a/packages/remote-config/src/register.ts b/packages/remote-config/src/register.ts index dda6cc544de..160e20219ce 100644 --- a/packages/remote-config/src/register.ts +++ b/packages/remote-config/src/register.ts @@ -51,7 +51,7 @@ export function registerRemoteConfig(): void { ); registerVersion(packageName, 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(packageName, version, '__BUILD_TARGET__'); function remoteConfigFactory( diff --git a/packages/storage-compat/package.json b/packages/storage-compat/package.json index e760b1051e3..e50f685fde5 100644 --- a/packages/storage-compat/package.json +++ b/packages/storage-compat/package.json @@ -4,13 +4,13 @@ "description": "The Firebase Firestore compatibility package", "author": "Firebase (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" }, diff --git a/packages/storage-compat/rollup.config.js b/packages/storage-compat/rollup.config.js index 59f6282bf5e..5e0753ffdb8 100644 --- a/packages/storage-compat/rollup.config.js +++ b/packages/storage-compat/rollup.config.js @@ -31,7 +31,7 @@ const buildPlugins = [ abortOnError: false, tsconfigOverride: { compilerOptions: { - target: 'es2017' + target: 'es2020' } } }), diff --git a/packages/storage/package.json b/packages/storage/package.json index 5a9d90a32ac..c1d272207dd 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -4,8 +4,8 @@ "description": "", "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.node.cjs.js", - "module": "dist/index.esm2017.js", - "browser": "dist/index.esm2017.js", + "module": "dist/index.esm.js", + "browser": "dist/index.esm.js", "exports": { ".": { "types": "./dist/storage-public.d.ts", @@ -15,9 +15,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" }, diff --git a/packages/storage/rollup.config.js b/packages/storage/rollup.config.js index 4ce92722281..c16231aa476 100644 --- a/packages/storage/rollup.config.js +++ b/packages/storage/rollup.config.js @@ -65,7 +65,7 @@ const browserBuilds = [ alias(generateAliasConfig('browser')), ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('esm', 2017), + ...generateBuildTargetReplaceConfig('esm', 2020), '__RUNTIME_ENV__': '' }) ], @@ -85,7 +85,7 @@ const browserBuilds = [ alias(generateAliasConfig('browser')), ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('cjs', 2017), + ...generateBuildTargetReplaceConfig('cjs', 2020), '__RUNTIME_ENV__': '' }) ], @@ -104,7 +104,7 @@ const browserBuilds = [ alias(generateAliasConfig('browser')), ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('cjs', 2017), + ...generateBuildTargetReplaceConfig('cjs', 2020), '__RUNTIME_ENV__': '' }) ], @@ -127,7 +127,7 @@ const nodeBuilds = [ alias(generateAliasConfig('node')), ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('cjs', 2017), + ...generateBuildTargetReplaceConfig('cjs', 2020), '__RUNTIME_ENV__': 'node' }) ], @@ -148,7 +148,7 @@ const nodeBuilds = [ alias(generateAliasConfig('node')), ...buildPlugins, replace({ - ...generateBuildTargetReplaceConfig('esm', 2017), + ...generateBuildTargetReplaceConfig('esm', 2020), '__RUNTIME_ENV__': 'node' }), emitModulePackageFile() diff --git a/packages/storage/src/index.ts b/packages/storage/src/index.ts index 733a39c9ad8..c23acc0ec4c 100644 --- a/packages/storage/src/index.ts +++ b/packages/storage/src/index.ts @@ -70,7 +70,7 @@ function registerStorage(): void { ); //RUNTIME_ENV will be replaced during the compilation to "node" for nodejs and an empty string for browser registerVersion(name, version, '__RUNTIME_ENV__'); - // 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__'); } diff --git a/packages/template/package.json b/packages/template/package.json index 6f0578f5dfc..70aa992a67e 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -5,8 +5,8 @@ "description": "A template package for new firebase packages", "author": "Firebase (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/index.d.ts", @@ -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" }, diff --git a/packages/util/package.json b/packages/util/package.json index c54612bee84..0528ad84638 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -4,8 +4,8 @@ "description": "", "author": "Firebase (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/util-public.d.ts", @@ -15,9 +15,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" }, diff --git a/packages/webchannel-wrapper/rollup.config.js b/packages/webchannel-wrapper/rollup.config.js index ae80c831396..18d7604133a 100644 --- a/packages/webchannel-wrapper/rollup.config.js +++ b/packages/webchannel-wrapper/rollup.config.js @@ -39,7 +39,7 @@ const buildPlugins = [ typescript, tsconfigOverride: { compilerOptions: { - target: 'es2017' + target: 'es2020' } } }), @@ -49,7 +49,7 @@ const buildPlugins = [ /** * ESM builds */ -const esm2017Builds = [ +const esmBuilds = [ { input: join(closureBlobsDir, 'webchannel_blob_es2018.js'), output: { @@ -70,4 +70,4 @@ const esm2017Builds = [ } ]; -export default esm2017Builds; +export default esmBuilds; diff --git a/repo-scripts/changelog-generator/tsconfig.json b/repo-scripts/changelog-generator/tsconfig.json index 38bdb7035e4..4d15389487e 100644 --- a/repo-scripts/changelog-generator/tsconfig.json +++ b/repo-scripts/changelog-generator/tsconfig.json @@ -9,6 +9,6 @@ "moduleResolution": "node", "esModuleInterop": true, "resolveJsonModule": true, - "target": "es2017" + "target": "es2020" } } \ No newline at end of file diff --git a/repo-scripts/prune-dts/tsconfig.json b/repo-scripts/prune-dts/tsconfig.json index 14618a434b0..a4cb1ed68a0 100644 --- a/repo-scripts/prune-dts/tsconfig.json +++ b/repo-scripts/prune-dts/tsconfig.json @@ -5,7 +5,7 @@ "module": "commonjs", "moduleResolution": "node", "resolveJsonModule": true, - "target": "es2017", + "target": "es2020", "esModuleInterop": true, "declaration": true, "strict": true, diff --git a/repo-scripts/size-analysis/analysis-helper.ts b/repo-scripts/size-analysis/analysis-helper.ts index 9507bfe253c..a21215c777d 100644 --- a/repo-scripts/size-analysis/analysis-helper.ts +++ b/repo-scripts/size-analysis/analysis-helper.ts @@ -86,7 +86,7 @@ export async function extractDependenciesAndSize( input, plugins: [ resolve({ - mainFields: ['esm2017', 'module', 'main'] + mainFields: ['module', 'main'] }), commonjs() ] @@ -499,16 +499,13 @@ export async function generateReportForModule( * @param pkgJson package.json of the module. * * This function implements a fallback of locating module's bundle file. - * It first looks at esm2017 field of package.json, then module field. Main + * It first looks at the module field. Main * field at the last. * */ function retrieveBundleFileLocation(pkgJson: { [key: string]: string; }): string { - if (pkgJson['esm2017']) { - return pkgJson['esm2017']; - } if (pkgJson['module']) { return pkgJson['module']; } diff --git a/repo-scripts/size-analysis/bundle/rollup.ts b/repo-scripts/size-analysis/bundle/rollup.ts index 272cd934d08..250ecd8da06 100644 --- a/repo-scripts/size-analysis/bundle/rollup.ts +++ b/repo-scripts/size-analysis/bundle/rollup.ts @@ -32,7 +32,7 @@ export async function bundleWithRollup( moduleDirectory?: string ): Promise { const resolveOptions: RollupNodeResolveOptions = { - mainFields: ['esm2017', 'module', 'main'] + mainFields: ['module', 'main'] }; if (moduleDirectory) { diff --git a/repo-scripts/size-analysis/bundle/webpack.ts b/repo-scripts/size-analysis/bundle/webpack.ts index 611212b26b9..4f0598733ac 100644 --- a/repo-scripts/size-analysis/bundle/webpack.ts +++ b/repo-scripts/size-analysis/bundle/webpack.ts @@ -36,7 +36,7 @@ export async function bundleWithWebpack( const outputFileName = 'o.js'; const resolveConfig: webpack.ResolveOptions = { - mainFields: ['esm2017', 'module', 'main'] + mainFields: ['module', 'main'] }; if (moduleDirectory) { diff --git a/repo-scripts/size-analysis/package.json b/repo-scripts/size-analysis/package.json index 294b07f507b..ce4def7c26b 100644 --- a/repo-scripts/size-analysis/package.json +++ b/repo-scripts/size-analysis/package.json @@ -5,7 +5,7 @@ "description": "A template package for new firebase packages", "author": "Firebase (https://firebase.google.com/)", "main": "dist/index.cjs.js", - "esm2017": "dist/index.esm2017.js", + "module": "dist/index.esm.js", "files": [ "dist" ], @@ -19,29 +19,31 @@ "build": "rollup -c" }, "license": "Apache-2.0", - "devDependencies": { - "@firebase/app": "0.13.2", - "@firebase/logger": "0.4.4", + "dependencies": { "@firebase/util": "1.12.1", - "@rollup/plugin-commonjs": "21.1.0", - "@rollup/plugin-json": "6.1.0", - "@rollup/plugin-node-resolve": "16.0.0", - "@rollup/plugin-virtual": "2.1.0", - "@types/webpack": "5.28.5", "child-process-promise": "2.2.1", "glob": "7.2.3", + "tmp": "0.2.3", "gzip-size": "6.0.0", "memfs": "3.5.3", + "terser": "5.37.0", + "@rollup/plugin-commonjs": "21.1.0", + "@rollup/plugin-json": "6.1.0", + "@rollup/plugin-node-resolve": "16.0.0", + "@rollup/plugin-virtual": "2.1.0", "rollup": "2.79.2", "rollup-plugin-replace": "2.2.0", "rollup-plugin-typescript2": "0.36.0", - "terser": "5.37.0", - "tmp": "0.2.3", "typescript": "5.5.4", "webpack": "5.98.0", "webpack-virtual-modules": "0.6.2", "yargs": "17.7.2" }, + "devDependencies": { + "@firebase/app": "0.13.2", + "@firebase/logger": "0.4.4", + "@types/webpack": "5.28.5" + }, "repository": { "directory": "repo-scripts/size-analysis", "type": "git", @@ -59,4 +61,4 @@ "engines": { "node": ">=18.0.0" } -} +} \ No newline at end of file diff --git a/repo-scripts/size-analysis/rollup.config.js b/repo-scripts/size-analysis/rollup.config.js index 505596e3d2e..0be78dd920c 100644 --- a/repo-scripts/size-analysis/rollup.config.js +++ b/repo-scripts/size-analysis/rollup.config.js @@ -41,7 +41,7 @@ export default [ typescript, tsconfigOverride: { compilerOptions: { - target: 'es2017', + target: 'es2020', module: 'es2015' } } @@ -66,7 +66,7 @@ export default [ typescript, tsconfigOverride: { compilerOptions: { - target: 'es2017', + target: 'es2020', module: 'es2015' } } diff --git a/repo-scripts/size-analysis/tsconfig.json b/repo-scripts/size-analysis/tsconfig.json index 326e95a0fa6..acbfc91e7e5 100644 --- a/repo-scripts/size-analysis/tsconfig.json +++ b/repo-scripts/size-analysis/tsconfig.json @@ -5,7 +5,7 @@ "module": "commonjs", "moduleResolution": "node", "resolveJsonModule": true, - "target": "es2017", + "target": "es2020", "esModuleInterop": true, "declaration": true, "strict": true diff --git a/scripts/docgen/docgen.ts b/scripts/docgen/docgen.ts index 811570decd1..af105ef65f6 100644 --- a/scripts/docgen/docgen.ts +++ b/scripts/docgen/docgen.ts @@ -194,8 +194,8 @@ async function generateDocs( 'utf8' ); const authApiConfigModified = authApiConfigOriginal.replace( - `"mainEntryPointFilePath": "/dist/esm2017/index.d.ts"`, - `"mainEntryPointFilePath": "/dist/esm2017/index.doc.d.ts"` + `"mainEntryPointFilePath": "/dist/esm/index.d.ts"`, + `"mainEntryPointFilePath": "/dist/esm/index.doc.d.ts"` ); try { diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index 75f1741329a..5ff7e49ff96 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -8,7 +8,7 @@ "moduleResolution": "node", "esModuleInterop": true, "resolveJsonModule": true, - "target": "es2017", + "target": "es2020", "typeRoots": [ "../node_modules/@types" ], diff --git a/yarn.lock b/yarn.lock index 51ede769d03..fe69e44aead 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3767,16 +3767,6 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^5.0.0: - version "5.5.2" - resolved "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - integrity sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw== - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -4415,29 +4405,6 @@ b4a@^1.6.4: resolved "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz#a99587d4ebbfbd5a6e3b21bdb5d5fa385767abe4" integrity sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg== -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g== - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-generator@^6.18.0: - version "6.26.1" - resolved "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA== - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - babel-loader@8.4.1: version "8.4.1" resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz#6ccb75c66e62c3b144e1c5f2eaec5b8f6c08c675" @@ -4448,13 +4415,6 @@ babel-loader@8.4.1: make-dir "^3.1.0" schema-utils "^2.6.5" -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== - dependencies: - babel-runtime "^6.22.0" - babel-plugin-istanbul@^6.1.1: version "6.1.1" resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" @@ -4511,55 +4471,6 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" -babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.16.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg== - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.18.0, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA== - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.18.0, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== - bach@^1.0.0: version "1.2.0" resolved "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880" @@ -5479,11 +5390,6 @@ cmd-shim@^4.1.0: dependencies: mkdirp-infer-owner "^2.0.0" -co@^4.6.0: - version "4.6.0" - resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -5892,11 +5798,6 @@ core-js-compat@^3.40.0: dependencies: browserslist "^4.24.3" -core-js@^2.4.0: - version "2.6.12" - resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" - integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -6138,7 +6039,7 @@ debug-fabulous@^1.0.0: memoizee "0.4.X" object-assign "4.X" -debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -6405,13 +6306,6 @@ detect-file@^1.0.0: resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q== -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== - dependencies: - repeating "^2.0.0" - detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" @@ -7411,11 +7305,6 @@ fancy-log@^1.3.2, fancy-log@^1.3.3: parse-node-version "^1.0.0" time-stamp "^1.0.0" -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - integrity sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw== - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -8403,11 +8292,6 @@ globals@^13.19.0: dependencies: type-fest "^0.20.2" -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== - globalthis@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" @@ -9213,13 +9097,6 @@ interpret@^1.0.0, interpret@^1.4.0: resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== -invariant@^2.2.2: - version "2.2.4" - resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" @@ -9425,11 +9302,6 @@ is-finalizationregistry@^1.1.0: dependencies: call-bound "^1.0.3" -is-finite@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" - integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== - is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -9861,21 +9733,6 @@ isstream@~0.1.2: resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== -istanbul-instrumenter-loader@3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz#9957bd59252b373fae5c52b7b5188e6fde2a0949" - integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w== - dependencies: - convert-source-map "^1.5.0" - istanbul-lib-instrument "^1.7.3" - loader-utils "^1.1.0" - schema-utils "^0.3.0" - -istanbul-lib-coverage@^1.2.1: - version "1.2.1" - resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0" - integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ== - istanbul-lib-coverage@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" @@ -9893,19 +9750,6 @@ istanbul-lib-hook@^3.0.0: dependencies: append-transform "^2.0.0" -istanbul-lib-instrument@^1.7.3: - version "1.10.2" - resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca" - integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A== - dependencies: - babel-generator "^6.18.0" - babel-template "^6.16.0" - babel-traverse "^6.18.0" - babel-types "^6.18.0" - babylon "^6.18.0" - istanbul-lib-coverage "^1.2.1" - semver "^5.3.0" - istanbul-lib-instrument@^4.0.0: version "4.0.3" resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" @@ -10192,16 +10036,11 @@ jquery@^3.4.1: resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: +js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== - js-yaml@4.1.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" @@ -10235,11 +10074,6 @@ jsbn@~0.1.0: resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== - jsesc@^3.0.2: version "3.1.0" resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" @@ -10284,11 +10118,6 @@ json-ptr@^3.0.1: resolved "https://registry.npmjs.org/json-ptr/-/json-ptr-3.1.1.tgz#184c3d48db659fa9bbc1519f7db6f390ddffb659" integrity sha512-SiSJQ805W1sDUCD1+/t1/1BIrveq2Fe9HJqENxZmMCILmrPI7WhS/pePpIOx85v6/H2z1Vy7AI08GV2TzfXocg== -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - integrity sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA== - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -10325,7 +10154,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^1.0.1, json5@^1.0.2: +json5@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== @@ -10828,15 +10657,6 @@ loader-runner@^4.2.0: resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== -loader-utils@^1.1.0: - version "1.4.2" - resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" - integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - loader-utils@^2.0.0, loader-utils@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" @@ -11003,7 +10823,7 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash@4.17.21, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0, lodash@~4.17.15, lodash@~4.17.21: +lodash@4.17.21, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0, lodash@~4.17.15, lodash@~4.17.21: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -11077,13 +10897,6 @@ long@^5.0.0: resolved "https://registry.npmjs.org/long/-/long-5.2.4.tgz#ee651d5c7c25901cfca5e67220ae9911695e99b2" integrity sha512-qtzLbJE8hq7VabR3mISmVGtoXP8KGc2Z/AT8OuqlYD7JTR3oqrgwdjnk07wpj1twXxYmgDXgoKVWUG/fReSzHg== -loose-envify@^1.0.0: - version "1.4.0" - resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - loupe@^2.3.6: version "2.3.7" resolved "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697" @@ -13913,11 +13726,6 @@ regenerate@^1.4.2: resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - regenerator-runtime@^0.14.0: version "0.14.1" resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" @@ -14027,13 +13835,6 @@ repeat-string@^1.6.1: resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== - dependencies: - is-finite "^1.0.0" - replace-ext@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" @@ -14459,13 +14260,6 @@ sax@>=0.6.0: resolved "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== -schema-utils@^0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - integrity sha512-QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q== - dependencies: - ajv "^5.0.0" - schema-utils@^2.6.5: version "2.7.1" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" @@ -15039,7 +14833,7 @@ source-map-url@^0.4.0: resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== -source-map@^0.5.6, source-map@^0.5.7: +source-map@^0.5.6: version "0.5.7" resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== @@ -15918,11 +15712,6 @@ to-absolute-glob@^2.0.0, to-absolute-glob@^2.0.2: is-absolute "^1.0.0" is-negated-glob "^1.0.0" -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== - to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -16013,11 +15802,6 @@ trim-newlines@^3.0.0: resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== - triple-beam@^1.3.0: version "1.4.1" resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984"