revert changes from RUT to be implemented later

Author: DellaBitta

.changeset/real-dolls-type.md

@@ -1,5 +1,4 @@
 ---
-'@firebase/rules-unit-testing': minor
 '@firebase/auth-compat': minor
 '@firebase/firestore': minor
 '@firebase/functions': minor
@@ -8,4 +7,5 @@
 'firebase': minor
 ---
 
-Replaced node-fetch v2.6.7 dependency with the latest version of undici (v5.26.5) in Node.js SDK builds.
+Replaced node-fetch v2.6.7 dependency with the latest version of undici (v5.26.5) in Node.js SDK
+builds for auth, firestore, functions and storage.

.yarn/releases/yarn-1.22.11.cjs

@@ -54,7 +54,6 @@
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
   "dependencies": {
-    "undici": "5.26.5",
     "node-fetch": "2.6.7",
     "@types/node-fetch": "2.6.4"
   }

packages/rules-unit-testing/package.json

@@ -38,7 +38,7 @@ export async function discoverEmulators(
 
   const emulators: DiscoveredEmulators = {};
 
-  const data = (await res.json()) as any;
+  const data = await res.json();
 
   if (data.database) {
     emulators.database = {

packages/rules-unit-testing/src/impl/discovery.ts

@@ -17,7 +17,7 @@
 
 import { HostAndPort } from '../public_types';
 import { makeUrl } from './url';
-import { fetch as undiciFetch } from 'undici';
+import fetch from 'node-fetch';
 
 /**
  * @private
@@ -29,7 +29,7 @@ export async function loadDatabaseRules(
 ): Promise<void> {
   const url = makeUrl(hostAndPort, '/.settings/rules.json');
   url.searchParams.append('ns', databaseName);
-  const resp = await undiciFetch(url, {
+  const resp = await fetch(url, {
     method: 'PUT',
     headers: { Authorization: 'Bearer owner' },
     body: rules
@@ -48,7 +48,7 @@ export async function loadFirestoreRules(
   projectId: string,
   rules: string
 ): Promise<void> {
-  const resp = await undiciFetch(
+  const resp = await fetch(
     makeUrl(hostAndPort, `/emulator/v1/projects/${projectId}:securityRules`),
     {
       method: 'PUT',
@@ -72,7 +72,7 @@ export async function loadStorageRules(
   hostAndPort: HostAndPort,
   rules: string
 ): Promise<void> {
-  const resp = await undiciFetch(makeUrl(hostAndPort, '/internal/setRules'), {
+  const resp = await fetch(makeUrl(hostAndPort, '/internal/setRules'), {
     method: 'PUT',
     headers: {
       'Content-Type': 'application/json'

packages/rules-unit-testing/src/impl/rules.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { fetch as undiciFetch } from 'undici';
+import fetch from 'node-fetch';
 import firebase from 'firebase/compat/app';
 import 'firebase/compat/firestore';
 import 'firebase/compat/database';
@@ -106,7 +106,7 @@ export class RulesTestEnvironmentImpl implements RulesTestEnvironment {
     this.checkNotDestroyed();
     assertEmulatorRunning(this.emulators, 'firestore');
 
-    const resp = await undiciFetch(
+    const resp = await fetch(
       makeUrl(
         this.emulators.firestore,
         `/emulator/v1/projects/${this.projectId}/databases/(default)/documents`

packages/rules-unit-testing/src/impl/test_environment.ts

@@ -21,7 +21,7 @@ import {
 } from './impl/discovery';
 import { fixHostname, makeUrl } from './impl/url';
 import { HostAndPort } from './public_types';
-import { fetch as undiciFetch } from 'undici';
+import fetch from 'node-fetch';
 
 /**
  * Run a setup function with background Cloud Functions triggers disabled. This can be used to
@@ -79,13 +79,12 @@ export async function withFunctionTriggersDisabled<TResult>(
   hub.host = fixHostname(hub.host);
   makeUrl(hub, '/functions/disableBackgroundTriggers');
   // Disable background triggers
-  const disableRes = await undiciFetch(
+  const disableRes = await fetch(
     makeUrl(hub, '/functions/disableBackgroundTriggers'),
     {
       method: 'PUT'
     }
   );
-
   if (!disableRes.ok) {
     throw new Error(
       `HTTP Error ${disableRes.status} when disabling functions triggers, are you using firebase-tools 8.13.0 or higher?`
@@ -98,7 +97,7 @@ export async function withFunctionTriggersDisabled<TResult>(
     result = await maybeFn();
   } finally {
     // Re-enable background triggers
-    const enableRes = await undiciFetch(
+    const enableRes = await fetch(
       makeUrl(hub, '/functions/enableBackgroundTriggers'),
       {
         method: 'PUT'

packages/rules-unit-testing/src/util.ts

@@ -165,7 +165,7 @@ describe('assertFails()', () => {
 
 describe('withFunctionTriggersDisabled()', () => {
   it('disabling function triggers does not throw, returns value', async function () {
-    const fetchSpy = sinon.spy(require('undici'), 'fetch');
+    const fetchSpy = sinon.spy(require('node-fetch'), 'default');
 
     const res = await withFunctionTriggersDisabled(() => {
       return Promise.resolve(1234);
@@ -176,7 +176,7 @@ describe('withFunctionTriggersDisabled()', () => {
   });
 
   it('disabling function triggers always re-enables, event when the function throws', async function () {
-    const fetchSpy = sinon.spy(require('undici'), 'fetch');
+    const fetchSpy = sinon.spy(require('node-fetch'), 'default');
 
     const res = withFunctionTriggersDisabled(() => {
       throw new Error('I throw!');