diff --git a/packages/host/app/lib/file-def-manager.ts b/packages/host/app/lib/file-def-manager.ts index 4598690eb7e..8db516f5f79 100644 --- a/packages/host/app/lib/file-def-manager.ts +++ b/packages/host/app/lib/file-def-manager.ts @@ -8,7 +8,6 @@ import { APP_BOXEL_MESSAGE_MSGTYPE, APP_BOXEL_CODE_PATCH_CORRECTNESS_MSGTYPE, APP_BOXEL_ROOM_SKILLS_EVENT_TYPE, - baseRealm, codeRefWithAbsoluteIdentifier, getClass, getToolDefinitions, @@ -317,7 +316,7 @@ export default class FileDefManagerImpl let { default: Base64ImageField } = await this.loaderService.loader.import<{ default: typeof Base64ImageFieldType; - }>(`${baseRealm.url}base64-image`); + }>('@cardstack/base/base64-image'); let serialization = await this.cardService.serializeCard(card, { omitFields: [Base64ImageField], ...opts, diff --git a/packages/host/app/lib/host-base-tool.ts b/packages/host/app/lib/host-base-tool.ts index 633baefe341..08d7867bf4b 100644 --- a/packages/host/app/lib/host-base-tool.ts +++ b/packages/host/app/lib/host-base-tool.ts @@ -3,8 +3,6 @@ import { service } from '@ember/service'; import { Command, type ToolContext } from '@cardstack/runtime-common'; -import { baseRealm } from '@cardstack/runtime-common'; - import type LoaderService from '../services/loader-service'; import type { CardDefConstructor } from '@cardstack/base/card-api'; import type * as BaseToolModule from '@cardstack/base/command'; @@ -22,7 +20,7 @@ export default abstract class HostBaseTool< protected loadToolModule(): Promise { return this.loaderService.loader.import( - `${baseRealm.url}command`, + '@cardstack/base/command', ); } } diff --git a/packages/host/app/routes/module.ts b/packages/host/app/routes/module.ts index 7682de73dab..cba2f3b13ed 100644 --- a/packages/host/app/routes/module.ts +++ b/packages/host/app/routes/module.ts @@ -20,7 +20,6 @@ import { type SearchablePathDiagnostic, isBaseDef, baseCardRef, - baseRealm, Deferred, loadCardDef, internalKeyFor, @@ -396,7 +395,7 @@ async function validateModuleSearchablePaths( } try { let loader = context.loaderService.loader; - let api = await loader.import(`${baseRealm.url}card-api`); + let api = await loader.import('@cardstack/base/card-api'); let lookupDefinition = async ( codeRef: CodeRef, ): Promise => { @@ -455,7 +454,7 @@ async function makeDefinition( let urlString = url instanceof URL ? url.href : url; try { let api = await context.loaderService.loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); let { fields, fieldDefs } = getFieldDefinitions(api, cardOrFieldDef); let codeRef = identifyCard(cardOrFieldDef) as ResolvedCodeRef; diff --git a/packages/host/app/tools/get-card-type-schema.ts b/packages/host/app/tools/get-card-type-schema.ts index bf286dc7c5d..c26feccc552 100644 --- a/packages/host/app/tools/get-card-type-schema.ts +++ b/packages/host/app/tools/get-card-type-schema.ts @@ -1,8 +1,4 @@ -import { - baseRealm, - getClass, - type ResolvedCodeRef, -} from '@cardstack/runtime-common'; +import { getClass, type ResolvedCodeRef } from '@cardstack/runtime-common'; import { basicMappings, generateJsonSchemaForCardType, @@ -44,7 +40,7 @@ export default class GetCardTypeSchemaTool extends HostBaseTool< } let cardApi = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); let mappings = await basicMappings(loader); let schema = generateJsonSchemaForCardType( diff --git a/packages/host/tests/acceptance/basic-test.gts b/packages/host/tests/acceptance/basic-test.gts index 7398f12e028..82cb9ee1e5b 100644 --- a/packages/host/tests/acceptance/basic-test.gts +++ b/packages/host/tests/acceptance/basic-test.gts @@ -3,8 +3,6 @@ import { click, find, visit, waitFor } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; - import { setupLocalIndexing, setupAcceptanceTestRealm, @@ -39,12 +37,12 @@ module('Acceptance | basic tests', function (hooks) { let loader = loaderService.loader; let { field, contains, CardDef, Component } = await loader.import< typeof import('@cardstack/base/card-api') - >(`${baseRealm.url}card-api`); + >('@cardstack/base/card-api'); let { default: StringField } = await loader.import< typeof import('@cardstack/base/string') - >(`${baseRealm.url}string`); + >('@cardstack/base/string'); let { Spec } = await loader.import( - `${baseRealm.url}spec`, + '@cardstack/base/spec', ); class Index extends CardDef { 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 07ca33acdf7..f0a126d4756 100644 --- a/packages/host/tests/acceptance/code-submode/card-playground-test.gts +++ b/packages/host/tests/acceptance/code-submode/card-playground-test.gts @@ -319,7 +319,7 @@ module('Acceptance | code-submode | card playground', function (_hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; let cardsGrid: typeof import('@cardstack/base/cards-grid'); - cardsGrid = await loader.import(`${baseRealm.url}cards-grid`); + cardsGrid = await loader.import('@cardstack/base/cards-grid'); let { CardsGrid } = cardsGrid; createAndJoinRoom({ 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 066ed0f0837..54f5182d008 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 @@ -4,8 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; - import { setupAcceptanceTestRealm, setupLocalIndexing, @@ -35,9 +33,9 @@ module('Acceptance | code submode | file def navigation', function (hooks) { 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`); - fileApi = await loader.import(`${baseRealm.url}file-api`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + fileApi = await loader.import('@cardstack/base/file-api'); let { field, contains, linksTo, CardDef, Component } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/acceptance/file-def-test.gts b/packages/host/tests/acceptance/file-def-test.gts index 23347e64649..1faa9a2ec78 100644 --- a/packages/host/tests/acceptance/file-def-test.gts +++ b/packages/host/tests/acceptance/file-def-test.gts @@ -3,7 +3,7 @@ import { waitFor, waitUntil } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { Deferred, baseRealm, type Realm } from '@cardstack/runtime-common'; +import { Deferred, type Realm } from '@cardstack/runtime-common'; import { SYSTEM_CARD_FIXTURE_CONTENTS, @@ -65,11 +65,11 @@ module('Acceptance | file def', function (hooks) { 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`); - markdown = await loader.import(`${baseRealm.url}markdown`); - markdownFileDef = await loader.import(`${baseRealm.url}markdown-file-def`); - skillModule = await loader.import(`${baseRealm.url}skill`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + markdown = await loader.import('@cardstack/base/markdown'); + markdownFileDef = await loader.import('@cardstack/base/markdown-file-def'); + skillModule = await loader.import('@cardstack/base/skill'); let { field, contains, linksTo, Component, CardDef } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/acceptance/host-mode-test.gts b/packages/host/tests/acceptance/host-mode-test.gts index 96fef7b1503..c7462e5fd7e 100644 --- a/packages/host/tests/acceptance/host-mode-test.gts +++ b/packages/host/tests/acceptance/host-mode-test.gts @@ -12,7 +12,6 @@ import { getPageTitle } from 'ember-page-title/test-support'; import window from 'ember-window-mock'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import { Deferred } from '@cardstack/runtime-common'; import HostModeService from '@cardstack/host/services/host-mode-service'; @@ -89,8 +88,8 @@ module('Acceptance | host mode tests', function (hooks) { let loader = getService('loader-service').loader; 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`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { field, contains, CardDef, Component } = cardApi; let { default: StringField } = string; 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 956d7251b8f..1d1c84e220f 100644 --- a/packages/host/tests/acceptance/interact-submode/create-file-test.gts +++ b/packages/host/tests/acceptance/interact-submode/create-file-test.gts @@ -221,7 +221,7 @@ module('Acceptance | interact submode | create-file tests', function (hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; let cardsGrid: typeof import('@cardstack/base/cards-grid'); - cardsGrid = await loader.import(`${baseRealm.url}cards-grid`); + cardsGrid = await loader.import('@cardstack/base/cards-grid'); let { CardsGrid } = cardsGrid; await withCachedRealmSetup(async () => { diff --git a/packages/host/tests/acceptance/operator-mode-acceptance-test.gts b/packages/host/tests/acceptance/operator-mode-acceptance-test.gts index 36c7c471627..67b3d3905fb 100644 --- a/packages/host/tests/acceptance/operator-mode-acceptance-test.gts +++ b/packages/host/tests/acceptance/operator-mode-acceptance-test.gts @@ -17,7 +17,6 @@ import { module, test } from 'qunit'; import { FieldContainer } from '@cardstack/boxel-ui/components'; import { - baseRealm, ensureTrailingSlash, type Realm, type LooseSingleCardDocument, @@ -101,8 +100,8 @@ module('Acceptance | operator mode tests', function (hooks) { let loader = getService('loader-service').loader; 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`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { field, diff --git a/packages/host/tests/acceptance/prerender-html-test.gts b/packages/host/tests/acceptance/prerender-html-test.gts index d0bc9d6490f..603e88f7567 100644 --- a/packages/host/tests/acceptance/prerender-html-test.gts +++ b/packages/host/tests/acceptance/prerender-html-test.gts @@ -4,10 +4,9 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { - type RenderRouteOptions, - type RenderError, - baseRealm, +import type { + RenderRouteOptions, + RenderError, } from '@cardstack/runtime-common'; import { @@ -48,7 +47,7 @@ module('Acceptance | prerender | html', function (hooks) { (globalThis as any).__doNotSuppressRenderRouteError = true; let loader = getService('loader-service').loader; let cardApi: typeof import('@cardstack/base/card-api'); - cardApi = await loader.import(`${baseRealm.url}card-api`); + cardApi = await loader.import('@cardstack/base/card-api'); let { field, diff --git a/packages/host/tests/acceptance/prerender-meta-test.gts b/packages/host/tests/acceptance/prerender-meta-test.gts index e6d5118fef4..4b1815b5d85 100644 --- a/packages/host/tests/acceptance/prerender-meta-test.gts +++ b/packages/host/tests/acceptance/prerender-meta-test.gts @@ -5,7 +5,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, baseRealmRRI, diffDoc, type PrerenderMeta, @@ -64,7 +63,7 @@ module('Acceptance | prerender | meta', function (hooks) { hooks.beforeEach(async function () { let loader = getService('loader-service').loader; let cardApi: typeof import('@cardstack/base/card-api'); - cardApi = await loader.import(`${baseRealm.url}card-api`); + cardApi = await loader.import('@cardstack/base/card-api'); let { field, diff --git a/packages/host/tests/acceptance/prerender-module-test.gts b/packages/host/tests/acceptance/prerender-module-test.gts index ce31c67a102..2132323a0e3 100644 --- a/packages/host/tests/acceptance/prerender-module-test.gts +++ b/packages/host/tests/acceptance/prerender-module-test.gts @@ -5,7 +5,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, baseRealmRRI, rri, trimExecutableExtension, @@ -207,7 +206,7 @@ module('Acceptance | prerender | module', function (hooks) { let loaderService = getService('loader-service'); let loader = loaderService.loader; let cardApi: typeof import('@cardstack/base/card-api'); - cardApi = await loader.import(`${baseRealm.url}card-api`); + cardApi = await loader.import('@cardstack/base/card-api'); let { field, contains, CardDef, StringField } = cardApi; class Shimmed extends CardDef { diff --git a/packages/host/tests/acceptance/theme-card-test.gts b/packages/host/tests/acceptance/theme-card-test.gts index 0e40de8b899..94b60dfe6cc 100644 --- a/packages/host/tests/acceptance/theme-card-test.gts +++ b/packages/host/tests/acceptance/theme-card-test.gts @@ -7,7 +7,7 @@ import { module, test } from 'qunit'; import { BoxelInput } from '@cardstack/boxel-ui/components'; -import { baseRealm, Deferred } from '@cardstack/runtime-common'; +import { Deferred } from '@cardstack/runtime-common'; import { percySnapshot, @@ -212,8 +212,8 @@ module('Acceptance | theme-card-test', function (hooks) { let loader = getService('loader-service').loader; 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`); + cardApi = await loader.import('@cardstack/base/card-api'); + booleanMod = await loader.import('@cardstack/base/boolean'); let { field, contains, CardDef, Component } = cardApi; let { default: BooleanField } = booleanMod; diff --git a/packages/host/tests/acceptance/workspace-delete-multiple-test.gts b/packages/host/tests/acceptance/workspace-delete-multiple-test.gts index bd2322c5e25..aab50213223 100644 --- a/packages/host/tests/acceptance/workspace-delete-multiple-test.gts +++ b/packages/host/tests/acceptance/workspace-delete-multiple-test.gts @@ -9,8 +9,6 @@ import { import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; - import { setupLocalIndexing, setupAcceptanceTestRealm, @@ -53,10 +51,10 @@ module('Acceptance | workspace-delete-multiple', function (hooks) { let loader = loaderService.loader; let { field, contains, CardDef, Component } = await loader.import< typeof import('@cardstack/base/card-api') - >(`${baseRealm.url}card-api`); + >('@cardstack/base/card-api'); let { default: StringField } = await loader.import< typeof import('@cardstack/base/string') - >(`${baseRealm.url}string`); + >('@cardstack/base/string'); class Pet extends CardDef { static displayName = 'Pet'; diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts index ba5dab99450..f9659d233f4 100644 --- a/packages/host/tests/helpers/adapter.ts +++ b/packages/host/tests/helpers/adapter.ts @@ -8,7 +8,6 @@ import type { } from '@cardstack/runtime-common'; import { RealmPaths, - baseRealm, createResponse, hasExecutableExtension, Deferred, @@ -146,7 +145,7 @@ export class TestRealmAdapter implements RealmAdapter { } let cardApi = await this.#loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); for (let { content, url } of this.#potentialModulesAndInstances) { if (cardApi.isCard(content)) { @@ -261,7 +260,7 @@ export class TestRealmAdapter implements RealmAdapter { fileRefContent = value; } else if (path.endsWith('.json')) { let cardApi = await this.#loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); if (cardApi.isCard(value)) { let doc = cardApi.serializeCard(value, {}); diff --git a/packages/host/tests/helpers/base-realm.ts b/packages/host/tests/helpers/base-realm.ts index 5233d99e543..24df0f0e35e 100644 --- a/packages/host/tests/helpers/base-realm.ts +++ b/packages/host/tests/helpers/base-realm.ts @@ -1,7 +1,5 @@ import { getService } from '@universal-ember/test-support'; -import { baseRealm } from '@cardstack/runtime-common'; - 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'; @@ -203,169 +201,169 @@ async function initialize() { let loader = getService('loader-service').loader; StringField = ( - await loader.import(`${baseRealm.url}string`) + await loader.import('@cardstack/base/string') ).default; NumberField = ( - await loader.import(`${baseRealm.url}number`) + await loader.import('@cardstack/base/number') ).default; DateField = ( - await loader.import(`${baseRealm.url}date`) + await loader.import('@cardstack/base/date') ).default; DateTimeField = ( - await loader.import(`${baseRealm.url}datetime`) + await loader.import('@cardstack/base/datetime') ).default; ColorField = ( - await loader.import(`${baseRealm.url}color`) + await loader.import('@cardstack/base/color') ).default; DatetimeStampField = ( await loader.import( - `${baseRealm.url}datetime-stamp`, + '@cardstack/base/datetime-stamp', ) ).default; DateRangeField = ( await loader.import( - `${baseRealm.url}date-range-field`, + '@cardstack/base/date-range-field', ) ).default; DayField = ( - await loader.import(`${baseRealm.url}date/day`) + await loader.import('@cardstack/base/date/day') ).default; MonthField = ( - await loader.import(`${baseRealm.url}date/month`) + await loader.import('@cardstack/base/date/month') ).default; MonthDayField = ( await loader.import( - `${baseRealm.url}date/month-day`, + '@cardstack/base/date/month-day', ) ).default; MonthYearField = ( await loader.import( - `${baseRealm.url}date/month-year`, + '@cardstack/base/date/month-year', ) ).default; YearField = ( - await loader.import(`${baseRealm.url}date/year`) + await loader.import('@cardstack/base/date/year') ).default; WeekField = ( - await loader.import(`${baseRealm.url}date/week`) + await loader.import('@cardstack/base/date/week') ).default; QuarterField = ( await loader.import( - `${baseRealm.url}date/quarter`, + '@cardstack/base/date/quarter', ) ).default; TimeField = ( - await loader.import(`${baseRealm.url}time`) + await loader.import('@cardstack/base/time') ).default; TimeRangeField = ( await loader.import( - `${baseRealm.url}time/time-range`, + '@cardstack/base/time/time-range', ) ).default; DurationField = ( await loader.import( - `${baseRealm.url}time/duration`, + '@cardstack/base/time/duration', ) ).default; RelativeTimeField = ( await loader.import( - `${baseRealm.url}time/relative-time`, + '@cardstack/base/time/relative-time', ) ).default; EmailField = ( - await loader.import(`${baseRealm.url}email`) + await loader.import('@cardstack/base/email') ).default; Base64ImageField = ( await loader.import( - `${baseRealm.url}base64-image`, + '@cardstack/base/base64-image', ) ).default; CodeRefField = ( - await loader.import(`${baseRealm.url}code-ref`) + await loader.import('@cardstack/base/code-ref') ).default; - ToolField = (await loader.import(`${baseRealm.url}skill`)) + ToolField = (await loader.import('@cardstack/base/skill')) .ToolField; BigIntegerField = ( - await loader.import(`${baseRealm.url}big-integer`) + await loader.import('@cardstack/base/big-integer') ).default; EthereumAddressField = ( await loader.import( - `${baseRealm.url}ethereum-address`, + '@cardstack/base/ethereum-address', ) ).default; BooleanField = ( - await loader.import(`${baseRealm.url}boolean`) + await loader.import('@cardstack/base/boolean') ).default; MarkdownField = ( - await loader.import(`${baseRealm.url}markdown`) + await loader.import('@cardstack/base/markdown') ).default; TextAreaField = ( - await loader.import(`${baseRealm.url}text-area`) + await loader.import('@cardstack/base/text-area') ).default; RealmField = ( - await loader.import(`${baseRealm.url}realm`) + await loader.import('@cardstack/base/realm') ).default; RichMarkdownField = ( await loader.import( - `${baseRealm.url}rich-markdown`, + '@cardstack/base/rich-markdown', ) ).RichMarkdownField; PhoneNumberField = ( await loader.import( - `${baseRealm.url}phone-number`, + '@cardstack/base/phone-number', ) ).default; CardsGrid = ( - await loader.import(`${baseRealm.url}cards-grid`) + await loader.import('@cardstack/base/cards-grid') ).CardsGrid; - Skill = (await loader.import(`${baseRealm.url}skill`)) + Skill = (await loader.import('@cardstack/base/skill')) .Skill; ModelConfiguration = ( - await loader.import(`${baseRealm.url}system-card`) + await loader.import('@cardstack/base/system-card') ).ModelConfiguration; SystemCard = ( - await loader.import(`${baseRealm.url}system-card`) + await loader.import('@cardstack/base/system-card') ).SystemCard; FileDef = ( - await loader.import(`${baseRealm.url}file-api`) + await loader.import('@cardstack/base/file-api') ).FileDef; cardAPI = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); ({ @@ -404,13 +402,13 @@ async function initialize() { // The searchable-driven generator lives in its own base module, not on // card-api (so it stays out of every card's dependency closure). searchDocFromFields = ( - await loader.import(`${baseRealm.url}searchable`) + await loader.import('@cardstack/base/searchable') ).searchDocFromFields; - enumField = (await loader.import(`${baseRealm.url}enum`)) + enumField = (await loader.import('@cardstack/base/enum')) .default; const enumModule = await loader.import( - `${baseRealm.url}enum`, + '@cardstack/base/enum', ); enumOptions = enumModule.enumOptions; enumValues = enumModule.enumValues; diff --git a/packages/host/tests/helpers/index.gts b/packages/host/tests/helpers/index.gts index 919d7a7d22b..21b9691b4e2 100644 --- a/packages/host/tests/helpers/index.gts +++ b/packages/host/tests/helpers/index.gts @@ -16,7 +16,6 @@ import QUnit from 'qunit'; import { validate as uuidValidate } from 'uuid'; import { - baseRealm, CachingDefinitionLookup, cardDefComputedFields, ensureTrailingSlash, @@ -1448,7 +1447,7 @@ export async function saveCard( store?: CardStore, realmURL?: RealmIdentifier, ) { - let api = await loader.import(`${baseRealm.url}card-api`); + let api = await loader.import('@cardstack/base/card-api'); let doc = api.serializeCard(instance, {}); doc.data.id = id; if (realmURL) { @@ -1521,7 +1520,7 @@ export function setupCardTest(hooks: NestedHooks): { setupRealmCacheTeardown(hooks); setupCardLogs(hooks, async () => (getService('loader-service') as any).loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ), ); return { diff --git a/packages/host/tests/helpers/interact-submode-setup.gts b/packages/host/tests/helpers/interact-submode-setup.gts index ae0857cd104..690c72a6aa1 100644 --- a/packages/host/tests/helpers/interact-submode-setup.gts +++ b/packages/host/tests/helpers/interact-submode-setup.gts @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { FieldContainer, GridContainer } from '@cardstack/boxel-ui/components'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Realm } from '@cardstack/runtime-common/realm'; import { @@ -61,12 +60,12 @@ export function setupInteractSubmodeTests( 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`); - cardsGrid = await loader.import(`${baseRealm.url}cards-grid`); - fileApi = await loader.import(`${baseRealm.url}file-api`); - imageFileApi = await loader.import(`${baseRealm.url}image-file-def`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + spec = await loader.import('@cardstack/base/spec'); + cardsGrid = await loader.import('@cardstack/base/cards-grid'); + fileApi = await loader.import('@cardstack/base/file-api'); + imageFileApi = await loader.import('@cardstack/base/image-file-def'); let { field, diff --git a/packages/host/tests/helpers/render-component.ts b/packages/host/tests/helpers/render-component.ts index 578922f8766..8a8b9206d35 100644 --- a/packages/host/tests/helpers/render-component.ts +++ b/packages/host/tests/helpers/render-component.ts @@ -3,7 +3,6 @@ import { precompileTemplate } from '@ember/template-compilation'; 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 '@cardstack/base/card-api'; @@ -12,7 +11,7 @@ import type { ComponentLike } from '@glint/template'; async function cardApi( loader: Loader, ): Promise { - return await loader.import(`${baseRealm.url}card-api`); + return await loader.import('@cardstack/base/card-api'); } export async function renderComponent(C: ComponentLike, format?: Format) { diff --git a/packages/host/tests/helpers/shard-warmup.ts b/packages/host/tests/helpers/shard-warmup.ts index 0c92d01f24d..61a1182faec 100644 --- a/packages/host/tests/helpers/shard-warmup.ts +++ b/packages/host/tests/helpers/shard-warmup.ts @@ -16,8 +16,6 @@ import { visit } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; - import { setupMockMatrix } from './mock-matrix'; import { setupApplicationTest } from './setup'; @@ -54,9 +52,9 @@ export function registerShardWarmup() { let loader = loaderService.loader; // Prime the loader with the most commonly imported base-realm modules // so subsequent real tests don't pay the import cost. - await loader.import(`${baseRealm.url}card-api`); - await loader.import(`${baseRealm.url}string`); - await loader.import(`${baseRealm.url}spec`); + await loader.import('@cardstack/base/card-api'); + await loader.import('@cardstack/base/string'); + await loader.import('@cardstack/base/spec'); await setupAcceptanceTestRealm({ mockMatrixUtils, diff --git a/packages/host/tests/integration/components/ai-assistant-panel/binary-upload-dedupe-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/binary-upload-dedupe-test.gts index d02e949d7b9..0b2a22016a5 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/binary-upload-dedupe-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/binary-upload-dedupe-test.gts @@ -9,7 +9,6 @@ import { module, test } from 'qunit'; import { md5 } from 'super-fast-md5'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import OperatorMode from '@cardstack/host/components/operator-mode/container'; @@ -77,7 +76,7 @@ module( setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/codeblocks-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/codeblocks-test.gts index 6a2c6978cf3..06fb9a30ee4 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/codeblocks-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/codeblocks-test.gts @@ -13,7 +13,6 @@ import { REPLACE_MARKER, SEARCH_MARKER, SEPARATOR_MARKER, - baseRealm, } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -62,7 +61,7 @@ module('Integration | ai-assistant-panel | codeblocks', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { 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 aaebca3be3a..777bcf670b6 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 @@ -6,8 +6,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; - import type { Loader } from '@cardstack/runtime-common/loader'; import { @@ -56,7 +54,7 @@ module('Integration | ai-assistant-panel | debug-message', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-live-delete-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-live-delete-test.gts index 112922bc259..a16bcb33de2 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-live-delete-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-live-delete-test.gts @@ -5,7 +5,7 @@ import GlimmerComponent from '@glimmer/component'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Realm } from '@cardstack/runtime-common'; +import type { Realm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -75,7 +75,7 @@ function commonSetup(hooks: NestedHooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); setupRealmCacheTeardown(hooks); } diff --git a/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-test.gts index 37f5baee21c..9c7c30a0c0b 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/fallback-banner-test.gts @@ -5,8 +5,6 @@ import GlimmerComponent from '@glimmer/component'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; - import type { Loader } from '@cardstack/runtime-common/loader'; import OperatorMode from '@cardstack/host/components/operator-mode/container'; @@ -75,7 +73,7 @@ function commonSetup(hooks: NestedHooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); setupRealmCacheTeardown(hooks); } diff --git a/packages/host/tests/integration/components/ai-assistant-panel/fallback-models-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/fallback-models-test.gts index 382d244ca10..35965cbbab2 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/fallback-models-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/fallback-models-test.gts @@ -6,8 +6,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; - import type { Loader } from '@cardstack/runtime-common/loader'; import { @@ -58,7 +56,7 @@ module('Integration | ai-assistant-panel | fallback-models', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/file-attachment-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/file-attachment-test.gts index 0235c09a219..2a8ccbdcee3 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/file-attachment-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/file-attachment-test.gts @@ -12,7 +12,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import OperatorMode from '@cardstack/host/components/operator-mode/container'; @@ -64,7 +63,7 @@ module('Integration | ai-assistant-panel | file-attachment', function (hooks) { setupRealmCacheTeardown(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/general-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/general-test.gts index 275dc8c5c60..80fa9474b55 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/general-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/general-test.gts @@ -15,7 +15,6 @@ import { format, subMinutes } from 'date-fns'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { @@ -79,7 +78,7 @@ module('Integration | ai-assistant-panel | general', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/past-sessions-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/past-sessions-test.gts index 2c0cfb0fd1d..39f845b650f 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/past-sessions-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/past-sessions-test.gts @@ -5,7 +5,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { APP_BOXEL_MESSAGE_MSGTYPE } from '@cardstack/runtime-common/matrix-constants'; @@ -55,7 +54,7 @@ module('Integration | ai-assistant-panel | past sessions', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/reasoning-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/reasoning-test.gts index da8e636ed32..3b64a588ca9 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/reasoning-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/reasoning-test.gts @@ -6,7 +6,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { APP_BOXEL_REASONING_CONTENT_KEY } from '@cardstack/runtime-common/matrix-constants'; @@ -56,7 +55,7 @@ module('Integration | ai-assistant-panel | reasoning', function (hooks) { setupRealmCacheTeardown(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/scrolling-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/scrolling-test.gts index 345eee171f6..e8668a7fd78 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/scrolling-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/scrolling-test.gts @@ -6,7 +6,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { APP_BOXEL_MESSAGE_MSGTYPE } from '@cardstack/runtime-common/matrix-constants'; @@ -57,7 +56,7 @@ module('Integration | ai-assistant-panel | scrolling', function (hooks) { setupRealmCacheTeardown(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/sending-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/sending-test.gts index 5a5842cd889..7cdab036c75 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/sending-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/sending-test.gts @@ -13,7 +13,6 @@ import { getService } from '@universal-ember/test-support'; import window from 'ember-window-mock'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import { Deferred } from '@cardstack/runtime-common/deferred'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -68,7 +67,7 @@ module('Integration | ai-assistant-panel | sending', function (hooks) { setupRealmCacheTeardown(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { 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 98a78238899..890abd7cc8b 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 @@ -10,7 +10,6 @@ import { REPLACE_MARKER, SEARCH_MARKER, SEPARATOR_MARKER, - baseRealm, rri, skillCardRef, } from '@cardstack/runtime-common'; @@ -74,7 +73,7 @@ module('Integration | ai-assistant-panel | skills', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/components/ai-assistant-panel/tools-test.gts b/packages/host/tests/integration/components/ai-assistant-panel/tools-test.gts index ff3dd6e1460..5fccd9361d0 100644 --- a/packages/host/tests/integration/components/ai-assistant-panel/tools-test.gts +++ b/packages/host/tests/integration/components/ai-assistant-panel/tools-test.gts @@ -6,7 +6,7 @@ import { getService } from '@universal-ember/test-support'; import { module, skip, test } from 'qunit'; -import { baseRealm, skillCardRef } from '@cardstack/runtime-common'; +import { skillCardRef } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { @@ -69,7 +69,7 @@ module('Integration | ai-assistant-panel | tools', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { 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 2578892a590..c99df0e936c 100644 --- a/packages/host/tests/integration/components/ai-module-creation-test.gts +++ b/packages/host/tests/integration/components/ai-module-creation-test.gts @@ -7,7 +7,6 @@ import { getService } from '@universal-ember/test-support'; import { module, skip } from 'qunit'; import type { Loader } from '@cardstack/runtime-common'; -import { baseRealm } from '@cardstack/runtime-common'; import { ensureTrailingSlash } from '@cardstack/runtime-common'; import { @@ -66,7 +65,7 @@ module('Integration | create app module via ai-assistant', function (hooks) { setupLocalIndexing(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); hooks.beforeEach(async function () { 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 18519738f69..3f51243ee61 100644 --- a/packages/host/tests/integration/components/brand-guide-attachments-test.gts +++ b/packages/host/tests/integration/components/brand-guide-attachments-test.gts @@ -3,7 +3,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import { setupBaseRealm } from '../../helpers/base-realm'; import { renderCard } from '../../helpers/render-component'; @@ -24,10 +24,10 @@ module('Integration | brand-guide | brand image attachments', function (hooks) { hooks.beforeEach(async function (this: RenderingTestContext) { loader = getService('loader-service').loader; let brandGuideModule = await loader.import( - `${baseRealm.url}brand-guide`, + '@cardstack/base/brand-guide', ); let cardApiModule = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); BrandGuide = brandGuideModule.default; CompoundImageField = brandGuideModule.CompoundImageField; 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 29bfe678745..7a799c56145 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 @@ -3,7 +3,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import { setupBaseRealm } from '../../helpers/base-realm'; import { renderCard } from '../../helpers/render-component'; @@ -23,7 +23,7 @@ module('Integration | brand-guide | custom-css section', function (hooks) { hooks.beforeEach(async function (this: RenderingTestContext) { loader = getService('loader-service').loader; let brandGuideModule = await loader.import( - `${baseRealm.url}brand-guide`, + '@cardstack/base/brand-guide', ); BrandGuide = brandGuideModule.default; CompoundColorField = brandGuideModule.CompoundColorField; 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 2b18e839997..a786b337fb7 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 @@ -4,11 +4,7 @@ import { click, fillIn } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { - baseRealm, - PermissionsContextName, - type Loader, -} from '@cardstack/runtime-common'; +import { PermissionsContextName, type Loader } from '@cardstack/runtime-common'; import { provideConsumeContext } from '../../helpers'; import { setupBaseRealm } from '../../helpers/base-realm'; @@ -29,10 +25,10 @@ module('Integration | brand-logo | MarkField edit', function (hooks) { hooks.beforeEach(async function (this: RenderingTestContext) { loader = getService('loader-service').loader; let brandLogoModule = await loader.import( - `${baseRealm.url}brand-logo`, + '@cardstack/base/brand-logo', ); let cardApiModule = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); BrandLogo = brandLogoModule.default; ImageDef = cardApiModule.ImageDef; diff --git a/packages/host/tests/integration/components/card-basics-test.gts b/packages/host/tests/integration/components/card-basics-test.gts index 7af7fa9ea38..ccf201b8bae 100644 --- a/packages/host/tests/integration/components/card-basics-test.gts +++ b/packages/host/tests/integration/components/card-basics-test.gts @@ -25,7 +25,6 @@ import { dayjsFormat } from '@cardstack/boxel-ui/helpers'; import type { Loader } from '@cardstack/runtime-common'; import { - baseRealm, primitive, localId, getField, @@ -103,7 +102,7 @@ module('Integration | card-basics', function (hooks) { }); setupCardLogs(hooks, async () => { - return await loader.import(`${baseRealm.url}card-api`); + return await loader.import('@cardstack/base/card-api'); }); module('cards are read-only', 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 60b44dfa589..5a552cd67be 100644 --- a/packages/host/tests/integration/components/card-chooser-test.gts +++ b/packages/host/tests/integration/components/card-chooser-test.gts @@ -50,11 +50,11 @@ module('Integration | card-chooser', function (hooks) { 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`); - cardsGrid = await loader.import(`${baseRealm.url}cards-grid`); - spec = await loader.import(`${baseRealm.url}spec`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + textArea = await loader.import('@cardstack/base/text-area'); + cardsGrid = await loader.import('@cardstack/base/cards-grid'); + spec = await loader.import('@cardstack/base/spec'); let { field, contains, linksTo, CardDef, FieldDef } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/components/card-copy-test.gts b/packages/host/tests/integration/components/card-copy-test.gts index 2941ff66c93..4678bd19640 100644 --- a/packages/host/tests/integration/components/card-copy-test.gts +++ b/packages/host/tests/integration/components/card-copy-test.gts @@ -69,7 +69,7 @@ module('Integration | card-copy', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let loggedInAs = '@testuser:localhost'; @@ -114,8 +114,8 @@ module('Integration | card-copy', function (hooks) { }; 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`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { field, contains, linksTo, CardDef, Component } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/components/card-def-field-def-relationships-test.gts b/packages/host/tests/integration/components/card-def-field-def-relationships-test.gts index 41d058a1485..8e163ffcc38 100644 --- a/packages/host/tests/integration/components/card-def-field-def-relationships-test.gts +++ b/packages/host/tests/integration/components/card-def-field-def-relationships-test.gts @@ -6,7 +6,6 @@ import { module, test } from 'qunit'; import { PermissionsContextName, type Permissions, - baseRealm, } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -65,7 +64,7 @@ module('Integration | CardDef-FieldDef relationships test', function (hooks) { setupBaseRealm(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); hooks.beforeEach(async function () { diff --git a/packages/host/tests/integration/components/card-delete-test.gts b/packages/host/tests/integration/components/card-delete-test.gts index faddd0a3fa5..3de994e9632 100644 --- a/packages/host/tests/integration/components/card-delete-test.gts +++ b/packages/host/tests/integration/components/card-delete-test.gts @@ -61,13 +61,13 @@ module('Integration | card-delete', function (hooks) { setupOperatorModeStateCleanup(hooks); hooks.beforeEach(async function () { loader = getService('loader-service').loader; - cardApi = await loader.import(`${baseRealm.url}card-api`); + cardApi = await loader.import('@cardstack/base/card-api'); }); setupLocalIndexing(hooks); setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -103,8 +103,8 @@ module('Integration | card-delete', function (hooks) { }; 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`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { field, contains, CardDef, Component } = cardApi; let { default: StringField } = 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 f8b1606aff0..9ebbca91714 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 @@ -4,11 +4,7 @@ import { click, fillIn } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { - baseRealm, - PermissionsContextName, - type Loader, -} from '@cardstack/runtime-common'; +import { PermissionsContextName, type Loader } from '@cardstack/runtime-common'; import { provideConsumeContext } from '../../helpers'; import { setupBaseRealm } from '../../helpers/base-realm'; @@ -32,7 +28,7 @@ module('Integration | card-info | thumbnail picker edit', function (hooks) { hooks.beforeEach(async function (this: RenderingTestContext) { loader = getService('loader-service').loader; let cardApiModule = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); CardDef = cardApiModule.CardDef; CardInfoField = cardApiModule.CardInfoField; diff --git a/packages/host/tests/integration/components/computed-test.gts b/packages/host/tests/integration/components/computed-test.gts index 20e878b9f37..816f11cb2a0 100644 --- a/packages/host/tests/integration/components/computed-test.gts +++ b/packages/host/tests/integration/components/computed-test.gts @@ -7,7 +7,6 @@ import { module, test } from 'qunit'; import { PermissionsContextName, type Permissions, - baseRealm, } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -60,7 +59,7 @@ module('Integration | computeds', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('can render a synchronous computed field', async function (assert) { 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 c2ff228cd08..d950d9073c9 100644 --- a/packages/host/tests/integration/components/field-markdown-domain-test.gts +++ b/packages/host/tests/integration/components/field-markdown-domain-test.gts @@ -3,7 +3,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import { CardDef, @@ -77,70 +77,70 @@ module('Integration | field markdown domain', function (hooks) { loader = getService('loader-service').loader; BrandFunctionalPalette = ( await loader.import( - `${baseRealm.url}brand-functional-palette`, + '@cardstack/base/brand-functional-palette', ) ).default; let brandLogoModule = await loader.import( - `${baseRealm.url}brand-logo`, + '@cardstack/base/brand-logo', ); BrandLogo = brandLogoModule.default; MarkField = brandLogoModule.MarkField; CSSValueField = ( await loader.import( - `${baseRealm.url}css-value`, + '@cardstack/base/css-value', ) ).default; CsvFileDef = ( await loader.import( - `${baseRealm.url}csv-file-def`, + '@cardstack/base/csv-file-def', ) ).CsvFileDef; GtsFileDef = ( await loader.import( - `${baseRealm.url}gts-file-def`, + '@cardstack/base/gts-file-def', ) ).GtsFileDef; ImageDef = ( await loader.import( - `${baseRealm.url}image-file-def`, + '@cardstack/base/image-file-def', ) ).ImageDef; JsonFileDef = ( await loader.import( - `${baseRealm.url}json-file-def`, + '@cardstack/base/json-file-def', ) ).JsonFileDef; MarkdownDef = ( await loader.import( - `${baseRealm.url}markdown-file-def`, + '@cardstack/base/markdown-file-def', ) ).MarkdownDef; ResponseField = ( await loader.import( - `${baseRealm.url}response-field`, + '@cardstack/base/response-field', ) ).default; StructuredTheme = ( await loader.import( - `${baseRealm.url}structured-theme`, + '@cardstack/base/structured-theme', ) ).default; let themeVarsModule = await loader.import( - `${baseRealm.url}structured-theme-variables`, + '@cardstack/base/structured-theme-variables', ); ThemeVarField = themeVarsModule.default; ThemeTypographyField = themeVarsModule.ThemeTypographyField; TextFileDef = ( await loader.import( - `${baseRealm.url}text-file-def`, + '@cardstack/base/text-file-def', ) ).TextFileDef; TsFileDef = ( - await loader.import(`${baseRealm.url}ts-file-def`) + await loader.import('@cardstack/base/ts-file-def') ).TsFileDef; TypographyField = ( await loader.import( - `${baseRealm.url}typography`, + '@cardstack/base/typography', ) ).default; }); 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 6a3c69d676c..bf79d40c0fe 100644 --- a/packages/host/tests/integration/components/field-markdown-specialized-test.gts +++ b/packages/host/tests/integration/components/field-markdown-specialized-test.gts @@ -3,7 +3,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import { BigIntegerField, @@ -65,39 +65,39 @@ module('Integration | field markdown specialized', function (hooks) { hooks.beforeEach(async function (this: RenderingTestContext) { loader = getService('loader-service').loader; AddressField = ( - await loader.import(`${baseRealm.url}address`) + await loader.import('@cardstack/base/address') ).default; ColorField = ( - await loader.import(`${baseRealm.url}color`) + await loader.import('@cardstack/base/color') ).default; CoordinateField = ( await loader.import( - `${baseRealm.url}coordinate`, + '@cardstack/base/coordinate', ) ).default; CountryField = ( - await loader.import(`${baseRealm.url}country`) + await loader.import('@cardstack/base/country') ).default; DateRangeField = ( await loader.import( - `${baseRealm.url}date-range-field`, + '@cardstack/base/date-range-field', ) ).default; LLMModelField = ( await loader.import( - `${baseRealm.url}llm-model`, + '@cardstack/base/llm-model', ) ).default; PercentageField = ( await loader.import( - `${baseRealm.url}percentage`, + '@cardstack/base/percentage', ) ).default; UrlField = ( - await loader.import(`${baseRealm.url}url`) + await loader.import('@cardstack/base/url') ).default; WebsiteField = ( - await loader.import(`${baseRealm.url}website`) + await loader.import('@cardstack/base/website') ).default; }); 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 821e6070fee..0e65f3ed085 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 @@ -5,7 +5,6 @@ import { module, test } from 'qunit'; import { PermissionsContextName, - baseRealm, localId, type Permissions, type SerializedError, @@ -116,7 +115,7 @@ module('Integration | getRelationshipMembershipState', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); module('singular linksTo', function () { 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 210b89cb1e8..540d836ce97 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 @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, CardCrudFunctionsContextName, PermissionsContextName, type LooseCardResource, @@ -138,7 +137,7 @@ module( setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); // Realm holds Person/Pet plus one real Pet (`Pet/mango`); `Pet/ghost` is @@ -348,7 +347,7 @@ module( }); let api = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); let PersonComponent = api.getComponent(person); 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 def989ae09a..81bc3d77fd0 100644 --- a/packages/host/tests/integration/components/linksto-error-sentinel-test.gts +++ b/packages/host/tests/integration/components/linksto-error-sentinel-test.gts @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, PermissionsContextName, type LooseCardResource, type Permissions, @@ -113,7 +112,7 @@ module('Integration | linksTo error sentinel producer', function (hooks) { provideConsumeContext(PermissionsContextName, permissions); loader = getService('loader-service').loader; let fieldSupport = await loader.import( - `${baseRealm.url}field-support`, + '@cardstack/base/field-support', ); isLinkError = fieldSupport.isLinkError; isLinkNotFound = fieldSupport.isLinkNotFound; @@ -121,7 +120,7 @@ module('Integration | linksTo error sentinel producer', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); // Realm holds the Person/Pet module and one real Pet, but never `Pet/ghost` 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 84c769b656f..5afc4118f03 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 @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, PermissionsContextName, type LooseCardResource, type Permissions, @@ -121,7 +120,7 @@ module( setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); // Realm holds Person/Pet plus two real Pets (`Pet/mango`, `Pet/vangogh`); @@ -297,7 +296,7 @@ module( }); let api = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); let PersonComponent = api.getComponent(person); 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 598a609aabf..d3152b727ea 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 @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, PermissionsContextName, type LooseCardResource, type Permissions, @@ -88,7 +87,7 @@ module( setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); // Build a Person whose `pets` array holds two present cards (Mango, Van Gogh) 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 e7afcd633db..19b77df2e74 100644 --- a/packages/host/tests/integration/components/linksto-sentinel-roundtrip-test.gts +++ b/packages/host/tests/integration/components/linksto-sentinel-roundtrip-test.gts @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, PermissionsContextName, type LooseCardResource, type Permissions, @@ -127,7 +126,7 @@ module( provideConsumeContext(PermissionsContextName, permissions); loader = getService('loader-service').loader; let fieldSupport = await loader.import( - `${baseRealm.url}field-support`, + '@cardstack/base/field-support', ); isLinkNotFound = fieldSupport.isLinkNotFound; isNotLoadedValue = fieldSupport.isNotLoadedValue; @@ -135,7 +134,7 @@ module( setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); // Realm holds the module and one real Pet (`Pet/mango`), but never 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 ced1d83533d..516e4801501 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 @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, PermissionsContextName, type LooseCardResource, type Permissions, @@ -101,7 +100,7 @@ module('Integration | linksTo singular JS-access contract', function (hooks) { provideConsumeContext(PermissionsContextName, permissions); loader = getService('loader-service').loader; let fieldSupport = await loader.import( - `${baseRealm.url}field-support`, + '@cardstack/base/field-support', ); isLinkError = fieldSupport.isLinkError; isLinkNotFound = fieldSupport.isLinkNotFound; @@ -109,7 +108,7 @@ module('Integration | linksTo singular JS-access contract', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); // Realm holds the Person/Pet module and one real Pet (`Pet/mango`). Links to diff --git a/packages/host/tests/integration/components/loading-test.gts b/packages/host/tests/integration/components/loading-test.gts index 15ebf284bc0..94ee4c81cfa 100644 --- a/packages/host/tests/integration/components/loading-test.gts +++ b/packages/host/tests/integration/components/loading-test.gts @@ -1,7 +1,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { @@ -36,7 +35,7 @@ module('Integration | loading', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -73,7 +72,7 @@ module('Integration | loading', function (hooks) { }); test('Cards attempting to import boxel icon that does not exist renders a 404 icon instead', async function (assert) { - cardApi = await loader.import(`${baseRealm.url}card-api`); + cardApi = await loader.import('@cardstack/base/card-api'); let { createFromSerialized } = cardApi; let doc = { data: { diff --git a/packages/host/tests/integration/components/markdown-preview-test.gts b/packages/host/tests/integration/components/markdown-preview-test.gts index 4479c5cf1d2..a3e58211559 100644 --- a/packages/host/tests/integration/components/markdown-preview-test.gts +++ b/packages/host/tests/integration/components/markdown-preview-test.gts @@ -6,7 +6,6 @@ import GlimmerComponent from '@glimmer/component'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import MarkdownPreview from '@cardstack/host/components/operator-mode/preview-panel/markdown-preview'; @@ -28,8 +27,8 @@ module('Integration | markdown-preview', function (hooks) { hooks.beforeEach(async function () { loader = getService('loader-service').loader; - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); this.owner.register('service:local-indexer', MockLocalIndexer); }); diff --git a/packages/host/tests/integration/components/markdown-skill-frontmatter-test.gts b/packages/host/tests/integration/components/markdown-skill-frontmatter-test.gts index 096118a0328..70fc3440ffc 100644 --- a/packages/host/tests/integration/components/markdown-skill-frontmatter-test.gts +++ b/packages/host/tests/integration/components/markdown-skill-frontmatter-test.gts @@ -16,7 +16,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, FRONTMATTER_PARSE_ERROR_SYMBOL, identifyCard, } from '@cardstack/runtime-common'; @@ -70,16 +69,16 @@ module('Integration | markdown skill frontmatter', function (hooks) { async function loadBase() { let { MarkdownDef } = await loader.import( - `${baseRealm.url}markdown-file-def`, + '@cardstack/base/markdown-file-def', ); let { SkillFrontmatterField } = await loader.import( - `${baseRealm.url}skill-frontmatter-field`, + '@cardstack/base/skill-frontmatter-field', ); let { FrontmatterField } = await loader.import( - `${baseRealm.url}frontmatter-field`, + '@cardstack/base/frontmatter-field', ); let { parseFrontmatter } = await loader.import( - `${baseRealm.url}frontmatter-parse`, + '@cardstack/base/frontmatter-parse', ); return { MarkdownDef, diff --git a/packages/host/tests/integration/components/operator-mode/setup.gts b/packages/host/tests/integration/components/operator-mode/setup.gts index 30c97a24084..4d8913d062b 100644 --- a/packages/host/tests/integration/components/operator-mode/setup.gts +++ b/packages/host/tests/integration/components/operator-mode/setup.gts @@ -7,7 +7,7 @@ import type { Realm, Loader, } from '@cardstack/runtime-common'; -import { baseRealm, baseRRI, rri } from '@cardstack/runtime-common'; +import { baseRRI, rri } from '@cardstack/runtime-common'; import type OperatorModeStateService from '@cardstack/host/services/operator-mode-state-service'; @@ -59,7 +59,7 @@ export function setupOperatorModeTests( setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -75,11 +75,11 @@ export function setupOperatorModeTests( 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`); - cardsGrid = await loader.import(`${baseRealm.url}cards-grid`); - spec = await loader.import(`${baseRealm.url}spec`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + textArea = await loader.import('@cardstack/base/text-area'); + cardsGrid = await loader.import('@cardstack/base/cards-grid'); + spec = await loader.import('@cardstack/base/spec'); let { field, diff --git a/packages/host/tests/integration/components/overlay-menu-items-test.gts b/packages/host/tests/integration/components/overlay-menu-items-test.gts index 5b2023f6788..baaf42cb0ec 100644 --- a/packages/host/tests/integration/components/overlay-menu-items-test.gts +++ b/packages/host/tests/integration/components/overlay-menu-items-test.gts @@ -49,7 +49,7 @@ module('Integration | overlay-menu-items', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -79,9 +79,9 @@ module('Integration | overlay-menu-items', function (hooks) { let cardApi: typeof import('@cardstack/base/card-api'); let string: typeof import('@cardstack/base/string'); let markdownFileDef: typeof import('@cardstack/base/markdown-file-def'); - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); - markdownFileDef = await loader.import(`${baseRealm.url}markdown-file-def`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + markdownFileDef = await loader.import('@cardstack/base/markdown-file-def'); let { field, contains, linksTo, CardDef, Component } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/components/prerender-serialize-cycle-test.gts b/packages/host/tests/integration/components/prerender-serialize-cycle-test.gts index 384c693584a..e737c9e98b0 100644 --- a/packages/host/tests/integration/components/prerender-serialize-cycle-test.gts +++ b/packages/host/tests/integration/components/prerender-serialize-cycle-test.gts @@ -2,7 +2,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, PermissionsContextName, type Permissions, } from '@cardstack/runtime-common'; @@ -66,7 +65,7 @@ module('Integration | prerender serialize cycle guard', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('queryableValue collapses a fresh-object cycle by id (object-identity alone would expand/recurse it)', async function (assert) { @@ -92,7 +91,7 @@ module('Integration | prerender serialize cycle guard', function (hooks) { } loader.shimModule(`${testRealmURL}test-cards`, { Node }); let api = (await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', )) as typeof import('@cardstack/base/card-api'); let a = new Node({ firstName: 'A-canonical' }); diff --git a/packages/host/tests/integration/components/preview-test.gts b/packages/host/tests/integration/components/preview-test.gts index 9269831584a..3e269c01d6b 100644 --- a/packages/host/tests/integration/components/preview-test.gts +++ b/packages/host/tests/integration/components/preview-test.gts @@ -7,7 +7,6 @@ import { tracked } from '@glimmer/tracking'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import CardRenderer from '@cardstack/host/components/card-renderer'; @@ -31,8 +30,8 @@ module('Integration | preview', function (hooks) { hooks.beforeEach(async function () { loader = getService('loader-service').loader; - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); this.owner.register('service:local-indexer', MockLocalIndexer); }); diff --git a/packages/host/tests/integration/components/query-field-error-sentinel-test.gts b/packages/host/tests/integration/components/query-field-error-sentinel-test.gts index b332118c280..721c1cb6f26 100644 --- a/packages/host/tests/integration/components/query-field-error-sentinel-test.gts +++ b/packages/host/tests/integration/components/query-field-error-sentinel-test.gts @@ -82,16 +82,16 @@ module( getOwner(this)!.register('service:realm', StubRealmService); loader = getService('loader-service').loader; - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); fieldSupport = await loader.import( - `${baseRealm.url}field-support`, + '@cardstack/base/field-support', ); }); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); // These tests pin down the *recognizer* side of the tolerance machine for diff --git a/packages/host/tests/integration/components/realm-config-routing-rule-edit-test.gts b/packages/host/tests/integration/components/realm-config-routing-rule-edit-test.gts index 470a93aa2bb..fbae2d51f37 100644 --- a/packages/host/tests/integration/components/realm-config-routing-rule-edit-test.gts +++ b/packages/host/tests/integration/components/realm-config-routing-rule-edit-test.gts @@ -46,12 +46,12 @@ module( ) { let loader = getService('loader-service').loader; let cardApi: typeof import('@cardstack/base/card-api') = - await loader.import(`${baseRealm.url}card-api`); + await loader.import('@cardstack/base/card-api'); let string: typeof import('@cardstack/base/string') = await loader.import( - `${baseRealm.url}string`, + '@cardstack/base/string', ); let cardsGrid: typeof import('@cardstack/base/cards-grid') = - await loader.import(`${baseRealm.url}cards-grid`); + await loader.import('@cardstack/base/cards-grid'); let { field, contains, CardDef } = cardApi; let { default: StringField } = string; @@ -269,7 +269,7 @@ module( // rather than the context fallback. let cardApi: typeof import('@cardstack/base/card-api') = await getService( 'loader-service', - ).loader.import(`${baseRealm.url}card-api`); + ).loader.import('@cardstack/base/card-api'); await setupIntegrationTestRealm({ mockMatrixUtils, diff --git a/packages/host/tests/integration/components/realm-field-test.gts b/packages/host/tests/integration/components/realm-field-test.gts index e859a1453b0..00360475ca0 100644 --- a/packages/host/tests/integration/components/realm-field-test.gts +++ b/packages/host/tests/integration/components/realm-field-test.gts @@ -7,7 +7,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, CardContextName, PermissionsContextName, type CommandContext, @@ -77,7 +76,7 @@ module('Integration | components | realm field', function (hooks) { setupCardLogs(hooks, async () => { return await getService('loader-service').loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); }); diff --git a/packages/host/tests/integration/components/rich-markdown-field-test.gts b/packages/host/tests/integration/components/rich-markdown-field-test.gts index 15cf239445d..5d8aa21bf3a 100644 --- a/packages/host/tests/integration/components/rich-markdown-field-test.gts +++ b/packages/host/tests/integration/components/rich-markdown-field-test.gts @@ -8,7 +8,6 @@ import { module, test } from 'qunit'; import { PermissionsContextName, type Permissions, - baseRealm, baseRRI, testRealmURL, } from '@cardstack/runtime-common'; @@ -69,7 +68,7 @@ module('Integration | RichMarkdownField', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('renders markdown as HTML', async function (assert) { @@ -484,7 +483,7 @@ module('Integration | RichMarkdownField', function (hooks) { ); let CodeMirrorEditor = ( - (await loader.import(`${baseRealm.url}codemirror-editor`)) as { + (await loader.import('@cardstack/base/codemirror-editor')) as { default: unknown; } ).default; diff --git a/packages/host/tests/integration/components/serialization-rri-form-audit-test.gts b/packages/host/tests/integration/components/serialization-rri-form-audit-test.gts index c7201e48452..57a0dde2972 100644 --- a/packages/host/tests/integration/components/serialization-rri-form-audit-test.gts +++ b/packages/host/tests/integration/components/serialization-rri-form-audit-test.gts @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, identifyCard, PermissionsContextName, type Permissions, @@ -51,7 +50,7 @@ module('Integration | serialization | RRI form audit', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('serializeCard output keys against an unmapped (test) realm', async function (assert) { diff --git a/packages/host/tests/integration/components/serialization-test.gts b/packages/host/tests/integration/components/serialization-test.gts index 9be133a74cf..d83798b9a3c 100644 --- a/packages/host/tests/integration/components/serialization-test.gts +++ b/packages/host/tests/integration/components/serialization-test.gts @@ -16,7 +16,6 @@ import type { Permissions, } from '@cardstack/runtime-common'; import { - baseRealm, fields, isSingleCardDocument, localId, @@ -116,7 +115,7 @@ module('Integration | serialization', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('can deserialize field', async function (assert) { diff --git a/packages/host/tests/integration/components/text-suggestion-test.gts b/packages/host/tests/integration/components/text-suggestion-test.gts index ffa92cd55ec..a8a9d5287eb 100644 --- a/packages/host/tests/integration/components/text-suggestion-test.gts +++ b/packages/host/tests/integration/components/text-suggestion-test.gts @@ -4,7 +4,7 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import type { Loader } from '@cardstack/runtime-common'; -import { baseRealm, baseRRI } from '@cardstack/runtime-common'; +import { baseRRI } from '@cardstack/runtime-common'; import { suggestCardChooserTitle, @@ -38,8 +38,8 @@ module('Integration | text-suggestion | card-chooser-title', function (hooks) { }); hooks.beforeEach(async function () { - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { contains, field, CardDef, linksTo } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/email-field-test.gts b/packages/host/tests/integration/email-field-test.gts index af8eeab26b6..f4ba85e662b 100644 --- a/packages/host/tests/integration/email-field-test.gts +++ b/packages/host/tests/integration/email-field-test.gts @@ -6,7 +6,6 @@ import { module, test } from 'qunit'; import { PermissionsContextName, type Permissions, - baseRealm, } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -39,7 +38,7 @@ module('Integration | EmailField', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('edit format uses EmailInput and only persists valid addresses', async function (assert) { diff --git a/packages/host/tests/integration/enum-field-test.gts b/packages/host/tests/integration/enum-field-test.gts index 19c27c19169..be2fc5e526f 100644 --- a/packages/host/tests/integration/enum-field-test.gts +++ b/packages/host/tests/integration/enum-field-test.gts @@ -11,7 +11,6 @@ import { module, test } from 'qunit'; import { PermissionsContextName, type Permissions, - baseRealm, getField, } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -60,7 +59,7 @@ module('Integration | enumField', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('edit renders a dropdown with the enum options', async function (assert) { @@ -656,7 +655,7 @@ module('Integration | enumField', function (hooks) { let app = new CrmApp({ globalPriorityOptions: ['High', 'Low'] }); let t = new Task({ crmApp: app as any, priority: 'High' }); - const enumModule = await loader.import(`${baseRealm.url}enum`); + const enumModule = await loader.import('@cardstack/base/enum'); const enumValues = (enumModule as any).enumValues; let values = enumValues(t, 'priority'); @@ -691,7 +690,7 @@ module('Integration | enumField', function (hooks) { let t = new Task({ priority: null }); // Helpers include null only when provided explicitly - const enumModule = await loader.import(`${baseRealm.url}enum`); + const enumModule = await loader.import('@cardstack/base/enum'); const enumValues = (enumModule as any).enumValues; assert.deepEqual( enumValues(t, 'priority'), @@ -957,7 +956,7 @@ module('Integration | enumField', function (hooks) { }); // Helpers should reflect usage-level configuration - const enumModule = await loader.import(`${baseRealm.url}enum`); + const enumModule = await loader.import('@cardstack/base/enum'); const enumValues = (enumModule as any).enumValues; assert.deepEqual( enumValues(t, 'priority'), diff --git a/packages/host/tests/integration/field-configuration-test.gts b/packages/host/tests/integration/field-configuration-test.gts index 4ee9f5b584b..8471b5d2980 100644 --- a/packages/host/tests/integration/field-configuration-test.gts +++ b/packages/host/tests/integration/field-configuration-test.gts @@ -4,7 +4,7 @@ import { settled } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, Deferred, VirtualNetwork } from '@cardstack/runtime-common'; +import { Deferred, VirtualNetwork } from '@cardstack/runtime-common'; import type { SingleCardDocument, SingleFileMetaDocument, @@ -196,7 +196,7 @@ module('Integration | field configuration', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); hooks.beforeEach(async function (this: RenderingTestContext) { class ColorField extends FieldDef { diff --git a/packages/host/tests/integration/field-support-predicates-test.gts b/packages/host/tests/integration/field-support-predicates-test.gts index 6e06d64095a..8b6abad2c45 100644 --- a/packages/host/tests/integration/field-support-predicates-test.gts +++ b/packages/host/tests/integration/field-support-predicates-test.gts @@ -1,7 +1,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { setupCardLogs, setupLocalIndexing } from '../helpers'; @@ -54,7 +53,7 @@ module( setupBaseRealm(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); setupLocalIndexing(hooks); setupMockMatrix(hooks); @@ -62,7 +61,7 @@ module( hooks.beforeEach(async function () { loader = getService('loader-service').loader; let fieldSupport = await loader.import( - `${baseRealm.url}field-support`, + '@cardstack/base/field-support', ); isNotLoadedValue = fieldSupport.isNotLoadedValue; isLinkError = fieldSupport.isLinkError; diff --git a/packages/host/tests/integration/markdown-skill-search-test.gts b/packages/host/tests/integration/markdown-skill-search-test.gts index dfd22868534..9944e2045d3 100644 --- a/packages/host/tests/integration/markdown-skill-search-test.gts +++ b/packages/host/tests/integration/markdown-skill-search-test.gts @@ -9,7 +9,7 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRRI, baseRealm } from '@cardstack/runtime-common'; +import { baseRRI } from '@cardstack/runtime-common'; import type { RealmIndexQueryEngine } from '@cardstack/runtime-common/realm-index-query-engine'; import { @@ -125,7 +125,7 @@ module('Integration | markdown skill search', function (hooks) { // rehydrates as its concrete subclass on read rather than the declared base. let loader = getService('loader-service').loader; let { SkillFrontmatterField } = await loader.import( - `${baseRealm.url}skill-frontmatter-field`, + '@cardstack/base/skill-frontmatter-field', ); let store = getService('store'); let url = `${testRealmURL}skills/realm-sync/SKILL.md`; diff --git a/packages/host/tests/integration/message-service-subscription-test.gts b/packages/host/tests/integration/message-service-subscription-test.gts index 649b89f7ec9..221d4eee7b9 100644 --- a/packages/host/tests/integration/message-service-subscription-test.gts +++ b/packages/host/tests/integration/message-service-subscription-test.gts @@ -9,7 +9,6 @@ import { tracked } from '@glimmer/tracking'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import { testRealmInfo } from '@cardstack/runtime-common/helpers/const'; import type { Loader } from '@cardstack/runtime-common/loader'; import { APP_BOXEL_REALM_EVENT_TYPE } from '@cardstack/runtime-common/matrix-constants'; @@ -56,7 +55,7 @@ module('Integration | message service subscription', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); setupRealmCacheTeardown(hooks); diff --git a/packages/host/tests/integration/phone-number-field-test.gts b/packages/host/tests/integration/phone-number-field-test.gts index 716668e4dd8..5e3683d9e12 100644 --- a/packages/host/tests/integration/phone-number-field-test.gts +++ b/packages/host/tests/integration/phone-number-field-test.gts @@ -6,7 +6,6 @@ import { module, test } from 'qunit'; import { PermissionsContextName, type Permissions, - baseRealm, } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -38,7 +37,7 @@ module('Integration | PhoneNumberField', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('edit format persists normalized phone numbers', async function (assert) { diff --git a/packages/host/tests/integration/realm-indexing-test.gts b/packages/host/tests/integration/realm-indexing-test.gts index acf6fa48535..56b5d51c33c 100644 --- a/packages/host/tests/integration/realm-indexing-test.gts +++ b/packages/host/tests/integration/realm-indexing-test.gts @@ -6,7 +6,6 @@ import { module, test } from 'qunit'; import { md5 } from 'super-fast-md5'; import { - baseRealm, baseRealmRRI, baseCardRef, ensureTrailingSlash, @@ -118,7 +117,7 @@ module(`Integration | realm indexing`, function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); async function getInstance( diff --git a/packages/host/tests/integration/realm-querying-test.gts b/packages/host/tests/integration/realm-querying-test.gts index 906e68b2e5f..afc0be513cb 100644 --- a/packages/host/tests/integration/realm-querying-test.gts +++ b/packages/host/tests/integration/realm-querying-test.gts @@ -3,7 +3,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseCardRef, baseRealm, baseRRI } from '@cardstack/runtime-common'; +import { baseCardRef, baseRRI } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { RealmPaths } from '@cardstack/runtime-common/paths'; @@ -39,7 +39,7 @@ module(`Integration | realm querying`, function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); const sampleCards: CardDocFiles = { diff --git a/packages/host/tests/integration/realm-test.gts b/packages/host/tests/integration/realm-test.gts index 783b315c373..cbc9e1016ea 100644 --- a/packages/host/tests/integration/realm-test.gts +++ b/packages/host/tests/integration/realm-test.gts @@ -7,7 +7,6 @@ import { validate as uuidValidate } from 'uuid'; import type { Realm } from '@cardstack/runtime-common'; import { - baseRealm, baseRealmRRI, rri, searchEntryWireQueryFromQuery, @@ -68,7 +67,7 @@ module('Integration | realm', function (hooks) { setupLocalIndexing(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); async function handle(realm: Realm, ...args: Parameters) { diff --git a/packages/host/tests/integration/resources/query-field-barrier-test.ts b/packages/host/tests/integration/resources/query-field-barrier-test.ts index b1cead6ee7f..12183dd4bef 100644 --- a/packages/host/tests/integration/resources/query-field-barrier-test.ts +++ b/packages/host/tests/integration/resources/query-field-barrier-test.ts @@ -61,8 +61,8 @@ module(`Integration | query field render-cycle barrier`, function (hooks) { setupBaseRealm(hooks); hooks.beforeEach(async function (this: RenderingTestContext) { - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { contains, field, CardDef, linksToMany, createFromSerialized } = cardApi; diff --git a/packages/host/tests/integration/resources/search-test.ts b/packages/host/tests/integration/resources/search-test.ts index c0b82b6543f..e88e802f5fc 100644 --- a/packages/host/tests/integration/resources/search-test.ts +++ b/packages/host/tests/integration/resources/search-test.ts @@ -81,8 +81,8 @@ module(`Integration | search resource`, function (hooks) { }); setupBaseRealm(hooks); hooks.beforeEach(async function (this: RenderingTestContext) { - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { contains, field, CardDef, FieldDef, linksTo } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/search-correlation-id-test.gts b/packages/host/tests/integration/search-correlation-id-test.gts index 651b36c8d91..f6f7532962b 100644 --- a/packages/host/tests/integration/search-correlation-id-test.gts +++ b/packages/host/tests/integration/search-correlation-id-test.gts @@ -5,7 +5,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, rri, setSearchTimingSinkForTests, X_BOXEL_LOGGING_CORRELATION_ID_HEADER, @@ -61,7 +60,7 @@ module('Integration | search correlation id', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); hooks.beforeEach(async function () { diff --git a/packages/host/tests/integration/searchable-search-doc-test.gts b/packages/host/tests/integration/searchable-search-doc-test.gts index 178bc33e375..d5f3ab8470a 100644 --- a/packages/host/tests/integration/searchable-search-doc-test.gts +++ b/packages/host/tests/integration/searchable-search-doc-test.gts @@ -1,7 +1,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Realm, IndexedInstance } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -52,7 +51,7 @@ module('Integration | searchable search doc', function (hooks) { let mockMatrixUtils = setupMockMatrix(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); hooks.beforeEach(async function () { diff --git a/packages/host/tests/integration/store-search-test.gts b/packages/host/tests/integration/store-search-test.gts index 3e2ad13db8f..46528ff53d5 100644 --- a/packages/host/tests/integration/store-search-test.gts +++ b/packages/host/tests/integration/store-search-test.gts @@ -6,7 +6,6 @@ import { module, test } from 'qunit'; import { isCardInstance, - baseRealm, baseFileRef, isCardResource, isFileMetaResource, @@ -48,7 +47,7 @@ module('Integration | store search public API', function (hooks) { setupLocalIndexing(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/store-test.gts b/packages/host/tests/integration/store-test.gts index 6774d94a355..2f6c92352b3 100644 --- a/packages/host/tests/integration/store-test.gts +++ b/packages/host/tests/integration/store-test.gts @@ -16,7 +16,6 @@ import { module, test } from 'qunit'; import { isCardInstance, - baseRealm, localId, baseCardRef, realmURL, @@ -95,7 +94,7 @@ module('Integration | Store', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -154,7 +153,7 @@ module('Integration | Store', function (hooks) { BoomPersonDef = BoomPerson; loaderService = getService('loader-service'); loader = loaderService.loader; - api = await loader.import(`${baseRealm.url}card-api`); + api = await loader.import('@cardstack/base/card-api'); storeService = getService('store'); operatorModeStateService = getService('operator-mode-state-service'); cardStore = (storeService as any).store as CardStore; diff --git a/packages/host/tests/integration/tools/apply-markdown-edit-test.gts b/packages/host/tests/integration/tools/apply-markdown-edit-test.gts index 099e17336ac..7e5b77c9981 100644 --- a/packages/host/tests/integration/tools/apply-markdown-edit-test.gts +++ b/packages/host/tests/integration/tools/apply-markdown-edit-test.gts @@ -4,7 +4,7 @@ import { settled, type RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import RealmService from '@cardstack/host/services/realm'; import ApplyMarkdownEditTool from '@cardstack/host/tools/apply-markdown-edit'; @@ -73,7 +73,7 @@ module('Integration | tools | apply-markdown-edit', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/tools/create-spec-test.gts b/packages/host/tests/integration/tools/create-spec-test.gts index 3b04465224b..6794ad219d2 100644 --- a/packages/host/tests/integration/tools/create-spec-test.gts +++ b/packages/host/tests/integration/tools/create-spec-test.gts @@ -1,7 +1,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import CreateSpecTool from '@cardstack/host/tools/create-specs'; @@ -74,7 +73,7 @@ module('Integration | Command | create-specs', function (hooks) { }); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); setupRealmCacheTeardown(hooks); diff --git a/packages/host/tests/integration/tools/migrate-skill-test.gts b/packages/host/tests/integration/tools/migrate-skill-test.gts index 22278741252..775c74f80e4 100644 --- a/packages/host/tests/integration/tools/migrate-skill-test.gts +++ b/packages/host/tests/integration/tools/migrate-skill-test.gts @@ -6,7 +6,6 @@ import { module, test } from 'qunit'; import { parse as parseYaml } from 'yaml'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import RealmService from '@cardstack/host/services/realm'; @@ -83,7 +82,7 @@ module('Integration | tools | migrate-skill', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); setupRealmCacheTeardown(hooks); diff --git a/packages/host/tests/integration/tools/preview-format-test.gts b/packages/host/tests/integration/tools/preview-format-test.gts index 1ddb7b7a261..9f0665e9cd4 100644 --- a/packages/host/tests/integration/tools/preview-format-test.gts +++ b/packages/host/tests/integration/tools/preview-format-test.gts @@ -6,7 +6,6 @@ import { setupWindowMock } from 'ember-window-mock/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import RealmService from '@cardstack/host/services/realm'; @@ -51,7 +50,7 @@ module('Integration | Command | preview-format', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { diff --git a/packages/host/tests/integration/tools/publish-realm-test.gts b/packages/host/tests/integration/tools/publish-realm-test.gts index 33baed9a4fe..bdbaa908074 100644 --- a/packages/host/tests/integration/tools/publish-realm-test.gts +++ b/packages/host/tests/integration/tools/publish-realm-test.gts @@ -4,7 +4,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import RealmService from '@cardstack/host/services/realm'; import PublishRealmTool from '@cardstack/host/tools/publish-realm'; @@ -117,7 +117,7 @@ module('Integration | tools | publish-realm', function (hooks) { getOwner(this)!.register('service:realm', StubRealmService); loader = getService('loader-service').loader; PublishTarget = ( - await loader.import(`${baseRealm.url}command`) + await loader.import('@cardstack/base/command') ).PublishTarget; publishabilityResponse = { publishable: true, violations: [] }; publishShouldFail = false; diff --git a/packages/host/tests/integration/tools/schema-generation-test.gts b/packages/host/tests/integration/tools/schema-generation-test.gts index 17174fa3745..1cec4e9a30a 100644 --- a/packages/host/tests/integration/tools/schema-generation-test.gts +++ b/packages/host/tests/integration/tools/schema-generation-test.gts @@ -3,7 +3,6 @@ import { setupWindowMock } from 'ember-window-mock/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { AttributesSchema } from '@cardstack/runtime-common/helpers/ai'; import { basicMappings } from '@cardstack/runtime-common/helpers/ai'; @@ -28,7 +27,7 @@ module( loader = getService('loader-service').loader; mappings = await basicMappings(loader); cardAPI = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); }); // for each host command, attempt to generate a JSON schema with strict: true diff --git a/packages/host/tests/integration/tools/search-tool-test.gts b/packages/host/tests/integration/tools/search-tool-test.gts index 73d6d225f33..cbd8cb6e796 100644 --- a/packages/host/tests/integration/tools/search-tool-test.gts +++ b/packages/host/tests/integration/tools/search-tool-test.gts @@ -1,7 +1,7 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Query, rri } from '@cardstack/runtime-common'; +import { type Query, rri } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import { @@ -37,7 +37,7 @@ module('Integration | tools | search', function (hooks) { setupRealmCacheTeardown(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -68,8 +68,8 @@ module('Integration | tools | search', function (hooks) { 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`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { field, contains, CardDef } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/tools/show-card-test.gts b/packages/host/tests/integration/tools/show-card-test.gts index 7c15594695e..7f3de05fafe 100644 --- a/packages/host/tests/integration/tools/show-card-test.gts +++ b/packages/host/tests/integration/tools/show-card-test.gts @@ -9,7 +9,6 @@ import { setupWindowMock } from 'ember-window-mock/test-support'; import { module, test, skip } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import { basicMappings } from '@cardstack/runtime-common/helpers/ai'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -134,7 +133,7 @@ module('Integration | Command | show-card', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -580,7 +579,7 @@ module('Integration | Command | show-card', function (hooks) { let loader = getService('loader-service').loader; let mappings = await basicMappings(loader); let cardAPI = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); const inputSchema = await command.getInputJsonSchema(cardAPI, mappings); assert.ok(inputSchema, 'Input JSON schema is defined'); diff --git a/packages/host/tests/integration/tools/sync-openrouter-models-test.gts b/packages/host/tests/integration/tools/sync-openrouter-models-test.gts index 1f6e8d728e1..5242a7f72e7 100644 --- a/packages/host/tests/integration/tools/sync-openrouter-models-test.gts +++ b/packages/host/tests/integration/tools/sync-openrouter-models-test.gts @@ -4,7 +4,6 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import type { AtomicOperation } from '@cardstack/runtime-common/atomic-document'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -84,7 +83,7 @@ module('Integration | tools | sync-openrouter-models', function (hooks) { setupRealmCacheTeardown(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -97,8 +96,8 @@ module('Integration | tools | sync-openrouter-models', function (hooks) { loader = getService('loader-service').loader; 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`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); let { field, contains, CardDef } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/tools/transform-cards-test.gts b/packages/host/tests/integration/tools/transform-cards-test.gts index 9f89a7d5e00..604a66ed9bf 100644 --- a/packages/host/tests/integration/tools/transform-cards-test.gts +++ b/packages/host/tests/integration/tools/transform-cards-test.gts @@ -4,7 +4,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, skip, test } from 'qunit'; -import { baseRealm, Command } from '@cardstack/runtime-common'; +import { Command } from '@cardstack/runtime-common'; import type { Loader } from '@cardstack/runtime-common/loader'; import RealmService from '@cardstack/host/services/realm'; @@ -50,7 +50,7 @@ module('Integration | tools | transform-cards', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); let mockMatrixUtils = setupMockMatrix(hooks, { @@ -65,9 +65,9 @@ module('Integration | tools | transform-cards', function (hooks) { 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`); - CommandModule = await loader.import(`${baseRealm.url}command`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + CommandModule = await loader.import('@cardstack/base/command'); let { field, contains, CardDef } = cardApi; let { default: StringField } = string; diff --git a/packages/host/tests/integration/tools/unpublish-realm-test.gts b/packages/host/tests/integration/tools/unpublish-realm-test.gts index 01261d4d03f..580fcfd8746 100644 --- a/packages/host/tests/integration/tools/unpublish-realm-test.gts +++ b/packages/host/tests/integration/tools/unpublish-realm-test.gts @@ -4,7 +4,7 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import RealmService from '@cardstack/host/services/realm'; import UnpublishRealmTool from '@cardstack/host/tools/unpublish-realm'; @@ -77,7 +77,7 @@ module('Integration | tools | unpublish-realm', function (hooks) { getOwner(this)!.register('service:realm', StubRealmService); loader = getService('loader-service').loader; PublishTarget = ( - await loader.import(`${baseRealm.url}command`) + await loader.import('@cardstack/base/command') ).PublishTarget; unpublishShouldFail = false; unpublishedURLs = []; diff --git a/packages/host/tests/integration/tools/update-room-skills-test.gts b/packages/host/tests/integration/tools/update-room-skills-test.gts index e6031396667..c44fda0db5a 100644 --- a/packages/host/tests/integration/tools/update-room-skills-test.gts +++ b/packages/host/tests/integration/tools/update-room-skills-test.gts @@ -6,10 +6,7 @@ import { setupWindowMock } from 'ember-window-mock/test-support'; import { module, test } from 'qunit'; -import { - APP_BOXEL_ROOM_SKILLS_EVENT_TYPE, - baseRealm, -} from '@cardstack/runtime-common'; +import { APP_BOXEL_ROOM_SKILLS_EVENT_TYPE } from '@cardstack/runtime-common'; import { basicMappings } from '@cardstack/runtime-common/helpers/ai'; import type { Loader } from '@cardstack/runtime-common/loader'; @@ -63,7 +60,7 @@ module('Integration | Command | update-room-skills', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); module('command metadata', function () { @@ -98,7 +95,7 @@ module('Integration | Command | update-room-skills', function (hooks) { let loader = getService('loader-service').loader; let mappings = await basicMappings(loader); let cardAPI = await loader.import( - `${baseRealm.url}card-api`, + '@cardstack/base/card-api', ); const inputSchema = await command.getInputJsonSchema(cardAPI, mappings); assert.deepEqual( diff --git a/packages/host/tests/unit/ai-function-generation-test.ts b/packages/host/tests/unit/ai-function-generation-test.ts index b937fb0d6d9..57d73d74429 100644 --- a/packages/host/tests/unit/ai-function-generation-test.ts +++ b/packages/host/tests/unit/ai-function-generation-test.ts @@ -3,7 +3,6 @@ import type { RenderingTestContext } from '@ember/test-helpers'; import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm } from '@cardstack/runtime-common'; import { generateJsonSchemaForCardType, basicMappings, @@ -39,15 +38,15 @@ module('Unit | ai-function-generation-test', function (hooks) { loader = getService('loader-service').loader; }); hooks.beforeEach(async function () { - cardApi = await loader.import(`${baseRealm.url}card-api`); + cardApi = await loader.import('@cardstack/base/card-api'); primitive = cardApi.primitive; - string = await loader.import(`${baseRealm.url}string`); - number = await loader.import(`${baseRealm.url}number`); - biginteger = await loader.import(`${baseRealm.url}big-integer`); - date = await loader.import(`${baseRealm.url}date`); - datetime = await loader.import(`${baseRealm.url}datetime`); - boolean = await loader.import(`${baseRealm.url}boolean`); - enumModule = await loader.import(`${baseRealm.url}enum`); + string = await loader.import('@cardstack/base/string'); + number = await loader.import('@cardstack/base/number'); + biginteger = await loader.import('@cardstack/base/big-integer'); + date = await loader.import('@cardstack/base/date'); + datetime = await loader.import('@cardstack/base/datetime'); + boolean = await loader.import('@cardstack/base/boolean'); + enumModule = await loader.import('@cardstack/base/enum'); mappings = await basicMappings(loader); }); @@ -55,7 +54,7 @@ module('Unit | ai-function-generation-test', function (hooks) { setupOnSave(hooks); setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); const cardDefAttributesProperties: { [fieldName: string]: AttributesSchema } = diff --git a/packages/host/tests/unit/box-test.ts b/packages/host/tests/unit/box-test.ts index fc2c4734fea..861d25c7c5f 100644 --- a/packages/host/tests/unit/box-test.ts +++ b/packages/host/tests/unit/box-test.ts @@ -4,7 +4,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import type { Loader } from '@cardstack/runtime-common'; -import { baseRealm } from '@cardstack/runtime-common'; import { setupRenderingTest } from '../helpers/setup'; @@ -18,7 +17,7 @@ module('Unit | box', function (hooks) { loader = getService('loader-service').loader; }); hooks.beforeEach(async function () { - cardApi = await loader.import(`${baseRealm.url}card-api`); + cardApi = await loader.import('@cardstack/base/card-api'); }); test('Box children maintain object strict equality after re-ordering', async function (assert) { diff --git a/packages/host/tests/unit/card-def-menu-items-test.ts b/packages/host/tests/unit/card-def-menu-items-test.ts index 5c2d5975cc7..0df0b01bbae 100644 --- a/packages/host/tests/unit/card-def-menu-items-test.ts +++ b/packages/host/tests/unit/card-def-menu-items-test.ts @@ -3,12 +3,7 @@ import { module, test } from 'qunit'; import type { MenuItemOptions } from '@cardstack/boxel-ui/helpers'; -import { - baseRealm, - realmURL, - testRealmURL, - type Loader, -} from '@cardstack/runtime-common'; +import { realmURL, testRealmURL, type Loader } from '@cardstack/runtime-common'; import { setupRenderingTest } from '../helpers/setup'; @@ -39,7 +34,7 @@ module('Unit | CardDef menu items', function (hooks) { loader = getService('loader-service').loader; }); hooks.beforeEach(async function () { - let mod: any = await loader.import(`${baseRealm.url}menu-items`); + let mod: any = await loader.import('@cardstack/base/menu-items'); getDefaultCardMenuItems = mod.getDefaultCardMenuItems; }); diff --git a/packages/host/tests/unit/code-ref-test.ts b/packages/host/tests/unit/code-ref-test.ts index c097e22990e..ec735848872 100644 --- a/packages/host/tests/unit/code-ref-test.ts +++ b/packages/host/tests/unit/code-ref-test.ts @@ -5,12 +5,7 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import type { Loader, LooseCardResource } from '@cardstack/runtime-common'; -import { - baseRealm, - loadCardDef, - rri, - visitModuleDeps, -} from '@cardstack/runtime-common'; +import { loadCardDef, rri, visitModuleDeps } from '@cardstack/runtime-common'; import * as CodeRefSerializer from '@cardstack/runtime-common/serializers/code-ref'; import { @@ -71,7 +66,7 @@ module('code-ref', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('can dynamically load a card definition', async function (assert) { diff --git a/packages/host/tests/unit/file-def-menu-items-test.ts b/packages/host/tests/unit/file-def-menu-items-test.ts index aca93778217..bae7de6e960 100644 --- a/packages/host/tests/unit/file-def-menu-items-test.ts +++ b/packages/host/tests/unit/file-def-menu-items-test.ts @@ -3,7 +3,7 @@ import { module, test } from 'qunit'; import type { MenuItemOptions } from '@cardstack/boxel-ui/helpers'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import { setupRenderingTest } from '../helpers/setup'; @@ -27,7 +27,7 @@ module('Unit | FileDef menu items', function (hooks) { loader = getService('loader-service').loader; }); hooks.beforeEach(async function () { - let mod: any = await loader.import(`${baseRealm.url}file-api`); + let mod: any = await loader.import('@cardstack/base/file-api'); getDefaultFileMenuItems = mod.getDefaultFileMenuItems; }); diff --git a/packages/host/tests/unit/garbage-collection-test.ts b/packages/host/tests/unit/garbage-collection-test.ts index 8a6e75bb82c..edac1977905 100644 --- a/packages/host/tests/unit/garbage-collection-test.ts +++ b/packages/host/tests/unit/garbage-collection-test.ts @@ -5,7 +5,6 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; import { - baseRealm, localId, type Loader, type CardErrorJSONAPI as CardError, @@ -40,7 +39,7 @@ module('Unit | identity-context garbage collection', function (hooks) { hooks.beforeEach(async function (this: RenderingTestContext) { loader = getService('loader-service').loader; - api = await loader.import(`${baseRealm.url}card-api`); + api = await loader.import('@cardstack/base/card-api'); delete (globalThis as any).__boxelRenderContext; }); diff --git a/packages/host/tests/unit/index-query-engine-test.ts b/packages/host/tests/unit/index-query-engine-test.ts index 144586d6608..64734d9b4b9 100644 --- a/packages/host/tests/unit/index-query-engine-test.ts +++ b/packages/host/tests/unit/index-query-engine-test.ts @@ -77,12 +77,12 @@ module('Unit | query', function (hooks) { virtualNetwork, }); - cardApi = await loader.import(`${baseRealm.url}card-api`); - string = await loader.import(`${baseRealm.url}string`); - date = await loader.import(`${baseRealm.url}date`); - number = await loader.import(`${baseRealm.url}number`); - boolean = await loader.import(`${baseRealm.url}boolean`); - codeRef = await loader.import(`${baseRealm.url}code-ref`); + cardApi = await loader.import('@cardstack/base/card-api'); + string = await loader.import('@cardstack/base/string'); + date = await loader.import('@cardstack/base/date'); + number = await loader.import('@cardstack/base/number'); + boolean = await loader.import('@cardstack/base/boolean'); + codeRef = await loader.import('@cardstack/base/code-ref'); let { field, @@ -225,7 +225,7 @@ module('Unit | query', function (hooks) { setCardAsSavedForTest(card); } - let api = await loader.import(`${baseRealm.url}card-api`); + let api = await loader.import('@cardstack/base/card-api'); async function buildDefinition(cardDef: typeof CardDef) { let { fields, fieldDefs } = getFieldDefinitions(api, cardDef); diff --git a/packages/host/tests/unit/instance-filter-matcher-test.ts b/packages/host/tests/unit/instance-filter-matcher-test.ts index 48b4bffeb24..c506d40c8df 100644 --- a/packages/host/tests/unit/instance-filter-matcher-test.ts +++ b/packages/host/tests/unit/instance-filter-matcher-test.ts @@ -56,11 +56,11 @@ module('Unit | instance-filter-matcher', function (hooks) { let cardApi = await loader.import< typeof import('@cardstack/base/card-api') - >(`${baseRealm.url}card-api`); - let string = await loader.import(`${baseRealm.url}string`); - let number = await loader.import(`${baseRealm.url}number`); - let boolean = await loader.import(`${baseRealm.url}boolean`); - let date = await loader.import(`${baseRealm.url}date`); + >('@cardstack/base/card-api'); + let string = await loader.import('@cardstack/base/string'); + let number = await loader.import('@cardstack/base/number'); + let boolean = await loader.import('@cardstack/base/boolean'); + let date = await loader.import('@cardstack/base/date'); api = { getQueryableValue: cardApi.getQueryableValue, @@ -528,7 +528,7 @@ module('Unit | instance-filter-matcher', function (hooks) { // -- unresolvable ----------------------------------------------------------- test('a not-loaded linksTo target is reported as unresolvable', async function (assert) { - let cardApi = await loader.import(`${baseRealm.url}card-api`); + let cardApi = await loader.import('@cardstack/base/card-api'); let doc = { data: { id: `${testRealmURL}lonely`, diff --git a/packages/host/tests/unit/loader-parallel-prefetch-test.ts b/packages/host/tests/unit/loader-parallel-prefetch-test.ts index 8ccc0589eab..a5db0e3e8e5 100644 --- a/packages/host/tests/unit/loader-parallel-prefetch-test.ts +++ b/packages/host/tests/unit/loader-parallel-prefetch-test.ts @@ -5,7 +5,7 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, Loader, clearFetchCache } from '@cardstack/runtime-common'; +import { Loader, clearFetchCache } from '@cardstack/runtime-common'; import { testRealmURL, @@ -110,7 +110,7 @@ module('Unit | loader prefetch', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('prefetch kicks off dependency fetch without waiting for completion', async function (assert) { diff --git a/packages/host/tests/unit/loader-test.ts b/packages/host/tests/unit/loader-test.ts index c1d6a74b2df..cf5cf16b8f0 100644 --- a/packages/host/tests/unit/loader-test.ts +++ b/packages/host/tests/unit/loader-test.ts @@ -133,7 +133,7 @@ module('Unit | loader', function (hooks) { setupCardLogs( hooks, - async () => await loader.import(`${baseRealm.url}card-api`), + async () => await loader.import('@cardstack/base/card-api'), ); test('can dynamically load modules with cycles', async function (assert) { diff --git a/packages/host/tests/unit/markdown-helpers-test.ts b/packages/host/tests/unit/markdown-helpers-test.ts index c6cd84917a6..60087993580 100644 --- a/packages/host/tests/unit/markdown-helpers-test.ts +++ b/packages/host/tests/unit/markdown-helpers-test.ts @@ -3,7 +3,7 @@ import { getService } from '@universal-ember/test-support'; import { module, test } from 'qunit'; -import { baseRealm, type Loader } from '@cardstack/runtime-common'; +import type { Loader } from '@cardstack/runtime-common'; import { setupRenderingTest } from '../helpers/setup'; @@ -27,7 +27,7 @@ module('Unit | markdown-helpers | card link helpers', function (hooks) { loader = getService('loader-service').loader; let mod = await loader.import< typeof import('@cardstack/base/markdown-helpers') - >(`${baseRealm.url}markdown-helpers`); + >('@cardstack/base/markdown-helpers'); markdownLinkForCard = mod.markdownLinkForCard; markdownLinksForCards = mod.markdownLinksForCards; markdownEmbedForCard = mod.markdownEmbedForCard; diff --git a/packages/host/tests/unit/searchable-option-test.ts b/packages/host/tests/unit/searchable-option-test.ts index 15b66d21bfd..e1772151ae2 100644 --- a/packages/host/tests/unit/searchable-option-test.ts +++ b/packages/host/tests/unit/searchable-option-test.ts @@ -65,9 +65,9 @@ module('Unit | searchable option', function (hooks) { virtualNetwork, }); - api = await loader.import(`${baseRealm.url}card-api`); + api = await loader.import('@cardstack/base/card-api'); let string = await loader.import( - `${baseRealm.url}string`, + '@cardstack/base/string', ); let {