ref(syncpromise): correct imports

Author: JonasBa

packages/browser/src/eventbuilder.ts

@@ -8,7 +8,7 @@ import {
   isErrorEvent,
   isEvent,
   isPlainObject,
-  resolvedSyncPromise,
+  makeSyncPromise,
 } from '@sentry/utils';
 
 import { eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
@@ -28,7 +28,7 @@ export function eventFromException(options: Options, exception: unknown, hint?:
   if (hint && hint.event_id) {
     event.event_id = hint.event_id;
   }
-  return resolvedSyncPromise(event);
+  return makeSyncPromise().resolve(event);
 }
 
 /**
@@ -49,7 +49,7 @@ export function eventFromMessage(
   if (hint && hint.event_id) {
     event.event_id = hint.event_id;
   }
-  return resolvedSyncPromise(event);
+  return makeSyncPromise().resolve(event);
 }
 
 /**

packages/browser/src/sdk.ts

@@ -63,6 +63,7 @@ export const defaultIntegrations = [
  * ```
  *
  * import * as Sentry from '@sentry/browser';
+import { makeSyncPromise } from '../../utils/src/syncpromise';
  * Sentry.captureMessage('Hello, world!');
  * Sentry.captureException(new Error('Good bye'));
  * Sentry.captureEvent({
@@ -162,10 +163,8 @@ export function flush(timeout?: number): PromiseLike<boolean> {
   if (client) {
     return client.flush(timeout);
   }
-  if (isDebugBuild()) {
-    logger.warn('Cannot flush events. No client defined.');
-  }
-  return resolvedSyncPromise(false);
+  logger.warn('Cannot flush events. No client defined.');
+  return makeSyncPromise().resolve(false);
 }
 
 /**
@@ -181,10 +180,8 @@ export function close(timeout?: number): PromiseLike<boolean> {
   if (client) {
     return client.close(timeout);
   }
-  if (isDebugBuild()) {
-    logger.warn('Cannot flush events and disable SDK. No client defined.');
-  }
-  return resolvedSyncPromise(false);
+  logger.warn('Cannot flush events and disable SDK. No client defined.');
+  return makeSyncPromise().resolve(false);
 }
 
 /**

packages/browser/test/unit/mocks/simpletransport.ts

@@ -1,12 +1,12 @@
-import { eventStatusFromHttpCode, resolvedSyncPromise } from '@sentry/utils';
+import { eventStatusFromHttpCode, makeSyncPromise } from '@sentry/utils';
 
 import { Event, Response } from '../../../src';
 import { BaseTransport } from '../../../src/transports';
 
 export class SimpleTransport extends BaseTransport {
   public sendEvent(_: Event): PromiseLike<Response> {
     return this._buffer.add(() =>
-      resolvedSyncPromise({
+      makeSyncPromise().resolve({
         status: eventStatusFromHttpCode(200),
       }),
     );

packages/core/src/baseclient.ts

@@ -363,7 +363,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
     }
 
     // We prepare the result here with a resolved Event.
-    let result = resolvedSyncPromise<Event | null>(prepared);
+    let result = makeSyncPromise().resolve<Event | null>(prepared);
 
     // This should be the last thing called, since we want that
     // {@link Hub.addEventProcessor} gets the finished prepared event.
@@ -538,7 +538,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
     }
 
     if (!this._isEnabled()) {
-      return rejectedSyncPromise(new SentryError('SDK not enabled, will not capture event.'));
+      return makeSyncPromise().reject(new SentryError('SDK not enabled, will not capture event.'));
     }
 
     const isTransaction = event.type === 'transaction';
@@ -547,7 +547,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
     // Sampling for transaction happens somewhere else
     if (!isTransaction && typeof sampleRate === 'number' && Math.random() > sampleRate) {
       recordLostEvent('sample_rate', 'event');
-      return rejectedSyncPromise(
+      return makeSyncPromise().reject(
         new SentryError(
           `Discarding event because it's not included in the random sample (sampling rate = ${sampleRate})`,
         ),

packages/core/src/transports/noop.ts

@@ -1,13 +1,13 @@
 import { Event, Response, Transport } from '@sentry/types';
-import { resolvedSyncPromise } from '@sentry/utils';
+import { makeSyncPromise } from '@sentry/utils';
 
 /** Noop transport */
 export class NoopTransport implements Transport {
   /**
    * @inheritDoc
    */
   public sendEvent(_: Event): PromiseLike<Response> {
-    return resolvedSyncPromise({
+    return makeSyncPromise().resolve({
       reason: `NoopTransport: Event has been skipped because no Dsn is configured.`,
       status: 'skipped',
     });
@@ -17,6 +17,6 @@ export class NoopTransport implements Transport {
    * @inheritDoc
    */
   public close(_?: number): PromiseLike<boolean> {
-    return resolvedSyncPromise(true);
+    return makeSyncPromise().resolve(true);
   }
 }

packages/core/test/mocks/backend.ts

@@ -1,6 +1,6 @@
 import { Session } from '@sentry/hub';
 import { Event, Options, SeverityLevel, Transport } from '@sentry/types';
-import { resolvedSyncPromise } from '@sentry/utils';
+import { makeSyncPromise } from '@sentry/utils';
 
 import { BaseBackend } from '../../src/basebackend';
 
@@ -24,7 +24,7 @@ export class TestBackend extends BaseBackend<TestOptions> {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   public eventFromException(exception: any): PromiseLike<Event> {
-    return resolvedSyncPromise({
+    return makeSyncPromise().resolve({
       exception: {
         values: [
           {
@@ -39,7 +39,7 @@ export class TestBackend extends BaseBackend<TestOptions> {
   }
 
   public eventFromMessage(message: string, level: SeverityLevel = 'info'): PromiseLike<Event> {
-    return resolvedSyncPromise({ message, level });
+    return makeSyncPromise().resolve({ message, level });
   }
 
   public sendEvent(event: Event): void {

packages/utils/src/syncpromise.ts

@@ -27,7 +27,7 @@ export interface SyncPromise<T> extends PromiseLike<T> {
   catch: <TResult = never>(
     onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null,
   ) => PromiseLike<T | TResult>;
-  resolve: (value: T | PromiseLike<T>) => PromiseLike<T>;
+  resolve: <T>(value: T | PromiseLike<T>) => PromiseLike<T>;
   reject: <T = never>(reason?: any) => PromiseLike<T>;
 }
 /**