update ci tests

Author: Feiyang1

.github/workflows/test-changed-fcm-integration.yml

@@ -28,6 +28,6 @@ jobs:
         cp config/ci.config.json config/project.json
         yarn
     - name: build
-      run: yarn build:changed fcm-integration --buildAppExp
+      run: yarn build:changed fcm-integration
     - name: Run tests if FCM or its dependencies has changed
       run: xvfb-run yarn test:changed fcm-integration

.github/workflows/test-changed-firestore-integration.yml

@@ -28,6 +28,6 @@ jobs:
         cp config/ci.config.json config/project.json
         yarn
     - name: build
-      run: yarn build:changed firestore-integration --buildAppExp --buildAppCompat
+      run: yarn build:changed firestore-integration
     - name: Run tests if firestore or its dependencies has changed
       run: yarn test:changed firestore-integration

.github/workflows/test-changed-firestore.yml

@@ -28,6 +28,6 @@ jobs:
         cp config/ci.config.json config/project.json
         yarn
     - name: build
-      run: yarn build:changed firestore --buildAppExp --buildAppCompat
+      run: yarn build:changed firestore
     - name: Run tests if firestore or its dependencies has changed
       run: yarn test:changed firestore

.github/workflows/test-changed-misc.yml

@@ -28,6 +28,6 @@ jobs:
         cp config/ci.config.json config/project.json
         yarn
     - name: build
-      run: yarn build:changed misc --buildAppExp
+      run: yarn build:changed misc
     - name: Run tests
       run: yarn test:changed misc

.github/workflows/test-changed.yml

@@ -28,6 +28,6 @@ jobs:
         cp config/ci.config.json config/project.json
         yarn
     - name: build
-      run: yarn build:changed core --buildAppExp
+      run: yarn build:changed core
     - name: Run tests on changed packages
       run: xvfb-run yarn test:changed core

.github/workflows/test-firebase-integration.yml

@@ -28,6 +28,6 @@ jobs:
         cp config/ci.config.json config/project.json
         yarn
     - name: build
-      run: yarn build:changed firebase-integration --buildAppExp
+      run: yarn build:changed firebase-integration
     - name: Run tests on changed packages
       run: yarn test:changed firebase-integration

scripts/ci-test/build_changed.ts

@@ -24,15 +24,6 @@ import { testConfig, TestConfig } from './testConfig';
 const root = resolve(__dirname, '../..');
 
 const argv = yargs.options({
-  // TODO: remove once modular SDKs become official
-  buildAppExp: {
-    type: 'boolean',
-    desc: 'whether or not build @firebase/app-exp first. It is a hack required to build Firestore'
-  },
-  buildAppCompat: {
-    type: 'boolean',
-    desc: 'whether or not build @firebase/app-compat first. It is a hack required to build Firestore'
-  },
   buildAll: {
     type: 'boolean',
     desc: 'if true, build all packages. Used in Test Auth workflow because Auth tests depends on the firebase package'
@@ -63,14 +54,12 @@ const config = testConfig[inputTestConfigName]!;
 buildForTests(config, argv);
 
 interface Options {
-  buildAppExp?: boolean;
-  buildAppCompat?: boolean;
   buildAll?: boolean;
 }
 
 async function buildForTests(
   config: TestConfig,
-  { buildAppExp = false, buildAppCompat = false, buildAll = false }: Options
+  { buildAll = false }: Options
 ) {
   try {
     const testTasks = filterTasks(await getTestTasks(), config);
@@ -87,58 +76,6 @@ async function buildForTests(
       return;
     }
 
-    // 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
-    // TODO: remove once modular SDKs become official
-    if (buildAppExp) {
-      await spawn(
-        'npx',
-        [
-          'lerna',
-          'run',
-          '--scope',
-          '@firebase/app-exp',
-          '--include-dependencies',
-          'build'
-        ],
-        { stdio: 'inherit', cwd: root }
-      );
-    }
-    // hack to build Firestore which depends on @firebase/app-compat (because of firestore exp),
-    // but doesn't list it as a dependency in its package.json
-    // TODO: remove once modular SDKs become official
-    if (buildAppCompat) {
-      await spawn(
-        'npx',
-        [
-          'lerna',
-          'run',
-          '--scope',
-          '@firebase/app-compat',
-          '--include-dependencies',
-          'build'
-        ],
-        { stdio: 'inherit', cwd: root }
-      );
-    }
-    // hack to build Storage which depends on @firebase/auth-exp (because of integration test),
-    // but doesn't list it as a dependency in its package.json
-    // TODO: remove once modular SDKs become official
-    if (testTasks.some(task => task.pkgName.includes('storage'))) {
-      await spawn(
-        'npx',
-        [
-          'lerna',
-          'run',
-          '--scope',
-          '@firebase/auth-exp',
-          '--include-dependencies',
-          'build'
-        ],
-        { stdio: 'inherit', cwd: root }
-      );
-    }
-
     const lernaCmd = ['lerna', 'run'];
     console.log(chalk`{blue Running build in:}`);
     for (const task of testTasks) {

scripts/ci-test/tasks.ts

@@ -122,7 +122,7 @@ export async function getTestTasks(): Promise<TestTask[]> {
       }
     }
     // Check for changed files inside package dirs.
-    const match = filename.match('^(packages(-exp)?/[a-zA-Z0-9-]+)/.*');
+    const match = filename.match('^(packages/[a-zA-Z0-9-]+)/.*');
     if (match && match[1]) {
       const pkgJsonPath = resolve(root, match[1], 'package.json');
 

scripts/ci-test/testConfig.ts

@@ -41,7 +41,6 @@ export const testConfig: {
       '@firebase/rules-unit-testing',
       '@firebase/auth',
       'firebase',
-      'firebase-exp'
     ]
   },
   'firestore': {