From 89a29d4a633672166720278b9227073dfb12bc3e Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Tue, 18 Mar 2025 11:57:02 -0400 Subject: [PATCH 1/3] Remove `files` from all karma module exports. This object is not used by Karma, so I believe there is no need to export it. Karma instead uses the 'files' property that is assigned on the config object. Running tests locally, it seems that the same set of tests are ran after this change. One side-effect of this change could be that files importing the another `karma.conf.js` file may use these exported files, but I can not find cases of this. --- integration/compat-interop/karma.conf.js | 4 +--- integration/firestore/karma.conf.js | 2 -- packages/analytics-compat/karma.conf.js | 2 -- packages/analytics/karma.conf.js | 2 -- packages/analytics/karma.integration.conf.js | 2 -- packages/app-check-compat/karma.conf.js | 2 -- packages/app-check/karma.conf.js | 2 -- packages/app-compat/karma.conf.js | 2 -- packages/app/karma.conf.js | 2 -- packages/auth/karma.conf.js | 2 -- packages/component/karma.conf.js | 2 -- packages/data-connect/karma.conf.js | 2 -- packages/database-compat/karma.conf.js | 2 -- packages/database/karma.conf.js | 2 -- packages/firestore-compat/karma.conf.js | 2 -- packages/firestore/karma.conf.js | 2 -- packages/functions-compat/karma.conf.js | 2 -- packages/functions/karma.conf.js | 2 -- packages/installations-compat/karma.conf.js | 2 -- packages/installations/karma.conf.js | 2 -- packages/logger/karma.conf.js | 2 -- packages/messaging-compat/karma.conf.js | 2 -- packages/messaging/karma.conf.js | 2 -- packages/performance-compat/karma.conf.js | 2 -- packages/performance/karma.conf.js | 2 -- packages/remote-config-compat/karma.conf.js | 2 -- packages/remote-config/karma.conf.js | 2 -- packages/storage-compat/karma.conf.js | 2 -- packages/storage/karma.conf.js | 2 -- packages/template/karma.conf.js | 2 -- packages/util/karma.conf.js | 2 -- packages/vertexai/karma.conf.js | 4 +--- 32 files changed, 2 insertions(+), 66 deletions(-) diff --git a/integration/compat-interop/karma.conf.js b/integration/compat-interop/karma.conf.js index 6dde3b61344..90d6e6cca52 100644 --- a/integration/compat-interop/karma.conf.js +++ b/integration/compat-interop/karma.conf.js @@ -31,6 +31,4 @@ module.exports = function (config) { }); config.set(karmaConfig); -}; - -module.exports.files = files; +}; \ No newline at end of file diff --git a/integration/firestore/karma.conf.js b/integration/firestore/karma.conf.js index a659abea7cf..d03007172ad 100644 --- a/integration/firestore/karma.conf.js +++ b/integration/firestore/karma.conf.js @@ -32,5 +32,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/analytics-compat/karma.conf.js b/packages/analytics-compat/karma.conf.js index c6488ea06bd..12df3026247 100644 --- a/packages/analytics-compat/karma.conf.js +++ b/packages/analytics-compat/karma.conf.js @@ -28,5 +28,3 @@ module.exports = function (config) { frameworks: ['mocha'] }); }; - -module.exports.files = files; diff --git a/packages/analytics/karma.conf.js b/packages/analytics/karma.conf.js index c6488ea06bd..12df3026247 100644 --- a/packages/analytics/karma.conf.js +++ b/packages/analytics/karma.conf.js @@ -28,5 +28,3 @@ module.exports = function (config) { frameworks: ['mocha'] }); }; - -module.exports.files = files; diff --git a/packages/analytics/karma.integration.conf.js b/packages/analytics/karma.integration.conf.js index 94215252451..6af15319b8f 100644 --- a/packages/analytics/karma.integration.conf.js +++ b/packages/analytics/karma.integration.conf.js @@ -28,5 +28,3 @@ module.exports = function (config) { frameworks: ['mocha'] }); }; - -module.exports.files = files; diff --git a/packages/app-check-compat/karma.conf.js b/packages/app-check-compat/karma.conf.js index 324777bcd54..394a4aac417 100644 --- a/packages/app-check-compat/karma.conf.js +++ b/packages/app-check-compat/karma.conf.js @@ -28,5 +28,3 @@ module.exports = function (config) { frameworks: ['mocha'] }); }; - -module.exports.files = files; diff --git a/packages/app-check/karma.conf.js b/packages/app-check/karma.conf.js index 324777bcd54..394a4aac417 100644 --- a/packages/app-check/karma.conf.js +++ b/packages/app-check/karma.conf.js @@ -28,5 +28,3 @@ module.exports = function (config) { frameworks: ['mocha'] }); }; - -module.exports.files = files; diff --git a/packages/app-compat/karma.conf.js b/packages/app-compat/karma.conf.js index c0737457c55..e2453404927 100644 --- a/packages/app-compat/karma.conf.js +++ b/packages/app-compat/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/app/karma.conf.js b/packages/app/karma.conf.js index c0917db53d1..42364e2d3e9 100644 --- a/packages/app/karma.conf.js +++ b/packages/app/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/auth/karma.conf.js b/packages/auth/karma.conf.js index 749ad0672c4..07db1140783 100644 --- a/packages/auth/karma.conf.js +++ b/packages/auth/karma.conf.js @@ -93,5 +93,3 @@ function getClientConfig(argv) { authEmulatorHost: process.env.FIREBASE_AUTH_EMULATOR_HOST }; } - -module.exports.files = getTestFiles(argv); diff --git a/packages/component/karma.conf.js b/packages/component/karma.conf.js index e3c01e1c27e..c776a7faff6 100644 --- a/packages/component/karma.conf.js +++ b/packages/component/karma.conf.js @@ -32,5 +32,3 @@ module.exports = function (config) { frameworks: ['mocha'] }); }; - -module.exports.files = files; diff --git a/packages/data-connect/karma.conf.js b/packages/data-connect/karma.conf.js index acb47c2ab3b..8ac22e715cb 100644 --- a/packages/data-connect/karma.conf.js +++ b/packages/data-connect/karma.conf.js @@ -30,5 +30,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/database-compat/karma.conf.js b/packages/database-compat/karma.conf.js index d51e08d046e..ece17be72fc 100644 --- a/packages/database-compat/karma.conf.js +++ b/packages/database-compat/karma.conf.js @@ -30,5 +30,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/database/karma.conf.js b/packages/database/karma.conf.js index d51e08d046e..ece17be72fc 100644 --- a/packages/database/karma.conf.js +++ b/packages/database/karma.conf.js @@ -30,5 +30,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/firestore-compat/karma.conf.js b/packages/firestore-compat/karma.conf.js index 9ce6532f646..7253e4aea79 100644 --- a/packages/firestore-compat/karma.conf.js +++ b/packages/firestore-compat/karma.conf.js @@ -57,5 +57,3 @@ function getTestFiles(argv) { const integrationTests = 'test/bootstrap.ts'; return [integrationTests]; } - -module.exports.files = getTestFiles(argv); diff --git a/packages/firestore/karma.conf.js b/packages/firestore/karma.conf.js index 70c5ffef546..9c022b8f7ec 100644 --- a/packages/firestore/karma.conf.js +++ b/packages/firestore/karma.conf.js @@ -83,5 +83,3 @@ function getTestBrowsers(argv) { } return browsers; } - -module.exports.files = getTestFiles(argv); diff --git a/packages/functions-compat/karma.conf.js b/packages/functions-compat/karma.conf.js index c0737457c55..e2453404927 100644 --- a/packages/functions-compat/karma.conf.js +++ b/packages/functions-compat/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/functions/karma.conf.js b/packages/functions/karma.conf.js index db9bf05bfe0..16b435f36d1 100644 --- a/packages/functions/karma.conf.js +++ b/packages/functions/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/installations-compat/karma.conf.js b/packages/installations-compat/karma.conf.js index 1699a0681ec..24397d35ede 100644 --- a/packages/installations-compat/karma.conf.js +++ b/packages/installations-compat/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/installations/karma.conf.js b/packages/installations/karma.conf.js index 1699a0681ec..24397d35ede 100644 --- a/packages/installations/karma.conf.js +++ b/packages/installations/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/logger/karma.conf.js b/packages/logger/karma.conf.js index 3d42695ced9..92fb441881a 100644 --- a/packages/logger/karma.conf.js +++ b/packages/logger/karma.conf.js @@ -30,5 +30,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/messaging-compat/karma.conf.js b/packages/messaging-compat/karma.conf.js index 322599066d1..fa38ee24502 100644 --- a/packages/messaging-compat/karma.conf.js +++ b/packages/messaging-compat/karma.conf.js @@ -28,5 +28,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/messaging/karma.conf.js b/packages/messaging/karma.conf.js index c9bc6b770c9..f8a6f44a49d 100644 --- a/packages/messaging/karma.conf.js +++ b/packages/messaging/karma.conf.js @@ -28,5 +28,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/performance-compat/karma.conf.js b/packages/performance-compat/karma.conf.js index c0737457c55..e2453404927 100644 --- a/packages/performance-compat/karma.conf.js +++ b/packages/performance-compat/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/performance/karma.conf.js b/packages/performance/karma.conf.js index 7f333fdb2fd..4bb7c01e863 100644 --- a/packages/performance/karma.conf.js +++ b/packages/performance/karma.conf.js @@ -30,5 +30,3 @@ module.exports = function (config) { frameworks: ['mocha'] }); }; - -module.exports.files = files; diff --git a/packages/remote-config-compat/karma.conf.js b/packages/remote-config-compat/karma.conf.js index c0737457c55..e2453404927 100644 --- a/packages/remote-config-compat/karma.conf.js +++ b/packages/remote-config-compat/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/remote-config/karma.conf.js b/packages/remote-config/karma.conf.js index 5006cd5a4ea..1272312cd2d 100644 --- a/packages/remote-config/karma.conf.js +++ b/packages/remote-config/karma.conf.js @@ -32,5 +32,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/storage-compat/karma.conf.js b/packages/storage-compat/karma.conf.js index 3b5d7e3f39b..a6699f54003 100644 --- a/packages/storage-compat/karma.conf.js +++ b/packages/storage-compat/karma.conf.js @@ -42,5 +42,3 @@ function getTestFiles(argv) { return [...unitTestFiles, ...integrationTestFiles]; } } - -module.exports.files = getTestFiles(argv); diff --git a/packages/storage/karma.conf.js b/packages/storage/karma.conf.js index c6d44ef1693..87feba78506 100644 --- a/packages/storage/karma.conf.js +++ b/packages/storage/karma.conf.js @@ -42,5 +42,3 @@ function getTestFiles(argv) { return [...unitTestFiles, ...integrationTestFiles]; } } - -module.exports.files = getTestFiles(argv); diff --git a/packages/template/karma.conf.js b/packages/template/karma.conf.js index 1699a0681ec..24397d35ede 100644 --- a/packages/template/karma.conf.js +++ b/packages/template/karma.conf.js @@ -31,5 +31,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/util/karma.conf.js b/packages/util/karma.conf.js index 3d42695ced9..92fb441881a 100644 --- a/packages/util/karma.conf.js +++ b/packages/util/karma.conf.js @@ -30,5 +30,3 @@ module.exports = function (config) { config.set(karmaConfig); }; - -module.exports.files = files; diff --git a/packages/vertexai/karma.conf.js b/packages/vertexai/karma.conf.js index 3fe2a2f9633..a6cf09fc8be 100644 --- a/packages/vertexai/karma.conf.js +++ b/packages/vertexai/karma.conf.js @@ -30,6 +30,4 @@ module.exports = function (config) { }; config.set(karmaConfig); -}; - -module.exports.files = files; +}; \ No newline at end of file From d11b3131bdc4a48bfb611b831dd8f1df2608d01d Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Tue, 18 Mar 2025 12:07:18 -0400 Subject: [PATCH 2/3] Formatting --- integration/compat-interop/karma.conf.js | 2 +- packages/vertexai/karma.conf.js | 2 +- packages/vertexai/package.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/integration/compat-interop/karma.conf.js b/integration/compat-interop/karma.conf.js index 90d6e6cca52..866d5957d21 100644 --- a/integration/compat-interop/karma.conf.js +++ b/integration/compat-interop/karma.conf.js @@ -31,4 +31,4 @@ module.exports = function (config) { }); config.set(karmaConfig); -}; \ No newline at end of file +}; diff --git a/packages/vertexai/karma.conf.js b/packages/vertexai/karma.conf.js index a6cf09fc8be..01a6885f07b 100644 --- a/packages/vertexai/karma.conf.js +++ b/packages/vertexai/karma.conf.js @@ -30,4 +30,4 @@ module.exports = function (config) { }; config.set(karmaConfig); -}; \ No newline at end of file +}; diff --git a/packages/vertexai/package.json b/packages/vertexai/package.json index f26aa2ec2a7..31320a15084 100644 --- a/packages/vertexai/package.json +++ b/packages/vertexai/package.json @@ -39,6 +39,7 @@ "test:ci": "yarn testsetup && node ../../scripts/run_tests_in_ci.js -s test", "test:skip-clone": "karma start", "test:browser": "yarn testsetup && karma start", + "test:integration": "karma start --integration", "api-report": "api-extractor run --local --verbose", "typings:public": "node ../../scripts/build/use_typings.js ./dist/vertexai-public.d.ts", "trusted-type-check": "tsec -p tsconfig.json --noEmit" From 6490d535309548c6c3df41d8732605be61063733 Mon Sep 17 00:00:00 2001 From: Daniel La Rocque Date: Tue, 18 Mar 2025 13:41:27 -0400 Subject: [PATCH 3/3] Remove accidental change --- packages/vertexai/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vertexai/package.json b/packages/vertexai/package.json index 31320a15084..f26aa2ec2a7 100644 --- a/packages/vertexai/package.json +++ b/packages/vertexai/package.json @@ -39,7 +39,6 @@ "test:ci": "yarn testsetup && node ../../scripts/run_tests_in_ci.js -s test", "test:skip-clone": "karma start", "test:browser": "yarn testsetup && karma start", - "test:integration": "karma start --integration", "api-report": "api-extractor run --local --verbose", "typings:public": "node ../../scripts/build/use_typings.js ./dist/vertexai-public.d.ts", "trusted-type-check": "tsec -p tsconfig.json --noEmit"