diff --git a/packages/async-rewriter2/.depcheckrc b/packages/async-rewriter2/.depcheckrc index db115bf59b..8721cf6363 100644 --- a/packages/async-rewriter2/.depcheckrc +++ b/packages/async-rewriter2/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - sinon-chai - ts-sinon - eslint-plugin-mocha diff --git a/packages/async-rewriter2/src/async-writer-babel.spec.ts b/packages/async-rewriter2/src/async-writer-babel.spec.ts index 342152a379..8deefb19e1 100644 --- a/packages/async-rewriter2/src/async-writer-babel.spec.ts +++ b/packages/async-rewriter2/src/async-writer-babel.spec.ts @@ -3,7 +3,7 @@ import childProcess from 'child_process'; import path from 'path'; import { promisify } from 'util'; import vm from 'vm'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import chai, { expect } from 'chai'; import sinonChai from 'sinon-chai'; chai.use(sinonChai); diff --git a/packages/browser-runtime-core/.depcheckrc b/packages/browser-runtime-core/.depcheckrc index f0846126a0..64321acf68 100644 --- a/packages/browser-runtime-core/.depcheckrc +++ b/packages/browser-runtime-core/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - sinon-chai - ts-sinon - eslint-plugin-mocha diff --git a/packages/build/.depcheckrc b/packages/build/.depcheckrc index a4ba437161..baf681c00b 100644 --- a/packages/build/.depcheckrc +++ b/packages/build/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - ts-sinon - sinon - eslint-plugin-mocha diff --git a/packages/build/src/download-center/artifacts.spec.ts b/packages/build/src/download-center/artifacts.spec.ts index 28006b5db2..30eb40ff85 100644 --- a/packages/build/src/download-center/artifacts.spec.ts +++ b/packages/build/src/download-center/artifacts.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import { uploadArtifactToDownloadCenter } from './artifacts'; describe('DownloadCenter artifacts', function () { diff --git a/packages/build/src/download-center/config.spec.ts b/packages/build/src/download-center/config.spec.ts index 68b306bce0..0daa70b0c8 100644 --- a/packages/build/src/download-center/config.spec.ts +++ b/packages/build/src/download-center/config.spec.ts @@ -1,7 +1,7 @@ import type { DownloadCenterConfig } from '@mongodb-js/dl-center/dist/download-center-config'; import type { PackageInformationProvider } from '../packaging'; import { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import type { PackageVariant } from '../config'; import { createVersionConfig, diff --git a/packages/build/src/helpers/with-retries.spec.ts b/packages/build/src/helpers/with-retries.spec.ts index 3fc5d36bf0..967dda87fe 100644 --- a/packages/build/src/helpers/with-retries.spec.ts +++ b/packages/build/src/helpers/with-retries.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import { withRetries } from './'; describe('withRetries', function () { diff --git a/packages/build/src/homebrew/generate-formula.spec.ts b/packages/build/src/homebrew/generate-formula.spec.ts index e9de3e7ca0..fe61f38c73 100644 --- a/packages/build/src/homebrew/generate-formula.spec.ts +++ b/packages/build/src/homebrew/generate-formula.spec.ts @@ -1,5 +1,5 @@ import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import type { GithubRepo } from '@mongodb-js/devtools-github-repo'; import { generateUpdatedFormula } from './generate-formula'; diff --git a/packages/build/src/homebrew/publish-to-homebrew.spec.ts b/packages/build/src/homebrew/publish-to-homebrew.spec.ts index 3a59ac5c4d..203d28175b 100644 --- a/packages/build/src/homebrew/publish-to-homebrew.spec.ts +++ b/packages/build/src/homebrew/publish-to-homebrew.spec.ts @@ -1,5 +1,5 @@ import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import type { GithubRepo } from '@mongodb-js/devtools-github-repo'; import { publishToHomebrew } from './publish-to-homebrew'; diff --git a/packages/build/src/homebrew/update-homebrew-fork.spec.ts b/packages/build/src/homebrew/update-homebrew-fork.spec.ts index 9888f74d3c..a7c7fb46f8 100644 --- a/packages/build/src/homebrew/update-homebrew-fork.spec.ts +++ b/packages/build/src/homebrew/update-homebrew-fork.spec.ts @@ -1,5 +1,5 @@ import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import { GithubRepo } from '@mongodb-js/devtools-github-repo'; import { updateHomebrewFork } from './update-homebrew-fork'; diff --git a/packages/build/src/packaging/package/zip.spec.ts b/packages/build/src/packaging/package/zip.spec.ts index 651066000a..e4b43602c0 100644 --- a/packages/build/src/packaging/package/zip.spec.ts +++ b/packages/build/src/packaging/package/zip.spec.ts @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { spawnSync } from 'child_process'; import { promises as fs } from 'fs'; import * as path from 'path'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import { withTempPackageEach } from '../../../test/helpers'; import { createPackage } from './create-package'; import { createZipPackage } from './zip'; diff --git a/packages/build/src/run-draft.spec.ts b/packages/build/src/run-draft.spec.ts index 395862ef22..485d79c9e3 100644 --- a/packages/build/src/run-draft.spec.ts +++ b/packages/build/src/run-draft.spec.ts @@ -1,5 +1,5 @@ import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import type { Config } from './config'; import { ALL_PACKAGE_VARIANTS } from './config'; import type { uploadArtifactToDownloadCenter as uploadArtifactToDownloadCenterFn } from './download-center'; diff --git a/packages/build/src/run-publish.spec.ts b/packages/build/src/run-publish.spec.ts index 4fcafc9863..efe2ce7908 100644 --- a/packages/build/src/run-publish.spec.ts +++ b/packages/build/src/run-publish.spec.ts @@ -1,5 +1,5 @@ import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import type { writeBuildInfo as writeBuildInfoType } from './build-info'; import { Barque } from './barque'; import type { diff --git a/packages/build/src/run-upload.spec.ts b/packages/build/src/run-upload.spec.ts index 0b6dc4054b..9427037b2b 100644 --- a/packages/build/src/run-upload.spec.ts +++ b/packages/build/src/run-upload.spec.ts @@ -1,5 +1,5 @@ import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import type { Config } from './config'; import type { uploadArtifactToEvergreen } from './evergreen'; import type { PackageFile } from './packaging'; diff --git a/packages/cli-repl/.depcheckrc b/packages/cli-repl/.depcheckrc index 257c6bfd7e..685b47cc95 100644 --- a/packages/cli-repl/.depcheckrc +++ b/packages/cli-repl/.depcheckrc @@ -5,8 +5,8 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai - - sinon-chai - sinon + - sinon-chai - ts-sinon - mocha - eslint-plugin-mocha diff --git a/packages/cli-repl/src/async-repl.spec.ts b/packages/cli-repl/src/async-repl.spec.ts index 2bbbe92c3d..106ff9b074 100644 --- a/packages/cli-repl/src/async-repl.spec.ts +++ b/packages/cli-repl/src/async-repl.spec.ts @@ -7,7 +7,7 @@ import { PassThrough } from 'stream'; import { promisify, inspect } from 'util'; import { once } from 'events'; import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import sinonChai from 'sinon-chai'; import { tick } from '../test/repl-helpers'; chai.use(sinonChai); diff --git a/packages/cli-repl/src/config-directory.spec.ts b/packages/cli-repl/src/config-directory.spec.ts index 16c704cdd9..9226d63809 100644 --- a/packages/cli-repl/src/config-directory.spec.ts +++ b/packages/cli-repl/src/config-directory.spec.ts @@ -4,7 +4,7 @@ import path from 'path'; import { promises as fs } from 'fs'; import { promisify } from 'util'; import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import sinonChai from 'sinon-chai'; import { bson } from '@mongosh/service-provider-core'; const { EJSON } = bson; diff --git a/packages/cli-repl/test/repl-helpers.ts b/packages/cli-repl/test/repl-helpers.ts index 189d1b9443..272939ce75 100644 --- a/packages/cli-repl/test/repl-helpers.ts +++ b/packages/cli-repl/test/repl-helpers.ts @@ -4,7 +4,7 @@ import path from 'path'; import { once } from 'events'; import rimraf from 'rimraf'; import chai, { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import sinonChai from 'sinon-chai'; import chaiAsPromised from 'chai-as-promised'; import type { MongoshBus, MongoshBusEventsMap } from '@mongosh/types'; diff --git a/packages/editor/.depcheckrc b/packages/editor/.depcheckrc index e625b8b1d6..8721cf6363 100644 --- a/packages/editor/.depcheckrc +++ b/packages/editor/.depcheckrc @@ -5,8 +5,8 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai - - sinon-chai - sinon + - sinon-chai - ts-sinon - eslint-plugin-mocha - eslint-config-mongodb-js diff --git a/packages/editor/src/editor.spec.ts b/packages/editor/src/editor.spec.ts index b608542295..757156c9fe 100644 --- a/packages/editor/src/editor.spec.ts +++ b/packages/editor/src/editor.spec.ts @@ -7,7 +7,7 @@ import path from 'path'; import { promises as fs } from 'fs'; import { promisify } from 'util'; import rimraf from 'rimraf'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import sinonChai from 'sinon-chai'; import type { EditorOptions } from './editor'; diff --git a/packages/errors/.depcheckrc b/packages/errors/.depcheckrc index e625b8b1d6..8721cf6363 100644 --- a/packages/errors/.depcheckrc +++ b/packages/errors/.depcheckrc @@ -5,8 +5,8 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai - - sinon-chai - sinon + - sinon-chai - ts-sinon - eslint-plugin-mocha - eslint-config-mongodb-js diff --git a/packages/service-provider-server/.depcheckrc b/packages/service-provider-server/.depcheckrc index 31305ddff9..2f9ddd1ba4 100644 --- a/packages/service-provider-server/.depcheckrc +++ b/packages/service-provider-server/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - sinon-chai - ts-sinon - eslint-plugin-mocha diff --git a/packages/shell-api/.depcheckrc b/packages/shell-api/.depcheckrc index db115bf59b..8721cf6363 100644 --- a/packages/shell-api/.depcheckrc +++ b/packages/shell-api/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - sinon-chai - ts-sinon - eslint-plugin-mocha diff --git a/packages/shell-api/src/aggregation-cursor.spec.ts b/packages/shell-api/src/aggregation-cursor.spec.ts index e23b332ce0..e56ca60f74 100644 --- a/packages/shell-api/src/aggregation-cursor.spec.ts +++ b/packages/shell-api/src/aggregation-cursor.spec.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import sinon from 'sinon'; +import { stubInterface } from 'ts-sinon'; import { signatures, toShellResult } from './index'; import AggregationCursor from './aggregation-cursor'; import { diff --git a/packages/shell-api/src/change-stream-cursor.spec.ts b/packages/shell-api/src/change-stream-cursor.spec.ts index 863d88ec57..4a3bf52855 100644 --- a/packages/shell-api/src/change-stream-cursor.spec.ts +++ b/packages/shell-api/src/change-stream-cursor.spec.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import sinon from 'sinon'; +import { stubInterface } from 'ts-sinon'; import { signatures, toShellResult } from './index'; import ChangeStreamCursor from './change-stream-cursor'; import { diff --git a/packages/shell-api/src/collection.spec.ts b/packages/shell-api/src/collection.spec.ts index a04369651a..f53f142805 100644 --- a/packages/shell-api/src/collection.spec.ts +++ b/packages/shell-api/src/collection.spec.ts @@ -1,6 +1,7 @@ import { expect, use } from 'chai'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import sinon from 'sinon'; +import { stubInterface } from 'ts-sinon'; import type { EventEmitter } from 'events'; import { signatures, toShellResult } from './index'; import { diff --git a/packages/shell-api/src/cursor.spec.ts b/packages/shell-api/src/cursor.spec.ts index ffff392f5b..9e7363c5c5 100644 --- a/packages/shell-api/src/cursor.spec.ts +++ b/packages/shell-api/src/cursor.spec.ts @@ -10,8 +10,9 @@ import { } from './enums'; import chai from 'chai'; import sinonChai from 'sinon-chai'; +import sinon from 'sinon'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import { stubInterface } from 'ts-sinon'; import { CommonErrors, MongoshDeprecatedError, diff --git a/packages/shell-api/src/database.spec.ts b/packages/shell-api/src/database.spec.ts index bd98af696f..c1a80bfdfb 100644 --- a/packages/shell-api/src/database.spec.ts +++ b/packages/shell-api/src/database.spec.ts @@ -1,7 +1,8 @@ import chai, { expect } from 'chai'; import sinonChai from 'sinon-chai'; +import sinon from 'sinon'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import { stubInterface } from 'ts-sinon'; import type { EventEmitter } from 'events'; import { ALL_PLATFORMS, ALL_SERVER_VERSIONS, ALL_TOPOLOGIES } from './enums'; import { signatures, toShellResult } from './index'; diff --git a/packages/shell-api/src/explainable-cursor.spec.ts b/packages/shell-api/src/explainable-cursor.spec.ts index ab7c9c7e6d..31146b5015 100644 --- a/packages/shell-api/src/explainable-cursor.spec.ts +++ b/packages/shell-api/src/explainable-cursor.spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import { ALL_PLATFORMS, ALL_SERVER_VERSIONS, diff --git a/packages/shell-api/src/explainable.spec.ts b/packages/shell-api/src/explainable.spec.ts index 8f57319714..c6daa6c2a3 100644 --- a/packages/shell-api/src/explainable.spec.ts +++ b/packages/shell-api/src/explainable.spec.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; +import sinon from 'sinon'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import { stubInterface } from 'ts-sinon'; import type { EventEmitter } from 'events'; import { ALL_PLATFORMS, ALL_SERVER_VERSIONS, ALL_TOPOLOGIES } from './enums'; import { signatures, toShellResult } from './index'; diff --git a/packages/shell-api/src/field-level-encryption.spec.ts b/packages/shell-api/src/field-level-encryption.spec.ts index a1c868a66d..6b20804cdf 100644 --- a/packages/shell-api/src/field-level-encryption.spec.ts +++ b/packages/shell-api/src/field-level-encryption.spec.ts @@ -12,8 +12,9 @@ import { EventEmitter } from 'events'; import { promises as fs } from 'fs'; import path from 'path'; import { Duplex } from 'stream'; +import sinon from 'sinon'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import { stubInterface } from 'ts-sinon'; import type Database from './database'; import { signatures, toShellResult } from './decorators'; import { diff --git a/packages/shell-api/src/help.spec.ts b/packages/shell-api/src/help.spec.ts index 95c85b47d9..73e5cfc0bf 100644 --- a/packages/shell-api/src/help.spec.ts +++ b/packages/shell-api/src/help.spec.ts @@ -1,4 +1,4 @@ -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import Help from './help'; import { toShellResult } from './index'; import { expect } from 'chai'; diff --git a/packages/shell-api/src/shard.spec.ts b/packages/shell-api/src/shard.spec.ts index 1007aa7146..13d8e14ce6 100644 --- a/packages/shell-api/src/shard.spec.ts +++ b/packages/shell-api/src/shard.spec.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; +import sinon from 'sinon'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import { stubInterface } from 'ts-sinon'; import Shard from './shard'; import { ADMIN_DB, diff --git a/packages/shell-api/src/shell-api.spec.ts b/packages/shell-api/src/shell-api.spec.ts index df279be79f..4f40207304 100644 --- a/packages/shell-api/src/shell-api.spec.ts +++ b/packages/shell-api/src/shell-api.spec.ts @@ -9,8 +9,9 @@ import { ALL_TOPOLOGIES, ALL_API_VERSIONS, } from './enums'; +import sinon from 'sinon'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import { stubInterface } from 'ts-sinon'; import Mongo from './mongo'; import type { ServiceProvider, diff --git a/packages/shell-api/src/shell-bson.spec.ts b/packages/shell-api/src/shell-bson.spec.ts index 7a567670a9..10749cdaa3 100644 --- a/packages/shell-api/src/shell-bson.spec.ts +++ b/packages/shell-api/src/shell-bson.spec.ts @@ -5,7 +5,7 @@ import { deserialize as bsonDeserialize, } from 'bson'; import { expect } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; import { ALL_SERVER_VERSIONS } from './enums'; import { toShellResult } from './index'; import constructShellBson from './shell-bson'; diff --git a/packages/shell-evaluator/.depcheckrc b/packages/shell-evaluator/.depcheckrc index db115bf59b..8721cf6363 100644 --- a/packages/shell-evaluator/.depcheckrc +++ b/packages/shell-evaluator/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - sinon-chai - ts-sinon - eslint-plugin-mocha diff --git a/packages/shell-evaluator/src/shell-evaluator.spec.ts b/packages/shell-evaluator/src/shell-evaluator.spec.ts index 5893bb559d..19da4eaced 100644 --- a/packages/shell-evaluator/src/shell-evaluator.spec.ts +++ b/packages/shell-evaluator/src/shell-evaluator.spec.ts @@ -1,5 +1,5 @@ import { expect, use } from 'chai'; -import sinon from 'ts-sinon'; +import sinon from 'sinon'; const sinonChai = require('sinon-chai'); // weird with import use(sinonChai); diff --git a/packages/snippet-manager/.depcheckrc b/packages/snippet-manager/.depcheckrc index db115bf59b..8721cf6363 100644 --- a/packages/snippet-manager/.depcheckrc +++ b/packages/snippet-manager/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - sinon-chai - ts-sinon - eslint-plugin-mocha diff --git a/packages/snippet-manager/src/snippet-manager.spec.ts b/packages/snippet-manager/src/snippet-manager.spec.ts index 5a20f4c9b1..df1ae238e1 100644 --- a/packages/snippet-manager/src/snippet-manager.spec.ts +++ b/packages/snippet-manager/src/snippet-manager.spec.ts @@ -3,8 +3,9 @@ import { signatures } from '@mongosh/shell-api'; import { SnippetManager } from './snippet-manager'; import chai, { expect } from 'chai'; import sinonChai from 'sinon-chai'; +import sinon from 'sinon'; import type { StubbedInstance } from 'ts-sinon'; -import sinon, { stubInterface } from 'ts-sinon'; +import { stubInterface } from 'ts-sinon'; import { once } from 'events'; import http from 'http'; import zlib from 'zlib'; diff --git a/packages/types/.depcheckrc b/packages/types/.depcheckrc index 4ce0a200c6..8f69b97b99 100644 --- a/packages/types/.depcheckrc +++ b/packages/types/.depcheckrc @@ -5,6 +5,7 @@ ignores: - '@typescript-eslint/parser' - '@typescript-eslint/eslint-plugin' - chai + - sinon - sinon-chai - ts-sinon - eslint-plugin-mocha