Changed the typings in firestore's package.json so that it does not point to an internal build. This fixes issues with type mismatch between Pipelines and classic Firestore in the integration tests CI step.

Author: MarkDuckworth

packages/firestore/package.json

@@ -11,7 +11,7 @@
     "compile": "tsc --emitDeclarationOnly --declaration -p tsconfig.json",
     "prebuild": "tsc --emitDeclarationOnly --declaration -p tsconfig.json; yarn api-report",
     "build": "run-p --npm-path npm build:lite build:main",
-    "build:release": "yarn build && yarn typings:public",
+    "build:release": "yarn build",
     "build:scripts": "tsc -moduleResolution node --module commonjs scripts/*.ts && ls scripts/*.js | xargs -I % sh -c 'terser %  -o %'",
     "build:deps": "lerna run --scope @firebase/firestore --include-dependencies build",
     "build:main": "rollup -c rollup.config.js",
@@ -57,7 +57,6 @@
     "api-report:api-json": "rm -rf temp && api-extractor run --local --verbose",
     "api-report": "run-s --npm-path npm api-report:main api-report:pipelines api-report:lite api-report:lite:pipelines && yarn api-report:api-json",
     "doc": "api-documenter markdown --input temp --output docs",
-    "typings:public": "node ../../scripts/build/use_typings.js ./dist/index.d.ts",
     "assertion-id:check": "ts-node scripts/assertion-id-tool.ts --dir=src --check",
     "assertion-id:new": "ts-node scripts/assertion-id-tool.ts --dir=src --new",
     "assertion-id:list": "ts-node scripts/assertion-id-tool.ts --dir=src --list",
@@ -173,7 +172,7 @@
   "bugs": {
     "url": "https://github.com/firebase/firebase-js-sdk/issues"
   },
-  "typings": "dist/firestore/src/index.d.ts",
+  "typings": "dist/index.d.ts",
   "nyc": {
     "extension": [
       ".ts"

packages/firestore/test/integration/api/aggregation.test.ts

@@ -161,6 +161,7 @@ apiDescribe('Count queries', persistence => {
         );
         // TODO(b/316359394) Remove the special logic for non-default databases
         // once cl/582465034 is rolled out to production.
+        // @ts-ignore internal API usage
         if (coll.firestore._databaseId.isDefaultDatabase) {
           await expect(
             getCountFromServer(query_)
@@ -373,6 +374,7 @@ apiDescribe('Aggregation queries', persistence => {
         );
         // TODO(b/316359394) Remove the special logic for non-default databases
         // once cl/582465034 is rolled out to production.
+        // @ts-ignore internal API usage
         if (coll.firestore._databaseId.isDefaultDatabase) {
           await expect(
             getAggregateFromServer(query_, {

packages/firestore/test/integration/api/bundle.test.ts

@@ -86,6 +86,7 @@ apiDescribe('Bundles', persistence => {
 
     // Extract elements from BUNDLE_TEMPLATE and replace the project ID.
     const elements = BUNDLE_TEMPLATE.map(e =>
+      // @ts-ignore internal API usage
       e.replace('{0}', projectId).replace('(default)', db._databaseId.database)
     );
 

packages/firestore/test/integration/api/database.test.ts

@@ -1901,6 +1901,7 @@ apiDescribe('Database', persistence => {
         const firestore2 = newTestFirestore(
           newTestApp(options.projectId!, name),
           DEFAULT_SETTINGS,
+          // @ts-ignore internal API usage
           firestore._databaseId.database
         );
         await enableIndexedDbPersistence(firestore2);
@@ -1946,6 +1947,7 @@ apiDescribe('Database', persistence => {
         const firestore2 = newTestFirestore(
           newTestApp(options.projectId!, name),
           undefined,
+          // @ts-ignore internal API usage
           docRef.firestore._databaseId.database
         );
         await enableIndexedDbPersistence(firestore2);
@@ -2110,6 +2112,7 @@ apiDescribe('Database', persistence => {
       const deferred: Deferred<FirestoreError> = new Deferred();
       const unsubscribe = onSnapshot(docRef, snapshot => {}, deferred.resolve);
 
+      // @ts-ignore internal API usage
       await firestore._restart();
 
       await expect(deferred.promise)

packages/firestore/test/integration/api/provider.test.ts

@@ -30,6 +30,7 @@ import {
   setDoc,
   memoryLocalCache,
   getDocFromCache,
+  // @ts-ignore internal API usage
   ensureFirestoreConfigured
 } from '../util/firebase_export';
 import { DEFAULT_SETTINGS } from '../util/settings';
@@ -68,10 +69,15 @@ describe('Firestore Provider', () => {
     const fs4 = getFirestore(app, 'name1');
     const fs5 = getFirestore(app, 'name2');
 
+    // @ts-ignore internal API usage
     expect(fs1._databaseId.database).to.be.equal('init1');
+    // @ts-ignore internal API usage
     expect(fs2._databaseId.database).to.be.equal('init2');
+    // @ts-ignore internal API usage
     expect(fs3._databaseId.database).to.be.equal('(default)');
+    // @ts-ignore internal API usage
     expect(fs4._databaseId.database).to.be.equal('name1');
+    // @ts-ignore internal API usage
     expect(fs5._databaseId.database).to.be.equal('name2');
 
     expect(fs1).to.not.be.equal(fs2);
@@ -210,6 +216,7 @@ describe('Firestore Provider', () => {
     const fs = getFirestore(app);
     ensureFirestoreConfigured(fs);
 
+    // @ts-ignore internal API usage
     expect(fs._firestoreClient?._databaseInfo.apiKey).to.equal(
       'fake-api-key-x'
     );

packages/firestore/test/integration/api/query.test.ts

@@ -731,6 +731,7 @@ apiDescribe('Queries', persistence => {
           err => {
             expect(err.code).to.equal('failed-precondition');
             expect(err.message).to.exist;
+            // @ts-ignore internal API usage
             if (coll.firestore._databaseId.isDefaultDatabase) {
               expect(err.message).to.match(
                 /index.*https:\/\/console\.firebase\.google\.com/

…ore/test/integration/api/console.test.ts …integration/api_internal/console.test.tspackages/firestore/test/integration/api/console.test.ts renamed to packages/firestore/test/integration/api_internal/console.test.ts packages/firestore/test/integration/api/console.test.ts renamed to packages/firestore/test/integration/api_internal/console.test.ts

@@ -54,6 +54,7 @@ apiDescribe('console support', persistence => {
           count: count(),
           avg: average('foo')
         });
+        // @ts-ignore internal API usage
         expect(doc._fieldsProto()).to.deep.equal({
           'count': {
             'integerValue': '2'

packages/firestore/test/integration/util/composite_index_test_helper.ts

@@ -40,7 +40,9 @@ import {
   deleteDoc as deleteDocument,
   doc,
   and,
+  // @ts-ignore internal API usage
   _AutoId,
+  // @ts-ignore internal API usage
   _FieldPath,
   newTestFirestore,
   newTestApp,

packages/firestore/test/integration/util/helpers.ts

@@ -46,6 +46,7 @@ import {
   Query,
   getDocsFromServer,
   getDocsFromCache,
+  // @ts-ignore internal API usage
   _AutoId
 } from './firebase_export';
 import {

packages/firestore/test/integration/util/testing_hooks_util.ts

@@ -17,7 +17,9 @@
 
 import {
   DocumentReference,
+  // @ts-ignore internal API usage
   _TestingHooks as TestingHooks,
+  // @ts-ignore internal API usage
   _TestingHooksExistenceFilterMismatchInfo as ExistenceFilterMismatchInfoInternal
 } from './firebase_export';