From 9bfffeb0fedc4c275c290ab9db973e92933afcd3 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Thu, 9 Jul 2026 18:26:17 -0500 Subject: [PATCH 1/8] refactor: use @cardstack/base import specifiers in runtime-common Part of the sweep converting in-repo base-module imports from the https://cardstack.com/base/ URL form to the canonical @cardstack/base/ prefix: static and literal-dynamic specifiers, tsconfig paths carrying both spellings, and import ordering per the specifier's new sort group. Co-Authored-By: Claude Fable 5 --- packages/runtime-common/ai/history.ts | 4 +- packages/runtime-common/ai/matrix-utils.ts | 4 +- packages/runtime-common/ai/prompt.ts | 4 +- packages/runtime-common/ai/types.ts | 2 +- packages/runtime-common/bot-trigger.ts | 2 +- packages/runtime-common/catalog.ts | 4 +- packages/runtime-common/code-ref.ts | 4 +- packages/runtime-common/commands.ts | 4 +- packages/runtime-common/definitions.ts | 9 ++-- packages/runtime-common/etc/test-fixtures.ts | 8 ++-- packages/runtime-common/helpers/ai.ts | 42 +++++++++++-------- .../helpers/card-type-display-name.ts | 2 +- packages/runtime-common/index.ts | 12 ++---- .../runtime-common/instance-filter-matcher.ts | 6 +-- packages/runtime-common/matrix-client.ts | 2 +- packages/runtime-common/module-syntax.ts | 2 +- packages/runtime-common/realm-index-card.ts | 2 +- packages/runtime-common/realm.ts | 2 +- packages/runtime-common/searchable-routes.ts | 2 +- .../runtime-common/serializers/big-integer.ts | 2 +- .../runtime-common/serializers/boolean.ts | 2 +- .../runtime-common/serializers/code-ref.ts | 4 +- packages/runtime-common/serializers/date.ts | 2 +- .../runtime-common/serializers/datetime.ts | 2 +- packages/runtime-common/serializers/email.ts | 2 +- .../serializers/ethereum-address.ts | 2 +- .../runtime-common/serializers/image-size.ts | 2 +- packages/runtime-common/serializers/index.ts | 2 +- packages/runtime-common/serializers/number.ts | 2 +- packages/runtime-common/serializers/phone.ts | 2 +- .../serializers/string-to-content.ts | 2 +- packages/runtime-common/tasks/index.ts | 2 +- packages/runtime-common/tsconfig.json | 6 +++ packages/runtime-common/utils.ts | 2 +- packages/runtime-common/worker-request.ts | 2 +- packages/runtime-common/worker.ts | 2 +- 36 files changed, 79 insertions(+), 78 deletions(-) diff --git a/packages/runtime-common/ai/history.ts b/packages/runtime-common/ai/history.ts index d84e6ae4933..f9bdb68b0f6 100644 --- a/packages/runtime-common/ai/history.ts +++ b/packages/runtime-common/ai/history.ts @@ -7,7 +7,7 @@ import type { MatrixEvent as DiscreteMatrixEvent, MessageEvent, RealmServerEvent, -} from 'https://cardstack.com/base/matrix-event'; +} from '@cardstack/base/matrix-event'; import type { MatrixClient } from 'matrix-js-sdk'; import type { IRoomEvent } from 'matrix-js-sdk'; @@ -27,7 +27,7 @@ import { } from '../matrix-constants.ts'; import { downloadFile } from './matrix-utils.ts'; -import type { SerializedFileDef } from 'https://cardstack.com/base/file-api'; +import type { SerializedFileDef } from '@cardstack/base/file-api'; import { HistoryConstructionError } from './types.ts'; function getLog() { diff --git a/packages/runtime-common/ai/matrix-utils.ts b/packages/runtime-common/ai/matrix-utils.ts index c866d937e76..8f67e86f00f 100644 --- a/packages/runtime-common/ai/matrix-utils.ts +++ b/packages/runtime-common/ai/matrix-utils.ts @@ -18,11 +18,11 @@ import { APP_BOXEL_CODE_PATCH_RESULT_EVENT_TYPE, isToolResultEventType, } from '../matrix-constants.ts'; -import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event'; +import type { MatrixEvent as DiscreteMatrixEvent } from '@cardstack/base/matrix-event'; import type { MatrixEvent } from 'matrix-js-sdk'; import type { PromptParts } from './types.ts'; import { encodeUri } from 'matrix-js-sdk/lib/utils.js'; -import type { SerializedFileDef } from 'https://cardstack.com/base/file-api'; +import type { SerializedFileDef } from '@cardstack/base/file-api'; import { isTextBasedContentType } from './modality.ts'; function getLog() { diff --git a/packages/runtime-common/ai/prompt.ts b/packages/runtime-common/ai/prompt.ts index 1d11a442df4..bf05605a5d0 100644 --- a/packages/runtime-common/ai/prompt.ts +++ b/packages/runtime-common/ai/prompt.ts @@ -37,11 +37,11 @@ import type { MatrixEventWithBoxelContext, SkillsConfigEvent, Tool, -} from 'https://cardstack.com/base/matrix-event'; +} from '@cardstack/base/matrix-event'; import type { SerializedFile, SerializedFileDef, -} from 'https://cardstack.com/base/file-api'; +} from '@cardstack/base/file-api'; import { APP_BOXEL_CODE_PATCH_RESULT_EVENT_TYPE, APP_BOXEL_CODE_PATCH_RESULT_REL_TYPE, diff --git a/packages/runtime-common/ai/types.ts b/packages/runtime-common/ai/types.ts index 818157050e1..b158a8d2b00 100644 --- a/packages/runtime-common/ai/types.ts +++ b/packages/runtime-common/ai/types.ts @@ -2,7 +2,7 @@ import type { BoxelContext, MatrixEvent as DiscreteMatrixEvent, Tool, -} from 'https://cardstack.com/base/matrix-event'; +} from '@cardstack/base/matrix-event'; import type { ReasoningEffort } from 'openai/resources/shared'; import type { ToolChoice } from '../helpers/ai.ts'; import type { CardResource } from '../resource-types.ts'; diff --git a/packages/runtime-common/bot-trigger.ts b/packages/runtime-common/bot-trigger.ts index 166257eb360..eab99111fd1 100644 --- a/packages/runtime-common/bot-trigger.ts +++ b/packages/runtime-common/bot-trigger.ts @@ -1,4 +1,4 @@ -import type { BotTriggerEvent } from 'https://cardstack.com/base/matrix-event'; +import type { BotTriggerEvent } from '@cardstack/base/matrix-event'; import { BOT_TRIGGER_EVENT_TYPE } from './matrix-constants.ts'; export function isBotTriggerEvent(value: unknown): value is BotTriggerEvent { diff --git a/packages/runtime-common/catalog.ts b/packages/runtime-common/catalog.ts index 3263b0338b4..ab3df314423 100644 --- a/packages/runtime-common/catalog.ts +++ b/packages/runtime-common/catalog.ts @@ -2,8 +2,8 @@ import { isEqual } from 'lodash-es'; import { uniqWith } from 'lodash-es'; import { kebabCase } from 'lodash-es'; import { v4 as uuidv4 } from 'uuid'; -import type { Spec } from 'https://cardstack.com/base/spec'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { Spec } from '@cardstack/base/spec'; +import type { CardDef } from '@cardstack/base/card-api'; import { RealmPaths, join } from './paths.ts'; import type { ResolvedCodeRef } from './code-ref.ts'; import { resolveAdoptedCodeRef } from './code-ref.ts'; diff --git a/packages/runtime-common/code-ref.ts b/packages/runtime-common/code-ref.ts index 992b0186047..cf26774f46c 100644 --- a/packages/runtime-common/code-ref.ts +++ b/packages/runtime-common/code-ref.ts @@ -5,8 +5,8 @@ import type { CardDef, FieldDef, FieldConstructor, -} from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +} from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; import { Loader } from './loader.ts'; import { isField, diff --git a/packages/runtime-common/commands.ts b/packages/runtime-common/commands.ts index 03066ef9717..87260531bc3 100644 --- a/packages/runtime-common/commands.ts +++ b/packages/runtime-common/commands.ts @@ -5,8 +5,8 @@ import { } from './code-ref.ts'; import type { RealmResourceIdentifier } from './realm-identifiers.ts'; import type { VirtualNetwork } from './virtual-network.ts'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type { CardDefConstructor } from 'https://cardstack.com/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { CardDefConstructor } from '@cardstack/base/card-api'; import type { AttributesSchema, CardSchema } from './helpers/ai.ts'; import { generateJsonSchemaForCardType } from './helpers/ai.ts'; import { simpleHash } from './utils.ts'; diff --git a/packages/runtime-common/definitions.ts b/packages/runtime-common/definitions.ts index fc252f1cc4b..b62a8309413 100644 --- a/packages/runtime-common/definitions.ts +++ b/packages/runtime-common/definitions.ts @@ -6,12 +6,9 @@ import { type CodeRef, } from './index.ts'; import type { SerializerName } from './serializers/index.ts'; -import type { - FieldType, - Searchable, -} from 'https://cardstack.com/base/card-api'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; +import type { FieldType, Searchable } from '@cardstack/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; import type { Query } from './query.ts'; export interface FieldDefinition { diff --git a/packages/runtime-common/etc/test-fixtures.ts b/packages/runtime-common/etc/test-fixtures.ts index a7f1054764e..25d6e28e999 100644 --- a/packages/runtime-common/etc/test-fixtures.ts +++ b/packages/runtime-common/etc/test-fixtures.ts @@ -6,8 +6,8 @@ import { field, Component, CardDef, -} from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; +} from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; export class Person extends CardDef { static displayName = 'Person'; @@ -32,8 +32,8 @@ export function increment() { export function compiledCard(id = 'null', moduleName = '/dir/person.gts') { return ` -import { contains, field, Component, CardDef } from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; +import { contains, field, Component, CardDef } from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; import { setComponentTemplate } from "@ember/component"; import { createTemplateFactory } from "@ember/template-factory"; export class Person extends CardDef { diff --git a/packages/runtime-common/helpers/ai.ts b/packages/runtime-common/helpers/ai.ts index f834276ff69..de7b9eeb383 100644 --- a/packages/runtime-common/helpers/ai.ts +++ b/packages/runtime-common/helpers/ai.ts @@ -1,8 +1,8 @@ -import type * as CardAPI from 'https://cardstack.com/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; import { primitive } from '../constants.ts'; import type { Loader } from '../loader.ts'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { Tool } from 'https://cardstack.com/base/matrix-event'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { Tool } from '@cardstack/base/matrix-event'; type ArraySchema = { type: 'array'; @@ -117,21 +117,27 @@ export interface CardSchema { export async function basicMappings(loader: Loader) { let mappings = new Map(); - let string: typeof import('https://cardstack.com/base/string') = - await loader.import('https://cardstack.com/base/string'); - let number: typeof import('https://cardstack.com/base/number') = - await loader.import('https://cardstack.com/base/number'); - let biginteger: typeof import('https://cardstack.com/base/big-integer') = - await loader.import('https://cardstack.com/base/big-integer'); - let date: typeof import('https://cardstack.com/base/date') = - await loader.import('https://cardstack.com/base/date'); - let datetime: typeof import('https://cardstack.com/base/datetime') = - await loader.import('https://cardstack.com/base/datetime'); - let boolean: typeof import('https://cardstack.com/base/boolean') = - await loader.import('https://cardstack.com/base/boolean'); - let codeRef: typeof import('https://cardstack.com/base/code-ref') = - await loader.import('https://cardstack.com/base/code-ref'); - let query: typeof import('https://cardstack.com/base/commands/search-card-result') = + let string: typeof import('@cardstack/base/string') = await loader.import( + '@cardstack/base/string', + ); + let number: typeof import('@cardstack/base/number') = await loader.import( + '@cardstack/base/number', + ); + let biginteger: typeof import('@cardstack/base/big-integer') = + await loader.import('@cardstack/base/big-integer'); + let date: typeof import('@cardstack/base/date') = await loader.import( + '@cardstack/base/date', + ); + let datetime: typeof import('@cardstack/base/datetime') = await loader.import( + '@cardstack/base/datetime', + ); + let boolean: typeof import('@cardstack/base/boolean') = await loader.import( + '@cardstack/base/boolean', + ); + let codeRef: typeof import('@cardstack/base/code-ref') = await loader.import( + '@cardstack/base/code-ref', + ); + let query: typeof import('@cardstack/base/commands/search-card-result') = await loader.import( 'https://cardstack.com/base/commands/search-card-result', ); diff --git a/packages/runtime-common/helpers/card-type-display-name.ts b/packages/runtime-common/helpers/card-type-display-name.ts index c67d81d4e66..11c118a372e 100644 --- a/packages/runtime-common/helpers/card-type-display-name.ts +++ b/packages/runtime-common/helpers/card-type-display-name.ts @@ -2,7 +2,7 @@ import type { BaseDef, BaseDefConstructor, Field, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; import { getField } from '../code-ref.ts'; diff --git a/packages/runtime-common/index.ts b/packages/runtime-common/index.ts index 18e634fe12b..d3f49a227e3 100644 --- a/packages/runtime-common/index.ts +++ b/packages/runtime-common/index.ts @@ -12,8 +12,8 @@ import type { Definition } from './definitions.ts'; import type { ErrorEntry } from './error.ts'; import { rri, type RealmResourceIdentifier } from './realm-identifiers.ts'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; +import type { FileDef } from '@cardstack/base/file-api'; export interface LooseSingleResourceDocument { data: LooseLinkableResource; @@ -957,12 +957,8 @@ export { sanitizeHtml } from './dompurify-runtime.ts'; export { getPlural } from './pluralize-runtime.ts'; -import type { - CardDef, - FieldDef, - BaseDef, -} from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; +import type { CardDef, FieldDef, BaseDef } from '@cardstack/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; import type { RealmInfo } from './realm.ts'; import type { QueryResultsMeta } from './index-query-engine.ts'; diff --git a/packages/runtime-common/instance-filter-matcher.ts b/packages/runtime-common/instance-filter-matcher.ts index a57de959cc7..4b5bb9875ae 100644 --- a/packages/runtime-common/instance-filter-matcher.ts +++ b/packages/runtime-common/instance-filter-matcher.ts @@ -18,11 +18,7 @@ import { import type { CodeRef } from './code-ref.ts'; import type { VirtualNetwork } from './virtual-network.ts'; -import type { - BaseDef, - CardDef, - Field, -} from 'https://cardstack.com/base/card-api'; +import type { BaseDef, CardDef, Field } from '@cardstack/base/card-api'; // The client-side counterpart to the server's `filterCondition()` / // `orderExpression()` in `index-query-engine.ts`. Those compile a `Query` to diff --git a/packages/runtime-common/matrix-client.ts b/packages/runtime-common/matrix-client.ts index 82a17ccc90e..8e1a3c4d960 100644 --- a/packages/runtime-common/matrix-client.ts +++ b/packages/runtime-common/matrix-client.ts @@ -1,7 +1,7 @@ import { Sha256 } from '@aws-crypto/sha256-js'; import { uint8ArrayToHex } from './index.ts'; import { REALM_ROOM_RETENTION_POLICY_MAX_LIFETIME } from './realm.ts'; -import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event'; +import type { MatrixEvent } from '@cardstack/base/matrix-event'; type JoinedRoomsResponse = { joined_rooms: string[] }; diff --git a/packages/runtime-common/module-syntax.ts b/packages/runtime-common/module-syntax.ts index f344895d3cf..e5fd35b76eb 100644 --- a/packages/runtime-common/module-syntax.ts +++ b/packages/runtime-common/module-syntax.ts @@ -44,7 +44,7 @@ import { getBabelOptions } from './babel-options.ts'; import type { types as t } from '@babel/core'; import type { NodePath } from '@babel/traverse'; -import type { FieldType } from 'https://cardstack.com/base/card-api'; +import type { FieldType } from '@cardstack/base/card-api'; export type { PossibleCardOrFieldDeclaration, diff --git a/packages/runtime-common/realm-index-card.ts b/packages/runtime-common/realm-index-card.ts index b0830c77ad6..2b39110a829 100644 --- a/packages/runtime-common/realm-index-card.ts +++ b/packages/runtime-common/realm-index-card.ts @@ -1,4 +1,4 @@ -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; import { realmURL } from './constants.ts'; import { RealmPaths } from './paths.ts'; diff --git a/packages/runtime-common/realm.ts b/packages/runtime-common/realm.ts index 96fa6facfe2..0f39b51dada 100644 --- a/packages/runtime-common/realm.ts +++ b/packages/runtime-common/realm.ts @@ -171,7 +171,7 @@ import type { FileWatcherEventContent, RealmEventContent, UpdateRealmEventContent, -} from 'https://cardstack.com/base/matrix-event'; +} from '@cardstack/base/matrix-event'; import type { AtomicOperation, AtomicOperationResult, diff --git a/packages/runtime-common/searchable-routes.ts b/packages/runtime-common/searchable-routes.ts index 82d0c9c8896..3829e4af64a 100644 --- a/packages/runtime-common/searchable-routes.ts +++ b/packages/runtime-common/searchable-routes.ts @@ -1,4 +1,4 @@ -import type { Searchable } from 'https://cardstack.com/base/card-api'; +import type { Searchable } from '@cardstack/base/card-api'; // Shared route logic for `searchable`-driven search-doc depth. `searchable` // only ever governs links (see the `Searchable` docs in `base/card-api.gts`): diff --git a/packages/runtime-common/serializers/big-integer.ts b/packages/runtime-common/serializers/big-integer.ts index 18ff5a4c3be..6e6a0ae1877 100644 --- a/packages/runtime-common/serializers/big-integer.ts +++ b/packages/runtime-common/serializers/big-integer.ts @@ -1,7 +1,7 @@ import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export function queryableValue(val: bigint | undefined): string | undefined { return val == null ? undefined : String(val); diff --git a/packages/runtime-common/serializers/boolean.ts b/packages/runtime-common/serializers/boolean.ts index 94897d74182..0a1aad2ed28 100644 --- a/packages/runtime-common/serializers/boolean.ts +++ b/packages/runtime-common/serializers/boolean.ts @@ -1,7 +1,7 @@ import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export function queryableValue(val: any): boolean { return asBoolean(val); diff --git a/packages/runtime-common/serializers/code-ref.ts b/packages/runtime-common/serializers/code-ref.ts index 82ec83256e5..d30d2db5b0b 100644 --- a/packages/runtime-common/serializers/code-ref.ts +++ b/packages/runtime-common/serializers/code-ref.ts @@ -2,7 +2,7 @@ import type { BaseDefConstructor, BaseInstanceType, CardStore, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; import { type ResolvedCodeRef, isUrlLike, @@ -13,7 +13,7 @@ import { import { rri, type RealmResourceIdentifier } from '../realm-identifiers.ts'; // We only use a subset of SerializeOpts here; accept any to align with the // serializer interface without surfacing unused properties. -import type { SerializeOpts } from 'https://cardstack.com/base/card-api'; +import type { SerializeOpts } from '@cardstack/base/card-api'; export function queryableValue( codeRef: ResolvedCodeRef | {} | undefined, diff --git a/packages/runtime-common/serializers/date.ts b/packages/runtime-common/serializers/date.ts index 1330dcc4c6b..fd6222120df 100644 --- a/packages/runtime-common/serializers/date.ts +++ b/packages/runtime-common/serializers/date.ts @@ -2,7 +2,7 @@ import { parse, format } from 'date-fns'; import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export const dateFormat = `yyyy-MM-dd`; diff --git a/packages/runtime-common/serializers/datetime.ts b/packages/runtime-common/serializers/datetime.ts index 471e9e552bf..19354e49825 100644 --- a/packages/runtime-common/serializers/datetime.ts +++ b/packages/runtime-common/serializers/datetime.ts @@ -2,7 +2,7 @@ import { format, parseISO } from 'date-fns'; import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export const datetimeFormat = `yyyy-MM-dd'T'HH:mm`; diff --git a/packages/runtime-common/serializers/email.ts b/packages/runtime-common/serializers/email.ts index e2acb066379..38993d82709 100644 --- a/packages/runtime-common/serializers/email.ts +++ b/packages/runtime-common/serializers/email.ts @@ -1,7 +1,7 @@ import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export function queryableValue(value: unknown): string | undefined { let normalized = deserializeSync(value); diff --git a/packages/runtime-common/serializers/ethereum-address.ts b/packages/runtime-common/serializers/ethereum-address.ts index ed0337650ac..d407f24bb33 100644 --- a/packages/runtime-common/serializers/ethereum-address.ts +++ b/packages/runtime-common/serializers/ethereum-address.ts @@ -1,7 +1,7 @@ import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; import { isAddress, getAddress } from 'ethers'; function isChecksumAddress(address: string): boolean { diff --git a/packages/runtime-common/serializers/image-size.ts b/packages/runtime-common/serializers/image-size.ts index 04684664da5..a21811ffbbe 100644 --- a/packages/runtime-common/serializers/image-size.ts +++ b/packages/runtime-common/serializers/image-size.ts @@ -1,7 +1,7 @@ import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export function queryableValue( val: 'actual' | 'contain' | 'cover' | undefined, diff --git a/packages/runtime-common/serializers/index.ts b/packages/runtime-common/serializers/index.ts index 93dff6184ef..8e01718859d 100644 --- a/packages/runtime-common/serializers/index.ts +++ b/packages/runtime-common/serializers/index.ts @@ -20,7 +20,7 @@ import type { BaseInstanceType, CardStore, DeserializeOpts, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export { DateSerializer, diff --git a/packages/runtime-common/serializers/number.ts b/packages/runtime-common/serializers/number.ts index 73ea2733666..e51986de483 100644 --- a/packages/runtime-common/serializers/number.ts +++ b/packages/runtime-common/serializers/number.ts @@ -1,7 +1,7 @@ import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export function queryableValue(val: number | undefined): number | undefined { return val != null ? val : undefined; diff --git a/packages/runtime-common/serializers/phone.ts b/packages/runtime-common/serializers/phone.ts index 34ccdb315af..10924f0b51f 100644 --- a/packages/runtime-common/serializers/phone.ts +++ b/packages/runtime-common/serializers/phone.ts @@ -2,7 +2,7 @@ import { parsePhoneNumber } from 'awesome-phonenumber'; import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; export function queryableValue(value: unknown): string | undefined { let normalized = deserializeSync(value); diff --git a/packages/runtime-common/serializers/string-to-content.ts b/packages/runtime-common/serializers/string-to-content.ts index 46651b3dd44..5cdae5347cb 100644 --- a/packages/runtime-common/serializers/string-to-content.ts +++ b/packages/runtime-common/serializers/string-to-content.ts @@ -1,7 +1,7 @@ import type { BaseDefConstructor, BaseInstanceType, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; /** * A migration serializer for composite fields that replace a primitive diff --git a/packages/runtime-common/tasks/index.ts b/packages/runtime-common/tasks/index.ts index 93becee5d20..54e125cdc31 100644 --- a/packages/runtime-common/tasks/index.ts +++ b/packages/runtime-common/tasks/index.ts @@ -10,7 +10,7 @@ import type { VirtualNetwork, } from '../index.ts'; import type { JobInfo, IndexingProgressEvent } from '../worker.ts'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; export type * from './lint.ts'; export * from '#lint-task'; export * from './full-reindex.ts'; diff --git a/packages/runtime-common/tsconfig.json b/packages/runtime-common/tsconfig.json index e02d04c8e98..2c0fc959fed 100644 --- a/packages/runtime-common/tsconfig.json +++ b/packages/runtime-common/tsconfig.json @@ -24,6 +24,12 @@ "experimentalDecorators": true, "skipLibCheck": true, "paths": { + "@cardstack/base/*": [ + "../base/*.gts", + "../base/*.ts", + "../base/*.d.ts", + "../base/*" + ], "https://cardstack.com/base/*": [ "../base/*.gts", "../base/*.ts", diff --git a/packages/runtime-common/utils.ts b/packages/runtime-common/utils.ts index 2fd8435c2b5..d17bfd90f1b 100644 --- a/packages/runtime-common/utils.ts +++ b/packages/runtime-common/utils.ts @@ -1,4 +1,4 @@ -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; import type { JobInfo } from './worker.ts'; diff --git a/packages/runtime-common/worker-request.ts b/packages/runtime-common/worker-request.ts index d722f9824eb..a77f26cda99 100644 --- a/packages/runtime-common/worker-request.ts +++ b/packages/runtime-common/worker-request.ts @@ -1,6 +1,6 @@ import { createHmac, timingSafeEqual } from 'crypto'; import { ensureTrailingSlash } from './paths.ts'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; // Shared-secret authentication and wire contract for the realm-server // /_worker-request endpoint. A worker container's worker manager and the realm diff --git a/packages/runtime-common/worker.ts b/packages/runtime-common/worker.ts index a6f6b09c8e4..0e564fa363b 100644 --- a/packages/runtime-common/worker.ts +++ b/packages/runtime-common/worker.ts @@ -28,7 +28,7 @@ import { import { MatrixClient } from './matrix-client.ts'; import * as Tasks from './tasks/index.ts'; import type { WorkerArgs, TaskArgs } from './tasks/index.ts'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; export interface Stats extends JSONTypes.Object { instancesIndexed: number; From 41e296ccf3f192d537109ace1b3d1f8c39b9507e Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Thu, 9 Jul 2026 18:26:17 -0500 Subject: [PATCH 2/8] refactor: use @cardstack/base import specifiers in base Part of the sweep converting in-repo base-module imports from the https://cardstack.com/base/ URL form to the canonical @cardstack/base/ prefix: static and literal-dynamic specifiers, tsconfig paths carrying both spellings, and import ordering per the specifier's new sort group. Co-Authored-By: Claude Fable 5 --- packages/base/color.gts | 4 ++-- packages/base/default-templates/head.gts | 2 +- packages/base/rich-markdown.gts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/base/color.gts b/packages/base/color.gts index 8fea3f65482..3d1977d5004 100644 --- a/packages/base/color.gts +++ b/packages/base/color.gts @@ -1,5 +1,5 @@ -import { Component } from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; +import { Component } from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; import { Swatch } from '@cardstack/boxel-ui/components'; import { markdownEscape } from '@cardstack/boxel-ui/helpers'; import PaletteIcon from '@cardstack/boxel-icons/palette'; diff --git a/packages/base/default-templates/head.gts b/packages/base/default-templates/head.gts index 5e5bdcfe5ea..f1fc4de34ef 100644 --- a/packages/base/default-templates/head.gts +++ b/packages/base/default-templates/head.gts @@ -1,6 +1,6 @@ import GlimmerComponent from '@glimmer/component'; import type { BaseDef, CardDef } from '../card-api'; -import type BrandGuide from 'https://cardstack.com/base/brand-guide'; +import type BrandGuide from '@cardstack/base/brand-guide'; export default class DefaultHeadTemplate extends GlimmerComponent<{ Args: { diff --git a/packages/base/rich-markdown.gts b/packages/base/rich-markdown.gts index 193e6e79992..bec6fc4163b 100644 --- a/packages/base/rich-markdown.gts +++ b/packages/base/rich-markdown.gts @@ -36,7 +36,7 @@ import { CardContextConsumer } from './field-component'; * * Usage: * ``` - * import RichMarkdownField from 'https://cardstack.com/base/rich-markdown'; + * import RichMarkdownField from '@cardstack/base/rich-markdown'; * * class MyCard extends CardDef { * @field body = contains(RichMarkdownField); From 4ccfdcec1c1a4ba41f567732ad5b0618d95934ee Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Thu, 9 Jul 2026 18:26:17 -0500 Subject: [PATCH 3/8] refactor: use @cardstack/base import specifiers in host Part of the sweep converting in-repo base-module imports from the https://cardstack.com/base/ URL form to the canonical @cardstack/base/ prefix: static and literal-dynamic specifiers, tsconfig paths carrying both spellings, and import ordering per the specifier's new sort group. Co-Authored-By: Claude Fable 5 --- .../attached-file-dropdown-menu.gts | 6 +- .../attachment-picker/attach-button.gts | 2 +- .../attachment-picker/attached-items.gts | 4 +- .../ai-assistant/attachment-picker/index.gts | 4 +- .../ai-assistant/attachment-picker/usage.gts | 4 +- .../code-block/apply-code-patch-button.gts | 4 +- .../code-block/diff-editor-header.gts | 6 +- .../ai-assistant/message/aibot-message.gts | 4 +- .../ai-assistant/message/attachments.gts | 4 +- .../components/ai-assistant/message/index.gts | 4 +- .../ai-assistant/skill-menu/index.gts | 2 +- .../app/components/card-chooser/modal.gts | 3 +- packages/host/app/components/card-pill.gts | 3 +- .../host/app/components/card-renderer.gts | 2 +- .../card-search/hydratable-card.gts | 4 +- .../card-search/live-recents-provider.gts | 2 +- .../components/card-search/panel-content.gts | 4 +- .../components/card-search/result-tile.gts | 4 +- .../components/card-search/sheet-results.gts | 4 +- .../components/file-chooser/mini/index.gts | 4 +- .../app/components/file-chooser/modal.gts | 4 +- .../app/components/file-chooser/panel.gts | 4 +- packages/host/app/components/file-pill.gts | 3 +- .../host/app/components/host-mode/content.gts | 10 +-- .../markdown-embed-chooser/pane-usage.gts | 4 +- .../markdown-embed-chooser/pane.gts | 3 +- .../markdown-embed-chooser/preview/index.gts | 6 +- .../markdown-embed-chooser/preview/usage.gts | 4 +- .../markdown-embed-chooser/tab-panel.gts | 3 +- .../components/matrix/room-message-tool.gts | 3 +- packages/host/app/components/matrix/room.gts | 5 +- .../operator-mode/card-error-detail.gts | 3 +- .../components/operator-mode/card-error.gts | 4 +- .../operator-mode/card-schema-editor.gts | 4 +- .../components/operator-mode/code-submode.gts | 15 ++-- .../code-submode/module-inspector.gts | 10 +-- .../playground/instance-chooser-dropdown.gts | 3 +- .../playground/playground-panel.gts | 20 +++--- .../playground/playground-preview.gts | 8 +-- .../code-submode/playground/playground.gts | 4 +- .../code-submode/schema-editor.gts | 2 +- .../code-submode/spec-preview-badge.gts | 2 +- .../code-submode/spec-preview.gts | 5 +- .../components/operator-mode/container.gts | 3 +- .../operator-mode/create-file-modal.gts | 7 +- .../operator-mode/detail-panel-selector.gts | 2 +- .../components/operator-mode/detail-panel.gts | 3 +- .../operator-mode/edit-field-modal.gts | 6 +- .../operator-mode/error-display.gts | 6 +- .../components/operator-mode/host-submode.gts | 3 +- .../operator-mode/interact-submode.gts | 9 +-- .../operator-mode/operator-mode-overlays.gts | 15 ++-- .../app/components/operator-mode/overlays.gts | 7 +- .../preview-panel/fitted-format-gallery.gts | 2 +- .../operator-mode/preview-panel/index.gts | 14 ++-- .../preview-panel/markdown-preview.gts | 4 +- .../preview-panel/metadata-panel.gts | 4 +- .../preview-panel/rendered-markdown.gts | 6 +- .../operator-mode/publish-realm-modal.gts | 2 +- .../operator-mode/remove-field-modal.gts | 2 +- .../send-error-to-ai-assistant.gts | 3 +- .../components/operator-mode/stack-item.gts | 11 ++- .../app/components/operator-mode/stack.gts | 13 ++-- .../host/app/helpers/subscribe-to-realms.ts | 2 +- packages/host/app/lib/field-path-parser.ts | 2 +- packages/host/app/lib/file-def-manager.ts | 25 +++---- packages/host/app/lib/gc-card-store.ts | 6 +- packages/host/app/lib/host-base-tool.ts | 5 +- packages/host/app/lib/isolated-render.gts | 2 +- .../app/lib/matrix-classes/message-builder.ts | 17 +++-- .../message-code-patch-result.ts | 3 +- .../app/lib/matrix-classes/message-tool.ts | 5 +- .../host/app/lib/matrix-classes/message.ts | 3 +- packages/host/app/lib/matrix-classes/room.ts | 8 +-- packages/host/app/lib/skill-tools.ts | 5 +- packages/host/app/lib/stack-item.ts | 4 +- packages/host/app/lib/tool-definitions.ts | 2 +- packages/host/app/lib/utils.ts | 2 +- .../host/app/resources/card-collection.ts | 3 +- packages/host/app/resources/card-resource.ts | 3 +- packages/host/app/resources/card-type.ts | 2 +- packages/host/app/resources/code-diff.ts | 4 +- packages/host/app/resources/directory.ts | 3 +- .../host/app/resources/element-tracker.ts | 6 +- .../app/resources/file-tree-from-index.ts | 3 +- packages/host/app/resources/file.ts | 3 +- .../host/app/resources/inheritance-chain.ts | 2 +- packages/host/app/resources/room.ts | 36 +++++----- packages/host/app/resources/search-entries.ts | 9 ++- packages/host/app/resources/search.ts | 7 +- packages/host/app/routes/command-runner.ts | 6 +- packages/host/app/routes/module.ts | 5 +- packages/host/app/routes/render.ts | 3 +- packages/host/app/routes/render/html.ts | 7 +- packages/host/app/routes/render/icon.ts | 3 +- packages/host/app/routes/render/meta.ts | 9 ++- packages/host/app/routes/render/types.ts | 3 +- .../services/ai-assistant-panel-service.ts | 7 +- packages/host/app/services/card-service.ts | 19 +++-- .../host/app/services/card-type-service.ts | 12 +--- .../app/services/code-semantics-service.ts | 3 +- packages/host/app/services/error-display.ts | 3 +- packages/host/app/services/file-upload.ts | 3 +- .../app/services/local-persistence-service.ts | 4 +- .../host/app/services/matrix-sdk-loader.ts | 5 +- packages/host/app/services/matrix-service.ts | 50 +++++++------ packages/host/app/services/message-service.ts | 3 +- .../app/services/module-contents-service.ts | 4 +- .../services/operator-mode-state-service.ts | 6 +- .../app/services/playground-panel-service.ts | 9 +-- packages/host/app/services/realm.ts | 9 ++- .../host/app/services/recent-cards-service.ts | 5 +- packages/host/app/services/render-service.ts | 13 ++-- packages/host/app/services/render-store.ts | 4 +- .../host/app/services/spec-panel-service.ts | 5 +- packages/host/app/services/store.ts | 22 +++--- packages/host/app/services/tool-service.ts | 5 +- .../host/app/templates/host-freestyle.gts | 3 +- packages/host/app/templates/index.gts | 7 +- packages/host/app/templates/render/html.gts | 3 +- .../app/tools/add-field-to-card-definition.ts | 5 +- packages/host/app/tools/ai-assistant.ts | 8 +-- .../host/app/tools/apply-markdown-edit.ts | 4 +- .../app/tools/apply-search-replace-block.ts | 4 +- packages/host/app/tools/ask-ai.ts | 3 +- packages/host/app/tools/authed-fetch.ts | 3 +- .../bot-requests/create-listing-pr-request.ts | 3 +- .../bot-requests/send-bot-trigger-event.ts | 5 +- packages/host/app/tools/can-read-realm.ts | 3 +- .../host/app/tools/cancel-indexing-job.ts | 3 +- packages/host/app/tools/check-correctness.ts | 3 +- .../app/tools/check-domain-availability.ts | 3 +- packages/host/app/tools/copy-and-edit.ts | 5 +- .../host/app/tools/copy-card-as-markdown.ts | 3 +- packages/host/app/tools/copy-card-to-stack.ts | 3 +- packages/host/app/tools/copy-card.ts | 3 +- packages/host/app/tools/copy-file-to-realm.ts | 3 +- packages/host/app/tools/copy-source.ts | 3 +- .../app/tools/create-ai-assistant-room.ts | 10 ++- ...reate-and-open-submission-workflow-card.ts | 4 +- packages/host/app/tools/create-specs.ts | 9 ++- .../app/tools/create-submission-workflow.ts | 3 +- packages/host/app/tools/evaluate-module.ts | 4 +- .../app/tools/execute-atomic-operations.ts | 3 +- packages/host/app/tools/fetch-card-json.ts | 3 +- packages/host/app/tools/full-reindex-realm.ts | 3 +- .../host/app/tools/generate-example-cards.ts | 5 +- .../host/app/tools/generate-readme-spec.ts | 7 +- .../host/app/tools/generate-theme-example.ts | 5 +- packages/host/app/tools/generate-thumbnail.ts | 8 +-- .../host/app/tools/get-all-realm-metas.ts | 3 +- .../tools/get-available-realm-identifiers.ts | 3 +- .../host/app/tools/get-card-type-schema.ts | 6 +- packages/host/app/tools/get-card.ts | 5 +- .../tools/get-catalog-realm-identifiers.ts | 3 +- .../app/tools/get-default-writable-realm.ts | 3 +- .../host/app/tools/get-events-from-room.ts | 6 +- .../host/app/tools/get-published-realms.ts | 3 +- .../tools/get-realm-of-resource-identifier.ts | 3 +- .../host/app/tools/get-user-system-card.ts | 3 +- packages/host/app/tools/instantiate-card.ts | 3 +- .../app/tools/invalidate-realm-identifiers.ts | 3 +- .../host/app/tools/invite-user-to-room.ts | 3 +- packages/host/app/tools/lint-and-fix.ts | 3 +- .../host/app/tools/listing-action-build.ts | 4 +- packages/host/app/tools/migrate-skill.ts | 5 +- .../host/app/tools/one-shot-llm-request.ts | 5 +- .../host/app/tools/open-ai-assistant-room.ts | 3 +- .../app/tools/open-create-listing-modal.ts | 3 +- .../host/app/tools/open-in-interact-mode.ts | 3 +- packages/host/app/tools/open-workspace.ts | 3 +- .../host/app/tools/patch-card-instance.ts | 7 +- packages/host/app/tools/patch-code.ts | 3 +- packages/host/app/tools/patch-fields.ts | 9 ++- packages/host/app/tools/patch-theme.ts | 6 +- .../tools/persist-module-inspector-view.ts | 3 +- .../app/tools/populate-with-sample-data.ts | 5 +- packages/host/app/tools/preview-format.ts | 3 +- packages/host/app/tools/publish-realm.ts | 3 +- packages/host/app/tools/read-binary-file.ts | 3 +- .../app/tools/read-card-for-ai-assistant.ts | 7 +- .../app/tools/read-file-for-ai-assistant.ts | 5 +- packages/host/app/tools/read-source.ts | 3 +- packages/host/app/tools/read-text-file.ts | 3 +- packages/host/app/tools/register-bot.ts | 3 +- packages/host/app/tools/reindex-realm.ts | 3 +- .../app/tools/retry-submission-workflow.ts | 3 +- .../host/app/tools/sanitize-module-list.ts | 4 +- packages/host/app/tools/save-card.ts | 5 +- packages/host/app/tools/screenshot-card.ts | 3 +- packages/host/app/tools/search-and-choose.ts | 4 +- packages/host/app/tools/search-cards.ts | 5 +- .../host/app/tools/search-google-images.ts | 4 +- .../app/tools/send-ai-assistant-message.ts | 12 ++-- .../host/app/tools/send-request-via-proxy.ts | 3 +- packages/host/app/tools/serialize-card.ts | 5 +- packages/host/app/tools/set-active-llm.ts | 3 +- .../host/app/tools/set-user-system-card.ts | 3 +- packages/host/app/tools/show-card.ts | 5 +- packages/host/app/tools/show-file.ts | 3 +- packages/host/app/tools/store-add.ts | 5 +- packages/host/app/tools/summarize-session.ts | 3 +- packages/host/app/tools/switch-submode.ts | 3 +- .../host/app/tools/sync-openrouter-models.ts | 3 +- packages/host/app/tools/transform-cards.ts | 4 +- packages/host/app/tools/unpublish-realm.ts | 3 +- packages/host/app/tools/unregister-bot.ts | 3 +- .../tools/update-code-path-with-selection.ts | 3 +- .../app/tools/update-playground-selection.ts | 5 +- packages/host/app/tools/update-room-skills.ts | 13 ++-- packages/host/app/tools/utils.ts | 15 ++-- packages/host/app/tools/validate-realm.ts | 4 +- packages/host/app/tools/write-binary-file.ts | 3 +- packages/host/app/tools/write-text-file.ts | 3 +- .../host/app/utils/card-search/sections.ts | 2 +- .../host/app/utils/card-search/type-filter.ts | 2 +- packages/host/app/utils/clipboard.ts | 2 +- .../utils/file-def-attributes-extractor.ts | 5 +- .../host/app/utils/id-from-card-or-url.ts | 2 +- packages/host/app/utils/render-error.ts | 2 +- packages/host/app/utils/schema-editor.ts | 2 +- .../tests/acceptance/ai-assistant-test.gts | 14 ++-- packages/host/tests/acceptance/basic-test.gts | 10 +-- .../tests/acceptance/code-patches-test.gts | 4 +- .../tests/acceptance/code-submode-test.ts | 48 ++++++------- .../code-submode/card-playground-test.gts | 60 ++++++++-------- .../code-submode/create-file-test.gts | 7 +- .../acceptance/code-submode/editor-test.ts | 20 +++--- .../code-submode/field-playground-test.gts | 16 ++--- .../code-submode/file-def-navigation-test.gts | 6 +- .../acceptance/code-submode/file-tree-test.ts | 20 +++--- .../code-submode/head-format-preview-test.ts | 8 +-- .../acceptance/code-submode/inspector-test.ts | 3 +- .../code-submode/recent-files-test.ts | 18 ++--- .../code-submode/schema-editor-test.ts | 26 +++---- .../acceptance/code-submode/spec-test.gts | 30 ++++---- .../host/tests/acceptance/commands-test.gts | 7 +- .../host/tests/acceptance/file-def-test.gts | 14 ++-- .../host/tests/acceptance/host-mode-test.gts | 10 +-- .../tests/acceptance/host-submode-test.gts | 4 +- .../acceptance/interact-submode-test.gts | 10 +-- .../interact-submode/create-file-test.gts | 2 +- .../markdown-embed-chooser-test.gts | 6 +- .../acceptance/markdown-file-def-test.gts | 2 +- .../operator-mode-acceptance-test.gts | 4 +- .../tests/acceptance/prerender-html-test.gts | 2 +- .../tests/acceptance/prerender-meta-test.gts | 2 +- .../acceptance/prerender-module-test.gts | 12 ++-- .../relationship-loading-state-test.gts | 4 +- .../host/tests/acceptance/theme-card-test.gts | 4 +- .../workspace-chooser-delete-test.gts | 2 +- .../workspace-delete-multiple-test.gts | 4 +- packages/host/tests/helpers/adapter.ts | 11 ++- packages/host/tests/helpers/base-realm.ts | 72 +++++++++---------- .../tests/helpers/cards/view-card-demo.ts | 4 +- packages/host/tests/helpers/index.gts | 9 +-- packages/host/tests/helpers/indexer.ts | 4 +- .../tests/helpers/interact-submode-setup.gts | 12 ++-- .../host/tests/helpers/mock-matrix/_client.ts | 14 ++-- .../host/tests/helpers/mock-matrix/_utils.ts | 3 +- packages/host/tests/helpers/playground.ts | 4 +- .../host/tests/helpers/render-component.ts | 8 +-- ...-field-to-card-definition-command-test.gts | 12 ++-- .../commands/apply-markdown-edit-test.gts | 8 +-- .../apply-search-replace-block-test.gts | 24 +++---- .../commands/check-correctness-test.gts | 6 +- .../commands/copy-and-edit-test.gts | 16 ++--- .../integration/commands/copy-card-test.gts | 8 +-- .../integration/commands/copy-source-test.gts | 4 +- .../integration/commands/create-spec-test.gts | 14 ++-- .../commands/evaluate-module-test.gts | 6 +- .../commands/fetch-card-json-test.gts | 4 +- .../generate-example-cards-one-shot-test.gts | 4 +- .../commands/instantiate-card-test.gts | 8 +-- .../open-create-listing-modal-test.gts | 4 +- .../integration/commands/patch-code-test.gts | 12 ++-- .../commands/patch-instance-test.gts | 4 +- .../commands/preview-format-test.gts | 6 +- .../commands/publish-realm-test.gts | 4 +- .../read-card-for-ai-assistant-test.gts | 6 +- .../commands/schema-generation-test.gts | 4 +- .../commands/search-and-choose-test.gts | 8 +-- .../commands/search-command-test.gts | 4 +- .../integration/commands/show-card-test.gts | 12 ++-- .../commands/switch-submode-test.gts | 4 +- .../commands/sync-openrouter-models-test.gts | 4 +- .../commands/transform-cards-test.gts | 10 +-- .../commands/unpublish-realm-test.gts | 4 +- .../commands/update-room-skills-test.gts | 6 +- .../commands/use-ai-assistant-test.gts | 7 +- .../ai-assistant-panel/commands-test.gts | 8 +-- .../ai-assistant-panel/debug-message-test.gts | 6 +- .../ai-assistant-panel/skills-test.gts | 25 ++++++- .../components/ai-module-creation-test.gts | 6 +- .../brand-guide-attachments-test.gts | 6 +- .../brand-guide-custom-css-test.gts | 4 +- .../components/brand-logo-mark-field-test.gts | 6 +- .../components/card-basics-test.gts | 7 +- .../components/card-chooser-test.gts | 10 +-- .../card-context-search-results-test.gts | 4 +- .../integration/components/card-copy-test.gts | 14 ++-- .../components/card-delete-test.gts | 9 ++- .../card-info-thumbnail-picker-test.gts | 4 +- .../components/field-markdown-domain-test.gts | 32 +++++---- .../field-markdown-specialized-test.gts | 22 +++--- ...get-relationship-membership-state-test.gts | 10 +-- .../linksto-broken-link-placeholder-test.gts | 10 +-- .../linksto-error-sentinel-test.gts | 14 ++-- ...ksto-many-broken-link-placeholder-test.gts | 10 +-- .../linksto-many-per-slot-access-test.gts | 10 +-- .../linksto-sentinel-roundtrip-test.gts | 12 ++-- ...nksto-singular-js-access-contract-test.gts | 6 +- .../integration/components/loading-test.gts | 8 +-- .../markdown-embed-preview-pane-test.gts | 3 +- .../markdown-embed-preview-test.gts | 3 +- .../components/markdown-preview-test.gts | 4 +- .../components/operator-mode-test.gts | 4 +- .../components/operator-mode-ui-test.gts | 4 +- .../components/operator-mode/setup.gts | 12 ++-- .../components/overlay-menu-items-test.gts | 10 +-- .../prerender-serialize-cycle-test.gts | 2 +- .../integration/components/preview-test.gts | 8 +-- .../query-field-error-sentinel-test.gts | 18 ++--- .../realm-config-routing-rule-edit-test.gts | 16 ++--- .../components/rich-markdown-field-test.gts | 4 +- .../components/serialization-test.gts | 3 +- .../components/text-suggestion-test.gts | 4 +- .../integration/field-configuration-test.gts | 14 ++-- .../field-support-predicates-test.gts | 4 +- .../message-service-subscription-test.gts | 4 +- .../tests/integration/realm-indexing-test.gts | 4 +- .../host/tests/integration/realm-test.gts | 8 +-- .../resources/query-field-barrier-test.ts | 4 +- .../integration/resources/search-test.ts | 7 +- .../search-correlation-id-test.gts | 4 +- .../searchable-search-doc-test.gts | 4 +- .../tests/integration/store-search-test.gts | 4 +- .../host/tests/integration/store-test.gts | 25 ++++--- .../tests/unit/ai-function-generation-test.ts | 20 +++--- packages/host/tests/unit/box-test.ts | 2 +- .../tests/unit/card-def-menu-items-test.ts | 7 +- packages/host/tests/unit/code-ref-test.ts | 12 ++-- .../tests/unit/file-def-menu-items-test.ts | 6 +- .../tests/unit/garbage-collection-test.ts | 6 +- .../tests/unit/index-query-engine-test.ts | 18 ++--- .../unit/instance-filter-matcher-test.ts | 6 +- .../unit/lib/command-definitions-test.ts | 2 +- .../tests/unit/lib/field-path-parser-test.ts | 28 ++++---- packages/host/tests/unit/loader-test.ts | 4 +- .../host/tests/unit/markdown-helpers-test.ts | 8 +-- packages/host/tests/unit/plan-install-test.ts | 4 +- .../host/tests/unit/searchable-option-test.ts | 12 ++-- .../unit/services/render-service-test.ts | 4 +- .../tests/unit/store-card-boundary-test.ts | 2 +- packages/host/tsconfig.json | 6 ++ 355 files changed, 1127 insertions(+), 1332 deletions(-) diff --git a/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts b/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts index 997110baa42..55c52941bd8 100644 --- a/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts +++ b/packages/host/app/components/ai-assistant/attached-file-dropdown-menu.gts @@ -29,11 +29,11 @@ import type CardService from '@cardstack/host/services/card-service'; import type MatrixService from '@cardstack/host/services/matrix-service'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import { Submodes } from '../submode-switcher'; -import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event'; +import type { FileDef } from '@cardstack/base/file-api'; -import { Submodes } from '../submode-switcher'; +import type { CodePatchStatus } from '@cardstack/base/matrix-event'; export default class AttachedFileDropdownMenu extends Component<{ Args: { diff --git a/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts b/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts index 3f1ad25e0c2..c4651190d30 100644 --- a/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts +++ b/packages/host/app/components/ai-assistant/attachment-picker/attach-button.gts @@ -12,7 +12,7 @@ import { eq } from '@cardstack/boxel-ui/helpers'; import { chooseCard, baseCardRef, chooseFile } from '@cardstack/runtime-common'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import type { FileDef } from '@cardstack/base/file-api'; interface AttachButtonTriggerSignature { Element: HTMLButtonElement; diff --git a/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts b/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts index 32f11cb7009..b1fb85d5e0e 100644 --- a/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts +++ b/packages/host/app/components/ai-assistant/attachment-picker/attached-items.gts @@ -31,8 +31,8 @@ import { urlForRealmLookup } from '@cardstack/host/lib/utils'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; import type { TrackedSet } from 'tracked-built-ins'; diff --git a/packages/host/app/components/ai-assistant/attachment-picker/index.gts b/packages/host/app/components/ai-assistant/attachment-picker/index.gts index 9e75e34b221..127aadaaaea 100644 --- a/packages/host/app/components/ai-assistant/attachment-picker/index.gts +++ b/packages/host/app/components/ai-assistant/attachment-picker/index.gts @@ -10,11 +10,11 @@ import { import type { FileUploadState } from '@cardstack/host/lib/file-upload-state'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import AttachButton from './attach-button'; import AttachedItems from './attached-items'; +import type { FileDef } from '@cardstack/base/file-api'; + import type { WithBoundArgs } from '@glint/template'; import type { TrackedSet } from 'tracked-built-ins'; diff --git a/packages/host/app/components/ai-assistant/attachment-picker/usage.gts b/packages/host/app/components/ai-assistant/attachment-picker/usage.gts index 7fbd5579775..c0551117ba7 100644 --- a/packages/host/app/components/ai-assistant/attachment-picker/usage.gts +++ b/packages/host/app/components/ai-assistant/attachment-picker/usage.gts @@ -10,10 +10,10 @@ import { TrackedSet } from 'tracked-built-ins'; import CardChooserModal from '@cardstack/host/components/card-chooser/modal'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import AiAssistantAttachmentPicker from './index'; +import type { FileDef } from '@cardstack/base/file-api'; + export default class AiAssistantCardPickerUsage extends Component { cardIds: TrackedArray = new TrackedArray([]); @tracked maxNumberOfCards: number | undefined = undefined; diff --git a/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts b/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts index 830126f2554..c480724ab40 100644 --- a/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts +++ b/packages/host/app/components/ai-assistant/code-block/apply-code-patch-button.gts @@ -7,10 +7,10 @@ import type { CodeData } from '@cardstack/host/lib/formatted-message/utils'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event'; - import ApplyButton from '../../ai-assistant/apply-button'; +import type { CodePatchStatus } from '@cardstack/base/matrix-event'; + export interface ApplyCodePatchButtonSignature { Args: { patchCodeStatus: CodePatchStatus | 'ready' | 'applying'; diff --git a/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts b/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts index 686327df78b..0e69ebdaa6c 100644 --- a/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts +++ b/packages/host/app/components/ai-assistant/code-block/diff-editor-header.gts @@ -13,11 +13,11 @@ import type MatrixService from '@cardstack/host/services/matrix-service'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event'; - import AttachedFileDropdownMenu from '../attached-file-dropdown-menu'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { CodePatchStatus } from '@cardstack/base/matrix-event'; + export interface CodeBlockDiffEditorHeaderSignature { Args: { codeData: Partial; diff --git a/packages/host/app/components/ai-assistant/message/aibot-message.gts b/packages/host/app/components/ai-assistant/message/aibot-message.gts index e40731e475b..0b3fb498237 100644 --- a/packages/host/app/components/ai-assistant/message/aibot-message.gts +++ b/packages/host/app/components/ai-assistant/message/aibot-message.gts @@ -34,10 +34,10 @@ import { getCodeDiffResultResource } from '@cardstack/host/resources/code-diff'; import type { MonacoSDK } from '@cardstack/host/services/monaco-service'; import type ToolService from '@cardstack/host/services/tool-service'; -import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event'; - import Message from './text-content'; +import type { CodePatchStatus } from '@cardstack/base/matrix-event'; + interface Signature { Element: HTMLDivElement; Args: { diff --git a/packages/host/app/components/ai-assistant/message/attachments.gts b/packages/host/app/components/ai-assistant/message/attachments.gts index 6d6d36e485a..b9ad60ceac8 100644 --- a/packages/host/app/components/ai-assistant/message/attachments.gts +++ b/packages/host/app/components/ai-assistant/message/attachments.gts @@ -13,8 +13,8 @@ import { urlForRealmLookup } from '@cardstack/host/lib/utils'; import type NetworkService from '@cardstack/host/services/network'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; interface Signature { Element: HTMLDivElement; diff --git a/packages/host/app/components/ai-assistant/message/index.gts b/packages/host/app/components/ai-assistant/message/index.gts index 0eac9e84158..61002ebc7ed 100644 --- a/packages/host/app/components/ai-assistant/message/index.gts +++ b/packages/host/app/components/ai-assistant/message/index.gts @@ -29,13 +29,13 @@ import type MatrixService from '@cardstack/host/services/matrix-service'; import type { MonacoSDK } from '@cardstack/host/services/monaco-service'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import AiBotMessage from './aibot-message'; import Attachments from './attachments'; import Meta from './meta'; import UserMessage from './user-message'; +import type { FileDef } from '@cardstack/base/file-api'; + import type { ComponentLike } from '@glint/template'; interface Signature { diff --git a/packages/host/app/components/ai-assistant/skill-menu/index.gts b/packages/host/app/components/ai-assistant/skill-menu/index.gts index 80670dd621c..35815ead8ca 100644 --- a/packages/host/app/components/ai-assistant/skill-menu/index.gts +++ b/packages/host/app/components/ai-assistant/skill-menu/index.gts @@ -19,7 +19,7 @@ import PillMenu from '@cardstack/host/components/pill-menu'; import type { RoomSkill } from '@cardstack/host/resources/room'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import type { FileDef } from '@cardstack/base/file-api'; // A skill expressed as a markdown file is a `MarkdownDef` whose frontmatter // declares `boxel.kind: skill`. The file chooser is scoped to exactly those. diff --git a/packages/host/app/components/card-chooser/modal.gts b/packages/host/app/components/card-chooser/modal.gts index a75a5f03e8b..254fb8d749e 100644 --- a/packages/host/app/components/card-chooser/modal.gts +++ b/packages/host/app/components/card-chooser/modal.gts @@ -33,8 +33,6 @@ import type { Query } from '@cardstack/runtime-common/query'; import { getFilterTypeRefs } from '@cardstack/host/utils/card-search/type-filter'; import type { NewCardArgs } from '@cardstack/host/utils/card-search/types'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { suggestCardChooserTitle, getSuggestionWithLowestDepth, @@ -51,6 +49,7 @@ import type OperatorModeStateService from '../../services/operator-mode-state-se import type RealmService from '../../services/realm'; import type RealmServerService from '../../services/realm-server'; import type StoreService from '../../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; interface Signature { Args: {}; diff --git a/packages/host/app/components/card-pill.gts b/packages/host/app/components/card-pill.gts index a868fd48b3a..c39fee904a5 100644 --- a/packages/host/app/components/card-pill.gts +++ b/packages/host/app/components/card-pill.gts @@ -18,11 +18,10 @@ import { FailureBordered, IconX } from '@cardstack/boxel-ui/icons'; import { type getCard, GetCardContextName } from '@cardstack/runtime-common'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import AttachedFileDropdownMenu from './ai-assistant/attached-file-dropdown-menu'; import type RealmService from '../services/realm'; +import type { FileDef } from '@cardstack/base/file-api'; interface CardPillSignature { Element: HTMLDivElement | HTMLButtonElement; diff --git a/packages/host/app/components/card-renderer.gts b/packages/host/app/components/card-renderer.gts index 519018d41d5..8f409741791 100644 --- a/packages/host/app/components/card-renderer.gts +++ b/packages/host/app/components/card-renderer.gts @@ -24,7 +24,7 @@ import type { Format, Field, CardContext, -} from 'https://cardstack.com/base/card-api'; +} from '@cardstack/base/card-api'; interface Signature { Element: any; diff --git a/packages/host/app/components/card-search/hydratable-card.gts b/packages/host/app/components/card-search/hydratable-card.gts index 1d4257310a9..61a131a101c 100644 --- a/packages/host/app/components/card-search/hydratable-card.gts +++ b/packages/host/app/components/card-search/hydratable-card.gts @@ -23,12 +23,12 @@ import { import type { HTMLComponent } from '@cardstack/host/lib/html-component'; import type StoreService from '@cardstack/host/services/store'; -import type { BaseDef, CardContext } from 'https://cardstack.com/base/card-api'; - import CardRenderer from '../card-renderer'; import SearchResultError from './search-result-error'; +import type { BaseDef, CardContext } from '@cardstack/base/card-api'; + // `HydrationMode` is the card-facing contract (it rides the `@context` // search surface), so it lives in runtime-common; re-exported here because this // is where it's consumed and where call sites have long imported it. diff --git a/packages/host/app/components/card-search/live-recents-provider.gts b/packages/host/app/components/card-search/live-recents-provider.gts index 105fa3736af..47785d4f208 100644 --- a/packages/host/app/components/card-search/live-recents-provider.gts +++ b/packages/host/app/components/card-search/live-recents-provider.gts @@ -9,7 +9,7 @@ import { type SearchResultsYield, } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; interface Signature { Args: { diff --git a/packages/host/app/components/card-search/panel-content.gts b/packages/host/app/components/card-search/panel-content.gts index 98e214f57db..c1e344f0a9f 100644 --- a/packages/host/app/components/card-search/panel-content.gts +++ b/packages/host/app/components/card-search/panel-content.gts @@ -39,13 +39,13 @@ import { resolveSearchKeyAsURL, } from '@cardstack/host/utils/card-search/url'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { SECTION_DISPLAY_LIMIT_FOCUSED, type SortOption } from './constants'; import LiveRecentsProvider from './live-recents-provider'; import SearchResults from './search-results'; import SheetResults from './sheet-results'; +import type { CardDef } from '@cardstack/base/card-api'; + import type { NamedArgs } from 'ember-modifier'; interface ScrollToFocusedSectionSignature { diff --git a/packages/host/app/components/card-search/result-tile.gts b/packages/host/app/components/card-search/result-tile.gts index f38ee969182..4ac83856ac5 100644 --- a/packages/host/app/components/card-search/result-tile.gts +++ b/packages/host/app/components/card-search/result-tile.gts @@ -26,10 +26,10 @@ import { type NewCardArgs, } from '@cardstack/host/utils/card-search/types'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import CardRenderer from '../card-renderer'; +import type { CardDef } from '@cardstack/base/card-api'; + import type { ModifierLike } from '@glint/template'; // Fallback used when no AdornContext positioner was threaded in (e.g. the tile diff --git a/packages/host/app/components/card-search/sheet-results.gts b/packages/host/app/components/card-search/sheet-results.gts index 6eebe68bf01..3ab9894246e 100644 --- a/packages/host/app/components/card-search/sheet-results.gts +++ b/packages/host/app/components/card-search/sheet-results.gts @@ -28,12 +28,12 @@ import { } from '@cardstack/host/utils/card-search/sections'; import type { NewCardArgs } from '@cardstack/host/utils/card-search/types'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { SORT_OPTIONS, VIEW_OPTIONS, type SortOption } from './constants'; import ResultSection from './result-section'; import SearchResultHeader from './search-result-header'; +import type { CardDef } from '@cardstack/base/card-api'; + import type { ModifierLike } from '@glint/template'; interface Signature { diff --git a/packages/host/app/components/file-chooser/mini/index.gts b/packages/host/app/components/file-chooser/mini/index.gts index 29b7a041763..a5bd10c48b0 100644 --- a/packages/host/app/components/file-chooser/mini/index.gts +++ b/packages/host/app/components/file-chooser/mini/index.gts @@ -9,10 +9,10 @@ import { eq } from '@cardstack/boxel-ui/helpers'; import { RealmPaths, type LocalPath } from '@cardstack/runtime-common'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import FileChooser, { type FileChooserRealm } from '../panel'; +import type { FileDef } from '@cardstack/base/file-api'; + interface Signature { Element: HTMLDivElement; Args: { diff --git a/packages/host/app/components/file-chooser/modal.gts b/packages/host/app/components/file-chooser/modal.gts index ad6ce451986..f12e2adeb1a 100644 --- a/packages/host/app/components/file-chooser/modal.gts +++ b/packages/host/app/components/file-chooser/modal.gts @@ -35,10 +35,10 @@ import type LoaderService from '@cardstack/host/services/loader-service'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; import type StoreService from '@cardstack/host/services/store'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import FileChooser, { type FileChooserRealm } from './panel'; +import type { FileDef } from '@cardstack/base/file-api'; + interface Signature { Args: {}; } diff --git a/packages/host/app/components/file-chooser/panel.gts b/packages/host/app/components/file-chooser/panel.gts index 0602bcf9995..5c253ead4c2 100644 --- a/packages/host/app/components/file-chooser/panel.gts +++ b/packages/host/app/components/file-chooser/panel.gts @@ -11,11 +11,11 @@ import type { FileUploadTask } from '@cardstack/host/services/file-upload'; import type RealmService from '@cardstack/host/services/realm'; import type { EnhancedRealmInfo } from '@cardstack/host/services/realm'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import IndexedFileTree from '../editor/indexed-file-tree'; import RealmDropdown, { type RealmDropdownItem } from '../realm-dropdown'; +import type { FileDef } from '@cardstack/base/file-api'; + import type { WithBoundArgs } from '@glint/template'; export type FileChooserRealm = { url: URL; info: EnhancedRealmInfo }; diff --git a/packages/host/app/components/file-pill.gts b/packages/host/app/components/file-pill.gts index dbac57e5ef9..9c47b4ffb85 100644 --- a/packages/host/app/components/file-pill.gts +++ b/packages/host/app/components/file-pill.gts @@ -14,11 +14,10 @@ import { IconX, Download } from '@cardstack/boxel-ui/icons'; import type { FileUploadStatus } from '@cardstack/host/lib/file-upload-state'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import AttachedFileDropdownMenu from './ai-assistant/attached-file-dropdown-menu'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type { FileDef } from '@cardstack/base/file-api'; interface FilePillSignature { Element: HTMLDivElement | HTMLButtonElement; diff --git a/packages/host/app/components/host-mode/content.gts b/packages/host/app/components/host-mode/content.gts index 56e8b987fea..6d285c6ef5e 100644 --- a/packages/host/app/components/host-mode/content.gts +++ b/packages/host/app/components/host-mode/content.gts @@ -14,15 +14,15 @@ import { meta } from '@cardstack/runtime-common/constants'; import { getCard } from '@cardstack/host/resources/card-resource'; +import HostModeBreadcrumbs from './breadcrumbs'; +import HostModeCard from './card'; +import HostModeStack from './stack'; + import type { CardDef, ViewCardFn, CardCrudFunctions, -} from 'https://cardstack.com/base/card-api'; - -import HostModeBreadcrumbs from './breadcrumbs'; -import HostModeCard from './card'; -import HostModeStack from './stack'; +} from '@cardstack/base/card-api'; interface Signature { Element: HTMLElement; diff --git a/packages/host/app/components/markdown-embed-chooser/pane-usage.gts b/packages/host/app/components/markdown-embed-chooser/pane-usage.gts index ed3b81b327a..5458071b264 100644 --- a/packages/host/app/components/markdown-embed-chooser/pane-usage.gts +++ b/packages/host/app/components/markdown-embed-chooser/pane-usage.gts @@ -11,11 +11,11 @@ import MiniCardChooser from '@cardstack/host/components/card-chooser/mini'; import type StoreService from '@cardstack/host/services/store'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import EmbedFormatSelection from './format-selection'; import MarkdownEmbedPreviewPane from './pane'; +import type { CardDef } from '@cardstack/base/card-api'; + export default class MarkdownEmbedPreviewPaneUsage extends Component { @service declare private store: StoreService; diff --git a/packages/host/app/components/markdown-embed-chooser/pane.gts b/packages/host/app/components/markdown-embed-chooser/pane.gts index 34f5a260578..b2f0232236e 100644 --- a/packages/host/app/components/markdown-embed-chooser/pane.gts +++ b/packages/host/app/components/markdown-embed-chooser/pane.gts @@ -12,14 +12,13 @@ import { IconX } from '@cardstack/boxel-ui/icons'; import { serializeBfmRef } from '@cardstack/runtime-common/bfm-card-references'; -import type { CardDef, FileDef } from 'https://cardstack.com/base/card-api'; - import PlacementToggle from './placement-toggle'; import MarkdownEmbedPreview from './preview'; import type EmbedFormatSelection from './format-selection'; import type { FormatOption, OptionValue } from './format-selection'; +import type { CardDef, FileDef } from '@cardstack/base/card-api'; export { type OptionValue }; diff --git a/packages/host/app/components/markdown-embed-chooser/preview/index.gts b/packages/host/app/components/markdown-embed-chooser/preview/index.gts index 4a182cd56cd..9e33c11594f 100644 --- a/packages/host/app/components/markdown-embed-chooser/preview/index.gts +++ b/packages/host/app/components/markdown-embed-chooser/preview/index.gts @@ -12,11 +12,7 @@ import { import CardRenderer from '@cardstack/host/components/card-renderer'; -import type { - CardDef, - FileDef, - Format, -} from 'https://cardstack.com/base/card-api'; +import type { CardDef, FileDef, Format } from '@cardstack/base/card-api'; type EmbedFormat = 'atom' | 'embedded' | 'fitted' | 'isolated'; diff --git a/packages/host/app/components/markdown-embed-chooser/preview/usage.gts b/packages/host/app/components/markdown-embed-chooser/preview/usage.gts index 025c8ff345f..3bab33a6280 100644 --- a/packages/host/app/components/markdown-embed-chooser/preview/usage.gts +++ b/packages/host/app/components/markdown-embed-chooser/preview/usage.gts @@ -13,10 +13,10 @@ import MiniCardChooser from '@cardstack/host/components/card-chooser/mini'; import type StoreService from '@cardstack/host/services/store'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import MarkdownEmbedPreview from './index'; +import type { CardDef } from '@cardstack/base/card-api'; + type EmbedFormat = 'atom' | 'embedded' | 'fitted' | 'isolated'; export default class MarkdownEmbedPreviewUsage extends Component { diff --git a/packages/host/app/components/markdown-embed-chooser/tab-panel.gts b/packages/host/app/components/markdown-embed-chooser/tab-panel.gts index c47f1f666e1..f3279ba7b79 100644 --- a/packages/host/app/components/markdown-embed-chooser/tab-panel.gts +++ b/packages/host/app/components/markdown-embed-chooser/tab-panel.gts @@ -23,12 +23,11 @@ import type { } from '@cardstack/host/services/markdown-embed-chooser'; import type StoreService from '@cardstack/host/services/store'; -import type { CardDef, FileDef } from 'https://cardstack.com/base/card-api'; - import MarkdownEmbedPreviewPane from './pane'; import TabPills from './tab-pills'; import type EmbedFormatSelection from './format-selection'; +import type { CardDef, FileDef } from '@cardstack/base/card-api'; interface Signature { Element: HTMLDivElement; diff --git a/packages/host/app/components/matrix/room-message-tool.gts b/packages/host/app/components/matrix/room-message-tool.gts index 96ea326670d..25b2638c361 100644 --- a/packages/host/app/components/matrix/room-message-tool.gts +++ b/packages/host/app/components/matrix/room-message-tool.gts @@ -37,12 +37,11 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod import type RealmService from '@cardstack/host/services/realm'; import type ToolService from '@cardstack/host/services/tool-service'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import CodeBlock from '../ai-assistant/code-block'; import CardRenderer from '../card-renderer'; import type { ApplyButtonState } from '../ai-assistant/apply-button'; +import type { CardDef } from '@cardstack/base/card-api'; interface Signature { Element: HTMLDivElement; diff --git a/packages/host/app/components/matrix/room.gts b/packages/host/app/components/matrix/room.gts index c6cbac2a9c9..a26f74d1ffe 100644 --- a/packages/host/app/components/matrix/room.gts +++ b/packages/host/app/components/matrix/room.gts @@ -77,9 +77,6 @@ import type ToolService from '@cardstack/host/services/tool-service'; import UpdateRoomSkillsTool from '@cardstack/host/tools/update-room-skills'; import { FileDefAttributesExtractor } from '@cardstack/host/utils/file-def-attributes-extractor'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import { errorJsonApiToErrorEntry } from '../../lib/window-error-handler'; import AiAssistantActionBar from '../ai-assistant/action-bar'; import AiAssistantAttachmentPicker from '../ai-assistant/attachment-picker'; @@ -97,6 +94,8 @@ import RoomMessage from './room-message'; import type RoomData from '../../lib/matrix-classes/room'; import type { RoomSkill } from '../../resources/room'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; import type { MatrixEvent } from 'matrix-js-sdk'; const LOCAL_SOURCE_URL_PREFIX = 'boxel-local://'; diff --git a/packages/host/app/components/operator-mode/card-error-detail.gts b/packages/host/app/components/operator-mode/card-error-detail.gts index cb6717c8c00..70f1a785883 100644 --- a/packages/host/app/components/operator-mode/card-error-detail.gts +++ b/packages/host/app/components/operator-mode/card-error-detail.gts @@ -1,10 +1,9 @@ import Component from '@glimmer/component'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import ErrorDisplay from './error-display'; import type { CardErrorJSONAPI } from '../../services/store'; +import type { FileDef } from '@cardstack/base/file-api'; interface Signature { Args: { diff --git a/packages/host/app/components/operator-mode/card-error.gts b/packages/host/app/components/operator-mode/card-error.gts index eab0166e805..50dfb88de6b 100644 --- a/packages/host/app/components/operator-mode/card-error.gts +++ b/packages/host/app/components/operator-mode/card-error.gts @@ -11,12 +11,12 @@ import { FileAlert, ExclamationCircle } from '@cardstack/boxel-ui/icons'; import type LoaderService from '@cardstack/host/services/loader-service'; import type { CardErrorJSONAPI } from '@cardstack/host/services/store'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import { htmlComponent } from '../../lib/html-component'; import CardErrorDetail from './card-error-detail'; +import type { FileDef } from '@cardstack/base/file-api'; + interface Signature { Args: { error: CardErrorJSONAPI; diff --git a/packages/host/app/components/operator-mode/card-schema-editor.gts b/packages/host/app/components/operator-mode/card-schema-editor.gts index 27c5fd4d5d0..0d042d84fca 100644 --- a/packages/host/app/components/operator-mode/card-schema-editor.gts +++ b/packages/host/app/components/operator-mode/card-schema-editor.gts @@ -41,10 +41,10 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod import type RealmService from '@cardstack/host/services/realm'; import { calculateTotalOwnFields } from '@cardstack/host/utils/schema-editor'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; - import ContextMenuButton from './context-menu-button'; +import type { BaseDef } from '@cardstack/base/card-api'; + interface Signature { Args: { card: typeof BaseDef; diff --git a/packages/host/app/components/operator-mode/code-submode.gts b/packages/host/app/components/operator-mode/code-submode.gts index 07a3270d5f3..51a7d0386a8 100644 --- a/packages/host/app/components/operator-mode/code-submode.gts +++ b/packages/host/app/components/operator-mode/code-submode.gts @@ -65,14 +65,6 @@ import type RecentFilesService from '@cardstack/host/services/recent-files-servi import type SpecPanelService from '@cardstack/host/services/spec-panel-service'; import type StoreService from '@cardstack/host/services/store'; -import type { - BaseDef, - CardDef, - Format, - CardContext, -} from 'https://cardstack.com/base/card-api'; -import type { SpecType } from 'https://cardstack.com/base/spec'; - import { CodeModePanelWidths, CodeModePanelHeights, @@ -94,6 +86,13 @@ import DetailPanel from './detail-panel'; import SubmodeLayout from './submode-layout'; import type { NewFileOptions } from './new-file-button'; +import type { + BaseDef, + CardDef, + Format, + CardContext, +} from '@cardstack/base/card-api'; +import type { SpecType } from '@cardstack/base/spec'; interface Signature { Args: { diff --git a/packages/host/app/components/operator-mode/code-submode/module-inspector.gts b/packages/host/app/components/operator-mode/code-submode/module-inspector.gts index 341109bd967..513362d13a2 100644 --- a/packages/host/app/components/operator-mode/code-submode/module-inspector.gts +++ b/packages/host/app/components/operator-mode/code-submode/module-inspector.gts @@ -86,13 +86,9 @@ import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url'; import { PlaygroundSelections } from '@cardstack/host/utils/local-storage-keys'; import { runWhileActive } from '@cardstack/host/utils/run-while-active'; -import type { - CardDef, - Format, - ViewCardFn, -} from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { Spec } from 'https://cardstack.com/base/spec'; +import type { CardDef, Format, ViewCardFn } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { Spec } from '@cardstack/base/spec'; import type { ComponentLike } from '@glint/template'; diff --git a/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts b/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts index 3c233fbc211..d448324d95d 100644 --- a/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts +++ b/packages/host/app/components/operator-mode/code-submode/playground/instance-chooser-dropdown.gts @@ -17,9 +17,8 @@ import { import CardRenderer from '@cardstack/host/components/card-renderer'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import type { FieldOption, SelectedInstance } from './playground-panel'; +import type { FileDef } from '@cardstack/base/file-api'; const getItemTitle = (selection: SelectedInstance | undefined) => { if (!selection) { diff --git a/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts b/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts index 45ce34f80b8..c08ea4c2a48 100644 --- a/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts +++ b/packages/host/app/components/operator-mode/code-submode/playground/playground-panel.gts @@ -80,16 +80,6 @@ import type RecentFilesService from '@cardstack/host/services/recent-files-servi import type StoreService from '@cardstack/host/services/store'; import type ToolService from '@cardstack/host/services/tool-service'; -import type { - CardContext, - CardDef, - FieldDef, - Format, - ViewCardFn, -} from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { Spec } from 'https://cardstack.com/base/spec'; - import SearchResults from '../../../card-search/search-results'; import CardError from '../../card-error'; import FormatChooser from '../format-chooser'; @@ -100,6 +90,16 @@ import InstanceSelectDropdown from './instance-chooser-dropdown'; import PlaygroundPreview from './playground-preview'; import SpecSearch from './spec-search'; +import type { + CardContext, + CardDef, + FieldDef, + Format, + ViewCardFn, +} from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { Spec } from '@cardstack/base/spec'; + export type SelectedInstance = { card: CardDef | FileDef; fieldIndex: number | undefined; diff --git a/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts b/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts index c5eb5284050..41f47e7a27d 100644 --- a/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts +++ b/packages/host/app/components/operator-mode/code-submode/playground/playground-preview.gts @@ -17,12 +17,8 @@ import FittedFormatGallery from '@cardstack/host/components/operator-mode/previe import MarkdownPreview from '@cardstack/host/components/operator-mode/preview-panel/markdown-preview'; import type { EnhancedRealmInfo } from '@cardstack/host/services/realm'; -import type { - CardDef, - FieldDef, - Format, -} from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import type { CardDef, FieldDef, Format } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; interface Signature { Args: { diff --git a/packages/host/app/components/operator-mode/code-submode/playground/playground.gts b/packages/host/app/components/operator-mode/code-submode/playground/playground.gts index aa8570a47a4..ac8232d7f28 100644 --- a/packages/host/app/components/operator-mode/code-submode/playground/playground.gts +++ b/packages/host/app/components/operator-mode/code-submode/playground/playground.gts @@ -5,10 +5,10 @@ import { not } from '@cardstack/boxel-ui/helpers'; import { isFieldDef, isFileDef, isPrimitive } from '@cardstack/runtime-common'; import type { ResolvedCodeRef } from '@cardstack/runtime-common'; -import type { BaseDef, ViewCardFn } from 'https://cardstack.com/base/card-api'; - import PlaygroundPanel from './playground-panel'; +import type { BaseDef, ViewCardFn } from '@cardstack/base/card-api'; + interface UnsupportedMessageSignature { Args: { cardOrField?: typeof BaseDef; diff --git a/packages/host/app/components/operator-mode/code-submode/schema-editor.gts b/packages/host/app/components/operator-mode/code-submode/schema-editor.gts index 8de52aad9ac..08ae76a66f5 100644 --- a/packages/host/app/components/operator-mode/code-submode/schema-editor.gts +++ b/packages/host/app/components/operator-mode/code-submode/schema-editor.gts @@ -25,7 +25,7 @@ import { isSelectedItemIncompatibleWithSchemaEditor, } from '@cardstack/host/utils/schema-editor'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; import type { WithBoundArgs } from '@glint/template'; diff --git a/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts b/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts index 53c2f0bcebf..ba72ac27a1f 100644 --- a/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts +++ b/packages/host/app/components/operator-mode/code-submode/spec-preview-badge.gts @@ -6,7 +6,7 @@ import Check from '@cardstack/boxel-icons/check'; import { BoxelButton } from '@cardstack/boxel-ui/components'; import { IconPlus } from '@cardstack/boxel-ui/icons'; -import type { Spec } from 'https://cardstack.com/base/spec'; +import type { Spec } from '@cardstack/base/spec'; interface SpecPreviewBadgeSignature { Args: { diff --git a/packages/host/app/components/operator-mode/code-submode/spec-preview.gts b/packages/host/app/components/operator-mode/code-submode/spec-preview.gts index c20e4e84cc6..75ba472bf8e 100644 --- a/packages/host/app/components/operator-mode/code-submode/spec-preview.gts +++ b/packages/host/app/components/operator-mode/code-submode/spec-preview.gts @@ -49,15 +49,14 @@ import type SpecPanelService from '@cardstack/host/services/spec-panel-service'; import type StoreService from '@cardstack/host/services/store'; import { runWhileActive } from '@cardstack/host/utils/run-while-active'; -import type { CardContext } from 'https://cardstack.com/base/card-api'; -import type { Spec } from 'https://cardstack.com/base/spec'; - import ElementTracker, { type RenderedCardForOverlayActions, } from '../../../resources/element-tracker'; import Overlays from '../overlays'; import type { CardDefOrId } from '../stack-item'; +import type { CardContext } from '@cardstack/base/card-api'; +import type { Spec } from '@cardstack/base/spec'; import type { WithBoundArgs } from '@glint/template'; interface Signature { diff --git a/packages/host/app/components/operator-mode/container.gts b/packages/host/app/components/operator-mode/container.gts index 83a01e73d5d..d08c6aef89d 100644 --- a/packages/host/app/components/operator-mode/container.gts +++ b/packages/host/app/components/operator-mode/container.gts @@ -34,8 +34,6 @@ import { getCard } from '@cardstack/host/resources/card-resource'; import type MessageService from '@cardstack/host/services/message-service'; -import type { CardContext } from 'https://cardstack.com/base/card-api'; - import CardChooserModal from '../card-chooser/modal'; import SearchResults from '../card-search/search-results'; import FileChooserModal from '../file-chooser/modal'; @@ -50,6 +48,7 @@ import type OperatorModeStateService from '../../services/operator-mode-state-se import type RealmServerService from '../../services/realm-server'; import type StoreService from '../../services/store'; import type ToolService from '../../services/tool-service'; +import type { CardContext } from '@cardstack/base/card-api'; const waiter = buildWaiter('operator-mode-container:saveCard-waiter'); interface Signature { diff --git a/packages/host/app/components/operator-mode/create-file-modal.gts b/packages/host/app/components/operator-mode/create-file-modal.gts index 872b4c8680a..240824aae6c 100644 --- a/packages/host/app/components/operator-mode/create-file-modal.gts +++ b/packages/host/app/components/operator-mode/create-file-modal.gts @@ -57,10 +57,6 @@ import config from '@cardstack/host/config/environment'; import type RealmService from '@cardstack/host/services/realm'; import CopyCardToRealmTool from '@cardstack/host/tools/copy-card'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { Spec } from 'https://cardstack.com/base/spec'; -import type { SpecType } from 'https://cardstack.com/base/spec'; - import { cleanseString } from '../../lib/utils'; import ModalContainer from '../modal-container'; @@ -75,6 +71,9 @@ import type CardService from '../../services/card-service'; import type NetworkService from '../../services/network'; import type StoreService from '../../services/store'; import type ToolService from '../../services/tool-service'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { SpecType } from '@cardstack/base/spec'; +import type { Spec } from '@cardstack/base/spec'; export type NewFileType = | 'duplicate-instance' diff --git a/packages/host/app/components/operator-mode/detail-panel-selector.gts b/packages/host/app/components/operator-mode/detail-panel-selector.gts index dc6ed07c86b..3df0b523cbf 100644 --- a/packages/host/app/components/operator-mode/detail-panel-selector.gts +++ b/packages/host/app/components/operator-mode/detail-panel-selector.gts @@ -22,7 +22,7 @@ import { isReexportCardOrField, } from '@cardstack/host/resources/module-contents'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; interface SelectorItemOptions { action: Function; diff --git a/packages/host/app/components/operator-mode/detail-panel.gts b/packages/host/app/components/operator-mode/detail-panel.gts index 83ab14e6c41..f4e981539d2 100644 --- a/packages/host/app/components/operator-mode/detail-panel.gts +++ b/packages/host/app/components/operator-mode/detail-panel.gts @@ -60,8 +60,6 @@ import type StoreService from '@cardstack/host/services/store'; import type ToolService from '@cardstack/host/services/tool-service'; import OpenCreateListingModalTool from '@cardstack/host/tools/open-create-listing-modal'; -import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api'; - import { lastModifiedDate } from '../../resources/last-modified-date'; import { PanelSection } from './code-submode/inner-container'; @@ -85,6 +83,7 @@ import type { SelectorItem } from './detail-panel-selector'; import type { ModuleAnalysis } from '../../resources/module-contents'; import type OperatorModeStateService from '../../services/operator-mode-state-service'; +import type { CardDef, BaseDef } from '@cardstack/base/card-api'; interface Signature { Element: HTMLElement; diff --git a/packages/host/app/components/operator-mode/edit-field-modal.gts b/packages/host/app/components/operator-mode/edit-field-modal.gts index a036f1fd757..ca1fe48af48 100644 --- a/packages/host/app/components/operator-mode/edit-field-modal.gts +++ b/packages/host/app/components/operator-mode/edit-field-modal.gts @@ -49,11 +49,11 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod import type RealmService from '@cardstack/host/services/realm'; import type StoreService from '@cardstack/host/services/store'; -import type { BaseDef, FieldType } from 'https://cardstack.com/base/card-api'; -import type { Spec } from 'https://cardstack.com/base/spec'; - import { SelectedTypePill } from './create-file-modal'; +import type { BaseDef, FieldType } from '@cardstack/base/card-api'; +import type { Spec } from '@cardstack/base/spec'; + interface Signature { Args: { file: Ready; diff --git a/packages/host/app/components/operator-mode/error-display.gts b/packages/host/app/components/operator-mode/error-display.gts index 7133772e9e0..9d33bffd275 100644 --- a/packages/host/app/components/operator-mode/error-display.gts +++ b/packages/host/app/components/operator-mode/error-display.gts @@ -20,11 +20,11 @@ import type { DisplayedErrorProvider } from '@cardstack/host/services/error-disp import type ToolService from '@cardstack/host/services/tool-service'; import SwitchSubmodeTool from '@cardstack/host/tools/switch-submode'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { BoxelErrorForContext } from 'https://cardstack.com/base/matrix-event'; - import SendErrorToAIAssistant from './send-error-to-ai-assistant'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { BoxelErrorForContext } from '@cardstack/base/matrix-event'; + interface Signature { Element: HTMLElement; Args: { diff --git a/packages/host/app/components/operator-mode/host-submode.gts b/packages/host/app/components/operator-mode/host-submode.gts index d83ffea0bea..d316f95d4cf 100644 --- a/packages/host/app/components/operator-mode/host-submode.gts +++ b/packages/host/app/components/operator-mode/host-submode.gts @@ -29,13 +29,12 @@ import UnpublishRealmTool from '@cardstack/host/tools/unpublish-realm'; import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url'; -import type { ViewCardFn } from 'https://cardstack.com/base/card-api'; - import HostModeContent from '../host-mode/content'; import SubmodeLayout from './submode-layout'; import type { PublishError } from './publish-realm-modal'; +import type { ViewCardFn } from '@cardstack/base/card-api'; interface HostSubmodeSignature { Element: HTMLElement; diff --git a/packages/host/app/components/operator-mode/interact-submode.gts b/packages/host/app/components/operator-mode/interact-submode.gts index b14f9bd52c8..d2f0f990ca8 100644 --- a/packages/host/app/components/operator-mode/interact-submode.gts +++ b/packages/host/app/components/operator-mode/interact-submode.gts @@ -59,13 +59,6 @@ import CopyCardToStackTool from '@cardstack/host/tools/copy-card-to-stack'; import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url'; -import type { - CardContext, - CardDef, - Format, -} from 'https://cardstack.com/base/card-api'; -import type { Spec } from 'https://cardstack.com/base/spec'; - import consumeContext from '../../helpers/consume-context'; import { removeFileExtension } from '../../utils/card-search/types'; @@ -94,6 +87,8 @@ import type RealmServer from '../../services/realm-server'; import type RecentCardsService from '../../services/recent-cards-service'; import type StoreService from '../../services/store'; import type ToolService from '../../services/tool-service'; +import type { CardContext, CardDef, Format } from '@cardstack/base/card-api'; +import type { Spec } from '@cardstack/base/spec'; const waiter = buildWaiter('operator-mode:interact-submode-waiter'); diff --git a/packages/host/app/components/operator-mode/operator-mode-overlays.gts b/packages/host/app/components/operator-mode/operator-mode-overlays.gts index 8be0672d05c..a96c8a56b2e 100644 --- a/packages/host/app/components/operator-mode/operator-mode-overlays.gts +++ b/packages/host/app/components/operator-mode/operator-mode-overlays.gts @@ -51,14 +51,6 @@ import { import { removeFileExtension } from '@cardstack/host/utils/card-search/types'; -import type { - BaseDef, - CardCrudFunctions, - CardDef, - FileDef, - Format, -} from 'https://cardstack.com/base/card-api'; - import { htmlComponent } from '../../lib/html-component'; import { knownFileMetaUrls } from '../../lib/known-file-meta-urls'; import { detectStackItemTypeForTarget } from '../../lib/stack-item'; @@ -69,6 +61,13 @@ import type { StackItemRenderedCardForOverlayActions } from './stack-item'; import type { CardDefOrId } from './stack-item'; import type StoreService from '../../services/store'; +import type { + BaseDef, + CardCrudFunctions, + CardDef, + FileDef, + Format, +} from '@cardstack/base/card-api'; // Adorn's `@compact` variant shrinks the label and selection chip // for narrow atom-format cards. The threshold mirrors what the diff --git a/packages/host/app/components/operator-mode/overlays.gts b/packages/host/app/components/operator-mode/overlays.gts index ce110f43038..f4abb45fb66 100644 --- a/packages/host/app/components/operator-mode/overlays.gts +++ b/packages/host/app/components/operator-mode/overlays.gts @@ -17,15 +17,10 @@ import { localId as localIdSymbol, rri } from '@cardstack/runtime-common'; import type CardService from '@cardstack/host/services/card-service'; import type RealmService from '@cardstack/host/services/realm'; -import type { - CardDef, - Format, - ViewCardFn, -} from 'https://cardstack.com/base/card-api'; - import type { CardDefOrId } from './stack-item'; import type { RenderedCardForOverlayActions } from '../../resources/element-tracker'; +import type { CardDef, Format, ViewCardFn } from '@cardstack/base/card-api'; import type { MiddlewareState } from '@floating-ui/dom'; interface OverlaySignature { diff --git a/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts b/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts index ab09148c09c..be4f89d7a3d 100644 --- a/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts +++ b/packages/host/app/components/operator-mode/preview-panel/fitted-format-gallery.gts @@ -12,7 +12,7 @@ import { FITTED_FORMATS, } from '@cardstack/runtime-common'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; interface Signature { Args: { diff --git a/packages/host/app/components/operator-mode/preview-panel/index.gts b/packages/host/app/components/operator-mode/preview-panel/index.gts index 1548daf76ad..db4247547a8 100644 --- a/packages/host/app/components/operator-mode/preview-panel/index.gts +++ b/packages/host/app/components/operator-mode/preview-panel/index.gts @@ -45,19 +45,19 @@ import type OperatorModeStateService from '@cardstack/host/services/operator-mod import type RealmService from '@cardstack/host/services/realm'; import type ToolService from '@cardstack/host/services/tool-service'; +import FormatChooser from '../code-submode/format-chooser'; + +import FittedFormatGallery from './fitted-format-gallery'; +import MarkdownPreview from './markdown-preview'; +import MetadataPanel from './metadata-panel'; + import type { BaseDef, CardContext, CardDef, Format, ViewCardFn, -} from 'https://cardstack.com/base/card-api'; - -import FormatChooser from '../code-submode/format-chooser'; - -import FittedFormatGallery from './fitted-format-gallery'; -import MarkdownPreview from './markdown-preview'; -import MetadataPanel from './metadata-panel'; +} from '@cardstack/base/card-api'; interface Signature { Element: HTMLElement; diff --git a/packages/host/app/components/operator-mode/preview-panel/markdown-preview.gts b/packages/host/app/components/operator-mode/preview-panel/markdown-preview.gts index 3e7f992aefb..2dc2ba74c49 100644 --- a/packages/host/app/components/operator-mode/preview-panel/markdown-preview.gts +++ b/packages/host/app/components/operator-mode/preview-panel/markdown-preview.gts @@ -12,10 +12,10 @@ import { cn, eq } from '@cardstack/boxel-ui/helpers'; import CardRenderer from '@cardstack/host/components/card-renderer'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; - import RenderedMarkdown from './rendered-markdown'; +import type { BaseDef } from '@cardstack/base/card-api'; + type ViewMode = 'source' | 'rendered'; interface Signature { diff --git a/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts b/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts index 476e2327308..f4d1b203fec 100644 --- a/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts +++ b/packages/host/app/components/operator-mode/preview-panel/metadata-panel.gts @@ -7,8 +7,8 @@ import { TrackedObject } from 'tracked-built-ins'; import type StoreService from '@cardstack/host/services/store'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +import type { BaseDef } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; interface Signature { Args: { diff --git a/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts b/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts index e6667a4653b..3719a2fd107 100644 --- a/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts +++ b/packages/host/app/components/operator-mode/preview-panel/rendered-markdown.gts @@ -39,11 +39,7 @@ import CardRenderer from '@cardstack/host/components/card-renderer'; import type StoreService from '@cardstack/host/services/store'; -import type { - CardContext, - CardDef, - FileDef, -} from 'https://cardstack.com/base/card-api'; +import type { CardContext, CardDef, FileDef } from '@cardstack/base/card-api'; type CardSlotFormat = 'atom' | 'embedded' | 'fitted' | 'isolated'; type SlotState = 'resolved' | 'loading' | 'unresolved'; diff --git a/packages/host/app/components/operator-mode/publish-realm-modal.gts b/packages/host/app/components/operator-mode/publish-realm-modal.gts index 3fb56d2e01e..ec7fb4dabf1 100644 --- a/packages/host/app/components/operator-mode/publish-realm-modal.gts +++ b/packages/host/app/components/operator-mode/publish-realm-modal.gts @@ -57,7 +57,7 @@ import type StoreService from '@cardstack/host/services/store'; import type ToolService from '@cardstack/host/services/tool-service'; import CheckDomainAvailabilityTool from '@cardstack/host/tools/check-domain-availability'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; type CustomSubdomainSelection = { url: string; diff --git a/packages/host/app/components/operator-mode/remove-field-modal.gts b/packages/host/app/components/operator-mode/remove-field-modal.gts index f2c2b41e4bb..e2f285b01bd 100644 --- a/packages/host/app/components/operator-mode/remove-field-modal.gts +++ b/packages/host/app/components/operator-mode/remove-field-modal.gts @@ -16,7 +16,7 @@ import type { Ready } from '@cardstack/host/resources/file'; import type { FieldOfType } from '@cardstack/host/services/card-type-service'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; interface Signature { Args: { diff --git a/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts b/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts index c2e0377031a..496a991504f 100644 --- a/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts +++ b/packages/host/app/components/operator-mode/send-error-to-ai-assistant.gts @@ -9,11 +9,10 @@ import { Button } from '@cardstack/boxel-ui/components'; import OpenAiAssistantRoomTool from '@cardstack/host/tools/open-ai-assistant-room'; import SendAiAssistantMessageTool from '@cardstack/host/tools/send-ai-assistant-message'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import type AiAssistantPanelService from '../../services/ai-assistant-panel-service'; import type MatrixService from '../../services/matrix-service'; import type ToolService from '../../services/tool-service'; +import type { FileDef } from '@cardstack/base/file-api'; interface Signature { Element: HTMLButtonElement; diff --git a/packages/host/app/components/operator-mode/stack-item.gts b/packages/host/app/components/operator-mode/stack-item.gts index 2b858727b9b..7af33de627f 100644 --- a/packages/host/app/components/operator-mode/stack-item.gts +++ b/packages/host/app/components/operator-mode/stack-item.gts @@ -70,12 +70,6 @@ import { } from '@cardstack/host/lib/stack-item'; import { urlForRealmLookup } from '@cardstack/host/lib/utils'; -import type { - CardContext, - CardCrudFunctions, - CardDef, -} from 'https://cardstack.com/base/card-api'; - import consumeContext from '../../helpers/consume-context'; import ElementTracker, { type RenderedCardForOverlayActions, @@ -93,6 +87,11 @@ import type NetworkService from '../../services/network'; import type OperatorModeStateService from '../../services/operator-mode-state-service'; import type RealmService from '../../services/realm'; import type StoreService from '../../services/store'; +import type { + CardContext, + CardCrudFunctions, + CardDef, +} from '@cardstack/base/card-api'; export interface StackItemComponentAPI { clearSelections: () => void; diff --git a/packages/host/app/components/operator-mode/stack.gts b/packages/host/app/components/operator-mode/stack.gts index 96c7a86bf77..7f25f3073bb 100644 --- a/packages/host/app/components/operator-mode/stack.gts +++ b/packages/host/app/components/operator-mode/stack.gts @@ -14,19 +14,18 @@ import { import type { StackItem } from '@cardstack/host/lib/stack-item'; +import OperatorModeStackItem, { + type StackItemComponentAPI, +} from './stack-item'; + +import type { CardDefOrId } from './stack-item'; import type { CreateCardFn, DeleteCardFn, EditCardFn, SaveCardFn, ViewCardFn, -} from 'https://cardstack.com/base/card-api'; - -import OperatorModeStackItem, { - type StackItemComponentAPI, -} from './stack-item'; - -import type { CardDefOrId } from './stack-item'; +} from '@cardstack/base/card-api'; interface Signature { Element: HTMLElement; diff --git a/packages/host/app/helpers/subscribe-to-realms.ts b/packages/host/app/helpers/subscribe-to-realms.ts index 70c517ee31c..1bb06edac66 100644 --- a/packages/host/app/helpers/subscribe-to-realms.ts +++ b/packages/host/app/helpers/subscribe-to-realms.ts @@ -4,7 +4,7 @@ import { isEqual } from 'lodash-es'; import { subscribeToRealm } from '@cardstack/runtime-common'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; interface Signature { Args: { diff --git a/packages/host/app/lib/field-path-parser.ts b/packages/host/app/lib/field-path-parser.ts index 942289e2f3a..ff167824a77 100644 --- a/packages/host/app/lib/field-path-parser.ts +++ b/packages/host/app/lib/field-path-parser.ts @@ -1,4 +1,4 @@ -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; export type ValidateFieldPathResult = | { diff --git a/packages/host/app/lib/file-def-manager.ts b/packages/host/app/lib/file-def-manager.ts index 9c4914a7a3d..c8dbdc6f7b5 100644 --- a/packages/host/app/lib/file-def-manager.ts +++ b/packages/host/app/lib/file-def-manager.ts @@ -22,27 +22,20 @@ import { import { canonicalizeMatrixMediaKey } from '@cardstack/runtime-common/ai/matrix-utils'; import { basicMappings } from '@cardstack/runtime-common/helpers/ai'; -import type { default as Base64ImageFieldType } from 'https://cardstack.com/base/base64-image'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as FileAPI from 'https://cardstack.com/base/file-api'; -import type { - FileDef, - SerializedFile, -} from 'https://cardstack.com/base/file-api'; -import type { - ToolDefinitionSchema, - Tool, -} from 'https://cardstack.com/base/matrix-event'; - -import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event'; -import type * as SkillModule from 'https://cardstack.com/base/skill'; - import type CardService from '../services/card-service'; import type LoaderService from '../services/loader-service'; import type { ExtendedClient } from '../services/matrix-sdk-loader'; import type NetworkService from '../services/network'; import type ToolService from '../services/tool-service'; +import type { default as Base64ImageFieldType } from '@cardstack/base/base64-image'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type * as FileAPI from '@cardstack/base/file-api'; +import type { FileDef, SerializedFile } from '@cardstack/base/file-api'; +import type { ToolDefinitionSchema, Tool } from '@cardstack/base/matrix-event'; + +import type { MatrixEvent } from '@cardstack/base/matrix-event'; +import type * as SkillModule from '@cardstack/base/skill'; export const isSkillCard = Symbol.for('is-skill-card'); diff --git a/packages/host/app/lib/gc-card-store.ts b/packages/host/app/lib/gc-card-store.ts index db0391d7de5..7a18e7dfb22 100644 --- a/packages/host/app/lib/gc-card-store.ts +++ b/packages/host/app/lib/gc-card-store.ts @@ -33,9 +33,9 @@ import type { QueryLoadInfo, QueryLoadMeta, StoreSearchResource, -} from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; +} from '@cardstack/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; export type ReferenceCount = Map; diff --git a/packages/host/app/lib/host-base-tool.ts b/packages/host/app/lib/host-base-tool.ts index 9a1bff973be..20cf88b9420 100644 --- a/packages/host/app/lib/host-base-tool.ts +++ b/packages/host/app/lib/host-base-tool.ts @@ -5,10 +5,9 @@ import { Command, type CommandContext } from '@cardstack/runtime-common'; import { baseRealm } from '@cardstack/runtime-common'; -import type { CardDefConstructor } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import type LoaderService from '../services/loader-service'; +import type { CardDefConstructor } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default abstract class HostBaseTool< CardInputType extends CardDefConstructor | undefined, diff --git a/packages/host/app/lib/isolated-render.gts b/packages/host/app/lib/isolated-render.gts index 407b488fa62..31640bcc4f0 100644 --- a/packages/host/app/lib/isolated-render.gts +++ b/packages/host/app/lib/isolated-render.gts @@ -9,7 +9,7 @@ import { resetTracking } from '@glimmer/validator'; import { CardError } from '@cardstack/runtime-common/error'; -import type { Format } from 'https://cardstack.com/base/card-api'; +import type { Format } from '@cardstack/base/card-api'; import type { ComponentLike } from '@glint/template'; diff --git a/packages/host/app/lib/matrix-classes/message-builder.ts b/packages/host/app/lib/matrix-classes/message-builder.ts index 0b31dca5079..1e8e4b57085 100644 --- a/packages/host/app/lib/matrix-classes/message-builder.ts +++ b/packages/host/app/lib/matrix-classes/message-builder.ts @@ -42,8 +42,13 @@ import type MatrixService from '@cardstack/host/services/matrix-service'; import type StoreService from '@cardstack/host/services/store'; import type ToolService from '@cardstack/host/services/tool-service'; -import type { ToolCallStatus } from 'https://cardstack.com/base/command'; -import type { SerializedFile } from 'https://cardstack.com/base/file-api'; +import { Message } from './message'; +import MessageCodePatchResult from './message-code-patch-result'; +import MessageTool from './message-tool'; + +import type { RoomMember } from './member'; +import type { ToolCallStatus } from '@cardstack/base/command'; +import type { SerializedFile } from '@cardstack/base/file-api'; import type { CardMessageContent, CardMessageEvent, @@ -53,13 +58,7 @@ import type { EncodedToolRequest, MatrixEvent as DiscreteMatrixEvent, MessageEvent, -} from 'https://cardstack.com/base/matrix-event'; - -import { Message } from './message'; -import MessageCodePatchResult from './message-code-patch-result'; -import MessageTool from './message-tool'; - -import type { RoomMember } from './member'; +} from '@cardstack/base/matrix-event'; const ErrorMessage: Record = { ['M_TOO_LARGE']: 'Message is too large', diff --git a/packages/host/app/lib/matrix-classes/message-code-patch-result.ts b/packages/host/app/lib/matrix-classes/message-code-patch-result.ts index a8b1a0506e4..e99920dc5f4 100644 --- a/packages/host/app/lib/matrix-classes/message-code-patch-result.ts +++ b/packages/host/app/lib/matrix-classes/message-code-patch-result.ts @@ -8,9 +8,8 @@ import type MatrixService from '@cardstack/host/services/matrix-service'; import type StoreService from '@cardstack/host/services/store'; import type ToolService from '@cardstack/host/services/tool-service'; -import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event'; - import type { Message } from './message'; +import type { CodePatchStatus } from '@cardstack/base/matrix-event'; export default class MessageCodePatchResult { @tracked index: number; diff --git a/packages/host/app/lib/matrix-classes/message-tool.ts b/packages/host/app/lib/matrix-classes/message-tool.ts index a48f0771d81..b57cdb0456b 100644 --- a/packages/host/app/lib/matrix-classes/message-tool.ts +++ b/packages/host/app/lib/matrix-classes/message-tool.ts @@ -11,10 +11,9 @@ import type MatrixService from '@cardstack/host/services/matrix-service'; import type StoreService from '@cardstack/host/services/store'; import type ToolService from '@cardstack/host/services/tool-service'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { SerializedFile } from 'https://cardstack.com/base/file-api'; - import type { Message } from './message'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { SerializedFile } from '@cardstack/base/file-api'; type ToolCallStatus = 'applied' | 'ready' | 'applying' | 'invalid'; diff --git a/packages/host/app/lib/matrix-classes/message.ts b/packages/host/app/lib/matrix-classes/message.ts index 8f0ebee5702..0e9d3a0caaf 100644 --- a/packages/host/app/lib/matrix-classes/message.ts +++ b/packages/host/app/lib/matrix-classes/message.ts @@ -11,13 +11,12 @@ import { type HtmlTagGroup, } from '@cardstack/host/lib/formatted-message/utils'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import type { RoomMember } from './member'; import type MessageCodePatchResult from './message-code-patch-result'; import type MessageTool from './message-tool'; +import type { FileDef } from '@cardstack/base/file-api'; import type { EventStatus } from 'matrix-js-sdk'; const ErrorMessage: Record = { diff --git a/packages/host/app/lib/matrix-classes/room.ts b/packages/host/app/lib/matrix-classes/room.ts index f9fdc0cddd5..24e7c3bfd18 100644 --- a/packages/host/app/lib/matrix-classes/room.ts +++ b/packages/host/app/lib/matrix-classes/room.ts @@ -10,13 +10,13 @@ import { type LLMMode, } from '@cardstack/runtime-common/matrix-constants'; -import type { SerializedFile } from 'https://cardstack.com/base/file-api'; +import Mutex from '../mutex'; + +import type { SerializedFile } from '@cardstack/base/file-api'; import type { ActiveLLMEvent, MatrixEvent as DiscreteMatrixEvent, -} from 'https://cardstack.com/base/matrix-event'; - -import Mutex from '../mutex'; +} from '@cardstack/base/matrix-event'; import type { IEvent } from 'matrix-js-sdk'; diff --git a/packages/host/app/lib/skill-tools.ts b/packages/host/app/lib/skill-tools.ts index b591303621b..d29acc10eee 100644 --- a/packages/host/app/lib/skill-tools.ts +++ b/packages/host/app/lib/skill-tools.ts @@ -1,11 +1,10 @@ import { isCardInstance } from '@cardstack/runtime-common'; -import type { MarkdownDef } from 'https://cardstack.com/base/markdown-file-def'; -import type * as SkillModule from 'https://cardstack.com/base/skill'; - import { isSkillCard } from './file-def-manager'; import type StoreService from '../services/store'; +import type { MarkdownDef } from '@cardstack/base/markdown-file-def'; +import type * as SkillModule from '@cardstack/base/skill'; // A skill is either a `Skill` card (commands on `Skill.commands`) or a // markdown file whose `boxel.kind: skill` frontmatter rehydrates as a diff --git a/packages/host/app/lib/stack-item.ts b/packages/host/app/lib/stack-item.ts index 16046a35818..21adbd6669e 100644 --- a/packages/host/app/lib/stack-item.ts +++ b/packages/host/app/lib/stack-item.ts @@ -4,10 +4,10 @@ import { isFileDefInstance } from '@cardstack/runtime-common'; import type { Deferred } from '@cardstack/runtime-common'; import type { Store, StoreReadType } from '@cardstack/runtime-common'; -import type { Format } from 'https://cardstack.com/base/card-api'; - import { knownFileMetaUrls } from './known-file-meta-urls'; +import type { Format } from '@cardstack/base/card-api'; + interface Args { format: Format; request?: Deferred; diff --git a/packages/host/app/lib/tool-definitions.ts b/packages/host/app/lib/tool-definitions.ts index e582bdae743..8d08b055089 100644 --- a/packages/host/app/lib/tool-definitions.ts +++ b/packages/host/app/lib/tool-definitions.ts @@ -1,4 +1,4 @@ -import type * as SkillModule from 'https://cardstack.com/base/skill'; +import type * as SkillModule from '@cardstack/base/skill'; export function isValidCommandDefinition( commandDefinition?: SkillModule.ToolField, diff --git a/packages/host/app/lib/utils.ts b/packages/host/app/lib/utils.ts index af3c5e9835c..31f9beda831 100644 --- a/packages/host/app/lib/utils.ts +++ b/packages/host/app/lib/utils.ts @@ -13,7 +13,7 @@ export { import ENV from '@cardstack/host/config/environment'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; export function stripFileExtension(path: string): string { return path.replace(/\.[^/.]+$/, ''); diff --git a/packages/host/app/resources/card-collection.ts b/packages/host/app/resources/card-collection.ts index 85785f8da72..6982544ea52 100644 --- a/packages/host/app/resources/card-collection.ts +++ b/packages/host/app/resources/card-collection.ts @@ -17,9 +17,8 @@ import { type CardErrorJSONAPI as CardError, } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; interface Args { named: { diff --git a/packages/host/app/resources/card-resource.ts b/packages/host/app/resources/card-resource.ts index 189304b0427..814d11084eb 100644 --- a/packages/host/app/resources/card-resource.ts +++ b/packages/host/app/resources/card-resource.ts @@ -11,9 +11,8 @@ import { isCardInstance, isFileDefInstance } from '@cardstack/runtime-common'; import type { StoreReadType } from '@cardstack/runtime-common'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; - import type StoreService from '../services/store'; +import type { BaseDef } from '@cardstack/base/card-api'; interface Args { named: { diff --git a/packages/host/app/resources/card-type.ts b/packages/host/app/resources/card-type.ts index 0df11e3a09a..2c9f5a08083 100644 --- a/packages/host/app/resources/card-type.ts +++ b/packages/host/app/resources/card-type.ts @@ -8,7 +8,7 @@ import type { Type } from '@cardstack/host/services/card-type-service'; import type CardTypeService from '@cardstack/host/services/card-type-service'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; interface Args { named: { diff --git a/packages/host/app/resources/code-diff.ts b/packages/host/app/resources/code-diff.ts index 3fa8c863b4c..06eea42834c 100644 --- a/packages/host/app/resources/code-diff.ts +++ b/packages/host/app/resources/code-diff.ts @@ -7,10 +7,10 @@ import { Resource } from 'ember-modify-based-class-resource'; import type CardService from '@cardstack/host/services/card-service'; import type ToolService from '@cardstack/host/services/tool-service'; -import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event'; - import ApplySearchReplaceBlockTool from '../tools/apply-search-replace-block'; +import type { CodePatchStatus } from '@cardstack/base/matrix-event'; + interface CodeDiffResourceArgs { named: { fileUrl?: string | null; diff --git a/packages/host/app/resources/directory.ts b/packages/host/app/resources/directory.ts index ff485fd09e7..78b868bb229 100644 --- a/packages/host/app/resources/directory.ts +++ b/packages/host/app/resources/directory.ts @@ -12,11 +12,10 @@ import { type Relationship, } from '@cardstack/runtime-common'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import type LoaderService from '../services/loader-service'; import type MessageService from '../services/message-service'; import type NetworkService from '../services/network'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; const log = logger('resource:directory'); diff --git a/packages/host/app/resources/element-tracker.ts b/packages/host/app/resources/element-tracker.ts index 1b161efe26b..7698f081582 100644 --- a/packages/host/app/resources/element-tracker.ts +++ b/packages/host/app/resources/element-tracker.ts @@ -6,11 +6,7 @@ import type { SafeString } from '@ember/template'; import Modifier from 'ember-modifier'; import { TrackedArray } from 'tracked-built-ins'; -import type { - CardDef, - Format, - FieldType, -} from 'https://cardstack.com/base/card-api'; +import type { CardDef, Format, FieldType } from '@cardstack/base/card-api'; import type { ArgsFor } from 'ember-modifier'; diff --git a/packages/host/app/resources/file-tree-from-index.ts b/packages/host/app/resources/file-tree-from-index.ts index fb9d39c1b24..5d5d075854b 100644 --- a/packages/host/app/resources/file-tree-from-index.ts +++ b/packages/host/app/resources/file-tree-from-index.ts @@ -17,9 +17,8 @@ import { type SearchEntryWireQuery, } from '@cardstack/runtime-common'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import type StoreService from '../services/store'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; const waiter = buildWaiter('file-tree-from-index-resource:search-waiter'); diff --git a/packages/host/app/resources/file.ts b/packages/host/app/resources/file.ts index 4a36b9003f1..ce2925eaacf 100644 --- a/packages/host/app/resources/file.ts +++ b/packages/host/app/resources/file.ts @@ -24,11 +24,10 @@ import type RealmService from '@cardstack/host/services/realm'; import type RecentFilesService from '@cardstack/host/services/recent-files-service'; import type StoreService from '@cardstack/host/services/store'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import type LoaderService from '../services/loader-service'; import type MessageService from '../services/message-service'; import type NetworkService from '../services/network'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; const log = logger('resource:file'); const realmEventsLogger = logger('realm:events'); diff --git a/packages/host/app/resources/inheritance-chain.ts b/packages/host/app/resources/inheritance-chain.ts index e8d44a2083b..8bc6cde83fc 100644 --- a/packages/host/app/resources/inheritance-chain.ts +++ b/packages/host/app/resources/inheritance-chain.ts @@ -9,7 +9,7 @@ import { loadCardDef } from '@cardstack/runtime-common'; import type { Type } from '@cardstack/host/services/card-type-service'; import type LoaderService from '@cardstack/host/services/loader-service'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; interface Args { named: { diff --git a/packages/host/app/resources/room.ts b/packages/host/app/resources/room.ts index 22ddcae3fe8..9acad8e3db7 100644 --- a/packages/host/app/resources/room.ts +++ b/packages/host/app/resources/room.ts @@ -31,25 +31,6 @@ import { type LLMMode, } from '@cardstack/runtime-common/matrix-constants'; -import type { SerializedFile } from 'https://cardstack.com/base/file-api'; -import type { - MatrixEvent as DiscreteMatrixEvent, - RoomCreateEvent, - RoomNameEvent, - InviteEvent, - JoinEvent, - LeaveEvent, - CardMessageEvent, - DebugMessageEvent, - MessageEvent, - ToolResultEvent, - RealmServerEvent, - CodePatchResultEvent, - ActiveLLMEvent, -} from 'https://cardstack.com/base/matrix-event'; - -import type { Skill } from 'https://cardstack.com/base/skill'; - import { RoomMember, type RoomMemberInterface, @@ -73,6 +54,23 @@ import type OperatorModeStateService from '../services/operator-mode-state-servi import type RealmService from '../services/realm'; import type StoreService from '../services/store'; import type ToolService from '../services/tool-service'; +import type { SerializedFile } from '@cardstack/base/file-api'; +import type { + MatrixEvent as DiscreteMatrixEvent, + RoomCreateEvent, + RoomNameEvent, + InviteEvent, + JoinEvent, + LeaveEvent, + CardMessageEvent, + DebugMessageEvent, + MessageEvent, + ToolResultEvent, + RealmServerEvent, + CodePatchResultEvent, + ActiveLLMEvent, +} from '@cardstack/base/matrix-event'; +import type { Skill } from '@cardstack/base/skill'; import type { TaskInstance } from 'ember-concurrency'; import type { IRoomEvent } from 'matrix-js-sdk'; diff --git a/packages/host/app/resources/search-entries.ts b/packages/host/app/resources/search-entries.ts index b5eb1a981f9..4a6dcd35053 100644 --- a/packages/host/app/resources/search-entries.ts +++ b/packages/host/app/resources/search-entries.ts @@ -36,11 +36,6 @@ import { type SearchEntryWireQuery, } from '@cardstack/runtime-common'; -import type { - RealmEventContent, - PrerenderHtmlEventContent, -} from 'https://cardstack.com/base/matrix-event'; - import { knownFileMetaUrls } from '../lib/known-file-meta-urls'; import { normalizeRealms } from '../lib/realm-utils'; import { searchErrorEntry } from '../lib/search-error-entry'; @@ -49,6 +44,10 @@ import type LoaderService from '../services/loader-service'; import type NetworkService from '../services/network'; import type RealmServerService from '../services/realm-server'; import type StoreService from '../services/store'; +import type { + RealmEventContent, + PrerenderHtmlEventContent, +} from '@cardstack/base/matrix-event'; const waiter = buildWaiter('search-entries-resource:search-waiter'); diff --git a/packages/host/app/resources/search.ts b/packages/host/app/resources/search.ts index f3372b6127c..31f4383a713 100644 --- a/packages/host/app/resources/search.ts +++ b/packages/host/app/resources/search.ts @@ -42,15 +42,14 @@ import { } from '@cardstack/runtime-common'; import type { Filter, Query } from '@cardstack/runtime-common/query'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import { searchErrorEntry } from '../lib/search-error-entry'; import type NetworkService from '../services/network'; import type RealmServerService from '../services/realm-server'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; const waiter = buildWaiter('search-resource:search-waiter'); diff --git a/packages/host/app/routes/command-runner.ts b/packages/host/app/routes/command-runner.ts index c29960f9776..1db1a061901 100644 --- a/packages/host/app/routes/command-runner.ts +++ b/packages/host/app/routes/command-runner.ts @@ -19,16 +19,12 @@ import { rri, } from '@cardstack/runtime-common'; -import type { - CardDef, - CardDefConstructor, -} from 'https://cardstack.com/base/card-api'; - import { registerBoxelTransitionTo } from '../utils/register-boxel-transition'; import type CardService from '../services/card-service'; import type LoaderService from '../services/loader-service'; import type RealmService from '../services/realm'; +import type { CardDef, CardDefConstructor } from '@cardstack/base/card-api'; const commandRequestStorageKeyPrefix = 'boxel-command-request:'; const commandRequestTtlMs = 5 * 60 * 1000; diff --git a/packages/host/app/routes/module.ts b/packages/host/app/routes/module.ts index c1042be5123..7682de73dab 100644 --- a/packages/host/app/routes/module.ts +++ b/packages/host/app/routes/module.ts @@ -44,9 +44,6 @@ import { type SerializedError, } from '@cardstack/runtime-common/error'; -import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; - import { createAuthErrorGuard } from '../utils/auth-error-guard'; import { registerBoxelTransitionTo } from '../utils/register-boxel-transition'; import { ensureMessageIncludesUrl, stripSelfDeps } from '../utils/render-error'; @@ -59,6 +56,8 @@ import type LoaderService from '../services/loader-service'; import type NetworkService from '../services/network'; import type RealmService from '../services/realm'; import type RenderStoreService from '../services/render-store'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { CardDef, BaseDef } from '@cardstack/base/card-api'; export type Model = { id: string; diff --git a/packages/host/app/routes/render.ts b/packages/host/app/routes/render.ts index a9886529630..e430e9d128e 100644 --- a/packages/host/app/routes/render.ts +++ b/packages/host/app/routes/render.ts @@ -35,8 +35,6 @@ import { serializableError, } from '@cardstack/runtime-common/error'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { windowErrorHandler, errorJsonApiToErrorEntry, @@ -64,6 +62,7 @@ import type RealmService from '../services/realm'; import type RealmServerService from '../services/realm-server'; import type RenderErrorStateService from '../services/render-error-state'; import type RenderStoreService from '../services/render-store'; +import type { CardDef } from '@cardstack/base/card-api'; type RenderStatus = 'loading' | 'ready' | 'error' | 'unusable'; diff --git a/packages/host/app/routes/render/html.ts b/packages/host/app/routes/render/html.ts index 31434bad589..6ef3c41a322 100644 --- a/packages/host/app/routes/render/html.ts +++ b/packages/host/app/routes/render/html.ts @@ -15,15 +15,10 @@ import { import type NetworkService from '@cardstack/host/services/network'; import type RealmService from '@cardstack/host/services/realm'; -import type { - BoxComponent, - CardDef, - Format, -} from 'https://cardstack.com/base/card-api'; - import { getClass, getTypes } from './meta'; import type { Model as ParentModel } from '../render'; +import type { BoxComponent, CardDef, Format } from '@cardstack/base/card-api'; // Stable internal key for the base CardsGrid type. We compare against // the internalKeyFor representation of the cards-grid module + name so diff --git a/packages/host/app/routes/render/icon.ts b/packages/host/app/routes/render/icon.ts index c570d82e732..d2af8854bda 100644 --- a/packages/host/app/routes/render/icon.ts +++ b/packages/host/app/routes/render/icon.ts @@ -3,9 +3,8 @@ import type Transition from '@ember/routing/transition'; import { cardTypeIcon } from '@cardstack/runtime-common'; -import type { CardOrFieldTypeIcon } from 'https://cardstack.com/base/card-api'; - import type { Model as ParentModel } from '../render'; +import type { CardOrFieldTypeIcon } from '@cardstack/base/card-api'; export interface Model { Component: CardOrFieldTypeIcon; diff --git a/packages/host/app/routes/render/meta.ts b/packages/host/app/routes/render/meta.ts index af829ebd034..76a427af5fb 100644 --- a/packages/host/app/routes/render/meta.ts +++ b/packages/host/app/routes/render/meta.ts @@ -25,15 +25,14 @@ import type CardService from '@cardstack/host/services/card-service'; import type NetworkService from '@cardstack/host/services/network'; import type RenderStoreService from '@cardstack/host/services/render-store'; +import { friendlyCardType } from '../../utils/render-error'; + +import type { Model as ParentModel } from '../render'; import type { BaseDef, CardDef, ComputePassSnapshot, -} from 'https://cardstack.com/base/card-api'; - -import { friendlyCardType } from '../../utils/render-error'; - -import type { Model as ParentModel } from '../render'; +} from '@cardstack/base/card-api'; export type Model = PrerenderMeta | RenderError | undefined; diff --git a/packages/host/app/routes/render/types.ts b/packages/host/app/routes/render/types.ts index 2baf1667723..6e76da1e0f0 100644 --- a/packages/host/app/routes/render/types.ts +++ b/packages/host/app/routes/render/types.ts @@ -10,11 +10,10 @@ import { import type NetworkService from '@cardstack/host/services/network'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { getClass, getTypes } from './meta'; import type { Model as ParentModel } from '../render'; +import type { CardDef } from '@cardstack/base/card-api'; export type Model = PrerenderTypes | RenderError | undefined; diff --git a/packages/host/app/services/ai-assistant-panel-service.ts b/packages/host/app/services/ai-assistant-panel-service.ts index b35db7f0a3a..1bf461517e7 100644 --- a/packages/host/app/services/ai-assistant-panel-service.ts +++ b/packages/host/app/services/ai-assistant-panel-service.ts @@ -18,10 +18,6 @@ import { type LLMMode, } from '@cardstack/runtime-common/matrix-constants'; -import type { CardDef, Format } from 'https://cardstack.com/base/card-api'; -import type * as CommandModule from 'https://cardstack.com/base/command'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import { Submodes } from '../components/submode-switcher'; import { isMatrixError } from '../lib/matrix-utils'; import { importResource } from '../resources/import'; @@ -44,6 +40,9 @@ import type ResetService from './reset'; import type StoreService from './store'; import type ToolService from './tool-service'; import type { Message } from '../lib/matrix-classes/message'; +import type { CardDef, Format } from '@cardstack/base/card-api'; +import type * as CommandModule from '@cardstack/base/command'; +import type { FileDef } from '@cardstack/base/file-api'; export interface SessionRoomData { roomId: string; diff --git a/packages/host/app/services/card-service.ts b/packages/host/app/services/card-service.ts index fcd6cc5d8b5..9f95595c424 100644 --- a/packages/host/app/services/card-service.ts +++ b/packages/host/app/services/card-service.ts @@ -18,16 +18,6 @@ import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document' import { createAtomicDocument } from '@cardstack/runtime-common/atomic-document'; import { validateWriteSize } from '@cardstack/runtime-common/write-size-validation'; -import type { - BaseDef, - CardDef, - FieldDef, - Field, - SerializeOpts, -} from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as Searchable from 'https://cardstack.com/base/searchable'; - import LimitedSet from '../lib/limited-set'; import type EnvironmentService from './environment-service'; @@ -36,6 +26,15 @@ import type MessageService from './message-service'; import type NetworkService from './network'; import type Realm from './realm'; import type ResetService from './reset'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { + BaseDef, + CardDef, + FieldDef, + Field, + SerializeOpts, +} from '@cardstack/base/card-api'; +import type * as Searchable from '@cardstack/base/searchable'; export type CardSaveSubscriber = ( url: URL, diff --git a/packages/host/app/services/card-type-service.ts b/packages/host/app/services/card-type-service.ts index 0efdf3a36e2..532df41cf23 100644 --- a/packages/host/app/services/card-type-service.ts +++ b/packages/host/app/services/card-type-service.ts @@ -6,7 +6,6 @@ import type { RealmInfo } from '@cardstack/runtime-common'; import { identifyCard, internalKeyFor, - baseRealm, moduleFrom, getAncestor, SupportedMimeType, @@ -18,16 +17,11 @@ import type { Loader } from '@cardstack/runtime-common/loader'; import type CardService from '@cardstack/host/services/card-service'; -import type { - BaseDef, - Field, - FieldType, -} from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; - import type LoaderService from '../services/loader-service'; import type NetworkService from '../services/network'; import type ResetService from '../services/reset'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { BaseDef, Field, FieldType } from '@cardstack/base/card-api'; export type CodeRefType = CodeRef & { displayName: string; @@ -124,7 +118,7 @@ export default class CardTypeService extends Service { this.moduleInfoCache.get(moduleURL.href) ?? (await this.fetchModuleInfo(moduleURL)); - let api = await loader.import(`${baseRealm.url}card-api`); + let api = await loader.import('@cardstack/base/card-api'); let { id: _remove, ...fields } = api.getFields(card, { includeComputeds: true, }); diff --git a/packages/host/app/services/code-semantics-service.ts b/packages/host/app/services/code-semantics-service.ts index 876d5cc56d6..c25880118e0 100644 --- a/packages/host/app/services/code-semantics-service.ts +++ b/packages/host/app/services/code-semantics-service.ts @@ -17,8 +17,6 @@ import { import { isReady } from '@cardstack/host/resources/file'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; - import { moduleContentsResource, type State, @@ -32,6 +30,7 @@ import type LoaderService from './loader-service'; import type OperatorModeStateService from './operator-mode-state-service'; import type ResetService from './reset'; import type { Ready } from '../resources/file'; +import type { BaseDef } from '@cardstack/base/card-api'; export default class CodeSemanticsService extends Service { @service declare operatorModeStateService: OperatorModeStateService; diff --git a/packages/host/app/services/error-display.ts b/packages/host/app/services/error-display.ts index 3739d38a588..bba31dc6ed2 100644 --- a/packages/host/app/services/error-display.ts +++ b/packages/host/app/services/error-display.ts @@ -2,9 +2,8 @@ import type Owner from '@ember/owner'; import Service from '@ember/service'; import { service } from '@ember/service'; -import type { BoxelErrorForContext } from 'https://cardstack.com/base/matrix-event'; - import type ResetService from './reset'; +import type { BoxelErrorForContext } from '@cardstack/base/matrix-event'; export interface DisplayedErrorProvider { getError: () => BoxelErrorForContext; diff --git a/packages/host/app/services/file-upload.ts b/packages/host/app/services/file-upload.ts index 67547e74a6d..5674ca1e976 100644 --- a/packages/host/app/services/file-upload.ts +++ b/packages/host/app/services/file-upload.ts @@ -11,11 +11,10 @@ import { type LocalPath, } from '@cardstack/runtime-common'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import type NetworkService from './network'; import type ResetService from './reset'; import type StoreService from './store'; +import type { FileDef } from '@cardstack/base/file-api'; export class FileUploadTask { @tracked state: 'picking' | 'uploading' | 'complete' | 'error' = 'picking'; diff --git a/packages/host/app/services/local-persistence-service.ts b/packages/host/app/services/local-persistence-service.ts index d8481d24913..84666e620ac 100644 --- a/packages/host/app/services/local-persistence-service.ts +++ b/packages/host/app/services/local-persistence-service.ts @@ -3,14 +3,14 @@ import Service from '@ember/service'; import window from 'ember-window-mock'; import { v4 as uuidv4 } from 'uuid'; -import type { SerializedFileDef } from 'https://cardstack.com/base/file-api'; - import { AiAssistantMessageDrafts, AiAssistantPendingSends, CurrentRoomIdPersistenceKey, } from '../utils/local-storage-keys'; +import type { SerializedFileDef } from '@cardstack/base/file-api'; + const ONE_WEEK_MS = 7 * 24 * 60 * 60 * 1000; export type StoredFileDraft = Pick< diff --git a/packages/host/app/services/matrix-sdk-loader.ts b/packages/host/app/services/matrix-sdk-loader.ts index 044a4ebe230..7dd0166d1c6 100644 --- a/packages/host/app/services/matrix-sdk-loader.ts +++ b/packages/host/app/services/matrix-sdk-loader.ts @@ -11,12 +11,11 @@ import { RealmAuthClient } from '@cardstack/runtime-common/realm-auth-client'; import type { FileDefManager } from '@cardstack/host/lib/file-def-manager'; import FileDefManagerImpl from '@cardstack/host/lib/file-def-manager'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as FileAPI from 'https://cardstack.com/base/file-api'; - import type MatrixService from './matrix-service'; import type NetworkService from './network'; import type ResetService from './reset'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type * as FileAPI from '@cardstack/base/file-api'; import type * as MatrixSDK from 'matrix-js-sdk'; type JoinedRoomsResponse = { joined_rooms: string[] }; diff --git a/packages/host/app/services/matrix-service.ts b/packages/host/app/services/matrix-service.ts index 7e171b5b4cb..c29c4559a06 100644 --- a/packages/host/app/services/matrix-service.ts +++ b/packages/host/app/services/matrix-service.ts @@ -94,32 +94,6 @@ import { getRandomBackgroundURL, iconURLFor } from '@cardstack/host/lib/utils'; import { getMatrixProfile } from '@cardstack/host/resources/matrix-profile'; import { clearLocalStorage } from '@cardstack/host/utils/local-storage-keys'; -import type { BaseDef, CardDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type { - CardForAttachmentCard, - FileForAttachmentCard, -} from 'https://cardstack.com/base/command'; -import type * as FileAPI from 'https://cardstack.com/base/file-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { - ActiveLLMEvent, - BoxelContext, - BotTriggerContent, - CardMessageContent, - MatrixEvent as DiscreteMatrixEvent, - CodePatchResultContent, - CodePatchStatus, - ToolResultWithNoOutputContent, - ToolResultWithOutputContent, - RealmEventContent, - Tool, - ToolResultStatus, -} from 'https://cardstack.com/base/matrix-event'; - -import type * as SkillModule from 'https://cardstack.com/base/skill'; -import type { SystemCard } from 'https://cardstack.com/base/system-card'; - import { isSkillCard } from '../lib/file-def-manager'; import { getSkillSourceTools, loadSkillSource } from '../lib/skill-tools'; import { getUniqueValidToolDefinitions } from '../lib/tool-definitions'; @@ -153,6 +127,30 @@ import type ResetService from './reset'; import type StoreService from './store'; import type ToolService from './tool-service'; import type { RoomResource } from '../resources/room'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { BaseDef, CardDef } from '@cardstack/base/card-api'; +import type { + CardForAttachmentCard, + FileForAttachmentCard, +} from '@cardstack/base/command'; +import type { FileDef } from '@cardstack/base/file-api'; +import type * as FileAPI from '@cardstack/base/file-api'; +import type { + ActiveLLMEvent, + BoxelContext, + BotTriggerContent, + CardMessageContent, + MatrixEvent as DiscreteMatrixEvent, + CodePatchResultContent, + CodePatchStatus, + ToolResultWithNoOutputContent, + ToolResultWithOutputContent, + RealmEventContent, + Tool, + ToolResultStatus, +} from '@cardstack/base/matrix-event'; +import type * as SkillModule from '@cardstack/base/skill'; +import type { SystemCard } from '@cardstack/base/system-card'; import type { MatrixClient } from 'matrix-js-sdk'; import type { LoginResponse, diff --git a/packages/host/app/services/message-service.ts b/packages/host/app/services/message-service.ts index 8d594da4dd8..b5319c6de51 100644 --- a/packages/host/app/services/message-service.ts +++ b/packages/host/app/services/message-service.ts @@ -2,10 +2,9 @@ import Service, { service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import type NetworkService from './network'; import type ResetService from './reset'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; export default class MessageService extends Service { @tracked listenerCallbacks: Map void)[]> = diff --git a/packages/host/app/services/module-contents-service.ts b/packages/host/app/services/module-contents-service.ts index 159ec58242a..aa7b3edf14a 100644 --- a/packages/host/app/services/module-contents-service.ts +++ b/packages/host/app/services/module-contents-service.ts @@ -25,10 +25,10 @@ import type { Type } from '@cardstack/host/services/card-type-service'; import type LoaderService from '@cardstack/host/services/loader-service'; import type NetworkService from '@cardstack/host/services/network'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; - import { loadModule } from '../resources/import'; +import type { BaseDef } from '@cardstack/base/card-api'; + export interface CardOrField { cardType: Type; cardOrField: typeof BaseDef; diff --git a/packages/host/app/services/operator-mode-state-service.ts b/packages/host/app/services/operator-mode-state-service.ts index 548563d1699..814c84fa963 100644 --- a/packages/host/app/services/operator-mode-state-service.ts +++ b/packages/host/app/services/operator-mode-state-service.ts @@ -50,10 +50,6 @@ import type RealmServer from '@cardstack/host/services/realm-server'; import type RecentCardsService from '@cardstack/host/services/recent-cards-service'; import type RecentFilesService from '@cardstack/host/services/recent-files-service'; -import type { CardDef, Format } from 'https://cardstack.com/base/card-api'; - -import type { BoxelContext } from 'https://cardstack.com/base/matrix-event'; - import { removeFileExtension } from '../utils/card-search/types'; import { @@ -75,6 +71,8 @@ import type StoreService from './store'; import type { Stack } from '../components/operator-mode/interact-submode'; import type IndexController from '../controllers'; +import type { CardDef, Format } from '@cardstack/base/card-api'; +import type { BoxelContext } from '@cardstack/base/matrix-event'; export interface CreateListingModalPayload { codeRef: CodeRef; diff --git a/packages/host/app/services/playground-panel-service.ts b/packages/host/app/services/playground-panel-service.ts index 701c5f9b4bf..08621df8d54 100644 --- a/packages/host/app/services/playground-panel-service.ts +++ b/packages/host/app/services/playground-panel-service.ts @@ -17,19 +17,14 @@ import { import { PlaygroundSelections } from '@cardstack/host/utils/local-storage-keys'; -import type { - CardDef, - BaseDef, - Format, -} from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; - import type CardService from './card-service'; import type NetworkService from './network'; import type OperatorModeStateService from './operator-mode-state-service'; import type ResetService from './reset'; import type StoreService from './store'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { CardDef, BaseDef, Format } from '@cardstack/base/card-api'; export interface PlaygroundSelection { cardId: RealmResourceIdentifier; // for fields, this is their corresponding spec card's id, since fields do not have a card id diff --git a/packages/host/app/services/realm.ts b/packages/host/app/services/realm.ts index 648569912e8..16bbaea85f3 100644 --- a/packages/host/app/services/realm.ts +++ b/packages/host/app/services/realm.ts @@ -47,11 +47,6 @@ import ENV from '@cardstack/host/config/environment'; import { assertNever } from '@cardstack/host/utils/assert-never'; -import type { - IndexRealmEventContent, - RealmEventContent, -} from 'https://cardstack.com/base/matrix-event'; - import { syncTokenToServiceWorker, syncAllTokensToServiceWorker, @@ -64,6 +59,10 @@ import type MessageService from './message-service'; import type NetworkService from './network'; import type RealmServerService from './realm-server'; import type ResetService from './reset'; +import type { + IndexRealmEventContent, + RealmEventContent, +} from '@cardstack/base/matrix-event'; const log = logger('service:realm'); diff --git a/packages/host/app/services/recent-cards-service.ts b/packages/host/app/services/recent-cards-service.ts index 0d3444752b4..dabd773f50b 100644 --- a/packages/host/app/services/recent-cards-service.ts +++ b/packages/host/app/services/recent-cards-service.ts @@ -13,9 +13,6 @@ import { trimJsonExtension, } from '@cardstack/runtime-common'; -import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; - import { RecentCards } from '../utils/local-storage-keys'; import type CardService from './card-service'; @@ -23,6 +20,8 @@ import type NetworkService from './network'; import type RecentFilesService from './recent-files-service'; import type ResetService from './reset'; import type StoreService from './store'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { CardDef, BaseDef } from '@cardstack/base/card-api'; export interface RecentCard { cardId: string; diff --git a/packages/host/app/services/render-service.ts b/packages/host/app/services/render-service.ts index ee10cd8ccd8..ca0c1465e83 100644 --- a/packages/host/app/services/render-service.ts +++ b/packages/host/app/services/render-service.ts @@ -25,18 +25,17 @@ import { import config from '@cardstack/host/config/environment'; +import { render, teardown } from '../lib/isolated-render'; + +import type CardService from './card-service'; +import type LoaderService from './loader-service'; import type { CardDef, Format, CardStore, BoxComponent, -} from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - -import { render, teardown } from '../lib/isolated-render'; - -import type CardService from './card-service'; -import type LoaderService from './loader-service'; +} from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; import type { ComponentLike } from '@glint/template'; import type { SimpleDocument, diff --git a/packages/host/app/services/render-store.ts b/packages/host/app/services/render-store.ts index 15f9e1f8b25..e3a15cbdb3d 100644 --- a/packages/host/app/services/render-store.ts +++ b/packages/host/app/services/render-store.ts @@ -4,10 +4,10 @@ import type { LooseSingleResourceDocument, } from '@cardstack/runtime-common'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import StoreService from './store'; +import type { FileDef } from '@cardstack/base/file-api'; + export default class RenderStoreService extends StoreService { protected override isRenderStore = true; diff --git a/packages/host/app/services/spec-panel-service.ts b/packages/host/app/services/spec-panel-service.ts index cedfdcb1b41..8580116072b 100644 --- a/packages/host/app/services/spec-panel-service.ts +++ b/packages/host/app/services/spec-panel-service.ts @@ -11,13 +11,12 @@ import { isCardInstance, isLocalId, localId } from '@cardstack/runtime-common'; import { SpecSelection } from '@cardstack/host/utils/local-storage-keys'; -import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; - import type CardService from './card-service'; import type NetworkService from './network'; import type ResetService from './reset'; import type StoreService from './store'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { CardDef, BaseDef } from '@cardstack/base/card-api'; export default class SpecPanelService extends Service { @tracked specSelection = window.localStorage.getItem(SpecSelection); diff --git a/packages/host/app/services/store.ts b/packages/host/app/services/store.ts index b58ca869307..684565478be 100644 --- a/packages/host/app/services/store.ts +++ b/packages/host/app/services/store.ts @@ -87,12 +87,6 @@ import { type VirtualNetwork, } from '@cardstack/runtime-common'; -import type { CardDef, BaseDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import CardStore, { getDeps, type ReferenceCount } from '../lib/gc-card-store'; import { @@ -126,6 +120,10 @@ import type RealmServerService from './realm-server'; import type ResetService from './reset'; import type ToolService from './tool-service'; import type { SearchResource } from '../resources/search'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { CardDef, BaseDef } from '@cardstack/base/card-api'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; export { CardErrorJSONAPI, CardSaveSubscriber }; @@ -541,23 +539,23 @@ export default class StoreService extends Service implements StoreInterface { // error document ("what query fields were still pending"). trackQueryLoad( load: Promise, - meta: import('https://cardstack.com/base/card-api').QueryLoadMeta, + meta: import('@cardstack/base/card-api').QueryLoadMeta, ): (() => void) | void { return ( this.store as unknown as { trackQueryLoad?: ( l: Promise, - m: import('https://cardstack.com/base/card-api').QueryLoadMeta, + m: import('@cardstack/base/card-api').QueryLoadMeta, ) => (() => void) | void; } ).trackQueryLoad?.(load, meta); } - queryLoadsInFlight(): import('https://cardstack.com/base/card-api').QueryLoadInfo[] { + queryLoadsInFlight(): import('@cardstack/base/card-api').QueryLoadInfo[] { return ( ( this.store as unknown as { - queryLoadsInFlight?: () => import('https://cardstack.com/base/card-api').QueryLoadInfo[]; + queryLoadsInFlight?: () => import('@cardstack/base/card-api').QueryLoadInfo[]; } ).queryLoadsInFlight?.() ?? [] ); @@ -606,14 +604,14 @@ export default class StoreService extends Service implements StoreInterface { ); } recentQueryLoads(): Array<{ - meta: import('https://cardstack.com/base/card-api').QueryLoadMeta; + meta: import('@cardstack/base/card-api').QueryLoadMeta; ms: number; }> { return ( ( this.store as unknown as { recentQueryLoads?: () => Array<{ - meta: import('https://cardstack.com/base/card-api').QueryLoadMeta; + meta: import('@cardstack/base/card-api').QueryLoadMeta; ms: number; }>; } diff --git a/packages/host/app/services/tool-service.ts b/packages/host/app/services/tool-service.ts index d0cefa043f9..e6bc8ac664d 100644 --- a/packages/host/app/services/tool-service.ts +++ b/packages/host/app/services/tool-service.ts @@ -33,9 +33,6 @@ import type Realm from '@cardstack/host/services/realm'; import CheckCorrectnessTool from '@cardstack/host/tools/check-correctness'; import PatchCodeTool from '@cardstack/host/tools/patch-code'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { CodePatchStatus } from 'https://cardstack.com/base/matrix-event'; - import LimitedSet from '../lib/limited-set'; import { CHECK_CORRECTNESS_COMMAND_NAME, @@ -52,6 +49,8 @@ import type { CodeData } from '../lib/formatted-message/utils'; import type MessageCodePatchResult from '../lib/matrix-classes/message-code-patch-result'; import type MessageTool from '../lib/matrix-classes/message-tool'; import type { RoomResource } from '../resources/room'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { CodePatchStatus } from '@cardstack/base/matrix-event'; import type { IEvent } from 'matrix-js-sdk'; const DELAY_FOR_APPLYING_UI = isTesting() ? 50 : 500; diff --git a/packages/host/app/templates/host-freestyle.gts b/packages/host/app/templates/host-freestyle.gts index c8424ad63ce..437231c0904 100644 --- a/packages/host/app/templates/host-freestyle.gts +++ b/packages/host/app/templates/host-freestyle.gts @@ -36,12 +36,11 @@ import SearchSheetUsage from '@cardstack/host/components/search-sheet/usage'; import { getCardCollection } from '@cardstack/host/resources/card-collection'; import { getCard } from '@cardstack/host/resources/card-resource'; -import type { CardContext } from 'https://cardstack.com/base/card-api'; - import formatComponentName from '../helpers/format-component-name'; import type StoreService from '../services/store'; import type ToolService from '../services/tool-service'; +import type { CardContext } from '@cardstack/base/card-api'; import type { ComponentLike } from '@glint/template'; interface UsageComponent { diff --git a/packages/host/app/templates/index.gts b/packages/host/app/templates/index.gts index 59d0c60690a..4aa649f3eec 100644 --- a/packages/host/app/templates/index.gts +++ b/packages/host/app/templates/index.gts @@ -42,14 +42,13 @@ import type ToolService from '@cardstack/host/services/tool-service'; import { idFromCardOrURL } from '@cardstack/host/utils/id-from-card-or-url'; +import type HostModeService from '../services/host-mode-service'; +import type OperatorModeStateService from '../services/operator-mode-state-service'; import type { CardContext, CardDef, ViewCardFn, -} from 'https://cardstack.com/base/card-api'; - -import type HostModeService from '../services/host-mode-service'; -import type OperatorModeStateService from '../services/operator-mode-state-service'; +} from '@cardstack/base/card-api'; export interface IndexComponentComponentSignature { Args: { diff --git a/packages/host/app/templates/render/html.gts b/packages/host/app/templates/render/html.gts index b9c3ac669bc..1600838b804 100644 --- a/packages/host/app/templates/render/html.gts +++ b/packages/host/app/templates/render/html.gts @@ -19,9 +19,8 @@ import { getCardCollection } from '@cardstack/host/resources/card-collection'; import { getCard } from '@cardstack/host/resources/card-resource'; import type RenderStoreService from '@cardstack/host/services/render-store'; -import type { CardContext } from 'https://cardstack.com/base/card-api'; - import type { Model } from '../../routes/render/html'; +import type { CardContext } from '@cardstack/base/card-api'; interface Signature { Args: { diff --git a/packages/host/app/tools/add-field-to-card-definition.ts b/packages/host/app/tools/add-field-to-card-definition.ts index b51321e9ae6..56e64722413 100644 --- a/packages/host/app/tools/add-field-to-card-definition.ts +++ b/packages/host/app/tools/add-field-to-card-definition.ts @@ -3,15 +3,14 @@ import { service } from '@ember/service'; import { rri } from '@cardstack/runtime-common'; import { ModuleSyntax } from '@cardstack/runtime-common/module-syntax'; -import type { FieldType } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import WriteTextFileTool from './write-text-file'; import type CardService from '../services/card-service'; import type NetworkService from '../services/network'; +import type { FieldType } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class AddFieldToCardDefinitionTool extends HostBaseTool< typeof BaseToolModule.AddFieldToCardDefinitionInput diff --git a/packages/host/app/tools/ai-assistant.ts b/packages/host/app/tools/ai-assistant.ts index 2e855415c7a..9cd59623e14 100644 --- a/packages/host/app/tools/ai-assistant.ts +++ b/packages/host/app/tools/ai-assistant.ts @@ -2,11 +2,6 @@ import { service } from '@ember/service'; import { isCardInstance } from '@cardstack/runtime-common'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - -import type { Skill } from 'https://cardstack.com/base/skill'; - import HostBaseTool from '../lib/host-base-tool'; import CreateAiAssistantRoomTool from './create-ai-assistant-room'; @@ -19,6 +14,9 @@ import UpdateRoomSkillsTool from './update-room-skills'; import type MatrixService from '../services/matrix-service'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type StoreService from '../services/store'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { Skill } from '@cardstack/base/skill'; export default class UseAiAssistantTool extends HostBaseTool< typeof BaseToolModule.UseAiAssistantInput, diff --git a/packages/host/app/tools/apply-markdown-edit.ts b/packages/host/app/tools/apply-markdown-edit.ts index c1be202725f..25403e29c53 100644 --- a/packages/host/app/tools/apply-markdown-edit.ts +++ b/packages/host/app/tools/apply-markdown-edit.ts @@ -1,5 +1,3 @@ -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import { FieldPathParser } from '../lib/field-path-parser'; import HostBaseTool from '../lib/host-base-tool'; @@ -7,6 +5,8 @@ import GetCardTool from './get-card'; import PatchFieldsTool from './patch-fields'; import SendRequestViaProxyTool from './send-request-via-proxy'; +import type * as BaseToolModule from '@cardstack/base/command'; + const escapeForTag = (value: string) => value.replace(/&/g, '&').replace(//g, '>'); diff --git a/packages/host/app/tools/apply-search-replace-block.ts b/packages/host/app/tools/apply-search-replace-block.ts index 5708aa460d9..749f3bc7ecd 100644 --- a/packages/host/app/tools/apply-search-replace-block.ts +++ b/packages/host/app/tools/apply-search-replace-block.ts @@ -4,11 +4,11 @@ import { SEPARATOR_MARKER, } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import { stripTrailingSeparatorMarker } from '../lib/search-replace-block-parsing'; +import type * as BaseToolModule from '@cardstack/base/command'; + let standardErrorMessage = 'Unable to process the code patch due to invalid code coming from AI'; export const APPLY_SEARCH_REPLACE_BLOCK_ERROR_MESSAGES = { diff --git a/packages/host/app/tools/ask-ai.ts b/packages/host/app/tools/ask-ai.ts index 1e824101715..21e34088599 100644 --- a/packages/host/app/tools/ask-ai.ts +++ b/packages/host/app/tools/ask-ai.ts @@ -1,7 +1,5 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import CreateAiAssistantRoomTool from './create-ai-assistant-room'; @@ -10,6 +8,7 @@ import SendAiAssistantMessageTool from './send-ai-assistant-message'; import type MatrixService from '../services/matrix-service'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class AskAiTool extends HostBaseTool< typeof BaseToolModule.AskAiInput, diff --git a/packages/host/app/tools/authed-fetch.ts b/packages/host/app/tools/authed-fetch.ts index 3ebeb9af2c9..66e45e7f5a5 100644 --- a/packages/host/app/tools/authed-fetch.ts +++ b/packages/host/app/tools/authed-fetch.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type NetworkService from '../services/network'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class AuthedFetchTool extends HostBaseTool< typeof BaseToolModule.AuthedFetchInput, diff --git a/packages/host/app/tools/bot-requests/create-listing-pr-request.ts b/packages/host/app/tools/bot-requests/create-listing-pr-request.ts index 74681969b09..6863fd47838 100644 --- a/packages/host/app/tools/bot-requests/create-listing-pr-request.ts +++ b/packages/host/app/tools/bot-requests/create-listing-pr-request.ts @@ -4,8 +4,6 @@ import { isCardInstance } from '@cardstack/runtime-common'; import type { Listing } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../../lib/host-base-tool'; import UseAiAssistantTool from '../ai-assistant'; @@ -14,6 +12,7 @@ import SendBotTriggerEventTool from './send-bot-trigger-event'; import type MatrixService from '../../services/matrix-service'; import type StoreService from '../../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CreateListingPRRequestTool extends HostBaseTool< typeof BaseToolModule.CreateListingPRRequestInput diff --git a/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts b/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts index f8f91010376..09f4650e26f 100644 --- a/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts +++ b/packages/host/app/tools/bot-requests/send-bot-trigger-event.ts @@ -2,12 +2,11 @@ import { service } from '@ember/service'; import { isBotTriggerEvent } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { BotTriggerEvent } from 'https://cardstack.com/base/matrix-event'; - import HostBaseTool from '../../lib/host-base-tool'; import type MatrixService from '../../services/matrix-service'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { BotTriggerEvent } from '@cardstack/base/matrix-event'; export default class SendBotTriggerEventTool extends HostBaseTool< typeof BaseToolModule.SendBotTriggerEventInput diff --git a/packages/host/app/tools/can-read-realm.ts b/packages/host/app/tools/can-read-realm.ts index cc4a5ae669a..a92c7e2bb62 100644 --- a/packages/host/app/tools/can-read-realm.ts +++ b/packages/host/app/tools/can-read-realm.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CanReadRealmTool extends HostBaseTool< typeof BaseToolModule.CanReadRealmInput, diff --git a/packages/host/app/tools/cancel-indexing-job.ts b/packages/host/app/tools/cancel-indexing-job.ts index 60404ceddfd..435d417550f 100644 --- a/packages/host/app/tools/cancel-indexing-job.ts +++ b/packages/host/app/tools/cancel-indexing-job.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CancelIndexingJobTool extends HostBaseTool< typeof BaseToolModule.RealmIdentifierCard, diff --git a/packages/host/app/tools/check-correctness.ts b/packages/host/app/tools/check-correctness.ts index fb36a3b10ed..a89ffa752df 100644 --- a/packages/host/app/tools/check-correctness.ts +++ b/packages/host/app/tools/check-correctness.ts @@ -9,8 +9,6 @@ import { import ENV from '@cardstack/host/config/environment'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; @@ -18,6 +16,7 @@ import type RealmService from '../services/realm'; import type RealmServerService from '../services/realm-server'; import type StoreService from '../services/store'; import type ToolService from '../services/tool-service'; +import type * as BaseToolModule from '@cardstack/base/command'; const cardIndexingTimeout = ENV.cardRenderTimeout; diff --git a/packages/host/app/tools/check-domain-availability.ts b/packages/host/app/tools/check-domain-availability.ts index df899c80e2e..ced6cedbbef 100644 --- a/packages/host/app/tools/check-domain-availability.ts +++ b/packages/host/app/tools/check-domain-availability.ts @@ -4,11 +4,10 @@ import { resolvePublishedRealmUrl } from '@cardstack/runtime-common'; import config from '@cardstack/host/config/environment'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmServerService from '../services/realm-server'; +import type * as BaseToolModule from '@cardstack/base/command'; // Checks whether a custom published-realm subdomain is available to claim, and // reports the published-realm URL it would map to. Only custom Boxel Site diff --git a/packages/host/app/tools/copy-and-edit.ts b/packages/host/app/tools/copy-and-edit.ts index c018da40562..ccf369ff296 100644 --- a/packages/host/app/tools/copy-and-edit.ts +++ b/packages/host/app/tools/copy-and-edit.ts @@ -2,9 +2,6 @@ import { service } from '@ember/service'; import { isCardInstance } from '@cardstack/runtime-common'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import CopyCardToRealmTool from './copy-card'; @@ -12,6 +9,8 @@ import CopyCardToRealmTool from './copy-card'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CopyAndEditTool extends HostBaseTool< typeof BaseToolModule.CopyAndEditInput, diff --git a/packages/host/app/tools/copy-card-as-markdown.ts b/packages/host/app/tools/copy-card-as-markdown.ts index 8a03f8ce2bd..38290cb433f 100644 --- a/packages/host/app/tools/copy-card-as-markdown.ts +++ b/packages/host/app/tools/copy-card-as-markdown.ts @@ -4,11 +4,10 @@ import { isTesting } from '@embroider/macros'; import { SupportedMimeType } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type NetworkService from '../services/network'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CopyCardAsMarkdownTool extends HostBaseTool< typeof BaseToolModule.CardIdCard, diff --git a/packages/host/app/tools/copy-card-to-stack.ts b/packages/host/app/tools/copy-card-to-stack.ts index bfbc903d37e..db26850a671 100644 --- a/packages/host/app/tools/copy-card-to-stack.ts +++ b/packages/host/app/tools/copy-card-to-stack.ts @@ -2,8 +2,6 @@ import { service } from '@ember/service'; import { isCardInstance, realmURL } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import CopyCardToRealmTool from './copy-card'; @@ -12,6 +10,7 @@ import type CardService from '../services/card-service'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CopyCardToStackTool extends HostBaseTool< typeof BaseToolModule.CopyCardToStackInput, diff --git a/packages/host/app/tools/copy-card.ts b/packages/host/app/tools/copy-card.ts index ef52f21db56..153904e6576 100644 --- a/packages/host/app/tools/copy-card.ts +++ b/packages/host/app/tools/copy-card.ts @@ -1,12 +1,11 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CopyCardToRealmTool extends HostBaseTool< typeof BaseToolModule.CopyCardToRealmInput, diff --git a/packages/host/app/tools/copy-file-to-realm.ts b/packages/host/app/tools/copy-file-to-realm.ts index 879cf232c1d..62576718e91 100644 --- a/packages/host/app/tools/copy-file-to-realm.ts +++ b/packages/host/app/tools/copy-file-to-realm.ts @@ -2,13 +2,12 @@ import { service } from '@ember/service'; import { rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import { findNonConflictingFilename } from '../utils/file-name'; import type CardService from '../services/card-service'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CopyFileToRealmTool extends HostBaseTool< typeof BaseToolModule.CopyFileToRealmInput, diff --git a/packages/host/app/tools/copy-source.ts b/packages/host/app/tools/copy-source.ts index ee5a9e593e5..fb9752f7846 100644 --- a/packages/host/app/tools/copy-source.ts +++ b/packages/host/app/tools/copy-source.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CopySourceTool extends HostBaseTool< typeof BaseToolModule.CopySourceInput, diff --git a/packages/host/app/tools/create-ai-assistant-room.ts b/packages/host/app/tools/create-ai-assistant-room.ts index ed22987b09c..209fb927d4b 100644 --- a/packages/host/app/tools/create-ai-assistant-room.ts +++ b/packages/host/app/tools/create-ai-assistant-room.ts @@ -9,12 +9,6 @@ import { DEFAULT_FALLBACK_MODEL_ID, } from '@cardstack/runtime-common/matrix-constants'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type * as SkillModule from 'https://cardstack.com/base/skill'; - import { isSkillCard } from '../lib/file-def-manager'; import HostBaseTool from '../lib/host-base-tool'; @@ -26,6 +20,10 @@ import { import type MatrixService from '../services/matrix-service'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { FileDef } from '@cardstack/base/file-api'; +import type * as SkillModule from '@cardstack/base/skill'; export default class CreateAiAssistantRoomTool extends HostBaseTool< typeof BaseToolModule.CreateAIAssistantRoomInput, diff --git a/packages/host/app/tools/create-and-open-submission-workflow-card.ts b/packages/host/app/tools/create-and-open-submission-workflow-card.ts index 5594490d1b6..fa6b1a1e16b 100644 --- a/packages/host/app/tools/create-and-open-submission-workflow-card.ts +++ b/packages/host/app/tools/create-and-open-submission-workflow-card.ts @@ -1,9 +1,9 @@ -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import CreateSubmissionWorkflowTool from './create-submission-workflow'; +import type * as BaseToolModule from '@cardstack/base/command'; + export default class CreateAndOpenSubmissionWorkflowCardTool extends HostBaseTool< typeof BaseToolModule.CreateListingPRRequestInput > { diff --git a/packages/host/app/tools/create-specs.ts b/packages/host/app/tools/create-specs.ts index edd0a180b94..beb403ec7b7 100644 --- a/packages/host/app/tools/create-specs.ts +++ b/packages/host/app/tools/create-specs.ts @@ -18,11 +18,6 @@ import { isResolvedCodeRef, } from '@cardstack/runtime-common/code-ref'; -import type { BaseDef, CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { Spec } from 'https://cardstack.com/base/spec'; -import type { SpecType } from 'https://cardstack.com/base/spec'; - import HostBaseTool from '../lib/host-base-tool'; import { type CardOrFieldDeclaration, @@ -38,6 +33,10 @@ import type ModuleContentsService from '../services/module-contents-service'; import type NetworkService from '../services/network'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type { BaseDef, CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { SpecType } from '@cardstack/base/spec'; +import type { Spec } from '@cardstack/base/spec'; class SpecTypeGuesser { constructor(private declaration: ModuleDeclaration) {} diff --git a/packages/host/app/tools/create-submission-workflow.ts b/packages/host/app/tools/create-submission-workflow.ts index b8f82c0f4c3..4057f88653a 100644 --- a/packages/host/app/tools/create-submission-workflow.ts +++ b/packages/host/app/tools/create-submission-workflow.ts @@ -5,8 +5,6 @@ import type { LooseSingleCardDocument } from '@cardstack/runtime-common'; import type { Listing } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import UseAiAssistantTool from './ai-assistant'; @@ -17,6 +15,7 @@ import type MatrixService from '../services/matrix-service'; import type RealmService from '../services/realm'; import type RealmServerService from '../services/realm-server'; import type StoreService from '../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class CreateSubmissionWorkflowTool extends HostBaseTool< typeof BaseToolModule.CreateListingPRRequestInput diff --git a/packages/host/app/tools/evaluate-module.ts b/packages/host/app/tools/evaluate-module.ts index 1ec17ba40c0..abfe2339d90 100644 --- a/packages/host/app/tools/evaluate-module.ts +++ b/packages/host/app/tools/evaluate-module.ts @@ -10,10 +10,10 @@ * Used by the software-factory's EvalValidationStep via `_run-command`. */ -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; +import type * as BaseToolModule from '@cardstack/base/command'; + export default class EvaluateModuleTool extends HostBaseTool< typeof BaseToolModule.EvaluateModuleInput, typeof BaseToolModule.EvaluateModuleResult diff --git a/packages/host/app/tools/execute-atomic-operations.ts b/packages/host/app/tools/execute-atomic-operations.ts index f723dafc45a..5cd760ae4cc 100644 --- a/packages/host/app/tools/execute-atomic-operations.ts +++ b/packages/host/app/tools/execute-atomic-operations.ts @@ -2,11 +2,10 @@ import { service } from '@ember/service'; import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class ExecuteAtomicOperationsTool extends HostBaseTool< typeof BaseToolModule.ExecuteAtomicOperationsInput, diff --git a/packages/host/app/tools/fetch-card-json.ts b/packages/host/app/tools/fetch-card-json.ts index 0bc75ff2156..a9f833c9143 100644 --- a/packages/host/app/tools/fetch-card-json.ts +++ b/packages/host/app/tools/fetch-card-json.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class FetchCardJsonTool extends HostBaseTool< typeof BaseToolModule.FetchCardJsonInput, diff --git a/packages/host/app/tools/full-reindex-realm.ts b/packages/host/app/tools/full-reindex-realm.ts index c05fcbe14aa..6327187642a 100644 --- a/packages/host/app/tools/full-reindex-realm.ts +++ b/packages/host/app/tools/full-reindex-realm.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class FullReindexRealmTool extends HostBaseTool< typeof BaseToolModule.RealmIdentifierCard, diff --git a/packages/host/app/tools/generate-example-cards.ts b/packages/host/app/tools/generate-example-cards.ts index 0749692d10c..99ef18c64b6 100644 --- a/packages/host/app/tools/generate-example-cards.ts +++ b/packages/host/app/tools/generate-example-cards.ts @@ -10,9 +10,6 @@ import { type ResolvedCodeRef, } from '@cardstack/runtime-common/code-ref'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import { buildAttachedFileURLs, buildExamplePrompt, @@ -32,6 +29,8 @@ import type MatrixService from '../services/matrix-service'; import type NetworkService from '../services/network'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GenerateExampleCardsTool extends HostBaseTool< typeof BaseToolModule.CreateInstancesInput, diff --git a/packages/host/app/tools/generate-readme-spec.ts b/packages/host/app/tools/generate-readme-spec.ts index f03d0a39c5e..c11c76feb7f 100644 --- a/packages/host/app/tools/generate-readme-spec.ts +++ b/packages/host/app/tools/generate-readme-spec.ts @@ -2,10 +2,6 @@ import { service } from '@ember/service'; import type { RealmResourceIdentifier } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { SpecType } from 'https://cardstack.com/base/spec'; - import HostBaseTool from '../lib/host-base-tool'; import { devSkillId } from '../lib/utils'; @@ -13,6 +9,9 @@ import OneShotLlmRequestTool from './one-shot-llm-request'; import PatchCardInstanceTool from './patch-card-instance'; import type ToolService from '../services/tool-service'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { SpecType } from '@cardstack/base/spec'; export default class GenerateReadmeSpecTool extends HostBaseTool< typeof BaseToolModule.GenerateReadmeSpecInput, diff --git a/packages/host/app/tools/generate-theme-example.ts b/packages/host/app/tools/generate-theme-example.ts index eba4d7eaf5a..3787d51012d 100644 --- a/packages/host/app/tools/generate-theme-example.ts +++ b/packages/host/app/tools/generate-theme-example.ts @@ -1,8 +1,5 @@ import { service } from '@ember/service'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import { buildAttachedFileURLs, buildExamplePrompt, @@ -17,6 +14,8 @@ import OneShotLlmRequestTool from './one-shot-llm-request'; import type NetworkService from '../services/network'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GenerateThemeExampleTool extends HostBaseTool< typeof BaseToolModule.GenerateThemeExampleInput, diff --git a/packages/host/app/tools/generate-thumbnail.ts b/packages/host/app/tools/generate-thumbnail.ts index 15dc0f4cb7d..fda53401519 100644 --- a/packages/host/app/tools/generate-thumbnail.ts +++ b/packages/host/app/tools/generate-thumbnail.ts @@ -2,16 +2,16 @@ import { v4 as uuidv4 } from 'uuid'; import { DEFAULT_IMAGE_GENERATION_LLM } from '@cardstack/runtime-common/matrix-constants'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import PatchCardInstanceTool from './patch-card-instance'; import SendRequestViaProxyTool from './send-request-via-proxy'; import WriteBinaryFileTool from './write-binary-file'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; + function arrayBufferToBase64(buffer: ArrayBuffer): string { const maybeBuffer = (globalThis as any).Buffer; diff --git a/packages/host/app/tools/get-all-realm-metas.ts b/packages/host/app/tools/get-all-realm-metas.ts index 1b508c25da7..d56f81c6820 100644 --- a/packages/host/app/tools/get-all-realm-metas.ts +++ b/packages/host/app/tools/get-all-realm-metas.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type Realm from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GetAllRealmMetasTool extends HostBaseTool< undefined, diff --git a/packages/host/app/tools/get-available-realm-identifiers.ts b/packages/host/app/tools/get-available-realm-identifiers.ts index 98b44a9e198..57fb8e525b8 100644 --- a/packages/host/app/tools/get-available-realm-identifiers.ts +++ b/packages/host/app/tools/get-available-realm-identifiers.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmServerService from '../services/realm-server'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GetAvailableRealmIdentifiersTool extends HostBaseTool< undefined, diff --git a/packages/host/app/tools/get-card-type-schema.ts b/packages/host/app/tools/get-card-type-schema.ts index a81ae1617a0..bf286dc7c5d 100644 --- a/packages/host/app/tools/get-card-type-schema.ts +++ b/packages/host/app/tools/get-card-type-schema.ts @@ -8,11 +8,11 @@ import { generateJsonSchemaForCardType, } from '@cardstack/runtime-common/helpers/ai'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; + export default class GetCardTypeSchemaTool extends HostBaseTool< typeof BaseToolModule.CardTypeSchemaInput, typeof BaseToolModule.JsonCard diff --git a/packages/host/app/tools/get-card.ts b/packages/host/app/tools/get-card.ts index 09dc6f0c440..5791bbe42fb 100644 --- a/packages/host/app/tools/get-card.ts +++ b/packages/host/app/tools/get-card.ts @@ -1,11 +1,10 @@ import { service } from '@ember/service'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GetCardTool extends HostBaseTool< typeof BaseToolModule.CardIdCard, diff --git a/packages/host/app/tools/get-catalog-realm-identifiers.ts b/packages/host/app/tools/get-catalog-realm-identifiers.ts index 7d02f7b9dcc..7778cd1069c 100644 --- a/packages/host/app/tools/get-catalog-realm-identifiers.ts +++ b/packages/host/app/tools/get-catalog-realm-identifiers.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmServerService from '../services/realm-server'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GetCatalogRealmIdentifiersTool extends HostBaseTool< undefined, diff --git a/packages/host/app/tools/get-default-writable-realm.ts b/packages/host/app/tools/get-default-writable-realm.ts index bf21f015c0d..fbcfc801a20 100644 --- a/packages/host/app/tools/get-default-writable-realm.ts +++ b/packages/host/app/tools/get-default-writable-realm.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GetDefaultWritableRealmTool extends HostBaseTool< undefined, diff --git a/packages/host/app/tools/get-events-from-room.ts b/packages/host/app/tools/get-events-from-room.ts index 58bda22676f..9e7898de06a 100644 --- a/packages/host/app/tools/get-events-from-room.ts +++ b/packages/host/app/tools/get-events-from-room.ts @@ -1,14 +1,12 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - -import type { MatrixEvent } from 'https://cardstack.com/base/matrix-event'; - import HostBaseTool from '../lib/host-base-tool'; import type { RoomResource } from '../resources/room'; import type MatrixService from '../services/matrix-service'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { MatrixEvent } from '@cardstack/base/matrix-event'; export default class GetEventsFromRoomTool extends HostBaseTool< typeof BaseToolModule.GetEventsFromRoomInput, diff --git a/packages/host/app/tools/get-published-realms.ts b/packages/host/app/tools/get-published-realms.ts index c768a343944..9dff51077d2 100644 --- a/packages/host/app/tools/get-published-realms.ts +++ b/packages/host/app/tools/get-published-realms.ts @@ -2,11 +2,10 @@ import { service } from '@ember/service'; import { ensureTrailingSlash } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; // Lists a source realm's published destinations and when each was last // published. The data comes from the source realm's `_info` response, whose diff --git a/packages/host/app/tools/get-realm-of-resource-identifier.ts b/packages/host/app/tools/get-realm-of-resource-identifier.ts index 4c8359fa4d9..a78db18fdad 100644 --- a/packages/host/app/tools/get-realm-of-resource-identifier.ts +++ b/packages/host/app/tools/get-realm-of-resource-identifier.ts @@ -2,11 +2,10 @@ import { service } from '@ember/service'; import { rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class GetRealmOfResourceIdentifierTool extends HostBaseTool< typeof BaseToolModule.GetRealmOfResourceIdentifierInput, diff --git a/packages/host/app/tools/get-user-system-card.ts b/packages/host/app/tools/get-user-system-card.ts index ccfda6e979e..49e6a9c50ce 100644 --- a/packages/host/app/tools/get-user-system-card.ts +++ b/packages/host/app/tools/get-user-system-card.ts @@ -2,11 +2,10 @@ import { service } from '@ember/service'; import ENV from '@cardstack/host/config/environment'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type MatrixService from '../services/matrix-service'; +import type * as BaseToolModule from '@cardstack/base/command'; const { defaultSystemCardId } = ENV; diff --git a/packages/host/app/tools/instantiate-card.ts b/packages/host/app/tools/instantiate-card.ts index 91d595fb5df..26ca12c17a5 100644 --- a/packages/host/app/tools/instantiate-card.ts +++ b/packages/host/app/tools/instantiate-card.ts @@ -16,11 +16,10 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type StoreService from '../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class InstantiateCardTool extends HostBaseTool< typeof BaseToolModule.InstantiateCardInput, diff --git a/packages/host/app/tools/invalidate-realm-identifiers.ts b/packages/host/app/tools/invalidate-realm-identifiers.ts index 066b68d1349..938c60d045b 100644 --- a/packages/host/app/tools/invalidate-realm-identifiers.ts +++ b/packages/host/app/tools/invalidate-realm-identifiers.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class InvalidateRealmIdentifiersTool extends HostBaseTool< typeof BaseToolModule.InvalidateRealmIdentifiersInput, diff --git a/packages/host/app/tools/invite-user-to-room.ts b/packages/host/app/tools/invite-user-to-room.ts index f0f57ea9c5b..379e24e0844 100644 --- a/packages/host/app/tools/invite-user-to-room.ts +++ b/packages/host/app/tools/invite-user-to-room.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type MatrixService from '../services/matrix-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class InviteUserToRoomTool extends HostBaseTool< typeof BaseToolModule.InviteUserToRoomInput diff --git a/packages/host/app/tools/lint-and-fix.ts b/packages/host/app/tools/lint-and-fix.ts index 035a4243f78..4db3844fdb1 100644 --- a/packages/host/app/tools/lint-and-fix.ts +++ b/packages/host/app/tools/lint-and-fix.ts @@ -2,8 +2,6 @@ import { service } from '@ember/service'; import { SupportedMimeType } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import { formatLintIssues, @@ -11,6 +9,7 @@ import { } from '../utils/lint-formatting'; import type NetworkService from '../services/network'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class LintAndFixTool extends HostBaseTool< typeof BaseToolModule.LintAndFixInput, diff --git a/packages/host/app/tools/listing-action-build.ts b/packages/host/app/tools/listing-action-build.ts index d9ec3603d03..31567f2284a 100644 --- a/packages/host/app/tools/listing-action-build.ts +++ b/packages/host/app/tools/listing-action-build.ts @@ -1,8 +1,6 @@ import type { Listing } from '@cardstack/runtime-common'; import { DEFAULT_CODING_LLM } from '@cardstack/runtime-common/matrix-constants'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import { devSkillId, skillCardURL } from '../lib/utils'; @@ -13,6 +11,8 @@ import SetActiveLLMTool from './set-active-llm'; import SwitchSubmodeTool from './switch-submode'; import UpdateRoomSkillsTool from './update-room-skills'; +import type * as BaseToolModule from '@cardstack/base/command'; + export default class ListingActionBuildTool extends HostBaseTool< typeof BaseToolModule.ListingBuildInput > { diff --git a/packages/host/app/tools/migrate-skill.ts b/packages/host/app/tools/migrate-skill.ts index 73a72dad1c8..41b51ceaf58 100644 --- a/packages/host/app/tools/migrate-skill.ts +++ b/packages/host/app/tools/migrate-skill.ts @@ -4,14 +4,13 @@ import { stringify as stringifyYaml } from 'yaml'; import { rri, skillCardRef } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { Skill } from 'https://cardstack.com/base/skill'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { Skill } from '@cardstack/base/skill'; // A single command in the migrated frontmatter — the same shape // `SkillFrontmatterField.tools` (a `containsMany(ToolField)`) parses back diff --git a/packages/host/app/tools/one-shot-llm-request.ts b/packages/host/app/tools/one-shot-llm-request.ts index 3befeab6061..b8604e2a17d 100644 --- a/packages/host/app/tools/one-shot-llm-request.ts +++ b/packages/host/app/tools/one-shot-llm-request.ts @@ -4,9 +4,6 @@ import { isCardInstance, logger } from '@cardstack/runtime-common'; // Conventional module-scoped logger (pattern used elsewhere like store & realm events) const oneShotLogger = logger('llm:oneshot'); -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { Skill } from 'https://cardstack.com/base/skill'; - import HostBaseTool from '../lib/host-base-tool'; import { prettifyMessages } from '../utils/prettify-messages'; @@ -20,6 +17,8 @@ import type MatrixService from '../services/matrix-service'; import type RealmServerService from '../services/realm-server'; import type StoreService from '../services/store'; import type ToolService from '../services/tool-service'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { Skill } from '@cardstack/base/skill'; export default class OneShotLlmRequestTool extends HostBaseTool< typeof BaseToolModule.OneShotLLMRequestInput, diff --git a/packages/host/app/tools/open-ai-assistant-room.ts b/packages/host/app/tools/open-ai-assistant-room.ts index b921c5f6178..5ed3754041b 100644 --- a/packages/host/app/tools/open-ai-assistant-room.ts +++ b/packages/host/app/tools/open-ai-assistant-room.ts @@ -1,12 +1,11 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type AiAssistantPanelService from '../services/ai-assistant-panel-service'; import type MatrixService from '../services/matrix-service'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class OpenAiAssistantRoomTool extends HostBaseTool< typeof BaseToolModule.OpenAiAssistantRoomInput diff --git a/packages/host/app/tools/open-create-listing-modal.ts b/packages/host/app/tools/open-create-listing-modal.ts index b5e568fd2ed..d171d5c894e 100644 --- a/packages/host/app/tools/open-create-listing-modal.ts +++ b/packages/host/app/tools/open-create-listing-modal.ts @@ -6,11 +6,10 @@ import { } from '@cardstack/runtime-common'; import { loadCardDef } from '@cardstack/runtime-common/code-ref'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class OpenCreateListingModalTool extends HostBaseTool< typeof BaseToolModule.ListingCreateInput diff --git a/packages/host/app/tools/open-in-interact-mode.ts b/packages/host/app/tools/open-in-interact-mode.ts index 4204d4b4961..8dfdc1749f7 100644 --- a/packages/host/app/tools/open-in-interact-mode.ts +++ b/packages/host/app/tools/open-in-interact-mode.ts @@ -2,11 +2,10 @@ import { service } from '@ember/service'; import type { Format } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class OpenInInteractModeTool extends HostBaseTool< typeof BaseToolModule.ShowCardInput diff --git a/packages/host/app/tools/open-workspace.ts b/packages/host/app/tools/open-workspace.ts index 06dbbd94d5b..2095ef7ee0e 100644 --- a/packages/host/app/tools/open-workspace.ts +++ b/packages/host/app/tools/open-workspace.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class OpenWorkspaceTool extends HostBaseTool< typeof BaseToolModule.RealmIdentifierCard diff --git a/packages/host/app/tools/patch-card-instance.ts b/packages/host/app/tools/patch-card-instance.ts index 1fc0832cb21..5dca3715d5b 100644 --- a/packages/host/app/tools/patch-card-instance.ts +++ b/packages/host/app/tools/patch-card-instance.ts @@ -9,14 +9,13 @@ import { generateJsonSchemaForCardType, } from '@cardstack/runtime-common/helpers/ai'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type StoreService from '../services/store'; import type ToolService from '../services/tool-service'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; interface Configuration { cardType: typeof CardDef; diff --git a/packages/host/app/tools/patch-code.ts b/packages/host/app/tools/patch-code.ts index f78a9db4e3d..b4717ed5838 100644 --- a/packages/host/app/tools/patch-code.ts +++ b/packages/host/app/tools/patch-code.ts @@ -2,8 +2,6 @@ import { service } from '@ember/service'; import { hasExecutableExtension, rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import { parseSearchReplace } from '../lib/search-replace-block-parsing'; import { isReady } from '../resources/file'; @@ -18,6 +16,7 @@ import type MonacoService from '../services/monaco-service'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type RealmService from '../services/realm'; import type ToolService from '../services/tool-service'; +import type * as BaseToolModule from '@cardstack/base/command'; interface FileInfo { exists: boolean; diff --git a/packages/host/app/tools/patch-fields.ts b/packages/host/app/tools/patch-fields.ts index 47fa7a4d7ff..545da361470 100644 --- a/packages/host/app/tools/patch-fields.ts +++ b/packages/host/app/tools/patch-fields.ts @@ -7,9 +7,6 @@ import { } from '@cardstack/runtime-common/helpers/ai'; import { Loader } from '@cardstack/runtime-common/loader'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import { FieldPathParser } from '../lib/field-path-parser'; import HostBaseTool from '../lib/host-base-tool'; @@ -17,6 +14,8 @@ import type { ValidateFieldPathResult } from '../lib/field-path-parser'; import type CardService from '../services/card-service'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; interface Configuration { cardType: typeof CardDef; @@ -76,7 +75,7 @@ export default class PatchFieldsTool extends HostBaseTool< ): Promise { // Load card-api dynamically to get getFields function const cardApi = await this.loaderService.loader.import< - typeof import('https://cardstack.com/base/card-api') + typeof import('@cardstack/base/card-api') >('https://cardstack.com/base/card-api'); return FieldPathParser.validatedFieldPath( @@ -218,7 +217,7 @@ export default class PatchFieldsTool extends HostBaseTool< if (configuredCardType) { const cardApi = await loaderForSchema.import< - typeof import('https://cardstack.com/base/card-api') + typeof import('@cardstack/base/card-api') >('https://cardstack.com/base/card-api'); const cardFields = cardApi.getFields(configuredCardType, { usedLinksToFieldsOnly: false, diff --git a/packages/host/app/tools/patch-theme.ts b/packages/host/app/tools/patch-theme.ts index b9606bde9de..e2a645b9003 100644 --- a/packages/host/app/tools/patch-theme.ts +++ b/packages/host/app/tools/patch-theme.ts @@ -1,10 +1,10 @@ -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { Skill } from 'https://cardstack.com/base/skill'; - import HostBaseTool from '../lib/host-base-tool'; import UseAiAssistantTool from './ai-assistant'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { Skill } from '@cardstack/base/skill'; + export default class PatchThemeTool extends HostBaseTool< typeof BaseToolModule.PatchThemeInput, typeof BaseToolModule.SendAiAssistantMessageResult diff --git a/packages/host/app/tools/persist-module-inspector-view.ts b/packages/host/app/tools/persist-module-inspector-view.ts index 09e9db10354..c34641d61a9 100644 --- a/packages/host/app/tools/persist-module-inspector-view.ts +++ b/packages/host/app/tools/persist-module-inspector-view.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class PersistModuleInspectorViewTool extends HostBaseTool< typeof BaseToolModule.PersistModuleInspectorViewInput, diff --git a/packages/host/app/tools/populate-with-sample-data.ts b/packages/host/app/tools/populate-with-sample-data.ts index 4a090cb7ccf..576bf15f18f 100644 --- a/packages/host/app/tools/populate-with-sample-data.ts +++ b/packages/host/app/tools/populate-with-sample-data.ts @@ -8,9 +8,6 @@ import { import { isBaseInstance, realmURL } from '@cardstack/runtime-common/constants'; -import type { CardDef, FieldDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import SendAiAssistantMessageTool from './send-ai-assistant-message'; @@ -19,6 +16,8 @@ import type AiAssistantPanelService from '../services/ai-assistant-panel-service import type MatrixService from '../services/matrix-service'; import type StoreService from '../services/store'; import type ToolService from '../services/tool-service'; +import type { CardDef, FieldDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class PopulateWithSampleDataTool extends HostBaseTool< typeof BaseToolModule.CardIdCard, diff --git a/packages/host/app/tools/preview-format.ts b/packages/host/app/tools/preview-format.ts index 629098204cb..9c51d6df489 100644 --- a/packages/host/app/tools/preview-format.ts +++ b/packages/host/app/tools/preview-format.ts @@ -1,13 +1,12 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import ShowCardTool from './show-card'; import SwitchSubmodeTool from './switch-submode'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class PreviewFormatTool extends HostBaseTool< typeof BaseToolModule.PreviewFormatInput diff --git a/packages/host/app/tools/publish-realm.ts b/packages/host/app/tools/publish-realm.ts index 6315f07a8b7..1aedfdcb98a 100644 --- a/packages/host/app/tools/publish-realm.ts +++ b/packages/host/app/tools/publish-realm.ts @@ -9,12 +9,11 @@ import { getMatrixUsername } from '@cardstack/runtime-common/matrix-client'; import config from '@cardstack/host/config/environment'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; import type { PublishabilityViolation } from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; // Publishes a realm to one or more destinations (subdirectory Boxel Spaces or // custom domains) and reports per-target status. `_publish-realm` returns 202 diff --git a/packages/host/app/tools/read-binary-file.ts b/packages/host/app/tools/read-binary-file.ts index 0e461758f0d..ff3111102cc 100644 --- a/packages/host/app/tools/read-binary-file.ts +++ b/packages/host/app/tools/read-binary-file.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type NetworkService from '../services/network'; +import type * as BaseToolModule from '@cardstack/base/command'; function uint8ArrayToBase64(bytes: Uint8Array): string { const maybeBuffer = (globalThis as any).Buffer as diff --git a/packages/host/app/tools/read-card-for-ai-assistant.ts b/packages/host/app/tools/read-card-for-ai-assistant.ts index 0430f12a31a..739857cb546 100644 --- a/packages/host/app/tools/read-card-for-ai-assistant.ts +++ b/packages/host/app/tools/read-card-for-ai-assistant.ts @@ -2,14 +2,13 @@ import { service } from '@ember/service'; import { isCardInstance } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import HostBaseTool from '../lib/host-base-tool'; import type MatrixService from '../services/matrix-service'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { FileDef } from '@cardstack/base/file-api'; export default class ReadCardForAssistantTool extends HostBaseTool< typeof BaseToolModule.CardIdCard, diff --git a/packages/host/app/tools/read-file-for-ai-assistant.ts b/packages/host/app/tools/read-file-for-ai-assistant.ts index 1f6b75e46a2..896cd58fb7b 100644 --- a/packages/host/app/tools/read-file-for-ai-assistant.ts +++ b/packages/host/app/tools/read-file-for-ai-assistant.ts @@ -1,11 +1,10 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import HostBaseTool from '../lib/host-base-tool'; import type MatrixService from '../services/matrix-service'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { FileDef } from '@cardstack/base/file-api'; export default class ReadFileForAssistantTool extends HostBaseTool< typeof BaseToolModule.FileIdentifierCard, diff --git a/packages/host/app/tools/read-source.ts b/packages/host/app/tools/read-source.ts index 31774c2997b..42501d4811d 100644 --- a/packages/host/app/tools/read-source.ts +++ b/packages/host/app/tools/read-source.ts @@ -2,11 +2,10 @@ import { service } from '@ember/service'; import { SupportedMimeType } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type NetworkService from '../services/network'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class ReadSourceTool extends HostBaseTool< typeof BaseToolModule.ReadSourceInput, diff --git a/packages/host/app/tools/read-text-file.ts b/packages/host/app/tools/read-text-file.ts index 2f70ffbf2e2..bfdc115e8a1 100644 --- a/packages/host/app/tools/read-text-file.ts +++ b/packages/host/app/tools/read-text-file.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type NetworkService from '../services/network'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class ReadTextFileTool extends HostBaseTool< typeof BaseToolModule.ReadTextFileInput, diff --git a/packages/host/app/tools/register-bot.ts b/packages/host/app/tools/register-bot.ts index eabc25c40dd..2f1eb468307 100644 --- a/packages/host/app/tools/register-bot.ts +++ b/packages/host/app/tools/register-bot.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmServerService from '../services/realm-server'; +import type * as BaseToolModule from '@cardstack/base/command'; type RegisterBotResult = { botRegistrationId: string; diff --git a/packages/host/app/tools/reindex-realm.ts b/packages/host/app/tools/reindex-realm.ts index a383761017e..580a03348e6 100644 --- a/packages/host/app/tools/reindex-realm.ts +++ b/packages/host/app/tools/reindex-realm.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class ReindexRealmTool extends HostBaseTool< typeof BaseToolModule.RealmIdentifierCard, diff --git a/packages/host/app/tools/retry-submission-workflow.ts b/packages/host/app/tools/retry-submission-workflow.ts index e2e1b46a8d1..6443a514982 100644 --- a/packages/host/app/tools/retry-submission-workflow.ts +++ b/packages/host/app/tools/retry-submission-workflow.ts @@ -2,14 +2,13 @@ import { service } from '@ember/service'; import { isCardInstance, rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import SendBotTriggerEventTool from './bot-requests/send-bot-trigger-event'; import type RealmService from '../services/realm'; import type StoreService from '../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; // Local view of the boxel-catalog SubmissionWorkflowCard — that repo isn't cloned in boxel CI. (CS-11166) interface WorkflowCardView { diff --git a/packages/host/app/tools/sanitize-module-list.ts b/packages/host/app/tools/sanitize-module-list.ts index 826c592e428..4a9ed873f9a 100644 --- a/packages/host/app/tools/sanitize-module-list.ts +++ b/packages/host/app/tools/sanitize-module-list.ts @@ -4,13 +4,13 @@ import { trimExecutableExtension, } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import CanReadRealmTool from './can-read-realm'; import GetRealmOfResourceIdentifierTool from './get-realm-of-resource-identifier'; +import type * as BaseToolModule from '@cardstack/base/command'; + const GLOBAL_URL_STEMS = [ 'https://cardstack.com', 'https://packages', diff --git a/packages/host/app/tools/save-card.ts b/packages/host/app/tools/save-card.ts index 0b3a9bbba73..d913983b89d 100644 --- a/packages/host/app/tools/save-card.ts +++ b/packages/host/app/tools/save-card.ts @@ -2,12 +2,11 @@ import { service } from '@ember/service'; import { isCardInstance } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class SaveCardTool extends HostBaseTool< typeof BaseToolModule.SaveCardInput, diff --git a/packages/host/app/tools/screenshot-card.ts b/packages/host/app/tools/screenshot-card.ts index a8c0d345a79..a2cfdb93b8f 100644 --- a/packages/host/app/tools/screenshot-card.ts +++ b/packages/host/app/tools/screenshot-card.ts @@ -4,14 +4,13 @@ import { v4 as uuidv4 } from 'uuid'; import { rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import WriteBinaryFileTool from './write-binary-file'; import type RealmService from '../services/realm'; import type RealmServerService from '../services/realm-server'; +import type * as BaseToolModule from '@cardstack/base/command'; function generateFilenameFromCard(cardId: string): string { const uniqueId = uuidv4().split('-')[0]; diff --git a/packages/host/app/tools/search-and-choose.ts b/packages/host/app/tools/search-and-choose.ts index 2ad012f06e0..eae4d7262f5 100644 --- a/packages/host/app/tools/search-and-choose.ts +++ b/packages/host/app/tools/search-and-choose.ts @@ -2,13 +2,13 @@ import { logger } from '@cardstack/runtime-common'; import type { ResolvedCodeRef } from '@cardstack/runtime-common'; import { isResolvedCodeRef } from '@cardstack/runtime-common/code-ref'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import OneShotLlmRequestTool from './one-shot-llm-request'; import { SearchCardsByTypeAndTitleTool } from './search-cards'; +import type * as BaseToolModule from '@cardstack/base/command'; + // Command-level logger (general lifecycle + decisions) const log = logger('commands:search-and-choose'); diff --git a/packages/host/app/tools/search-cards.ts b/packages/host/app/tools/search-cards.ts index 1e7c2ac4946..add8b352c08 100644 --- a/packages/host/app/tools/search-cards.ts +++ b/packages/host/app/tools/search-cards.ts @@ -3,13 +3,12 @@ import { service } from '@ember/service'; import type { Filter } from '@cardstack/runtime-common'; import { assertQuery } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmServerService from '../services/realm-server'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export class SearchCardsByTypeAndTitleTool extends HostBaseTool< typeof BaseToolModule.SearchCardsByTypeAndTitleInput, diff --git a/packages/host/app/tools/search-google-images.ts b/packages/host/app/tools/search-google-images.ts index 60f88912d02..5c84862ddf6 100644 --- a/packages/host/app/tools/search-google-images.ts +++ b/packages/host/app/tools/search-google-images.ts @@ -1,9 +1,9 @@ -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import SendRequestViaProxyTool from './send-request-via-proxy'; +import type * as BaseToolModule from '@cardstack/base/command'; + export default class SearchGoogleImagesTool extends HostBaseTool< typeof BaseToolModule.SearchGoogleImagesInput, typeof BaseToolModule.SearchGoogleImagesResult diff --git a/packages/host/app/tools/send-ai-assistant-message.ts b/packages/host/app/tools/send-ai-assistant-message.ts index 8d00d92adef..34a9bbec754 100644 --- a/packages/host/app/tools/send-ai-assistant-message.ts +++ b/packages/host/app/tools/send-ai-assistant-message.ts @@ -4,14 +4,6 @@ import { v4 as uuidv4 } from 'uuid'; import { APP_BOXEL_MESSAGE_MSGTYPE } from '@cardstack/runtime-common/matrix-constants'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { - CardMessageContent, - Tool, -} from 'https://cardstack.com/base/matrix-event'; - import HostBaseTool from '../lib/host-base-tool'; import { addPatchTools } from '../tools/utils'; @@ -20,6 +12,10 @@ import type MatrixService from '../services/matrix-service'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type RealmService from '../services/realm'; import type ToolService from '../services/tool-service'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { CardMessageContent, Tool } from '@cardstack/base/matrix-event'; export default class SendAiAssistantMessageTool extends HostBaseTool< typeof BaseToolModule.SendAiAssistantMessageInput, diff --git a/packages/host/app/tools/send-request-via-proxy.ts b/packages/host/app/tools/send-request-via-proxy.ts index c9e1b2d9ffe..cc9cac09c57 100644 --- a/packages/host/app/tools/send-request-via-proxy.ts +++ b/packages/host/app/tools/send-request-via-proxy.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmServerService from '../services/realm-server'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class SendRequestViaProxyTool extends HostBaseTool< typeof BaseToolModule.SendRequestViaProxyInput, diff --git a/packages/host/app/tools/serialize-card.ts b/packages/host/app/tools/serialize-card.ts index ee07c79b21c..edaf86eb470 100644 --- a/packages/host/app/tools/serialize-card.ts +++ b/packages/host/app/tools/serialize-card.ts @@ -1,12 +1,11 @@ import { service } from '@ember/service'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class SerializeCardTool extends HostBaseTool< typeof BaseToolModule.CardIdCard, diff --git a/packages/host/app/tools/set-active-llm.ts b/packages/host/app/tools/set-active-llm.ts index 6e06de61330..dfdb0f6483e 100644 --- a/packages/host/app/tools/set-active-llm.ts +++ b/packages/host/app/tools/set-active-llm.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type MatrixService from '../services/matrix-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class SetActiveLLMTool extends HostBaseTool< typeof BaseToolModule.SetActiveLLMInput, diff --git a/packages/host/app/tools/set-user-system-card.ts b/packages/host/app/tools/set-user-system-card.ts index 7b88a8345a0..0ac711f120b 100644 --- a/packages/host/app/tools/set-user-system-card.ts +++ b/packages/host/app/tools/set-user-system-card.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type MatrixService from '../services/matrix-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class SetUserSystemCardTool extends HostBaseTool< typeof BaseToolModule.CardIdCard, diff --git a/packages/host/app/tools/show-card.ts b/packages/host/app/tools/show-card.ts index af021709a82..d49bfd0dd12 100644 --- a/packages/host/app/tools/show-card.ts +++ b/packages/host/app/tools/show-card.ts @@ -8,15 +8,14 @@ import { rri, } from '@cardstack/runtime-common'; -import type { CardDef, Format } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type NetworkService from '../services/network'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type PlaygroundPanelService from '../services/playground-panel-service'; import type StoreService from '../services/store'; +import type { CardDef, Format } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class ShowCardTool extends HostBaseTool< typeof BaseToolModule.ShowCardInput, diff --git a/packages/host/app/tools/show-file.ts b/packages/host/app/tools/show-file.ts index 4e3238d29e0..0d774b51220 100644 --- a/packages/host/app/tools/show-file.ts +++ b/packages/host/app/tools/show-file.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type OperatorModeStateService from '../services/operator-mode-state-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class ShowFileTool extends HostBaseTool< typeof BaseToolModule.FileIdentifierCard diff --git a/packages/host/app/tools/store-add.ts b/packages/host/app/tools/store-add.ts index df64c5988ea..fb72b1ae12d 100644 --- a/packages/host/app/tools/store-add.ts +++ b/packages/host/app/tools/store-add.ts @@ -2,12 +2,11 @@ import { service } from '@ember/service'; import type { LooseSingleCardDocument } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class StoreAddTool extends HostBaseTool< typeof BaseToolModule.StoreAddInput, diff --git a/packages/host/app/tools/summarize-session.ts b/packages/host/app/tools/summarize-session.ts index 63a42811a46..160007bc454 100644 --- a/packages/host/app/tools/summarize-session.ts +++ b/packages/host/app/tools/summarize-session.ts @@ -1,7 +1,5 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import SendRequestViaProxyTool from './send-request-via-proxy'; @@ -9,6 +7,7 @@ import SendRequestViaProxyTool from './send-request-via-proxy'; import type MatrixService from '../services/matrix-service'; import type RealmServerService from '../services/realm-server'; import type ToolService from '../services/tool-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class SummarizeSessionTool extends HostBaseTool< typeof BaseToolModule.SummarizeSessionInput, diff --git a/packages/host/app/tools/switch-submode.ts b/packages/host/app/tools/switch-submode.ts index b28442b9e14..c76dde3d631 100644 --- a/packages/host/app/tools/switch-submode.ts +++ b/packages/host/app/tools/switch-submode.ts @@ -2,8 +2,6 @@ import { service } from '@ember/service'; import { rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import { Submodes } from '../components/submode-switcher'; import HostBaseTool from '../lib/host-base-tool'; @@ -12,6 +10,7 @@ import WriteTextFileTool from './write-text-file'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type StoreService from '../services/store'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class SwitchSubmodeTool extends HostBaseTool< typeof BaseToolModule.SwitchSubmodeInput, diff --git a/packages/host/app/tools/sync-openrouter-models.ts b/packages/host/app/tools/sync-openrouter-models.ts index 414b8d05d84..3e5b2db1a47 100644 --- a/packages/host/app/tools/sync-openrouter-models.ts +++ b/packages/host/app/tools/sync-openrouter-models.ts @@ -8,12 +8,11 @@ import { } from '@cardstack/runtime-common'; import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type CardService from '../services/card-service'; import type NetworkService from '../services/network'; +import type * as BaseToolModule from '@cardstack/base/command'; const OPENROUTER_MODELS_URL = 'https://openrouter.ai/api/v1/models'; const BATCH_SIZE = 20; diff --git a/packages/host/app/tools/transform-cards.ts b/packages/host/app/tools/transform-cards.ts index 9fe546afe2a..c9f68681b35 100644 --- a/packages/host/app/tools/transform-cards.ts +++ b/packages/host/app/tools/transform-cards.ts @@ -1,13 +1,13 @@ import { getClass } from '@cardstack/runtime-common'; -import type { VisitCardsInput } from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import ReadSourceTool from './read-source'; import { SearchCardsByQueryTool } from './search-cards'; import WriteTextFileTool from './write-text-file'; +import type { VisitCardsInput } from '@cardstack/base/command'; + export default class TransformCardsTool extends HostBaseTool< typeof VisitCardsInput > { diff --git a/packages/host/app/tools/unpublish-realm.ts b/packages/host/app/tools/unpublish-realm.ts index f9cecfde3bb..f86038b592f 100644 --- a/packages/host/app/tools/unpublish-realm.ts +++ b/packages/host/app/tools/unpublish-realm.ts @@ -9,11 +9,10 @@ import { getMatrixUsername } from '@cardstack/runtime-common/matrix-client'; import config from '@cardstack/host/config/environment'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; // Unpublishes a realm from a single published destination. Resolves once the // realm-server accepts the request; there is no reindex on unpublish (the diff --git a/packages/host/app/tools/unregister-bot.ts b/packages/host/app/tools/unregister-bot.ts index 15f1073a0ba..458e3102f22 100644 --- a/packages/host/app/tools/unregister-bot.ts +++ b/packages/host/app/tools/unregister-bot.ts @@ -1,10 +1,9 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type RealmServerService from '../services/realm-server'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class UnregisterBotTool extends HostBaseTool< typeof BaseToolModule.UnregisterBotInput, diff --git a/packages/host/app/tools/update-code-path-with-selection.ts b/packages/host/app/tools/update-code-path-with-selection.ts index 70bb7190824..cc663378a9d 100644 --- a/packages/host/app/tools/update-code-path-with-selection.ts +++ b/packages/host/app/tools/update-code-path-with-selection.ts @@ -1,11 +1,10 @@ import { service } from '@ember/service'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type OperatorModeStateService from '../services/operator-mode-state-service'; import type RecentFilesService from '../services/recent-files-service'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class UpdateCodePathWithSelectionTool extends HostBaseTool< typeof BaseToolModule.UpdateCodePathWithSelectionInput diff --git a/packages/host/app/tools/update-playground-selection.ts b/packages/host/app/tools/update-playground-selection.ts index 8fc4a50c065..4ab2ac8e4ac 100644 --- a/packages/host/app/tools/update-playground-selection.ts +++ b/packages/host/app/tools/update-playground-selection.ts @@ -2,12 +2,11 @@ import { service } from '@ember/service'; import { rri } from '@cardstack/runtime-common'; -import type { Format } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import type PlaygroundPanelService from '../services/playground-panel-service'; +import type { Format } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class UpdatePlaygroundSelectionTool extends HostBaseTool< typeof BaseToolModule.UpdatePlaygroundSelectionInput diff --git a/packages/host/app/tools/update-room-skills.ts b/packages/host/app/tools/update-room-skills.ts index 5eba15ac13b..76f225a2fd9 100644 --- a/packages/host/app/tools/update-room-skills.ts +++ b/packages/host/app/tools/update-room-skills.ts @@ -5,15 +5,6 @@ import { getToolDefinitions, } from '@cardstack/runtime-common/matrix-constants'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; -import type { - FileDef, - SerializedFile, -} from 'https://cardstack.com/base/file-api'; - -import type * as SkillModule from 'https://cardstack.com/base/skill'; - import { isSkillCard } from '../lib/file-def-manager'; import HostBaseTool from '../lib/host-base-tool'; @@ -25,6 +16,10 @@ import { import type MatrixService from '../services/matrix-service'; import type StoreService from '../services/store'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as BaseToolModule from '@cardstack/base/command'; +import type { FileDef, SerializedFile } from '@cardstack/base/file-api'; +import type * as SkillModule from '@cardstack/base/skill'; export default class UpdateRoomSkillsTool extends HostBaseTool< typeof BaseToolModule.UpdateRoomSkillsInput diff --git a/packages/host/app/tools/utils.ts b/packages/host/app/tools/utils.ts index 90a63f64429..328d9e0030d 100644 --- a/packages/host/app/tools/utils.ts +++ b/packages/host/app/tools/utils.ts @@ -15,8 +15,12 @@ import { getPatchTool, } from '@cardstack/runtime-common/helpers/ai'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; +import GetEventsFromRoomTool from './get-events-from-room'; + +import type LoaderService from '../services/loader-service'; +import type MessageService from '../services/message-service'; +import type { CardDef } from '@cardstack/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; import type { CardMessageEvent, ToolResultEvent, @@ -24,12 +28,7 @@ import type { MatrixEvent, RealmEventContent, Tool, -} from 'https://cardstack.com/base/matrix-event'; - -import GetEventsFromRoomTool from './get-events-from-room'; - -import type LoaderService from '../services/loader-service'; -import type MessageService from '../services/message-service'; +} from '@cardstack/base/matrix-event'; export async function waitForMatrixEvent( commandContext: CommandContext, diff --git a/packages/host/app/tools/validate-realm.ts b/packages/host/app/tools/validate-realm.ts index 006512efb35..72d77dca298 100644 --- a/packages/host/app/tools/validate-realm.ts +++ b/packages/host/app/tools/validate-realm.ts @@ -1,11 +1,11 @@ import { RealmPaths } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import GetAvailableRealmIdentifiersTool from './get-available-realm-identifiers'; +import type * as BaseToolModule from '@cardstack/base/command'; + export default class ValidateRealmTool extends HostBaseTool< typeof BaseToolModule.ValidateRealmInput, typeof BaseToolModule.ValidateRealmResult diff --git a/packages/host/app/tools/write-binary-file.ts b/packages/host/app/tools/write-binary-file.ts index c04ffbfd7d8..92c079f258e 100644 --- a/packages/host/app/tools/write-binary-file.ts +++ b/packages/host/app/tools/write-binary-file.ts @@ -4,14 +4,13 @@ import { v4 as uuidv4 } from 'uuid'; import { rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import { findNonConflictingFilename } from '../utils/file-name'; import type CardService from '../services/card-service'; import type NetworkService from '../services/network'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; function base64ToUint8Array(base64: string): Uint8Array { const maybeBuffer = (globalThis as any).Buffer as diff --git a/packages/host/app/tools/write-text-file.ts b/packages/host/app/tools/write-text-file.ts index aaf04e534f8..182cae23abe 100644 --- a/packages/host/app/tools/write-text-file.ts +++ b/packages/host/app/tools/write-text-file.ts @@ -2,14 +2,13 @@ import { service } from '@ember/service'; import { rri } from '@cardstack/runtime-common'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import HostBaseTool from '../lib/host-base-tool'; import { findNonConflictingFilename } from '../utils/file-name'; import type CardService from '../services/card-service'; import type { SaveType } from '../services/card-service'; import type RealmService from '../services/realm'; +import type * as BaseToolModule from '@cardstack/base/command'; export default class WriteTextFileTool extends HostBaseTool< typeof BaseToolModule.WriteTextFileInput, diff --git a/packages/host/app/utils/card-search/sections.ts b/packages/host/app/utils/card-search/sections.ts index 0ef1ffa7092..1419aa51cf8 100644 --- a/packages/host/app/utils/card-search/sections.ts +++ b/packages/host/app/utils/card-search/sections.ts @@ -5,7 +5,7 @@ import type { import { urlForRealmLookup } from '@cardstack/host/lib/utils'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; // ── Section types ── diff --git a/packages/host/app/utils/card-search/type-filter.ts b/packages/host/app/utils/card-search/type-filter.ts index 4704ddad151..ce59e197a80 100644 --- a/packages/host/app/utils/card-search/type-filter.ts +++ b/packages/host/app/utils/card-search/type-filter.ts @@ -15,7 +15,7 @@ import { isResolvedCodeRef, } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; /** * Internal key strings for root types (CardDef, FieldDef, BaseDef). diff --git a/packages/host/app/utils/clipboard.ts b/packages/host/app/utils/clipboard.ts index 760863510e3..57c6425d60f 100644 --- a/packages/host/app/utils/clipboard.ts +++ b/packages/host/app/utils/clipboard.ts @@ -1,6 +1,6 @@ import config from '@cardstack/host/config/environment'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; export async function copyCardURLToClipboard( card: CardDef | URL | string, diff --git a/packages/host/app/utils/file-def-attributes-extractor.ts b/packages/host/app/utils/file-def-attributes-extractor.ts index 32d98baafff..80caf68eed6 100644 --- a/packages/host/app/utils/file-def-attributes-extractor.ts +++ b/packages/host/app/utils/file-def-attributes-extractor.ts @@ -18,13 +18,12 @@ import { } from '@cardstack/runtime-common'; import { getFieldDefinitions } from '@cardstack/runtime-common/definitions'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; - import type { createAuthErrorGuard } from './auth-error-guard'; import type LoaderService from '../services/loader-service'; import type NetworkService from '../services/network'; +import type { BaseDef } from '@cardstack/base/card-api'; +import type * as CardAPI from '@cardstack/base/card-api'; export type FileDefExport = { extractAttributes: ( diff --git a/packages/host/app/utils/id-from-card-or-url.ts b/packages/host/app/utils/id-from-card-or-url.ts index 880d067912a..87aa4e96d69 100644 --- a/packages/host/app/utils/id-from-card-or-url.ts +++ b/packages/host/app/utils/id-from-card-or-url.ts @@ -1,6 +1,6 @@ import { rri, type RealmResourceIdentifier } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; export function idFromCardOrURL( cardOrURL: CardDef | URL | string, diff --git a/packages/host/app/utils/render-error.ts b/packages/host/app/utils/render-error.ts index 2180a448ea9..224903b6237 100644 --- a/packages/host/app/utils/render-error.ts +++ b/packages/host/app/utils/render-error.ts @@ -13,7 +13,7 @@ import { serializableError, } from '@cardstack/runtime-common/error'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; +import type { CardDef } from '@cardstack/base/card-api'; export interface RenderErrorContext { cardId?: string; diff --git a/packages/host/app/utils/schema-editor.ts b/packages/host/app/utils/schema-editor.ts index 799746c7894..cecad439fb6 100644 --- a/packages/host/app/utils/schema-editor.ts +++ b/packages/host/app/utils/schema-editor.ts @@ -6,7 +6,7 @@ import { } from '@cardstack/host/resources/module-contents'; import type { Type } from '@cardstack/host/services/card-type-service'; -import type { BaseDef } from 'https://cardstack.com/base/card-api'; +import type { BaseDef } from '@cardstack/base/card-api'; export function calculateTotalOwnFields( card: typeof BaseDef, diff --git a/packages/host/tests/acceptance/ai-assistant-test.gts b/packages/host/tests/acceptance/ai-assistant-test.gts index db21f19710d..a6e6b766167 100644 --- a/packages/host/tests/acceptance/ai-assistant-test.gts +++ b/packages/host/tests/acceptance/ai-assistant-test.gts @@ -36,8 +36,6 @@ import type AiAssistantPanelService from '@cardstack/host/services/ai-assistant- import type MonacoService from '@cardstack/host/services/monaco-service'; import { AiAssistantMessageDrafts } from '@cardstack/host/utils/local-storage-keys'; -import type { BoxelContext } from 'https://cardstack.com/base/matrix-event'; - import { setupLocalIndexing, addSkillToAiAssistant, @@ -77,6 +75,8 @@ import { setupMockMatrix } from '../helpers/mock-matrix'; import { getRoomIdForRealmAndUser } from '../helpers/mock-matrix/_utils'; import { setupApplicationTest } from '../helpers/setup'; +import type { BoxelContext } from '@cardstack/base/matrix-event'; + async function selectCardFromCatalog(cardId: string) { await click('[data-test-attach-button]'); await click('[data-test-attach-card-btn]'); @@ -98,8 +98,8 @@ async function waitForSessionPreparationToFinish( }); } -let countryDefinition = `import { field, contains, CardDef } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; +let countryDefinition = `import { field, contains, CardDef } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export class Country extends CardDef { static displayName = 'Country'; @field name = contains(StringField); @@ -414,8 +414,8 @@ module('Acceptance | AI Assistant tests', function (hooks) { 'person.gts': { Person }, 'pet.gts': { Pet }, 'broken-card.gts': ` - import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + import { CardDef, field, contains } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; import { BrokenField } from './does-not-exist'; export class BrokenCard extends CardDef { static displayName = 'Broken Card'; @@ -465,7 +465,7 @@ module('Acceptance | AI Assistant tests', function (hooks) { friends: [mangoPet], }), 'plant.gts': ` - import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api'; + import { CardDef, field, contains, StringField } from '@cardstack/base/card-api'; export class Plant extends CardDef { static displayName = "Plant"; @field commonName = contains(StringField); diff --git a/packages/host/tests/acceptance/basic-test.gts b/packages/host/tests/acceptance/basic-test.gts index 8cdcbaba223..7398f12e028 100644 --- a/packages/host/tests/acceptance/basic-test.gts +++ b/packages/host/tests/acceptance/basic-test.gts @@ -38,14 +38,14 @@ module('Acceptance | basic tests', function (hooks) { let loaderService = getService('loader-service'); let loader = loaderService.loader; let { field, contains, CardDef, Component } = await loader.import< - typeof import('https://cardstack.com/base/card-api') + typeof import('@cardstack/base/card-api') >(`${baseRealm.url}card-api`); let { default: StringField } = await loader.import< - typeof import('https://cardstack.com/base/string') + typeof import('@cardstack/base/string') >(`${baseRealm.url}string`); - let { Spec } = await loader.import< - typeof import('https://cardstack.com/base/spec') - >(`${baseRealm.url}spec`); + let { Spec } = await loader.import( + `${baseRealm.url}spec`, + ); class Index extends CardDef { static isolated = class Isolated extends Component { diff --git a/packages/host/tests/acceptance/code-patches-test.gts b/packages/host/tests/acceptance/code-patches-test.gts index dec8d170d98..96d4c8f85e1 100644 --- a/packages/host/tests/acceptance/code-patches-test.gts +++ b/packages/host/tests/acceptance/code-patches-test.gts @@ -54,8 +54,8 @@ import type { TestContextWithSave } from '../helpers'; let mockedFileContent = 'Hello, world!'; const testCardContent = ` -import { CardDef, Component, field, contains } from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; +import { CardDef, Component, field, contains } from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; export class TestCard extends CardDef { static displayName = 'Test Card'; diff --git a/packages/host/tests/acceptance/code-submode-test.ts b/packages/host/tests/acceptance/code-submode-test.ts index 0c327e0649f..130c62de41f 100644 --- a/packages/host/tests/acceptance/code-submode-test.ts +++ b/packages/host/tests/acceptance/code-submode-test.ts @@ -62,7 +62,7 @@ import { import { setupApplicationTest } from '../helpers/setup'; const indexCardSource = ` - import { CardDef, Component } from "https://cardstack.com/base/card-api"; + import { CardDef, Component } from "@cardstack/base/card-api"; export class Index extends CardDef { static isolated = class Isolated extends Component { @@ -81,8 +81,8 @@ const postalCodeFieldSource = ` field, Component, FieldDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export class PostalCode extends FieldDef { static displayName = 'Postal Code'; @@ -105,8 +105,8 @@ const addressFieldSource = ` field, Component, FieldDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; import { PostalCode } from './postal-code'; export class Address extends FieldDef { @@ -138,8 +138,8 @@ const countryCardSource = ` field, Component, CardDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export class Country extends CardDef { static displayName = 'Country'; @@ -166,7 +166,7 @@ const tripsFieldSource = ` field, Component, FieldDef, - } from 'https://cardstack.com/base/card-api'; + } from '@cardstack/base/card-api'; import { Country } from './country'; export class Trips extends FieldDef { @@ -184,8 +184,8 @@ const tripsFieldSource = ` `; const personCardSource = ` - import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import { Friend } from './friend'; import { Pet } from "./pet"; import { Address } from './address'; @@ -226,8 +226,8 @@ const personCardSource = ` `; const petCardSource = ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Pet extends CardDef { static displayName = 'Pet'; @@ -262,8 +262,8 @@ const petCardSource = ` `; const customEditCardSource = ` - import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class CustomEdit extends CardDef { static displayName = 'Custom Edit'; @field name = contains(StringField); @@ -281,10 +281,10 @@ const employeeCardSource = ` field, Component, CardDef - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; - import DateField from 'https://cardstack.com/base/date'; - import BooleanField from 'https://cardstack.com/base/boolean'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; + import DateField from '@cardstack/base/date'; + import BooleanField from '@cardstack/base/boolean'; import { Person } from './person'; export class Isolated extends Component { @@ -319,8 +319,8 @@ const inThisFileSource = ` field, CardDef, FieldDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export const exportedVar = 'exported var'; @@ -365,8 +365,8 @@ const inThisFileSource = ` `; const friendCardSource = ` - import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Friend extends CardDef { static displayName = 'Friend'; @@ -2471,8 +2471,8 @@ module('Acceptance | code submode tests', function (_hooks) { test('card preview live updates when there is a change in module', async function (assert) { const personGts = ` - import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import { Friend } from './friend'; import { Pet } from "./pet"; import { Address } from './address'; diff --git a/packages/host/tests/acceptance/code-submode/card-playground-test.gts b/packages/host/tests/acceptance/code-submode/card-playground-test.gts index 1190251b598..07ca33acdf7 100644 --- a/packages/host/tests/acceptance/code-submode/card-playground-test.gts +++ b/packages/host/tests/acceptance/code-submode/card-playground-test.gts @@ -66,16 +66,16 @@ import { import { searchCardsForTest } from '../../helpers/search-cards'; import { setupApplicationTest } from '../../helpers/setup'; -const codeRefDriverCard = `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; - import { Component } from 'https://cardstack.com/base/card-api'; - import CodeRefField from 'https://cardstack.com/base/code-ref'; +const codeRefDriverCard = `import { CardDef, field, contains } from '@cardstack/base/card-api'; + import { Component } from '@cardstack/base/card-api'; + import CodeRefField from '@cardstack/base/code-ref'; export class CodeRefDriver extends CardDef { static displayName = "Code Ref Driver"; @field ref = contains(CodeRefField); }`; -const testSpecCard = `import { Component } from 'https://cardstack.com/base/card-api'; - import { Spec } from 'https://cardstack.com/base/spec'; +const testSpecCard = `import { Component } from '@cardstack/base/card-api'; + import { Spec } from '@cardstack/base/spec'; export class TestSpec extends Spec { static displayName = 'TestSpec'; static isolated = class Isolated extends Component { @@ -85,9 +85,9 @@ const testSpecCard = `import { Component } from 'https://cardstack.com/base/card } }`; -const authorCard = `import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import MarkdownField from 'https://cardstack.com/base/markdown'; - import StringField from "https://cardstack.com/base/string"; +const authorCard = `import { contains, field, CardDef, Component } from "@cardstack/base/card-api"; + import MarkdownField from '@cardstack/base/markdown'; + import StringField from "@cardstack/base/string"; export class Author extends CardDef { static displayName = 'Author'; @field firstName = contains(StringField); @@ -115,9 +115,9 @@ const authorCard = `import { contains, field, CardDef, Component } from "https:/ } }`; -const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api"; - import DateTimeField from 'https://cardstack.com/base/datetime'; - import MarkdownField from 'https://cardstack.com/base/markdown'; +const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api"; + import DateTimeField from '@cardstack/base/datetime'; + import MarkdownField from '@cardstack/base/markdown'; import { Author } from './author'; export class Category extends CardDef { @@ -162,7 +162,7 @@ const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, C } }`; -const personCard = `import { field, linksTo, CardDef } from 'https://cardstack.com/base/card-api'; +const personCard = `import { field, linksTo, CardDef } from '@cardstack/base/card-api'; export class Pet extends CardDef { static displayName = 'Pet'; } @@ -172,8 +172,8 @@ const personCard = `import { field, linksTo, CardDef } from 'https://cardstack.c } `; -const customEditCard = `import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; +const customEditCard = `import { contains, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class CustomEdit extends CardDef { static displayName = 'Custom Edit'; @field name = contains(StringField); @@ -184,8 +184,8 @@ const customEditCard = `import { contains, field, CardDef, Component } from "htt }; }`; -const headPreviewCard = `import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; +const headPreviewCard = `import { contains, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class HeadPreview extends CardDef { static displayName = 'Head Preview'; @@ -318,7 +318,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; - let cardsGrid: typeof import('https://cardstack.com/base/cards-grid'); + let cardsGrid: typeof import('@cardstack/base/cards-grid'); cardsGrid = await loader.import(`${baseRealm.url}cards-grid`); let { CardsGrid } = cardsGrid; @@ -1164,9 +1164,9 @@ module('Acceptance | code-submode | card playground', function (_hooks) { test('playground preview for card with contained fields can live update when module changes', async function (assert) { // change: added "Hello" before rendering title on the template - const authorCard = `import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import MarkdownField from 'https://cardstack.com/base/markdown'; - import StringField from "https://cardstack.com/base/string"; + const authorCard = `import { contains, field, CardDef, Component } from "@cardstack/base/card-api"; + import MarkdownField from '@cardstack/base/markdown'; + import StringField from "@cardstack/base/string"; export class Author extends CardDef { static displayName = 'Author'; @field firstName = contains(StringField); @@ -1209,10 +1209,10 @@ module('Acceptance | code-submode | card playground', function (_hooks) { test('playground preview for card with linked fields can live update when module changes', async function (assert) { // change: added "Hello" before rendering title on the template - const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api"; - import DateTimeField from 'https://cardstack.com/base/datetime'; - import MarkdownField from 'https://cardstack.com/base/markdown'; - import StringField from "https://cardstack.com/base/string"; + const blogPostCard = `import { contains, field, linksTo, linksToMany, CardDef, Component } from "@cardstack/base/card-api"; + import DateTimeField from '@cardstack/base/datetime'; + import MarkdownField from '@cardstack/base/markdown'; + import StringField from "@cardstack/base/string"; import { Author } from './author'; export class Category extends CardDef { @@ -1868,7 +1868,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { let { setRealmPermissions, setActiveRealms, createAndJoinRoom } = mockMatrixUtils; - const boomPet = `import { contains, field, CardDef, Component, FieldDef, StringField, serialize } from 'https://cardstack.com/base/card-api'; + const boomPet = `import { contains, field, CardDef, Component, FieldDef, StringField, serialize } from '@cardstack/base/card-api'; // this field explodes when serialized (saved) export class BoomField extends FieldDef { @field cardTitle = contains(StringField); @@ -1886,7 +1886,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { @field boom = contains(BoomField); } `; - const boomPerson = `import { field, contains, CardDef, FieldDef, Component, StringField } from 'https://cardstack.com/base/card-api'; + const boomPerson = `import { field, contains, CardDef, FieldDef, Component, StringField } from '@cardstack/base/card-api'; export class BoomPerson extends CardDef { static displayName = 'Boom Person'; @field firstName = contains(StringField); @@ -1921,7 +1921,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { } `; const syntaxError = ` - import { contains, field, CardDef } from "https://cardstack.com/base/card-api"; + import { contains, field, CardDef } from "@cardstack/base/card-api"; // missing StringField import export class Boom extends CardDef { @field firstName = contains(StringField); @@ -2058,7 +2058,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { // fix error await realm.write( 'boom-person.gts', - `import { field, contains, CardDef, Component, StringField } from 'https://cardstack.com/base/card-api'; + `import { field, contains, CardDef, Component, StringField } from '@cardstack/base/card-api'; export class BoomPerson extends CardDef { static displayName = 'Boom Person'; @field firstName = contains(StringField); @@ -2102,7 +2102,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { // fix error await realm.write( 'boom-pet.gts', - `import { contains, field, CardDef, Component, FieldDef, StringField } from 'https://cardstack.com/base/card-api'; + `import { contains, field, CardDef, Component, FieldDef, StringField } from '@cardstack/base/card-api'; export class BoomPet extends CardDef { static displayName = 'Boom Pet'; @field boom = contains(StringField); @@ -2168,7 +2168,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { // fix error await realm.write( 'boom-person.gts', - `import { contains, field, CardDef, Component, FieldDef, StringField } from 'https://cardstack.com/base/card-api'; + `import { contains, field, CardDef, Component, FieldDef, StringField } from '@cardstack/base/card-api'; export class FailingField extends FieldDef { static displayName = 'Failing Field'; @field cardTitle = contains(StringField); diff --git a/packages/host/tests/acceptance/code-submode/create-file-test.gts b/packages/host/tests/acceptance/code-submode/create-file-test.gts index 0eb1d62b8e3..06484488ecc 100644 --- a/packages/host/tests/acceptance/code-submode/create-file-test.gts +++ b/packages/host/tests/acceptance/code-submode/create-file-test.gts @@ -19,8 +19,6 @@ import { import type FileUploadService from '@cardstack/host/services/file-upload'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import { percySnapshot, setupLocalIndexing, @@ -44,6 +42,7 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupApplicationTest } from '../../helpers/setup'; import type { TestRealmAdapter } from '../../helpers/adapter'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; const testRealmURL2 = 'http://test-realm/test2/'; const testRealmAIconURL = 'https://i.postimg.cc/L8yXRvws/icon.png'; @@ -1559,7 +1558,7 @@ export class TestCard extends Animal { let newFilePath = 'ai-created-card.gts'; let newFileUrl = `${testRealmURL}${newFilePath}`; let newFileSource = ` - import { CardDef } from 'https://cardstack.com/base/card-api'; + import { CardDef } from '@cardstack/base/card-api'; export default class AiCreatedCard extends CardDef { static displayName = 'Ai Created Card'; } @@ -1644,7 +1643,7 @@ export class TestCard extends Animal { let newFilePath = 'navigated-to-card.gts'; let newFileUrl = `${testRealmURL}${newFilePath}`; let newFileSource = ` - import { CardDef } from 'https://cardstack.com/base/card-api'; + import { CardDef } from '@cardstack/base/card-api'; export default class NavigatedToCard extends CardDef { static displayName = 'Navigated To Card'; } diff --git a/packages/host/tests/acceptance/code-submode/editor-test.ts b/packages/host/tests/acceptance/code-submode/editor-test.ts index 4a0c8a1c3bf..8b365567e12 100644 --- a/packages/host/tests/acceptance/code-submode/editor-test.ts +++ b/packages/host/tests/acceptance/code-submode/editor-test.ts @@ -88,8 +88,8 @@ module('Acceptance | code submode | editor tests', function (hooks) { contents: { ...SYSTEM_CARD_FIXTURE_CONTENTS, 'pet.gts': ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Pet extends CardDef { static displayName = 'Pet'; @@ -109,8 +109,8 @@ module('Acceptance | code submode | editor tests', function (hooks) { } `, 'shipping-info.gts': ` - import { contains, field, Component, FieldDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, FieldDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class ShippingInfo extends FieldDef { static displayName = 'Shipping Info'; @field preferredCarrier = contains(StringField); @@ -129,8 +129,8 @@ module('Acceptance | code submode | editor tests', function (hooks) { } `, 'address.gts': ` - import { contains, field, Component, FieldDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, FieldDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import { ShippingInfo } from "./shipping-info"; import { FieldContainer } from '@cardstack/boxel-ui/components'; @@ -165,8 +165,8 @@ module('Acceptance | code submode | editor tests', function (hooks) { } `, 'person.gts': ` - import { contains, linksTo, field, Component, CardDef, linksToMany } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, linksTo, field, Component, CardDef, linksToMany } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import { Pet } from "./pet"; import { Address } from "./address"; @@ -789,8 +789,8 @@ module('Acceptance | code submode | editor tests', function (hooks) { test('card definition change made in monaco editor is auto-saved', async function (assert) { let expected = ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Pet extends CardDef { static displayName = 'PetXXX'; // this is the change diff --git a/packages/host/tests/acceptance/code-submode/field-playground-test.gts b/packages/host/tests/acceptance/code-submode/field-playground-test.gts index a0c3e998ae8..f0cd20471da 100644 --- a/packages/host/tests/acceptance/code-submode/field-playground-test.gts +++ b/packages/host/tests/acceptance/code-submode/field-playground-test.gts @@ -48,9 +48,9 @@ import { setupApplicationTest } from '../../helpers/setup'; const { resolvedBaseRealmURL } = ENV; -const authorCard = `import { contains, field, CardDef, Component, FieldDef } from "https://cardstack.com/base/card-api"; - import MarkdownField from 'https://cardstack.com/base/markdown'; - import StringField from "https://cardstack.com/base/string"; +const authorCard = `import { contains, field, CardDef, Component, FieldDef } from "@cardstack/base/card-api"; + import MarkdownField from '@cardstack/base/markdown'; + import StringField from "@cardstack/base/string"; export class Author extends CardDef { static displayName = 'Author'; @field firstName = contains(StringField); @@ -107,10 +107,10 @@ const authorCard = `import { contains, field, CardDef, Component, FieldDef } fro } }`; -const blogPostCard = `import { contains, containsMany, field, linksTo, CardDef, Component, FieldDef } from "https://cardstack.com/base/card-api"; - import DateTimeField from 'https://cardstack.com/base/datetime'; - import MarkdownField from 'https://cardstack.com/base/markdown'; - import StringField from "https://cardstack.com/base/string"; +const blogPostCard = `import { contains, containsMany, field, linksTo, CardDef, Component, FieldDef } from "@cardstack/base/card-api"; + import DateTimeField from '@cardstack/base/datetime'; + import MarkdownField from '@cardstack/base/markdown'; + import StringField from "@cardstack/base/string"; import { Author } from './author'; export class Status extends StringField { @@ -200,7 +200,7 @@ const blogPostCard = `import { contains, containsMany, field, linksTo, CardDef, } }`; -const petCard = `import { contains, containsMany, field, CardDef, Component, FieldDef, StringField } from 'https://cardstack.com/base/card-api'; +const petCard = `import { contains, containsMany, field, CardDef, Component, FieldDef, StringField } from '@cardstack/base/card-api'; export class ToyField extends FieldDef { static displayName = 'Toy'; @field cardTitle = contains(StringField); diff --git a/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts b/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts index 820ec9a41d6..066ed0f0837 100644 --- a/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts +++ b/packages/host/tests/acceptance/code-submode/file-def-navigation-test.gts @@ -31,9 +31,9 @@ module('Acceptance | code submode | file def navigation', function (hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); - let fileApi: typeof import('https://cardstack.com/base/file-api'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); + let fileApi: typeof import('@cardstack/base/file-api'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); diff --git a/packages/host/tests/acceptance/code-submode/file-tree-test.ts b/packages/host/tests/acceptance/code-submode/file-tree-test.ts index d2efe50a6ac..2f227d006b2 100644 --- a/packages/host/tests/acceptance/code-submode/file-tree-test.ts +++ b/packages/host/tests/acceptance/code-submode/file-tree-test.ts @@ -39,7 +39,7 @@ import { setupApplicationTest } from '../../helpers/setup'; import type { TestRealmAdapter } from '../../helpers/adapter'; const indexCardSource = ` - import { CardDef, Component } from "https://cardstack.com/base/card-api"; + import { CardDef, Component } from "@cardstack/base/card-api"; export class Index extends CardDef { static isolated = class Isolated extends Component { @@ -53,8 +53,8 @@ const indexCardSource = ` `; const personCardSource = ` - import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, containsMany, field, linksToMany, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import WriteTextFileTool from '../../../app/tools/write-text-file'; import { Friend } from './friend'; @@ -94,8 +94,8 @@ const employeeCardSource = ` contains, field, Component, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; import { Person } from './person'; export class Employee extends Person { @@ -118,8 +118,8 @@ const inThisFileSource = ` field, CardDef, FieldDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export const exportedVar = 'exported var'; @@ -164,8 +164,8 @@ const inThisFileSource = ` `; const friendCardSource = ` - import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Friend extends CardDef { static displayName = 'Friend'; @@ -1091,7 +1091,7 @@ module('Acceptance | code submode | file-tree tests', function (hooks) { await writeTextFileCommand.execute({ path: `${newDirName}/${newFileName}`, content: - 'import { CardDef, Component } from "https://cardstack.com/base/card-api";\n\nexport class NewFile extends CardDef {\n static isolated = class Isolated extends Component {\n \n };\n}', + 'import { CardDef, Component } from "@cardstack/base/card-api";\n\nexport class NewFile extends CardDef {\n static isolated = class Isolated extends Component {\n \n };\n}', realm: testRealmURL, }); await settled(); diff --git a/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts b/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts index 54aa2e29b5d..4b329722403 100644 --- a/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts +++ b/packages/host/tests/acceptance/code-submode/head-format-preview-test.ts @@ -25,8 +25,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupApplicationTest } from '../../helpers/setup'; const headPreviewWithDisallowedTagsSource = ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class HeadPreviewUnsafe extends CardDef { static displayName = 'Head Preview Unsafe'; @@ -46,8 +46,8 @@ const headPreviewWithDisallowedTagsSource = ` `; const headPreviewCardSource = ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class HeadPreview extends CardDef { static displayName = 'Head Preview'; diff --git a/packages/host/tests/acceptance/code-submode/inspector-test.ts b/packages/host/tests/acceptance/code-submode/inspector-test.ts index b4c706ffc55..463af0ecc4c 100644 --- a/packages/host/tests/acceptance/code-submode/inspector-test.ts +++ b/packages/host/tests/acceptance/code-submode/inspector-test.ts @@ -33,8 +33,6 @@ import type { SerializedState } from '@cardstack/host/services/operator-mode-sta import { CodeModePanelHeights } from '@cardstack/host/utils/local-storage-keys'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import { elementIsVisible, getMonacoContent, @@ -62,6 +60,7 @@ import { assertRecentFileURLs } from '../../helpers/recent-files-cards'; import { setupApplicationTest } from '../../helpers/setup'; import type { TestRealmAdapter } from '../../helpers/adapter'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; const testRealmURL2 = 'http://test-realm/test2/'; const realmAFiles: Record = { diff --git a/packages/host/tests/acceptance/code-submode/recent-files-test.ts b/packages/host/tests/acceptance/code-submode/recent-files-test.ts index c96ec3c8f41..09420b56b19 100644 --- a/packages/host/tests/acceptance/code-submode/recent-files-test.ts +++ b/packages/host/tests/acceptance/code-submode/recent-files-test.ts @@ -39,7 +39,7 @@ import { import { setupApplicationTest } from '../../helpers/setup'; const indexCardSource = ` - import { CardDef, Component } from "https://cardstack.com/base/card-api"; + import { CardDef, Component } from "@cardstack/base/card-api"; export class Index extends CardDef { static isolated = class Isolated extends Component { @@ -53,8 +53,8 @@ const indexCardSource = ` `; const personCardSource = ` - import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, containsMany, field, linksToMany, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import { Friend } from './friend'; export class Person extends CardDef { @@ -93,8 +93,8 @@ const employeeCardSource = ` contains, field, Component, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; import { Person } from './person'; export class Employee extends Person { @@ -117,8 +117,8 @@ const inThisFileSource = ` field, CardDef, FieldDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export const exportedVar = 'exported var'; @@ -163,8 +163,8 @@ const inThisFileSource = ` `; const friendCardSource = ` - import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Friend extends CardDef { static displayName = 'Friend'; diff --git a/packages/host/tests/acceptance/code-submode/schema-editor-test.ts b/packages/host/tests/acceptance/code-submode/schema-editor-test.ts index 593083fdc24..c9a5807bcdf 100644 --- a/packages/host/tests/acceptance/code-submode/schema-editor-test.ts +++ b/packages/host/tests/acceptance/code-submode/schema-editor-test.ts @@ -69,7 +69,7 @@ async function waitForRealmIcon(selector: string, timeoutMs = 5000) { } const indexCardSource = ` - import { CardDef, Component } from "https://cardstack.com/base/card-api"; + import { CardDef, Component } from "@cardstack/base/card-api"; export class Index extends CardDef { static isolated = class Isolated extends Component { @@ -85,7 +85,7 @@ const indexCardSource = ` const personOwnFieldCount = 5; const personTotalFieldCount = `${cardDefFieldCount + personOwnFieldCount}`; const personCardSource = ` - import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api"; + import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api"; import { Friend } from './friend'; export class Person extends CardDef { @@ -126,10 +126,10 @@ const employeeCardSource = ` linksTo, Component, FieldDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; - import BooleanField from 'https://cardstack.com/base/boolean'; - import DateField from 'https://cardstack.com/base/date'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; + import BooleanField from '@cardstack/base/boolean'; + import DateField from '@cardstack/base/date'; import { Person } from './person'; class Supervisor extends Person { @@ -182,8 +182,8 @@ const inThisFileSource = ` field, CardDef, FieldDef, - } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export const exportedVar = 'exported var'; @@ -228,8 +228,8 @@ const inThisFileSource = ` `; const friendCardSource = ` - import { contains, linksTo, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, linksTo, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Friend extends CardDef { static displayName = 'Friend'; @@ -264,7 +264,7 @@ const ambiguousDisplayNamesCardSource = ` field, linksTo, Component, - } from 'https://cardstack.com/base/card-api'; + } from '@cardstack/base/card-api'; export class Editor extends CardDef { static displayName = 'Author Bio'; @@ -1066,7 +1066,7 @@ module('Acceptance | code submode | schema editor tests', function (hooks) { assert.codeEqual( content, ` - import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api"; + import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api"; import { Friend } from './friend'; export class Person extends CardDef { @@ -1130,7 +1130,7 @@ module('Acceptance | code submode | schema editor tests', function (hooks) { assert.codeEqual( content, ` - import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "https://cardstack.com/base/card-api"; + import { contains, containsMany, field, linksToMany, CardDef, Component, StringField } from "@cardstack/base/card-api"; import { Friend } from './friend'; export class Person extends CardDef { diff --git a/packages/host/tests/acceptance/code-submode/spec-test.gts b/packages/host/tests/acceptance/code-submode/spec-test.gts index f64095eb448..bf0d74e38d2 100644 --- a/packages/host/tests/acceptance/code-submode/spec-test.gts +++ b/packages/host/tests/acceptance/code-submode/spec-test.gts @@ -45,8 +45,8 @@ import '@cardstack/runtime-common/helpers/code-equality-assertion'; const testRealm2URL = `http://test-realm/test2/`; const personCardSource = ` - import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component, FieldDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, containsMany, field, linksTo, linksToMany, CardDef, Component, FieldDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class PersonField extends FieldDef { static displayName = 'PersonField'; @@ -83,8 +83,8 @@ const personCardSource = ` `; const person1CardSource = ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Person1 extends CardDef { static displayName = 'Person1'; @@ -92,8 +92,8 @@ const person1CardSource = ` `; const petCardSource = ` - import { contains, field, Component, CardDef, FieldDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef, FieldDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class PetField extends FieldDef { static displayName = 'PetField'; @@ -126,8 +126,8 @@ const petCardSource = ` `; const employeeCardSource = ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export default class Employee extends CardDef { static displayName = 'Employee'; @@ -141,8 +141,8 @@ const employeeCardSource = ` `; const newSkillCardSource = ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import { Skill } from 'https://cardstack.com/base/skill'; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import { Skill } from '@cardstack/base/skill'; export class NewSkill extends Skill { static displayName = 'NewSkill'; @@ -154,7 +154,7 @@ const newSkillCardSource = ` `; const specCardSource = ` - import { Spec } from 'https://cardstack.com/base/spec'; + import { Spec } from '@cardstack/base/spec'; export class TestSpec extends Spec { static displayName = 'TestSpec'; @@ -167,7 +167,7 @@ const primitiveFieldCardSource = ` Component, FieldDef, primitive, - } from 'https://cardstack.com/base/card-api'; + } from '@cardstack/base/card-api'; export class PrimitiveField extends FieldDef { static displayName = 'PrimitiveField'; @@ -180,8 +180,8 @@ const primitiveFieldCardSource = ` `; const quoteFieldCardSource = ` - import { contains, field, Component, FieldDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, FieldDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class QuoteField extends FieldDef { static displayName = 'QuoteField'; @@ -205,7 +205,7 @@ const polymorphicFieldCardSource = ` contains, StringField, FieldDef, - } from 'https://cardstack.com/base/card-api'; + } from '@cardstack/base/card-api'; import { on } from '@ember/modifier'; export class TestField extends FieldDef { diff --git a/packages/host/tests/acceptance/commands-test.gts b/packages/host/tests/acceptance/commands-test.gts index ddb425b7d12..8a4df2bbd5d 100644 --- a/packages/host/tests/acceptance/commands-test.gts +++ b/packages/host/tests/acceptance/commands-test.gts @@ -45,10 +45,6 @@ import { waitForRealmState, } from '@cardstack/host/tools/utils'; -import type { SearchCardsByTypeAndTitleInput } from 'https://cardstack.com/base/command'; - -import type { Skill } from 'https://cardstack.com/base/skill'; - import { addSkillToAiAssistant, setupLocalIndexing, @@ -81,6 +77,9 @@ import { setupMockMatrix } from '../helpers/mock-matrix'; import { setupApplicationTest } from '../helpers/setup'; import { suspendGlobalErrorHook } from '../helpers/uncaught-exceptions'; +import type { SearchCardsByTypeAndTitleInput } from '@cardstack/base/command'; +import type { Skill } from '@cardstack/base/skill'; + let matrixRoomId = ''; let maybeBoomShouldBoom = true; let savedMeetingCardId: string | undefined; diff --git a/packages/host/tests/acceptance/file-def-test.gts b/packages/host/tests/acceptance/file-def-test.gts index 439e38a143a..23347e64649 100644 --- a/packages/host/tests/acceptance/file-def-test.gts +++ b/packages/host/tests/acceptance/file-def-test.gts @@ -5,8 +5,6 @@ import { module, test } from 'qunit'; import { Deferred, baseRealm, type Realm } from '@cardstack/runtime-common'; -import type { RealmEventContent } from 'https://cardstack.com/base/matrix-event'; - import { SYSTEM_CARD_FIXTURE_CONTENTS, setupAcceptanceTestRealm, @@ -20,6 +18,8 @@ import { import { setupMockMatrix } from '../helpers/mock-matrix'; import { setupApplicationTest } from '../helpers/setup'; +import type { RealmEventContent } from '@cardstack/base/matrix-event'; + module('Acceptance | file def', function (hooks) { let realm: Realm; @@ -59,11 +59,11 @@ module('Acceptance | file def', function (hooks) { setupAuthEndpoints(); let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); - let markdown: typeof import('https://cardstack.com/base/markdown'); - let markdownFileDef: typeof import('https://cardstack.com/base/markdown-file-def'); - let skillModule: typeof import('https://cardstack.com/base/skill'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); + let markdown: typeof import('@cardstack/base/markdown'); + let markdownFileDef: typeof import('@cardstack/base/markdown-file-def'); + let skillModule: typeof import('@cardstack/base/skill'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); diff --git a/packages/host/tests/acceptance/host-mode-test.gts b/packages/host/tests/acceptance/host-mode-test.gts index 946b08f5645..96fef7b1503 100644 --- a/packages/host/tests/acceptance/host-mode-test.gts +++ b/packages/host/tests/acceptance/host-mode-test.gts @@ -87,8 +87,8 @@ module('Acceptance | host mode tests', function (hooks) { setExpiresInSec(60 * 60); let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); @@ -330,8 +330,8 @@ module('Acceptance | host mode tests', function (hooks) { }, }, 'broken-card.gts': ` - import { contains, field, Component, CardDef } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + import { contains, field, Component, CardDef } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export class BrokenCard extends CardDef { static displayName = 'BrokenCard'; @field name = contains(StringField); @@ -361,7 +361,7 @@ module('Acceptance | host mode tests', function (hooks) { // it just can't load because a dependency is missing — a legitimate // error state, distinct from the card not being found. 'missing-dep-card.gts': ` - import { Component, CardDef } from 'https://cardstack.com/base/card-api'; + import { Component, CardDef } from '@cardstack/base/card-api'; import { MissingThing } from './missing-dependency'; export class MissingDepCard extends CardDef { static displayName = 'MissingDepCard'; diff --git a/packages/host/tests/acceptance/host-submode-test.gts b/packages/host/tests/acceptance/host-submode-test.gts index e9aa7411190..3089da64508 100644 --- a/packages/host/tests/acceptance/host-submode-test.gts +++ b/packages/host/tests/acceptance/host-submode-test.gts @@ -44,8 +44,8 @@ import { setupMockMatrix } from '../helpers/mock-matrix'; import { setupApplicationTest } from '../helpers/setup'; const personCardSource = ` - import { contains, containsMany, field, linksToMany, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, containsMany, field, linksToMany, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Person extends CardDef { static displayName = 'Person'; diff --git a/packages/host/tests/acceptance/interact-submode-test.gts b/packages/host/tests/acceptance/interact-submode-test.gts index afa67de78f0..53106a696f4 100644 --- a/packages/host/tests/acceptance/interact-submode-test.gts +++ b/packages/host/tests/acceptance/interact-submode-test.gts @@ -22,11 +22,6 @@ import { } from '@cardstack/runtime-common'; import type { Realm } from '@cardstack/runtime-common/realm'; -import type { - IncrementalIndexEventContent, - RealmEventContent, -} from 'https://cardstack.com/base/matrix-event'; - import { percySnapshot, testModuleRealm, @@ -40,6 +35,11 @@ import { testRealm2URL, } from '../helpers/interact-submode-setup'; +import type { + IncrementalIndexEventContent, + RealmEventContent, +} from '@cardstack/base/matrix-event'; + module('Acceptance | interact submode tests', function (hooks) { let realm: Realm; diff --git a/packages/host/tests/acceptance/interact-submode/create-file-test.gts b/packages/host/tests/acceptance/interact-submode/create-file-test.gts index 6ec859a9217..956d7251b8f 100644 --- a/packages/host/tests/acceptance/interact-submode/create-file-test.gts +++ b/packages/host/tests/acceptance/interact-submode/create-file-test.gts @@ -220,7 +220,7 @@ module('Acceptance | interact submode | create-file tests', function (hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; - let cardsGrid: typeof import('https://cardstack.com/base/cards-grid'); + let cardsGrid: typeof import('@cardstack/base/cards-grid'); cardsGrid = await loader.import(`${baseRealm.url}cards-grid`); let { CardsGrid } = cardsGrid; diff --git a/packages/host/tests/acceptance/markdown-embed-chooser-test.gts b/packages/host/tests/acceptance/markdown-embed-chooser-test.gts index 353d2803b98..f87a15f81c7 100644 --- a/packages/host/tests/acceptance/markdown-embed-chooser-test.gts +++ b/packages/host/tests/acceptance/markdown-embed-chooser-test.gts @@ -61,8 +61,8 @@ module('Acceptance | markdown embed chooser modal', function (hooks) { contents: { ...SYSTEM_CARD_FIXTURE_CONTENTS, 'note.gts': ` - import { CardDef, Component, contains, field, StringField } from 'https://cardstack.com/base/card-api'; - import { RichMarkdownField } from 'https://cardstack.com/base/rich-markdown'; + import { CardDef, Component, contains, field, StringField } from '@cardstack/base/card-api'; + import { RichMarkdownField } from '@cardstack/base/rich-markdown'; export class Note extends CardDef { static displayName = 'Note'; @field title = contains(StringField); @@ -86,7 +86,7 @@ module('Acceptance | markdown embed chooser modal', function (hooks) { } `, 'pet.gts': ` - import { CardDef, Component, contains, field, StringField } from 'https://cardstack.com/base/card-api'; + import { CardDef, Component, contains, field, StringField } from '@cardstack/base/card-api'; export class Pet extends CardDef { static displayName = 'Pet'; @field name = contains(StringField); diff --git a/packages/host/tests/acceptance/markdown-file-def-test.gts b/packages/host/tests/acceptance/markdown-file-def-test.gts index e3e459fc842..164a4a77cc8 100644 --- a/packages/host/tests/acceptance/markdown-file-def-test.gts +++ b/packages/host/tests/acceptance/markdown-file-def-test.gts @@ -251,7 +251,7 @@ module('Acceptance | markdown BFM card references', function (hooks) { contents: { ...SYSTEM_CARD_FIXTURE_CONTENTS, 'pet.gts': ` - import { CardDef, Component, contains, field, StringField } from 'https://cardstack.com/base/card-api'; + import { CardDef, Component, contains, field, StringField } from '@cardstack/base/card-api'; export class Pet extends CardDef { static displayName = 'Pet'; @field name = contains(StringField); diff --git a/packages/host/tests/acceptance/operator-mode-acceptance-test.gts b/packages/host/tests/acceptance/operator-mode-acceptance-test.gts index 3378c4b737f..36c7c471627 100644 --- a/packages/host/tests/acceptance/operator-mode-acceptance-test.gts +++ b/packages/host/tests/acceptance/operator-mode-acceptance-test.gts @@ -99,8 +99,8 @@ module('Acceptance | operator mode tests', function (hooks) { setExpiresInSec(60 * 60); let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); diff --git a/packages/host/tests/acceptance/prerender-html-test.gts b/packages/host/tests/acceptance/prerender-html-test.gts index 5a94117114e..d0bc9d6490f 100644 --- a/packages/host/tests/acceptance/prerender-html-test.gts +++ b/packages/host/tests/acceptance/prerender-html-test.gts @@ -47,7 +47,7 @@ module('Acceptance | prerender | html', function (hooks) { (globalThis as any).__boxel_definitions_recursing_depth = 0; (globalThis as any).__doNotSuppressRenderRouteError = true; let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); + let cardApi: typeof import('@cardstack/base/card-api'); cardApi = await loader.import(`${baseRealm.url}card-api`); let { diff --git a/packages/host/tests/acceptance/prerender-meta-test.gts b/packages/host/tests/acceptance/prerender-meta-test.gts index 534090dc5f4..e6d5118fef4 100644 --- a/packages/host/tests/acceptance/prerender-meta-test.gts +++ b/packages/host/tests/acceptance/prerender-meta-test.gts @@ -63,7 +63,7 @@ module('Acceptance | prerender | meta', function (hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); + let cardApi: typeof import('@cardstack/base/card-api'); cardApi = await loader.import(`${baseRealm.url}card-api`); let { diff --git a/packages/host/tests/acceptance/prerender-module-test.gts b/packages/host/tests/acceptance/prerender-module-test.gts index db60fd5997b..ce31c67a102 100644 --- a/packages/host/tests/acceptance/prerender-module-test.gts +++ b/packages/host/tests/acceptance/prerender-module-test.gts @@ -51,7 +51,7 @@ module('Acceptance | prerender | module', function (hooks) { optionsSegment = DEFAULT_MODULE_OPTIONS_SEGMENT, ) => `/module/${encodeURIComponent(url)}/${nonce}/${optionsSegment}`; const PERSON_MODULE = ` - import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api'; + import { CardDef, field, contains, StringField } from '@cardstack/base/card-api'; export class Person extends CardDef { static displayName = 'Person'; @@ -59,7 +59,7 @@ module('Acceptance | prerender | module', function (hooks) { } `; const PARENT_MODULE = ` - import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api'; + import { CardDef, field, contains, StringField } from '@cardstack/base/card-api'; export class Parent extends CardDef { static displayName = 'Parent'; @@ -68,7 +68,7 @@ module('Acceptance | prerender | module', function (hooks) { `; const CHILD_MODULE = ` import { Parent } from './parent'; - import { field, contains, StringField } from 'https://cardstack.com/base/card-api'; + import { field, contains, StringField } from '@cardstack/base/card-api'; export class Child extends Parent { static displayName = 'Child'; @@ -80,7 +80,7 @@ module('Acceptance | prerender | module', function (hooks) { // (reviewer → bogus). Definition-build validation records only the bad path // on `meta.diagnostics.searchablePathIssues`, tagged with its owning def. const SEARCHABLE_MODULE = ` - import { CardDef, field, contains, linksTo, StringField } from 'https://cardstack.com/base/card-api'; + import { CardDef, field, contains, linksTo, StringField } from '@cardstack/base/card-api'; export class SearchAuthor extends CardDef { static displayName = 'SearchAuthor'; @@ -206,7 +206,7 @@ module('Acceptance | prerender | module', function (hooks) { test('identifies shimmed modules', async function (assert) { let loaderService = getService('loader-service'); let loader = loaderService.loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); + let cardApi: typeof import('@cardstack/base/card-api'); cardApi = await loader.import(`${baseRealm.url}card-api`); let { field, contains, CardDef, StringField } = cardApi; @@ -331,7 +331,7 @@ module('Acceptance | prerender | module', function (hooks) { await adapter.write( 'person.gts', ` - import { CardDef, field, contains, StringField } from 'https://cardstack.com/base/card-api'; + import { CardDef, field, contains, StringField } from '@cardstack/base/card-api'; export class Person extends CardDef { static displayName = 'Updated Person'; diff --git a/packages/host/tests/acceptance/relationship-loading-state-test.gts b/packages/host/tests/acceptance/relationship-loading-state-test.gts index 2fccd848c3a..f347eb7c437 100644 --- a/packages/host/tests/acceptance/relationship-loading-state-test.gts +++ b/packages/host/tests/acceptance/relationship-loading-state-test.gts @@ -8,8 +8,6 @@ import { Deferred, SupportedMimeType } from '@cardstack/runtime-common'; import type NetworkService from '@cardstack/host/services/network'; -import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api'; - import { setupAcceptanceTestRealm, setupLocalIndexing, @@ -30,6 +28,8 @@ import { import { setupMockMatrix } from '../helpers/mock-matrix'; import { setupApplicationTest } from '../helpers/setup'; +import type { CardDef as CardDefType } from '@cardstack/base/card-api'; + const SUBJECTS_MODULE = `${testRealmURL}subjects`; const LINKSTO_URL = `${testRealmURL}linksto-subject`; const LINKSTOMANY_URL = `${testRealmURL}linkstomany-subject`; diff --git a/packages/host/tests/acceptance/theme-card-test.gts b/packages/host/tests/acceptance/theme-card-test.gts index b5c75771fa2..0e40de8b899 100644 --- a/packages/host/tests/acceptance/theme-card-test.gts +++ b/packages/host/tests/acceptance/theme-card-test.gts @@ -210,8 +210,8 @@ module('Acceptance | theme-card-test', function (hooks) { setupAuthEndpoints(); let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let booleanMod: typeof import('https://cardstack.com/base/boolean'); + let cardApi: typeof import('@cardstack/base/card-api'); + let booleanMod: typeof import('@cardstack/base/boolean'); cardApi = await loader.import(`${baseRealm.url}card-api`); booleanMod = await loader.import(`${baseRealm.url}boolean`); diff --git a/packages/host/tests/acceptance/workspace-chooser-delete-test.gts b/packages/host/tests/acceptance/workspace-chooser-delete-test.gts index 841cb2299e0..3e94d62e188 100644 --- a/packages/host/tests/acceptance/workspace-chooser-delete-test.gts +++ b/packages/host/tests/acceptance/workspace-chooser-delete-test.gts @@ -74,7 +74,7 @@ module('Acceptance | workspace-chooser-delete', function (hooks) { }, }, }, - 'person.gts': `import { CardDef } from "https://cardstack.com/base/card-api"; + 'person.gts': `import { CardDef } from "@cardstack/base/card-api"; export class Person extends CardDef {} `, diff --git a/packages/host/tests/acceptance/workspace-delete-multiple-test.gts b/packages/host/tests/acceptance/workspace-delete-multiple-test.gts index 56a26ca555b..bd2322c5e25 100644 --- a/packages/host/tests/acceptance/workspace-delete-multiple-test.gts +++ b/packages/host/tests/acceptance/workspace-delete-multiple-test.gts @@ -52,10 +52,10 @@ module('Acceptance | workspace-delete-multiple', function (hooks) { let loaderService = getService('loader-service'); let loader = loaderService.loader; let { field, contains, CardDef, Component } = await loader.import< - typeof import('https://cardstack.com/base/card-api') + typeof import('@cardstack/base/card-api') >(`${baseRealm.url}card-api`); let { default: StringField } = await loader.import< - typeof import('https://cardstack.com/base/string') + typeof import('@cardstack/base/string') >(`${baseRealm.url}string`); class Pet extends CardDef { diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts index af64be8f02e..ba5dab99450 100644 --- a/packages/host/tests/helpers/adapter.ts +++ b/packages/host/tests/helpers/adapter.ts @@ -27,16 +27,15 @@ import type { TokenClaims, } from '@cardstack/runtime-common/realm'; -import type { - FileWatcherEventContent, - RealmEventContent, -} from 'https://cardstack.com/base/matrix-event'; - import { WebMessageStream, messageCloseHandler } from './stream'; import { createJWT, testRealmURL } from '.'; import type { MockUtils } from './mock-matrix/_utils'; +import type { + FileWatcherEventContent, + RealmEventContent, +} from '@cardstack/base/matrix-event'; import type ms from 'ms'; interface Dir { @@ -49,7 +48,7 @@ interface File { content: string | object | Uint8Array; } -type CardAPI = typeof import('https://cardstack.com/base/card-api'); +type CardAPI = typeof import('@cardstack/base/card-api'); class TokenExpiredError extends Error {} class JsonWebTokenError extends Error {} diff --git a/packages/host/tests/helpers/base-realm.ts b/packages/host/tests/helpers/base-realm.ts index 8c4b05adb88..5233d99e543 100644 --- a/packages/host/tests/helpers/base-realm.ts +++ b/packages/host/tests/helpers/base-realm.ts @@ -2,42 +2,42 @@ import { getService } from '@universal-ember/test-support'; import { baseRealm } from '@cardstack/runtime-common'; -import type * as Base64ImageFieldModule from 'https://cardstack.com/base/base64-image'; -import type * as BigIntegerModule from 'https://cardstack.com/base/big-integer'; -import type * as BooleanFieldModule from 'https://cardstack.com/base/boolean'; -import type * as CardAPIModule from 'https://cardstack.com/base/card-api'; -import type * as CardsGridModule from 'https://cardstack.com/base/cards-grid'; -import type * as CodeRefModule from 'https://cardstack.com/base/code-ref'; -import type * as ColorFieldModule from 'https://cardstack.com/base/color'; -import type * as DateFieldModule from 'https://cardstack.com/base/date'; -import type * as DayFieldModule from 'https://cardstack.com/base/date/day'; -import type * as MonthFieldModule from 'https://cardstack.com/base/date/month'; -import type * as MonthDayFieldModule from 'https://cardstack.com/base/date/month-day'; -import type * as MonthYearFieldModule from 'https://cardstack.com/base/date/month-year'; -import type * as QuarterFieldModule from 'https://cardstack.com/base/date/quarter'; -import type * as WeekFieldModule from 'https://cardstack.com/base/date/week'; -import type * as YearFieldModule from 'https://cardstack.com/base/date/year'; -import type * as DateRangeFieldModule from 'https://cardstack.com/base/date-range-field'; -import type * as DateTimeFieldModule from 'https://cardstack.com/base/datetime'; -import type * as DatetimeStampFieldModule from 'https://cardstack.com/base/datetime-stamp'; -import type * as EmailFieldModule from 'https://cardstack.com/base/email'; -import type * as EnumModule from 'https://cardstack.com/base/enum'; -import type * as EthereumAddressModule from 'https://cardstack.com/base/ethereum-address'; -import type * as FileApiModule from 'https://cardstack.com/base/file-api'; -import type * as MarkdownFieldModule from 'https://cardstack.com/base/markdown'; -import type * as NumberFieldModule from 'https://cardstack.com/base/number'; -import type * as PhoneNumberFieldModule from 'https://cardstack.com/base/phone-number'; -import type * as RealmFieldModule from 'https://cardstack.com/base/realm'; -import type * as RichMarkdownModule from 'https://cardstack.com/base/rich-markdown'; -import type * as SearchableModule from 'https://cardstack.com/base/searchable'; -import type * as SkillModule from 'https://cardstack.com/base/skill'; -import type * as StringFieldModule from 'https://cardstack.com/base/string'; -import type * as SystemCardModule from 'https://cardstack.com/base/system-card'; -import type * as TextAreaFieldModule from 'https://cardstack.com/base/text-area'; -import type * as TimeFieldModule from 'https://cardstack.com/base/time'; -import type * as DurationFieldModule from 'https://cardstack.com/base/time/duration'; -import type * as RelativeTimeFieldModule from 'https://cardstack.com/base/time/relative-time'; -import type * as TimeRangeFieldModule from 'https://cardstack.com/base/time/time-range'; +import type * as Base64ImageFieldModule from '@cardstack/base/base64-image'; +import type * as BigIntegerModule from '@cardstack/base/big-integer'; +import type * as BooleanFieldModule from '@cardstack/base/boolean'; +import type * as CardAPIModule from '@cardstack/base/card-api'; +import type * as CardsGridModule from '@cardstack/base/cards-grid'; +import type * as CodeRefModule from '@cardstack/base/code-ref'; +import type * as ColorFieldModule from '@cardstack/base/color'; +import type * as DateFieldModule from '@cardstack/base/date'; +import type * as DayFieldModule from '@cardstack/base/date/day'; +import type * as MonthFieldModule from '@cardstack/base/date/month'; +import type * as MonthDayFieldModule from '@cardstack/base/date/month-day'; +import type * as MonthYearFieldModule from '@cardstack/base/date/month-year'; +import type * as QuarterFieldModule from '@cardstack/base/date/quarter'; +import type * as WeekFieldModule from '@cardstack/base/date/week'; +import type * as YearFieldModule from '@cardstack/base/date/year'; +import type * as DateRangeFieldModule from '@cardstack/base/date-range-field'; +import type * as DateTimeFieldModule from '@cardstack/base/datetime'; +import type * as DatetimeStampFieldModule from '@cardstack/base/datetime-stamp'; +import type * as EmailFieldModule from '@cardstack/base/email'; +import type * as EnumModule from '@cardstack/base/enum'; +import type * as EthereumAddressModule from '@cardstack/base/ethereum-address'; +import type * as FileApiModule from '@cardstack/base/file-api'; +import type * as MarkdownFieldModule from '@cardstack/base/markdown'; +import type * as NumberFieldModule from '@cardstack/base/number'; +import type * as PhoneNumberFieldModule from '@cardstack/base/phone-number'; +import type * as RealmFieldModule from '@cardstack/base/realm'; +import type * as RichMarkdownModule from '@cardstack/base/rich-markdown'; +import type * as SearchableModule from '@cardstack/base/searchable'; +import type * as SkillModule from '@cardstack/base/skill'; +import type * as StringFieldModule from '@cardstack/base/string'; +import type * as SystemCardModule from '@cardstack/base/system-card'; +import type * as TextAreaFieldModule from '@cardstack/base/text-area'; +import type * as TimeFieldModule from '@cardstack/base/time'; +import type * as DurationFieldModule from '@cardstack/base/time/duration'; +import type * as RelativeTimeFieldModule from '@cardstack/base/time/relative-time'; +import type * as TimeRangeFieldModule from '@cardstack/base/time/time-range'; type StringField = (typeof StringFieldModule)['default']; let StringField: StringField; diff --git a/packages/host/tests/helpers/cards/view-card-demo.ts b/packages/host/tests/helpers/cards/view-card-demo.ts index d5a4e49e578..0552869ae31 100644 --- a/packages/host/tests/helpers/cards/view-card-demo.ts +++ b/packages/host/tests/helpers/cards/view-card-demo.ts @@ -7,8 +7,8 @@ export const viewCardDemoCardSource = ` field, contains, Component, - } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import { fn } from '@ember/helper' export class ViewCardDemo extends CardDef { diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts index 51562f3ab4d..80dbca1633e 100644 --- a/packages/host/tests/helpers/index.gts +++ b/packages/host/tests/helpers/index.gts @@ -64,12 +64,6 @@ import { normalizeRenderError, } from '@cardstack/host/utils/render-error'; -import type { - CardStore, - CardDef, - FieldDef, -} from 'https://cardstack.com/base/card-api'; - import { TestRealmAdapter } from './adapter'; import { testRealmServerMatrixUsername, setupMockMatrix } from './mock-matrix'; import percySnapshot from './percy-snapshot'; @@ -80,6 +74,7 @@ import { getTestRealmRegistry } from './test-realm-registry'; import visitOperatorMode from './visit-operator-mode'; import type { MockUtils } from './mock-matrix/_utils'; +import type { CardStore, CardDef, FieldDef } from '@cardstack/base/card-api'; import type { SimpleElement } from '@simple-dom/interface'; @@ -133,7 +128,7 @@ const { sqlSchema } = ENV; export const cardDefFieldCount = cardDefComputedFields?.length + 1; // standard computeds + `cardInfo` -type CardAPI = typeof import('https://cardstack.com/base/card-api'); +type CardAPI = typeof import('@cardstack/base/card-api'); type ModuleHooks = { after: (callback: () => void | Promise) => void; }; diff --git a/packages/host/tests/helpers/indexer.ts b/packages/host/tests/helpers/indexer.ts index 7d4c2869316..c60baa4c023 100644 --- a/packages/host/tests/helpers/indexer.ts +++ b/packages/host/tests/helpers/indexer.ts @@ -23,10 +23,10 @@ import { rri, } from '@cardstack/runtime-common'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { testRealmURL } from './index'; +import type { CardDef } from '@cardstack/base/card-api'; + const defaultIndexEntry = { generation: 1, realm_url: testRealmURL, diff --git a/packages/host/tests/helpers/interact-submode-setup.gts b/packages/host/tests/helpers/interact-submode-setup.gts index a8e30eef9a1..ae0857cd104 100644 --- a/packages/host/tests/helpers/interact-submode-setup.gts +++ b/packages/host/tests/helpers/interact-submode-setup.gts @@ -55,12 +55,12 @@ export function setupInteractSubmodeTests( setupAuthEndpoints(); let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); - let spec: typeof import('https://cardstack.com/base/spec'); - let cardsGrid: typeof import('https://cardstack.com/base/cards-grid'); - let fileApi: typeof import('https://cardstack.com/base/file-api'); - let imageFileApi: typeof import('https://cardstack.com/base/image-file-def'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); + let spec: typeof import('@cardstack/base/spec'); + let cardsGrid: typeof import('@cardstack/base/cards-grid'); + let fileApi: typeof import('@cardstack/base/file-api'); + let imageFileApi: typeof import('@cardstack/base/image-file-def'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); spec = await loader.import(`${baseRealm.url}spec`); diff --git a/packages/host/tests/helpers/mock-matrix/_client.ts b/packages/host/tests/helpers/mock-matrix/_client.ts index 9621bdc075d..9189fff43f2 100644 --- a/packages/host/tests/helpers/mock-matrix/_client.ts +++ b/packages/host/tests/helpers/mock-matrix/_client.ts @@ -33,17 +33,15 @@ import type { ExtendedClient } from '@cardstack/host/services/matrix-sdk-loader' import { assertNever } from '@cardstack/host/utils/assert-never'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; -import type { SerializedFile } from 'https://cardstack.com/base/file-api'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; -import type { MatrixEvent as DiscreteMatrixEvent } from 'https://cardstack.com/base/matrix-event'; -import type { ToolField } from 'https://cardstack.com/base/skill'; - import type { MockSDK } from './_sdk'; - import type { ServerState } from './_server-state'; - import type { Config } from '../mock-matrix'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { SerializedFile } from '@cardstack/base/file-api'; +import type { FileDef } from '@cardstack/base/file-api'; +import type { MatrixEvent as DiscreteMatrixEvent } from '@cardstack/base/matrix-event'; +import type { ToolField } from '@cardstack/base/skill'; + import type { MSC3575SlidingSyncRequest, MSC3575SlidingSyncResponse, diff --git a/packages/host/tests/helpers/mock-matrix/_utils.ts b/packages/host/tests/helpers/mock-matrix/_utils.ts index 68210e9d2fb..53427b68ac8 100644 --- a/packages/host/tests/helpers/mock-matrix/_utils.ts +++ b/packages/host/tests/helpers/mock-matrix/_utils.ts @@ -5,12 +5,11 @@ import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-con import type RealmService from '@cardstack/host/services/realm'; -import type { RealmEvent } from 'https://cardstack.com/base/matrix-event'; - import { setupAuthEndpoints } from '../'; import type { MockSDK } from './_sdk'; import type { Config } from '../mock-matrix'; +import type { RealmEvent } from '@cardstack/base/matrix-event'; import type * as MatrixSDK from 'matrix-js-sdk'; diff --git a/packages/host/tests/helpers/playground.ts b/packages/host/tests/helpers/playground.ts index a4bea8d0a9f..63de70b36e7 100644 --- a/packages/host/tests/helpers/playground.ts +++ b/packages/host/tests/helpers/playground.ts @@ -12,10 +12,10 @@ import { SpecSelection, } from '@cardstack/host/utils/local-storage-keys'; -import type { Format } from 'https://cardstack.com/base/card-api'; - import { testRealmURL, visitOperatorMode } from './index'; +import type { Format } from '@cardstack/base/card-api'; + export type { Format, PlaygroundSelection }; export const assertCardExists = ( diff --git a/packages/host/tests/helpers/render-component.ts b/packages/host/tests/helpers/render-component.ts index a2838d92e29..578922f8766 100644 --- a/packages/host/tests/helpers/render-component.ts +++ b/packages/host/tests/helpers/render-component.ts @@ -5,17 +5,13 @@ import { render, getContext } from '@ember/test-helpers'; import type { Loader } from '@cardstack/runtime-common'; import { baseRealm } from '@cardstack/runtime-common'; -import type { - BaseDef, - Format, - Field, -} from 'https://cardstack.com/base/card-api'; +import type { BaseDef, Format, Field } from '@cardstack/base/card-api'; import type { ComponentLike } from '@glint/template'; async function cardApi( loader: Loader, -): Promise { +): Promise { return await loader.import(`${baseRealm.url}card-api`); } diff --git a/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts b/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts index d07d07a4ca2..ef77a3d3af4 100644 --- a/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts +++ b/packages/host/tests/integration/commands/add-field-to-card-definition-command-test.gts @@ -48,8 +48,8 @@ module( mockMatrixUtils, contents: { 'person.gts': ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Person extends CardDef { static displayName = 'Person'; @field firstName = contains(StringField); @@ -87,8 +87,8 @@ module( assert.strictEqual( response, ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Person extends CardDef { static displayName = 'Person'; @field firstName = contains(StringField); @@ -135,8 +135,8 @@ module( assert.strictEqual( response, ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Person extends CardDef { static displayName = 'Person'; @field firstName = contains(StringField); diff --git a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts b/packages/host/tests/integration/commands/apply-markdown-edit-test.gts index ce205fbab71..447d9f8806a 100644 --- a/packages/host/tests/integration/commands/apply-markdown-edit-test.gts +++ b/packages/host/tests/integration/commands/apply-markdown-edit-test.gts @@ -9,8 +9,6 @@ import { baseRealm, type Loader } from '@cardstack/runtime-common'; import RealmService from '@cardstack/host/services/realm'; import ApplyMarkdownEditTool from '@cardstack/host/tools/apply-markdown-edit'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { setupCardLogs, setupIntegrationTestRealm, @@ -26,6 +24,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef } from '@cardstack/base/card-api'; + class StubRealmService extends RealmService { get defaultReadableRealm() { return { @@ -116,8 +116,8 @@ module('Integration | commands | apply-markdown-edit', function (hooks) { mockMatrixUtils, contents: { 'article.gts': ` - import { CardDef, field, contains } from "https://cardstack.com/base/card-api"; - import MarkdownField from "https://cardstack.com/base/markdown"; + import { CardDef, field, contains } from "@cardstack/base/card-api"; + import MarkdownField from "@cardstack/base/markdown"; export class Article extends CardDef { static displayName = 'Article'; diff --git a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts b/packages/host/tests/integration/commands/apply-search-replace-block-test.gts index 92f77c5998d..3385c4f8313 100644 --- a/packages/host/tests/integration/commands/apply-search-replace-block-test.gts +++ b/packages/host/tests/integration/commands/apply-search-replace-block-test.gts @@ -25,10 +25,10 @@ module('Integration | commands | apply-search-replace-block', function (hooks) { field, CardDef, Component, -} from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; -import DateTimeField from 'https://cardstack.com/base/datetime'; -import NumberField from 'https://cardstack.com/base/number'; +} from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; +import DateTimeField from '@cardstack/base/datetime'; +import NumberField from '@cardstack/base/number'; export class Task extends CardDef { static displayName = 'Task'; @@ -38,10 +38,10 @@ export class Task extends CardDef { @field priority = contains(NumberField); }`; const codeBlock = `${SEARCH_MARKER} -import NumberField from 'https://cardstack.com/base/number'; +import NumberField from '@cardstack/base/number'; ${SEPARATOR_MARKER} -import NumberField from 'https://cardstack.com/base/number'; -import BooleanField from 'https://cardstack.com/base/boolean'; +import NumberField from '@cardstack/base/number'; +import BooleanField from '@cardstack/base/boolean'; ${REPLACE_MARKER}`; let result = await applyCommand.execute({ @@ -54,11 +54,11 @@ ${REPLACE_MARKER}`; field, CardDef, Component, -} from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; -import DateTimeField from 'https://cardstack.com/base/datetime'; -import NumberField from 'https://cardstack.com/base/number'; -import BooleanField from 'https://cardstack.com/base/boolean'; +} from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; +import DateTimeField from '@cardstack/base/datetime'; +import NumberField from '@cardstack/base/number'; +import BooleanField from '@cardstack/base/boolean'; export class Task extends CardDef { static displayName = 'Task'; diff --git a/packages/host/tests/integration/commands/check-correctness-test.gts b/packages/host/tests/integration/commands/check-correctness-test.gts index 4d308a2da76..686eeba89bc 100644 --- a/packages/host/tests/integration/commands/check-correctness-test.gts +++ b/packages/host/tests/integration/commands/check-correctness-test.gts @@ -44,9 +44,9 @@ module('Integration | commands | check-correctness', function (hooks) { mockMatrixUtils, contents: { 'pet.gts': ` - import { contains, field, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; - import BooleanField from "https://cardstack.com/base/boolean"; + import { contains, field, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; + import BooleanField from "@cardstack/base/boolean"; export class Pet extends CardDef { static displayName = 'Pet'; @field name = contains(StringField); diff --git a/packages/host/tests/integration/commands/copy-and-edit-test.gts b/packages/host/tests/integration/commands/copy-and-edit-test.gts index 95943487e1c..dd0a4112fb1 100644 --- a/packages/host/tests/integration/commands/copy-and-edit-test.gts +++ b/packages/host/tests/integration/commands/copy-and-edit-test.gts @@ -8,8 +8,6 @@ import { realmURL as realmURLSymbol } from '@cardstack/runtime-common'; import { StackItem } from '@cardstack/host/lib/stack-item'; import CopyAndEditTool from '@cardstack/host/tools/copy-and-edit'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { setupIntegrationTestRealm, setupLocalIndexing, @@ -20,6 +18,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef } from '@cardstack/base/card-api'; + const otherRealmURL = 'http://other-realm/test2/'; module('Integration | commands | copy-and-edit', function (hooks) { @@ -40,8 +40,8 @@ module('Integration | commands | copy-and-edit', function (hooks) { realmURL: testRealmURL, contents: { 'content-card.gts': ` - import { CardDef, contains, field, linksTo, linksToMany } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { CardDef, contains, field, linksTo, linksToMany } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Child extends CardDef { static displayName = 'Child'; @@ -93,8 +93,8 @@ module('Integration | commands | copy-and-edit', function (hooks) { }, }, 'simple-card.gts': ` - import { CardDef, field, contains } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { CardDef, field, contains } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Theme extends CardDef { static displayName = 'Theme'; @@ -150,8 +150,8 @@ module('Integration | commands | copy-and-edit', function (hooks) { realmURL: otherRealmURL, contents: { 'content-card.gts': ` - import { CardDef, contains, field } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { CardDef, contains, field } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Child extends CardDef { static displayName = 'Child'; diff --git a/packages/host/tests/integration/commands/copy-card-test.gts b/packages/host/tests/integration/commands/copy-card-test.gts index 2948fd64a3b..f8278c5d9e3 100644 --- a/packages/host/tests/integration/commands/copy-card-test.gts +++ b/packages/host/tests/integration/commands/copy-card-test.gts @@ -7,8 +7,6 @@ import { StackItem } from '@cardstack/host/lib/stack-item'; import CopyCardToRealmTool from '@cardstack/host/tools/copy-card'; import CopyCardToStackTool from '@cardstack/host/tools/copy-card-to-stack'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { setupIntegrationTestRealm, setupLocalIndexing, @@ -19,6 +17,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef } from '@cardstack/base/card-api'; + const testRealm2URL = 'http://test-realm/test2/'; module('Integration | commands | copy-card', function (hooks) { @@ -39,8 +39,8 @@ module('Integration | commands | copy-card', function (hooks) { realmURL: testRealmURL, contents: { 'pet.gts': ` - import { contains, field, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Pet extends CardDef { static displayName = 'Pet'; @field firstName = contains(StringField); diff --git a/packages/host/tests/integration/commands/copy-source-test.gts b/packages/host/tests/integration/commands/copy-source-test.gts index 3be3050c340..3aa9055e845 100644 --- a/packages/host/tests/integration/commands/copy-source-test.gts +++ b/packages/host/tests/integration/commands/copy-source-test.gts @@ -51,8 +51,8 @@ module('Integration | commands | copy-source', function (hooks) { realmURL: testRealmURL, contents: { 'person.gts': ` - import { contains, field, Component, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, Component, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Person extends CardDef { static displayName = 'Person'; @field firstName = contains(StringField); diff --git a/packages/host/tests/integration/commands/create-spec-test.gts b/packages/host/tests/integration/commands/create-spec-test.gts index 824ad30a77b..c8c469e3cb3 100644 --- a/packages/host/tests/integration/commands/create-spec-test.gts +++ b/packages/host/tests/integration/commands/create-spec-test.gts @@ -6,8 +6,6 @@ import type { Loader } from '@cardstack/runtime-common/loader'; import CreateSpecTool from '@cardstack/host/tools/create-specs'; -import type { Spec } from 'https://cardstack.com/base/spec'; - import { testRealmURL, testRRI, @@ -24,6 +22,8 @@ import { setupBaseRealm } from '../../helpers/base-realm'; import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { Spec } from '@cardstack/base/spec'; + module('Integration | Command | create-specs', function (hooks) { setupRenderingTest(hooks); setupBaseRealm(hooks); @@ -86,19 +86,19 @@ module('Integration | Command | create-specs', function (hooks) { mockMatrixUtils, realmURL: testRealmURL, contents: { - 'test-card.gts': `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; + 'test-card.gts': `import { CardDef, field, contains } from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; export class TestCard extends CardDef { static displayName = 'Test Card'; @field name = contains(StringField); }`, - 'test-field.gts': `import { FieldDef } from 'https://cardstack.com/base/card-api'; + 'test-field.gts': `import { FieldDef } from '@cardstack/base/card-api'; export class TestField extends FieldDef { static displayName = 'Test Field'; }`, - 'app-card.gts': `import { CardDef } from 'https://cardstack.com/base/card-api'; + 'app-card.gts': `import { CardDef } from '@cardstack/base/card-api'; export class AppCard extends CardDef { static displayName = 'App Card'; @@ -113,7 +113,7 @@ export default class TestComponent extends Component { export default class TestCommand extends Command { static displayName = 'Test Command'; }`, - 'test-spec.gts': `import { Spec } from 'https://cardstack.com/base/spec'; + 'test-spec.gts': `import { Spec } from '@cardstack/base/spec'; export class TestSpec extends Spec { static displayName = 'Test Spec'; diff --git a/packages/host/tests/integration/commands/evaluate-module-test.gts b/packages/host/tests/integration/commands/evaluate-module-test.gts index 5311cb01c5e..f62c840bfe9 100644 --- a/packages/host/tests/integration/commands/evaluate-module-test.gts +++ b/packages/host/tests/integration/commands/evaluate-module-test.gts @@ -14,8 +14,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; const VALID_MODULE = ` - import { contains, field, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class ValidCard extends CardDef { static displayName = 'Valid Card'; @field name = contains(StringField); @@ -23,7 +23,7 @@ const VALID_MODULE = ` `; const BROKEN_IMPORT_MODULE = ` - import { CardDef, field, contains } from "https://cardstack.com/base/card-api"; + import { CardDef, field, contains } from "@cardstack/base/card-api"; import { Foo } from "./does-not-exist"; export class BrokenImportCard extends CardDef { static displayName = 'Broken Import Card'; diff --git a/packages/host/tests/integration/commands/fetch-card-json-test.gts b/packages/host/tests/integration/commands/fetch-card-json-test.gts index 1c6e1bcc886..05257d8a842 100644 --- a/packages/host/tests/integration/commands/fetch-card-json-test.gts +++ b/packages/host/tests/integration/commands/fetch-card-json-test.gts @@ -51,8 +51,8 @@ module('Integration | commands | fetch-card-json', function (hooks) { mockMatrixUtils, contents: { 'person.gts': ` - import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + import { CardDef, field, contains } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export class Person extends CardDef { static displayName = 'Person'; diff --git a/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts b/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts index 34cb8c18daf..5d3ca88c272 100644 --- a/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts +++ b/packages/host/tests/integration/commands/generate-example-cards-one-shot-test.gts @@ -78,8 +78,8 @@ module( setupIntegrationTestRealm({ mockMatrixUtils, contents: { - 'test-card.gts': `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; + 'test-card.gts': `import { CardDef, field, contains } from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; export class TestCard extends CardDef { static displayName = 'Test Card'; diff --git a/packages/host/tests/integration/commands/instantiate-card-test.gts b/packages/host/tests/integration/commands/instantiate-card-test.gts index f37a0f70f34..bd216329648 100644 --- a/packages/host/tests/integration/commands/instantiate-card-test.gts +++ b/packages/host/tests/integration/commands/instantiate-card-test.gts @@ -14,8 +14,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; const VALID_MODULE = ` - import { contains, field, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class ValidCard extends CardDef { static displayName = 'Valid Card'; @field name = contains(StringField); @@ -23,8 +23,8 @@ const VALID_MODULE = ` `; const TAGS_MODULE = ` - import { CardDef, field, contains, containsMany } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { CardDef, field, contains, containsMany } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class TagsCard extends CardDef { static displayName = 'Tags Card'; @field name = contains(StringField); diff --git a/packages/host/tests/integration/commands/open-create-listing-modal-test.gts b/packages/host/tests/integration/commands/open-create-listing-modal-test.gts index 5fa63248c00..fbbd8dcb9d0 100644 --- a/packages/host/tests/integration/commands/open-create-listing-modal-test.gts +++ b/packages/host/tests/integration/commands/open-create-listing-modal-test.gts @@ -42,8 +42,8 @@ module('Integration | commands | open-create-listing-modal', function (hooks) { FieldDef, contains, field, - } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class PetName extends FieldDef { static displayName = 'Pet Name'; diff --git a/packages/host/tests/integration/commands/patch-code-test.gts b/packages/host/tests/integration/commands/patch-code-test.gts index 30478f94b75..9d90c6a40cc 100644 --- a/packages/host/tests/integration/commands/patch-code-test.gts +++ b/packages/host/tests/integration/commands/patch-code-test.gts @@ -52,9 +52,9 @@ module('Integration | commands | patch-code', function (hooks) { field, CardDef, Component, -} from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; -import NumberField from 'https://cardstack.com/base/number'; +} from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; +import NumberField from '@cardstack/base/number'; export class Task extends CardDef { static displayName = 'Task'; @field cardTitle = contains(StringField); @@ -135,9 +135,9 @@ import { field, CardDef, Component, -} from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; -import NumberField from 'https://cardstack.com/base/number'; +} from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; +import NumberField from '@cardstack/base/number'; export class Task extends CardDef { static displayName = 'Task'; @field cardTitle = contains(StringField); diff --git a/packages/host/tests/integration/commands/patch-instance-test.gts b/packages/host/tests/integration/commands/patch-instance-test.gts index dde7d3e925f..2ec81bb88bd 100644 --- a/packages/host/tests/integration/commands/patch-instance-test.gts +++ b/packages/host/tests/integration/commands/patch-instance-test.gts @@ -13,8 +13,6 @@ import type { RealmIndexQueryEngine } from '@cardstack/runtime-common/realm-inde import type ToolService from '@cardstack/host/services/tool-service'; import PatchCardInstanceTool from '@cardstack/host/tools/patch-card-instance'; -import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api'; - import { testRealmURL, setupIntegrationTestRealm, @@ -39,6 +37,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef as CardDefType } from '@cardstack/base/card-api'; + module('Integration | commands | patch-instance', function (hooks) { setupRenderingTest(hooks); setupBaseRealm(hooks); diff --git a/packages/host/tests/integration/commands/preview-format-test.gts b/packages/host/tests/integration/commands/preview-format-test.gts index 9bf8914ee6e..f970da3583b 100644 --- a/packages/host/tests/integration/commands/preview-format-test.gts +++ b/packages/host/tests/integration/commands/preview-format-test.gts @@ -70,9 +70,9 @@ module('Integration | Command | preview-format', function (hooks) { mockMatrixUtils, contents: { 'rental-item.gts': ` - import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; - import NumberField from 'https://cardstack.com/base/number'; + import { CardDef, field, contains } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; + import NumberField from '@cardstack/base/number'; export class RentalItem extends CardDef { static displayName = 'RentalItem'; diff --git a/packages/host/tests/integration/commands/publish-realm-test.gts b/packages/host/tests/integration/commands/publish-realm-test.gts index 0963fc96929..5ba84c92b17 100644 --- a/packages/host/tests/integration/commands/publish-realm-test.gts +++ b/packages/host/tests/integration/commands/publish-realm-test.gts @@ -9,8 +9,6 @@ import { baseRealm, type Loader } from '@cardstack/runtime-common'; import RealmService from '@cardstack/host/services/realm'; import PublishRealmTool from '@cardstack/host/tools/publish-realm'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import { setupIntegrationTestRealm, setupLocalIndexing, @@ -24,6 +22,8 @@ import { setupBaseRealm } from '../../helpers/base-realm'; import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as BaseToolModule from '@cardstack/base/command'; + class StubRealmService extends RealmService { get defaultReadableRealm() { return { diff --git a/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts b/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts index aafa9d3034f..81d92f410b9 100644 --- a/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts +++ b/packages/host/tests/integration/commands/read-card-for-ai-assistant-test.gts @@ -51,9 +51,9 @@ module('Integration | commands | read-card-for-ai-assistant', function (hooks) { mockMatrixUtils, contents: { 'person.gts': ` - import { contains, field, CardDef, Component } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; - import NumberField from "https://cardstack.com/base/number"; + import { contains, field, CardDef, Component } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; + import NumberField from "@cardstack/base/number"; export class Person extends CardDef { @field firstName = contains(StringField); diff --git a/packages/host/tests/integration/commands/schema-generation-test.gts b/packages/host/tests/integration/commands/schema-generation-test.gts index 9edbd630d24..61d41117ba3 100644 --- a/packages/host/tests/integration/commands/schema-generation-test.gts +++ b/packages/host/tests/integration/commands/schema-generation-test.gts @@ -10,10 +10,10 @@ import { basicMappings } from '@cardstack/runtime-common/helpers/ai'; import type HostBaseTool from '@cardstack/host/lib/host-base-tool'; import { HostToolClasses } from '@cardstack/host/tools'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; - import { setupRenderingTest } from '../../helpers/setup'; +import type * as CardAPI from '@cardstack/base/card-api'; + module( 'Integration | Command | host command schema generation test', function (hooks) { diff --git a/packages/host/tests/integration/commands/search-and-choose-test.gts b/packages/host/tests/integration/commands/search-and-choose-test.gts index a72ddfa8d0d..17a1d8e866c 100644 --- a/packages/host/tests/integration/commands/search-and-choose-test.gts +++ b/packages/host/tests/integration/commands/search-and-choose-test.gts @@ -86,16 +86,16 @@ module('Integration | commands | search-and-choose', function (hooks) { setupRealmCacheTeardown(hooks); hooks.beforeEach(async function () { - const choiceSource = `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; + const choiceSource = `import { CardDef, field, contains } from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; // choice-source-marker export class Choice extends CardDef { static displayName = 'Choice'; @field cardTitle = contains(StringField); }`; - const contextSource = `import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; -import StringField from 'https://cardstack.com/base/string'; + const contextSource = `import { CardDef, field, contains } from '@cardstack/base/card-api'; +import StringField from '@cardstack/base/string'; // context-source-marker export class ContextCard extends CardDef { diff --git a/packages/host/tests/integration/commands/search-command-test.gts b/packages/host/tests/integration/commands/search-command-test.gts index ce8909f0d01..33e249a95d1 100644 --- a/packages/host/tests/integration/commands/search-command-test.gts +++ b/packages/host/tests/integration/commands/search-command-test.gts @@ -65,8 +65,8 @@ module('Integration | commands | search', function (hooks) { hooks.beforeEach(async function () { loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); diff --git a/packages/host/tests/integration/commands/show-card-test.gts b/packages/host/tests/integration/commands/show-card-test.gts index 08bf6474e04..b50a310f78b 100644 --- a/packages/host/tests/integration/commands/show-card-test.gts +++ b/packages/host/tests/integration/commands/show-card-test.gts @@ -19,8 +19,6 @@ import type { OperatorModeState } from '@cardstack/host/services/operator-mode-s import RealmService from '@cardstack/host/services/realm'; import ShowCardTool from '@cardstack/host/tools/show-card'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; - import { setupCardLogs, setupIntegrationTestRealm, @@ -35,6 +33,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as CardAPI from '@cardstack/base/card-api'; + class StubRealmService extends RealmService { get defaultReadableRealm() { return { @@ -155,8 +155,8 @@ module('Integration | Command | show-card', function (hooks) { mockMatrixUtils, contents: { 'person.gts': ` - import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + import { CardDef, field, contains } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export class Person extends CardDef { static displayName = 'Person'; @@ -170,8 +170,8 @@ module('Integration | Command | show-card', function (hooks) { } `, 'pet.gts': ` - import { CardDef, field, contains } from 'https://cardstack.com/base/card-api'; - import StringField from 'https://cardstack.com/base/string'; + import { CardDef, field, contains } from '@cardstack/base/card-api'; + import StringField from '@cardstack/base/string'; export class Pet extends CardDef { static displayName = 'Pet'; diff --git a/packages/host/tests/integration/commands/switch-submode-test.gts b/packages/host/tests/integration/commands/switch-submode-test.gts index 9cb1ccd30f7..f7977636fe2 100644 --- a/packages/host/tests/integration/commands/switch-submode-test.gts +++ b/packages/host/tests/integration/commands/switch-submode-test.gts @@ -10,8 +10,6 @@ import RealmService from '@cardstack/host/services/realm'; import type StoreService from '@cardstack/host/services/store'; import SwitchSubmodeTool from '@cardstack/host/tools/switch-submode'; -import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api'; - import { setupIntegrationTestRealm, setupLocalIndexing, @@ -24,6 +22,8 @@ import { CardDef, setupBaseRealm } from '../../helpers/base-realm'; import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef as CardDefType } from '@cardstack/base/card-api'; + let store: StoreService; class StubRealmService extends RealmService { diff --git a/packages/host/tests/integration/commands/sync-openrouter-models-test.gts b/packages/host/tests/integration/commands/sync-openrouter-models-test.gts index df23fafc321..cb30f4790cf 100644 --- a/packages/host/tests/integration/commands/sync-openrouter-models-test.gts +++ b/packages/host/tests/integration/commands/sync-openrouter-models-test.gts @@ -95,8 +95,8 @@ module('Integration | commands | sync-openrouter-models', function (hooks) { hooks.beforeEach(async function () { loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); let { field, contains, CardDef } = cardApi; diff --git a/packages/host/tests/integration/commands/transform-cards-test.gts b/packages/host/tests/integration/commands/transform-cards-test.gts index 83b6dd38aeb..d3fbe8db621 100644 --- a/packages/host/tests/integration/commands/transform-cards-test.gts +++ b/packages/host/tests/integration/commands/transform-cards-test.gts @@ -11,8 +11,6 @@ import RealmService from '@cardstack/host/services/realm'; import type { SearchCardsByQueryTool as SearchCardsByQueryCommandType } from '@cardstack/host/tools/search-cards'; import TransformCardsTool from '@cardstack/host/tools/transform-cards'; -import type * as CommandModule from 'https://cardstack.com/base/command'; - import { setupCardLogs, setupIntegrationTestRealm, @@ -26,6 +24,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as CommandModule from '@cardstack/base/command'; + class StubRealmService extends RealmService { get defaultReadableRealm() { return { @@ -61,9 +61,9 @@ module('Integration | commands | transform-cards', function (hooks) { hooks.beforeEach(async function () { loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); - let CommandModule: typeof import('https://cardstack.com/base/command'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); + let CommandModule: typeof import('@cardstack/base/command'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); diff --git a/packages/host/tests/integration/commands/unpublish-realm-test.gts b/packages/host/tests/integration/commands/unpublish-realm-test.gts index ba038d46c8a..829476dcd3e 100644 --- a/packages/host/tests/integration/commands/unpublish-realm-test.gts +++ b/packages/host/tests/integration/commands/unpublish-realm-test.gts @@ -9,8 +9,6 @@ import { baseRealm, type Loader } from '@cardstack/runtime-common'; import RealmService from '@cardstack/host/services/realm'; import UnpublishRealmTool from '@cardstack/host/tools/unpublish-realm'; -import type * as BaseToolModule from 'https://cardstack.com/base/command'; - import { setupIntegrationTestRealm, setupLocalIndexing, @@ -24,6 +22,8 @@ import { setupBaseRealm } from '../../helpers/base-realm'; import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as BaseToolModule from '@cardstack/base/command'; + class StubRealmService extends RealmService { get defaultReadableRealm() { return { diff --git a/packages/host/tests/integration/commands/update-room-skills-test.gts b/packages/host/tests/integration/commands/update-room-skills-test.gts index 02a40d40940..3e2baeef5c9 100644 --- a/packages/host/tests/integration/commands/update-room-skills-test.gts +++ b/packages/host/tests/integration/commands/update-room-skills-test.gts @@ -16,9 +16,6 @@ import type { Loader } from '@cardstack/runtime-common/loader'; import RealmService from '@cardstack/host/services/realm'; import UpdateRoomSkillsTool from '@cardstack/host/tools/update-room-skills'; -import type * as CardAPI from 'https://cardstack.com/base/card-api'; -import type { SerializedFile } from 'https://cardstack.com/base/file-api'; - import { setupCardLogs, setupIntegrationTestRealm, @@ -33,6 +30,9 @@ import { setupBaseRealm, ToolField, Skill } from '../../helpers/base-realm'; import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as CardAPI from '@cardstack/base/card-api'; +import type { SerializedFile } from '@cardstack/base/file-api'; + class StubRealmService extends RealmService { get defaultReadableRealm() { return { diff --git a/packages/host/tests/integration/commands/use-ai-assistant-test.gts b/packages/host/tests/integration/commands/use-ai-assistant-test.gts index 731c7e4c5ea..095774712aa 100644 --- a/packages/host/tests/integration/commands/use-ai-assistant-test.gts +++ b/packages/host/tests/integration/commands/use-ai-assistant-test.gts @@ -17,10 +17,6 @@ import type ToolService from '@cardstack/host/services/tool-service'; import UseAiAssistantTool from '@cardstack/host/tools/ai-assistant'; import OpenAiAssistantRoomTool from '@cardstack/host/tools/open-ai-assistant-room'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - -import type { Skill } from 'https://cardstack.com/base/skill'; - import { setupIntegrationTestRealm, setupLocalIndexing, @@ -33,6 +29,9 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef } from '@cardstack/base/card-api'; +import type { Skill } from '@cardstack/base/skill'; + let toolService: ToolService; class StubRealmService extends RealmService { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts index 511e5146dca..8d4e26e8814 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/commands-test.gts @@ -257,16 +257,16 @@ module('Integration | ai-assistant-panel | commands', function (hooks) { realmURL: readOnlyRealmURL, contents: { 'pet.gts': ` - import { contains, field, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; export class Pet extends CardDef { static displayName = 'Pet'; @field name = contains(StringField); } `, 'person.gts': ` - import { contains, field, linksTo, CardDef } from "https://cardstack.com/base/card-api"; - import StringField from "https://cardstack.com/base/string"; + import { contains, field, linksTo, CardDef } from "@cardstack/base/card-api"; + import StringField from "@cardstack/base/string"; import { Pet } from "./pet"; export class Person extends CardDef { static displayName = 'Person'; diff --git a/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts index 2c2227f4f60..aaebca3be3a 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/debug-message-test.gts @@ -20,9 +20,6 @@ import OperatorMode from '@cardstack/host/components/operator-mode/container'; import type MatrixService from '@cardstack/host/services/matrix-service'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { SerializedFile } from 'https://cardstack.com/base/file-api'; -import type { CardMessageContent } from 'https://cardstack.com/base/matrix-event'; - import { testRealmURL, setupCardLogs, @@ -39,6 +36,9 @@ import { setupMockMatrix } from '../../../helpers/mock-matrix'; import { renderComponent } from '../../../helpers/render-component'; import { setupRenderingTest } from '../../../helpers/setup'; +import type { SerializedFile } from '@cardstack/base/file-api'; +import type { CardMessageContent } from '@cardstack/base/matrix-event'; + module('Integration | ai-assistant-panel | debug-message', function (hooks) { const realmName = 'Debug Message Test Realm'; let loader: Loader; diff --git a/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts index a06e199190b..9642c46bee8 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/skills-test.gts @@ -26,8 +26,6 @@ import OperatorMode from '@cardstack/host/components/operator-mode/container'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { FileDef } from 'https://cardstack.com/base/file-api'; - import { addSkillToAiAssistant, envSkillId, @@ -57,6 +55,8 @@ import { setupMockMatrix } from '../../../helpers/mock-matrix'; import { renderComponent } from '../../../helpers/render-component'; import { setupRenderingTest } from '../../../helpers/setup'; +import type { FileDef } from '@cardstack/base/file-api'; + module('Integration | ai-assistant-panel | skills', function (hooks) { const realmName = 'Operator Mode Workspace'; let loader: Loader; @@ -185,7 +185,7 @@ module('Integration | ai-assistant-panel | skills', function (hooks) { import { Command } from '@cardstack/runtime-common'; import { SearchCardsByTypeAndTitleTool } from '@cardstack/boxel-host/commands/search-cards'; import ShowCardTool from '@cardstack/boxel-host/commands/show-card'; - import type { SearchCardsByTypeAndTitleInput } from 'https://cardstack.com/base/commands/search-card-result'; + import type { SearchCardsByTypeAndTitleInput } from '@cardstack/base/commands/search-card-result'; export default class SearchAndOpenCardCommand extends Command< typeof SearchCardsByTypeAndTitleInput, @@ -1161,6 +1161,25 @@ ${REPLACE_MARKER} }, ); + // The count is unchanged by an in-place definition update, so also wait + // for the definitions content itself to change before comparing. + await waitUntil( + () => { + let skillsState = getRoomState( + roomId, + APP_BOXEL_ROOM_SKILLS_EVENT_TYPE, + ); + return ( + JSON.stringify(skillsState?.toolDefinitions) !== + JSON.stringify(afterCodeModeRoomStateSkillsJson.toolDefinitions) + ); + }, + { + timeoutMessage: + 'timed out waiting for command definitions content to update', + }, + ); + const finalRoomStateSkillsJson = getRoomState( roomId, APP_BOXEL_ROOM_SKILLS_EVENT_TYPE, diff --git a/packages/host/tests/integration/components/ai-module-creation-test.gts b/packages/host/tests/integration/components/ai-module-creation-test.gts index e0197954d78..2578892a590 100644 --- a/packages/host/tests/integration/components/ai-module-creation-test.gts +++ b/packages/host/tests/integration/components/ai-module-creation-test.gts @@ -21,8 +21,6 @@ import ENV from '@cardstack/host/config/environment'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; -import type { CardMessageContent } from 'https://cardstack.com/base/matrix-event'; - import { testRealmURL, setupCardLogs, @@ -34,6 +32,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { renderComponent } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardMessageContent } from '@cardstack/base/matrix-event'; + class MockRouterService extends Service { replaceWith(_route: any, _args: any) { // This is a stub method that does nothing @@ -193,7 +193,7 @@ module('Integration | create app module via ai-assistant', function (hooks) { ); // Remove catalog app card dependency for now since we don't have catalog in tests - const moduleCode = `import { Component, CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from 'https://cardstack.com/base/card-api';\nimport StringField from 'https://cardstack.com/base/string';\nimport BooleanField from 'https://cardstack.com/base/boolean';\nimport DateField from 'https://cardstack.com/base/date';\nimport DateTimeField from 'https://cardstack.com/base/datetime';\nimport NumberField from 'https://cardstack.com/base/number';\nimport MarkdownField from 'https://cardstack.com/base/markdown';\n\nexport class Tour extends CardDef {\n static displayName = 'Tour';\n\n @field tourID = contains(StringField);\n @field date = contains(DateField);\n @field time = contains(DateTimeField);\n @field parentNames = contains(StringField);\n @field contactInformation = contains(StringField);\n @field notes = contains(MarkdownField);\n\n @field parents = linksToMany(() => Parent);\n}\n\nexport class Student extends CardDef {\n static displayName = 'Student';\n\n @field studentID = contains(StringField);\n @field name = contains(StringField);\n @field age = contains(NumberField);\n @field enrollmentDate = contains(DateField);\n @field parentInformation = contains(MarkdownField);\n @field allergiesMedicalNotes = contains(MarkdownField);\n @field attendanceRecords = containsMany(MarkdownField);\n \n @field parents = linksToMany(() => Parent);\n @field classes = linksToMany(() => Class);\n}\n\nexport class Parent extends CardDef {\n static displayName = 'Parent';\n\n @field parentID = contains(StringField);\n @field name = contains(StringField);\n @field contactInformation = contains(StringField);\n \n @field students = linksToMany(Student);\n @field tours = linksToMany(Tour);\n}\n\nexport class Staff extends CardDef {\n static displayName = 'Staff';\n\n @field staffID = contains(StringField);\n @field name = contains(StringField);\n @field role = contains(StringField);\n @field contactInformation = contains(StringField);\n @field schedule = contains(MarkdownField);\n}\n\nexport class Class extends CardDef {\n static displayName = 'Class';\n\n @field classID = contains(StringField);\n @field name = contains(StringField);\n @field schedule = contains(MarkdownField);\n \n @field instructor = linksTo(Staff);\n @field enrolledStudents = linksToMany(Student);\n}\n\nexport class Communication extends CardDef {\n static displayName = 'Communication';\n\n @field communicationID = contains(StringField);\n @field date = contains(DateField);\n @field type = contains(StringField);\n @field content = contains(MarkdownField);\n @field followUpDate = contains(DateField);\n}\n\nexport class PreschoolCRMApp extends CardDef {\n static displayName = 'Preschool CRM';\n\n @field tours = containsMany(Tour);\n @field students = containsMany(Student);\n @field parents = containsMany(Parent);\n @field staff = containsMany(Staff);\n @field classes = containsMany(Class);\n @field communications = containsMany(Communication);\n}\n`; + const moduleCode = `import { Component, CardDef, FieldDef, linksTo, linksToMany, field, contains, containsMany } from '@cardstack/base/card-api';\nimport StringField from '@cardstack/base/string';\nimport BooleanField from '@cardstack/base/boolean';\nimport DateField from '@cardstack/base/date';\nimport DateTimeField from '@cardstack/base/datetime';\nimport NumberField from '@cardstack/base/number';\nimport MarkdownField from '@cardstack/base/markdown';\n\nexport class Tour extends CardDef {\n static displayName = 'Tour';\n\n @field tourID = contains(StringField);\n @field date = contains(DateField);\n @field time = contains(DateTimeField);\n @field parentNames = contains(StringField);\n @field contactInformation = contains(StringField);\n @field notes = contains(MarkdownField);\n\n @field parents = linksToMany(() => Parent);\n}\n\nexport class Student extends CardDef {\n static displayName = 'Student';\n\n @field studentID = contains(StringField);\n @field name = contains(StringField);\n @field age = contains(NumberField);\n @field enrollmentDate = contains(DateField);\n @field parentInformation = contains(MarkdownField);\n @field allergiesMedicalNotes = contains(MarkdownField);\n @field attendanceRecords = containsMany(MarkdownField);\n \n @field parents = linksToMany(() => Parent);\n @field classes = linksToMany(() => Class);\n}\n\nexport class Parent extends CardDef {\n static displayName = 'Parent';\n\n @field parentID = contains(StringField);\n @field name = contains(StringField);\n @field contactInformation = contains(StringField);\n \n @field students = linksToMany(Student);\n @field tours = linksToMany(Tour);\n}\n\nexport class Staff extends CardDef {\n static displayName = 'Staff';\n\n @field staffID = contains(StringField);\n @field name = contains(StringField);\n @field role = contains(StringField);\n @field contactInformation = contains(StringField);\n @field schedule = contains(MarkdownField);\n}\n\nexport class Class extends CardDef {\n static displayName = 'Class';\n\n @field classID = contains(StringField);\n @field name = contains(StringField);\n @field schedule = contains(MarkdownField);\n \n @field instructor = linksTo(Staff);\n @field enrolledStudents = linksToMany(Student);\n}\n\nexport class Communication extends CardDef {\n static displayName = 'Communication';\n\n @field communicationID = contains(StringField);\n @field date = contains(DateField);\n @field type = contains(StringField);\n @field content = contains(MarkdownField);\n @field followUpDate = contains(DateField);\n}\n\nexport class PreschoolCRMApp extends CardDef {\n static displayName = 'Preschool CRM';\n\n @field tours = containsMany(Tour);\n @field students = containsMany(Student);\n @field parents = containsMany(Parent);\n @field staff = containsMany(Staff);\n @field classes = containsMany(Class);\n @field communications = containsMany(Communication);\n}\n`; simulateRemoteMessage(roomId, '@aibot:localhost', { msgtype: APP_BOXEL_MESSAGE_MSGTYPE, diff --git a/packages/host/tests/integration/components/brand-guide-attachments-test.gts b/packages/host/tests/integration/components/brand-guide-attachments-test.gts index d5f3289c203..18519738f69 100644 --- a/packages/host/tests/integration/components/brand-guide-attachments-test.gts +++ b/packages/host/tests/integration/components/brand-guide-attachments-test.gts @@ -5,13 +5,13 @@ import { module, test } from 'qunit'; import { baseRealm, type Loader } from '@cardstack/runtime-common'; -import type * as BrandGuideModule from 'https://cardstack.com/base/brand-guide'; -import type * as CardApiModule from 'https://cardstack.com/base/card-api'; - import { setupBaseRealm } from '../../helpers/base-realm'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as BrandGuideModule from '@cardstack/base/brand-guide'; +import type * as CardApiModule from '@cardstack/base/card-api'; + module('Integration | brand-guide | brand image attachments', function (hooks) { setupRenderingTest(hooks); setupBaseRealm(hooks); diff --git a/packages/host/tests/integration/components/brand-guide-custom-css-test.gts b/packages/host/tests/integration/components/brand-guide-custom-css-test.gts index b1957d34ebb..29bfe678745 100644 --- a/packages/host/tests/integration/components/brand-guide-custom-css-test.gts +++ b/packages/host/tests/integration/components/brand-guide-custom-css-test.gts @@ -5,12 +5,12 @@ import { module, test } from 'qunit'; import { baseRealm, type Loader } from '@cardstack/runtime-common'; -import type * as BrandGuideModule from 'https://cardstack.com/base/brand-guide'; - import { setupBaseRealm } from '../../helpers/base-realm'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as BrandGuideModule from '@cardstack/base/brand-guide'; + module('Integration | brand-guide | custom-css section', function (hooks) { setupRenderingTest(hooks); setupBaseRealm(hooks); diff --git a/packages/host/tests/integration/components/brand-logo-mark-field-test.gts b/packages/host/tests/integration/components/brand-logo-mark-field-test.gts index 7b616ab44cc..2b18e839997 100644 --- a/packages/host/tests/integration/components/brand-logo-mark-field-test.gts +++ b/packages/host/tests/integration/components/brand-logo-mark-field-test.gts @@ -10,14 +10,14 @@ import { type Loader, } from '@cardstack/runtime-common'; -import type * as BrandLogoModule from 'https://cardstack.com/base/brand-logo'; -import type * as CardApiModule from 'https://cardstack.com/base/card-api'; - import { provideConsumeContext } from '../../helpers'; import { setupBaseRealm } from '../../helpers/base-realm'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as BrandLogoModule from '@cardstack/base/brand-logo'; +import type * as CardApiModule from '@cardstack/base/card-api'; + module('Integration | brand-logo | MarkField edit', function (hooks) { setupRenderingTest(hooks); setupBaseRealm(hooks); diff --git a/packages/host/tests/integration/components/card-basics-test.gts b/packages/host/tests/integration/components/card-basics-test.gts index 0c7ca530f86..7af7fa9ea38 100644 --- a/packages/host/tests/integration/components/card-basics-test.gts +++ b/packages/host/tests/integration/components/card-basics-test.gts @@ -36,11 +36,6 @@ import { type CodeRef, } from '@cardstack/runtime-common'; -import type { - BaseDef, - SignatureFor, -} from 'https://cardstack.com/base/card-api'; - import { cleanWhiteSpace, p, @@ -95,6 +90,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type { BaseDef, SignatureFor } from '@cardstack/base/card-api'; + let loader: Loader; module('Integration | card-basics', function (hooks) { diff --git a/packages/host/tests/integration/components/card-chooser-test.gts b/packages/host/tests/integration/components/card-chooser-test.gts index 21fc954d10e..60b44dfa589 100644 --- a/packages/host/tests/integration/components/card-chooser-test.gts +++ b/packages/host/tests/integration/components/card-chooser-test.gts @@ -45,11 +45,11 @@ module('Integration | card-chooser', function (hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); - let textArea: typeof import('https://cardstack.com/base/text-area'); - let cardsGrid: typeof import('https://cardstack.com/base/cards-grid'); - let spec: typeof import('https://cardstack.com/base/spec'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); + let textArea: typeof import('@cardstack/base/text-area'); + let cardsGrid: typeof import('@cardstack/base/cards-grid'); + let spec: typeof import('@cardstack/base/spec'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); textArea = await loader.import(`${baseRealm.url}text-area`); diff --git a/packages/host/tests/integration/components/card-context-search-results-test.gts b/packages/host/tests/integration/components/card-context-search-results-test.gts index 3eab77340db..3fe0668ecc5 100644 --- a/packages/host/tests/integration/components/card-context-search-results-test.gts +++ b/packages/host/tests/integration/components/card-context-search-results-test.gts @@ -25,8 +25,6 @@ import { getCardCollection } from '@cardstack/host/resources/card-collection'; import { getCard } from '@cardstack/host/resources/card-resource'; import type StoreService from '@cardstack/host/services/store'; -import type { CardContext } from 'https://cardstack.com/base/card-api'; - import { setupIntegrationTestRealm, setupLocalIndexing, @@ -44,6 +42,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardContext } from '@cardstack/base/card-api'; + // The search surface is the card-facing `@context.searchResultsComponent`, // codified at the type level: the member exists and carries the component // contract. This fails the type-check (and so the suite) if that shape ever diff --git a/packages/host/tests/integration/components/card-copy-test.gts b/packages/host/tests/integration/components/card-copy-test.gts index 68795a6712c..2941ff66c93 100644 --- a/packages/host/tests/integration/components/card-copy-test.gts +++ b/packages/host/tests/integration/components/card-copy-test.gts @@ -19,11 +19,6 @@ import type { Realm } from '@cardstack/runtime-common/realm'; import OperatorMode from '@cardstack/host/components/operator-mode/container'; -import type { - IncrementalIndexEventContent, - IndexRealmEventContent, -} from 'https://cardstack.com/base/matrix-event'; - import { SYSTEM_CARD_FIXTURE_CONTENTS, percySnapshot, @@ -41,6 +36,11 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { renderComponent } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type { + IncrementalIndexEventContent, + IndexRealmEventContent, +} from '@cardstack/base/matrix-event'; + const testRealm2URL = `http://test-realm/test2/`; const readOnlyRealmURL = `http://test-realm/test-read-only/`; let loader: Loader; @@ -112,8 +112,8 @@ module('Integration | card-copy', function (hooks) { ].filter((a) => a.length > 0); operatorModeStateService.restore({ stacks }); }; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); diff --git a/packages/host/tests/integration/components/card-delete-test.gts b/packages/host/tests/integration/components/card-delete-test.gts index abf4e7f58b5..faddd0a3fa5 100644 --- a/packages/host/tests/integration/components/card-delete-test.gts +++ b/packages/host/tests/integration/components/card-delete-test.gts @@ -11,8 +11,6 @@ import type { Realm } from '@cardstack/runtime-common/realm'; import OperatorMode from '@cardstack/host/components/operator-mode/container'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { testRealmURL, testModuleRealm, @@ -29,9 +27,10 @@ import { renderComponent } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; import type { TestRealmAdapter } from '../../helpers/adapter'; +import type { CardDef } from '@cardstack/base/card-api'; let loader: Loader; -let cardApi: typeof import('https://cardstack.com/base/card-api'); +let cardApi: typeof import('@cardstack/base/card-api'); let setCardInOperatorModeState: ( leftCards: string[], rightCards?: string[], @@ -102,8 +101,8 @@ module('Integration | card-delete', function (hooks) { ].filter((a) => a.length > 0); operatorModeStateService.restore({ stacks }); }; - let cardApi: typeof import('https://cardstack.com/base/card-api'); - let string: typeof import('https://cardstack.com/base/string'); + let cardApi: typeof import('@cardstack/base/card-api'); + let string: typeof import('@cardstack/base/string'); cardApi = await loader.import(`${baseRealm.url}card-api`); string = await loader.import(`${baseRealm.url}string`); diff --git a/packages/host/tests/integration/components/card-info-thumbnail-picker-test.gts b/packages/host/tests/integration/components/card-info-thumbnail-picker-test.gts index c836e89a694..f8b1606aff0 100644 --- a/packages/host/tests/integration/components/card-info-thumbnail-picker-test.gts +++ b/packages/host/tests/integration/components/card-info-thumbnail-picker-test.gts @@ -10,13 +10,13 @@ import { type Loader, } from '@cardstack/runtime-common'; -import type * as CardApiModule from 'https://cardstack.com/base/card-api'; - import { provideConsumeContext } from '../../helpers'; import { setupBaseRealm } from '../../helpers/base-realm'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type * as CardApiModule from '@cardstack/base/card-api'; + module('Integration | card-info | thumbnail picker edit', function (hooks) { setupRenderingTest(hooks); setupBaseRealm(hooks); diff --git a/packages/host/tests/integration/components/field-markdown-domain-test.gts b/packages/host/tests/integration/components/field-markdown-domain-test.gts index 8e9fb7178d1..c2ff228cd08 100644 --- a/packages/host/tests/integration/components/field-markdown-domain-test.gts +++ b/packages/host/tests/integration/components/field-markdown-domain-test.gts @@ -5,21 +5,6 @@ import { module, test } from 'qunit'; import { baseRealm, type Loader } from '@cardstack/runtime-common'; -import type * as BrandFunctionalPaletteModule from 'https://cardstack.com/base/brand-functional-palette'; -import type * as BrandLogoModule from 'https://cardstack.com/base/brand-logo'; -import type * as CSSValueFieldModule from 'https://cardstack.com/base/css-value'; -import type * as CsvFileDefModule from 'https://cardstack.com/base/csv-file-def'; -import type * as GtsFileDefModule from 'https://cardstack.com/base/gts-file-def'; -import type * as ImageFileDefModule from 'https://cardstack.com/base/image-file-def'; -import type * as JsonFileDefModule from 'https://cardstack.com/base/json-file-def'; -import type * as MarkdownFileDefModule from 'https://cardstack.com/base/markdown-file-def'; -import type * as ResponseFieldModule from 'https://cardstack.com/base/response-field'; -import type * as StructuredThemeModule from 'https://cardstack.com/base/structured-theme'; -import type * as StructuredThemeVarsModule from 'https://cardstack.com/base/structured-theme-variables'; -import type * as TextFileDefModule from 'https://cardstack.com/base/text-file-def'; -import type * as TsFileDefModule from 'https://cardstack.com/base/ts-file-def'; -import type * as TypographyFieldModule from 'https://cardstack.com/base/typography'; - import { CardDef, CardInfoField, @@ -31,9 +16,26 @@ import { setupBaseRealm, StringField, } from '../../helpers/base-realm'; + import { renderCard } from '../../helpers/render-component'; + import { setupRenderingTest } from '../../helpers/setup'; +import type * as BrandFunctionalPaletteModule from '@cardstack/base/brand-functional-palette'; +import type * as BrandLogoModule from '@cardstack/base/brand-logo'; +import type * as CSSValueFieldModule from '@cardstack/base/css-value'; +import type * as CsvFileDefModule from '@cardstack/base/csv-file-def'; +import type * as GtsFileDefModule from '@cardstack/base/gts-file-def'; +import type * as ImageFileDefModule from '@cardstack/base/image-file-def'; +import type * as JsonFileDefModule from '@cardstack/base/json-file-def'; +import type * as MarkdownFileDefModule from '@cardstack/base/markdown-file-def'; +import type * as ResponseFieldModule from '@cardstack/base/response-field'; +import type * as StructuredThemeModule from '@cardstack/base/structured-theme'; +import type * as StructuredThemeVarsModule from '@cardstack/base/structured-theme-variables'; +import type * as TextFileDefModule from '@cardstack/base/text-file-def'; +import type * as TsFileDefModule from '@cardstack/base/ts-file-def'; +import type * as TypographyFieldModule from '@cardstack/base/typography'; + // Verifies the explicit `static markdown` templates added per CS-10787 to // domain/reference/file/theme fields. Fields are tested via a CardDef wrapper // whose `isolated` template embeds `<@fields.foo @format='markdown' />` inside diff --git a/packages/host/tests/integration/components/field-markdown-specialized-test.gts b/packages/host/tests/integration/components/field-markdown-specialized-test.gts index 2d8f0999c87..6a3c69d676c 100644 --- a/packages/host/tests/integration/components/field-markdown-specialized-test.gts +++ b/packages/host/tests/integration/components/field-markdown-specialized-test.gts @@ -5,16 +5,6 @@ import { module, test } from 'qunit'; import { baseRealm, type Loader } from '@cardstack/runtime-common'; -import type * as AddressFieldModule from 'https://cardstack.com/base/address'; -import type * as ColorFieldModule from 'https://cardstack.com/base/color'; -import type * as CoordinateFieldModule from 'https://cardstack.com/base/coordinate'; -import type * as CountryFieldModule from 'https://cardstack.com/base/country'; -import type * as DateRangeFieldModule from 'https://cardstack.com/base/date-range-field'; -import type * as LLMModelFieldModule from 'https://cardstack.com/base/llm-model'; -import type * as PercentageFieldModule from 'https://cardstack.com/base/percentage'; -import type * as UrlFieldModule from 'https://cardstack.com/base/url'; -import type * as WebsiteFieldModule from 'https://cardstack.com/base/website'; - import { BigIntegerField, BooleanField, @@ -31,9 +21,21 @@ import { field, setupBaseRealm, } from '../../helpers/base-realm'; + import { renderCard } from '../../helpers/render-component'; + import { setupRenderingTest } from '../../helpers/setup'; +import type * as AddressFieldModule from '@cardstack/base/address'; +import type * as ColorFieldModule from '@cardstack/base/color'; +import type * as CoordinateFieldModule from '@cardstack/base/coordinate'; +import type * as CountryFieldModule from '@cardstack/base/country'; +import type * as DateRangeFieldModule from '@cardstack/base/date-range-field'; +import type * as LLMModelFieldModule from '@cardstack/base/llm-model'; +import type * as PercentageFieldModule from '@cardstack/base/percentage'; +import type * as UrlFieldModule from '@cardstack/base/url'; +import type * as WebsiteFieldModule from '@cardstack/base/website'; + // Verifies the explicit `static markdown` templates added per CS-10786 to // specialized fields. Each primitive/composite field renders through a // CardDef wrapper whose `isolated` template invokes `<@fields.foo diff --git a/packages/host/tests/integration/components/get-relationship-membership-state-test.gts b/packages/host/tests/integration/components/get-relationship-membership-state-test.gts index 6a692d198d6..821e6070fee 100644 --- a/packages/host/tests/integration/components/get-relationship-membership-state-test.gts +++ b/packages/host/tests/integration/components/get-relationship-membership-state-test.gts @@ -12,11 +12,6 @@ import { } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { - RelationshipState as RelationshipStateType, - RelationshipStatus as RelationshipStatusType, -} from 'https://cardstack.com/base/card-api'; - import { provideConsumeContext, saveCard, @@ -40,6 +35,11 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { + RelationshipState as RelationshipStateType, + RelationshipStatus as RelationshipStatusType, +} from '@cardstack/base/card-api'; + type RelationshipState = RelationshipStateType; type NotLoadedSentinel = { type: 'not-loaded'; reference: string }; type LinkErrorSentinel = { diff --git a/packages/host/tests/integration/components/linksto-broken-link-placeholder-test.gts b/packages/host/tests/integration/components/linksto-broken-link-placeholder-test.gts index 2a32958d811..210b89cb1e8 100644 --- a/packages/host/tests/integration/components/linksto-broken-link-placeholder-test.gts +++ b/packages/host/tests/integration/components/linksto-broken-link-placeholder-test.gts @@ -13,8 +13,6 @@ import { } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api'; - import { provideConsumeContext, setupCardLogs, @@ -37,6 +35,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef as CardDefType } from '@cardstack/base/card-api'; + const GHOST_URL = `${testRealmURL}Pet/ghost`; // The cards are declared inside a helper rather than at module scope because the @@ -347,9 +347,9 @@ module( pet: { links: { self: GHOST_URL } }, }); - let api = await loader.import< - typeof import('https://cardstack.com/base/card-api') - >(`${baseRealm.url}card-api`); + let api = await loader.import( + `${baseRealm.url}card-api`, + ); let PersonComponent = api.getComponent(person); let renderCount = 0; diff --git a/packages/host/tests/integration/components/linksto-error-sentinel-test.gts b/packages/host/tests/integration/components/linksto-error-sentinel-test.gts index 059e371bcce..def989ae09a 100644 --- a/packages/host/tests/integration/components/linksto-error-sentinel-test.gts +++ b/packages/host/tests/integration/components/linksto-error-sentinel-test.gts @@ -12,13 +12,6 @@ import { } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api'; -import type { - RelationshipState, - RelationshipStatus, -} from 'https://cardstack.com/base/card-api'; -import type * as FieldSupportModule from 'https://cardstack.com/base/field-support'; - import { provideConsumeContext, setupCardLogs, @@ -44,6 +37,13 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { + RelationshipState, + RelationshipStatus, +} from '@cardstack/base/card-api'; +import type { CardDef as CardDefType } from '@cardstack/base/card-api'; +import type * as FieldSupportModule from '@cardstack/base/field-support'; + // A terminal sentinel never escapes the field getter — userland reads // `undefined` — so tests read the raw bucket entry to observe the planted // shape, and `getRelationshipMembershipState` to observe the structured failure. diff --git a/packages/host/tests/integration/components/linksto-many-broken-link-placeholder-test.gts b/packages/host/tests/integration/components/linksto-many-broken-link-placeholder-test.gts index 9d51fba61d8..84c769b656f 100644 --- a/packages/host/tests/integration/components/linksto-many-broken-link-placeholder-test.gts +++ b/packages/host/tests/integration/components/linksto-many-broken-link-placeholder-test.gts @@ -12,8 +12,6 @@ import { } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api'; - import { provideConsumeContext, setupCardLogs, @@ -36,6 +34,8 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef as CardDefType } from '@cardstack/base/card-api'; + const GHOST_URL = `${testRealmURL}Pet/ghost`; const MANGO_URL = `${testRealmURL}Pet/mango`; const VANGOGH_URL = `${testRealmURL}Pet/vangogh`; @@ -296,9 +296,9 @@ module( 'pets.0': { links: { self: GHOST_URL } }, }); - let api = await loader.import< - typeof import('https://cardstack.com/base/card-api') - >(`${baseRealm.url}card-api`); + let api = await loader.import( + `${baseRealm.url}card-api`, + ); let PersonComponent = api.getComponent(person); let renderCount = 0; diff --git a/packages/host/tests/integration/components/linksto-many-per-slot-access-test.gts b/packages/host/tests/integration/components/linksto-many-per-slot-access-test.gts index 1552e51b855..598a609aabf 100644 --- a/packages/host/tests/integration/components/linksto-many-per-slot-access-test.gts +++ b/packages/host/tests/integration/components/linksto-many-per-slot-access-test.gts @@ -12,11 +12,6 @@ import { } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { - CardDef as CardDefType, - RelationshipState as RelationshipStateType, -} from 'https://cardstack.com/base/card-api'; - import { provideConsumeContext, saveCard, @@ -40,6 +35,11 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { + CardDef as CardDefType, + RelationshipState as RelationshipStateType, +} from '@cardstack/base/card-api'; + const MANGO_URL = `${testRealmURL}Pet/mango`; const VANGOGH_URL = `${testRealmURL}Pet/vangogh`; const GHOST_URL = `${testRealmURL}Pet/ghost`; diff --git a/packages/host/tests/integration/components/linksto-sentinel-roundtrip-test.gts b/packages/host/tests/integration/components/linksto-sentinel-roundtrip-test.gts index be1e1fbab6a..e7afcd633db 100644 --- a/packages/host/tests/integration/components/linksto-sentinel-roundtrip-test.gts +++ b/packages/host/tests/integration/components/linksto-sentinel-roundtrip-test.gts @@ -11,12 +11,6 @@ import { } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { - RelationshipState, - RelationshipStatus, -} from 'https://cardstack.com/base/card-api'; -import type * as FieldSupportModule from 'https://cardstack.com/base/field-support'; - import { provideConsumeContext, setupCardLogs, @@ -41,6 +35,12 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { + RelationshipState, + RelationshipStatus, +} from '@cardstack/base/card-api'; +import type * as FieldSupportModule from '@cardstack/base/field-support'; + // A terminal sentinel never escapes the field getter — userland reads // `undefined` — so tests read the raw bucket entry to observe the planted shape. function bucketEntry(instance: any, fieldName: string): any { diff --git a/packages/host/tests/integration/components/linksto-singular-js-access-contract-test.gts b/packages/host/tests/integration/components/linksto-singular-js-access-contract-test.gts index 6e8814ffaff..ced1d83533d 100644 --- a/packages/host/tests/integration/components/linksto-singular-js-access-contract-test.gts +++ b/packages/host/tests/integration/components/linksto-singular-js-access-contract-test.gts @@ -12,9 +12,6 @@ import { } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { CardDef as CardDefType } from 'https://cardstack.com/base/card-api'; -import type * as FieldSupportModule from 'https://cardstack.com/base/field-support'; - import { provideConsumeContext, setupCardLogs, @@ -35,6 +32,9 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef as CardDefType } from '@cardstack/base/card-api'; +import type * as FieldSupportModule from '@cardstack/base/field-support'; + // The contract under test is the *userland* JS shape of `card.linkField`: // strict-equality, optional-chain, and raw-access semantics across all five // relationship states the singular `linksTo` getter can be in. `getRelationshipMembershipState` diff --git a/packages/host/tests/integration/components/loading-test.gts b/packages/host/tests/integration/components/loading-test.gts index 50e3f45daba..15ebf284bc0 100644 --- a/packages/host/tests/integration/components/loading-test.gts +++ b/packages/host/tests/integration/components/loading-test.gts @@ -4,8 +4,6 @@ import { module, test } from 'qunit'; import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; -import type { CardDef } from 'https://cardstack.com/base/card-api'; - import { testRealmURL, testRRI, @@ -21,12 +19,14 @@ import { setupMockMatrix } from '../../helpers/mock-matrix'; import { renderCard } from '../../helpers/render-component'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef } from '@cardstack/base/card-api'; + module('Integration | loading', function (hooks) { setupRenderingTest(hooks); const realmName = 'Operator Mode Workspace'; let loader: Loader; - let cardApi: typeof import('https://cardstack.com/base/card-api'); + let cardApi: typeof import('@cardstack/base/card-api'); hooks.beforeEach(function () { loader = getService('loader-service').loader; @@ -51,7 +51,7 @@ module('Integration | loading', function (hooks) { let cardWithBrokenIconDefSource = ` import NonExistentIcon from '@cardstack/boxel-icons/non-existent'; - import { CardDef } from 'https://cardstack.com/base/card-api'; + import { CardDef } from '@cardstack/base/card-api'; export class CardWithBrokenIcon extends CardDef { static icon = NonExistentIcon; diff --git a/packages/host/tests/integration/components/markdown-embed-preview-pane-test.gts b/packages/host/tests/integration/components/markdown-embed-preview-pane-test.gts index 36807c37e09..01e671e67b9 100644 --- a/packages/host/tests/integration/components/markdown-embed-preview-pane-test.gts +++ b/packages/host/tests/integration/components/markdown-embed-preview-pane-test.gts @@ -30,7 +30,6 @@ import type StoreService from '@cardstack/host/services/store'; // The base-realm helper below exports `CardDef` as a value (for defining test // card classes); import the instance *type* separately for annotations. -import type { CardDef as CardDefInstance } from 'https://cardstack.com/base/card-api'; import { setupIntegrationTestRealm, @@ -47,6 +46,8 @@ import { import { setupMockMatrix } from '../../helpers/mock-matrix'; import { setupRenderingTest } from '../../helpers/setup'; +import type { CardDef as CardDefInstance } from '@cardstack/base/card-api'; + const PaneBox: TOC<{ Blocks: { default: [] } }> =