api.ts -> index.ts

packages/server/lib/cloud/encryption.ts

@@ -2,7 +2,7 @@ import crypto from 'crypto'
 import { TextEncoder, promisify } from 'util'
 import { generalDecrypt, GeneralJWE } from 'jose'
 import base64Url from 'base64url'
-import type { CypressRequestOptions } from './api/api'
+import type { CypressRequestOptions } from './api'
 import { deflateRaw as deflateRawCb } from 'zlib'
 
 const deflateRaw = promisify(deflateRawCb)

packages/server/lib/cloud/exception.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash'
 const Promise = require('bluebird')
 const pkg = require('@packages/root')
-const api = require('./api/api')
+const api = require('./api')
 const user = require('./user')
 const system = require('../util/system')
 

packages/server/lib/cloud/user.ts

@@ -1,4 +1,4 @@
-const api = require('./api/api')
+const api = require('./api')
 const cache = require('../cache')
 
 import type { CachedUser } from '@packages/types'

packages/server/lib/modes/record.js

@@ -12,7 +12,7 @@ const { telemetry } = require('@packages/telemetry')
 
 const { hideKeys } = require('@packages/config')
 
-const api = require('../cloud/api/api')
+const api = require('../cloud/api')
 const exception = require('../cloud/exception')
 const upload = require('../cloud/upload')
 

packages/server/test/integration/cypress_spec.js

@@ -24,7 +24,7 @@ const ciProvider = require(`../../lib/util/ci_provider`)
 const settings = require(`../../lib/util/settings`)
 const Windows = require(`../../lib/gui/windows`)
 const interactiveMode = require(`../../lib/modes/interactive`)
-const api = require(`../../lib/cloud/api/api`)
+const api = require(`../../lib/cloud/api`)
 const cwd = require(`../../lib/cwd`)
 const user = require(`../../lib/cloud/user`)
 const cache = require(`../../lib/cache`)

packages/server/test/unit/cloud/api/api_spec.js

@@ -13,7 +13,7 @@ const {
   agent,
 } = require('@packages/network')
 const pkg = require('@packages/root')
-const api = require('../../../../lib/cloud/api/api')
+const api = require('../../../../lib/cloud/api')
 const cache = require('../../../../lib/cache')
 const errors = require('../../../../lib/errors')
 const machineId = require('../../../../lib/cloud/machine_id')
@@ -237,7 +237,7 @@ describe('lib/cloud/api', () => {
 
       if (!prodApi) {
         prodApi = stealthyRequire(require.cache, () => {
-          return require('../../../../lib/cloud/api/api')
+          return require('../../../../lib/cloud/api')
         }, () => {
           require('../../../../lib/cloud/encryption')
         }, module)

packages/server/test/unit/cloud/exceptions_spec.js

@@ -2,7 +2,7 @@ require('../../spec_helper')
 
 delete global.fs
 
-const api = require('../../../lib/cloud/api/api')
+const api = require('../../../lib/cloud/api')
 const user = require('../../../lib/cloud/user')
 const exception = require('../../../lib/cloud/exception')
 const system = require('../../../lib/util/system')

packages/server/test/unit/cloud/user_spec.js

@@ -1,6 +1,6 @@
 require('../../spec_helper')
 
-const api = require('../../../lib/cloud/api/api')
+const api = require('../../../lib/cloud/api')
 const cache = require('../../../lib/cache')
 const user = require('../../../lib/cloud/user')
 

packages/server/test/unit/modes/record_spec.js

@@ -6,7 +6,7 @@ const commitInfo = require('@cypress/commit-info')
 const mockedEnv = require('mocked-env')
 
 const errors = require(`../../../lib/errors`)
-const api = require(`../../../lib/cloud/api/api`)
+const api = require(`../../../lib/cloud/api`)
 const exception = require(`../../../lib/cloud/exception`)
 const recordMode = require(`../../../lib/modes/record`)
 const ciProvider = require(`../../../lib/util/ci_provider`)

scripts/after-pack-hook.js

@@ -77,7 +77,7 @@ module.exports = async function (params) {
       const encryptionFileSource = await getEncryptionFileSource(encryptionFilePath)
       const cloudEnvironmentFilePath = path.join(CY_ROOT_DIR, 'packages/server/lib/cloud/environment.ts')
       const cloudEnvironmentFileSource = await getCloudEnvironmentFileSource(cloudEnvironmentFilePath)
-      const cloudApiFilePath = path.join(CY_ROOT_DIR, 'packages/server/lib/cloud/api/api.ts')
+      const cloudApiFilePath = path.join(CY_ROOT_DIR, 'packages/server/lib/cloud/api/index.ts')
       const cloudApiFileSource = await getProtocolFileSource(cloudApiFilePath)
       const cloudProtocolFilePath = path.join(CY_ROOT_DIR, 'packages/server/lib/cloud/protocol.ts')
       const cloudProtocolFileSource = await getProtocolFileSource(cloudProtocolFilePath)

tooling/v8-snapshot/cache/darwin/snapshot-meta.json

@@ -751,7 +751,7 @@
     "./packages/server/lib/browsers/firefox.ts",
     "./packages/server/lib/browsers/memory/index.ts",
     "./packages/server/lib/cache.js",
-    "./packages/server/lib/cloud/api/api.ts",
+    "./packages/server/lib/cloud/api/index.ts",
     "./packages/server/lib/cloud/auth.ts",
     "./packages/server/lib/cloud/routes.ts",
     "./packages/server/lib/cloud/upload.ts",

tooling/v8-snapshot/cache/linux/snapshot-meta.json

@@ -750,7 +750,7 @@
     "./packages/server/lib/browsers/firefox.ts",
     "./packages/server/lib/browsers/memory/index.ts",
     "./packages/server/lib/cache.js",
-    "./packages/server/lib/cloud/api/api.ts",
+    "./packages/server/lib/cloud/api/index.ts",
     "./packages/server/lib/cloud/auth.ts",
     "./packages/server/lib/cloud/routes.ts",
     "./packages/server/lib/cloud/upload.ts",

tooling/v8-snapshot/cache/win32/snapshot-meta.json

@@ -755,7 +755,7 @@
     "./packages/server/lib/browsers/firefox.ts",
     "./packages/server/lib/browsers/memory/index.ts",
     "./packages/server/lib/cache.js",
-    "./packages/server/lib/cloud/api/api.ts",
+    "./packages/server/lib/cloud/api/index.ts",
     "./packages/server/lib/cloud/auth.ts",
     "./packages/server/lib/cloud/routes.ts",
     "./packages/server/lib/cloud/upload.ts",