Merge branch 'console' of github.com:firebase/firebase-js-sdk into feat/pipelines

Author: MarkDuckworth

repo-scripts/prune-dts/prune-dts.ts

@@ -268,61 +268,6 @@ function prunePrivateImports<
   }
 }
 
-/**
- * Iterates over the provided symbols and returns named declarations for these
- * symbols if they are missing from `currentClass`. This allows us to merge
- * class hierarchies for classes whose inherited types are not part of the
- * public API.
- *
- * This method relies on a private API in TypeScript's `codefix` package.
- */
-function convertPropertiesForEnclosingClass(
-  program: ts.Program,
-  host: ts.CompilerHost,
-  sourceFile: ts.SourceFile,
-  parentClassSymbols: ts.Symbol[],
-  currentClass: ts.ClassDeclaration
-): ts.ClassElement[] {
-  const newMembers: ts.ClassElement[] = [];
-  // The `codefix` package is not public but it does exactly what we want. It's
-  // the same package that is used by VSCode to fill in missing members, which
-  // is what we are using it for in this script. `codefix` handles missing
-  // properties, methods and correctly deduces generics.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (ts as any).codefix.createMissingMemberNodes(
-    currentClass,
-    parentClassSymbols,
-    sourceFile,
-    { program, host },
-    /* userPreferences= */ {},
-    /* importAdder= */ undefined,
-    (missingMember: ts.ClassElement) => {
-      const originalSymbol = parentClassSymbols.find(
-        symbol =>
-          symbol.escapedName ==
-          (missingMember.name as ts.Identifier).escapedText
-      );
-      if (originalSymbol) {
-        const jsDocComment = extractJSDocComment(originalSymbol, newMembers);
-        if (jsDocComment) {
-          ts.setSyntheticLeadingComments(missingMember, [
-            {
-              kind: ts.SyntaxKind.MultiLineCommentTrivia,
-              text: `*\n${jsDocComment}\n`,
-              hasTrailingNewLine: true,
-              pos: -1,
-              end: -1
-            }
-          ]);
-        }
-
-        newMembers.push(missingMember);
-      }
-    }
-  );
-  return newMembers;
-}
-
 /**
  * Iterates over the provided symbols and returns named declarations for these
  * symbols if they are missing from `currentInterface`. This allows us to merge

scripts/run_tests_in_ci.js

@@ -61,8 +61,7 @@ const argv = yargs.options({
   const dir = path.resolve(myPath);
   const { name } = require(`${dir}/package.json`);
 
-  let stdout = '';
-  let stderr = '';
+  let testProcessOutput = '';
   try {
     if (process.env?.BROWSERS) {
       for (const package in crossBrowserPackages) {
@@ -74,27 +73,26 @@ const argv = yargs.options({
     const testProcess = spawn('yarn', ['--cwd', dir, scriptName]);
 
     testProcess.childProcess.stdout.on('data', data => {
-      stdout += data.toString();
+      testProcessOutput += '[stdout]' + data.toString();
     });
     testProcess.childProcess.stderr.on('data', data => {
-      stderr += data.toString();
+      testProcessOutput += '[stderr]' + data.toString();
     });
 
     await testProcess;
     console.log('Success: ' + name);
-    writeLogs('Success', name, stdout + '\n' + stderr);
+    writeLogs('Success', name, testProcessOutput);
   } catch (e) {
     console.error('Failure: ' + name);
-    console.log(stdout);
-    console.error(stderr);
+    console.error(testProcessOutput);
 
     if (process.env.CHROME_VERSION_NOTES) {
       console.error();
       console.error(process.env.CHROME_VERSION_NOTES);
       console.error();
     }
 
-    writeLogs('Failure', name, stdout + '\n' + stderr);
+    writeLogs('Failure', name, testProcessOutput);
 
     process.exit(1);
   }