diff --git a/eslint.config.mjs b/eslint.config.mjs index 91d97ba9ac07..3427939654ad 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -21,12 +21,17 @@ const generalRestrictedImportPatterns = [ // Block relative paths to insomnia-data { group: ['./**/insomnia-data', './**/insomnia-data/**', '../**/insomnia-data', '../**/insomnia-data/**'], - message: "Please use '~/insomnia-data' instead of relative paths", + message: "Please use 'insomnia-data' instead of relative paths", }, - // Only allow ~/insomnia-data and ~/insomnia-data/node + // Only allow insomnia-data and insomnia-data/node { - regex: '^~/insomnia-data/(?!node($|/)|common($|/)).+', - message: "Only '~/insomnia-data', '~/insomnia-data/node' and '~/insomnia-data/common' are allowed", + regex: '^insomnia-data/(?!node($|/)|common($|/)).+', + message: "Only 'insomnia-data', 'insomnia-data/node' and 'insomnia-data/common' are allowed", + }, + // Only allow insomnia-data, not allow ~/insomnia-data anymore + { + regex: '^~/insomnia-data(/.*)?$', + message: "Please use 'insomnia-data' instead of '~/insomnia-data'", }, ]; const rendererNodeMigrationOffenders = [ diff --git a/packages/insomnia-inso/src/analytics.ts b/packages/insomnia-inso/src/analytics.ts index 2f116f99cd8f..d0774e90df83 100644 --- a/packages/insomnia-inso/src/analytics.ts +++ b/packages/insomnia-inso/src/analytics.ts @@ -2,10 +2,9 @@ import os from 'node:os'; import { getSegmentWriteKey } from 'insomnia/src/common/constants'; import { InsoEvent, InsomniaAnalytics } from 'insomnia-analytics'; +import type { Settings } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; -import type { Settings } from '~/insomnia-data'; - import packageJson from '../package.json'; import neDbAdapter from './db/adapters/ne-db-adapter'; import { getAppDataDir, getDefaultProductName } from './util'; diff --git a/packages/insomnia-inso/src/cli.ts b/packages/insomnia-inso/src/cli.ts index a363b574c394..4e1c2fbb11ea 100644 --- a/packages/insomnia-inso/src/cli.ts +++ b/packages/insomnia-inso/src/cli.ts @@ -12,11 +12,6 @@ import { isDevelopment, JSON_ORDER_PREFIX, JSON_ORDER_SEPARATOR } from 'insomnia import { insomniaFetch } from 'insomnia/src/common/insomnia-fetch'; import { getSendRequestCallbackMemDb } from 'insomnia/src/common/send-request'; import { configureFetch } from 'insomnia-api'; -import { generate, runTestsCli } from 'insomnia-testing'; -import orderedJSON from 'json-order'; -import { parseArgsStringToArgv } from 'string-argv'; -import { v4 as uuidv4 } from 'uuid'; - import type { Environment, Request, @@ -24,10 +19,14 @@ import type { RequestTestResult, UserUploadEnvironment, Workspace, -} from '~/insomnia-data'; -import { initServices, models } from '~/insomnia-data'; -import { deserializeNDJSON } from '~/insomnia-data/common'; -import { servicesNodeImpl } from '~/insomnia-data/node'; +} from 'insomnia-data'; +import { initServices, models } from 'insomnia-data'; +import { deserializeNDJSON } from 'insomnia-data/common'; +import { servicesNodeImpl } from 'insomnia-data/node'; +import { generate, runTestsCli } from 'insomnia-testing'; +import orderedJSON from 'json-order'; +import { parseArgsStringToArgv } from 'string-argv'; +import { v4 as uuidv4 } from 'uuid'; import packageJson from '../package.json'; import { flushAnalytics, InsoEvent, trackInsoEvent } from './analytics'; diff --git a/packages/insomnia-inso/src/commands/run-collection/result-report.ts b/packages/insomnia-inso/src/commands/run-collection/result-report.ts index 9ff267d74675..75a5f1dbe47b 100644 --- a/packages/insomnia-inso/src/commands/run-collection/result-report.ts +++ b/packages/insomnia-inso/src/commands/run-collection/result-report.ts @@ -3,7 +3,6 @@ import nodePath from 'node:path'; import type { ConsolaInstance } from 'consola'; import { pick } from 'es-toolkit'; - import type { Environment, Request, @@ -12,8 +11,8 @@ import type { RequestTestResult, UserUploadEnvironment, Workspace, -} from '~/insomnia-data'; -import { typedKeys } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { typedKeys } from 'insomnia-data/common'; interface RunReportExecution { request: Request; diff --git a/packages/insomnia-inso/src/db/types.ts b/packages/insomnia-inso/src/db/types.ts index 3badd6abf5ca..9232d941deed 100644 --- a/packages/insomnia-inso/src/db/types.ts +++ b/packages/insomnia-inso/src/db/types.ts @@ -1,4 +1,4 @@ -import type { CaCertificate, ClientCertificate, CloudProviderCredential, CookieJar, Settings } from '~/insomnia-data'; +import type { CaCertificate, ClientCertificate, CloudProviderCredential, CookieJar, Settings } from 'insomnia-data'; import type { ApiSpec, diff --git a/packages/insomnia-inso/src/reporter/index.test.ts b/packages/insomnia-inso/src/reporter/index.test.ts index 6d248a8d7fe2..59aef1de2f64 100644 --- a/packages/insomnia-inso/src/reporter/index.test.ts +++ b/packages/insomnia-inso/src/reporter/index.test.ts @@ -1,7 +1,6 @@ +import type { RequestTestResult } from 'insomnia-data'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import type { RequestTestResult } from '~/insomnia-data'; - import { logTestResult, logTestResultSummary, reporterTypes } from './index'; describe('Reporter', () => { diff --git a/packages/insomnia-inso/src/reporter/index.ts b/packages/insomnia-inso/src/reporter/index.ts index fcc8db784214..8e597f532e31 100644 --- a/packages/insomnia-inso/src/reporter/index.ts +++ b/packages/insomnia-inso/src/reporter/index.ts @@ -1,7 +1,6 @@ +import type { RequestTestResult } from 'insomnia-data'; import pc from 'picocolors'; -import type { RequestTestResult } from '~/insomnia-data'; - export const reporterTypes = ['dot', 'list', 'min', 'progress', 'spec', 'tap'] as const; export type TestReporter = (typeof reporterTypes)[number]; diff --git a/packages/insomnia-inso/tsconfig.json b/packages/insomnia-inso/tsconfig.json index 442bd1d5067a..94c1e74035a6 100644 --- a/packages/insomnia-inso/tsconfig.json +++ b/packages/insomnia-inso/tsconfig.json @@ -10,7 +10,9 @@ "isolatedModules": true, "noEmit": true, "paths": { - "~/*": ["../insomnia/src/*"] + "~/*": ["../insomnia/src/*"], + "insomnia-data": ["../insomnia/src/insomnia-data"], + "insomnia-data/*": ["../insomnia/src/insomnia-data/*"] }, /* Transpiling Options */ "module": "ESNext", diff --git a/packages/insomnia-inso/vitest.config.ts b/packages/insomnia-inso/vitest.config.ts index efadd39353bd..018f55da3614 100644 --- a/packages/insomnia-inso/vitest.config.ts +++ b/packages/insomnia-inso/vitest.config.ts @@ -5,8 +5,10 @@ export default defineConfig({ hideSkippedTests: true, alias: { '~/network/network-adapter': new URL('../insomnia/src/network/network-adapter.node.ts', import.meta.url).pathname, - '~/templating/render-adapter': new URL('../insomnia/src/templating/render-adapter.node.ts', import.meta.url).pathname, + '~/templating/render-adapter': new URL('../insomnia/src/templating/render-adapter.node.ts', import.meta.url) + .pathname, '~/': new URL('../insomnia/src/', import.meta.url).pathname, + 'insomnia-data': new URL('../insomnia/src/insomnia-data', import.meta.url).pathname, }, env: { DEFAULT_APP_NAME: process.env.DEFAULT_APP_NAME || 'insomnia-app', diff --git a/packages/insomnia-scripting-environment/src/objects/auth.ts b/packages/insomnia-scripting-environment/src/objects/auth.ts index 4efa265091a6..922de11d8723 100644 --- a/packages/insomnia-scripting-environment/src/objects/auth.ts +++ b/packages/insomnia-scripting-environment/src/objects/auth.ts @@ -1,6 +1,5 @@ import type { OAuth1SignatureMethod } from 'insomnia/src/common/constants'; - -import type { OAuth2ResponseType, RequestAuthentication } from '~/insomnia-data'; +import type { OAuth2ResponseType, RequestAuthentication } from 'insomnia-data'; import { Property } from './properties'; import { Variable, VariableList } from './variables'; diff --git a/packages/insomnia-scripting-environment/src/objects/cookies.ts b/packages/insomnia-scripting-environment/src/objects/cookies.ts index 403f9c10dc73..febd9ad075bf 100644 --- a/packages/insomnia-scripting-environment/src/objects/cookies.ts +++ b/packages/insomnia-scripting-environment/src/objects/cookies.ts @@ -1,8 +1,7 @@ +import type { Cookie as InsomniaCookie, CookieJar as InsomniaCookieJar } from 'insomnia-data'; import { Cookie as ToughCookie } from 'tough-cookie'; import { v4 as uuidv4 } from 'uuid'; -import type { Cookie as InsomniaCookie, CookieJar as InsomniaCookieJar } from '~/insomnia-data'; - import { getExistingConsole } from './console'; import { Property, PropertyList } from './properties'; diff --git a/packages/insomnia-scripting-environment/src/objects/insomnia.ts b/packages/insomnia-scripting-environment/src/objects/insomnia.ts index 3f0ff84602a5..ea3763621ba8 100644 --- a/packages/insomnia-scripting-environment/src/objects/insomnia.ts +++ b/packages/insomnia-scripting-environment/src/objects/insomnia.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; import { filterClientCertificates } from 'insomnia/src/network/certificate'; - -import type { ClientCertificate, RequestHeader, RequestTestResult, Settings } from '~/insomnia-data'; +import type { ClientCertificate, RequestHeader, RequestTestResult, Settings } from 'insomnia-data'; import { toPreRequestAuth } from './auth'; import { getExistingConsole } from './console'; diff --git a/packages/insomnia-scripting-environment/src/objects/interfaces.ts b/packages/insomnia-scripting-environment/src/objects/interfaces.ts index 6a41fc7aba21..5abd587357d9 100644 --- a/packages/insomnia-scripting-environment/src/objects/interfaces.ts +++ b/packages/insomnia-scripting-environment/src/objects/interfaces.ts @@ -1,6 +1,5 @@ import type { sendCurlAndWriteTimelineError, sendCurlAndWriteTimelineResponse } from 'insomnia/src/network/network'; - -import type { ClientCertificate, CookieJar, Request, RequestTestResult, Settings } from '~/insomnia-data'; +import type { ClientCertificate, CookieJar, Request, RequestTestResult, Settings } from 'insomnia-data'; import type { ExecutionOption } from './execution'; import type { RequestInfoOption } from './request-info'; diff --git a/packages/insomnia-scripting-environment/src/objects/request.ts b/packages/insomnia-scripting-environment/src/objects/request.ts index f9d2485ab961..de05b52c726f 100644 --- a/packages/insomnia-scripting-environment/src/objects/request.ts +++ b/packages/insomnia-scripting-environment/src/objects/request.ts @@ -5,8 +5,8 @@ import type { RequestBodyParameter, RequestPathParameter, Settings, -} from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models } from 'insomnia-data'; import { type AuthOptions, type AuthOptionTypes, fromPreRequestAuth, RequestAuth } from './auth'; import type { CertificateOptions } from './certificates'; diff --git a/packages/insomnia-scripting-environment/src/objects/response.ts b/packages/insomnia-scripting-environment/src/objects/response.ts index 3eb535a18b4a..35f6e252cd93 100644 --- a/packages/insomnia-scripting-environment/src/objects/response.ts +++ b/packages/insomnia-scripting-environment/src/objects/response.ts @@ -2,8 +2,7 @@ import { Ajv, type ErrorObject } from 'ajv'; import * as chai from 'chai'; import { RESPONSE_CODE_REASONS } from 'insomnia/src/common/constants'; import type { sendCurlAndWriteTimelineError, sendCurlAndWriteTimelineResponse } from 'insomnia/src/network/network'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { Cookie, type CookieOptions } from './cookies'; import { CookieList } from './cookies'; diff --git a/packages/insomnia-scripting-environment/src/objects/send-request.ts b/packages/insomnia-scripting-environment/src/objects/send-request.ts index 16614902b850..128554c8e610 100644 --- a/packages/insomnia-scripting-environment/src/objects/send-request.ts +++ b/packages/insomnia-scripting-environment/src/objects/send-request.ts @@ -1,10 +1,9 @@ import type { CurlRequestOutput } from 'insomnia/src/main/network/libcurl-promise'; +import type { Settings } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { Cookie } from 'tough-cookie'; import { v4 as uuidv4 } from 'uuid'; -import type { Settings } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; - import { RequestAuth } from './auth'; import { fromPreRequestAuth } from './auth'; import type { CookieOptions } from './cookies'; diff --git a/packages/insomnia-scripting-environment/src/objects/test.ts b/packages/insomnia-scripting-environment/src/objects/test.ts index 4d356f4e2970..92c27067a45a 100644 --- a/packages/insomnia-scripting-environment/src/objects/test.ts +++ b/packages/insomnia-scripting-environment/src/objects/test.ts @@ -1,4 +1,4 @@ -import type { RequestTestResult } from '~/insomnia-data'; +import type { RequestTestResult } from 'insomnia-data'; /** @ignore */ export async function test(msg: string, fn: () => Promise, log: (testResult: RequestTestResult) => void) { diff --git a/packages/insomnia-scripting-environment/tsconfig.json b/packages/insomnia-scripting-environment/tsconfig.json index 183fa0f10fc9..04db35b2ab7c 100644 --- a/packages/insomnia-scripting-environment/tsconfig.json +++ b/packages/insomnia-scripting-environment/tsconfig.json @@ -11,7 +11,9 @@ "isolatedModules": true, "noEmit": true, "paths": { - "~/*": ["../insomnia/src/*"] + "~/*": ["../insomnia/src/*"], + "insomnia-data": ["../insomnia/src/insomnia-data"], + "insomnia-data/*": ["../insomnia/src/insomnia-data/*"] }, /* Strictness */ "strict": true, diff --git a/packages/insomnia-scripting-environment/vitest.config.ts b/packages/insomnia-scripting-environment/vitest.config.ts index 856fe385854e..d09638d02b29 100644 --- a/packages/insomnia-scripting-environment/vitest.config.ts +++ b/packages/insomnia-scripting-environment/vitest.config.ts @@ -5,6 +5,7 @@ export default defineConfig({ hideSkippedTests: true, alias: { '~/': new URL('../insomnia/src/', import.meta.url).pathname, + 'insomnia-data': new URL('../insomnia/src/insomnia-data', import.meta.url).pathname, }, }, }); diff --git a/packages/insomnia/setup-vitest.ts b/packages/insomnia/setup-vitest.ts index a10467b41e7b..115e97e3e600 100644 --- a/packages/insomnia/setup-vitest.ts +++ b/packages/insomnia/setup-vitest.ts @@ -1,8 +1,7 @@ +import { initDatabase, initServices } from 'insomnia-data'; +import { servicesNodeImpl } from 'insomnia-data/node'; import { vi } from 'vitest'; -import { initDatabase, initServices } from '~/insomnia-data'; -import { servicesNodeImpl } from '~/insomnia-data/node'; - import { nodeLibcurlMock } from './src/__mocks__/@getinsomnia/node-libcurl'; import { electronMock } from './src/__mocks__/electron'; import { v4Mock } from './src/__mocks__/uuid'; diff --git a/packages/insomnia/src/account/crypt.ts b/packages/insomnia/src/account/crypt.ts index 622833ae132a..dde36438af32 100644 --- a/packages/insomnia/src/account/crypt.ts +++ b/packages/insomnia/src/account/crypt.ts @@ -1,7 +1,6 @@ +import type { AESMessage } from 'insomnia-data'; import forge from 'node-forge'; -import type { AESMessage } from '~/insomnia-data'; - export type { AESMessage }; /** diff --git a/packages/insomnia/src/account/session.ts b/packages/insomnia/src/account/session.ts index 5fd9ee5c7f1c..509cffa089e3 100644 --- a/packages/insomnia/src/account/session.ts +++ b/packages/insomnia/src/account/session.ts @@ -1,7 +1,6 @@ import { getEncryptionKeys, getUserProfile, logout as logoutAPI } from 'insomnia-api'; - -import type { GitRepository, Project, WorkspaceMeta } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +import type { GitRepository, Project, WorkspaceMeta } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { AI_PLUGIN_NAME, LLM_BACKENDS } from '../common/constants'; import { database } from '../common/database'; diff --git a/packages/insomnia/src/common/__fixtures__/nestedfolders.ts b/packages/insomnia/src/common/__fixtures__/nestedfolders.ts index 8488807a4f9a..d1c5224223ff 100644 --- a/packages/insomnia/src/common/__fixtures__/nestedfolders.ts +++ b/packages/insomnia/src/common/__fixtures__/nestedfolders.ts @@ -1,5 +1,5 @@ -import type { BaseModel } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { BaseModel } from 'insomnia-data'; +import { models } from 'insomnia-data'; const { workspace, requestGroup, request } = models; diff --git a/packages/insomnia/src/common/__tests__/constants.test.ts b/packages/insomnia/src/common/__tests__/constants.test.ts index acfe19a60fe0..f906894174de 100644 --- a/packages/insomnia/src/common/__tests__/constants.test.ts +++ b/packages/insomnia/src/common/__tests__/constants.test.ts @@ -1,7 +1,6 @@ +import type { MockServer } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import type { MockServer } from '~/insomnia-data'; - import { FLEXIBLE_URL_REGEX, getContentTypeName, diff --git a/packages/insomnia/src/common/__tests__/get-workspace-label.test.ts b/packages/insomnia/src/common/__tests__/get-workspace-label.test.ts index 21172de2c9fa..ea958e77031e 100644 --- a/packages/insomnia/src/common/__tests__/get-workspace-label.test.ts +++ b/packages/insomnia/src/common/__tests__/get-workspace-label.test.ts @@ -1,9 +1,8 @@ +import type { Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import { describe, expect, it } from 'vitest'; -import type { Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; - import { getWorkspaceLabel } from '../get-workspace-label'; describe('getWorkspaceLabel', () => { diff --git a/packages/insomnia/src/common/__tests__/har.test.ts b/packages/insomnia/src/common/__tests__/har.test.ts index b96770f80389..9a0620973418 100644 --- a/packages/insomnia/src/common/__tests__/har.test.ts +++ b/packages/insomnia/src/common/__tests__/har.test.ts @@ -12,9 +12,8 @@ vi.mock('~/network/network-adapter', () => ({ applyRequestHooks: (request: any) => Promise.resolve(request), applyResponseHooks: (response: any) => Promise.resolve(response), })); - -import type { Cookie, Request, Response } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +import type { Cookie, Request, Response } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { database as db } from '../../common/database'; import { exportHar, exportHarResponse, exportHarWithRequest } from '../har'; diff --git a/packages/insomnia/src/common/__tests__/import-v5-parser.test.ts b/packages/insomnia/src/common/__tests__/import-v5-parser.test.ts index a44d6e175b1a..faaecec1a142 100644 --- a/packages/insomnia/src/common/__tests__/import-v5-parser.test.ts +++ b/packages/insomnia/src/common/__tests__/import-v5-parser.test.ts @@ -31,7 +31,7 @@ import { beforeAll(() => { // Make tests deterministic when schema uses crypto.randomUUID() if (!globalThis.crypto || typeof globalThis.crypto.randomUUID !== 'function') { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore globalThis.crypto = { randomUUID: () => '00000000-0000-4000-8000-000000000000', diff --git a/packages/insomnia/src/common/__tests__/import.test.ts b/packages/insomnia/src/common/__tests__/import.test.ts index 541a8e7c83ca..a435fca8a8cb 100644 --- a/packages/insomnia/src/common/__tests__/import.test.ts +++ b/packages/insomnia/src/common/__tests__/import.test.ts @@ -1,11 +1,10 @@ import fs from 'node:fs'; import path from 'node:path'; +import { EnvironmentKvPairDataType, EnvironmentType, services } from 'insomnia-data'; import { describe, expect, it, vi } from 'vitest'; import { parse } from 'yaml'; -import { EnvironmentKvPairDataType, EnvironmentType, services } from '~/insomnia-data'; - import * as importUtil from '../import'; import { INSOMNIA_SCHEMA_VERSION } from '../insomnia-schema-migrations/schema-version'; import { tryImportV5Data } from '../insomnia-v5'; diff --git a/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts b/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts index c6801ac2eae4..45debebdb70f 100644 --- a/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts +++ b/packages/insomnia/src/common/__tests__/insomnia-v5.test.ts @@ -5,12 +5,11 @@ * ensuring they work correctly and handle edge cases properly. */ +import type { Request } from 'insomnia-data'; +import { EnvironmentKvPairDataType, services } from 'insomnia-data'; import { beforeEach, describe, expect, it } from 'vitest'; import YAML from 'yaml'; -import type { Request } from '~/insomnia-data'; -import { EnvironmentKvPairDataType, services } from '~/insomnia-data'; - import { INSOMNIA_SCHEMA_VERSION } from '../../common/insomnia-schema-migrations/schema-version'; import { database as db } from '../database'; import { diff --git a/packages/insomnia/src/common/__tests__/render.test.ts b/packages/insomnia/src/common/__tests__/render.test.ts index 029a8bd03c62..45815cb84759 100644 --- a/packages/insomnia/src/common/__tests__/render.test.ts +++ b/packages/insomnia/src/common/__tests__/render.test.ts @@ -1,10 +1,9 @@ // @ts-nocheck import { createBuilder } from '@develohpanda/fluent-builder'; +import type { Environment, Workspace } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { beforeEach, describe, expect, it } from 'vitest'; -import type { Environment, Workspace } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; - import { environmentModelSchema, requestGroupModelSchema } from '../../sync/__schemas__/model-schemas'; import * as renderUtils from '../render'; diff --git a/packages/insomnia/src/common/__tests__/sorting.test.ts b/packages/insomnia/src/common/__tests__/sorting.test.ts index d0f3135a379c..acf7466479e2 100644 --- a/packages/insomnia/src/common/__tests__/sorting.test.ts +++ b/packages/insomnia/src/common/__tests__/sorting.test.ts @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; - import { METHOD_DELETE, METHOD_GET, diff --git a/packages/insomnia/src/common/common-headers.ts b/packages/insomnia/src/common/common-headers.ts index 9590c3cbae05..485c2d2c3127 100644 --- a/packages/insomnia/src/common/common-headers.ts +++ b/packages/insomnia/src/common/common-headers.ts @@ -1,4 +1,4 @@ -import type { RequestHeader } from '~/insomnia-data'; +import type { RequestHeader } from 'insomnia-data'; import allCharsets from '../datasets/charsets'; import allMimeTypes from '../datasets/content-types'; diff --git a/packages/insomnia/src/common/constants.ts b/packages/insomnia/src/common/constants.ts index ebbc5168ce0d..be55688f7c47 100644 --- a/packages/insomnia/src/common/constants.ts +++ b/packages/insomnia/src/common/constants.ts @@ -1,4 +1,4 @@ -import type { MockServer } from '~/insomnia-data'; +import type { MockServer } from 'insomnia-data'; import { CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_GRAPHQL, @@ -8,7 +8,7 @@ import { isWindows, METHOD_GET, platform, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; import appConfig from '../../config/config.json'; import { version } from '../../package.json'; @@ -211,7 +211,7 @@ export const HTTP_METHODS = [ export const METHOD_GRPC = 'GRPC'; // Content Types -export { CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_GRAPHQL, CONTENT_TYPE_JSON } from '~/insomnia-data/common'; +export { CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_GRAPHQL, CONTENT_TYPE_JSON } from 'insomnia-data/common'; export const CONTENT_TYPE_PLAINTEXT = 'text/plain'; export const CONTENT_TYPE_XML = 'application/xml'; export const CONTENT_TYPE_YAML = 'application/yaml'; diff --git a/packages/insomnia/src/common/cookies.ts b/packages/insomnia/src/common/cookies.ts index b81fbae8af78..2e8fe55ecd14 100644 --- a/packages/insomnia/src/common/cookies.ts +++ b/packages/insomnia/src/common/cookies.ts @@ -1,7 +1,6 @@ +import type { Cookie } from 'insomnia-data'; import { Cookie as ToughCookie, CookieJar, type CookieJSON } from 'tough-cookie'; -import type { Cookie } from '~/insomnia-data'; - /** * Get a list of cookie objects from a request.jar() */ diff --git a/packages/insomnia/src/common/database.ts b/packages/insomnia/src/common/database.ts index 3c86fb251b5f..254fe2005d80 100644 --- a/packages/insomnia/src/common/database.ts +++ b/packages/insomnia/src/common/database.ts @@ -1 +1 @@ -export { database, type ChangeBufferEvent, type ChangeType, type Operation } from '~/insomnia-data'; +export { database, type ChangeBufferEvent, type ChangeType, type Operation } from 'insomnia-data'; diff --git a/packages/insomnia/src/common/get-workspace-label.ts b/packages/insomnia/src/common/get-workspace-label.ts index 8601848f29d7..bb81029d6f94 100644 --- a/packages/insomnia/src/common/get-workspace-label.ts +++ b/packages/insomnia/src/common/get-workspace-label.ts @@ -1,8 +1,7 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; - -import type { Workspace, WorkspaceScope } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; +import type { Workspace, WorkspaceScope } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; export type ProjectScopeKeys = WorkspaceScope | 'unsynced'; diff --git a/packages/insomnia/src/common/har.ts b/packages/insomnia/src/common/har.ts index 56998a6c2a9a..8ab9bece16eb 100644 --- a/packages/insomnia/src/common/har.ts +++ b/packages/insomnia/src/common/har.ts @@ -1,8 +1,8 @@ import type * as Har from 'har-format'; +import type { BaseModel, Environment, Request, RequestGroup, Response, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { Cookie as ToughCookie } from 'tough-cookie'; -import type { BaseModel, Environment, Request, RequestGroup, Response, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { applyRequestHooks } from '~/network/network-adapter'; import { RenderError } from '../templating/render-error'; diff --git a/packages/insomnia/src/common/import.ts b/packages/insomnia/src/common/import.ts index faa4db35910d..55a696e288b4 100644 --- a/packages/insomnia/src/common/import.ts +++ b/packages/insomnia/src/common/import.ts @@ -1,6 +1,3 @@ -import orderedJSON from 'json-order'; -import { z, type ZodError } from 'zod/v4'; - import type { AllTypes, ApiSpec, @@ -17,8 +14,10 @@ import type { UnitTestSuite, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import orderedJSON from 'json-order'; +import { z, type ZodError } from 'zod/v4'; import type { InsomniaImporter } from '../main/importers/convert'; import type { ImportEntry } from '../main/importers/entities'; diff --git a/packages/insomnia/src/common/insomnia-v5.ts b/packages/insomnia/src/common/insomnia-v5.ts index 893ef46fbdd3..d4a341d7b892 100644 --- a/packages/insomnia/src/common/insomnia-v5.ts +++ b/packages/insomnia/src/common/insomnia-v5.ts @@ -12,11 +12,6 @@ * */ -import { parse, stringify } from 'yaml'; - -import { type AllExportTypes, MODELS_BY_EXPORT_TYPE } from '~/common/import'; -import { migrateToLatestYaml } from '~/common/insomnia-schema-migrations'; -import { INSOMNIA_SCHEMA_VERSION } from '~/common/insomnia-schema-migrations/schema-version'; import type { ApiSpec, BaseModel, @@ -38,8 +33,13 @@ import type { WebSocketRequest, Workspace, WorkspaceScope, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { parse, stringify } from 'yaml'; + +import { type AllExportTypes, MODELS_BY_EXPORT_TYPE } from '~/common/import'; +import { migrateToLatestYaml } from '~/common/insomnia-schema-migrations'; +import { INSOMNIA_SCHEMA_VERSION } from '~/common/insomnia-schema-migrations/schema-version'; import { maskVaultEnvironmentData } from '~/utils/environment-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/common/misc.ts b/packages/insomnia/src/common/misc.ts index fd5784fbea49..0eed1f529cc5 100644 --- a/packages/insomnia/src/common/misc.ts +++ b/packages/insomnia/src/common/misc.ts @@ -79,7 +79,7 @@ export function getContentDispositionHeader(headers: T[]): T | return matches.length ? matches[0] : null; } -export { generateId } from '~/insomnia-data/common'; +export { generateId } from 'insomnia-data/common'; export function delay(milliseconds: number = DEBOUNCE_MILLIS) { return new Promise(resolve => setTimeout(resolve, milliseconds)); diff --git a/packages/insomnia/src/common/organization-storage-rules.ts b/packages/insomnia/src/common/organization-storage-rules.ts index b9077348450f..30284050bb77 100644 --- a/packages/insomnia/src/common/organization-storage-rules.ts +++ b/packages/insomnia/src/common/organization-storage-rules.ts @@ -1,6 +1,6 @@ import { getOrganizationStorageRule, type StorageRules } from 'insomnia-api'; +import { models, services } from 'insomnia-data'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; const inMemoryStorageRuleCache: Map = new Map(); diff --git a/packages/insomnia/src/common/project.ts b/packages/insomnia/src/common/project.ts index 609d26fc11bc..af53bcbd0a7b 100644 --- a/packages/insomnia/src/common/project.ts +++ b/packages/insomnia/src/common/project.ts @@ -1,7 +1,3 @@ -import { parseApiSpec, type ParsedApiSpec } from '~/common/api-specs'; -import { scopeToLabelMap } from '~/common/get-workspace-label'; -import { isNotNullOrUndefined } from '~/common/misc'; -import { descendingNumberSort } from '~/common/sorting'; import { type ApiSpec, database, @@ -17,7 +13,12 @@ import { type Workspace, type WorkspaceMeta, type WorkspaceScope, -} from '~/insomnia-data'; +} from 'insomnia-data'; + +import { parseApiSpec, type ParsedApiSpec } from '~/common/api-specs'; +import { scopeToLabelMap } from '~/common/get-workspace-label'; +import { isNotNullOrUndefined } from '~/common/misc'; +import { descendingNumberSort } from '~/common/sorting'; export interface InsomniaFile { id: string; diff --git a/packages/insomnia/src/common/render.ts b/packages/insomnia/src/common/render.ts index 45278a129d99..80afb6f69b8b 100644 --- a/packages/insomnia/src/common/render.ts +++ b/packages/insomnia/src/common/render.ts @@ -1,6 +1,4 @@ import clone from 'clone'; -import orderedJSON from 'json-order'; - import type { Environment, GrpcRequest, @@ -12,8 +10,10 @@ import type { UserUploadEnvironment, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import orderedJSON from 'json-order'; + import { renderTemplate } from '~/templating/render-adapter'; import { getOrInheritAuthentication, getOrInheritHeaders } from '../network/network'; diff --git a/packages/insomnia/src/common/send-request.ts b/packages/insomnia/src/common/send-request.ts index 30ef43eb2a04..93b3579b94b2 100644 --- a/packages/insomnia/src/common/send-request.ts +++ b/packages/insomnia/src/common/send-request.ts @@ -1,9 +1,9 @@ import fs from 'node:fs/promises'; import path from 'node:path'; -import type { BaseModel, Environment, Settings, UserUploadEnvironment } from '~/insomnia-data'; -import { database, initDatabase, services } from '~/insomnia-data'; -import { createNedbDatabase } from '~/insomnia-data/node'; +import type { BaseModel, Environment, Settings, UserUploadEnvironment } from 'insomnia-data'; +import { database, initDatabase, services } from 'insomnia-data'; +import { createNedbDatabase } from 'insomnia-data/node'; import { defaultSendActionRuntime, diff --git a/packages/insomnia/src/common/sorting.ts b/packages/insomnia/src/common/sorting.ts index 5f77835aae2f..fa22d83c49ff 100644 --- a/packages/insomnia/src/common/sorting.ts +++ b/packages/insomnia/src/common/sorting.ts @@ -1,5 +1,5 @@ -import type { GrpcRequest, Request, RequestGroup } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { GrpcRequest, Request, RequestGroup } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { type DashboardSortOrder, HTTP_METHODS, type SortOrder } from './constants'; diff --git a/packages/insomnia/src/entry.client.tsx b/packages/insomnia/src/entry.client.tsx index 81b5f1ffad2d..58c1d9c6d3aa 100644 --- a/packages/insomnia/src/entry.client.tsx +++ b/packages/insomnia/src/entry.client.tsx @@ -2,12 +2,12 @@ import './ui/renderer-listeners'; import './ui/log'; import { configureFetch } from 'insomnia-api'; +import { initDatabase, initServices, services } from 'insomnia-data'; import { startTransition, StrictMode } from 'react'; import { hydrateRoot } from 'react-dom/client'; import { HydratedRouter } from 'react-router/dom'; import { insomniaFetch } from '~/common/insomnia-fetch'; -import { initDatabase, initServices, services } from '~/insomnia-data'; import { database as clientDatabase } from '~/ui/database.client'; import { clearOAuthWindowSessionId } from '~/ui/spawn-oauth-window'; diff --git a/packages/insomnia/src/entry.hidden-window-preload.ts b/packages/insomnia/src/entry.hidden-window-preload.ts index acd523a175ec..897e24c5ae97 100644 --- a/packages/insomnia/src/entry.hidden-window-preload.ts +++ b/packages/insomnia/src/entry.hidden-window-preload.ts @@ -1,8 +1,8 @@ import * as fs from 'node:fs'; import { contextBridge, ipcRenderer, type IpcRendererEvent } from 'electron'; +import type { Compression } from 'insomnia-data'; -import type { Compression } from '~/insomnia-data'; import { servicesProxy } from '~/ui/renderer-services-proxy'; import { diff --git a/packages/insomnia/src/entry.hidden-window.ts b/packages/insomnia/src/entry.hidden-window.ts index 5d0065a46aa3..cd2d31c01691 100644 --- a/packages/insomnia/src/entry.hidden-window.ts +++ b/packages/insomnia/src/entry.hidden-window.ts @@ -1,7 +1,6 @@ import * as Sentry from '@sentry/electron/renderer'; import { SENTRY_OPTIONS } from 'insomnia/src/common/sentry'; - -import { initServices } from '~/insomnia-data'; +import { initServices } from 'insomnia-data'; import type { RequestContext } from '../../insomnia-scripting-environment/src/objects'; import { runScript } from './scripting/run-script'; diff --git a/packages/insomnia/src/entry.main.ts b/packages/insomnia/src/entry.main.ts index c1c5e58d5784..53594c8f8948 100644 --- a/packages/insomnia/src/entry.main.ts +++ b/packages/insomnia/src/entry.main.ts @@ -7,12 +7,12 @@ import electron, { app, BrowserWindow, session } from 'electron'; import contextMenu from 'electron-context-menu'; import installExtension, { REACT_DEVELOPER_TOOLS } from 'electron-devtools-installer'; import { configureFetch } from 'insomnia-api'; +import type { Project, RemoteProject, Stats } from 'insomnia-data'; +import { database, initDatabase, initServices, models, services } from 'insomnia-data'; +import { isMac } from 'insomnia-data/common'; +import { servicesNodeImpl } from 'insomnia-data/node'; import { insomniaFetch } from '~/common/insomnia-fetch'; -import type { Project, RemoteProject, Stats } from '~/insomnia-data'; -import { database, initDatabase, initServices, models, services } from '~/insomnia-data'; -import { isMac } from '~/insomnia-data/common'; -import { servicesNodeImpl } from '~/insomnia-data/node'; import { mainDatabase } from '~/main/database.main'; import { initElectronStorage } from '~/main/electron-storage'; import { runGitCredentialsMigration } from '~/main/git/migrations'; diff --git a/packages/insomnia/src/entry.plugin-window.ts b/packages/insomnia/src/entry.plugin-window.ts index beff5f346534..e1f5e36dd4cf 100644 --- a/packages/insomnia/src/entry.plugin-window.ts +++ b/packages/insomnia/src/entry.plugin-window.ts @@ -1,6 +1,5 @@ import { ipcRenderer } from 'electron'; - -import { initDatabase, initServices } from '~/insomnia-data'; +import { initDatabase, initServices } from 'insomnia-data'; import { pluginWindowDatabase } from './main/database.plugin-window'; import { invokePluginMethod } from './plugins/invoke-method'; diff --git a/packages/insomnia/src/entry.preload.ts b/packages/insomnia/src/entry.preload.ts index fedd4aa8d503..a8f885b5c428 100644 --- a/packages/insomnia/src/entry.preload.ts +++ b/packages/insomnia/src/entry.preload.ts @@ -1,6 +1,6 @@ import { contextBridge, ipcRenderer, webUtils as webUtilities } from 'electron'; +import type { AuthTypeOAuth2, OAuth2Token, RequestHeader } from 'insomnia-data'; -import type { AuthTypeOAuth2, OAuth2Token, RequestHeader } from '~/insomnia-data'; import { invokeWithNormalizedError } from '~/main/ipc/invoke'; import type { LLMBackend, LLMConfig, LLMConfigServiceAPI } from '~/main/llm-config-service'; import type { GenerateMcpSamplingResponseFunction } from '~/plugins/types'; diff --git a/packages/insomnia/src/insomnia-data/README.md b/packages/insomnia/src/insomnia-data/README.md index 4dd576235b26..ae12a9578d67 100644 --- a/packages/insomnia/src/insomnia-data/README.md +++ b/packages/insomnia/src/insomnia-data/README.md @@ -95,9 +95,9 @@ Renderer services path: ### Main ```ts -import { initDatabase, initServices } from '~/insomnia-data'; +import { initDatabase, initServices } from 'insomnia-data'; import { mainDatabase } from '~/main/database.main'; -import { servicesNodeImpl } from '~/insomnia-data/node'; +import { servicesNodeImpl } from 'insomnia-data/node'; await initDatabase(mainDatabase); initServices(servicesNodeImpl); @@ -106,7 +106,7 @@ initServices(servicesNodeImpl); ### Renderer ```ts -import { initDatabase, initServices } from '~/insomnia-data'; +import { initDatabase, initServices } from 'insomnia-data'; import { clientDatabase } from '~/ui/database.client'; await initDatabase(clientDatabase); @@ -116,8 +116,8 @@ initServices(window._dataServices); ### Inso / Node ```ts -import { initDatabase, initServices } from '~/insomnia-data'; -import { createNedbDatabase, servicesNodeImpl } from '~/insomnia-data/node'; +import { initDatabase, initServices } from 'insomnia-data'; +import { createNedbDatabase, servicesNodeImpl } from 'insomnia-data/node'; await initDatabase(createNedbDatabase()); initServices(servicesNodeImpl); @@ -126,7 +126,7 @@ initServices(servicesNodeImpl); ### Consuming ```ts -import { services, models, type Request } from '~/insomnia-data'; +import { services, models, type Request } from 'insomnia-data'; const mcpRequest = await services.mcpRequest.create({ url: 'http://localhost:3000' }); const all = await services.mcpRequest.all(); diff --git a/packages/insomnia/src/insomnia-data/__tests__/git-credentials.test.ts b/packages/insomnia/src/insomnia-data/__tests__/git-credentials.test.ts index c5c7cd1025d9..c04581518e3f 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/git-credentials.test.ts +++ b/packages/insomnia/src/insomnia-data/__tests__/git-credentials.test.ts @@ -1,8 +1,7 @@ +import type { BaseGitCredentialsV2 } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import type { BaseGitCredentialsV2 } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; - const { init, isGitCredentialsV2, supportsRenewal } = models.gitCredentials; describe('init()', () => { diff --git a/packages/insomnia/src/insomnia-data/__tests__/grpc-request-meta.test.ts b/packages/insomnia/src/insomnia-data/__tests__/grpc-request-meta.test.ts index 2dc7638c05cc..aebda768f435 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/grpc-request-meta.test.ts +++ b/packages/insomnia/src/insomnia-data/__tests__/grpc-request-meta.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it, vi } from 'vitest'; -import { models, services } from '~/insomnia-data'; - describe('init()', () => { it('contains all required fields', async () => { expect(models.grpcRequestMeta.init()).toEqual({ diff --git a/packages/insomnia/src/insomnia-data/__tests__/grpc-request.test.ts b/packages/insomnia/src/insomnia-data/__tests__/grpc-request.test.ts index 936412367374..9eeb027d5295 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/grpc-request.test.ts +++ b/packages/insomnia/src/insomnia-data/__tests__/grpc-request.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it, vi } from 'vitest'; -import { models, services } from '~/insomnia-data'; - describe('init()', () => { it('contains all required fields', async () => { Date.now = vi.fn().mockReturnValue(1_478_795_580_200); diff --git a/packages/insomnia/src/insomnia-data/__tests__/index.test.ts b/packages/insomnia/src/insomnia-data/__tests__/index.test.ts index bae99f1748be..061c41c436c2 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/index.test.ts +++ b/packages/insomnia/src/insomnia-data/__tests__/index.test.ts @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; - const { getModel, mustGetModel } = models; describe('index', () => { diff --git a/packages/insomnia/src/insomnia-data/__tests__/proto-file.test.ts b/packages/insomnia/src/insomnia-data/__tests__/proto-file.test.ts index 92177b609ceb..588d9c256d57 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/proto-file.test.ts +++ b/packages/insomnia/src/insomnia-data/__tests__/proto-file.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it, vi } from 'vitest'; -import { models, services } from '~/insomnia-data'; - describe('init()', () => { it('contains all required fields', async () => { expect(models.protoFile.init()).toEqual({ diff --git a/packages/insomnia/src/insomnia-data/__tests__/request-meta.test.ts b/packages/insomnia/src/insomnia-data/__tests__/request-meta.test.ts index c765422b59c4..8f9fdb9f2f57 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/request-meta.test.ts +++ b/packages/insomnia/src/insomnia-data/__tests__/request-meta.test.ts @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { services } from '~/insomnia-data'; - describe('create()', () => { it('fails when missing parentId', async () => { expect(() => diff --git a/packages/insomnia/src/insomnia-data/__tests__/request.test.ts b/packages/insomnia/src/insomnia-data/__tests__/request.test.ts index c641d1606933..650f9621a3f5 100644 --- a/packages/insomnia/src/insomnia-data/__tests__/request.test.ts +++ b/packages/insomnia/src/insomnia-data/__tests__/request.test.ts @@ -5,9 +5,6 @@ * we added comments to in request.ts, ensuring they work correctly. */ -import { v4 as uuidv4 } from 'uuid'; -import { beforeEach, describe, expect, it } from 'vitest'; - import type { AuthTypeAPIKey, AuthTypeAsap, @@ -24,8 +21,10 @@ import type { RequestBody, RequestHeader, RequestParameter, -} from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { services } from 'insomnia-data'; +import { v4 as uuidv4 } from 'uuid'; +import { beforeEach, describe, expect, it } from 'vitest'; // @vitest-environment jsdom describe('Request Model - Comprehensive Tests', () => { diff --git a/packages/insomnia/src/insomnia-data/node-src/database/database-nedb.ts b/packages/insomnia/src/insomnia-data/node-src/database/database-nedb.ts index a5808708dd20..2dc5581f877c 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/database-nedb.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/database-nedb.ts @@ -5,7 +5,6 @@ import os from 'node:os'; import fsPath from 'node:path'; import NeDB from '@seald-io/nedb'; - import type { AllTypes, ApiSpec, @@ -25,9 +24,9 @@ import type { Query, Workspace, WorkspaceMeta, -} from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { generateId } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { generateId } from 'insomnia-data/common'; import { initModel } from './init-model'; import { repairDatabase } from './repair-database'; diff --git a/packages/insomnia/src/insomnia-data/node-src/database/database.test.ts b/packages/insomnia/src/insomnia-data/node-src/database/database.test.ts index 828d6113e86f..56cf543488e5 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/database.test.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/database.test.ts @@ -1,9 +1,8 @@ // @ts-nocheck +import type { BaseModel } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { afterEach, assert, beforeEach, describe, expect, it, vi } from 'vitest'; -import type { BaseModel } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; - import type { ChangeBufferEvent } from '../..'; import { database as db } from '../..'; import * as workspaceInitModel from './init-model/workspace'; diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/cookie-jar.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/cookie-jar.ts index 612b08507988..3b30ebce7abb 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/cookie-jar.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/cookie-jar.ts @@ -1,7 +1,6 @@ +import type { CookieJar } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; -import type { CookieJar } from '~/insomnia-data'; - /** Ensure every cookie has an ID property */ function migrateCookieId(cookieJar: CookieJar) { for (const cookie of cookieJar.cookies) { diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/index.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/index.ts index f9718973be86..8d5ab6c6aa43 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/index.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/index.ts @@ -1,6 +1,6 @@ -import type { AllTypes, BaseModel } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { generateId, typedKeys } from '~/insomnia-data/common'; +import type { AllTypes, BaseModel } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { generateId, typedKeys } from 'insomnia-data/common'; import { migrate as migrateCookieJar } from './cookie-jar'; import { migrate as migrateRequest } from './request'; diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/request.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/request.ts index 33a5e7fac0b2..caf21e9d09d9 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/request.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/request.ts @@ -1,9 +1,9 @@ -import type { Request } from '~/insomnia-data'; +import type { Request } from 'insomnia-data'; import { CONTENT_TYPE_FORM_URLENCODED, deconstructQueryStringToParams, getContentTypeFromHeaders, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; export function migrate(doc: Request): Request { try { diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.test.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.test.ts index bbd1234428b3..2a8c864d02d2 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.test.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.test.ts @@ -3,11 +3,10 @@ import { tmpdir } from 'node:os'; import path from 'node:path'; import zlib from 'node:zlib'; +import type { Response } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import type { Response } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; - import { initModel } from './index'; describe('migrate()', () => { diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.ts index 7c14b5c73651..16da7f72d9ff 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/response.ts @@ -1,4 +1,4 @@ -import type { Response } from '~/insomnia-data'; +import type { Response } from 'insomnia-data'; export function migrate(doc: Response) { try { diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/settings.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/settings.ts index 9e51c9e0cd85..f5a6735b1e2a 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/settings.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/settings.ts @@ -1,6 +1,6 @@ -import type { Settings } from '~/insomnia-data'; -import type { KeyboardShortcut } from '~/insomnia-data/common'; -import { newDefaultRegistry } from '~/insomnia-data/common'; +import type { Settings } from 'insomnia-data'; +import type { KeyboardShortcut } from 'insomnia-data/common'; +import { newDefaultRegistry } from 'insomnia-data/common'; export function migrate(doc: Settings) { try { diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.test.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.test.ts index 6fa141a01685..2df5bbab6559 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.test.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models, services } from '~/insomnia-data'; - import { migrate as migrateWorkspace } from './workspace'; describe('migrate()', () => { diff --git a/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.ts b/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.ts index 96fb8fe0f023..b84d2427733c 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/init-model/workspace.ts @@ -1,8 +1,7 @@ +import type { Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; import type { Merge } from 'type-fest'; -import type { Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import * as clientCertificateService from '../../services/client-certificate'; const { WorkspaceScopeKeys } = models.workspace; diff --git a/packages/insomnia/src/insomnia-data/node-src/database/repair-database.ts b/packages/insomnia/src/insomnia-data/node-src/database/repair-database.ts index 053f85f1ff15..483d04d04070 100644 --- a/packages/insomnia/src/insomnia-data/node-src/database/repair-database.ts +++ b/packages/insomnia/src/insomnia-data/node-src/database/repair-database.ts @@ -1,5 +1,5 @@ -import type { CookieJar, Environment, GitRepository, Workspace } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; +import type { CookieJar, Environment, GitRepository, Workspace } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; import * as apiSpecServices from '../services/api-spec'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/api-spec.ts b/packages/insomnia/src/insomnia-data/node-src/services/api-spec.ts index fd57698c2713..0b8ab6eb3ce8 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/api-spec.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/api-spec.ts @@ -1,5 +1,5 @@ -import type { ApiSpec } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { ApiSpec } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.apiSpec; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/ca-certificate.ts b/packages/insomnia/src/insomnia-data/node-src/services/ca-certificate.ts index 6926962a1d1f..caaa019713d0 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/ca-certificate.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/ca-certificate.ts @@ -1,5 +1,5 @@ -import type { CaCertificate } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { CaCertificate } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.caCertificate; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/client-certificate.ts b/packages/insomnia/src/insomnia-data/node-src/services/client-certificate.ts index 67c8aba0d0f9..993cf1121c65 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/client-certificate.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/client-certificate.ts @@ -1,5 +1,5 @@ -import type { ClientCertificate } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { ClientCertificate } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.clientCertificate; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/cloud-credential.ts b/packages/insomnia/src/insomnia-data/node-src/services/cloud-credential.ts index 6d0a83c0b48c..1440a2456ea2 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/cloud-credential.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/cloud-credential.ts @@ -1,5 +1,5 @@ -import type { CloudProviderCredential, CloudProviderName } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { CloudProviderCredential, CloudProviderName } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.cloudCredential; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/cookie-jar.ts b/packages/insomnia/src/insomnia-data/node-src/services/cookie-jar.ts index 1c462e9326ae..8a5621e6f52d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/cookie-jar.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/cookie-jar.ts @@ -1,7 +1,7 @@ import * as crypto from 'node:crypto'; -import type { CookieJar } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { CookieJar } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type, prefix } = models.cookieJar; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/environment.ts b/packages/insomnia/src/insomnia-data/node-src/services/environment.ts index cdbd356aadbc..de90d71d85e0 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/environment.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/environment.ts @@ -1,7 +1,7 @@ import * as crypto from 'node:crypto'; -import type { Environment, Project, Workspace } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { Environment, Project, Workspace } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type, prefix, vaultEnvironmentPath } = models.environment; const { EnvironmentKvPairDataType, EnvironmentType } = models.environment; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/git-credentials.ts b/packages/insomnia/src/insomnia-data/node-src/services/git-credentials.ts index 752e6001ce25..752fe2c80421 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/git-credentials.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/git-credentials.ts @@ -1,5 +1,5 @@ -import type { BaseGitCredentialsV2, GitCredentials, GitCredentialsV2 } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { BaseGitCredentialsV2, GitCredentials, GitCredentialsV2 } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.gitCredentials; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/git-repository.ts b/packages/insomnia/src/insomnia-data/node-src/services/git-repository.ts index 03ea0523b010..a6220944e4b1 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/git-repository.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/git-repository.ts @@ -1,5 +1,5 @@ -import type { GitRepository } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { GitRepository } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const type = models.gitRepository.type; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request-meta.ts b/packages/insomnia/src/insomnia-data/node-src/services/grpc-request-meta.ts index 9a97eab7e399..50e33eaf788d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request-meta.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/grpc-request-meta.ts @@ -1,5 +1,5 @@ -import type { GrpcRequestMeta } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { GrpcRequestMeta } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.grpcRequestMeta; const { isGrpcRequestId } = models.grpcRequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request.ts b/packages/insomnia/src/insomnia-data/node-src/services/grpc-request.ts index 74d5aa16e2b5..1aa17f3b1dc0 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/grpc-request.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/grpc-request.ts @@ -1,5 +1,5 @@ -import type { GrpcRequest } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { GrpcRequest } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type, name } = models.grpcRequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.test.ts b/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.test.ts index 78cada9c4a0d..13a6f22feade 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.test.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.test.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models, services } from '~/insomnia-data'; - import { queryAllWorkspaceUrls } from './query-all-workspace-urls'; describe('queryAllWorkspaceUrls', () => { diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts b/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts index b7a38746bcce..c8eee716dc8c 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/helpers/query-all-workspace-urls.ts @@ -1,6 +1,6 @@ -import type { GrpcRequest, models, Request } from '~/insomnia-data'; -import { database as db } from '~/insomnia-data'; -import { invariant } from '~/insomnia-data/common'; +import type { GrpcRequest, models, Request } from 'insomnia-data'; +import { database as db } from 'insomnia-data'; +import { invariant } from 'insomnia-data/common'; import * as workspaceService from '../workspace'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/request-operations.ts b/packages/insomnia/src/insomnia-data/node-src/services/helpers/request-operations.ts index 6b901a6ff0d8..f3dfeabff771 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/request-operations.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/helpers/request-operations.ts @@ -1,5 +1,5 @@ -import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from 'insomnia-data'; +import { models } from 'insomnia-data'; import * as grpcRequestService from '../grpc-request'; import * as mcpRequestService from '../mcp-request'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/helpers/response-operations.ts b/packages/insomnia/src/insomnia-data/node-src/services/helpers/response-operations.ts index a14903862b2d..4dc862e62512 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/helpers/response-operations.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/helpers/response-operations.ts @@ -8,9 +8,9 @@ import type { ResponseTimelineEntry, SocketIOResponse, WebSocketResponse, -} from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; -import { deserializeNDJSON } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; +import { deserializeNDJSON } from 'insomnia-data/common'; import * as settingsService from '../settings'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mcp-payload.ts b/packages/insomnia/src/insomnia-data/node-src/services/mcp-payload.ts index ed2ef3b0f8e6..cd6cc9ddb501 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mcp-payload.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/mcp-payload.ts @@ -1,5 +1,5 @@ -import type { McpPayload } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; +import type { McpPayload } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; const { type, name } = models.mcpPayload; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mcp-request.ts b/packages/insomnia/src/insomnia-data/node-src/services/mcp-request.ts index 44c663fad022..89e526575859 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mcp-request.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/mcp-request.ts @@ -1,6 +1,6 @@ -import type { McpRequest } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; -import { invariant } from '~/insomnia-data/common'; +import type { McpRequest } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; +import { invariant } from 'insomnia-data/common'; const { type } = models.mcpRequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mcp-response.ts b/packages/insomnia/src/insomnia-data/node-src/services/mcp-response.ts index 7313dd29cfd1..929ce9a8a88d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mcp-response.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/mcp-response.ts @@ -1,5 +1,5 @@ -import type { McpResponse } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { McpResponse } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; import * as requestHelpers from './helpers/request-operations'; import * as requestVersionService from './request-version'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mock-route.ts b/packages/insomnia/src/insomnia-data/node-src/services/mock-route.ts index 2a78bd7fded0..8004d41b058d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mock-route.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/mock-route.ts @@ -1,5 +1,5 @@ -import type { MockRoute } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { MockRoute } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.mockRoute; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/mock-server.ts b/packages/insomnia/src/insomnia-data/node-src/services/mock-server.ts index 15fcc4cfb978..f46f4e3d3578 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/mock-server.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/mock-server.ts @@ -1,5 +1,5 @@ -import type { MockServer } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { MockServer } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; import * as workspace from './workspace'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/o-auth-2-token.ts b/packages/insomnia/src/insomnia-data/node-src/services/o-auth-2-token.ts index df0220ad12e7..0e585dabbfe3 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/o-auth-2-token.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/o-auth-2-token.ts @@ -1,5 +1,5 @@ -import type { OAuth2Token } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { OAuth2Token } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.oAuth2Token; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/organization.ts b/packages/insomnia/src/insomnia-data/node-src/services/organization.ts index 48141388db19..a29ae76a6b64 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/organization.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/organization.ts @@ -1,6 +1,5 @@ import { getOrganizations, type Organization } from 'insomnia-api'; - -import { models } from '~/insomnia-data'; +import { models } from 'insomnia-data'; import * as userSessionService from './user-session'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/plugin-data.ts b/packages/insomnia/src/insomnia-data/node-src/services/plugin-data.ts index 0e8e53e16382..840bab188784 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/plugin-data.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/plugin-data.ts @@ -1,5 +1,5 @@ -import type { PluginData } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { PluginData } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.pluginData; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/project-lint-ruleset.ts b/packages/insomnia/src/insomnia-data/node-src/services/project-lint-ruleset.ts index 7e187c08901b..390427525ce1 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/project-lint-ruleset.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/project-lint-ruleset.ts @@ -1,5 +1,5 @@ -import type { ProjectLintRuleset } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { ProjectLintRuleset } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.projectLintRuleset; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/project.ts b/packages/insomnia/src/insomnia-data/node-src/services/project.ts index a6ca41a3b5b2..da937a5eec58 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/project.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/project.ts @@ -1,5 +1,5 @@ -import type { Project, Query } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { Project, Query } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.project; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/proto-directory.ts b/packages/insomnia/src/insomnia-data/node-src/services/proto-directory.ts index 05aa9489b5d2..6e4ba164e0c5 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/proto-directory.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/proto-directory.ts @@ -1,5 +1,5 @@ -import type { ProtoDirectory } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { ProtoDirectory } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.protoDirectory; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/proto-file.ts b/packages/insomnia/src/insomnia-data/node-src/services/proto-file.ts index 7791603c73e1..6c6c5921800a 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/proto-file.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/proto-file.ts @@ -1,5 +1,5 @@ -import type { ProtoFile } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { ProtoFile } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.protoFile; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-group-meta.ts b/packages/insomnia/src/insomnia-data/node-src/services/request-group-meta.ts index 65399dba8ca5..dfe759cd73e1 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-group-meta.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/request-group-meta.ts @@ -1,5 +1,5 @@ -import type { RequestGroupMeta } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { RequestGroupMeta } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.requestGroupMeta; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-group.ts b/packages/insomnia/src/insomnia-data/node-src/services/request-group.ts index 9923ddd7156d..cfc010634690 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-group.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/request-group.ts @@ -1,5 +1,5 @@ -import type { RequestGroup } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { RequestGroup } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.requestGroup; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-meta.ts b/packages/insomnia/src/insomnia-data/node-src/services/request-meta.ts index 2dc2f8a0bab6..514ba8ced6e1 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-meta.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/request-meta.ts @@ -1,5 +1,5 @@ -import type { RequestMeta } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { RequestMeta } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.requestMeta; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request-version.ts b/packages/insomnia/src/insomnia-data/node-src/services/request-version.ts index ed5be128ab3c..464da4f1be8b 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request-version.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/request-version.ts @@ -2,7 +2,6 @@ import { promisify } from 'node:util'; import zlib from 'node:zlib'; import deepEqual from 'deep-equal'; - import type { GrpcRequest, McpRequest, @@ -10,8 +9,8 @@ import type { RequestVersion, SocketIORequest, WebSocketRequest, -} from '~/insomnia-data'; -import { database, database as db, models } from '~/insomnia-data'; +} from 'insomnia-data'; +import { database, database as db, models } from 'insomnia-data'; import * as requestHelpers from './helpers/request-operations'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/request.ts b/packages/insomnia/src/insomnia-data/node-src/services/request.ts index 7dc69d05e0e4..5a423afaea81 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/request.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/request.ts @@ -1,5 +1,5 @@ -import type { Request } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { Request } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type, name } = models.request; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/response.ts b/packages/insomnia/src/insomnia-data/node-src/services/response.ts index 129f434afaf4..0be8568c34ab 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/response.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/response.ts @@ -1,5 +1,5 @@ -import type { Response } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { Response } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; import * as requestHelpers from './helpers/request-operations'; import * as requestVersionService from './request-version'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/runner-test-result.ts b/packages/insomnia/src/insomnia-data/node-src/services/runner-test-result.ts index 0fa76689b5ad..9f8507ede7be 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/runner-test-result.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/runner-test-result.ts @@ -1,5 +1,5 @@ -import type { RunnerTestResult } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { RunnerTestResult } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.runnerTestResult; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/settings.ts b/packages/insomnia/src/insomnia-data/node-src/services/settings.ts index 8cf623e8a223..9cbb1f58142f 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/settings.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/settings.ts @@ -1,5 +1,5 @@ -import type { Settings } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { Settings } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; export async function all() { let settingsList = await db.find(models.settings.type); diff --git a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-payload.ts b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-payload.ts index 64634e3df3d0..74ca8df53058 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-payload.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-payload.ts @@ -1,5 +1,5 @@ -import type { SocketIOPayload } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; +import type { SocketIOPayload } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; const { type, name } = models.socketIOPayload; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request-meta.ts b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request-meta.ts index cd01953ff1e4..323bd50fe91b 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request-meta.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request-meta.ts @@ -1,5 +1,5 @@ -import type { SocketIORequestMeta } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { SocketIORequestMeta } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.socketIORequestMeta; const { isSocketIORequestId } = models.socketIORequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request.ts b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request.ts index d24fcc338b9f..53545a609f1d 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-request.ts @@ -1,5 +1,5 @@ -import type { SocketIORequest } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; +import type { SocketIORequest } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; const { type, name } = models.socketIORequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-response.ts b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-response.ts index 03ee4218f3b6..7d0416182ef1 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/socket-io-response.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/socket-io-response.ts @@ -1,5 +1,5 @@ -import type { SocketIOResponse } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { SocketIOResponse } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; import * as requestHelpers from './helpers/request-operations'; import * as requestVersionService from './request-version'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/stats.ts b/packages/insomnia/src/insomnia-data/node-src/services/stats.ts index 8fce73c1f5ff..6f47981fc09a 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/stats.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/stats.ts @@ -1,5 +1,5 @@ -import type { Project, RequestGroup, Stats, Workspace } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { Project, RequestGroup, Stats, Workspace } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.stats; const { isRequest } = models.request; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-result.ts b/packages/insomnia/src/insomnia-data/node-src/services/unit-test-result.ts index ea483d8ad79e..72ae7c4cac59 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-result.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/unit-test-result.ts @@ -1,5 +1,5 @@ -import type { UnitTestResult } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { UnitTestResult } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.unitTestResult; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-suite.ts b/packages/insomnia/src/insomnia-data/node-src/services/unit-test-suite.ts index 223b41fe2359..b9d97c0d3dfe 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/unit-test-suite.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/unit-test-suite.ts @@ -1,5 +1,5 @@ -import type { UnitTestSuite } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { UnitTestSuite } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.unitTestSuite; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/unit-test.ts b/packages/insomnia/src/insomnia-data/node-src/services/unit-test.ts index c6a48b206364..13b2334d1a2f 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/unit-test.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/unit-test.ts @@ -1,5 +1,5 @@ -import type { UnitTest } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { UnitTest } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.unitTest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts b/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts index 7d44e8e70245..6df0ec1d9e37 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/user-session.ts @@ -1,5 +1,5 @@ -import type { UserSession } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { UserSession } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.userSession; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/websocket-payload.ts b/packages/insomnia/src/insomnia-data/node-src/services/websocket-payload.ts index c595942f9b62..c0b501f5ca44 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/websocket-payload.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/websocket-payload.ts @@ -1,5 +1,5 @@ -import type { WebSocketPayload } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; +import type { WebSocketPayload } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; const { type, name } = models.webSocketPayload; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/websocket-request-meta.ts b/packages/insomnia/src/insomnia-data/node-src/services/websocket-request-meta.ts index 02fc170c8cd4..26cbe8ae0bc9 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/websocket-request-meta.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/websocket-request-meta.ts @@ -1,5 +1,5 @@ -import type { WebSocketRequestMeta } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { WebSocketRequestMeta } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.webSocketRequestMeta; const { isWebSocketRequestId } = models.webSocketRequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/websocket-request.ts b/packages/insomnia/src/insomnia-data/node-src/services/websocket-request.ts index 6e74f58351b7..fd95e3c8594f 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/websocket-request.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/websocket-request.ts @@ -1,5 +1,5 @@ -import type { WebSocketRequest } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; +import type { WebSocketRequest } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; const { type, name } = models.webSocketRequest; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/websocket-response.ts b/packages/insomnia/src/insomnia-data/node-src/services/websocket-response.ts index 58208b85523a..1245ed403da9 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/websocket-response.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/websocket-response.ts @@ -1,5 +1,5 @@ -import type { WebSocketResponse } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { WebSocketResponse } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; import * as requestHelpers from './helpers/request-operations'; import * as requestVersionService from './request-version'; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/workspace-meta.ts b/packages/insomnia/src/insomnia-data/node-src/services/workspace-meta.ts index 636abc3760aa..218ceeb772fa 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/workspace-meta.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/workspace-meta.ts @@ -1,5 +1,5 @@ -import type { WorkspaceMeta } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { WorkspaceMeta } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.workspaceMeta; diff --git a/packages/insomnia/src/insomnia-data/node-src/services/workspace.ts b/packages/insomnia/src/insomnia-data/node-src/services/workspace.ts index 638d9bd858d7..4552bb0b52d7 100644 --- a/packages/insomnia/src/insomnia-data/node-src/services/workspace.ts +++ b/packages/insomnia/src/insomnia-data/node-src/services/workspace.ts @@ -1,5 +1,5 @@ -import type { Workspace } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { Workspace } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; const { type } = models.workspace; diff --git a/packages/insomnia/src/insomnia-data/src/database/index.ts b/packages/insomnia/src/insomnia-data/src/database/index.ts index f8b60cb877a5..a3fa72c6c54a 100644 --- a/packages/insomnia/src/insomnia-data/src/database/index.ts +++ b/packages/insomnia/src/insomnia-data/src/database/index.ts @@ -24,7 +24,7 @@ export async function initDatabase(impl: IDatabase, config?: NeDB.DataStoreOptio * This is a getter that returns the initialized database instance. * * Usage: - * - Import: `import { database } from '~/insomnia-data';` + * - Import: `import { database } from 'insomnia-data';` * - Call methods directly: `await database.find(type, query);` */ export let database: IDatabase = new Proxy({} as IDatabase, { diff --git a/packages/insomnia/src/insomnia-data/src/models/api-spec.ts b/packages/insomnia/src/insomnia-data/src/models/api-spec.ts index 144613fa8143..ce0ff9b84df9 100644 --- a/packages/insomnia/src/insomnia-data/src/models/api-spec.ts +++ b/packages/insomnia/src/insomnia-data/src/models/api-spec.ts @@ -1,4 +1,4 @@ -import { strings } from '~/insomnia-data/common'; +import { strings } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/index.test.ts b/packages/insomnia/src/insomnia-data/src/models/index.test.ts index 9a5fa30d0d38..47c46b28f287 100644 --- a/packages/insomnia/src/insomnia-data/src/models/index.test.ts +++ b/packages/insomnia/src/insomnia-data/src/models/index.test.ts @@ -1,7 +1,6 @@ +import { generateId } from 'insomnia-data/common'; import { describe, expect, it } from 'vitest'; -import { generateId } from '~/insomnia-data/common'; - import * as models from './'; import type { AllTypes } from './types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/project.test.ts b/packages/insomnia/src/insomnia-data/src/models/project.test.ts index 91d505ce9c14..57ad0e7ca87b 100644 --- a/packages/insomnia/src/insomnia-data/src/models/project.test.ts +++ b/packages/insomnia/src/insomnia-data/src/models/project.test.ts @@ -1,7 +1,6 @@ +import { models, type Project } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models, type Project } from '~/insomnia-data'; - const defaultOrgProject = { name: 'a', remoteId: 'proj_team_123456789345678987654', _id: 'not important' }; const remoteA = { name: 'a', remoteId: 'notNull', _id: 'remoteA' }; diff --git a/packages/insomnia/src/insomnia-data/src/models/project.ts b/packages/insomnia/src/insomnia-data/src/models/project.ts index 5a123c5c1987..fd8502544686 100644 --- a/packages/insomnia/src/insomnia-data/src/models/project.ts +++ b/packages/insomnia/src/insomnia-data/src/models/project.ts @@ -1,6 +1,5 @@ import type { StorageRules } from 'insomnia-api'; - -import { generateId } from '~/insomnia-data/common'; +import { generateId } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/proto-directory.ts b/packages/insomnia/src/insomnia-data/src/models/proto-directory.ts index d7585b393b5e..2024f003cc49 100644 --- a/packages/insomnia/src/insomnia-data/src/models/proto-directory.ts +++ b/packages/insomnia/src/insomnia-data/src/models/proto-directory.ts @@ -1,4 +1,4 @@ -import { generateId } from '~/insomnia-data/common'; +import { generateId } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/request-meta.ts b/packages/insomnia/src/insomnia-data/src/models/request-meta.ts index cc2a10ebe4ee..c5ba0e60c6f8 100644 --- a/packages/insomnia/src/insomnia-data/src/models/request-meta.ts +++ b/packages/insomnia/src/insomnia-data/src/models/request-meta.ts @@ -1,4 +1,4 @@ -import { PREVIEW_MODE_FRIENDLY, type PreviewMode } from '~/insomnia-data/common'; +import { PREVIEW_MODE_FRIENDLY, type PreviewMode } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/request.ts b/packages/insomnia/src/insomnia-data/src/models/request.ts index ce965cda0d86..d18647817f23 100644 --- a/packages/insomnia/src/insomnia-data/src/models/request.ts +++ b/packages/insomnia/src/insomnia-data/src/models/request.ts @@ -14,9 +14,8 @@ */ import { getOperationAST, OperationTypeNode, parse } from 'graphql'; - -import type { OAuth1SignatureMethod } from '~/insomnia-data/common'; -import { CONTENT_TYPE_GRAPHQL, METHOD_GET } from '~/insomnia-data/common'; +import type { OAuth1SignatureMethod } from 'insomnia-data/common'; +import { CONTENT_TYPE_GRAPHQL, METHOD_GET } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; import { replaceIdsInFields } from './utils/replace-ids-in-fields'; diff --git a/packages/insomnia/src/insomnia-data/src/models/settings.ts b/packages/insomnia/src/insomnia-data/src/models/settings.ts index 706a0eee084c..d36be6ac3e25 100644 --- a/packages/insomnia/src/insomnia-data/src/models/settings.ts +++ b/packages/insomnia/src/insomnia-data/src/models/settings.ts @@ -6,7 +6,7 @@ import { newDefaultRegistry, type Settings as BaseSettings, UpdateChannel, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/insomnia-data/src/models/socket-io-payload.ts b/packages/insomnia/src/insomnia-data/src/models/socket-io-payload.ts index 99ca1ed0196c..afb185607eea 100644 --- a/packages/insomnia/src/insomnia-data/src/models/socket-io-payload.ts +++ b/packages/insomnia/src/insomnia-data/src/models/socket-io-payload.ts @@ -1,7 +1,6 @@ +import { CONTENT_TYPE_JSON } from 'insomnia-data/common'; import { v4 as uuidv4 } from 'uuid'; -import { CONTENT_TYPE_JSON } from '~/insomnia-data/common'; - import type { BaseModel } from './base-types'; import { replaceIdsInFields } from './utils/replace-ids-in-fields'; diff --git a/packages/insomnia/src/insomnia-data/src/models/workspace.ts b/packages/insomnia/src/insomnia-data/src/models/workspace.ts index 2980bac812aa..0223f374a54d 100644 --- a/packages/insomnia/src/insomnia-data/src/models/workspace.ts +++ b/packages/insomnia/src/insomnia-data/src/models/workspace.ts @@ -1,4 +1,4 @@ -import { strings } from '~/insomnia-data/common'; +import { strings } from 'insomnia-data/common'; import type { BaseModel } from './base-types'; diff --git a/packages/insomnia/src/konnect/__tests__/sync.test.ts b/packages/insomnia/src/konnect/__tests__/sync.test.ts index be19982fa00d..3ae1f98845fb 100644 --- a/packages/insomnia/src/konnect/__tests__/sync.test.ts +++ b/packages/insomnia/src/konnect/__tests__/sync.test.ts @@ -5,10 +5,9 @@ * window.main is stubbed globally so trackAnalyticsEvent calls don't throw. */ +import { initDatabase, models, services as insoservices } from 'insomnia-data'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { initDatabase, models, services as insoservices } from '~/insomnia-data'; - import { resetV4Counter } from '../../__mocks__/uuid'; import { database as db } from '../../common/database'; import { mainDatabase } from '../../main/database.main'; diff --git a/packages/insomnia/src/konnect/sync.ts b/packages/insomnia/src/konnect/sync.ts index 0e3a21f463d8..757b61863048 100644 --- a/packages/insomnia/src/konnect/sync.ts +++ b/packages/insomnia/src/konnect/sync.ts @@ -1,5 +1,5 @@ -import type { GrpcRequest, Project, Request, RequestGroup, WebSocketRequest, Workspace } from '~/insomnia-data'; -import { EnvironmentKvPairDataType, models, services as insoservices } from '~/insomnia-data'; +import type { GrpcRequest, Project, Request, RequestGroup, WebSocketRequest, Workspace } from 'insomnia-data'; +import { EnvironmentKvPairDataType, models, services as insoservices } from 'insomnia-data'; import { database as db } from '../common/database'; import { diff --git a/packages/insomnia/src/main/__tests__/llm-config-service.test.ts b/packages/insomnia/src/main/__tests__/llm-config-service.test.ts index 5683cd0eb129..8c7bc1017a45 100644 --- a/packages/insomnia/src/main/__tests__/llm-config-service.test.ts +++ b/packages/insomnia/src/main/__tests__/llm-config-service.test.ts @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { clearActiveBackend, getActiveBackend, @@ -11,7 +10,7 @@ import { updateBackendConfig, } from '../llm-config-service'; -vi.mock('~/insomnia-data', async () => { +vi.mock('insomnia-data', async () => { return { services: { pluginData: { diff --git a/packages/insomnia/src/main/__tests__/sync-initialization.test.ts b/packages/insomnia/src/main/__tests__/sync-initialization.test.ts index 477a57a8db42..56c4548616ae 100644 --- a/packages/insomnia/src/main/__tests__/sync-initialization.test.ts +++ b/packages/insomnia/src/main/__tests__/sync-initialization.test.ts @@ -1,7 +1,7 @@ +import { models, services } from 'insomnia-data'; import { beforeEach, describe, expect, it, vi } from 'vitest'; import { fetchAndCacheOrganizationStorageRule } from '~/common/organization-storage-rules'; -import { models, services } from '~/insomnia-data'; import { getMainVCS } from '~/main/cloud-sync/vcs'; import { initializeLocalBackendProjectAndMarkForSync, @@ -14,7 +14,7 @@ vi.mock('~/common/organization-storage-rules', () => ({ fetchAndCacheOrganizationStorageRule: vi.fn(), })); -vi.mock('~/insomnia-data', () => ({ +vi.mock('insomnia-data', () => ({ services: { workspace: { getById: vi.fn(), diff --git a/packages/insomnia/src/main/analytics.ts b/packages/insomnia/src/main/analytics.ts index dd71185315d9..a5e898ad7f55 100644 --- a/packages/insomnia/src/main/analytics.ts +++ b/packages/insomnia/src/main/analytics.ts @@ -3,10 +3,9 @@ import crypto from 'node:crypto'; import * as Sentry from '@sentry/electron/main'; import { net } from 'electron'; import { AnalyticsEvent, InsomniaAnalytics } from 'insomnia-analytics'; +import { services } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; -import { services } from '~/insomnia-data'; - import { getApiBaseURL, getAppVersion, diff --git a/packages/insomnia/src/main/api.protocol.ts b/packages/insomnia/src/main/api.protocol.ts index 42155c07fd5c..21d2510d75ab 100644 --- a/packages/insomnia/src/main/api.protocol.ts +++ b/packages/insomnia/src/main/api.protocol.ts @@ -4,8 +4,7 @@ import { parse as urlParse } from 'node:url'; import { Curl, CurlAuth, CurlFeature, CurlProxy, CurlSslOpt, type HeaderInfo } from '@getinsomnia/node-libcurl'; import { app, net, protocol, session } from 'electron'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { getApiBaseURL } from '../common/constants'; import { setDefaultProtocol } from './network/libcurl-promise'; diff --git a/packages/insomnia/src/main/authorize-user-in-window.ts b/packages/insomnia/src/main/authorize-user-in-window.ts index 9b4b72152090..9d4bfaf1a240 100644 --- a/packages/insomnia/src/main/authorize-user-in-window.ts +++ b/packages/insomnia/src/main/authorize-user-in-window.ts @@ -1,6 +1,5 @@ import { BrowserWindow, dialog } from 'electron'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; export enum ChromiumVerificationResult { BLIND_TRUST = 0, diff --git a/packages/insomnia/src/main/backup.ts b/packages/insomnia/src/main/backup.ts index 404bdb7a8331..222cd352d0b7 100644 --- a/packages/insomnia/src/main/backup.ts +++ b/packages/insomnia/src/main/backup.ts @@ -2,8 +2,8 @@ import { copyFile, mkdir, readdir } from 'node:fs/promises'; import path from 'node:path'; import electron from 'electron'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { getUpdateUrl } from '~/main/updates'; import { version } from '../../package.json'; diff --git a/packages/insomnia/src/main/cloud-sync/core/store/drivers/graceful-rename.ts b/packages/insomnia/src/main/cloud-sync/core/store/drivers/graceful-rename.ts index 218dd2256e7e..08b4652495ab 100644 --- a/packages/insomnia/src/main/cloud-sync/core/store/drivers/graceful-rename.ts +++ b/packages/insomnia/src/main/cloud-sync/core/store/drivers/graceful-rename.ts @@ -1,6 +1,6 @@ import fs from 'node:fs/promises'; -import { isWindows } from '~/insomnia-data/common'; +import { isWindows } from 'insomnia-data/common'; // Based on node-graceful-fs and vs-code's take on renaming files in a way that is more resilient to Windows locking renames // https://github.com/microsoft/vscode/pull/188899/files#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7R529 // On Windows, A/V software can lock the directory, causing this diff --git a/packages/insomnia/src/main/cloud-sync/core/util.ts b/packages/insomnia/src/main/cloud-sync/core/util.ts index 608af39358a2..072b54217782 100644 --- a/packages/insomnia/src/main/cloud-sync/core/util.ts +++ b/packages/insomnia/src/main/cloud-sync/core/util.ts @@ -1,8 +1,7 @@ import crypto from 'node:crypto'; import clone from 'clone'; - -import type { BaseModel } from '~/insomnia-data'; +import type { BaseModel } from 'insomnia-data'; import { deleteKeys, resetKeys } from '../../../sync/ignore-keys'; import { deterministicStringify } from '../../../sync/lib/deterministic-stringify'; diff --git a/packages/insomnia/src/main/cloud-sync/core/vcs.ts b/packages/insomnia/src/main/cloud-sync/core/vcs.ts index 92c9dc722b14..49a43f83a9a4 100644 --- a/packages/insomnia/src/main/cloud-sync/core/vcs.ts +++ b/packages/insomnia/src/main/cloud-sync/core/vcs.ts @@ -6,9 +6,9 @@ import path from 'node:path'; import clone from 'clone'; import { runVcsGraphQL } from 'insomnia-api'; +import type { BaseModel } from 'insomnia-data'; import { PLAYWRIGHT_TEST } from '~/common/constants'; -import type { BaseModel } from '~/insomnia-data'; import * as crypt from '../../../account/crypt'; import * as session from '../../../account/session'; diff --git a/packages/insomnia/src/main/cloud-sync/initialization.ts b/packages/insomnia/src/main/cloud-sync/initialization.ts index 19d341ef9810..6cdb21e651b1 100644 --- a/packages/insomnia/src/main/cloud-sync/initialization.ts +++ b/packages/insomnia/src/main/cloud-sync/initialization.ts @@ -1,5 +1,6 @@ +import { models, services } from 'insomnia-data'; + import { fetchAndCacheOrganizationStorageRule } from '~/common/organization-storage-rules'; -import { models, services } from '~/insomnia-data'; import { getMainVCS } from '~/main/cloud-sync/vcs'; import { initializeLocalBackendProjectAndMarkForSync, diff --git a/packages/insomnia/src/main/cloud-sync/pull-backend-project.ts b/packages/insomnia/src/main/cloud-sync/pull-backend-project.ts index c89e941bb77d..4c87bb490791 100644 --- a/packages/insomnia/src/main/cloud-sync/pull-backend-project.ts +++ b/packages/insomnia/src/main/cloud-sync/pull-backend-project.ts @@ -1,5 +1,6 @@ -import type { RemoteProject, Workspace } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; +import type { RemoteProject, Workspace } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; + import type { VCS } from '~/main/cloud-sync/core/vcs'; import { interceptAccessError } from '~/sync/access-error'; import type { BackendProjectWithTeam } from '~/sync/types'; diff --git a/packages/insomnia/src/main/cloud-sync/vcs.ts b/packages/insomnia/src/main/cloud-sync/vcs.ts index beab107ee115..8bf5f2b3a177 100644 --- a/packages/insomnia/src/main/cloud-sync/vcs.ts +++ b/packages/insomnia/src/main/cloud-sync/vcs.ts @@ -2,9 +2,9 @@ import { AsyncLocalStorage } from 'node:async_hooks'; import { randomUUID } from 'node:crypto'; import { app, type WebContents } from 'electron'; +import type { RemoteProject } from 'insomnia-data'; +import { services } from 'insomnia-data'; -import type { RemoteProject } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import type { VCS } from '~/main/cloud-sync/core/vcs'; import { createVCS } from '~/main/cloud-sync/create-vcs'; import { pullBackendProject } from '~/main/cloud-sync/pull-backend-project'; diff --git a/packages/insomnia/src/main/database.main.ts b/packages/insomnia/src/main/database.main.ts index d26925f48503..f532474aae0d 100644 --- a/packages/insomnia/src/main/database.main.ts +++ b/packages/insomnia/src/main/database.main.ts @@ -1,7 +1,6 @@ import electron from 'electron'; - -import type { DataStoreOptions, IDatabase } from '~/insomnia-data'; -import { createNedbDatabase, flushChangesImpl } from '~/insomnia-data/node'; +import type { DataStoreOptions, IDatabase } from 'insomnia-data'; +import { createNedbDatabase, flushChangesImpl } from 'insomnia-data/node'; export const mainDatabase: IDatabase = createNedbDatabase(nedbDatabase => ({ ...nedbDatabase, diff --git a/packages/insomnia/src/main/database.plugin-window.ts b/packages/insomnia/src/main/database.plugin-window.ts index 919199911e00..63758e078693 100644 --- a/packages/insomnia/src/main/database.plugin-window.ts +++ b/packages/insomnia/src/main/database.plugin-window.ts @@ -1,6 +1,5 @@ import { ipcRenderer } from 'electron'; - -import type { IDatabase } from '~/insomnia-data'; +import type { IDatabase } from 'insomnia-data'; // Routes all database calls to the main process via the 'database.invoke' IPC handler // that mainDatabase registers on startup. The plugin window must not open a second diff --git a/packages/insomnia/src/main/git-service.ts b/packages/insomnia/src/main/git-service.ts index 6ab23a27e3db..16d723d719b8 100644 --- a/packages/insomnia/src/main/git-service.ts +++ b/packages/insomnia/src/main/git-service.ts @@ -18,9 +18,6 @@ import path from 'node:path'; import { app } from 'electron/main'; import { fromUrl } from 'hosted-git-info'; -import { Errors, type PromiseFsClient } from 'isomorphic-git'; -import YAML, { parse } from 'yaml'; - import type { BaseModel, GitProject, @@ -29,8 +26,11 @@ import type { Workspace, WorkspaceMeta, WorkspaceScope, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { Errors, type PromiseFsClient } from 'isomorphic-git'; +import YAML, { parse } from 'yaml'; + import { GitVCSOperationErrors } from '~/sync/git/git-vcs-operation-errors'; import { gitRemoteProviderRegistry, diff --git a/packages/insomnia/src/main/git/migrations.ts b/packages/insomnia/src/main/git/migrations.ts index 5d01e598eeaa..b7e61c0d28df 100644 --- a/packages/insomnia/src/main/git/migrations.ts +++ b/packages/insomnia/src/main/git/migrations.ts @@ -24,8 +24,9 @@ * @see providers/ for provider implementations */ -import type { GitCredentials, GitRepository } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; +import type { GitCredentials, GitRepository } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; + import { getElectronStorage } from '~/main/electron-storage'; const { isGitCredentialsOAuth } = models.gitRepository; diff --git a/packages/insomnia/src/main/importers/entities.ts b/packages/insomnia/src/main/importers/entities.ts index 2ceb898ae3f8..9b995ed85804 100644 --- a/packages/insomnia/src/main/importers/entities.ts +++ b/packages/insomnia/src/main/importers/entities.ts @@ -1,6 +1,5 @@ import type * as Har from 'har-format'; - -import type { RequestAuthentication } from '~/insomnia-data'; +import type { RequestAuthentication } from 'insomnia-data'; export interface Comment { comment?: string; diff --git a/packages/insomnia/src/main/importers/importers/curl.test.ts b/packages/insomnia/src/main/importers/importers/curl.test.ts index 87c15fe3d273..78b520e28ebc 100644 --- a/packages/insomnia/src/main/importers/importers/curl.test.ts +++ b/packages/insomnia/src/main/importers/importers/curl.test.ts @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { afterEach, describe, expect, it } from 'vitest'; -import { services } from '~/insomnia-data'; - import { convert } from './curl'; describe('curl', () => { diff --git a/packages/insomnia/src/main/importers/importers/curl.ts b/packages/insomnia/src/main/importers/importers/curl.ts index 2481b96193cb..3495bad62cdd 100644 --- a/packages/insomnia/src/main/importers/importers/curl.ts +++ b/packages/insomnia/src/main/importers/importers/curl.ts @@ -1,9 +1,8 @@ import { URL } from 'node:url'; +import { type RequestAuthentication,services } from 'insomnia-data'; import { type ControlOperator, parse, type ParseEntry } from 'shell-quote'; -import { type RequestAuthentication,services } from '~/insomnia-data'; - import { getAppVersion } from '../../../common/constants'; import { type Converter, type ImportRequest, type Parameter } from '../entities'; diff --git a/packages/insomnia/src/main/importers/importers/postman.ts b/packages/insomnia/src/main/importers/importers/postman.ts index d4a6e581e0f1..97cbe42798be 100644 --- a/packages/insomnia/src/main/importers/importers/postman.ts +++ b/packages/insomnia/src/main/importers/importers/postman.ts @@ -1,8 +1,8 @@ import { CONTENT_TYPE_JSON, CONTENT_TYPE_PLAINTEXT, CONTENT_TYPE_XML } from 'insomnia/src/common/constants'; import { fakerFunctions } from 'insomnia/src/templating/faker-functions'; import { forceBracketNotation } from 'insomnia/src/templating/utils'; +import type { AuthTypeOAuth2 } from 'insomnia-data'; -import type { AuthTypeOAuth2 } from '~/insomnia-data'; import { translateHandlersInScript } from '~/main/importers/importers/translate-postman-script'; import type { Converter, ImportRequest, Parameter, PathParameters } from '../entities'; diff --git a/packages/insomnia/src/main/install-plugin.ts b/packages/insomnia/src/main/install-plugin.ts index 0f95bc1ece00..bc3cf8f2aa76 100644 --- a/packages/insomnia/src/main/install-plugin.ts +++ b/packages/insomnia/src/main/install-plugin.ts @@ -5,8 +5,8 @@ import path from 'node:path'; import { promisify } from 'node:util'; import { app, net } from 'electron'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics'; import { isDevelopment } from '../common/constants'; diff --git a/packages/insomnia/src/main/ipc/__tests__/grpc.test.ts b/packages/insomnia/src/main/ipc/__tests__/grpc.test.ts index 2428a7d4a5f3..a8a0840f354c 100644 --- a/packages/insomnia/src/main/ipc/__tests__/grpc.test.ts +++ b/packages/insomnia/src/main/ipc/__tests__/grpc.test.ts @@ -3,11 +3,10 @@ import type { AnyMessage, MethodInfo, PartialMessage, ServiceType } from '@bufbu import type { UnaryResponse } from '@connectrpc/connect'; import { createConnectTransport } from '@connectrpc/connect-node'; import * as grpcReflection from 'grpc-reflection-js'; +import { services } from 'insomnia-data'; import protobuf from 'protobufjs'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { loadMethodsFromReflection, writeProtoFileById } from '../grpc'; vi.mock('grpc-reflection-js'); diff --git a/packages/insomnia/src/main/ipc/grpc.ts b/packages/insomnia/src/main/ipc/grpc.ts index c554a481f048..c8880821b809 100644 --- a/packages/insomnia/src/main/ipc/grpc.ts +++ b/packages/insomnia/src/main/ipc/grpc.ts @@ -27,9 +27,8 @@ import type { import * as protoLoader from '@grpc/proto-loader'; import electron, { type IpcMainEvent } from 'electron'; import * as grpcReflection from 'grpc-reflection-js'; - -import type { GrpcRequest, GrpcRequestBody, GrpcRequestHeader } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +import type { GrpcRequest, GrpcRequestBody, GrpcRequestHeader } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { version } from '../../../package.json'; import { parseGrpcUrl } from '../../network/grpc/parse-grpc-url'; diff --git a/packages/insomnia/src/main/ipc/main.ts b/packages/insomnia/src/main/ipc/main.ts index e663724721f5..71f521eb6604 100644 --- a/packages/insomnia/src/main/ipc/main.ts +++ b/packages/insomnia/src/main/ipc/main.ts @@ -17,12 +17,12 @@ import { } from 'electron'; import type { UtilityProcess } from 'electron/main'; import iconv from 'iconv-lite'; +import type { AuthTypeOAuth2, OAuth2Token, RequestHeader, Services } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { bundleSpectralRuleset } from '~/common/bundle-spectral-ruleset'; import { AI_PLUGIN_NAME } from '~/common/constants'; import { cannotAccessPathError } from '~/common/misc'; -import type { AuthTypeOAuth2, OAuth2Token, RequestHeader, Services } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { initializeWorkspaceBackendProject, syncNewWorkspaceIfNeeded } from '~/main/cloud-sync/initialization'; import type { SyncBridgeAPI } from '~/main/cloud-sync/ipc'; import { convert } from '~/main/importers/convert'; diff --git a/packages/insomnia/src/main/llm-config-service.ts b/packages/insomnia/src/main/llm-config-service.ts index 1e17a800a716..7f713429b63f 100644 --- a/packages/insomnia/src/main/llm-config-service.ts +++ b/packages/insomnia/src/main/llm-config-service.ts @@ -1,9 +1,9 @@ import path from 'node:path'; import { app } from 'electron'; +import { services } from 'insomnia-data'; import { LLM_BACKENDS } from '~/common/constants'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics'; import { ipcMainHandle } from '~/main/ipc/electron'; diff --git a/packages/insomnia/src/main/mcp/common.ts b/packages/insomnia/src/main/mcp/common.ts index dc4c3ba2299b..22fabbdfca0b 100644 --- a/packages/insomnia/src/main/mcp/common.ts +++ b/packages/insomnia/src/main/mcp/common.ts @@ -12,6 +12,7 @@ import { } from '@modelcontextprotocol/sdk/types.js'; import electron from 'electron'; import { BrowserWindow } from 'electron'; +import { models, services } from 'insomnia-data'; import { Agent } from 'undici'; import { v4 as uuidV4 } from 'uuid'; @@ -27,7 +28,6 @@ import { unsupportedMethodPrefix, } from '~/common/mcp-utils'; import { generateId } from '~/common/misc'; -import { models, services } from '~/insomnia-data'; import type { CommonMcpOptions, McpClient, diff --git a/packages/insomnia/src/main/mcp/oauth-client-provider.ts b/packages/insomnia/src/main/mcp/oauth-client-provider.ts index d8461d3d9981..f92b43c2f66b 100644 --- a/packages/insomnia/src/main/mcp/oauth-client-provider.ts +++ b/packages/insomnia/src/main/mcp/oauth-client-provider.ts @@ -6,10 +6,10 @@ import { type OAuthTokens, } from '@modelcontextprotocol/sdk/shared/auth.js'; import { BrowserWindow, ipcMain } from 'electron'; +import type { RequestAuthentication } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { getOauthRedirectUrl } from '~/common/constants'; -import type { RequestAuthentication } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { authorizeUserInDefaultBrowser } from '~/main/authorize-user-in-default-browser'; import type { ConnectionContext } from '~/main/mcp/common'; import { encryptOAuthUrl } from '~/main/network/o-auth-2/get-token'; diff --git a/packages/insomnia/src/main/mcp/transport-stdio.ts b/packages/insomnia/src/main/mcp/transport-stdio.ts index 89af3444b212..5efd67ce27e7 100644 --- a/packages/insomnia/src/main/mcp/transport-stdio.ts +++ b/packages/insomnia/src/main/mcp/transport-stdio.ts @@ -1,10 +1,10 @@ import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; import { InitializeRequestSchema, type JSONRPCRequest } from '@modelcontextprotocol/sdk/types.js'; +import type { McpResponse } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { shellPath } from 'shell-path'; import { parse } from 'shell-quote'; -import type { McpResponse } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { type ConnectionContext, writeTimeline } from '~/main/mcp/common'; import type { OpenMcpStdioClientConnectionOptions } from '~/main/mcp/types'; diff --git a/packages/insomnia/src/main/mcp/transport-streamable-http.ts b/packages/insomnia/src/main/mcp/transport-streamable-http.ts index 7a8e17ccceb4..5b9d3cc76287 100644 --- a/packages/insomnia/src/main/mcp/transport-streamable-http.ts +++ b/packages/insomnia/src/main/mcp/transport-streamable-http.ts @@ -7,10 +7,10 @@ import { import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'; import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js'; import { BrowserWindow } from 'electron'; +import type { McpResponse, RequestHeader } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import type { Dispatcher } from 'undici'; -import type { McpResponse, RequestHeader } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { type ConnectionContext, getFetchDispatcher, writeEventLogAndNotify, writeTimeline } from '~/main/mcp/common'; import { MCPAuthError, type McpOAuthClientProvider } from '~/main/mcp/oauth-client-provider'; import type { McpAuthEventWithoutBase, OpenMcpHTTPClientConnectionOptions } from '~/main/mcp/types'; diff --git a/packages/insomnia/src/main/mcp/types.ts b/packages/insomnia/src/main/mcp/types.ts index 6f9691557e01..07693f331bc4 100644 --- a/packages/insomnia/src/main/mcp/types.ts +++ b/packages/insomnia/src/main/mcp/types.ts @@ -2,10 +2,9 @@ import type { Client } from '@modelcontextprotocol/sdk/client/index.js'; import type { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; import type { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'; import type { ClientRequest, JSONRPCResponse, Notification } from '@modelcontextprotocol/sdk/types.js'; +import type { models, RequestAuthentication, RequestHeader } from 'insomnia-data'; import type z from 'zod'; -import type { models, RequestAuthentication, RequestHeader } from '~/insomnia-data'; - // Refer the SDK: https://github.com/modelcontextprotocol/typescript-sdk/blob/main/src/shared/protocol.ts#L504 // The Client type has missing transport property export type McpClient = Client & { transport: StreamableHTTPClientTransport | StdioClientTransport }; diff --git a/packages/insomnia/src/main/network/curl.ts b/packages/insomnia/src/main/network/curl.ts index 69ec5ec94446..4adcc32a79b0 100644 --- a/packages/insomnia/src/main/network/curl.ts +++ b/packages/insomnia/src/main/network/curl.ts @@ -4,11 +4,11 @@ import type { Readable } from 'node:stream'; import { Curl, CurlFeature, CurlInfoDebug, type HeaderInfo } from '@getinsomnia/node-libcurl'; import electron, { BrowserWindow } from 'electron'; +import type { CookieJar, RequestAuthentication, RequestHeader, Response } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { v4 as uuidV4 } from 'uuid'; import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; -import type { CookieJar, RequestAuthentication, RequestHeader, Response } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { insecureReadFile } from '~/main/secure-read-file'; import { describeByteSize, generateId, getSetCookieHeaders } from '../../common/misc'; diff --git a/packages/insomnia/src/main/network/get-auth-header.ts b/packages/insomnia/src/main/network/get-auth-header.ts index 7e5152045d79..36b87c326ebb 100644 --- a/packages/insomnia/src/main/network/get-auth-header.ts +++ b/packages/insomnia/src/main/network/get-auth-header.ts @@ -1,6 +1,6 @@ import * as Hawk from 'hawk'; +import type { AuthTypeOAuth2, RequestAuthentication, RequestHeader } from 'insomnia-data'; -import type { AuthTypeOAuth2, RequestAuthentication, RequestHeader } from '~/insomnia-data'; import type { RenderedRequest } from '~/templating/types'; import { COOKIE, HEADER } from '../../network/api-key/constants'; diff --git a/packages/insomnia/src/main/network/libcurl-promise.ts b/packages/insomnia/src/main/network/libcurl-promise.ts index 26120e87b0b8..592555aec939 100644 --- a/packages/insomnia/src/main/network/libcurl-promise.ts +++ b/packages/insomnia/src/main/network/libcurl-promise.ts @@ -19,10 +19,9 @@ import { } from '@getinsomnia/node-libcurl'; import { isValid } from 'date-fns'; import electron from 'electron'; +import type { ClientCertificate, RequestHeader, ResponseHeader, ResponseTimelineEntry } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; -import type { ClientCertificate, RequestHeader, ResponseHeader, ResponseTimelineEntry } from '~/insomnia-data'; - import { version } from '../../../package.json'; import { type AuthTypes, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED } from '../../common/constants'; import { cannotAccessPathError, describeByteSize, hasAuthHeader } from '../../common/misc'; diff --git a/packages/insomnia/src/main/network/mcp.ts b/packages/insomnia/src/main/network/mcp.ts index c17dfbf78c3d..b4b12267faa6 100644 --- a/packages/insomnia/src/main/network/mcp.ts +++ b/packages/insomnia/src/main/network/mcp.ts @@ -17,10 +17,10 @@ import { ServerNotificationSchema, } from '@modelcontextprotocol/sdk/types.js'; import electron from 'electron'; +import { models, services } from 'insomnia-data'; import { getAppVersion, getProductName, REALTIME_EVENTS_CHANNELS } from '~/common/constants'; import { getMcpMethodFromMessage, METHOD_NOTIFICATION_CANCELLED } from '~/common/mcp-utils'; -import { models, services } from '~/insomnia-data'; import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics'; import { callTool, diff --git a/packages/insomnia/src/main/network/multipart.ts b/packages/insomnia/src/main/network/multipart.ts index c30f2724d249..af737c46a49d 100644 --- a/packages/insomnia/src/main/network/multipart.ts +++ b/packages/insomnia/src/main/network/multipart.ts @@ -6,10 +6,9 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; +import type { RequestBodyParameter } from 'insomnia-data'; import { lookup } from 'mime-types'; -import type { RequestBodyParameter } from '~/insomnia-data'; - import { DEFAULT_BOUNDARY } from '../../network/multipart-constants'; interface Multipart { diff --git a/packages/insomnia/src/main/network/o-auth-1/get-token.ts b/packages/insomnia/src/main/network/o-auth-1/get-token.ts index e3014bdc2007..bdf60d5ea9c5 100644 --- a/packages/insomnia/src/main/network/o-auth-1/get-token.ts +++ b/packages/insomnia/src/main/network/o-auth-1/get-token.ts @@ -1,9 +1,8 @@ import crypto from 'node:crypto'; +import type { RequestAuthentication, RequestBody } from 'insomnia-data'; import OAuth1 from 'oauth-1.0a'; -import type { RequestAuthentication, RequestBody } from '~/insomnia-data'; - import { CONTENT_TYPE_FORM_URLENCODED, type OAuth1SignatureMethod, diff --git a/packages/insomnia/src/main/network/o-auth-2/get-token.ts b/packages/insomnia/src/main/network/o-auth-2/get-token.ts index c040244a2fb2..a6ee672d1e64 100644 --- a/packages/insomnia/src/main/network/o-auth-2/get-token.ts +++ b/packages/insomnia/src/main/network/o-auth-2/get-token.ts @@ -2,8 +2,6 @@ import crypto from 'node:crypto'; import querystring from 'node:querystring'; import { BrowserWindow } from 'electron'; -import { v4 as uuidv4 } from 'uuid'; - import type { AuthTypeOAuth2, OAuth2ResponseType, @@ -13,8 +11,10 @@ import type { RequestHeader, RequestParameter, Response, -} from '~/insomnia-data'; -import { database as db, models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { database as db, models, services } from 'insomnia-data'; +import { v4 as uuidv4 } from 'uuid'; + import { authorizeUserInDefaultBrowser } from '~/main/authorize-user-in-default-browser'; import { authorizeUserInWindow } from '~/main/authorize-user-in-window'; import { getElectronStorage as getSharedElectronStorage } from '~/main/electron-storage'; diff --git a/packages/insomnia/src/main/network/socket-io.ts b/packages/insomnia/src/main/network/socket-io.ts index b0b245686bb5..98bbfe32d5cc 100644 --- a/packages/insomnia/src/main/network/socket-io.ts +++ b/packages/insomnia/src/main/network/socket-io.ts @@ -5,18 +5,18 @@ import tls from 'node:tls'; import electron, { BrowserWindow } from 'electron'; import { HttpProxyAgent } from 'http-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent'; -import { io as SocketIOClient, type ManagerOptions, type Socket, type SocketOptions } from 'socket.io-client'; -import { v4 as uuidV4 } from 'uuid'; - -import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; import type { BaseSocketIORequest, CookieJar, RequestAuthentication, RequestHeader, SocketIOResponse, -} from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { services } from 'insomnia-data'; +import { io as SocketIOClient, type ManagerOptions, type Socket, type SocketOptions } from 'socket.io-client'; +import { v4 as uuidV4 } from 'uuid'; + +import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; import { jarFromCookies } from '../../common/cookies'; import { generateId } from '../../common/misc'; diff --git a/packages/insomnia/src/main/network/websocket.ts b/packages/insomnia/src/main/network/websocket.ts index 6c29d3da35f5..466f90792061 100644 --- a/packages/insomnia/src/main/network/websocket.ts +++ b/packages/insomnia/src/main/network/websocket.ts @@ -7,11 +7,6 @@ import electron, { BrowserWindow } from 'electron'; import { MessageType, parseMessage } from 'graphql-ws'; import { HttpProxyAgent } from 'http-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent'; -import { v4 as uuidV4 } from 'uuid'; -import { type CloseEvent, type ErrorEvent, type Event, type MessageEvent, WebSocket } from 'ws'; - -import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; -import { database } from '~/common/database'; import type { BaseWebSocketRequest, CookieJar, @@ -19,8 +14,13 @@ import type { RequestAuthentication, RequestHeader, WebSocketResponse, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { v4 as uuidV4 } from 'uuid'; +import { type CloseEvent, type ErrorEvent, type Event, type MessageEvent, WebSocket } from 'ws'; + +import { REALTIME_EVENTS_CHANNELS } from '~/common/constants'; +import { database } from '~/common/database'; import { jarFromCookies } from '../../common/cookies'; import { generateId, getSetCookieHeaders } from '../../common/misc'; diff --git a/packages/insomnia/src/main/proxy.ts b/packages/insomnia/src/main/proxy.ts index 442dfdfc49f9..10478333260f 100644 --- a/packages/insomnia/src/main/proxy.ts +++ b/packages/insomnia/src/main/proxy.ts @@ -1,6 +1,5 @@ import { session } from 'electron/main'; - -import { models, services } from '~/insomnia-data'; +import { models, services } from 'insomnia-data'; import { type ChangeBufferEvent, database as db } from '../common/database'; import { setDefaultProtocol } from '../utils/url/protocol'; diff --git a/packages/insomnia/src/main/secure-read-file.ts b/packages/insomnia/src/main/secure-read-file.ts index 6bb5c558c8ae..78ecea9f0af8 100644 --- a/packages/insomnia/src/main/secure-read-file.ts +++ b/packages/insomnia/src/main/secure-read-file.ts @@ -3,8 +3,8 @@ import os from 'node:os'; import path from 'node:path'; import electron from 'electron'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { SECURITY_SETTINGS_PATH_LABEL } from '../common/misc'; diff --git a/packages/insomnia/src/main/sentry.ts b/packages/insomnia/src/main/sentry.ts index c5964e332ee7..f90c222a1a96 100644 --- a/packages/insomnia/src/main/sentry.ts +++ b/packages/insomnia/src/main/sentry.ts @@ -1,6 +1,5 @@ import * as Sentry from '@sentry/electron/main'; - -import { models, services } from '~/insomnia-data'; +import { models, services } from 'insomnia-data'; import * as session from '../account/session'; import { type ChangeBufferEvent, database as db } from '../common/database'; diff --git a/packages/insomnia/src/main/templating-worker-database.ts b/packages/insomnia/src/main/templating-worker-database.ts index ca9666299cbd..f9c233dce258 100644 --- a/packages/insomnia/src/main/templating-worker-database.ts +++ b/packages/insomnia/src/main/templating-worker-database.ts @@ -4,9 +4,6 @@ import os from 'node:os'; import { shell } from 'electron'; import iconv from 'iconv-lite'; -import { v4 as uuidv4 } from 'uuid'; - -import { jarFromCookies } from '~/common/cookies'; import type { AllTypes, CloudProviderCredential, @@ -14,8 +11,11 @@ import type { RequestGroup, Response, Workspace, -} from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { services } from 'insomnia-data'; +import { v4 as uuidv4 } from 'uuid'; + +import { jarFromCookies } from '~/common/cookies'; import { getAppBundlePlugins, RESPONSE_CODE_REASONS } from '../common/constants'; import { isDevelopment } from '../common/constants'; diff --git a/packages/insomnia/src/main/updates.ts b/packages/insomnia/src/main/updates.ts index cedfafd76b2b..ee9f3daece9a 100644 --- a/packages/insomnia/src/main/updates.ts +++ b/packages/insomnia/src/main/updates.ts @@ -5,9 +5,8 @@ import path from 'node:path'; import { app, autoUpdater, BrowserWindow, dialog } from 'electron'; import log from 'electron-log'; import { autoUpdater as electronUpdater } from 'electron-updater'; - -import type { Settings } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +import type { Settings } from 'insomnia-data'; +import { services } from 'insomnia-data'; import appConfig from '../../config/config.json'; import packageJSON from '../../package.json'; diff --git a/packages/insomnia/src/main/window-utils.ts b/packages/insomnia/src/main/window-utils.ts index 2a6f2ad04410..e4e17a67dce2 100644 --- a/packages/insomnia/src/main/window-utils.ts +++ b/packages/insomnia/src/main/window-utils.ts @@ -15,8 +15,8 @@ import { screen, shell, } from 'electron'; +import { isLinux, isMac } from 'insomnia-data/common'; -import { isLinux, isMac } from '~/insomnia-data/common'; import { AnalyticsEvent, trackAnalyticsEvent } from '~/main/analytics'; import { getAppBuildDate, getAppVersion, getProductName, isDevelopment, MNEMONIC_SYM } from '../common/constants'; diff --git a/packages/insomnia/src/network/__tests__/certificate.test.ts b/packages/insomnia/src/network/__tests__/certificate.test.ts index 033598788454..fb41989f7989 100644 --- a/packages/insomnia/src/network/__tests__/certificate.test.ts +++ b/packages/insomnia/src/network/__tests__/certificate.test.ts @@ -1,8 +1,7 @@ +import type { ClientCertificate } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import type { ClientCertificate } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import { filterClientCertificates } from '../certificate'; describe('filterClientCertificates', () => { diff --git a/packages/insomnia/src/network/__tests__/network.test.ts b/packages/insomnia/src/network/__tests__/network.test.ts index d7772c4158fb..10522d8f33bb 100644 --- a/packages/insomnia/src/network/__tests__/network.test.ts +++ b/packages/insomnia/src/network/__tests__/network.test.ts @@ -3,11 +3,10 @@ import fs from 'node:fs'; import nodePath from 'node:path'; import { CurlHttpVersion, CurlNetrc } from '@getinsomnia/node-libcurl'; +import { models, services } from 'insomnia-data'; +import { HttpVersions } from 'insomnia-data/common'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { models, services } from '~/insomnia-data'; -import { HttpVersions } from '~/insomnia-data/common'; - import { CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED } from '../../common/constants'; import { filterHeaders } from '../../common/misc'; import { getRenderedRequestAndContext } from '../../common/render'; diff --git a/packages/insomnia/src/network/authentication.ts b/packages/insomnia/src/network/authentication.ts index 55c163b35973..6c6afd3d3c74 100644 --- a/packages/insomnia/src/network/authentication.ts +++ b/packages/insomnia/src/network/authentication.ts @@ -1,4 +1,4 @@ -import type { RequestAuthentication } from '~/insomnia-data'; +import type { RequestAuthentication } from 'insomnia-data'; export const _buildBearerHeader = (accessToken: string, prefix?: string) => { if (!accessToken) { diff --git a/packages/insomnia/src/network/basic-auth/get-header.ts b/packages/insomnia/src/network/basic-auth/get-header.ts index 67de13074ff3..7937af85ffa1 100644 --- a/packages/insomnia/src/network/basic-auth/get-header.ts +++ b/packages/insomnia/src/network/basic-auth/get-header.ts @@ -1,4 +1,4 @@ -import type { RequestHeader } from '~/insomnia-data'; +import type { RequestHeader } from 'insomnia-data'; export function getBasicAuthHeader(username?: string | null, password?: string | null, encoding = 'utf8') { const name = 'Authorization'; diff --git a/packages/insomnia/src/network/bearer-auth/get-header.ts b/packages/insomnia/src/network/bearer-auth/get-header.ts index fab0daa9c36c..d1ea353272ba 100644 --- a/packages/insomnia/src/network/bearer-auth/get-header.ts +++ b/packages/insomnia/src/network/bearer-auth/get-header.ts @@ -1,4 +1,4 @@ -import type { RequestHeader } from '~/insomnia-data'; +import type { RequestHeader } from 'insomnia-data'; export function getBearerAuthHeader(token: string, prefix?: string) { const name = 'Authorization'; diff --git a/packages/insomnia/src/network/certificate.ts b/packages/insomnia/src/network/certificate.ts index 8018c60ebddd..c0268aa1a63f 100644 --- a/packages/insomnia/src/network/certificate.ts +++ b/packages/insomnia/src/network/certificate.ts @@ -1,4 +1,4 @@ -import type { ClientCertificate } from '~/insomnia-data'; +import type { ClientCertificate } from 'insomnia-data'; import { setDefaultProtocol } from '../utils/url/protocol'; import { urlMatchesCertHost } from './url-matches-cert-host'; diff --git a/packages/insomnia/src/network/concurrency.ts b/packages/insomnia/src/network/concurrency.ts index a6e334413d58..80a4afcf4bc6 100644 --- a/packages/insomnia/src/network/concurrency.ts +++ b/packages/insomnia/src/network/concurrency.ts @@ -1,6 +1,5 @@ import type { queueAsPromised } from 'fastq'; import * as fastq from 'fastq'; - import type { ClientCertificate, CookieJar, @@ -9,7 +8,7 @@ import type { RequestTestResult, Settings, UserUploadEnvironment, -} from '~/insomnia-data'; +} from 'insomnia-data'; import type { RequestContext } from '../../../insomnia-scripting-environment/src/objects'; import { cancellableExecution } from './cancellation'; diff --git a/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts b/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts index 9cd8e7512db5..62fdb12f4de0 100644 --- a/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts +++ b/packages/insomnia/src/network/grpc/__tests__/write-proto-file.test.ts @@ -3,10 +3,9 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; +import { services } from 'insomnia-data'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { writeProtoFile } from '../write-proto-file'; describe('writeProtoFile', () => { diff --git a/packages/insomnia/src/network/grpc/write-proto-file.ts b/packages/insomnia/src/network/grpc/write-proto-file.ts index 517e042c3156..2597b77cfb77 100644 --- a/packages/insomnia/src/network/grpc/write-proto-file.ts +++ b/packages/insomnia/src/network/grpc/write-proto-file.ts @@ -2,8 +2,8 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; -import type { BaseModel, ProtoDirectory, ProtoFile, Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { BaseModel, ProtoDirectory, ProtoFile, Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { database as db } from '../../common/database'; diff --git a/packages/insomnia/src/network/network-adapter.node.ts b/packages/insomnia/src/network/network-adapter.node.ts index 04dc6c50e91b..ee830298fe84 100644 --- a/packages/insomnia/src/network/network-adapter.node.ts +++ b/packages/insomnia/src/network/network-adapter.node.ts @@ -2,8 +2,8 @@ import fs from 'node:fs'; import nodePath from 'node:path'; import clone from 'clone'; +import type { RequestHeader } from 'insomnia-data'; -import type { RequestHeader } from '~/insomnia-data'; import type { RenderedRequest } from '~/templating/types'; import type { RequestContext } from '../../../insomnia-scripting-environment/src/objects'; diff --git a/packages/insomnia/src/network/network-adapter.renderer.ts b/packages/insomnia/src/network/network-adapter.renderer.ts index 4eba7cb2293e..1cb1ade79168 100644 --- a/packages/insomnia/src/network/network-adapter.renderer.ts +++ b/packages/insomnia/src/network/network-adapter.renderer.ts @@ -1,4 +1,5 @@ -import type { RequestHeader } from '~/insomnia-data'; +import type { RequestHeader } from 'insomnia-data'; + import { plugins as pluginsBridge } from '~/plugins/renderer-bridge'; import type { RenderedRequest } from '~/templating/types'; diff --git a/packages/insomnia/src/network/network.ts b/packages/insomnia/src/network/network.ts index 8b6bafba2fdf..b35776184eff 100644 --- a/packages/insomnia/src/network/network.ts +++ b/packages/insomnia/src/network/network.ts @@ -1,5 +1,3 @@ -import orderedJSON from 'json-order'; - import type { CaCertificate, ClientCertificate, @@ -21,9 +19,11 @@ import type { UserUploadEnvironment, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { EnvironmentType, models, services } from '~/insomnia-data'; -import { invariant, serializeNDJSON } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { EnvironmentType, models, services } from 'insomnia-data'; +import { invariant, serializeNDJSON } from 'insomnia-data/common'; +import orderedJSON from 'json-order'; + import { appendTimelineLines, appendToTimelineOnError, diff --git a/packages/insomnia/src/network/parse-header-strings.ts b/packages/insomnia/src/network/parse-header-strings.ts index cfab4b6891a5..2d19ac28abdb 100644 --- a/packages/insomnia/src/network/parse-header-strings.ts +++ b/packages/insomnia/src/network/parse-header-strings.ts @@ -1,5 +1,6 @@ import aws4 from 'aws4'; import clone from 'clone'; +import type { RequestAuthentication } from 'insomnia-data'; import { CONTENT_TYPE_FORM_DATA } from '~/common/constants'; import { @@ -10,7 +11,6 @@ import { hasAuthHeader, hasContentTypeHeader, } from '~/common/misc'; -import type { RequestAuthentication } from '~/insomnia-data'; import { DEFAULT_BOUNDARY } from './multipart-constants'; diff --git a/packages/insomnia/src/network/set-cookie-util.ts b/packages/insomnia/src/network/set-cookie-util.ts index 5487cdc14a24..58fedea53241 100644 --- a/packages/insomnia/src/network/set-cookie-util.ts +++ b/packages/insomnia/src/network/set-cookie-util.ts @@ -1,4 +1,4 @@ -import type { Cookie } from '~/insomnia-data'; +import type { Cookie } from 'insomnia-data'; import { cookiesFromJar, jarFromCookies } from '../common/cookies'; diff --git a/packages/insomnia/src/network/unit-test-feature.ts b/packages/insomnia/src/network/unit-test-feature.ts index 7ba0000e03b6..cd0b746463f4 100644 --- a/packages/insomnia/src/network/unit-test-feature.ts +++ b/packages/insomnia/src/network/unit-test-feature.ts @@ -1,4 +1,4 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { parseGraphQLReqeustBody } from '../utils/graph-ql'; import { diff --git a/packages/insomnia/src/plugins/__tests__/index.test.ts b/packages/insomnia/src/plugins/__tests__/index.test.ts index a4c56435990f..46c81c0598c9 100644 --- a/packages/insomnia/src/plugins/__tests__/index.test.ts +++ b/packages/insomnia/src/plugins/__tests__/index.test.ts @@ -8,7 +8,7 @@ vi.mock('~/templating/liquid-extension-worker', () => ({ vi.mock('../context/app', () => ({ init: vi.fn().mockReturnValue({ app: {} }) })); vi.mock('../context/store', () => ({ init: vi.fn().mockReturnValue({ store: {} }) })); vi.mock('../context/network', () => ({ init: vi.fn().mockReturnValue({ network: {} }) })); -vi.mock('~/insomnia-data', () => ({ +vi.mock('insomnia-data', () => ({ services: { settings: { get: vi.fn() }, request: { getById: vi.fn() }, @@ -21,6 +21,8 @@ vi.mock('~/insomnia-data', () => ({ }, })); +import { services } from 'insomnia-data'; + import { fetchFromTemplateWorkerDatabase } from '~/templating/liquid-extension-worker'; import type { Plugin } from '../index'; @@ -340,8 +342,8 @@ describe('executePluginMainAction', () => { it('propagates rejections from the IPC call', async () => { vi.mocked(fetchFromTemplateWorkerDatabase).mockRejectedValue(new Error('IPC failure')); - await expect( - executePluginMainAction({ pluginName: bundlePluginName, actionName: 'doThing' }), - ).rejects.toThrow('IPC failure'); + await expect(executePluginMainAction({ pluginName: bundlePluginName, actionName: 'doThing' })).rejects.toThrow( + 'IPC failure', + ); }); }); diff --git a/packages/insomnia/src/plugins/__tests__/invoke-method.test.ts b/packages/insomnia/src/plugins/__tests__/invoke-method.test.ts index a3b317603518..70b271709dd2 100644 --- a/packages/insomnia/src/plugins/__tests__/invoke-method.test.ts +++ b/packages/insomnia/src/plugins/__tests__/invoke-method.test.ts @@ -7,7 +7,7 @@ vi.mock('../context/store', () => ({ init: vi.fn().mockReturnValue({ store: {} } vi.mock('../context/network', () => ({ init: vi.fn().mockReturnValue({ network: {} }) })); vi.mock('../context/request', () => ({ init: vi.fn().mockReturnValue({ request: {} }) })); vi.mock('../context/response', () => ({ init: vi.fn().mockReturnValue({ response: {} }) })); -vi.mock('~/insomnia-data', () => ({ +vi.mock('insomnia-data', () => ({ services: { settings: { get: vi.fn() }, request: { getById: vi.fn() }, diff --git a/packages/insomnia/src/plugins/context/__tests__/request.test.ts b/packages/insomnia/src/plugins/context/__tests__/request.test.ts index 3bef0969f63e..49685b3280e4 100644 --- a/packages/insomnia/src/plugins/context/__tests__/request.test.ts +++ b/packages/insomnia/src/plugins/context/__tests__/request.test.ts @@ -1,8 +1,7 @@ // @ts-nocheck +import { services } from 'insomnia-data'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { CONTENT_TYPE_FORM_URLENCODED } from '../../../common/constants'; import { database as db } from '../../../common/database'; import * as plugin from '../request'; diff --git a/packages/insomnia/src/plugins/context/__tests__/response.test.ts b/packages/insomnia/src/plugins/context/__tests__/response.test.ts index 84073561e190..f9a2f6307cfd 100644 --- a/packages/insomnia/src/plugins/context/__tests__/response.test.ts +++ b/packages/insomnia/src/plugins/context/__tests__/response.test.ts @@ -2,10 +2,9 @@ import fs from 'node:fs'; import { tmpdir } from 'node:os'; import path from 'node:path'; +import { services } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { services } from '~/insomnia-data'; - import * as plugin from '../response'; describe('init()', () => { diff --git a/packages/insomnia/src/plugins/context/app.ts b/packages/insomnia/src/plugins/context/app.ts index df03a17bd89a..c1e9ca036e06 100644 --- a/packages/insomnia/src/plugins/context/app.ts +++ b/packages/insomnia/src/plugins/context/app.ts @@ -1,8 +1,7 @@ import { getAppVersion } from 'insomnia/src/common/constants'; import type { AppContext, RenderPurpose } from 'insomnia/src/templating/types'; import { invariant } from 'insomnia/src/utils/invariant'; - -import { platform } from '~/insomnia-data/common'; +import { platform } from 'insomnia-data/common'; // TODO: consider how this would work in a webworker context const isRenderer = process.type === 'renderer'; diff --git a/packages/insomnia/src/plugins/context/data.ts b/packages/insomnia/src/plugins/context/data.ts index c40bcfc9b16b..4cc2fb60df6c 100644 --- a/packages/insomnia/src/plugins/context/data.ts +++ b/packages/insomnia/src/plugins/context/data.ts @@ -1,5 +1,5 @@ -import type { Workspace } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +import type { Workspace } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { exportWorkspacesHAR } from '../../common/har'; import { fetchImportContentFromURI, importResourcesToProject, scanResources } from '../../common/import'; diff --git a/packages/insomnia/src/plugins/context/network.ts b/packages/insomnia/src/plugins/context/network.ts index 5d0a2f96eb35..b9b51881835d 100644 --- a/packages/insomnia/src/plugins/context/network.ts +++ b/packages/insomnia/src/plugins/context/network.ts @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { v4 as uuidv4 } from 'uuid'; -import { services } from '~/insomnia-data'; - import { RESPONSE_CODE_REASONS } from '../../common/constants'; import { fetchRequestData, diff --git a/packages/insomnia/src/plugins/context/request.ts b/packages/insomnia/src/plugins/context/request.ts index 116178b2e377..11a2fe457aa4 100644 --- a/packages/insomnia/src/plugins/context/request.ts +++ b/packages/insomnia/src/plugins/context/request.ts @@ -1,4 +1,4 @@ -import type { RequestBody } from '~/insomnia-data'; +import type { RequestBody } from 'insomnia-data'; import * as misc from '../../common/misc'; import type { RenderedRequest } from '../../templating/types'; diff --git a/packages/insomnia/src/plugins/context/response.ts b/packages/insomnia/src/plugins/context/response.ts index 4b2a0c275ba7..5b31f9e2b58d 100644 --- a/packages/insomnia/src/plugins/context/response.ts +++ b/packages/insomnia/src/plugins/context/response.ts @@ -1,7 +1,7 @@ import type { Readable } from 'node:stream'; -import type { Compression, ResponseHeader } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +import type { Compression, ResponseHeader } from 'insomnia-data'; +import { services } from 'insomnia-data'; interface MaybeResponse { parentId?: string; diff --git a/packages/insomnia/src/plugins/context/store.ts b/packages/insomnia/src/plugins/context/store.ts index 441956fc97d0..6073b291ad4f 100644 --- a/packages/insomnia/src/plugins/context/store.ts +++ b/packages/insomnia/src/plugins/context/store.ts @@ -1,4 +1,4 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import type { PluginStore } from '../../templating/types'; import type { Plugin } from '../index'; diff --git a/packages/insomnia/src/plugins/index.ts b/packages/insomnia/src/plugins/index.ts index 32b794d32d7b..02871e48cff7 100644 --- a/packages/insomnia/src/plugins/index.ts +++ b/packages/insomnia/src/plugins/index.ts @@ -2,10 +2,10 @@ import fs from 'node:fs'; import path from 'node:path'; import electron from 'electron'; +import type { GrpcRequest, Request, RequestGroup, SocketIORequest, WebSocketRequest, Workspace } from 'insomnia-data'; +import { database as db, models, services } from 'insomnia-data'; +import type { PluginConfigMap } from 'insomnia-data/common'; -import type { GrpcRequest, Request, RequestGroup, SocketIORequest, WebSocketRequest, Workspace } from '~/insomnia-data'; -import { database as db, models, services } from '~/insomnia-data'; -import type { PluginConfigMap } from '~/insomnia-data/common'; import { fetchFromTemplateWorkerDatabase } from '~/templating/liquid-extension-worker'; import type { ParsedApiSpec } from '../common/api-specs'; diff --git a/packages/insomnia/src/plugins/misc.ts b/packages/insomnia/src/plugins/misc.ts index 745ff07bca51..7fd0ae32d418 100644 --- a/packages/insomnia/src/plugins/misc.ts +++ b/packages/insomnia/src/plugins/misc.ts @@ -1,7 +1,6 @@ import Color from 'color'; - -import type { ThemeSettings } from '~/insomnia-data'; -import { getAppDefaultTheme } from '~/insomnia-data/common'; +import type { ThemeSettings } from 'insomnia-data'; +import { getAppDefaultTheme } from 'insomnia-data/common'; import type { HexColor, diff --git a/packages/insomnia/src/root.tsx b/packages/insomnia/src/root.tsx index 35118b6900e6..b19ac9dd4ff3 100644 --- a/packages/insomnia/src/root.tsx +++ b/packages/insomnia/src/root.tsx @@ -1,5 +1,7 @@ import { config } from '@fortawesome/fontawesome-svg-core'; import type { IpcRendererEvent } from 'electron'; +import type { Settings, UserSession } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import type { FC } from 'react'; import { useEffect, useState } from 'react'; import { Button } from 'react-aria-components'; @@ -22,8 +24,6 @@ import { import { useLatest } from 'react-use'; import { EXTERNAL_VAULT_PLUGIN_NAME, isDevelopment } from '~/common/constants'; -import type { Settings, UserSession } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { createPlugin } from '~/plugins/create'; import { setTheme } from '~/plugins/misc'; import { plugins } from '~/plugins/renderer-bridge'; diff --git a/packages/insomnia/src/routes/auth.authorize.tsx b/packages/insomnia/src/routes/auth.authorize.tsx index a7532fce336d..68b28bd15c28 100644 --- a/packages/insomnia/src/routes/auth.authorize.tsx +++ b/packages/insomnia/src/routes/auth.authorize.tsx @@ -1,9 +1,9 @@ import { getVault } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { Fragment } from 'react'; import { Button, Heading } from 'react-aria-components'; import { href, redirect, useFetchers, useNavigate } from 'react-router'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { getLoginUrl, submitAuthCode } from '~/ui/auth-session-provider.client'; import { Icon } from '~/ui/components/icon'; diff --git a/packages/insomnia/src/routes/auth.clear-vault-key.tsx b/packages/insomnia/src/routes/auth.clear-vault-key.tsx index c508a67240fa..2354cccf0b56 100644 --- a/packages/insomnia/src/routes/auth.clear-vault-key.tsx +++ b/packages/insomnia/src/routes/auth.clear-vault-key.tsx @@ -1,7 +1,7 @@ import { getVault } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { showToast } from '~/ui/components/toast-notification'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/auth.login.tsx b/packages/insomnia/src/routes/auth.login.tsx index ad5651f5cf99..2a6bf42f53f6 100644 --- a/packages/insomnia/src/routes/auth.login.tsx +++ b/packages/insomnia/src/routes/auth.login.tsx @@ -1,8 +1,8 @@ +import { models } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button } from 'react-aria-components'; import { href, redirect, useNavigate } from 'react-router'; -import { models } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { getLoginUrl } from '~/ui/auth-session-provider.client'; import { Icon } from '~/ui/components/icon'; diff --git a/packages/insomnia/src/routes/auth.update-vault-salt.tsx b/packages/insomnia/src/routes/auth.update-vault-salt.tsx index b6a9340ccb83..19b567133f56 100644 --- a/packages/insomnia/src/routes/auth.update-vault-salt.tsx +++ b/packages/insomnia/src/routes/auth.update-vault-salt.tsx @@ -1,7 +1,7 @@ import { getVault } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { type ActionFunctionArgs, href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; export async function clientAction(_args: ActionFunctionArgs) { diff --git a/packages/insomnia/src/routes/auth.validate-vault-key.tsx b/packages/insomnia/src/routes/auth.validate-vault-key.tsx index 1da944e1ca9c..c707c6361995 100644 --- a/packages/insomnia/src/routes/auth.validate-vault-key.tsx +++ b/packages/insomnia/src/routes/auth.validate-vault-key.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { type ActionFunctionArgs, href } from 'react-router'; -import { services } from '~/insomnia-data'; import { saveVaultKey, validateVaultKey } from '~/ui/vault-key.client'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts index 636e3309de12..24c382d4699d 100644 --- a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts +++ b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.delete.ts @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts index 88a03bb6ffcb..960a6bd9c696 100644 --- a/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts +++ b/packages/insomnia/src/routes/cloud-credentials.$cloudCredentialId.update.ts @@ -1,8 +1,8 @@ +import type { CloudProviderCredential } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { EXTERNAL_VAULT_PLUGIN_NAME } from '~/common/constants'; -import type { CloudProviderCredential } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { plugins } from '~/plugins/renderer-bridge'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/cloud-credentials.create.tsx b/packages/insomnia/src/routes/cloud-credentials.create.tsx index 56470c8cf1ae..4c056745b41d 100644 --- a/packages/insomnia/src/routes/cloud-credentials.create.tsx +++ b/packages/insomnia/src/routes/cloud-credentials.create.tsx @@ -1,8 +1,8 @@ +import type { CloudProviderCredential } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { EXTERNAL_VAULT_PLUGIN_NAME } from '~/common/constants'; -import type { CloudProviderCredential } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { plugins } from '~/plugins/renderer-bridge'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/commands.tsx b/packages/insomnia/src/routes/commands.tsx index f71a1aef12ae..44967ad62d44 100644 --- a/packages/insomnia/src/routes/commands.tsx +++ b/packages/insomnia/src/routes/commands.tsx @@ -1,6 +1,4 @@ import type { Organization } from 'insomnia-api'; - -import { fuzzyMatch } from '~/common/misc'; import type { Environment, GrpcRequest, @@ -9,8 +7,10 @@ import type { RequestGroup, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; + +import { fuzzyMatch } from '~/common/misc'; import { invariant } from '~/utils/invariant'; import { createFetcherLoadHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/git-credentials.$id.delete.tsx b/packages/insomnia/src/routes/git-credentials.$id.delete.tsx index 284e30456971..d817bf8d70ad 100644 --- a/packages/insomnia/src/routes/git-credentials.$id.delete.tsx +++ b/packages/insomnia/src/routes/git-credentials.$id.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx b/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx index bd97a968d4ba..08a455a05f64 100644 --- a/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx +++ b/packages/insomnia/src/routes/git-credentials.$id.related-projects.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.$id.related-projects'; diff --git a/packages/insomnia/src/routes/git-credentials.$id.update.tsx b/packages/insomnia/src/routes/git-credentials.$id.update.tsx index f6cbaf7832fb..dc9766ba380e 100644 --- a/packages/insomnia/src/routes/git-credentials.$id.update.tsx +++ b/packages/insomnia/src/routes/git-credentials.$id.update.tsx @@ -1,7 +1,7 @@ +import type { GitCredentialsV2 } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import type { GitCredentialsV2 } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.$id.update'; diff --git a/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx b/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx index d94fff21279b..81aa5e124fe1 100644 --- a/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx +++ b/packages/insomnia/src/routes/git-credentials.complete-sign-in.tsx @@ -1,7 +1,7 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitRemoteProviderType } from 'insomnia-data'; import { href } from 'react-router'; -import type { GitRemoteProviderType } from '~/insomnia-data'; import { showToast } from '~/ui/components/toast-notification'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/git-credentials.create.tsx b/packages/insomnia/src/routes/git-credentials.create.tsx index 700208710430..eca3a24c0364 100644 --- a/packages/insomnia/src/routes/git-credentials.create.tsx +++ b/packages/insomnia/src/routes/git-credentials.create.tsx @@ -1,7 +1,7 @@ +import type { BaseGitCredentialsV2 } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { BaseGitCredentialsV2 } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/git-credentials.create'; diff --git a/packages/insomnia/src/routes/git-credentials.tsx b/packages/insomnia/src/routes/git-credentials.tsx index da24f7a807f0..3fb502586f3b 100644 --- a/packages/insomnia/src/routes/git-credentials.tsx +++ b/packages/insomnia/src/routes/git-credentials.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, type LoaderFunctionArgs } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; export async function clientLoader(_args: LoaderFunctionArgs) { diff --git a/packages/insomnia/src/routes/git.all-connected-repos.tsx b/packages/insomnia/src/routes/git.all-connected-repos.tsx index 5b4762d30721..0ca1fe5290ac 100644 --- a/packages/insomnia/src/routes/git.all-connected-repos.tsx +++ b/packages/insomnia/src/routes/git.all-connected-repos.tsx @@ -1,9 +1,9 @@ import type { Organization } from 'insomnia-api'; +import type { Project } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import type { Project } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; export async function clientLoader() { diff --git a/packages/insomnia/src/routes/git.branch.delete.tsx b/packages/insomnia/src/routes/git.branch.delete.tsx index 4e06a99c89b4..44c2627f73a0 100644 --- a/packages/insomnia/src/routes/git.branch.delete.tsx +++ b/packages/insomnia/src/routes/git.branch.delete.tsx @@ -1,6 +1,6 @@ +import { invariant } from 'insomnia-data/common'; import { href } from 'react-router'; -import { invariant } from '~/insomnia-data/common'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/git.branch.delete'; diff --git a/packages/insomnia/src/routes/import.resources.tsx b/packages/insomnia/src/routes/import.resources.tsx index 92c73befb19e..899f13f0e462 100644 --- a/packages/insomnia/src/routes/import.resources.tsx +++ b/packages/insomnia/src/routes/import.resources.tsx @@ -1,3 +1,5 @@ +import type { Workspace } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { @@ -7,8 +9,6 @@ import { importResourcesToProject, importResourcesToWorkspace, } from '~/common/import'; -import type { Workspace } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx index 0599e63193ce..44550e471c96 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators-check-seats.tsx @@ -1,8 +1,8 @@ import { checkSeats } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { v4 as uuidv4 } from 'uuid'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators-check-seats'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx index 2180b26840dc..9aa21cf03183 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators-search.tsx @@ -1,7 +1,7 @@ import { searchCollaborators } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators-search'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx index ec19c2ed8f67..8b12e7b93e7d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.reinvite.tsx @@ -1,7 +1,7 @@ import { reinvite } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators.invites.$invitationId.reinvite'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx index c27bcdfabd32..8a67ffc5b0f6 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.invites.$invitationId.tsx @@ -1,7 +1,7 @@ import { updateInvitationRole } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx b/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx index 732fee0a4255..4128b3038ebb 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.collaborators.tsx @@ -1,7 +1,7 @@ import { getCollaborators } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.collaborators'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx b/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx index 5c4096eeb43c..f41c410bc810 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.insomnia-sync.pull-remote-file.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx b/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx index 50aa9188b4c3..88a50f4e66f8 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.members.$userId.roles.tsx @@ -1,7 +1,7 @@ import { updateUserRoles } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx b/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx index a75245ce067a..e62bed82af4e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.permissions.tsx @@ -1,7 +1,7 @@ import { type Billing, type FeatureList, getOrganizationFeatures, type Organization } from 'insomnia-api'; +import { models, services } from 'insomnia-data'; import { href, redirect, type ShouldRevalidateFunctionArgs } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.permissions'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx index e9f8a560ed51..4df76aae11ca 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId._index.tsx @@ -1,4 +1,6 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitRepository, Project, WorkspaceScope } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { Fragment, useEffect, useMemo, useState } from 'react'; import { Button, @@ -29,8 +31,6 @@ import { scopeToBgColorMap, scopeToIconMap, scopeToTextColorMap } from '~/common import { fuzzyMatchAll } from '~/common/misc'; import type { InsomniaFile } from '~/common/project'; import { sortMethodMap } from '~/common/sorting'; -import type { GitRepository, Project, WorkspaceScope } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useInsomniaSyncPullRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.pull-remote-file'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete-ruleset.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete-ruleset.tsx index 5e5199d4574e..05595b78dc48 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete-ruleset.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete-ruleset.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx index 5b4cb9ad9299..02edb5048375 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.delete.tsx @@ -1,9 +1,9 @@ import { deleteTeamProject, isApiError } from 'insomnia-api'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; import { projectLock } from '~/common/project'; -import { models, services } from '~/insomnia-data'; import { reportGitProjectCount } from '~/routes/organization.$organizationId.project.new'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook, getInitialRouteForOrganization } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx index 8df18618e6ac..b4b21f3c787e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.list-workspaces.tsx @@ -1,3 +1,5 @@ +import type { ApiSpec, GitRepository, MockServer, Project, WorkspaceMeta } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { parseApiSpec, type ParsedApiSpec } from '~/common/api-specs'; @@ -6,8 +8,6 @@ import { scopeToLabelMap } from '~/common/get-workspace-label'; import { isNotNullOrUndefined } from '~/common/misc'; import type { InsomniaFile } from '~/common/project'; import { descendingNumberSort } from '~/common/sorting'; -import type { ApiSpec, GitRepository, MockServer, Project, WorkspaceMeta } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherLoadHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx index 822dd1e5a57e..384b6bf2a268 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move-workspace.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx index bdfd0e49f7d6..5a79dd395b7d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.move.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx index 48a129aba5a9..25ca878a1614 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx @@ -1,4 +1,5 @@ import { getLearningFeature } from 'insomnia-api'; +import { models, services } from 'insomnia-data'; import { useEffect, useRef, useState } from 'react'; import { Button, Heading } from 'react-aria-components'; import { type ImperativePanelHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; @@ -14,7 +15,6 @@ import { getAllRemoteFiles, getProjectsWithGitRepositories, } from '~/common/project'; -import { models, services } from '~/insomnia-data'; import { useStorageRulesLoaderFetcher } from '~/routes/organization.$organizationId.storage-rules'; import { ProjectModal } from '~/ui/components/modals/project-modal'; import { ScratchPadTutorialPanel } from '~/ui/components/panes/scratchpad-tutorial-pane'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update-ruleset.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update-ruleset.tsx index 7dda0046db06..be0325334508 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update-ruleset.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update-ruleset.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx index d2a63e160071..7832ae5bf7ee 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.update.tsx @@ -1,10 +1,10 @@ import { createTeamProject, deleteTeamProject, isApiError, updateTeamProject } from 'insomnia-api'; +import type { WorkspaceMeta } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; import { projectLock } from '~/common/project'; -import type { WorkspaceMeta } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { reportGitProjectCount } from '~/routes/organization.$organizationId.project.new'; import { AnalyticsEvent } from '~/ui/analytics'; import { showToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx index fa7b40952aba..f113f4ceca09 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx index 1dcd918bfc0b..a9b0df027150 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx index 38e29b1a0901..cdb20f0a6b6e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update.tsx @@ -1,7 +1,7 @@ +import type { CaCertificate } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { CaCertificate } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx index dfe8f70e8c43..0412f9189533 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx index 74256398e9b4..eb010c4ba78d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new.tsx @@ -1,7 +1,7 @@ +import type { ClientCertificate } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { ClientCertificate } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.new'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx index 6a5d172fa428..583be09d5167 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.clientcert.update.tsx @@ -1,7 +1,7 @@ +import type { ClientCertificate } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { ClientCertificate } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx index 88d8c6d0a183..d5f10366c025 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx index 3fe186e1a601..e55b1db40146 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.tsx @@ -1,7 +1,7 @@ +import type { RequestGroup } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href, redirect, useRouteLoaderData } from 'react-router'; -import type { RequestGroup } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx index 723ac2fb362d..317587c43275 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update-meta.tsx @@ -1,7 +1,7 @@ +import type { RequestGroupMeta } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { RequestGroupMeta } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx index f15abadf2dbe..1c0e238c7eeb 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId.update.tsx @@ -1,7 +1,7 @@ +import type { RequestGroup } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { RequestGroup } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx index 582c527c70d0..728dac3e38b9 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx index 0a9cfa3dc2e3..edb36a4ea64a 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate.tsx @@ -1,7 +1,7 @@ +import type { RequestGroup } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { RequestGroup } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx index 35dc6afe86d5..ac267f0b7230 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new.tsx @@ -1,6 +1,6 @@ +import { EnvironmentType, services } from 'insomnia-data'; import { href } from 'react-router'; -import { EnvironmentType, services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx index 0ba69a0b15bd..7c9ea38b8028 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.connect.tsx @@ -1,14 +1,14 @@ import { GRAPHQL_TRANSPORT_WS_PROTOCOL, MessageType } from 'graphql-ws'; -import { href } from 'react-router'; - import type { ChangeBufferEvent, CookieJar, McpTransportType, RequestAuthentication, RequestHeader, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { href } from 'react-router'; + import type { RenderedRequest } from '~/templating/types'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx index 5ed5c40e217c..626e4b08076f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx index 5cdd5d669e81..c2baf503e966 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.grant-access.tsx @@ -1,7 +1,7 @@ +import type { McpRequest } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { McpRequest } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx index 042d2ebce65a..94e37831b4c1 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx index bae0fa743140..f2e0ce0b08ad 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx index 97bdcd4f3946..2d2a1cfbd623 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.send.tsx @@ -1,10 +1,4 @@ import contentDisposition from 'content-disposition'; -import { extension as mimeExtension } from 'mime-types'; -import { href, redirect } from 'react-router'; -import { v4 as uuidv4 } from 'uuid'; - -import { CONTENT_TYPE_GRAPHQL } from '~/common/constants'; -import { getContentDispositionHeader } from '~/common/misc'; import type { Environment, Request, @@ -14,8 +8,14 @@ import type { ResponseInfo, RunnerResultPerRequestPerIteration, UserUploadEnvironment, -} from '~/insomnia-data'; -import { database as db, models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { database as db, models, services } from 'insomnia-data'; +import { extension as mimeExtension } from 'mime-types'; +import { href, redirect } from 'react-router'; +import { v4 as uuidv4 } from 'uuid'; + +import { CONTENT_TYPE_GRAPHQL } from '~/common/constants'; +import { getContentDispositionHeader } from '~/common/misc'; import type { ResponsePatch } from '~/main/network/libcurl-promise'; import type { TimingStep } from '~/main/network/request-timing'; import { diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx index 61c3f08e0e71..2e58e8e086b3 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.tsx @@ -1,6 +1,3 @@ -import { href, Outlet, redirect, useRouteLoaderData } from 'react-router'; - -import { database } from '~/common/database'; import type { BaseModel, GrpcRequest, @@ -19,8 +16,11 @@ import type { SocketIOResponse, WebSocketRequest, WebSocketResponse, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { href, Outlet, redirect, useRouteLoaderData } from 'react-router'; + +import { database } from '~/common/database'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx index e3178beb4ffc..d03de7797086 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta.tsx @@ -1,7 +1,7 @@ +import type { GrpcRequestMeta, RequestMeta, SocketIORequestMeta, WebSocketRequestMeta } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import type { GrpcRequestMeta, RequestMeta, SocketIORequestMeta, WebSocketRequestMeta } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx index b29c46375375..d1e9c6e723a1 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload.tsx @@ -1,7 +1,7 @@ +import type { McpPayload, SocketIOPayload } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import type { McpPayload, SocketIOPayload } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx index a0df5808cc22..b3b5ae2de22f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update.tsx @@ -1,7 +1,7 @@ +import type { WebSocketRequest } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import type { WebSocketRequest } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { updateMimeType } from '~/ui/components/dropdowns/content-type-dropdown'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx index d4ade81ac079..61621c8e608d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx index db6d65a9b38e..72912e08f625 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send.tsx @@ -1,7 +1,7 @@ +import type { Request } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { Request } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { fetchRequestData, responseTransform, diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx index 588033c7109e..a225e7fa31ce 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new.tsx @@ -1,3 +1,5 @@ +import type { Request, RequestBody, RequestParameter } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { @@ -8,8 +10,6 @@ import { METHOD_GET, METHOD_POST, } from '~/common/constants'; -import type { Request, RequestBody, RequestParameter } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import type { RequestCreatedMetricsProperties } from '~/ui/analytics'; import { AnalyticsEvent } from '~/ui/analytics'; import type { CreateRequestType } from '~/ui/hooks/use-request'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx index 2472989e3c2f..f91102c6bdfb 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner.tsx @@ -1,3 +1,10 @@ +import type { + ResponseTimelineEntry, + RunnerResultPerRequest, + RunnerTestResult, + UserUploadEnvironment, +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import porderedJSON from 'json-order'; import React, { type FC, useCallback, useEffect, useMemo, useState } from 'react'; import { @@ -22,13 +29,6 @@ import * as reactUse from 'react-use'; import { v4 as uuidv4 } from 'uuid'; import { JSON_ORDER_PREFIX, JSON_ORDER_SEPARATOR } from '~/common/constants'; -import type { - ResponseTimelineEntry, - RunnerResultPerRequest, - RunnerTestResult, - UserUploadEnvironment, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import type { TimingStep } from '~/main/network/request-timing'; import { cancelRequestById } from '~/network/cancellation'; import { defaultSendActionRuntime } from '~/network/network'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx index 7130ebe904bd..b902f8d8ea9a 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.tsx @@ -1,6 +1,19 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; import type { ServiceError, StatusObject } from '@grpc/grpc-js'; import { useVirtualizer } from '@tanstack/react-virtual'; +import type { + ChangeBufferEvent, + Environment, + GrpcRequest, + Project, + Request, + RequestGroup, + SocketIORequest, + WebSocketRequest, + Workspace, +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React, { Fragment, useCallback, useEffect, useRef, useState } from 'react'; import { Button, @@ -30,19 +43,6 @@ import * as reactUse from 'react-use'; import { getProductName, SORT_ORDERS, type SortOrder, sortOrderName } from '~/common/constants'; import { generateId } from '~/common/misc'; -import type { - ChangeBufferEvent, - Environment, - GrpcRequest, - Project, - Request, - RequestGroup, - SocketIORequest, - WebSocketRequest, - Workspace, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import type { GrpcMethodInfo } from '~/main/ipc/grpc'; import { useRootLoaderData } from '~/root'; import { diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx index 4cf378b27650..bfefdc673cd4 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create.tsx @@ -1,6 +1,6 @@ +import { EnvironmentType, services } from 'insomnia-data'; import { href } from 'react-router'; -import { EnvironmentType, services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx index 5beb7d232b2a..b451bf64c39f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx index 81e76e50776c..8cd12708c312 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx index 5b8b137d6022..c153667d0e87 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx index 95ed241f2267..ad4fa4547cd4 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx index 3bd1b7a02f93..2c37774b4be1 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.tsx @@ -1,4 +1,6 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { Environment, EnvironmentKvPairData } from 'insomnia-data'; +import { EnvironmentKvPairDataType, EnvironmentType, models, services } from 'insomnia-data'; import React, { Fragment, useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -18,8 +20,6 @@ import { import { type ImperativePanelGroupHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { debounce } from '~/common/misc'; -import type { Environment, EnvironmentKvPairData } from '~/insomnia-data'; -import { EnvironmentKvPairDataType, EnvironmentType, models, services } from '~/insomnia-data'; import { useWorkspaceLoaderData, WORKSPACE_CONTENT_WRAPPER, diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx index 694219612425..11eacaf6e990 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.update.tsx @@ -1,7 +1,7 @@ +import type { Environment } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { Environment } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx index 5cbbb3683b12..0e880500ac62 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout.tsx @@ -1,8 +1,8 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import type { Operation } from '~/common/database'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { getSyncItems, remoteCompareCache, reparentSyncDelta } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx index 73cf2e409f83..bbb787a92723 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.delete.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { remoteBranchesCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx index 2290dd3c9c4f..39cd98c9e44d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { remoteCompareCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx index 40db6f1f4bbb..d26496afbc36 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.fetch.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; import { reparentSyncDelta } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx index 5dd3689c6862..f52fa542cb2f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { getSyncItems, remoteCompareCache, reparentSyncDelta, vcsEventProperties } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx index 599d8a8a64d1..c8c013e0c544 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { remoteCompareCache, vcsEventProperties } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx index 51a15be3d7ee..223d969d20bf 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.restore.tsx @@ -1,8 +1,8 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import type { Operation } from '~/common/database'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { getSyncItems, remoteCompareCache, reparentSyncDelta } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx index 0b6bff60cf16..b631d5781ad5 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.rollback.tsx @@ -1,8 +1,8 @@ +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import type { Operation } from '~/common/database'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { getSyncItems, remoteCompareCache, reparentSyncDelta } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx index 60fb4d0957e0..6d7a755ab96a 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.sync-data.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { getSyncItems, remoteBackendProjectsCache, remoteBranchesCache, remoteCompareCache } from '~/ui/sync-utils'; import { invariant } from '~/utils/invariant'; import { createFetcherLoadHook, createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx index 34e8a0962ca4..f511d638f89b 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.tsx @@ -1,7 +1,7 @@ +import type { Workspace } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; import { href } from 'react-router'; -import type { Workspace } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherLoadHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx index 525c1625b465..1cf477f57878 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mcp.tsx @@ -1,9 +1,9 @@ +import { services } from 'insomnia-data'; import { Breadcrumb, Breadcrumbs, Button } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { href, NavLink, redirect, useParams } from 'react-router'; import { Icon } from '~/basic-components/icon'; -import { services } from '~/insomnia-data'; import { WorkspaceSyncDropdown } from '~/ui/components/dropdowns/workspace-sync-dropdown'; import { Pane, PaneBody, PaneHeader } from '~/ui/components/panes/pane'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx index 1db859424892..5fa1297a0299 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.generate-request-collection.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { getMockServiceBinURL } from '~/common/constants'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx index 73f8dd7f64c9..61b6d8a86b5c 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx index 9dce91fbbd80..7191ac28baed 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.tsx @@ -1,5 +1,7 @@ import type * as Har from 'har-format'; import { isApiError, upsertMockbin } from 'insomnia-api'; +import type { MockRoute, MockServer, Request, RequestHeader, Response } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { useCallback } from 'react'; import { Button, Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; import { useParams, useRouteLoaderData } from 'react-router'; @@ -17,8 +19,6 @@ import { } from '~/common/constants'; import { database as db } from '~/common/database'; import { getResponseCookiesFromHeaders } from '~/common/har'; -import type { MockRoute, MockServer, Request, RequestHeader, Response } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useRequestNewMockSendActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send'; import { useMockRouteUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx index b10e2617301d..4310f26bd65f 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update.tsx @@ -1,7 +1,7 @@ +import type { MockRoute } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { MockRoute } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx index 74162888d0e8..7f6c5564dab3 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new.tsx @@ -1,7 +1,7 @@ +import type { MockRoute } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import type { MockRoute } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx index 7ed3083425bc..ab9416eeef19 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.tsx @@ -1,4 +1,6 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import type { MockRoute } from 'insomnia-data'; +import { services } from 'insomnia-data'; import React, { Suspense, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { Button, GridList, GridListItem, Menu, MenuItem, MenuTrigger, Popover } from 'react-aria-components'; import { type ImperativePanelGroupHandle, Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; @@ -13,8 +15,6 @@ import { } from 'react-router'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; -import type { MockRoute } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData, diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx index 7c68d3fad849..f234bd7bab3b 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.generate-request-collection.tsx @@ -1,8 +1,8 @@ import type { IRuleResult } from '@stoplight/spectral-core'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { importResourcesToWorkspace, scanResources } from '~/common/import'; -import { models, services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx index 97cfe48060c5..0ec897c198d7 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.tsx @@ -1,5 +1,6 @@ import { type IRuleResult } from '@stoplight/spectral-core'; import CodeMirror from 'codemirror'; +import { models, services } from 'insomnia-data'; import type { OpenAPIV3 } from 'openapi-types'; import { Fragment, type ReactNode, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; import { @@ -30,7 +31,6 @@ import { parseApiSpec } from '~/common/api-specs'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; import { debounce } from '~/common/misc'; import { selectFileOrFolder } from '~/common/select-file-or-folder'; -import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useDeleteProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.delete-ruleset'; import { useUpdateProjectRulesetActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.update-ruleset'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx index 74846c9bae19..12644d3624a8 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.spec.update.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx index ee18b37cc3f1..0645489b8529 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index.tsx @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import { href, Outlet, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; - import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.test._index'; export default Outlet; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx index 1b94d87602db..df250e498701 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index.tsx @@ -1,7 +1,7 @@ +import type { UnitTestResult } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTestResult } from '~/insomnia-data'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId._index'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx index 57c681344d40..efec26a9b57e 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx index d60c8c970b36..7e2f2368a3ed 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests.tsx @@ -1,9 +1,9 @@ +import type { UnitTest } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { generate, runTests, type Test, type TestResults } from 'insomnia-testing'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTest } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { getSendRequestCallback } from '~/network/unit-test-feature'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx index 685fb6cf4479..2214281ad1d9 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result.$testResultId.tsx @@ -1,9 +1,9 @@ +import type { UnitTestResult } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { Heading } from 'react-aria-components'; import { useRouteLoaderData } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTestResult } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { Icon } from '~/ui/components/icon'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx index ed221d649281..6baa59f32f45 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index.tsx @@ -1,7 +1,7 @@ +import type { UnitTestResult } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTestResult } from '~/insomnia-data'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test-result._index'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx index cbf2d2376db1..281a05690dba 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete.tsx @@ -1,8 +1,8 @@ +import type { UnitTest } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTest } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx index adae5b57c6fe..ea96c23883ef 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run.tsx @@ -1,9 +1,9 @@ +import type { UnitTest } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { generate, runTests, type Test, type TestResults } from 'insomnia-testing'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTest } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { getSendRequestCallback } from '~/network/unit-test-feature'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx index b3f38ca95968..1f9f686f8714 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.update.tsx @@ -1,8 +1,8 @@ +import type { UnitTest } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTest } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx index dc55f580b2e2..d45bd97c6b46 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.new.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx index 977f7d4156c6..802318495e6d 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.tsx @@ -1,3 +1,5 @@ +import type { Request, UnitTest, UnitTestSuite } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import React, { Fragment, useRef, useState } from 'react'; import { Button, @@ -17,8 +19,6 @@ import { useParams, useRouteLoaderData } from 'react-router'; import { database } from '~/common/database'; import { documentationLinks } from '~/common/documentation'; -import type { Request, UnitTest, UnitTestSuite } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useRunAllTestsActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests'; import { useTestDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.delete'; import { useTestRunActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.test.$testId.run'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx index 74d9e37a5f18..f21bb65c5bb9 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.update.tsx @@ -1,8 +1,8 @@ +import type { UnitTestSuite } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import type { UnitTestSuite } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx index 9ae6ab1e18c7..9cd0539d4b58 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.new.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import { services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx index 73c0cd791277..4d3f942804f0 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.tsx @@ -1,4 +1,6 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import type { UnitTestSuite } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { Suspense, useLayoutEffect, useRef, useState } from 'react'; import { Button, @@ -17,8 +19,6 @@ import { Route as RouteComponent, Routes, useFetchers, useLoaderData, useParams import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; import { database } from '~/common/database'; -import type { UnitTestSuite } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useTestSuiteDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.delete'; import { useRunAllTestsActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.test.test-suite.$testSuiteId.run-all-tests'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx index 17df002f105e..4d238eb1ff90 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.toggle-expand-all.tsx @@ -1,7 +1,7 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import { models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx index a8db6f0a1563..0b9dc5006dd7 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.tsx @@ -1,11 +1,3 @@ -import { useLayoutEffect, useState } from 'react'; -import { href, Outlet, redirect, useNavigate, useParams, useRouteLoaderData } from 'react-router'; - -import { Button } from '~/basic-components/button'; -import { Modal } from '~/basic-components/modal'; -import type { SortOrder } from '~/common/constants'; -import { database } from '~/common/database'; -import { sortMethodMap } from '~/common/sorting'; import type { ApiSpec, CaCertificate, @@ -27,8 +19,16 @@ import type { WebSocketRequestMeta, Workspace, WorkspaceMeta, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { useLayoutEffect, useState } from 'react'; +import { href, Outlet, redirect, useNavigate, useParams, useRouteLoaderData } from 'react-router'; + +import { Button } from '~/basic-components/button'; +import { Modal } from '~/basic-components/modal'; +import type { SortOrder } from '~/common/constants'; +import { database } from '~/common/database'; +import { sortMethodMap } from '~/common/sorting'; import { pushSnapshotOnInitialize } from '~/sync/vcs/initialize-backend-project'; import { Icon } from '~/ui/components/icon'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx index 7c4fd6cb386d..f7589eeee3d8 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar.tsx @@ -1,6 +1,6 @@ +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx index 99b339865e4e..29c76a52de4a 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta.tsx @@ -1,7 +1,7 @@ +import type { WorkspaceMeta } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import type { WorkspaceMeta } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { createFetcherSubmitHook } from '~/utils/router'; import type { Route } from './+types/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-meta'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx index df89beb7f0cd..30d56aedb2fd 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.delete.tsx @@ -1,7 +1,7 @@ +import type { Project, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import type { Project, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import uiEventBus, { CLOUD_SYNC_FILE_CHANGE } from '~/ui/event-bus'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx index fcd22cea332b..0e295ff3c202 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.move.tsx @@ -1,9 +1,9 @@ +import type { Project } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; import { importResourcesToNewWorkspace } from '~/common/import'; import { getInsomniaV5DataExport, importInsomniaV5Data } from '~/common/insomnia-v5'; -import type { Project } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { syncNewWorkspaceIfNeeded } from '~/routes/import.resources'; import { invariant } from '~/utils/invariant'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx index ae6230382f97..654ecf827bd3 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.new.tsx @@ -1,10 +1,10 @@ import { upsertMockbin } from 'insomnia-api'; +import type { MockRoute, MockServer, WorkspaceScope } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { getAppVersion, getMockServiceURL, METHOD_GET } from '~/common/constants'; import { database } from '~/common/database'; -import type { MockRoute, MockServer, WorkspaceScope } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import type { MockRouteData } from '~/plugins/types'; import { safeToUseInsomniaFileNameWithExt } from '~/sync/git/insomnia-filename'; import { AnalyticsEvent } from '~/ui/analytics'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx index f03892b3c4df..35c3db4d3605 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.workspace.update.tsx @@ -1,6 +1,6 @@ +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; -import { models, services } from '~/insomnia-data'; import { safeToUseInsomniaFileNameWithExt } from '~/sync/git/insomnia-filename'; import { AnalyticsEvent } from '~/ui/analytics'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx index cbaf292c0447..c77c1bbdb432 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx @@ -1,3 +1,5 @@ +import type { GitRepository, Project } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import type { LoaderFunctionArgs } from 'react-router'; @@ -6,8 +8,6 @@ import { href, redirect, useParams } from 'react-router'; import { logout } from '~/account/session'; import { DEFAULT_SIDEBAR_SIZE } from '~/common/constants'; import { getProjectsWithGitRepositories } from '~/common/project'; -import type { GitRepository, Project } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useStorageRulesLoaderFetcher } from '~/routes/organization.$organizationId.storage-rules'; import { ErrorBoundary } from '~/ui/components/error-boundary'; import { ProjectModal } from '~/ui/components/modals/project-modal'; diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx index da3098da94f6..f5bde047c2b2 100644 --- a/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx +++ b/packages/insomnia/src/routes/organization.$organizationId.project.new.tsx @@ -1,11 +1,11 @@ import { createTeamProject, isApiError, updateGitProjectCount } from 'insomnia-api'; +import type { Project } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import { database } from '~/common/database'; import { isNotNullOrUndefined } from '~/common/misc'; import { projectLock } from '~/common/project'; -import type { Project } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { showToast } from '~/ui/components/toast-notification'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization._index.tsx b/packages/insomnia/src/routes/organization._index.tsx index 1d3b8f16a67f..b6be8516f0d5 100644 --- a/packages/insomnia/src/routes/organization._index.tsx +++ b/packages/insomnia/src/routes/organization._index.tsx @@ -1,8 +1,8 @@ import type { Organization } from 'insomnia-api'; +import { models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; import * as session from '~/account/session'; -import { models, services } from '~/insomnia-data'; import { migrateProjectsUnderOrganization, syncOrganizations } from '~/ui/organization-utils'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx b/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx index e310d9f1179b..d6bd7e7ba8a4 100644 --- a/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx +++ b/packages/insomnia/src/routes/organization.sync-organizations-and-projects.tsx @@ -1,8 +1,8 @@ import type { Organization } from 'insomnia-api'; +import type { Project } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; import { href, redirect } from 'react-router'; -import type { Project } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; import { migrateProjectsUnderOrganization, syncOrganizations, syncProjects } from '~/ui/organization-utils'; import { invariant } from '~/utils/invariant'; import { AsyncTask, createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.sync.tsx b/packages/insomnia/src/routes/organization.sync.tsx index c3656e666f56..fd55eb40374f 100644 --- a/packages/insomnia/src/routes/organization.sync.tsx +++ b/packages/insomnia/src/routes/organization.sync.tsx @@ -1,4 +1,5 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; + import { syncOrganizations } from '~/ui/organization-utils'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/organization.tsx b/packages/insomnia/src/routes/organization.tsx index e45d3754d859..a0fe2b23cb3f 100644 --- a/packages/insomnia/src/routes/organization.tsx +++ b/packages/insomnia/src/routes/organization.tsx @@ -1,11 +1,11 @@ import { type Billing, type CurrentPlan, type FeatureList, type Organization, type User } from 'insomnia-api'; +import type { Settings } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import React, { Fragment, useCallback, useEffect, useState } from 'react'; import { Button, Link, ToggleButton, Tooltip, TooltipTrigger } from 'react-aria-components'; import { href, NavLink, Outlet, useLocation, useNavigate, useParams, useRouteLoaderData } from 'react-router'; import * as reactUse from 'react-use'; -import type { Settings } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useSyncOrganizationsAndProjectsActionFetcher } from '~/routes/organization.sync-organizations-and-projects'; diff --git a/packages/insomnia/src/routes/remote-files.tsx b/packages/insomnia/src/routes/remote-files.tsx index 75345010bf0b..d58aa118b93d 100644 --- a/packages/insomnia/src/routes/remote-files.tsx +++ b/packages/insomnia/src/routes/remote-files.tsx @@ -1,9 +1,9 @@ import { getUserFiles, type Organization, type RemoteFile } from 'insomnia-api'; +import type { Project } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { href } from 'react-router'; import { database } from '~/common/database'; -import type { Project } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/remote-files'; diff --git a/packages/insomnia/src/routes/resource.usage.tsx b/packages/insomnia/src/routes/resource.usage.tsx index 900b28f1c3ce..d67f8232a556 100644 --- a/packages/insomnia/src/routes/resource.usage.tsx +++ b/packages/insomnia/src/routes/resource.usage.tsx @@ -6,9 +6,9 @@ import { getResourceUsage, getTrialEligibility, } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; async function getCurrentEnterprise(sessionId: string) { diff --git a/packages/insomnia/src/routes/settings.update.tsx b/packages/insomnia/src/routes/settings.update.tsx index d537f0c004a5..f09e5c791ae2 100644 --- a/packages/insomnia/src/routes/settings.update.tsx +++ b/packages/insomnia/src/routes/settings.update.tsx @@ -1,5 +1,6 @@ -import type { Settings } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +import type { Settings } from 'insomnia-data'; +import { services } from 'insomnia-data'; + import { AnalyticsEvent } from '~/ui/analytics'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/trial.check.tsx b/packages/insomnia/src/routes/trial.check.tsx index 452394b6502a..cd2ceda865a3 100644 --- a/packages/insomnia/src/routes/trial.check.tsx +++ b/packages/insomnia/src/routes/trial.check.tsx @@ -1,7 +1,7 @@ import { getTrialEligibility } from 'insomnia-api'; +import { services } from 'insomnia-data'; import { href } from 'react-router'; -import { services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/settings.update'; diff --git a/packages/insomnia/src/routes/trial.start.tsx b/packages/insomnia/src/routes/trial.start.tsx index 2b249193cc6e..e8ef3eebe7f5 100644 --- a/packages/insomnia/src/routes/trial.start.tsx +++ b/packages/insomnia/src/routes/trial.start.tsx @@ -1,6 +1,6 @@ import { startTrial } from 'insomnia-api'; +import { services } from 'insomnia-data'; -import { services } from '~/insomnia-data'; import { syncCurrentPlan } from '~/ui/organization-utils'; import { createFetcherSubmitHook } from '~/utils/router'; diff --git a/packages/insomnia/src/routes/untracked-projects.tsx b/packages/insomnia/src/routes/untracked-projects.tsx index 1134d19da234..ddb017cceb2b 100644 --- a/packages/insomnia/src/routes/untracked-projects.tsx +++ b/packages/insomnia/src/routes/untracked-projects.tsx @@ -1,7 +1,7 @@ import type { Organization } from 'insomnia-api'; +import type { Project, Workspace } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; -import type { Project, Workspace } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; import { createFetcherLoadHook } from '~/utils/router'; import type { Route } from './+types/untracked-projects'; diff --git a/packages/insomnia/src/sync/__schemas__/model-schemas.ts b/packages/insomnia/src/sync/__schemas__/model-schemas.ts index 45b0004e5980..e785d80859e1 100644 --- a/packages/insomnia/src/sync/__schemas__/model-schemas.ts +++ b/packages/insomnia/src/sync/__schemas__/model-schemas.ts @@ -1,8 +1,7 @@ import type { Schema } from '@develohpanda/fluent-builder'; import clone from 'clone'; - -import type { AllTypes, BaseModel, Environment, GrpcRequest, Request, RequestGroup, Workspace } from '~/insomnia-data'; -import { EnvironmentKvPairDataType, EnvironmentType, models } from '~/insomnia-data'; +import type { AllTypes, BaseModel, Environment, GrpcRequest, Request, RequestGroup, Workspace } from 'insomnia-data'; +import { EnvironmentKvPairDataType, EnvironmentType, models } from 'insomnia-data'; const { environment, grpcRequest, request, requestGroup, workspace } = models; diff --git a/packages/insomnia/src/sync/access-error.ts b/packages/insomnia/src/sync/access-error.ts index 3f13a71b5138..28651a0a759c 100644 --- a/packages/insomnia/src/sync/access-error.ts +++ b/packages/insomnia/src/sync/access-error.ts @@ -1,4 +1,4 @@ -import { strings } from '~/insomnia-data/common'; +import { strings } from 'insomnia-data/common'; export const interceptAccessError = async ({ callback, diff --git a/packages/insomnia/src/sync/git/__tests__/git-repo-migration.test.ts b/packages/insomnia/src/sync/git/__tests__/git-repo-migration.test.ts index 077c99be7957..c492134c8e80 100644 --- a/packages/insomnia/src/sync/git/__tests__/git-repo-migration.test.ts +++ b/packages/insomnia/src/sync/git/__tests__/git-repo-migration.test.ts @@ -2,10 +2,9 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; +import { services } from 'insomnia-data'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { services } from '~/insomnia-data'; - import { database as db } from '../../../common/database'; import { CURRENT_MIGRATION_VERSION, migrateRepoStructureIfNeeded } from '../git-repo-migration'; diff --git a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts index 83edd4790821..43fc9c63e003 100644 --- a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts +++ b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts @@ -8,11 +8,10 @@ import path from 'node:path'; import { createBuilder } from '@develohpanda/fluent-builder'; +import { models, services } from 'insomnia-data'; import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'; import YAML from 'yaml'; -import { models, services } from '~/insomnia-data'; - import { database as db } from '../../../common/database'; import { workspaceModelSchema } from '../../__schemas__/model-schemas'; import { GIT_CLONE_DIR, GIT_INSOMNIA_DIR, GIT_INSOMNIA_DIR_NAME } from '../git-vcs'; diff --git a/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts b/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts index 14da043b1710..4d6dd4e8ccbc 100644 --- a/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts +++ b/packages/insomnia/src/sync/git/__tests__/parse-git-path.test.ts @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { models } from '~/insomnia-data'; - import { GIT_INSOMNIA_DIR } from '../git-vcs'; import parseGitPath from '../parse-git-path'; diff --git a/packages/insomnia/src/sync/git/get-oauth2-format-name.ts b/packages/insomnia/src/sync/git/get-oauth2-format-name.ts index ae4133b79a6e..a36d94b35a0d 100644 --- a/packages/insomnia/src/sync/git/get-oauth2-format-name.ts +++ b/packages/insomnia/src/sync/git/get-oauth2-format-name.ts @@ -1,4 +1,4 @@ -import type { GitRepoCredentials, OauthProviderName } from '~/insomnia-data'; +import type { GitRepoCredentials, OauthProviderName } from 'insomnia-data'; export const getOauth2FormatName = (credentials?: GitRepoCredentials | null): OauthProviderName | undefined => { if (credentials && 'oauth2format' in credentials) { diff --git a/packages/insomnia/src/sync/git/git-repo-migration.ts b/packages/insomnia/src/sync/git/git-repo-migration.ts index 62b5ae546807..33da014182b0 100644 --- a/packages/insomnia/src/sync/git/git-repo-migration.ts +++ b/packages/insomnia/src/sync/git/git-repo-migration.ts @@ -28,8 +28,8 @@ import path from 'node:path'; export type MigrationLogger = (level: 'info' | 'warn' | 'error', message: string) => void; -import type { GitRepository, Workspace, WorkspaceMeta } from '~/insomnia-data'; -import { database as db, models } from '~/insomnia-data'; +import type { GitRepository, Workspace, WorkspaceMeta } from 'insomnia-data'; +import { database as db, models } from 'insomnia-data'; import { getInsomniaV5DataExport } from '../../common/insomnia-v5'; import { CURRENT_MIGRATION_VERSION } from './git-migration-version'; diff --git a/packages/insomnia/src/sync/git/git-vcs.ts b/packages/insomnia/src/sync/git/git-vcs.ts index 58f5e0475636..790d467ffac9 100644 --- a/packages/insomnia/src/sync/git/git-vcs.ts +++ b/packages/insomnia/src/sync/git/git-vcs.ts @@ -2,11 +2,11 @@ import path from 'node:path'; import type { Change } from 'diff'; import { diffLines } from 'diff'; +import type { GitAuthor, GitRemoteConfig } from 'insomnia-data'; import * as git from 'isomorphic-git'; import { parse, stringify } from 'yaml'; import { migrateToLatestYaml } from '~/common/insomnia-schema-migrations'; -import type { GitAuthor, GitRemoteConfig } from '~/insomnia-data'; import { GitVCSOperationErrors } from '~/sync/git/git-vcs-operation-errors'; import type { WriteFileMap } from '~/sync/git/project-routable-fs-client'; diff --git a/packages/insomnia/src/sync/git/ne-db-client.ts b/packages/insomnia/src/sync/git/ne-db-client.ts index 5f1e94b556d4..5d6938741eaa 100644 --- a/packages/insomnia/src/sync/git/ne-db-client.ts +++ b/packages/insomnia/src/sync/git/ne-db-client.ts @@ -15,12 +15,11 @@ import path from 'node:path'; +import type { BaseModel } from 'insomnia-data'; +import { models } from 'insomnia-data'; import type { PromiseFsClient } from 'isomorphic-git'; import YAML from 'yaml'; -import type { BaseModel } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import { database as db } from '../../common/database'; import { resetKeys } from '../ignore-keys'; import { GIT_INSOMNIA_DIR_NAME } from './git-vcs'; diff --git a/packages/insomnia/src/sync/git/parse-git-path.ts b/packages/insomnia/src/sync/git/parse-git-path.ts index f53754bafbbf..ae43d764609c 100644 --- a/packages/insomnia/src/sync/git/parse-git-path.ts +++ b/packages/insomnia/src/sync/git/parse-git-path.ts @@ -1,7 +1,7 @@ import path from 'node:path'; -import type { AllTypes } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { AllTypes } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { GIT_CLONE_DIR } from './git-vcs'; diff --git a/packages/insomnia/src/sync/git/providers/custom.ts b/packages/insomnia/src/sync/git/providers/custom.ts index 78c025ecdf64..4e7dffaab626 100644 --- a/packages/insomnia/src/sync/git/providers/custom.ts +++ b/packages/insomnia/src/sync/git/providers/custom.ts @@ -1,8 +1,7 @@ +import type { GitCredentials } from 'insomnia-data'; +import { models } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; -import type { GitCredentials } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import type { CustomProviderConfig, GitRemoteProvider, ValidationResult } from './types'; const { isGitCredentialsV2 } = models.gitCredentials; diff --git a/packages/insomnia/src/sync/git/providers/github.ts b/packages/insomnia/src/sync/git/providers/github.ts index 0e440cd5451e..8a012a05a8b1 100644 --- a/packages/insomnia/src/sync/git/providers/github.ts +++ b/packages/insomnia/src/sync/git/providers/github.ts @@ -1,11 +1,11 @@ import { shell } from 'electron'; import { net } from 'electron/main'; +import type { GitCredentials, GitCredentialsV2 } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; import { v4 } from 'uuid'; import { getApiBaseURL, getAppWebsiteBaseURL, PLAYWRIGHT_TEST } from '~/common/constants'; -import type { GitCredentials, GitCredentialsV2 } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { expiresAtFromOAuthExpiresIn } from '~/sync/git/utils'; import type { diff --git a/packages/insomnia/src/sync/git/providers/gitlab.ts b/packages/insomnia/src/sync/git/providers/gitlab.ts index f552ab5b53d0..21656344393c 100644 --- a/packages/insomnia/src/sync/git/providers/gitlab.ts +++ b/packages/insomnia/src/sync/git/providers/gitlab.ts @@ -2,6 +2,8 @@ import { createHash, randomBytes } from 'node:crypto'; import { shell } from 'electron'; import { net } from 'electron/main'; +import type { BaseGitCredentialsV2, GitCredentials, GitCredentialsV2 } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; import { v4 } from 'uuid'; @@ -11,8 +13,6 @@ import { INSOMNIA_GITLAB_REDIRECT_URI, PLAYWRIGHT_TEST, } from '~/common/constants'; -import type { BaseGitCredentialsV2, GitCredentials, GitCredentialsV2 } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { expiresAtFromOAuthExpiresIn } from '~/sync/git/utils'; import type { diff --git a/packages/insomnia/src/sync/git/providers/types.ts b/packages/insomnia/src/sync/git/providers/types.ts index 0be52be3920b..5a5d37d4f58f 100644 --- a/packages/insomnia/src/sync/git/providers/types.ts +++ b/packages/insomnia/src/sync/git/providers/types.ts @@ -1,8 +1,7 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitCredentials } from 'insomnia-data'; import type { GitAuth } from 'isomorphic-git'; -import type { GitCredentials } from '~/insomnia-data'; - /** * Supported Git remote provider types */ diff --git a/packages/insomnia/src/sync/git/repo-file-watcher.ts b/packages/insomnia/src/sync/git/repo-file-watcher.ts index d164eec3c4dd..956cd3e580e1 100644 --- a/packages/insomnia/src/sync/git/repo-file-watcher.ts +++ b/packages/insomnia/src/sync/git/repo-file-watcher.ts @@ -42,10 +42,10 @@ import fs from 'node:fs'; import path from 'node:path'; import { BrowserWindow } from 'electron'; +import type { Workspace, WorkspaceMeta } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import YAML from 'yaml'; -import type { Workspace, WorkspaceMeta } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import type { WorkspaceFileIssue } from '~/main/git-service'; import { database as db } from '../../common/database'; diff --git a/packages/insomnia/src/sync/git/shallow-clone.ts b/packages/insomnia/src/sync/git/shallow-clone.ts index 44f0190bd540..e8536eb23230 100644 --- a/packages/insomnia/src/sync/git/shallow-clone.ts +++ b/packages/insomnia/src/sync/git/shallow-clone.ts @@ -1,7 +1,6 @@ +import type { GitRepository } from 'insomnia-data'; import * as git from 'isomorphic-git'; -import type { GitRepository } from '~/insomnia-data'; - import { GIT_CLONE_DIR, GIT_INTERNAL_DIR } from './git-vcs'; import { httpClient } from './http-client'; import { gitCallbacks } from './utils'; diff --git a/packages/insomnia/src/sync/git/utils.ts b/packages/insomnia/src/sync/git/utils.ts index c1907988f76a..6b6d9e78cdc8 100644 --- a/packages/insomnia/src/sync/git/utils.ts +++ b/packages/insomnia/src/sync/git/utils.ts @@ -1,7 +1,7 @@ +import type { GitAuthor } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import type { AuthCallback, AuthFailureCallback, AuthSuccessCallback, GitAuth, MessageCallback } from 'isomorphic-git'; -import type { GitAuthor } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { gitRemoteProviderRegistry } from '~/sync/git/providers'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/sync/ignore-keys.ts b/packages/insomnia/src/sync/ignore-keys.ts index 545911322668..a08af280f107 100644 --- a/packages/insomnia/src/sync/ignore-keys.ts +++ b/packages/insomnia/src/sync/ignore-keys.ts @@ -1,5 +1,5 @@ -import type { BaseModel, ProjectLintRuleset, Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { BaseModel, ProjectLintRuleset, Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; // Key for VCS to delete before computing changes const DELETE_KEY: keyof BaseModel = 'modified'; diff --git a/packages/insomnia/src/sync/types.ts b/packages/insomnia/src/sync/types.ts index 38f777c8edf0..01a091bac12a 100644 --- a/packages/insomnia/src/sync/types.ts +++ b/packages/insomnia/src/sync/types.ts @@ -1,4 +1,4 @@ -import type { BaseModel } from '~/insomnia-data'; +import type { BaseModel } from 'insomnia-data'; export interface Team { id: string; diff --git a/packages/insomnia/src/sync/vcs/initialize-backend-project.ts b/packages/insomnia/src/sync/vcs/initialize-backend-project.ts index f801bfd5d496..bef659769771 100644 --- a/packages/insomnia/src/sync/vcs/initialize-backend-project.ts +++ b/packages/insomnia/src/sync/vcs/initialize-backend-project.ts @@ -1,5 +1,5 @@ -import type { BaseModel, Project, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +import type { BaseModel, Project, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { database } from '../../common/database'; import type { Stage, StageEntry, Status, StatusCandidate } from '../types'; diff --git a/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts b/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts index 28e8cb4b60ba..98e77669912e 100644 --- a/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts +++ b/packages/insomnia/src/sync/vcs/migrate-projects-into-organization.ts @@ -1,5 +1,5 @@ -import type { Project, RemoteProject } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +import type { Project, RemoteProject } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { database } from '../../common/database'; diff --git a/packages/insomnia/src/templating/liquid-extension-worker.ts b/packages/insomnia/src/templating/liquid-extension-worker.ts index cb31981aa250..a9824e153727 100644 --- a/packages/insomnia/src/templating/liquid-extension-worker.ts +++ b/packages/insomnia/src/templating/liquid-extension-worker.ts @@ -1,8 +1,7 @@ +import type { CloudProviderCredential, Request, RequestGroup, Response, Workspace } from 'insomnia-data'; import type { Context, Emitter, Liquid, TagToken, TopLevelToken } from 'liquidjs'; import { Tag } from 'liquidjs'; -import type { CloudProviderCredential, Request, RequestGroup, Response, Workspace } from '~/insomnia-data'; - import packageJson from '../../package.json'; import type { Plugin } from '../plugins/index'; import { tokenizeArgs } from './tokenize-args'; diff --git a/packages/insomnia/src/templating/liquid-extension.ts b/packages/insomnia/src/templating/liquid-extension.ts index 8ce7c81b27cb..a5b34abac0b2 100644 --- a/packages/insomnia/src/templating/liquid-extension.ts +++ b/packages/insomnia/src/templating/liquid-extension.ts @@ -3,12 +3,12 @@ import crypto from 'node:crypto'; import os from 'node:os'; import iconv from 'iconv-lite'; -import type { Context, Emitter, Liquid,TagToken, TopLevelToken } from 'liquidjs'; +import type { Request, RequestGroup, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import type { Context, Emitter, Liquid, TagToken, TopLevelToken } from 'liquidjs'; import { Tag } from 'liquidjs'; import { jarFromCookies } from '~/common/cookies'; -import type { Request, RequestGroup, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { database as db } from '../common/database'; import * as pluginApp from '../plugins/context/app'; @@ -25,7 +25,11 @@ function resolveArg(arg: ReturnType[number], scope: Record< return arg.value; } -export function createLiquidTag(ext: PluginTemplateTag, plugin: Plugin, renderFn?: (str: string, opts: { context: Record }) => Promise): typeof Tag { +export function createLiquidTag( + ext: PluginTemplateTag, + plugin: Plugin, + renderFn?: (str: string, opts: { context: Record }) => Promise, +): typeof Tag { class InsomniTag extends Tag { private rawArgs: string; @@ -41,9 +45,7 @@ export function createLiquidTag(ext: PluginTemplateTag, plugin: Plugin, renderFn const renderPurpose = renderContext.getPurpose?.(); const parsedArgs = tokenizeArgs(this.rawArgs); - const args = parsedArgs - .map(a => resolveArg(a, scope)) - .map(decodeEncoding); + const args = parsedArgs.map(a => resolveArg(a, scope)).map(decodeEncoding); const helperContext: PluginTemplateTagContext = { ...pluginApp.init(), @@ -66,7 +68,7 @@ export function createLiquidTag(ext: PluginTemplateTag, plugin: Plugin, renderFn decode: async (buffer: Buffer, encoding = 'utf8') => iconv.decode(buffer, encoding), encode: async (input: string, encoding: BinaryToTextEncoding) => crypto.createHash('md5').update(input).digest(encoding), - render: (str: string) => renderFn ? renderFn(str, { context: renderContext }) : Promise.resolve(str), + render: (str: string) => (renderFn ? renderFn(str, { context: renderContext }) : Promise.resolve(str)), openInBrowser: (url: string) => window.main.openInBrowser(url), models: { request: { @@ -90,8 +92,7 @@ export function createLiquidTag(ext: PluginTemplateTag, plugin: Plugin, renderFn getByRequestId: services.oAuth2Token.getByParentId, }, cookieJar: { - getOrCreateForParentId: (parentId: string) => - services.cookieJar.getOrCreateForParentId(parentId), + getOrCreateForParentId: (parentId: string) => services.cookieJar.getOrCreateForParentId(parentId), getCookiesForUrl: async (parentId: string, url: string) => { const cookies = await services.cookieJar.getOrCreateForParentId(parentId); const jar = jarFromCookies(cookies.cookies); diff --git a/packages/insomnia/src/templating/types.ts b/packages/insomnia/src/templating/types.ts index 2171110aba07..e788e78ac66a 100644 --- a/packages/insomnia/src/templating/types.ts +++ b/packages/insomnia/src/templating/types.ts @@ -1,7 +1,5 @@ import type { BinaryToTextEncoding } from 'node:crypto'; -import type { Cookie } from 'tough-cookie'; - import type { CloudProviderCredential, CookieJar, @@ -19,7 +17,8 @@ import type { UserUploadEnvironment, WebSocketRequest, Workspace, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import type { Cookie } from 'tough-cookie'; type NodeCurlRequestType = Pick & Partial>; diff --git a/packages/insomnia/src/templating/utils.ts b/packages/insomnia/src/templating/utils.ts index ff7cfef78dd5..e4146ba01211 100644 --- a/packages/insomnia/src/templating/utils.ts +++ b/packages/insomnia/src/templating/utils.ts @@ -1,6 +1,6 @@ import type { EditorFromTextArea, MarkerRange } from 'codemirror'; +import { models, services } from 'insomnia-data'; -import { models, services } from '~/insomnia-data'; import { decryptSecretValue } from '~/utils/vault-crypto'; import type { NunjucksParsedTag, NunjucksParsedTagArg, RenderPurpose } from '../templating/types'; diff --git a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx index b0908117d7a9..d2d6de5cc2af 100644 --- a/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx +++ b/packages/insomnia/src/ui/components/.client/codemirror/code-editor.tsx @@ -11,6 +11,8 @@ import CodeMirror, { import type { GraphQLInfoOptions } from 'codemirror-graphql/info'; import type { ModifiedGraphQLJumpOptions } from 'codemirror-graphql/jump'; import deepEqual from 'deep-equal'; +import type { KeyCombination } from 'insomnia-data/common'; +import { isMac } from 'insomnia-data/common'; import { JSONPath } from 'jsonpath-plus'; import React, { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'; import { Button, Menu, MenuItem, MenuTrigger, Popover, Toolbar } from 'react-aria-components'; @@ -19,8 +21,6 @@ import vkBeautify from 'vkbeautify'; import { DEBOUNCE_MILLIS } from '~/common/constants'; import * as misc from '~/common/misc'; -import type { KeyCombination } from '~/insomnia-data/common'; -import { isMac } from '~/insomnia-data/common'; import { plugins } from '~/plugins/renderer-bridge'; import { useRootLoaderData } from '~/root'; import { getTagDefinitions } from '~/templating/renderer-safe'; diff --git a/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts b/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts index 71908de229bf..45de0ede29f6 100644 --- a/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts +++ b/packages/insomnia/src/ui/components/.client/codemirror/extensions/autocomplete.ts @@ -1,9 +1,9 @@ import 'codemirror/addon/mode/overlay'; import CodeMirror, { type EnvironmentAutocompleteOptions, type Hint, type ShowHintOptions } from 'codemirror'; +import { getPlatformKeyCombinations } from 'insomnia-data/common'; import { escapeRegex, fnOrString, isNotNullOrUndefined } from '~/common/misc'; -import { getPlatformKeyCombinations } from '~/insomnia-data/common'; import type { NunjucksParsedTag } from '~/templating/types'; import { getDefaultFill } from '~/templating/utils'; diff --git a/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx b/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx index 281502d7f144..b72420420d90 100644 --- a/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx +++ b/packages/insomnia/src/ui/components/.client/codemirror/one-line-editor.tsx @@ -3,13 +3,13 @@ import './base-imports'; import classnames from 'classnames'; import clone from 'clone'; import CodeMirror, { type EditorConfiguration, type EditorEventMap } from 'codemirror'; +import type { KeyCombination } from 'insomnia-data/common'; +import { isMac } from 'insomnia-data/common'; import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react'; import * as reactUse from 'react-use'; import { DEBOUNCE_MILLIS } from '~/common/constants'; import * as misc from '~/common/misc'; -import type { KeyCombination } from '~/insomnia-data/common'; -import { isMac } from '~/insomnia-data/common'; import { plugins } from '~/plugins/renderer-bridge'; import { useRootLoaderData } from '~/root'; import { getTagDefinitions } from '~/templating/renderer-safe'; diff --git a/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx b/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx index 3946949fb0ce..f977fce3d963 100644 --- a/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx +++ b/packages/insomnia/src/ui/components/base/dropdown/dropdown-hint.tsx @@ -1,4 +1,4 @@ -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import { Hotkey } from '../../hotkey'; diff --git a/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx b/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx index fbfc2b384cc7..6999980311ac 100644 --- a/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx +++ b/packages/insomnia/src/ui/components/base/dropdown/item-content.tsx @@ -1,7 +1,6 @@ +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React, { type CSSProperties, type FC, type PropsWithChildren, type ReactNode } from 'react'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; - import { SvgIcon } from '../../svg-icon'; import { PromptButton } from '../prompt-button'; import { DropdownHint } from './dropdown-hint'; diff --git a/packages/insomnia/src/ui/components/command-palette.tsx b/packages/insomnia/src/ui/components/command-palette.tsx index 2c91353ed792..ff0ef3ebd906 100644 --- a/packages/insomnia/src/ui/components/command-palette.tsx +++ b/packages/insomnia/src/ui/components/command-palette.tsx @@ -1,3 +1,5 @@ +import { models } from 'insomnia-data'; +import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from 'insomnia-data/common'; import React, { memo, useEffect, useRef } from 'react'; import { useState } from 'react'; import { @@ -21,8 +23,6 @@ import { import { useNavigate, useParams } from 'react-router'; import { scopeToBgColorMap, scopeToIconMap, scopeToLabelMap, scopeToTextColorMap } from '~/common/get-workspace-label'; -import { models } from '~/insomnia-data'; -import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useCommandsLoaderFetcher } from '~/routes/commands'; import { useInsomniaSyncPullRemoteFileActionFetcher } from '~/routes/organization.$organizationId.insomnia-sync.pull-remote-file'; diff --git a/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx index c130c30a1573..4719c021f27e 100644 --- a/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx @@ -1,4 +1,11 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import type { + AuthTypeAPIKey, + AuthTypeAwsIam, + AuthTypeBasic, + AuthTypeNTLM, + RequestAuthentication, +} from 'insomnia-data'; import React, { type FC, useCallback } from 'react'; import { Button, @@ -13,14 +20,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { - AuthTypeAPIKey, - AuthTypeAwsIam, - AuthTypeBasic, - AuthTypeNTLM, - RequestAuthentication, -} from '~/insomnia-data'; - import { type AuthTypes, GRANT_TYPE_AUTHORIZATION_CODE, diff --git a/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx index a9cfc621f26d..3d5bda075181 100644 --- a/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx @@ -1,4 +1,6 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import type { Request, RequestBody, RequestHeader, RequestParameter } from 'insomnia-data'; +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import React, { type FC } from 'react'; import { Button, @@ -13,9 +15,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { Request, RequestBody, RequestHeader, RequestParameter } from '~/insomnia-data'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; - import { CONTENT_TYPE_EDN, CONTENT_TYPE_FILE, diff --git a/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx index 4223f11fc140..130ba7dd0951 100644 --- a/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/git-project-sync-dropdown.tsx @@ -1,4 +1,6 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitProject, GitRepository } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { type FC, useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -15,8 +17,6 @@ import { import { useParams, useRevalidator } from 'react-router'; import * as reactUse from 'react-use'; -import type { GitProject, GitRepository } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useGitProjectCheckoutBranchActionFetcher } from '~/routes/git.branch.checkout'; import { useGitProjectFetchActionFetcher } from '~/routes/git.fetch'; import { useGitProjectPushActionFetcher } from '~/routes/git.push'; diff --git a/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx index cc6da54a19e2..b9ba6d153e17 100644 --- a/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx @@ -1,4 +1,5 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitRepository } from 'insomnia-data'; import { type FC, useEffect, useState } from 'react'; import { Button, @@ -14,7 +15,6 @@ import { import { useParams, useRevalidator } from 'react-router'; import * as reactUse from 'react-use'; -import type { GitRepository } from '~/insomnia-data'; import { useGitProjectCheckoutBranchActionFetcher } from '~/routes/git.branch.checkout'; import { useGitProjectFetchActionFetcher } from '~/routes/git.fetch'; import { useGitProjectPushActionFetcher } from '~/routes/git.push'; diff --git a/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx index 1c94fb2cf24b..f7b25a101b9a 100644 --- a/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/mcp-actions-dropdown.tsx @@ -1,10 +1,10 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import type { McpRequest, McpServerPrimitiveTypes } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React from 'react'; import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; import type { McpServerData } from '~/common/mcp-utils'; -import type { McpRequest, McpServerPrimitiveTypes } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import { Icon } from '../icon'; import type { PrimitiveTypeItem } from '../mcp/types'; diff --git a/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx index 3385879e8f75..648b5941dbcd 100644 --- a/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx @@ -1,9 +1,8 @@ +import { models, services } from 'insomnia-data'; +import { getPreviewModeName, PREVIEW_MODE_SOURCE, PREVIEW_MODES } from 'insomnia-data/common'; import React, { type FC, useCallback } from 'react'; import { Button } from 'react-aria-components'; -import { models, services } from '~/insomnia-data'; -import { getPreviewModeName, PREVIEW_MODE_SOURCE, PREVIEW_MODES } from '~/insomnia-data/common'; - import { exportHarCurrentRequest } from '../../../common/har'; import { type RequestLoaderData, diff --git a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx index 5ae19919a037..b8be3272654b 100644 --- a/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx @@ -1,8 +1,4 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; -import React, { Fragment, useCallback, useState } from 'react'; -import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; -import { useParams } from 'react-router'; - import type { GrpcRequest, Project, @@ -11,9 +7,13 @@ import type { SocketIORequest, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; +import React, { Fragment, useCallback, useState } from 'react'; +import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; +import { useParams } from 'react-router'; + import { plugins } from '~/plugins/renderer-bridge'; import { useRootLoaderData } from '~/root'; import { useRequestDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate'; diff --git a/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx index bf33d1d7f0f3..a48b3579a315 100644 --- a/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx @@ -1,11 +1,11 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import type { Project, Request, RequestGroup, Workspace } from 'insomnia-data'; +import { services } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React, { Fragment, useRef, useState } from 'react'; import { Button, Collection, Header, Menu, MenuItem, MenuSection, MenuTrigger, Popover } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { Project, Request, RequestGroup, Workspace } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import { plugins } from '~/plugins/renderer-bridge'; import { useRootLoaderData } from '~/root'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; diff --git a/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx index ab101b080f55..0d8b9a165e16 100644 --- a/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx @@ -1,8 +1,4 @@ import { differenceInHours, differenceInMinutes, isThisWeek, isToday } from 'date-fns'; -import React, { useCallback, useEffect, useRef, useState } from 'react'; -import { Button } from 'react-aria-components'; -import { useParams } from 'react-router'; - import type { McpResponse, Request, @@ -11,8 +7,12 @@ import type { SocketIOResponse, WebSocketRequest, WebSocketResponse, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; +import { Button } from 'react-aria-components'; +import { useParams } from 'react-router'; + import { useRequestResponseDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete'; import { useRequestResponseDeleteAllActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.response.delete-all'; diff --git a/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx index fe766a8a80ca..42c64c8b05ba 100644 --- a/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/sidebar-project-dropdown.tsx @@ -1,5 +1,7 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; import type { StorageRules } from 'insomnia-api'; +import type { GitRepository, Project, WorkspaceScope } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { type FC, Fragment, useEffect, useState } from 'react'; import { Button, @@ -20,8 +22,6 @@ import * as reactUse from 'react-use'; import type { SORT_ORDERS } from '~/common/constants'; import { sortOrderName } from '~/common/constants'; import { scopeToBgColorMap, scopeToTextColorMap } from '~/common/get-workspace-label'; -import type { GitRepository, Project, WorkspaceScope } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useProjectDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.delete'; import { NewWorkspaceModal } from '~/ui/components/modals/new-workspace-modal'; diff --git a/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx index 34d50b121e45..ba56f67b863e 100644 --- a/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/sidebar-workspace-dropdown.tsx @@ -4,6 +4,9 @@ import { exportMcpClientToFile, exportMockServerToFile, } from 'insomnia/src/ui/components/settings/import-export'; +import type { Project, Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; import React, { Fragment, useState } from 'react'; import { Button, @@ -25,9 +28,6 @@ import { } from 'react-aria-components'; import { href } from 'react-router'; -import type { Project, Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { useRequestGroupNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new'; import { useWorkspaceDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.delete'; diff --git a/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx index f757039e8077..58528485929e 100644 --- a/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx @@ -1,4 +1,5 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { Project, Workspace } from 'insomnia-data'; import React, { type FC, Fragment, useCallback, useEffect, useState } from 'react'; import { Button, @@ -15,7 +16,6 @@ import { import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import type { Project, Workspace } from '~/insomnia-data'; import { useInsomniaSyncBranchCheckoutActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.branch.checkout'; import { useInsomniaSyncPullActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.pull'; import { useInsomniaSyncPushActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.push'; diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx index 392861d59e96..015eef427a83 100644 --- a/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx @@ -3,12 +3,12 @@ import { exportMcpClientToFile, exportMockServerToFile, } from 'insomnia/src/ui/components/settings/import-export'; +import type { ApiSpec, MockServer, Project, Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { type FC, Fragment, useCallback, useState } from 'react'; import { Button, Dialog, Heading, Label, Modal, ModalOverlay, Radio, RadioGroup } from 'react-aria-components'; import { href, useParams } from 'react-router'; -import type { ApiSpec, MockServer, Project, Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useWorkspaceDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.delete'; import { useWorkspaceUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.update'; import { useTabNavigate } from '~/ui/hooks/use-insomnia-tab'; diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx index 7c7e39a50bb8..71f514b91b0c 100644 --- a/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx @@ -4,6 +4,10 @@ import { exportMcpClientToFile, exportMockServerToFile, } from 'insomnia/src/ui/components/settings/import-export'; +import type { Workspace } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import type { PlatformKeyCombinations } from 'insomnia-data/common'; +import { invariant } from 'insomnia-data/common'; import { type FC, type ReactNode, useCallback, useEffect, useState } from 'react'; import { Button, @@ -24,10 +28,6 @@ import { } from 'react-aria-components'; import { href, useNavigate, useParams } from 'react-router'; -import type { Workspace } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import type { PlatformKeyCombinations } from '~/insomnia-data/common'; -import { invariant } from '~/insomnia-data/common'; import { useWorkspaceDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.delete'; import { useWorkspaceUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.update'; diff --git a/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx b/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx index a325f3767052..d34ff64ce383 100644 --- a/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx +++ b/packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx @@ -1,6 +1,6 @@ +import { models } from 'insomnia-data'; import React, { type FC } from 'react'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; diff --git a/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx b/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx index 6d4fe061047e..da0f6a25e6fe 100644 --- a/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/auth-wrapper.tsx @@ -1,8 +1,8 @@ +import type { RequestAuthentication } from 'insomnia-data'; import React, { type FC, type ReactNode } from 'react'; import { Toolbar } from 'react-aria-components'; import type { AuthTypes } from '~/common/constants'; -import type { RequestAuthentication } from '~/insomnia-data'; import { SingleTokenAuth } from '~/ui/components/editors/auth/single-token-auth'; import { getAuthObjectOrNull } from '../../../../network/authentication'; diff --git a/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx b/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx index ddae9b23d6ce..52ed051b315d 100644 --- a/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx @@ -1,7 +1,7 @@ import classnames from 'classnames'; +import type { RequestAccordionKeys } from 'insomnia-data'; import React, { type FC, type PropsWithChildren } from 'react'; -import type { RequestAccordionKeys } from '~/insomnia-data'; import { type RequestLoaderData, useRequestLoaderData, diff --git a/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx b/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx index e9acca4e878f..842023ffa8e2 100644 --- a/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx @@ -1,7 +1,7 @@ +import type { RequestAuthentication } from 'insomnia-data'; import React, { type ChangeEvent, type FC, type ReactNode, useCallback } from 'react'; import { toKebabCase } from '~/common/misc'; -import type { RequestAuthentication } from '~/insomnia-data'; import { getAuthObjectOrNull } from '~/network/authentication'; import { type RequestLoaderData, diff --git a/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx b/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx index 9dbee46702fd..967bb0e66576 100644 --- a/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx @@ -1,3 +1,4 @@ +import type { AuthTypeOAuth1 } from 'insomnia-data'; import React, { type FC } from 'react'; import { @@ -7,7 +8,6 @@ import { SIGNATURE_METHOD_PLAINTEXT, SIGNATURE_METHOD_RSA_SHA1, } from '~/common/constants'; -import type { AuthTypeOAuth1 } from '~/insomnia-data'; import { type RequestLoaderData, diff --git a/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx b/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx index d8586c05849b..9a0e6b794b0a 100644 --- a/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx +++ b/packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx @@ -1,7 +1,7 @@ +import type { AuthTypeOAuth2, OAuth2ResponseType, OAuth2Token, RequestAuthentication } from 'insomnia-data'; +import { services } from 'insomnia-data'; import React, { type ChangeEvent, type FC, type ReactNode, useEffect, useMemo, useState } from 'react'; -import type { AuthTypeOAuth2, OAuth2ResponseType, OAuth2Token, RequestAuthentication } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { clearOAuthWindowSessionId } from '~/ui/spawn-oauth-window'; import { diff --git a/packages/insomnia/src/ui/components/editors/body/body-editor.tsx b/packages/insomnia/src/ui/components/editors/body/body-editor.tsx index bc7d35897e53..3016a38e619f 100644 --- a/packages/insomnia/src/ui/components/editors/body/body-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/body/body-editor.tsx @@ -1,13 +1,12 @@ import clone from 'clone'; +import type { Request, RequestBodyParameter } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_GRAPHQL, getContentTypeFromHeaders } from 'insomnia-data/common'; import { lookup } from 'mime-types'; import React, { type FC, useCallback } from 'react'; import { Toolbar } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { Request, RequestBodyParameter } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_GRAPHQL, getContentTypeFromHeaders } from '~/insomnia-data/common'; - import { CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA } from '../../../../common/constants'; import { documentationLinks } from '../../../../common/documentation'; import { getContentTypeHeader } from '../../../../common/misc'; diff --git a/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx b/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx index c607111275c4..ec5ff7e26ebe 100644 --- a/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx @@ -16,14 +16,14 @@ import { typeFromAST, } from 'graphql'; import type { Maybe } from 'graphql-language-service'; +import type { Request } from 'insomnia-data'; +import { services } from 'insomnia-data'; import React, { type FC, useCallback, useEffect, useRef, useState } from 'react'; import { Button, Group, Heading, Toolbar, Tooltip, TooltipTrigger } from 'react-aria-components'; import ReactDOM from 'react-dom'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import * as reactUse from 'react-use'; -import type { Request } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import { CONTENT_TYPE_JSON } from '../../../../common/constants'; diff --git a/packages/insomnia/src/ui/components/editors/environment-editor.tsx b/packages/insomnia/src/ui/components/editors/environment-editor.tsx index b7b1a1cb3e79..6f6b88c445c1 100644 --- a/packages/insomnia/src/ui/components/editors/environment-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/environment-editor.tsx @@ -1,7 +1,7 @@ +import { isWindows } from 'insomnia-data/common'; import orderedJSON from 'json-order'; import React, { forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react'; -import { isWindows } from '~/insomnia-data/common'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import { checkNestedKeys } from '~/utils/environment-utils'; diff --git a/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx b/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx index 5d392674900a..3d89544d67a8 100644 --- a/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/environment-key-value-editor/key-value-editor.tsx @@ -1,3 +1,5 @@ +import type { EnvironmentKvPairData } from 'insomnia-data'; +import { EnvironmentKvPairDataType } from 'insomnia-data'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -13,8 +15,6 @@ import { useDragAndDrop, } from 'react-aria-components'; -import type { EnvironmentKvPairData } from '~/insomnia-data'; -import { EnvironmentKvPairDataType } from '~/insomnia-data'; import { OneLineEditor } from '~/ui/components/.client/codemirror/one-line-editor'; import { checkNestedKeys, ensureKeyIsValid } from '~/utils/environment-utils'; diff --git a/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx b/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx index 5c3a6af09bfc..d7aa9dfc3e7c 100644 --- a/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx +++ b/packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx @@ -1,8 +1,8 @@ +import { models } from 'insomnia-data'; import React, { useState } from 'react'; import { Button } from 'react-aria-components'; import { useNavigate, useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useRequestLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId'; import { diff --git a/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx b/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx index 2bddd476788f..83a020a1c175 100644 --- a/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx @@ -1,7 +1,7 @@ +import type { RequestHeader } from 'insomnia-data'; import React, { type FC, useCallback } from 'react'; import { useParams } from 'react-router'; -import type { RequestHeader } from '~/insomnia-data'; import { useMockRouteLoaderData, useMockRoutePatcher, diff --git a/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx b/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx index d8bc4623b419..617d118f9577 100644 --- a/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/request-headers-editor.tsx @@ -1,7 +1,7 @@ +import type { RequestHeader } from 'insomnia-data'; import React, { type FC, useCallback } from 'react'; import { useParams } from 'react-router'; -import type { RequestHeader } from '~/insomnia-data'; import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor'; import { getCommonHeaderNames, getCommonHeaderValues } from '../../../common/common-headers'; diff --git a/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx b/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx index 6192625a4d33..f0c85bc19ad7 100644 --- a/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx @@ -1,7 +1,7 @@ +import type { RequestParameter } from 'insomnia-data'; import { type FC, useCallback } from 'react'; import { useParams } from 'react-router'; -import type { RequestParameter } from '~/insomnia-data'; import { type RequestLoaderData, useRequestLoaderData, diff --git a/packages/insomnia/src/ui/components/editors/request-script-editor.tsx b/packages/insomnia/src/ui/components/editors/request-script-editor.tsx index a7466409887e..3575fbd53f83 100644 --- a/packages/insomnia/src/ui/components/editors/request-script-editor.tsx +++ b/packages/insomnia/src/ui/components/editors/request-script-editor.tsx @@ -1,4 +1,5 @@ import type { Snippet } from 'codemirror'; +import type { Settings } from 'insomnia-data'; import React, { type FC, useRef } from 'react'; import { Button, @@ -12,7 +13,6 @@ import { Toolbar, } from 'react-aria-components'; -import type { Settings } from '~/insomnia-data'; import { translateHandlersInScript } from '~/main/importers/importers/translate-postman-script'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/environment-picker.tsx b/packages/insomnia/src/ui/components/environment-picker.tsx index 22ce95f41680..4e82bfcb5850 100644 --- a/packages/insomnia/src/ui/components/environment-picker.tsx +++ b/packages/insomnia/src/ui/components/environment-picker.tsx @@ -1,4 +1,5 @@ import type { IconName } from '@fortawesome/fontawesome-svg-core'; +import { models } from 'insomnia-data'; import { Fragment } from 'react'; import { Button, @@ -14,7 +15,6 @@ import { } from 'react-aria-components'; import { useNavigate, useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { useSetActiveEnvironmentFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active'; import { useEnvironmentSetActiveGlobalActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.set-active-global'; import { Tooltip } from '~/ui/components/tooltip'; diff --git a/packages/insomnia/src/ui/components/first-request-creation.tsx b/packages/insomnia/src/ui/components/first-request-creation.tsx index 8f080bc28b03..9cd4243a6840 100644 --- a/packages/insomnia/src/ui/components/first-request-creation.tsx +++ b/packages/insomnia/src/ui/components/first-request-creation.tsx @@ -1,11 +1,11 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { Request } from 'insomnia-data'; import { type KeyboardEvent as ReactKeyboardEvent, useEffect, useRef, useState } from 'react'; import { useNavigate, useParams } from 'react-router'; import { Button } from '~/basic-components/button'; import { SelectPopover } from '~/basic-components/select-popover'; import { getProjectRecentRequests, type RecentProjectRequest } from '~/common/project'; -import type { Request } from '~/insomnia-data'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { useWorkspaceNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.new'; import { createKeybindingsHandler, useKeyboardShortcuts } from '~/ui/components/keydown-binder'; diff --git a/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx b/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx index fded46a573c1..587c60af245a 100644 --- a/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx +++ b/packages/insomnia/src/ui/components/git-credentials/git-custom-credential-form.tsx @@ -1,7 +1,7 @@ +import type { CustomGitCredentialV2 } from 'insomnia-data'; import { Form } from 'react-aria-components'; import { Button } from '~/basic-components/button'; -import type { CustomGitCredentialV2 } from '~/insomnia-data'; import { useGitCredentialsUpdateActionFetcher } from '~/routes/git-credentials.$id.update'; import { useGitCredentialsCreateActionFetcher } from '~/routes/git-credentials.create'; import { Input } from '~/ui/components/base/input'; diff --git a/packages/insomnia/src/ui/components/git/connection-info.tsx b/packages/insomnia/src/ui/components/git/connection-info.tsx index 621be6b611c1..11704ced4a46 100644 --- a/packages/insomnia/src/ui/components/git/connection-info.tsx +++ b/packages/insomnia/src/ui/components/git/connection-info.tsx @@ -1,9 +1,9 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitRepository } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button, Separator } from 'react-aria-components'; import { Icon } from '~/basic-components/icon'; -import type { GitRepository } from '~/insomnia-data'; import { showSettingsModal } from '~/ui/components/modals/settings-modal'; export const GitConnectionInfo = ({ diff --git a/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx b/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx index d4b54de4f9ba..e91e1e9f9f38 100644 --- a/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx +++ b/packages/insomnia/src/ui/components/git/git-oauth-auth-banner.tsx @@ -1,11 +1,11 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitCredentials, GitRepository } from 'insomnia-data'; import type { FC } from 'react'; import { useEffect, useRef, useState } from 'react'; import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; import { Banner } from '~/basic-components/banner'; import { Icon } from '~/basic-components/icon'; -import type { GitCredentials, GitRepository } from '~/insomnia-data'; import { GIT_PROVIDER_COMPLETE_SIGN_IN_FETCHER_KEY, useGitProviderCompleteSignInFetcher, diff --git a/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts b/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts index 9f63200a506e..b00c55b000e1 100644 --- a/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts +++ b/packages/insomnia/src/ui/components/git/git-oauth-auth-utils.ts @@ -1,5 +1,6 @@ -import type { GitCredentials, GitRepository } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +import type { GitCredentials, GitRepository } from 'insomnia-data'; +import { models } from 'insomnia-data'; + import { getOauth2FormatName } from '~/sync/git/get-oauth2-format-name'; const { isGitCredentialsV2, isOAuthCredential } = models.gitCredentials; diff --git a/packages/insomnia/src/ui/components/github-app-config-link.tsx b/packages/insomnia/src/ui/components/github-app-config-link.tsx index 7c7d4554820f..c18a62f6df73 100644 --- a/packages/insomnia/src/ui/components/github-app-config-link.tsx +++ b/packages/insomnia/src/ui/components/github-app-config-link.tsx @@ -1,4 +1,5 @@ -import type { GitRepository } from '~/insomnia-data'; +import type { GitRepository } from 'insomnia-data'; + import { getOauth2FormatName } from '~/sync/git/get-oauth2-format-name'; import { getAppWebsiteBaseURL } from '../../common/constants'; diff --git a/packages/insomnia/src/ui/components/hotkey.tsx b/packages/insomnia/src/ui/components/hotkey.tsx index 4be0eb5c5de1..aeced0446630 100644 --- a/packages/insomnia/src/ui/components/hotkey.tsx +++ b/packages/insomnia/src/ui/components/hotkey.tsx @@ -1,9 +1,8 @@ import classnames from 'classnames'; +import type { KeyCombination, PlatformKeyCombinations } from 'insomnia-data/common'; +import { constructKeyCombinationDisplay, getPlatformKeyCombinations, isMac } from 'insomnia-data/common'; import React, { type FC, memo } from 'react'; -import type { KeyCombination, PlatformKeyCombinations } from '~/insomnia-data/common'; -import { constructKeyCombinationDisplay, getPlatformKeyCombinations, isMac } from '~/insomnia-data/common'; - interface Props { /** One of these two must be given. If both is given, keyCombination will be used. */ keyCombination?: KeyCombination; diff --git a/packages/insomnia/src/ui/components/keydown-binder.ts b/packages/insomnia/src/ui/components/keydown-binder.ts index 3f9316ea47e6..b88016f1fd04 100644 --- a/packages/insomnia/src/ui/components/keydown-binder.ts +++ b/packages/insomnia/src/ui/components/keydown-binder.ts @@ -1,3 +1,5 @@ +import type { KeyboardShortcut, KeyCombination } from 'insomnia-data/common'; +import { getPlatformKeyCombinations, keyboardKeys } from 'insomnia-data/common'; import { useEffect } from 'react'; import { createKeybindingsHandler as _createKeybindingsHandler, @@ -6,8 +8,6 @@ import { tinykeys, } from 'tinykeys'; -import type { KeyboardShortcut, KeyCombination } from '~/insomnia-data/common'; -import { getPlatformKeyCombinations, keyboardKeys } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; const keyCombinationToTinyKeyString = ({ ctrl, alt, shift, meta, keyCode }: KeyCombination): string => diff --git a/packages/insomnia/src/ui/components/mcp/event-view.tsx b/packages/insomnia/src/ui/components/mcp/event-view.tsx index 222e0f8c1895..f51fdafa3a24 100644 --- a/packages/insomnia/src/ui/components/mcp/event-view.tsx +++ b/packages/insomnia/src/ui/components/mcp/event-view.tsx @@ -4,18 +4,17 @@ import { ElicitRequestSchema, } from '@modelcontextprotocol/sdk/types.js'; import { type RJSFSchema } from '@rjsf/utils'; -import React, { useCallback, useEffect, useRef, useState } from 'react'; -import { Button } from 'react-aria-components'; -import { useParams } from 'react-router'; - -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { getPreviewModeName, PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW, PREVIEW_MODE_SOURCE, PREVIEW_MODES, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; +import React, { useCallback, useEffect, useRef, useState } from 'react'; +import { Button } from 'react-aria-components'; +import { useParams } from 'react-router'; import { METHOD_CALL_TOOL } from '../../../common/mcp-utils'; import type { McpEvent } from '../../../main/mcp/types'; diff --git a/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx b/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx index fc769db7cc38..f72d758f92a6 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-pane.tsx @@ -1,5 +1,6 @@ import { useVirtualizer } from '@tanstack/react-virtual'; import cn from 'classnames'; +import type { McpRequest, McpServerPrimitiveTypes } from 'insomnia-data'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -25,7 +26,6 @@ import { METHOD_LIST_TOOLS, } from '~/common/mcp-utils'; import { fuzzyMatchAll } from '~/common/misc'; -import type { McpRequest, McpServerPrimitiveTypes } from '~/insomnia-data'; import type { McpEvent, McpMessageEvent } from '~/main/mcp/types'; import { useRootLoaderData } from '~/root'; import { diff --git a/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx b/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx index 6f05a91fe2e5..d864337c3d59 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-request-pane.tsx @@ -1,5 +1,6 @@ import { type RJSFSchema } from '@rjsf/utils'; import type { EditorChange } from 'codemirror'; +import type { Environment, EnvironmentKvPairData, McpPayload } from 'insomnia-data'; import React, { type FC, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; @@ -7,7 +8,6 @@ import { useLatest } from 'react-use'; import { docsMcpClient } from '~/common/documentation'; import { buildResourceJsonSchema, fillUriTemplate } from '~/common/mcp-utils'; -import type { Environment, EnvironmentKvPairData, McpPayload } from '~/insomnia-data'; import type { McpReadyState } from '~/main/mcp/types'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { Link } from '~/ui/components/base/link'; diff --git a/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx b/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx index 5aaea80e50a1..7355bd1d9979 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-roots-panel.tsx @@ -1,8 +1,8 @@ import type { Root } from '@modelcontextprotocol/sdk/types.js'; +import type { McpRequest } from 'insomnia-data'; import { useState } from 'react'; import { Button, Heading, ListBox, ListBoxItem, Toolbar } from 'react-aria-components'; -import type { McpRequest } from '~/insomnia-data'; import type { McpReadyState } from '~/main/mcp/types'; import { AnalyticsEvent } from '~/ui/analytics'; import { PromptButton } from '~/ui/components/base/prompt-button'; diff --git a/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx b/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx index 81b6698e93de..5a03a09ca308 100644 --- a/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx +++ b/packages/insomnia/src/ui/components/mcp/mcp-url-bar.tsx @@ -1,11 +1,11 @@ +import type { AuthTypeOAuth2, McpRequest, Project } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useRef } from 'react'; import { OverlayContainer } from 'react-aria'; import { Button as RaButton, Heading, Radio, RadioGroup } from 'react-aria-components'; import { useParams } from 'react-router'; import { useLatest } from 'react-use'; -import type { AuthTypeOAuth2, McpRequest, Project } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import type { McpReadyState } from '~/main/mcp/types'; import { _buildBearerHeader } from '~/network/authentication'; import { getBasicAuthHeader } from '~/network/basic-auth/get-header'; diff --git a/packages/insomnia/src/ui/components/mcp/types.ts b/packages/insomnia/src/ui/components/mcp/types.ts index d897703b31cc..c952f5cfe4f6 100644 --- a/packages/insomnia/src/ui/components/mcp/types.ts +++ b/packages/insomnia/src/ui/components/mcp/types.ts @@ -1,6 +1,5 @@ import type { Prompt, Resource, ResourceTemplate, Tool } from '@modelcontextprotocol/sdk/types.js'; - -import type { McpServerPrimitiveTypes } from '~/insomnia-data'; +import type { McpServerPrimitiveTypes } from 'insomnia-data'; interface CommonItemProps { itemLevel: number; diff --git a/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx b/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx index 9c8652c2c7f3..f8a47791be4e 100644 --- a/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx +++ b/packages/insomnia/src/ui/components/mocks/mock-response-pane.tsx @@ -1,11 +1,11 @@ import { fetchMockbinLogs, type MockbinLogOutput } from 'insomnia-api'; +import type { MockRoute, MockServer, Response, ResponseTimelineEntry } from 'insomnia-data'; +import { services } from 'insomnia-data'; +import { getPreviewModeName, PREVIEW_MODE_FRIENDLY, PREVIEW_MODES, type PreviewMode } from 'insomnia-data/common'; import React, { Fragment, useCallback, useEffect, useState } from 'react'; import { Button, Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; import * as reactUse from 'react-use'; -import type { MockRoute, MockServer, Response, ResponseTimelineEntry } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; -import { getPreviewModeName, PREVIEW_MODE_FRIENDLY, PREVIEW_MODES, type PreviewMode } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useRequestNewMockSendActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new-mock-send'; import { useMockRouteLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId'; diff --git a/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx b/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx index 35431e819ac1..9432cd3b5c42 100644 --- a/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx +++ b/packages/insomnia/src/ui/components/mocks/mock-url-bar.tsx @@ -1,8 +1,8 @@ +import { services } from 'insomnia-data'; import React, { useEffect, useRef, useState } from 'react'; import { Button } from 'react-aria-components'; import * as reactUse from 'react-use'; -import { services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useMockRouteLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId'; diff --git a/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts b/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts index fdd52bc015e6..f57b2ec5944b 100644 --- a/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts +++ b/packages/insomnia/src/ui/components/modals/__tests__/import-export.test.ts @@ -1,4 +1,5 @@ import { exportRequestsHAR, exportWorkspacesHAR } from 'insomnia/src/common/har'; +import { database as db, services } from 'insomnia-data'; import { beforeEach, describe, expect, it, vi } from 'vitest'; vi.mock('~/network/network-adapter', () => ({ @@ -12,8 +13,6 @@ vi.mock('~/network/network-adapter', () => ({ applyResponseHooks: (response: any) => Promise.resolve(response), })); -import { database as db, services } from '~/insomnia-data'; - // @vitest-environment jsdom describe('exportWorkspacesHAR() and exportRequestsHAR()', () => { beforeEach(async () => { diff --git a/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx b/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx index 9e520937c6b0..8969e184daa8 100644 --- a/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/add-key-combination-modal.tsx @@ -1,9 +1,8 @@ import classnames from 'classnames'; +import type { KeyboardShortcut, KeyCombination } from 'insomnia-data/common'; +import { constructKeyCombinationDisplay, isModifierKeyCode, keyboardKeys } from 'insomnia-data/common'; import React, { forwardRef, type KeyboardEvent, useImperativeHandle, useRef, useState } from 'react'; -import type { KeyboardShortcut, KeyCombination } from '~/insomnia-data/common'; -import { constructKeyCombinationDisplay, isModifierKeyCode, keyboardKeys } from '~/insomnia-data/common'; - import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; import { ModalBody } from '../base/modal-body'; import { ModalHeader } from '../base/modal-header'; diff --git a/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx b/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx index b93047b18815..8cbf29cf48b5 100644 --- a/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/add-request-to-collection-modal.tsx @@ -1,10 +1,10 @@ +import type { BaseModel, Project } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import React, { type FC, type MouseEventHandler, useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; import { useParams } from 'react-router'; -import type { BaseModel, Project } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx index aff0492789db..37a86ac396c5 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/aws-credential-form.tsx @@ -1,13 +1,12 @@ -import React, { useState } from 'react'; -import { Button, Input, Label, TextField } from 'react-aria-components'; - import { AWSCredentialType, type AWSFileCredential, type AWSTemporaryCredential, type CloudProviderCredential, type CloudProviderName, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import React, { useState } from 'react'; +import { Button, Input, Label, TextField } from 'react-aria-components'; import { HelpTooltip } from '../../help-tooltip'; import { Icon } from '../../icon'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx index a86562901d35..837660aa56d9 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/cloud-credential-modal.tsx @@ -1,8 +1,8 @@ +import type { CloudProviderCredential } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; -import type { CloudProviderCredential } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useUpdateCloudCredentialActionFetcher } from '~/routes/cloud-credentials.$cloudCredentialId.update'; import { useCreateCloudCredentialActionFetcher } from '~/routes/cloud-credentials.create'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx index c2b2b91586b9..5e782e7d26d7 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/gcp-credential-form.tsx @@ -1,8 +1,7 @@ +import type { CloudProviderCredential, CloudProviderName } from 'insomnia-data'; import React, { useState } from 'react'; import { Button, Input, Label, TextField } from 'react-aria-components'; -import type { CloudProviderCredential, CloudProviderName } from '~/insomnia-data'; - import { HelpTooltip } from '../../help-tooltip'; import { Icon } from '../../icon'; diff --git a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx index 8d53b8d6f31b..58b7ac72fb9f 100644 --- a/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx +++ b/packages/insomnia/src/ui/components/modals/cloud-credential-modal/hashicorp-credential-form.tsx @@ -1,6 +1,3 @@ -import React, { useState } from 'react'; -import { Button, Input, Label, TextField } from 'react-aria-components'; - import type { CloudProviderCredential, CloudProviderName, @@ -9,8 +6,10 @@ import type { HCPVaultDedicatedTokenCredential, VaultAppRoleCredential, VaultTokenCredential, -} from '~/insomnia-data'; -import { HashiCorpCredentialType, HashiCorpVaultAuthMethod } from '~/insomnia-data'; +} from 'insomnia-data'; +import { HashiCorpCredentialType, HashiCorpVaultAuthMethod } from 'insomnia-data'; +import React, { useState } from 'react'; +import { Button, Input, Label, TextField } from 'react-aria-components'; import { HelpTooltip } from '../../help-tooltip'; import { Icon } from '../../icon'; diff --git a/packages/insomnia/src/ui/components/modals/cookies-modal.tsx b/packages/insomnia/src/ui/components/modals/cookies-modal.tsx index 6bae82a3cd39..f06a626eb153 100644 --- a/packages/insomnia/src/ui/components/modals/cookies-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/cookies-modal.tsx @@ -1,5 +1,6 @@ import clone from 'clone'; import { isValid } from 'date-fns'; +import type { Cookie, CookieJar } from 'insomnia-data'; import React, { useState } from 'react'; import { Button, @@ -21,7 +22,6 @@ import { useParams } from 'react-router'; import { Cookie as ToughCookie } from 'tough-cookie'; import { v4 as uuidv4 } from 'uuid'; -import type { Cookie, CookieJar } from '~/insomnia-data'; import { useUpdateCookieJarActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.update-cookie-jar'; import { OneLineEditor } from '~/ui/components/.client/codemirror/one-line-editor'; diff --git a/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx b/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx index 13e7d22d7afa..e691f64f7d5b 100644 --- a/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/export-requests-modal.tsx @@ -1,11 +1,10 @@ import { exportRequestsToFile } from 'insomnia/src/ui/components/settings/import-export'; +import type { GrpcRequest, Request, RequestGroup, SocketIORequest, WebSocketRequest } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { type FC, type ReactNode, useEffect, useState } from 'react'; import { Button, Checkbox, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { GrpcRequest, Request, RequestGroup, SocketIORequest, WebSocketRequest } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import { type Child, useWorkspaceLoaderFetcher, diff --git a/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx b/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx index 31cb5dfaf072..6e65527ca9f4 100644 --- a/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/generate-code-modal.tsx @@ -1,8 +1,8 @@ import type { HTTPSnippetClient, HTTPSnippetTarget } from 'httpsnippet'; +import type { Request } from 'insomnia-data'; import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'; import { Button } from 'react-aria-components'; -import type { Request } from '~/insomnia-data'; import { AnalyticsEvent } from '~/ui/analytics'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx b/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx index 0aad2401c964..bb433ef658f6 100644 --- a/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/git-project-migration-modal.tsx @@ -1,3 +1,4 @@ +import type { WorkspaceScope } from 'insomnia-data'; import React, { type FC } from 'react'; import { Button, @@ -14,7 +15,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { WorkspaceScope } from '~/insomnia-data'; import { useGitProjectMigrateLegacyInsomniaFolderActionFetcher } from '~/routes/git.migrate-legacy-insomnia-folder-to-file'; import { diff --git a/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx b/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx index 556a6db13555..2c08fa523684 100644 --- a/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/git-project-staging-modal.tsx @@ -1,3 +1,5 @@ +import type { GitCredentials, GitRepository } from 'insomnia-data'; +import { platform } from 'insomnia-data/common'; import React, { type FC, forwardRef, @@ -33,8 +35,6 @@ import { Banner } from '~/basic-components/banner'; import { Button as BasicButton } from '~/basic-components/button'; import { LearnMoreLink } from '~/basic-components/link'; import { scopeToBgColorMap, scopeToIconMap, scopeToTextColorMap } from '~/common/get-workspace-label'; -import type { GitCredentials, GitRepository } from '~/insomnia-data'; -import { platform } from '~/insomnia-data/common'; import { useAIGenerateActionFetcher } from '~/routes/ai.generate-commit-messages'; import { useGitProjectChangesFetcher } from '~/routes/git.changes'; import { useGitProjectCommitActionFetcher } from '~/routes/git.commit'; diff --git a/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx index 99dca28c4b1a..9641735496c7 100644 --- a/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx @@ -1,8 +1,8 @@ +import type { GitRepository } from 'insomnia-data'; import { useEffect, useRef } from 'react'; import { OverlayContainer } from 'react-aria'; import { useParams } from 'react-router'; -import type { GitRepository } from '~/insomnia-data'; import { useGitProjectResetActionFetcher } from '~/routes/git.reset'; import { GitConnectionInfo } from '~/ui/components/git/connection-info'; import { useGitCredentials } from '~/ui/hooks/use-git-credentials'; diff --git a/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx b/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx index 144f7b4a81b7..0637d09b6696 100644 --- a/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/import-modal/import-modal.tsx @@ -1,12 +1,12 @@ import classNames from 'classnames'; import { formatDistanceToNowStrict } from 'date-fns'; +import { models } from 'insomnia-data'; import React, { type FC, Fragment, type ReactNode, useEffect, useId, useMemo, useRef, useState } from 'react'; import { type DirectoryDropItem, type FileDropItem, OverlayContainer, useDrop } from 'react-aria'; import { Heading, Link } from 'react-aria-components'; import { useNavigate, useParams } from 'react-router'; import { isNotNullOrUndefined } from '~/common/misc'; -import { models } from '~/insomnia-data'; import { useImportResourcesFetcher } from '~/routes/import.resources'; import { useScanResourcesFetcher } from '~/routes/import.scan'; import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; diff --git a/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx b/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx index e89696649788..7bd59a80dd57 100644 --- a/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/import-modal/import-projects-modal.tsx @@ -1,4 +1,6 @@ import classnames from 'classnames'; +import type { Project } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { type DirectoryDropItem, type FileDropItem, OverlayContainer, useDrop } from 'react-aria'; import { Label, ProgressBar } from 'react-aria-components'; @@ -8,8 +10,6 @@ import * as reactUse from 'react-use'; import { database } from '~/common/database'; import type { ScanResult } from '~/common/import'; import { selectFileOrFolder } from '~/common/select-file-or-folder'; -import type { Project } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { importScannedResources } from '~/routes/import.resources'; import { scanImportResources } from '~/routes/import.scan'; import { useOrganizationLoaderData } from '~/routes/organization'; diff --git a/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx b/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx index 870611a51fda..cf2ce58f51ba 100644 --- a/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/input-vault-key-modal.tsx @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, Dialog, Heading, Input, Modal, ModalOverlay } from 'react-aria-components'; -import { services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useResetVaultKeyFetcher } from '~/routes/auth.reset-vault-key'; import { useValidateVaultKeyActionFetcher } from '~/routes/auth.validate-vault-key'; diff --git a/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx b/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx index 5d189f44ab22..a59895706ca6 100644 --- a/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx +++ b/packages/insomnia/src/ui/components/modals/invite-modal/invite-form.tsx @@ -1,5 +1,6 @@ import classNames from 'classnames'; import { checkSeats, type CheckSeatsResponse, needsToIncreaseSeats, needsToUpgrade, type Role } from 'insomnia-api'; +import { models } from 'insomnia-data'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { Button, @@ -17,7 +18,6 @@ import { useParams, useSearchParams } from 'react-router'; import { getAppWebsiteBaseURL } from '~/common/constants'; import { docsPricingLearnMoreLink } from '~/common/documentation'; import { debounce } from '~/common/misc'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useCollaboratorsSearchLoaderFetcher } from '~/routes/organization.$organizationId.collaborators-search'; diff --git a/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx index 4a7ea5981258..9e338d158e3a 100644 --- a/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/konnect-settings-modal.tsx @@ -1,8 +1,8 @@ +import { services } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; import { database } from '~/common/database'; -import { services } from '~/insomnia-data'; import { validatePat } from '~/konnect/api'; import { useRootLoaderData } from '~/root'; import { AnalyticsEvent } from '~/ui/analytics'; diff --git a/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx b/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx index 9ccfe216801b..bec2fcc13522 100644 --- a/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/mock-route-modal.tsx @@ -1,3 +1,4 @@ +import type { ResponseHeader } from 'insomnia-data'; import React from 'react'; import { Button, @@ -13,7 +14,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { ResponseHeader } from '~/insomnia-data'; import { useMockRouteUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.$mockRouteId.update'; import { useMockRouteNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.mock-server.mock-route.new'; diff --git a/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx b/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx index 4f641d5cdf42..90c58283bfc1 100644 --- a/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/new-workspace-modal.tsx @@ -1,5 +1,7 @@ import type { StorageRules } from 'insomnia-api'; -import { useEffect, useRef, useState } from 'react'; +import type { ApiSpec, Project, WorkspaceScope } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import React, { useEffect, useRef, useState } from 'react'; import { Button, Collection, @@ -21,8 +23,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { ApiSpec, Project, WorkspaceScope } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useGitProjectRepositoryTreeLoaderFetcher } from '~/routes/git.repository-tree'; import { useWorkspaceNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.new'; import { Badge } from '~/ui/components/base/badge'; diff --git a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx index f3906bae54ed..fc1144406199 100644 --- a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx @@ -1,7 +1,6 @@ +import type { Workspace } from 'insomnia-data'; import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'; -import type { Workspace } from '~/insomnia-data'; - import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; import { ModalBody } from '../base/modal-body'; import { ModalFooter } from '../base/modal-footer'; diff --git a/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx b/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx index 1d213dff7b70..7a7daec9f059 100644 --- a/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/paste-curl-modal.tsx @@ -1,7 +1,7 @@ +import type { Request } from 'insomnia-data'; import React, { useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; -import type { Request } from '~/insomnia-data'; import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor'; import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; diff --git a/packages/insomnia/src/ui/components/modals/project-modal.tsx b/packages/insomnia/src/ui/components/modals/project-modal.tsx index 93adddbbe1a3..890d9a2dfff7 100644 --- a/packages/insomnia/src/ui/components/modals/project-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/project-modal.tsx @@ -1,9 +1,9 @@ import type { StorageRules } from 'insomnia-api'; +import type { GitRepository, Project } from 'insomnia-data'; import React, { useEffect } from 'react'; import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components'; import { useNavigation } from 'react-router'; -import type { GitRepository, Project } from '~/insomnia-data'; import { useActiveView } from '~/ui/components/project/utils'; import { useGitCredentials } from '~/ui/hooks/use-git-credentials'; diff --git a/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx b/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx index 957954a5d9e2..65229537395c 100644 --- a/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/proto-files-modal.tsx @@ -1,10 +1,9 @@ import * as protoLoader from '@grpc/proto-loader'; +import type { ProtoDirectory, ProtoFile } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import React, { type FC, useEffect, useRef, useState } from 'react'; import { useParams } from 'react-router'; -import type { ProtoDirectory, ProtoFile } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; - import { type ChangeBufferEvent, database as db } from '../../../common/database'; import { selectFileOrFolder } from '../../../common/select-file-or-folder'; import { Modal, type ModalHandle } from '../base/modal'; diff --git a/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx index 9803fdaae5d4..c793d0ff27d6 100644 --- a/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx @@ -1,8 +1,8 @@ +import type { RequestGroup } from 'insomnia-data'; import React, { useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; import { useNavigate, useParams } from 'react-router'; -import type { RequestGroup } from '~/insomnia-data'; import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; import { useRequestGroupDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.duplicate'; diff --git a/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx b/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx index e67a1bcf0ecb..b44da7e96610 100644 --- a/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx @@ -1,8 +1,7 @@ +import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from 'insomnia-data'; import { JSONPath } from 'jsonpath-plus'; import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'; -import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from '~/insomnia-data'; - import { docsTemplateTags } from '../../../common/documentation'; import type { RenderError } from '../../../templating/render-error'; import { Link } from '../base/link'; diff --git a/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx index d80f5b642b63..f1beb327020c 100644 --- a/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/request-settings-modal.tsx @@ -1,9 +1,9 @@ +import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import React, { useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; import { useNavigate, useParams } from 'react-router'; -import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; import { useRequestDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.duplicate'; import { useReadyState } from '~/ui/hooks/use-ready-state'; diff --git a/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx b/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx index ca61fdec9a5b..80acd9ad03cf 100644 --- a/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/response-debug-modal.tsx @@ -1,8 +1,7 @@ +import type { Response, ResponseTimelineEntry } from 'insomnia-data'; +import { services } from 'insomnia-data'; import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'; -import type { Response, ResponseTimelineEntry } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; - import { ResponseTimelineViewer } from '../../components/viewers/response-timeline-viewer'; import { Modal, type ModalHandle, type ModalProps } from '../base/modal'; import { ModalBody } from '../base/modal-body'; diff --git a/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx b/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx index b881297c9e0f..dae29982b541 100644 --- a/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/sync-delete-modal.tsx @@ -1,8 +1,7 @@ +import { strings } from 'insomnia-data/common'; import React, { useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; -import { strings } from '~/insomnia-data/common'; - import { useWorkspaceLoaderData } from '../../../routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { interceptAccessError } from '../../../sync/access-error'; import { Button } from '../../components/themed-button'; diff --git a/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx b/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx index fa718a117b14..c12a9bd8a22a 100644 --- a/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/sync-staging-modal.tsx @@ -1,3 +1,4 @@ +import { models } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button, @@ -16,7 +17,6 @@ import { import { useParams } from 'react-router'; import { stringify } from 'yaml'; -import { models } from '~/insomnia-data'; import { useInsomniaSyncCreateSnapshotActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.create-snapshot'; import { useInsomniaSyncStageActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.stage'; import { useInsomniaSyncUnstageActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.insomnia-sync.unstage'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx index ca9b73ba0a75..c0c232029389 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-certificates-modal.tsx @@ -1,3 +1,4 @@ +import type { CaCertificate, ClientCertificate } from 'insomnia-data'; import React, { Fragment, type ReactNode, useEffect, useId, useState } from 'react'; import { Button, @@ -18,7 +19,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { CaCertificate, ClientCertificate } from '~/insomnia-data'; import { useCaCertDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.delete'; import { useCACertNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.new'; import { useCACertUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.cacert.update'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx index 09846879907a..cdfeb8cde42f 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-duplicate-modal.tsx @@ -1,10 +1,10 @@ +import type { BaseModel, Project, Workspace } from 'insomnia-data'; +import { database, models } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import React, { type FC, type MouseEventHandler, useEffect, useRef, useState } from 'react'; import { OverlayContainer } from 'react-aria'; import { href, useNavigate, useParams } from 'react-router'; -import type { BaseModel, Project, Workspace } from '~/insomnia-data'; -import { database, models } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useWorkspaceMoveActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.move'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx index 530499188b8c..76a2cc16f113 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-environments-edit-modal.tsx @@ -1,4 +1,6 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { Environment, EnvironmentKvPairData } from 'insomnia-data'; +import { EnvironmentKvPairDataType, EnvironmentType, models } from 'insomnia-data'; import React, { Fragment, useMemo, useRef, useState } from 'react'; import { Button, @@ -20,8 +22,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { Environment, EnvironmentKvPairData } from '~/insomnia-data'; -import { EnvironmentKvPairDataType, EnvironmentType, models } from '~/insomnia-data'; import { useEnvironmentCreateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.create'; import { useEnvironmentDeleteActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.delete'; import { useEnvironmentDuplicateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.environment.duplicate'; diff --git a/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx b/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx index 63490174a01b..54c16a1dc97c 100644 --- a/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx +++ b/packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx @@ -1,3 +1,5 @@ +import type { MockServer, Project, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { useEffect, useState } from 'react'; import { Button, @@ -13,8 +15,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { MockServer, Project, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useGitProjectRepositoryTreeLoaderFetcher } from '~/routes/git.repository-tree'; import { useWorkspaceUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.update'; diff --git a/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx b/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx index 1ec96d70bc34..e81b068f0dd2 100644 --- a/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/grpc-request-pane.tsx @@ -1,11 +1,11 @@ +import type { GrpcRequest, GrpcRequestHeader, RequestGroup } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import React, { type FunctionComponent, useRef, useState } from 'react'; import { Tab, TabList, TabPanel, Tabs } from 'react-aria-components'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; import { recordProjectRecentRequest } from '~/common/project'; -import type { GrpcRequest, GrpcRequestHeader, RequestGroup } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { AnalyticsEvent } from '~/ui/analytics'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx b/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx index 8a860d6e5c96..618e541da859 100644 --- a/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/placeholder-response-pane.tsx @@ -1,7 +1,7 @@ +import type { KeyboardShortcut } from 'insomnia-data/common'; +import { keyboardShortcutDescriptions } from 'insomnia-data/common'; import React, { type FC, type PropsWithChildren } from 'react'; -import type { KeyboardShortcut } from '~/insomnia-data/common'; -import { keyboardShortcutDescriptions } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { Hotkey } from '../hotkey'; diff --git a/packages/insomnia/src/ui/components/panes/request-group-pane.tsx b/packages/insomnia/src/ui/components/panes/request-group-pane.tsx index 1d4d1bd03da0..eea0fd4f0a66 100644 --- a/packages/insomnia/src/ui/components/panes/request-group-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/request-group-pane.tsx @@ -1,8 +1,8 @@ +import type { EnvironmentKvPairData, Settings } from 'insomnia-data'; +import { EnvironmentType } from 'insomnia-data'; import React, { type FC, useRef, useState } from 'react'; import { Heading, Tab, TabList, TabPanel, Tabs, ToggleButton } from 'react-aria-components'; -import type { EnvironmentKvPairData, Settings } from '~/insomnia-data'; -import { EnvironmentType } from '~/insomnia-data'; import { useToggleEnvironmentType } from '~/ui/hooks/use-toggle-environment-type'; import { getDataFromKVPair } from '~/utils/environment-utils'; diff --git a/packages/insomnia/src/ui/components/panes/request-pane.tsx b/packages/insomnia/src/ui/components/panes/request-pane.tsx index ee1f18ed9bfa..a5fc04afb3cc 100644 --- a/packages/insomnia/src/ui/components/panes/request-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/request-pane.tsx @@ -1,12 +1,12 @@ +import type { RequestParameter, Settings } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { deconstructQueryStringToParams, getContentTypeFromHeaders } from 'insomnia-data/common'; import React, { type FC, Fragment, useRef, useState } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, ToggleButton } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import type { RequestParameter, Settings } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; -import { deconstructQueryStringToParams, getContentTypeFromHeaders } from '~/insomnia-data/common'; import { OneLineEditor } from '~/ui/components/.client/codemirror/one-line-editor'; import { getAuthObjectOrNull } from '../../../network/authentication'; diff --git a/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx b/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx index 6fce15910dbc..a627545ebc3f 100644 --- a/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/request-test-result-pane.tsx @@ -1,8 +1,7 @@ +import type { RequestTestResult } from 'insomnia-data'; import React, { type FC, useState } from 'react'; import { Toolbar } from 'react-aria-components'; -import type { RequestTestResult } from '~/insomnia-data'; - import { fuzzyMatch } from '../../../common/misc'; type TargetTestType = 'all' | 'passed' | 'failed' | 'skipped'; diff --git a/packages/insomnia/src/ui/components/panes/response-pane.tsx b/packages/insomnia/src/ui/components/panes/response-pane.tsx index 91e8c48d6203..4d2fc7a94cda 100644 --- a/packages/insomnia/src/ui/components/panes/response-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/response-pane.tsx @@ -1,9 +1,9 @@ +import type { ResponseTimelineEntry } from 'insomnia-data'; +import { services } from 'insomnia-data'; +import { PREVIEW_MODE_SOURCE } from 'insomnia-data/common'; import { type FC, useCallback, useEffect, useMemo, useState } from 'react'; import { Tab, TabList, TabPanel, Tabs, Toolbar } from 'react-aria-components'; -import type { ResponseTimelineEntry } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; -import { PREVIEW_MODE_SOURCE } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { AnalyticsEvent } from '~/ui/analytics'; diff --git a/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx b/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx index e92e6cbcc63a..c2cd4ea13db8 100644 --- a/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/runner-result-history-pane.tsx @@ -1,4 +1,5 @@ import { format } from 'date-fns'; +import type { RunnerTestResult } from 'insomnia-data'; import React, { type FC } from 'react'; import { Cell, @@ -12,8 +13,6 @@ import { TooltipTrigger, } from 'react-aria-components'; -import type { RunnerTestResult } from '~/insomnia-data'; - import { PromptButton } from '../base/prompt-button'; import { Icon } from '../icon'; import { getTimeAndUnit } from '../tags/time-tag'; diff --git a/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx b/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx index d480243c9528..9f82c6a227e3 100644 --- a/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx +++ b/packages/insomnia/src/ui/components/panes/runner-test-result-pane.tsx @@ -1,8 +1,7 @@ +import type { BaseRunnerTestResult, RunnerResultPerRequest } from 'insomnia-data'; import React, { type FC, useState } from 'react'; import { Toolbar } from 'react-aria-components'; -import type { BaseRunnerTestResult, RunnerResultPerRequest } from '~/insomnia-data'; - import { RequestTestResultRows } from './request-test-result-pane'; type TargetTestType = 'all' | 'passed' | 'failed' | 'skipped'; diff --git a/packages/insomnia/src/ui/components/project/git-repo-form.tsx b/packages/insomnia/src/ui/components/project/git-repo-form.tsx index 76002006864f..5f540c9cf49a 100644 --- a/packages/insomnia/src/ui/components/project/git-repo-form.tsx +++ b/packages/insomnia/src/ui/components/project/git-repo-form.tsx @@ -1,3 +1,5 @@ +import type { GitCredentials, ProviderEmail } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { type FC, Fragment, useEffect, useState } from 'react'; import { Button, @@ -12,8 +14,6 @@ import { } from 'react-aria-components'; import { Icon } from '~/basic-components/icon'; -import type { GitCredentials, ProviderEmail } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useAllConnectedReposLoaderFetcher } from '~/routes/git.all-connected-repos'; import type { useGitProjectInitCloneActionFetcher } from '~/routes/git.init-clone'; import { useGitValidateCredentialFetcher } from '~/routes/git.validate-credential'; diff --git a/packages/insomnia/src/ui/components/project/project-create-form.tsx b/packages/insomnia/src/ui/components/project/project-create-form.tsx index 91b5f6a58020..49595f334cd5 100644 --- a/packages/insomnia/src/ui/components/project/project-create-form.tsx +++ b/packages/insomnia/src/ui/components/project/project-create-form.tsx @@ -1,10 +1,10 @@ import type { StorageRules } from 'insomnia-api'; +import type { GitCredentials } from 'insomnia-data'; import type { FC } from 'react'; import React, { useEffect, useState } from 'react'; import { Button, Input, Label, TextField } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { GitCredentials } from '~/insomnia-data'; import { useGitProjectInitCloneActionFetcher } from '~/routes/git.init-clone'; import { useProjectNewActionFetcher } from '~/routes/organization.$organizationId.project.new'; import type { GitProviderOption } from '~/sync/git/providers/types'; diff --git a/packages/insomnia/src/ui/components/project/project-settings-form.tsx b/packages/insomnia/src/ui/components/project/project-settings-form.tsx index 4d6cc7598fce..25718675e41d 100644 --- a/packages/insomnia/src/ui/components/project/project-settings-form.tsx +++ b/packages/insomnia/src/ui/components/project/project-settings-form.tsx @@ -1,4 +1,7 @@ import type { StorageRules } from 'insomnia-api'; +import type { GitCredentials, GitRepository, Project, ProviderEmail } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { platform } from 'insomnia-data/common'; import type { FC } from 'react'; import { Fragment, useEffect, useMemo, useState } from 'react'; import { @@ -19,9 +22,6 @@ import { useParams } from 'react-router'; import { Banner } from '~/basic-components/banner'; import { Divider } from '~/basic-components/divider'; import { LearnMoreLink } from '~/basic-components/link'; -import type { GitCredentials, GitRepository, Project, ProviderEmail } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { platform } from '~/insomnia-data/common'; import { useGitProjectInitCloneActionFetcher } from '~/routes/git.init-clone'; import { useGitValidateCredentialsFetcher } from '~/routes/git.validate-credentials'; import { useGitProviderEmailsLoaderFetcher } from '~/routes/git-provider.emails'; diff --git a/packages/insomnia/src/ui/components/project/project-type-warning.tsx b/packages/insomnia/src/ui/components/project/project-type-warning.tsx index 1676c0da86ad..67c8bd0e6682 100644 --- a/packages/insomnia/src/ui/components/project/project-type-warning.tsx +++ b/packages/insomnia/src/ui/components/project/project-type-warning.tsx @@ -1,4 +1,5 @@ import type { StorageRules } from 'insomnia-api'; +import { models } from 'insomnia-data'; import { useParams } from 'react-router'; import { Banner } from '~/basic-components/banner'; @@ -6,7 +7,6 @@ import { Button } from '~/basic-components/button'; import { LearnMoreLink } from '~/basic-components/link'; import { getAppWebsiteBaseURL } from '~/common/constants'; import { docsPricingLearnMoreLink } from '~/common/documentation'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import type { ProjectType } from '~/ui/components/project/utils'; diff --git a/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx b/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx index c395ad09f3b0..08f278d466db 100644 --- a/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx +++ b/packages/insomnia/src/ui/components/proto-file/proto-file-list.tsx @@ -1,8 +1,7 @@ +import type { ProtoDirectory, ProtoFile } from 'insomnia-data'; import React, { type FunctionComponent } from 'react'; import { Checkbox } from 'react-aria-components'; -import type { ProtoDirectory, ProtoFile } from '~/insomnia-data'; - import { Button } from '../themed-button'; export type SelectProtoFileHandler = (id: string) => void; diff --git a/packages/insomnia/src/ui/components/rendered-query-string.tsx b/packages/insomnia/src/ui/components/rendered-query-string.tsx index 67b984751326..3cff81e09eb5 100644 --- a/packages/insomnia/src/ui/components/rendered-query-string.tsx +++ b/packages/insomnia/src/ui/components/rendered-query-string.tsx @@ -1,7 +1,4 @@ import classNames from 'classnames'; -import { type FC, useCallback, useEffect, useState } from 'react'; -import { Link } from 'react-aria-components'; - import type { Request, RequestAuthentication, @@ -9,8 +6,11 @@ import type { RequestParameter, SocketIORequest, WebSocketRequest, -} from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { type FC, useCallback, useEffect, useState } from 'react'; +import { Link } from 'react-aria-components'; + import { AnalyticsEvent } from '~/ui/analytics'; import { showSettingsModal } from '~/ui/components/modals/settings-modal'; diff --git a/packages/insomnia/src/ui/components/request-url-bar.tsx b/packages/insomnia/src/ui/components/request-url-bar.tsx index 906c02a22c2e..d7d2fe3bdb50 100644 --- a/packages/insomnia/src/ui/components/request-url-bar.tsx +++ b/packages/insomnia/src/ui/components/request-url-bar.tsx @@ -1,3 +1,5 @@ +import type { Request, RequestGroup } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'; import { Button, Link } from 'react-aria-components'; import { useParams, useSearchParams } from 'react-router'; @@ -5,8 +7,6 @@ import * as reactUse from 'react-use'; import { SECURITY_SETTINGS_PATH_LABEL } from '~/common/misc'; import { recordProjectRecentRequest } from '~/common/project'; -import type { Request, RequestGroup } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { type ConnectActionParams, diff --git a/packages/insomnia/src/ui/components/settings/boolean-setting.tsx b/packages/insomnia/src/ui/components/settings/boolean-setting.tsx index 5ec9569eba9a..0429b5aa82d4 100644 --- a/packages/insomnia/src/ui/components/settings/boolean-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/boolean-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type FC, type ReactNode } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx index 45ad45c3f573..6486b4620735 100644 --- a/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx +++ b/packages/insomnia/src/ui/components/settings/cloud-service-credentials.tsx @@ -1,8 +1,8 @@ +import type { CloudProviderCredential, CloudProviderName } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { useEffect, useState } from 'react'; import { Button, Menu, MenuItem, MenuTrigger, Popover } from 'react-aria-components'; -import type { CloudProviderCredential, CloudProviderName } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useDeleteCloudCredentialActionFetcher } from '~/routes/cloud-credentials.$cloudCredentialId.delete'; diff --git a/packages/insomnia/src/ui/components/settings/credentials.tsx b/packages/insomnia/src/ui/components/settings/credentials.tsx index c35278009737..10f39740bb7e 100644 --- a/packages/insomnia/src/ui/components/settings/credentials.tsx +++ b/packages/insomnia/src/ui/components/settings/credentials.tsx @@ -1,4 +1,6 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import type { GitCredentials, GitCredentialsV2, GitRemoteProviderType, ProviderEmail } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { Fragment, useEffect, useRef, useState } from 'react'; import { Button, @@ -21,8 +23,6 @@ import { import { Button as BasicButton } from '~/basic-components/button'; import { Icon } from '~/basic-components/icon'; -import type { GitCredentials, GitCredentialsV2, GitRemoteProviderType, ProviderEmail } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useGitCredentialsLoaderFetcher } from '~/routes/git-credentials'; import { useGitCredentialsDeleteActionFetcher } from '~/routes/git-credentials.$id.delete'; import { useRelatedProjectsByGitCredentialsIdLoaderFetcher } from '~/routes/git-credentials.$id.related-projects'; diff --git a/packages/insomnia/src/ui/components/settings/enum-setting.tsx b/packages/insomnia/src/ui/components/settings/enum-setting.tsx index 82fbea41f9b8..f12de6bf8b0d 100644 --- a/packages/insomnia/src/ui/components/settings/enum-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/enum-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type PropsWithChildren, type ReactNode } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/general.tsx b/packages/insomnia/src/ui/components/settings/general.tsx index 35c169cde473..3560830aa700 100644 --- a/packages/insomnia/src/ui/components/settings/general.tsx +++ b/packages/insomnia/src/ui/components/settings/general.tsx @@ -1,6 +1,6 @@ +import { type HttpVersion, HttpVersions, isMac, strings, UpdateChannel } from 'insomnia-data/common'; import React, { type FC, Fragment } from 'react'; -import { type HttpVersion, HttpVersions, isMac, strings, UpdateChannel } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { clearOAuthWindowSessionId } from '~/ui/spawn-oauth-window'; diff --git a/packages/insomnia/src/ui/components/settings/import-export.tsx b/packages/insomnia/src/ui/components/settings/import-export.tsx index 1e822db66409..7faa1fd9fe46 100644 --- a/packages/insomnia/src/ui/components/settings/import-export.tsx +++ b/packages/insomnia/src/ui/components/settings/import-export.tsx @@ -12,13 +12,13 @@ import { ExportRequestsModal } from 'insomnia/src/ui/components/modals/export-re import { ImportModal } from 'insomnia/src/ui/components/modals/import-modal/import-modal'; import { SelectModal } from 'insomnia/src/ui/components/modals/select-modal'; import type { Organization } from 'insomnia-api'; +import type { BaseModel, Environment, Project, Workspace } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; +import { strings } from 'insomnia-data/common'; import React, { type FC, Fragment, useEffect, useState } from 'react'; import { Button, Heading, ListBox, ListBoxItem, Popover, Select, SelectValue } from 'react-aria-components'; import { href, useParams } from 'react-router'; -import type { BaseModel, Environment, Project, Workspace } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; -import { strings } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; import { useProjectListWorkspacesLoaderFetcher } from '~/routes/organization.$organizationId.project.$projectId.list-workspaces'; diff --git a/packages/insomnia/src/ui/components/settings/masked-setting.tsx b/packages/insomnia/src/ui/components/settings/masked-setting.tsx index 8d69d998220f..c09c5662d26d 100644 --- a/packages/insomnia/src/ui/components/settings/masked-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/masked-setting.tsx @@ -1,7 +1,7 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type FC } from 'react'; import * as reactUse from 'react-use'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/number-setting.tsx b/packages/insomnia/src/ui/components/settings/number-setting.tsx index f56c67ab57b9..a3a0337f52be 100644 --- a/packages/insomnia/src/ui/components/settings/number-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/number-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type ChangeEventHandler, type FC, type InputHTMLAttributes, useCallback } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/settings/shortcuts.tsx b/packages/insomnia/src/ui/components/settings/shortcuts.tsx index 087a7aa82a45..72356230e6b2 100644 --- a/packages/insomnia/src/ui/components/settings/shortcuts.tsx +++ b/packages/insomnia/src/ui/components/settings/shortcuts.tsx @@ -1,14 +1,14 @@ -import React, { type FC } from 'react'; -import { Button } from 'react-aria-components'; - -import type { HotKeyRegistry, KeyboardShortcut, KeyCombination } from '~/insomnia-data/common'; +import type { HotKeyRegistry, KeyboardShortcut, KeyCombination } from 'insomnia-data/common'; import { areSameKeyCombinations, constructKeyCombinationDisplay, getPlatformKeyCombinations, keyboardShortcutDescriptions, newDefaultRegistry, -} from '~/insomnia-data/common'; +} from 'insomnia-data/common'; +import React, { type FC } from 'react'; +import { Button } from 'react-aria-components'; + import { useRootLoaderData } from '~/root'; import { generateId } from '../../../common/misc'; diff --git a/packages/insomnia/src/ui/components/settings/text-array-setting.tsx b/packages/insomnia/src/ui/components/settings/text-array-setting.tsx index a6c0726ef997..b27856923467 100644 --- a/packages/insomnia/src/ui/components/settings/text-array-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/text-array-setting.tsx @@ -1,7 +1,7 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type FC, type InputHTMLAttributes, useCallback, useState } from 'react'; import { ListBox, ListBoxItem } from 'react-aria-components'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/ui/components/settings/text-setting.tsx b/packages/insomnia/src/ui/components/settings/text-setting.tsx index cbf38abe0f62..c8cf72c74a06 100644 --- a/packages/insomnia/src/ui/components/settings/text-setting.tsx +++ b/packages/insomnia/src/ui/components/settings/text-setting.tsx @@ -1,6 +1,6 @@ +import type { SettingsOfType } from 'insomnia-data/common'; import React, { type ChangeEventHandler, type FC, type InputHTMLAttributes, useCallback } from 'react'; -import type { SettingsOfType } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useSettingsPatcher } from '../../hooks/use-request'; diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx index c2e30a76c962..71d516ba94e7 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/empty-node.tsx @@ -1,9 +1,9 @@ import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core'; import type { StorageRules } from 'insomnia-api'; +import type { WorkspaceScope } from 'insomnia-data'; import { useState } from 'react'; import { Button, Menu, MenuItem, MenuTrigger, Popover } from 'react-aria-components'; -import type { WorkspaceScope } from '~/insomnia-data'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { useRequestGroupNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.new'; import { showModal } from '~/ui/components/modals'; diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.test.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.test.ts index 97ef08777858..b95321c4b2b7 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.test.ts +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.test.ts @@ -1,7 +1,7 @@ +import { services } from 'insomnia-data'; import { beforeEach, describe, expect, it } from 'vitest'; import { database as db } from '~/common/database'; -import { services } from '~/insomnia-data'; import { type AllRequestsAndMetaInWorkspace, diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.ts index 7806f72a881e..437ab0b1499d 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.ts +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar-utils.ts @@ -1,6 +1,3 @@ -import { database } from '~/common/database'; -import { fuzzyMatchAll } from '~/common/misc'; -import { sortMethodMap } from '~/common/sorting'; import type { GrpcRequest, GrpcRequestMeta, @@ -13,9 +10,13 @@ import type { WebSocketRequest, WebSocketRequestMeta, Workspace, -} from '~/insomnia-data'; -import type { BaseModel } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +} from 'insomnia-data'; +import type { BaseModel } from 'insomnia-data'; +import { models } from 'insomnia-data'; + +import { database } from '~/common/database'; +import { fuzzyMatchAll } from '~/common/misc'; +import { sortMethodMap } from '~/common/sorting'; import type { Child } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; export interface SlimRequestDoc extends BaseModel { diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx index 41787a6afd97..3374115da421 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-navigation-sidebar.tsx @@ -1,5 +1,7 @@ import { useVirtualizer } from '@tanstack/react-virtual'; import type { StorageRules } from 'insomnia-api'; +import type { RequestGroup, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Button, GridList, GridListItem, Input, SearchField, Tab, TabList, Tabs } from 'react-aria-components'; import { useNavigate, useParams, useSearchParams } from 'react-router'; @@ -10,8 +12,6 @@ import type { SortOrder } from '~/common/constants'; import { fuzzyMatchAll } from '~/common/misc'; import { getAllRemoteBackendProjectsOfOrg, getUnsyncedRemoteWorkspaces, type InsomniaFile } from '~/common/project'; import { sortMethodMap } from '~/common/sorting'; -import type { RequestGroup, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import type { SyncResult } from '~/konnect/sync'; import { useRootLoaderData } from '~/root'; import { useProjectLoaderData } from '~/routes/organization.$organizationId.project.$projectId'; diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-node.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-node.tsx index aa1f0c4c16e8..1d75545193a1 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-node.tsx +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/project-node.tsx @@ -1,7 +1,7 @@ import type { StorageRules } from 'insomnia-api'; +import { models } from 'insomnia-data'; import { Button } from 'react-aria-components'; -import { models } from '~/insomnia-data'; import { ProjectDropdown, type WorkspaceSortOrder } from '~/ui/components/dropdowns/sidebar-project-dropdown'; import { AvatarGroup } from '../../avatar'; diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/request-node.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/request-node.tsx index 03365008d39b..dbdd0312cf4d 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/request-node.tsx +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/request-node.tsx @@ -1,7 +1,3 @@ -import { useState } from 'react'; -import { Button, Tooltip, TooltipTrigger } from 'react-aria-components'; -import { useParams } from 'react-router'; - import type { GrpcRequest, McpRequest, @@ -10,8 +6,12 @@ import type { SocketIORequest, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { models } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { useState } from 'react'; +import { Button, Tooltip, TooltipTrigger } from 'react-aria-components'; +import { useParams } from 'react-router'; + import { RequestActionsDropdown } from '~/ui/components/dropdowns/request-actions-dropdown'; import { RequestGroupActionsDropdown } from '~/ui/components/dropdowns/request-group-actions-dropdown'; import { EditableInput } from '~/ui/components/editable-input'; diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/types.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/types.ts index 5e8be285b842..a633303cef5a 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/types.ts +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/types.ts @@ -1,5 +1,6 @@ +import type { BaseModel, GitRepository, Project, RequestGroup, Workspace, WorkspaceMeta } from 'insomnia-data'; + import type { InsomniaFile } from '~/common/project'; -import type { BaseModel, GitRepository, Project, RequestGroup, Workspace, WorkspaceMeta } from '~/insomnia-data'; import type { Child } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; export type ProjectWithPresence = Project & { diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts index fb2ad5c5c4f4..0c03f37312e9 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-project-navigation-sidebar-navigation.ts @@ -1,8 +1,8 @@ import type { Virtualizer } from '@tanstack/react-virtual'; +import { database, models, type Workspace } from 'insomnia-data'; import type { Dispatch, SetStateAction } from 'react'; import { useEffect, useRef, useState } from 'react'; -import { database, models, type Workspace } from '~/insomnia-data'; import type { NavigationResources } from '~/ui/hooks/use-insomnia-navigation'; import { useInsomniaNavigation } from '~/ui/hooks/use-insomnia-navigation'; diff --git a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx index b6eeed0643a9..ac1f8bc75514 100644 --- a/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx +++ b/packages/insomnia/src/ui/components/sidebar/project-navigation-sidebar/use-sidebar-drag-and-drop.tsx @@ -1,9 +1,9 @@ import type { Virtualizer } from '@tanstack/react-virtual'; +import { models, type WorkspaceScope } from 'insomnia-data'; import { useCallback, useMemo, useRef } from 'react'; import type { DragAndDropHooks, ItemDropTarget } from 'react-aria-components'; import { DropIndicator, useDragAndDrop } from 'react-aria-components'; -import { models, type WorkspaceScope } from '~/insomnia-data'; import { useDebugReorderActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.reorder'; import type { CollectionChildFlatItem, EmptyNodeFlatItem, FlatItem } from './types'; diff --git a/packages/insomnia/src/ui/components/sidebar/sync-bar.tsx b/packages/insomnia/src/ui/components/sidebar/sync-bar.tsx index ac3a93def299..dde05539b26a 100644 --- a/packages/insomnia/src/ui/components/sidebar/sync-bar.tsx +++ b/packages/insomnia/src/ui/components/sidebar/sync-bar.tsx @@ -1,4 +1,5 @@ -import { models } from '~/insomnia-data'; +import { models } from 'insomnia-data'; + import { useProjectLoaderData } from '~/routes/organization.$organizationId.project.$projectId'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { CloudSyncProjectBar } from '~/ui/components/dropdowns/cloud-sync-project-bar'; diff --git a/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx b/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx index e81be17fce19..a487459e4534 100644 --- a/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx +++ b/packages/insomnia/src/ui/components/socket-io/body-tab-pane.tsx @@ -1,3 +1,4 @@ +import type { SocketIOPayload, SocketIORequest } from 'insomnia-data'; import React, { useMemo, useRef, useState } from 'react'; import { Button, @@ -19,7 +20,6 @@ import { } from 'react-aria-components'; import { v4 as uuidv4 } from 'uuid'; -import type { SocketIOPayload, SocketIORequest } from '~/insomnia-data'; import { CodeEditor } from '~/ui/components/.client/codemirror/code-editor'; import { CONTENT_TYPE_JSON, CONTENT_TYPE_PLAINTEXT } from '../../../common/constants'; diff --git a/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx b/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx index 8b0fcf9f81a8..41f8168f259f 100644 --- a/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx +++ b/packages/insomnia/src/ui/components/socket-io/event-tab-pane.tsx @@ -1,9 +1,8 @@ import classNames from 'classnames'; +import type { SocketIOEventListener, SocketIORequest } from 'insomnia-data'; import React, { useMemo } from 'react'; import { Button, GridList, GridListItem, Input, Switch } from 'react-aria-components'; -import type { SocketIOEventListener, SocketIORequest } from '~/insomnia-data'; - import { generateId } from '../../../common/misc'; import { useRequestPatcher } from '../../hooks/use-request'; import { Icon } from '../icon'; diff --git a/packages/insomnia/src/ui/components/socket-io/event-view.tsx b/packages/insomnia/src/ui/components/socket-io/event-view.tsx index cad3659e1670..83bb0f87e2d3 100644 --- a/packages/insomnia/src/ui/components/socket-io/event-view.tsx +++ b/packages/insomnia/src/ui/components/socket-io/event-view.tsx @@ -1,7 +1,6 @@ +import { services } from 'insomnia-data'; import React, { type FC } from 'react'; -import { services } from '~/insomnia-data'; - import { CONTENT_TYPE_JSON } from '../../../common/constants'; import type { SocketIOEvent, SocketIOMessageEvent } from '../../../main/network/socket-io'; import { diff --git a/packages/insomnia/src/ui/components/socket-io/request-pane.tsx b/packages/insomnia/src/ui/components/socket-io/request-pane.tsx index a8e3db8ff9a4..405c562d89eb 100644 --- a/packages/insomnia/src/ui/components/socket-io/request-pane.tsx +++ b/packages/insomnia/src/ui/components/socket-io/request-pane.tsx @@ -1,12 +1,12 @@ +import type { Environment, RequestPathParameter } from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import React, { type FC, Fragment } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, ToggleButton } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import type { Environment, RequestPathParameter } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; import { getAuthObjectOrNull } from '~/network/authentication'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; diff --git a/packages/insomnia/src/ui/components/tabs/tab-list.tsx b/packages/insomnia/src/ui/components/tabs/tab-list.tsx index 0bb4085b7f04..f1ec7689059f 100644 --- a/packages/insomnia/src/ui/components/tabs/tab-list.tsx +++ b/packages/insomnia/src/ui/components/tabs/tab-list.tsx @@ -1,3 +1,5 @@ +import type { BaseModel, MockRoute, Request } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import React, { useCallback, useEffect, useState } from 'react'; import { Button, @@ -12,8 +14,6 @@ import { } from 'react-aria-components'; import { useParams } from 'react-router'; -import type { BaseModel, MockRoute, Request } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { useRequestNewActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.new'; import { useGitFileIssues } from '~/ui/hooks/use-git-file-issues'; import { useInsomniaTab } from '~/ui/hooks/use-insomnia-tab'; diff --git a/packages/insomnia/src/ui/components/tabs/tab.tsx b/packages/insomnia/src/ui/components/tabs/tab.tsx index d062f77510cb..2d491de8ebaa 100644 --- a/packages/insomnia/src/ui/components/tabs/tab.tsx +++ b/packages/insomnia/src/ui/components/tabs/tab.tsx @@ -1,9 +1,9 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; import classNames from 'classnames'; +import { models } from 'insomnia-data'; import React, { useCallback } from 'react'; import { Button, GridListItem } from 'react-aria-components'; -import { models } from '~/insomnia-data'; import type { WorkspaceFileIssue } from '~/main/git-service'; import { scrollElementIntoView } from '../../../utils'; diff --git a/packages/insomnia/src/ui/components/tags/method-tag.tsx b/packages/insomnia/src/ui/components/tags/method-tag.tsx index a0f55fe05cf0..45418d7f4c49 100644 --- a/packages/insomnia/src/ui/components/tags/method-tag.tsx +++ b/packages/insomnia/src/ui/components/tags/method-tag.tsx @@ -1,8 +1,7 @@ +import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { type FC, memo } from 'react'; -import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import { CONTENT_TYPE_GRAPHQL, METHOD_DELETE, METHOD_OPTIONS } from '../../../common/constants'; const { isEventStreamRequest, isRequest } = models.request; diff --git a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx index 3cc2dcdf7bdf..c4e044c46484 100644 --- a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx +++ b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx @@ -1,9 +1,8 @@ +import type { CloudProviderCredential, CloudProviderName } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React, { useMemo, useState } from 'react'; import { Button } from 'react-aria-components'; -import type { CloudProviderCredential, CloudProviderName } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import { debounce } from '../../../../common/misc'; import { Icon } from '../../icon'; import { CloudCredentialModal } from '../../modals/cloud-credential-modal/cloud-credential-modal'; diff --git a/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx index c0c7a5150dcc..b7ab9c1c51bf 100644 --- a/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx +++ b/packages/insomnia/src/ui/components/templating/external-vault/hashicorp-vault-form.tsx @@ -1,7 +1,7 @@ +import type { CloudProviderCredential } from 'insomnia-data'; +import { models } from 'insomnia-data'; import React from 'react'; -import type { CloudProviderCredential } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import type { NunjucksParsedTag } from '~/templating/types'; diff --git a/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx b/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx index e0877d8818ba..2588c6357d33 100644 --- a/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx +++ b/packages/insomnia/src/ui/components/templating/tag-editor-arg-sub-form.tsx @@ -1,7 +1,6 @@ +import type { BaseModel } from 'insomnia-data'; import React from 'react'; -import type { BaseModel } from '~/insomnia-data'; - import type { NunjucksParsedTag } from '../../../templating/types'; import { isBase64String, isValidJSONString } from '../../../utils/string-check'; import { ExternalVaultForm } from './external-vault/external-vault-form'; diff --git a/packages/insomnia/src/ui/components/templating/tag-editor.tsx b/packages/insomnia/src/ui/components/templating/tag-editor.tsx index 1680c98fb3ac..f28e2a346de5 100644 --- a/packages/insomnia/src/ui/components/templating/tag-editor.tsx +++ b/packages/insomnia/src/ui/components/templating/tag-editor.tsx @@ -1,11 +1,11 @@ import classnames from 'classnames'; import clone from 'clone'; +import type { BaseModel, CloudProviderCredential, Request, RequestGroup, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import React, { type FC, useCallback, useEffect, useState } from 'react'; import { Button, Link } from 'react-aria-components'; import * as reactUse from 'react-use'; -import type { BaseModel, CloudProviderCredential, Request, RequestGroup, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { showSettingsModal } from '~/ui/components/modals/settings-modal'; import { database as db } from '../../../common/database'; diff --git a/packages/insomnia/src/ui/components/templating/variable-editor.tsx b/packages/insomnia/src/ui/components/templating/variable-editor.tsx index 2b60c17da9a8..07970766afc8 100644 --- a/packages/insomnia/src/ui/components/templating/variable-editor.tsx +++ b/packages/insomnia/src/ui/components/templating/variable-editor.tsx @@ -1,7 +1,6 @@ +import { models } from 'insomnia-data'; import React, { type FC, useEffect, useMemo, useState } from 'react'; -import { models } from '~/insomnia-data'; - import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../../../templating/constants'; import type { RenderPurpose } from '../../../templating/types'; import { useNunjucks } from '../../context/nunjucks/use-nunjucks'; diff --git a/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx index 7600950fa79c..7d5d51f7ad62 100644 --- a/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-headers-viewer.tsx @@ -1,7 +1,6 @@ +import type { ResponseHeader } from 'insomnia-data'; import React, { type FC, Fragment, useMemo } from 'react'; -import type { ResponseHeader } from '~/insomnia-data'; - import { CopyButton } from '../base/copy-button'; import { Link } from '../base/link'; diff --git a/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx index 6ed9154b1197..abf24c6c553c 100644 --- a/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-multipart-viewer.tsx @@ -1,10 +1,10 @@ import { format } from 'date-fns'; import type { SaveDialogOptions } from 'electron'; +import { getContentTypeFromHeaders, PREVIEW_MODE_FRIENDLY } from 'insomnia-data/common'; import { extension as mimeExtension } from 'mime-types'; import React, { type FC, useCallback, useEffect, useState } from 'react'; import { Button } from 'react-aria-components'; -import { getContentTypeFromHeaders, PREVIEW_MODE_FRIENDLY } from '~/insomnia-data/common'; import type { Part } from '~/main/multipart-buffer-to-array'; import { Dropdown, DropdownItem, ItemContent } from '../base/dropdown'; diff --git a/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx index c2ee3e511be1..0793e6391ae2 100644 --- a/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-timeline-viewer.tsx @@ -1,6 +1,6 @@ +import type { ResponseTimelineEntry } from 'insomnia-data'; import React, { type FC, useEffect, useRef } from 'react'; -import type { ResponseTimelineEntry } from '~/insomnia-data'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; interface Props { diff --git a/packages/insomnia/src/ui/components/viewers/response-viewer.tsx b/packages/insomnia/src/ui/components/viewers/response-viewer.tsx index 1fc36b7b042f..d57b4324d585 100644 --- a/packages/insomnia/src/ui/components/viewers/response-viewer.tsx +++ b/packages/insomnia/src/ui/components/viewers/response-viewer.tsx @@ -1,6 +1,6 @@ +import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW } from 'insomnia-data/common'; import { Fragment, useCallback, useRef, useState } from 'react'; -import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW } from '~/insomnia-data/common'; import { AnalyticsEvent } from '~/ui/analytics'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/websockets/action-bar.tsx b/packages/insomnia/src/ui/components/websockets/action-bar.tsx index 1d4e0c52c165..5e86061f7273 100644 --- a/packages/insomnia/src/ui/components/websockets/action-bar.tsx +++ b/packages/insomnia/src/ui/components/websockets/action-bar.tsx @@ -1,9 +1,9 @@ +import type { SocketIORequest, WebSocketRequest } from 'insomnia-data'; +import { services } from 'insomnia-data'; import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useRef } from 'react'; import { useParams } from 'react-router'; import { recordProjectRecentRequest } from '~/common/project'; -import type { SocketIORequest, WebSocketRequest } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; import { type ConnectActionParams, useRequestConnectActionFetcher, diff --git a/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx b/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx index 875f5081f731..6a1774a1004b 100644 --- a/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx +++ b/packages/insomnia/src/ui/components/websockets/disconnect-button.tsx @@ -1,8 +1,7 @@ +import { models } from 'insomnia-data'; import React, { type FC } from 'react'; import { Button } from 'react-aria-components'; -import { models } from '~/insomnia-data'; - import { Dropdown as OriginalDropdown, DropdownItem, ItemContent } from '../base/dropdown'; export const DisconnectButton: FC<{ requestId: string }> = ({ requestId }) => { diff --git a/packages/insomnia/src/ui/components/websockets/event-view.tsx b/packages/insomnia/src/ui/components/websockets/event-view.tsx index 775044a0f0ab..3d0c2e13c182 100644 --- a/packages/insomnia/src/ui/components/websockets/event-view.tsx +++ b/packages/insomnia/src/ui/components/websockets/event-view.tsx @@ -1,7 +1,7 @@ +import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW, PREVIEW_MODE_SOURCE } from 'insomnia-data/common'; import React, { type FC, useCallback, useRef } from 'react'; import { useParams } from 'react-router'; -import { PREVIEW_MODE_FRIENDLY, PREVIEW_MODE_RAW, PREVIEW_MODE_SOURCE } from '~/insomnia-data/common'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; import type { CurlEvent, CurlMessageEvent } from '../../../main/network/curl'; diff --git a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx index ea411813f3a6..24741f5d9c32 100644 --- a/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx +++ b/packages/insomnia/src/ui/components/websockets/realtime-response-pane.tsx @@ -1,9 +1,4 @@ import classnames from 'classnames'; -import React, { type FC, useEffect, useMemo, useState } from 'react'; -import { Button, Input, SearchField, Tab, TabList, TabPanel, Tabs } from 'react-aria-components'; -import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; - -import { docsMcpAuthentication } from '~/common/documentation'; import type { McpResponse, RequestVersion, @@ -11,9 +6,14 @@ import type { ResponseTimelineEntry, SocketIOResponse, WebSocketResponse, -} from '~/insomnia-data'; -import { models } from '~/insomnia-data'; -import { deserializeNDJSON } from '~/insomnia-data/common'; +} from 'insomnia-data'; +import { models } from 'insomnia-data'; +import { deserializeNDJSON } from 'insomnia-data/common'; +import React, { type FC, useEffect, useMemo, useState } from 'react'; +import { Button, Input, SearchField, Tab, TabList, TabPanel, Tabs } from 'react-aria-components'; +import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; + +import { docsMcpAuthentication } from '~/common/documentation'; import { useMcpReadyState } from '~/ui/hooks/use-mcp-ready-state'; import { useRealtimeConnectionNotifications } from '~/ui/hooks/use-realtime-connection-notifications'; diff --git a/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx b/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx index d7539245c562..095fa127d85d 100644 --- a/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx +++ b/packages/insomnia/src/ui/components/websockets/websocket-preview-dropdown.tsx @@ -1,8 +1,7 @@ +import { getPreviewModeName, PREVIEW_MODES, type PreviewMode } from 'insomnia-data/common'; import React, { type FC } from 'react'; import { Button } from 'react-aria-components'; -import { getPreviewModeName, PREVIEW_MODES, type PreviewMode } from '~/insomnia-data/common'; - import { Dropdown, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown'; interface Props { diff --git a/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx b/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx index 970065d08737..ff0a62323a84 100644 --- a/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx +++ b/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx @@ -1,12 +1,12 @@ +import type { Environment, RequestPathParameter, WebSocketRequest } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import React, { type FC, Fragment, useEffect, useRef, useState } from 'react'; import { Button, Heading, Tab, TabList, TabPanel, Tabs, ToggleButton, Toolbar } from 'react-aria-components'; import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels'; import { useParams } from 'react-router'; import * as reactUse from 'react-use'; -import type { Environment, RequestPathParameter, WebSocketRequest } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; import { useRootLoaderData } from '~/root'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { CodeEditor, type CodeEditorHandle } from '~/ui/components/.client/codemirror/code-editor'; diff --git a/packages/insomnia/src/ui/components/workspace/resource-icon.tsx b/packages/insomnia/src/ui/components/workspace/resource-icon.tsx index fc03a972f4a2..4769d5803dc2 100644 --- a/packages/insomnia/src/ui/components/workspace/resource-icon.tsx +++ b/packages/insomnia/src/ui/components/workspace/resource-icon.tsx @@ -1,7 +1,7 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; +import { models } from 'insomnia-data'; import { Icon } from '~/basic-components/icon'; -import { models } from '~/insomnia-data'; import { getMethodShortHand, getRequestBadgeClassName } from '~/ui/components/tags/method-tag'; export const getBadgeClassName = (colorKey: string) => diff --git a/packages/insomnia/src/ui/components/workspace/use-workspace-breadcrumb.tsx b/packages/insomnia/src/ui/components/workspace/use-workspace-breadcrumb.tsx index f063dddf05d8..6b8f1f337c6e 100644 --- a/packages/insomnia/src/ui/components/workspace/use-workspace-breadcrumb.tsx +++ b/packages/insomnia/src/ui/components/workspace/use-workspace-breadcrumb.tsx @@ -1,7 +1,7 @@ +import { models } from 'insomnia-data'; import { useMemo } from 'react'; import { useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useRequestLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId'; import { useRequestGroupLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request-group.$requestGroupId'; diff --git a/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx b/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx index fa94fa9b3247..0578348365af 100644 --- a/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx +++ b/packages/insomnia/src/ui/components/workspace/workspace-pane-header.tsx @@ -1,8 +1,8 @@ +import { type McpRequest, models } from 'insomnia-data'; import { useMemo, useState } from 'react'; import { Button } from 'react-aria-components'; import { isNotNullOrUndefined } from '~/common/misc'; -import { type McpRequest, models } from '~/insomnia-data'; import { useWorkspaceLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId'; import { useRequestLoaderData } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId'; import { AnalyticsEvent } from '~/ui/analytics'; diff --git a/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx b/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx index 56212b0e83f9..f13c4ce7582e 100644 --- a/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx +++ b/packages/insomnia/src/ui/context/app/insomnia-tab-context.tsx @@ -1,8 +1,8 @@ +import { models } from 'insomnia-data'; import React, { createContext, type FC, type PropsWithChildren, useCallback, useContext, useRef } from 'react'; import { useNavigate, useParams } from 'react-router'; import * as reactUse from 'react-use'; -import { models } from '~/insomnia-data'; import type { BaseTab } from '~/ui/components/tabs/tab'; import type { OrganizationTabs } from '~/ui/components/tabs/tab-list'; import uiEventBus from '~/ui/event-bus'; diff --git a/packages/insomnia/src/ui/database.client.ts b/packages/insomnia/src/ui/database.client.ts index 0401e1e5d3a8..05ff7aa3656d 100644 --- a/packages/insomnia/src/ui/database.client.ts +++ b/packages/insomnia/src/ui/database.client.ts @@ -1,7 +1,7 @@ // Bridge Database implementation for renderer process // Uses window.database.invoke API exposed by contextBridge from preload -import type { AllTypes, BaseModel, IDatabase, Operation, Query } from '~/insomnia-data'; +import type { AllTypes, BaseModel, IDatabase, Operation, Query } from 'insomnia-data'; /** * Bridge database implementation for renderer process. diff --git a/packages/insomnia/src/ui/hooks/theme.ts b/packages/insomnia/src/ui/hooks/theme.ts index d87c9a4f2ad7..3e0b49e9c3eb 100644 --- a/packages/insomnia/src/ui/hooks/theme.ts +++ b/packages/insomnia/src/ui/hooks/theme.ts @@ -1,7 +1,7 @@ +import type { ThemeSettings } from 'insomnia-data'; import { useCallback, useEffect, useState } from 'react'; import * as reactUse from 'react-use'; -import type { ThemeSettings } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { AnalyticsEvent } from '~/ui/analytics'; diff --git a/packages/insomnia/src/ui/hooks/use-close-connection.ts b/packages/insomnia/src/ui/hooks/use-close-connection.ts index f0ba14526e4b..e3b9945eb6bd 100644 --- a/packages/insomnia/src/ui/hooks/use-close-connection.ts +++ b/packages/insomnia/src/ui/hooks/use-close-connection.ts @@ -1,7 +1,6 @@ +import { models, services } from 'insomnia-data'; import { useCallback, useEffect } from 'react'; -import { models, services } from '~/insomnia-data'; - import { useInsomniaTabContext } from '../context/app/insomnia-tab-context'; import uiEventBus from '../event-bus'; diff --git a/packages/insomnia/src/ui/hooks/use-filtered-requests.ts b/packages/insomnia/src/ui/hooks/use-filtered-requests.ts index 313398418c98..6d3936876a69 100644 --- a/packages/insomnia/src/ui/hooks/use-filtered-requests.ts +++ b/packages/insomnia/src/ui/hooks/use-filtered-requests.ts @@ -1,8 +1,7 @@ +import type { BaseModel } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { useMemo } from 'react'; -import type { BaseModel } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; - import { fuzzyMatchAll } from '../../common/misc'; interface SearchableFields { diff --git a/packages/insomnia/src/ui/hooks/use-insomnia-navigation.ts b/packages/insomnia/src/ui/hooks/use-insomnia-navigation.ts index 9752a9cd1fab..50b38fa63cdc 100644 --- a/packages/insomnia/src/ui/hooks/use-insomnia-navigation.ts +++ b/packages/insomnia/src/ui/hooks/use-insomnia-navigation.ts @@ -1,6 +1,3 @@ -import { useCallback, useMemo } from 'react'; -import { href, matchPath, useLocation, useSearchParams } from 'react-router'; - import type { GrpcRequest, McpRequest, @@ -14,8 +11,10 @@ import type { UnitTestSuite, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; +import { useCallback, useMemo } from 'react'; +import { href, matchPath, useLocation, useSearchParams } from 'react-router'; export type NavigationResource = | undefined diff --git a/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts b/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts index 2950bf23e7bb..c84009caa23d 100644 --- a/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts +++ b/packages/insomnia/src/ui/hooks/use-insomnia-tab.ts @@ -1,9 +1,9 @@ import type { Organization } from 'insomnia-api'; +import type { Project, Request, Workspace } from 'insomnia-data'; +import { models, services } from 'insomnia-data'; import { useCallback, useEffect, useRef } from 'react'; import { useNavigate } from 'react-router'; -import type { Project, Request, Workspace } from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; import { formatMethodName, getRequestMethodShortHand } from '~/ui/components/tags/method-tag'; import { showResourceNotFoundToast } from '~/ui/components/toast-notification'; diff --git a/packages/insomnia/src/ui/hooks/use-organization-features.tsx b/packages/insomnia/src/ui/hooks/use-organization-features.tsx index 20ef91bdb4dd..9625b5d07841 100644 --- a/packages/insomnia/src/ui/hooks/use-organization-features.tsx +++ b/packages/insomnia/src/ui/hooks/use-organization-features.tsx @@ -1,7 +1,7 @@ +import { models } from 'insomnia-data'; import { useCallback, useEffect, useState } from 'react'; import { useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { fallbackBilling, fallbackFeatures, diff --git a/packages/insomnia/src/ui/hooks/use-plan.tsx b/packages/insomnia/src/ui/hooks/use-plan.tsx index b9014113d507..dc993168d278 100644 --- a/packages/insomnia/src/ui/hooks/use-plan.tsx +++ b/packages/insomnia/src/ui/hooks/use-plan.tsx @@ -1,7 +1,7 @@ import { type PersonalPlanType } from 'insomnia-api'; +import { models } from 'insomnia-data'; import { useParams } from 'react-router'; -import { models } from '~/insomnia-data'; import { useRootLoaderData } from '~/root'; import { useOrganizationLoaderData } from '~/routes/organization'; diff --git a/packages/insomnia/src/ui/hooks/use-request.ts b/packages/insomnia/src/ui/hooks/use-request.ts index 70aeeb632649..32d56e48da88 100644 --- a/packages/insomnia/src/ui/hooks/use-request.ts +++ b/packages/insomnia/src/ui/hooks/use-request.ts @@ -1,5 +1,3 @@ -import { useParams } from 'react-router'; - import type { GrpcRequest, GrpcRequestMeta, @@ -14,7 +12,9 @@ import type { SocketIORequest, WebSocketRequest, WorkspaceMeta, -} from '~/insomnia-data'; +} from 'insomnia-data'; +import { useParams } from 'react-router'; + import { useRequestUpdateActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update'; import { useRequestUpdateMetaActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-meta'; import { useRequestUpdatePayloadActionFetcher } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.request.$requestId.update-payload'; diff --git a/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx b/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx index c94da6b8eb69..205e08e7ee97 100644 --- a/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx +++ b/packages/insomnia/src/ui/hooks/use-runner-request-list.tsx @@ -1,7 +1,7 @@ +import type { Request } from 'insomnia-data'; +import { models } from 'insomnia-data'; import { useEffect, useMemo, useRef } from 'react'; -import type { Request } from '~/insomnia-data'; -import { models } from '~/insomnia-data'; import type { RequestRow } from '~/routes/organization.$organizationId.project.$projectId.workspace.$workspaceId.debug.runner'; import { useRunnerContext } from '~/ui/context/app/runner-context'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx b/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx index c4e5f1c965d5..69f43e995846 100644 --- a/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx +++ b/packages/insomnia/src/ui/hooks/use-toggle-environment-type.tsx @@ -1,7 +1,7 @@ +import type { Environment, EnvironmentKvPairData } from 'insomnia-data'; +import { EnvironmentType } from 'insomnia-data'; import { useCallback } from 'react'; -import type { Environment, EnvironmentKvPairData } from '~/insomnia-data'; -import { EnvironmentType } from '~/insomnia-data'; import { showModal } from '~/ui/components/modals'; import { AlertModal } from '~/ui/components/modals/alert-modal'; import { AskModal } from '~/ui/components/modals/ask-modal'; diff --git a/packages/insomnia/src/ui/organization-utils.ts b/packages/insomnia/src/ui/organization-utils.ts index 60fc5d294752..b67d4970c19a 100644 --- a/packages/insomnia/src/ui/organization-utils.ts +++ b/packages/insomnia/src/ui/organization-utils.ts @@ -1,8 +1,8 @@ import { createTeamProject, fetchTeamProjects, getCurrentPlan, getUserProfile, isApiError } from 'insomnia-api'; +import type { Project, Workspace } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; import { projectLock } from '~/common/project'; -import type { Project, Workspace } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; import { invariant } from '~/utils/invariant'; import { diff --git a/packages/insomnia/src/ui/renderer-listeners.ts b/packages/insomnia/src/ui/renderer-listeners.ts index d026a9578752..c45daa0ff29a 100644 --- a/packages/insomnia/src/ui/renderer-listeners.ts +++ b/packages/insomnia/src/ui/renderer-listeners.ts @@ -1,4 +1,5 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; + import { type RAToastContent, showToast } from '~/ui/components/toast-notification'; import * as themes from '../plugins/misc'; diff --git a/packages/insomnia/src/ui/renderer-services-proxy.ts b/packages/insomnia/src/ui/renderer-services-proxy.ts index a76d7d3c97f5..c70364892558 100644 --- a/packages/insomnia/src/ui/renderer-services-proxy.ts +++ b/packages/insomnia/src/ui/renderer-services-proxy.ts @@ -1,4 +1,5 @@ -import type { Services } from '~/insomnia-data'; +import type { Services } from 'insomnia-data'; + import { invokeWithNormalizedError } from '~/main/ipc/invoke'; export const servicesProxy = new Proxy({} as Services, { diff --git a/packages/insomnia/src/ui/sync-utils.ts b/packages/insomnia/src/ui/sync-utils.ts index 17e337716a7c..fe1d874825be 100644 --- a/packages/insomnia/src/ui/sync-utils.ts +++ b/packages/insomnia/src/ui/sync-utils.ts @@ -1,4 +1,3 @@ -import { database, type Operation } from '~/common/database'; import type { ApiSpec, Environment, @@ -14,8 +13,10 @@ import type { UnitTestSuite, WebSocketRequest, Workspace, -} from '~/insomnia-data'; -import { models, services } from '~/insomnia-data'; +} from 'insomnia-data'; +import { models, services } from 'insomnia-data'; + +import { database, type Operation } from '~/common/database'; import type { BackendProject, Compare, StatusCandidate } from '~/sync/types'; import { invariant } from '~/utils/invariant'; diff --git a/packages/insomnia/src/ui/utils.ts b/packages/insomnia/src/ui/utils.ts index 0dd21482827e..a22103334c9b 100644 --- a/packages/insomnia/src/ui/utils.ts +++ b/packages/insomnia/src/ui/utils.ts @@ -1,7 +1,6 @@ +import { isMac } from 'insomnia-data/common'; import type { PressEvent } from 'react-aria'; -import { isMac } from '~/insomnia-data/common'; - export const isPrimaryClickModifier = (e: React.MouseEvent | MouseEvent | PressEvent) => { return isMac ? e.metaKey : e.ctrlKey; }; diff --git a/packages/insomnia/src/ui/vault-key.client.ts b/packages/insomnia/src/ui/vault-key.client.ts index 889d686442eb..4e1f4d6e7085 100644 --- a/packages/insomnia/src/ui/vault-key.client.ts +++ b/packages/insomnia/src/ui/vault-key.client.ts @@ -1,8 +1,7 @@ import * as srp from '@getinsomnia/srp-js'; import { createVault, resetVault, verifyVaultA, verifyVaultM1 } from 'insomnia-api'; - -import type { UserSession } from '~/insomnia-data'; -import { services } from '~/insomnia-data'; +import type { UserSession } from 'insomnia-data'; +import { services } from 'insomnia-data'; import { base64encode, saveVaultKeyIfNecessary } from '../utils/vault'; diff --git a/packages/insomnia/src/utils/environment-utils.test.ts b/packages/insomnia/src/utils/environment-utils.test.ts index 57af2f4f7149..41b502444313 100644 --- a/packages/insomnia/src/utils/environment-utils.test.ts +++ b/packages/insomnia/src/utils/environment-utils.test.ts @@ -1,7 +1,6 @@ +import { EnvironmentKvPairDataType, models } from 'insomnia-data'; import { describe, expect, it } from 'vitest'; -import { EnvironmentKvPairDataType, models } from '~/insomnia-data'; - import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../templating'; import { checkNestedKeys, diff --git a/packages/insomnia/src/utils/environment-utils.ts b/packages/insomnia/src/utils/environment-utils.ts index b54628d73aec..5e28a1e6ec65 100644 --- a/packages/insomnia/src/utils/environment-utils.ts +++ b/packages/insomnia/src/utils/environment-utils.ts @@ -1,8 +1,7 @@ +import type { Environment, EnvironmentKvPairData } from 'insomnia-data'; +import { EnvironmentKvPairDataType, models } from 'insomnia-data'; import orderedJSON from 'json-order'; -import type { Environment, EnvironmentKvPairData } from '~/insomnia-data'; -import { EnvironmentKvPairDataType, models } from '~/insomnia-data'; - import { JSON_ORDER_SEPARATOR } from '../common/constants'; import { generateId } from '../common/misc'; import { NUNJUCKS_TEMPLATE_GLOBAL_PROPERTY_NAME } from '../templating/constants'; diff --git a/packages/insomnia/src/utils/invariant.ts b/packages/insomnia/src/utils/invariant.ts index ef18adb09788..4f3681f7d96c 100644 --- a/packages/insomnia/src/utils/invariant.ts +++ b/packages/insomnia/src/utils/invariant.ts @@ -1 +1 @@ -export { invariant } from '~/insomnia-data/common'; +export { invariant } from 'insomnia-data/common'; diff --git a/packages/insomnia/src/utils/router.ts b/packages/insomnia/src/utils/router.ts index ca50d851fcae..141f1fd8456f 100644 --- a/packages/insomnia/src/utils/router.ts +++ b/packages/insomnia/src/utils/router.ts @@ -1,10 +1,9 @@ import type { Organization } from 'insomnia-api'; +import type { GitProject, GitRepository, Project } from 'insomnia-data'; +import { database, models, services } from 'insomnia-data'; import { useCallback } from 'react'; import { href, matchPath, type PathMatch, useFetcher } from 'react-router'; -import type { GitProject, GitRepository, Project } from '~/insomnia-data'; -import { database, models, services } from '~/insomnia-data'; - import { CURRENT_MIGRATION_VERSION } from '../sync/git/git-migration-version'; export const enum AsyncTask { diff --git a/packages/insomnia/src/utils/try-interpolate.ts b/packages/insomnia/src/utils/try-interpolate.ts index eae80c9f4be6..4a6497542d37 100644 --- a/packages/insomnia/src/utils/try-interpolate.ts +++ b/packages/insomnia/src/utils/try-interpolate.ts @@ -1,4 +1,4 @@ -import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from '~/insomnia-data'; +import type { GrpcRequest, McpRequest, Request, SocketIORequest, WebSocketRequest } from 'insomnia-data'; import { getRenderContext, render } from '../common/render'; import { RenderError } from '../templating/render-error'; diff --git a/packages/insomnia/src/utils/url/querystring.ts b/packages/insomnia/src/utils/url/querystring.ts index 8c0edd816a9b..c0dea5732606 100644 --- a/packages/insomnia/src/utils/url/querystring.ts +++ b/packages/insomnia/src/utils/url/querystring.ts @@ -1,5 +1,5 @@ -import type { IQueryStringOptions, StrictNullSearchParamsValueType } from '~/insomnia-data/common'; -import { deconstructQueryStringToParams } from '~/insomnia-data/common'; +import type { IQueryStringOptions, StrictNullSearchParamsValueType } from 'insomnia-data/common'; +import { deconstructQueryStringToParams } from 'insomnia-data/common'; import { setDefaultProtocol } from './protocol'; diff --git a/packages/insomnia/src/utils/vault.ts b/packages/insomnia/src/utils/vault.ts index 8f56022d4f07..111ced6fc1c6 100644 --- a/packages/insomnia/src/utils/vault.ts +++ b/packages/insomnia/src/utils/vault.ts @@ -1,4 +1,4 @@ -import { services } from '~/insomnia-data'; +import { services } from 'insomnia-data'; import { type AESMessage, decryptAES, encryptAES } from '../account/crypt'; import { getInsomniaVaultKey, PLAYWRIGHT_TEST } from '../common/constants'; diff --git a/packages/insomnia/tsconfig.json b/packages/insomnia/tsconfig.json index ef564fe874d5..8f864356aa05 100644 --- a/packages/insomnia/tsconfig.json +++ b/packages/insomnia/tsconfig.json @@ -16,7 +16,9 @@ "baseUrl": ".", "rootDirs": [".", "./.react-router/types"], "paths": { - "~/*": ["./src/*"] + "~/*": ["./src/*"], + "insomnia-data": ["./src/insomnia-data"], + "insomnia-data/*": ["./src/insomnia-data/*"] }, /* Runs in the DOM */ "lib": ["ES2023", "DOM.Iterable", "DOM"], diff --git a/packages/insomnia/types/codemirror.d.ts b/packages/insomnia/types/codemirror.d.ts index 72c518a7c34a..a9fede43f8c8 100644 --- a/packages/insomnia/types/codemirror.d.ts +++ b/packages/insomnia/types/codemirror.d.ts @@ -4,7 +4,7 @@ import { GraphQLInfoOptions } from 'codemirror-graphql/info'; import { ModifiedGraphQLJumpOptions } from 'codemirror-graphql/jump'; import { GraphQLSchema } from 'graphql'; -import type { Settings } from '~/insomnia-data'; +import type { Settings } from 'insomnia-data'; import { HandleRender } from '../src/common/render'; import { NunjucksParsedTag } from '../src/templating/utils'; diff --git a/packages/insomnia/types/global.d.ts b/packages/insomnia/types/global.d.ts index 20fd702f88a3..4c3567bd75c3 100644 --- a/packages/insomnia/types/global.d.ts +++ b/packages/insomnia/types/global.d.ts @@ -3,7 +3,7 @@ import type { HiddenBrowserWindowToMainBridgeAPI } from '../src/hidden-window-pr import type { RendererToMainBridgeAPI } from '../src/main/ipc/main'; import type { DatabaseBridgeAPI } from '../src/main/ipc/database'; import type { DiffMatchPatch, DiffOp } from 'diff-match-patch-ts'; -import type { Services } from '~/insomnia-data'; +import type { Services } from 'insomnia-data'; type RendererEnv = { INSOMNIA_GITLAB_REDIRECT_URI: string | undefined; diff --git a/packages/insomnia/vite.config.ts b/packages/insomnia/vite.config.ts index f4b57fc94581..af100e83f266 100644 --- a/packages/insomnia/vite.config.ts +++ b/packages/insomnia/vite.config.ts @@ -58,6 +58,7 @@ export default defineConfig(({ mode }) => { '~/network/network-adapter': path.resolve(__dirname, './src/network/network-adapter.renderer'), '~/templating/render-adapter': path.resolve(__dirname, './src/templating/render-adapter.renderer'), '~': path.resolve(__dirname, './src'), + 'insomnia-data': path.resolve(__dirname, './src/insomnia-data'), // Shim Node's `path` module for browser-safe dependencies (e.g. mime-types uses path.extname). 'path': path.resolve(__dirname, './src/path-shim.ts'), }, diff --git a/packages/insomnia/vitest.config.ts b/packages/insomnia/vitest.config.ts index 5309c7419674..97a05792a21b 100644 --- a/packages/insomnia/vitest.config.ts +++ b/packages/insomnia/vitest.config.ts @@ -14,6 +14,7 @@ export default defineConfig({ '~/network/network-adapter': path.resolve(__dirname, './src/network/network-adapter.renderer'), '~/templating/render-adapter': path.resolve(__dirname, './src/templating/render-adapter.node'), '~': path.resolve(__dirname, './src'), + 'insomnia-data': path.resolve(__dirname, './src/insomnia-data'), 'electron/main': 'electron', }, server: {