revert yarn.lock

Author: Feiyang1

scripts/ci-test/build.ts

@@ -21,11 +21,30 @@ import chalk from 'chalk';
 import { resolve } from 'path';
 const root = resolve(__dirname, '../..');
 
-export async function buildForTests(testTasks: TestTask[]) {
+export async function buildForTests(
+  testTasks: TestTask[],
+  buildAppExp = false
+) {
   try {
     if (testTasks.length === 0) {
       chalk`{green No test tasks. Skipping all tests }`;
-      process.exit(0);
+    }
+
+    // hack to build Firestore which depends on @firebase/app-exp (because of firestore exp),
+    // but doesn't list it as a dependency in its package.json
+    if (buildAppExp) {
+      await spawn(
+        'npx',
+        [
+          'lerna',
+          'run',
+          '--scope',
+          '@firebase/app-exp',
+          '--include-dependencies',
+          'build'
+        ],
+        { stdio: 'inherit', cwd: root }
+      );
     }
 
     const lernaCmd = ['lerna', 'run'];
@@ -46,9 +65,7 @@ export async function buildForTests(testTasks: TestTask[]) {
 
     lernaCmd.push('--include-dependencies', 'build');
     await spawn('npx', lernaCmd, { stdio: 'inherit', cwd: root });
-    process.exit(0);
   } catch (e) {
     console.error(chalk`{red ${e}}`);
-    process.exit(1);
   }
 }

scripts/ci-test/run_changed.ts

@@ -110,7 +110,9 @@ export async function getTestTasks(): Promise<TestTask[]> {
       console.log(
         chalk`{blue Running all tests because ${filename} was modified.}`
       );
-      return allPackageNames.map(pkgName => createTestTask(pkgName));
+      // run tests in all packages
+      testTasks = allPackageNames.map(pkgName => createTestTask(pkgName));
+      break;
     }
     // Files outside a package dir that should trigger its tests.
     const specialPathKeys = Object.keys(specialPaths) as Array<
@@ -169,7 +171,6 @@ export async function getTestTasks(): Promise<TestTask[]> {
     );
   }
 
-  // remove ignored packages
   testTasks = testTasks.filter(t => !ignoredPackages.includes(t.pkgName));
 
   return testTasks;

scripts/ci-test/run_changed_firestore.ts

@@ -26,7 +26,7 @@ const includeOnlyPackages = [
 async function run() {
   let testTasks = await getTestTasks();
   testTasks = testTasks.filter(t => includeOnlyPackages.includes(t.pkgName));
-  await buildForTests(testTasks);
+  await buildForTests(testTasks, true);
   runTests(testTasks);
 }
 

scripts/ci-test/run_changed_no_firestore.ts

@@ -44,7 +44,7 @@ async function run() {
 
   // remove the ignored packages from the tasks
   testTasks = testTasks.filter(t => !ignoredPackages.includes(t.pkgName));
-
+  console.log(testTasks);
   await buildForTests(testTasks);
 
   runTests(testTasks);

yarn.lock

@@ -7,7 +7,7 @@
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
   integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
-    "@babel/highlight" "^7.10.4" 
+    "@babel/highlight" "^7.10.4"
 
 "@babel/compat-data@^7.10.4":
   version "7.10.5"