From 00420a7a529308dd80c278f9bf05b37aa306ad71 Mon Sep 17 00:00:00 2001 From: Erika Date: Thu, 16 May 2024 16:11:58 +0000 Subject: [PATCH] [ci] format --- packages/db/src/core/cli/commands/execute/index.ts | 2 +- packages/db/src/core/cli/commands/link/index.ts | 7 ++++++- packages/db/src/core/cli/commands/login/index.ts | 2 +- packages/db/src/core/cli/commands/logout/index.ts | 2 +- packages/db/src/core/cli/commands/push/index.ts | 2 +- packages/db/src/core/cli/commands/shell/index.ts | 2 +- packages/db/src/core/cli/commands/verify/index.ts | 2 +- packages/db/src/core/integration/index.ts | 2 +- packages/db/src/core/utils.ts | 2 +- 9 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/db/src/core/cli/commands/execute/index.ts b/packages/db/src/core/cli/commands/execute/index.ts index e9421d97d9..c6c11cdbb6 100644 --- a/packages/db/src/core/cli/commands/execute/index.ts +++ b/packages/db/src/core/cli/commands/execute/index.ts @@ -1,4 +1,5 @@ import { existsSync } from 'node:fs'; +import { getManagedAppTokenOrExit } from '@astrojs/studio'; import { LibsqlError } from '@libsql/client'; import type { AstroConfig } from 'astro'; import { green } from 'kleur/colors'; @@ -14,7 +15,6 @@ import { getStudioVirtualModContents, } from '../../../integration/vite-plugin-db.js'; import { bundleFile, importBundledFile } from '../../../load-file.js'; -import { getManagedAppTokenOrExit } from '@astrojs/studio'; import type { DBConfig } from '../../../types.js'; export async function cmd({ diff --git a/packages/db/src/core/cli/commands/link/index.ts b/packages/db/src/core/cli/commands/link/index.ts index 52e4b2f2e5..e4e2bc68e8 100644 --- a/packages/db/src/core/cli/commands/link/index.ts +++ b/packages/db/src/core/cli/commands/link/index.ts @@ -1,12 +1,17 @@ import { mkdir, writeFile } from 'node:fs/promises'; import { homedir } from 'node:os'; import { basename } from 'node:path'; +import { + MISSING_SESSION_ID_ERROR, + PROJECT_ID_FILE, + getAstroStudioUrl, + getSessionIdFromFile, +} from '@astrojs/studio'; import { slug } from 'github-slugger'; import { bgRed, cyan } from 'kleur/colors'; import ora from 'ora'; import prompts from 'prompts'; import { safeFetch } from '../../../../runtime/utils.js'; -import { PROJECT_ID_FILE, MISSING_SESSION_ID_ERROR, getAstroStudioUrl, getSessionIdFromFile } from '@astrojs/studio'; import { type Result } from '../../../utils.js'; export async function cmd() { diff --git a/packages/db/src/core/cli/commands/login/index.ts b/packages/db/src/core/cli/commands/login/index.ts index e50afda045..61f7e0275b 100644 --- a/packages/db/src/core/cli/commands/login/index.ts +++ b/packages/db/src/core/cli/commands/login/index.ts @@ -1,5 +1,6 @@ import { mkdir, writeFile } from 'node:fs/promises'; import { createServer as _createServer } from 'node:http'; +import { SESSION_LOGIN_FILE, getAstroStudioUrl } from '@astrojs/studio'; import type { AstroConfig } from 'astro'; import { listen } from 'async-listen'; import { cyan } from 'kleur/colors'; @@ -7,7 +8,6 @@ import open from 'open'; import ora from 'ora'; import prompt from 'prompts'; import type { Arguments } from 'yargs-parser'; -import { SESSION_LOGIN_FILE, getAstroStudioUrl } from '@astrojs/studio'; import type { DBConfig } from '../../../types.js'; const isWebContainer = diff --git a/packages/db/src/core/cli/commands/logout/index.ts b/packages/db/src/core/cli/commands/logout/index.ts index a69d83bbc1..8b78786590 100644 --- a/packages/db/src/core/cli/commands/logout/index.ts +++ b/packages/db/src/core/cli/commands/logout/index.ts @@ -1,5 +1,5 @@ import { unlink } from 'node:fs/promises'; -import { SESSION_LOGIN_FILE } from '@astrojs/studio' +import { SESSION_LOGIN_FILE } from '@astrojs/studio'; export async function cmd() { await unlink(SESSION_LOGIN_FILE); diff --git a/packages/db/src/core/cli/commands/push/index.ts b/packages/db/src/core/cli/commands/push/index.ts index a5802a31f7..bfccdf5f80 100644 --- a/packages/db/src/core/cli/commands/push/index.ts +++ b/packages/db/src/core/cli/commands/push/index.ts @@ -1,9 +1,9 @@ +import { getManagedAppTokenOrExit } from '@astrojs/studio'; import type { AstroConfig } from 'astro'; import prompts from 'prompts'; import type { Arguments } from 'yargs-parser'; import { safeFetch } from '../../../../runtime/utils.js'; import { MIGRATION_VERSION } from '../../../consts.js'; -import { getManagedAppTokenOrExit } from '@astrojs/studio'; import { type DBConfig, type DBSnapshot } from '../../../types.js'; import { type Result, getRemoteDatabaseUrl } from '../../../utils.js'; import { diff --git a/packages/db/src/core/cli/commands/shell/index.ts b/packages/db/src/core/cli/commands/shell/index.ts index 4e0c0d9765..7a4115abc5 100644 --- a/packages/db/src/core/cli/commands/shell/index.ts +++ b/packages/db/src/core/cli/commands/shell/index.ts @@ -1,3 +1,4 @@ +import { getManagedAppTokenOrExit } from '@astrojs/studio'; import type { AstroConfig } from 'astro'; import { sql } from 'drizzle-orm'; import type { Arguments } from 'yargs-parser'; @@ -8,7 +9,6 @@ import { import { normalizeDatabaseUrl } from '../../../../runtime/index.js'; import { DB_PATH } from '../../../consts.js'; import { SHELL_QUERY_MISSING_ERROR } from '../../../errors.js'; -import { getManagedAppTokenOrExit } from '@astrojs/studio'; import type { DBConfigInput } from '../../../types.js'; import { getAstroEnv, getRemoteDatabaseUrl } from '../../../utils.js'; diff --git a/packages/db/src/core/cli/commands/verify/index.ts b/packages/db/src/core/cli/commands/verify/index.ts index b555f3d122..950fb66156 100644 --- a/packages/db/src/core/cli/commands/verify/index.ts +++ b/packages/db/src/core/cli/commands/verify/index.ts @@ -1,6 +1,6 @@ +import { getManagedAppTokenOrExit } from '@astrojs/studio'; import type { AstroConfig } from 'astro'; import type { Arguments } from 'yargs-parser'; -import { getManagedAppTokenOrExit } from '@astrojs/studio'; import type { DBConfig } from '../../../types.js'; import { createCurrentSnapshot, diff --git a/packages/db/src/core/integration/index.ts b/packages/db/src/core/integration/index.ts index a79abb136e..9be71956f2 100644 --- a/packages/db/src/core/integration/index.ts +++ b/packages/db/src/core/integration/index.ts @@ -1,6 +1,7 @@ import { existsSync } from 'fs'; import { dirname } from 'path'; import { fileURLToPath } from 'url'; +import { type ManagedAppToken, getManagedAppTokenOrExit } from '@astrojs/studio'; import { LibsqlError } from '@libsql/client'; import type { AstroConfig, AstroIntegration } from 'astro'; import { mkdir, writeFile } from 'fs/promises'; @@ -19,7 +20,6 @@ import { CONFIG_FILE_NAMES, DB_PATH } from '../consts.js'; import { EXEC_DEFAULT_EXPORT_ERROR, EXEC_ERROR } from '../errors.js'; import { resolveDbConfig } from '../load-file.js'; import { SEED_DEV_FILE_NAME } from '../queries.js'; -import { type ManagedAppToken, getManagedAppTokenOrExit } from '@astrojs/studio'; import { type VitePlugin, getDbDirectoryUrl } from '../utils.js'; import { fileURLIntegration } from './file-url.js'; import { typegenInternal } from './typegen.js'; diff --git a/packages/db/src/core/utils.ts b/packages/db/src/core/utils.ts index 6570bada74..4fef5fbe18 100644 --- a/packages/db/src/core/utils.ts +++ b/packages/db/src/core/utils.ts @@ -1,7 +1,7 @@ +import { getAstroStudioEnv } from '@astrojs/studio'; import type { AstroConfig, AstroIntegration } from 'astro'; import { loadEnv } from 'vite'; import type { AstroDbIntegration } from './types.js'; -import { getAstroStudioEnv } from '@astrojs/studio'; export type VitePlugin = Required['plugins'][number];