Change dynamic imports to use @cardstack/base

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,

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<typeof BaseToolModule> {
     return this.loaderService.loader.import<typeof BaseToolModule>(
-      `${baseRealm.url}command`,
+      '@cardstack/base/command',
     );
   }
 }

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<typeof CardAPI>(`${baseRealm.url}card-api`);
+    let api = await loader.import<typeof CardAPI>('@cardstack/base/card-api');
     let lookupDefinition = async (
       codeRef: CodeRef,
     ): Promise<Definition | undefined> => {
@@ -455,7 +454,7 @@ async function makeDefinition(
   let urlString = url instanceof URL ? url.href : url;
   try {
     let api = await context.loaderService.loader.import<typeof CardAPI>(
-      `${baseRealm.url}card-api`,
+      '@cardstack/base/card-api',
     );
     let { fields, fieldDefs } = getFieldDefinitions(api, cardOrFieldDef);
     let codeRef = identifyCard(cardOrFieldDef) as ResolvedCodeRef;

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<typeof CardAPI>(
-      `${baseRealm.url}card-api`,
+      '@cardstack/base/card-api',
     );
     let mappings = await basicMappings(loader);
     let schema = generateJsonSchemaForCardType(

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<typeof import('@cardstack/base/spec')>(
-      `${baseRealm.url}spec`,
+      '@cardstack/base/spec',
     );
 
     class Index extends CardDef {

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({

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;

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;

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;

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 () => {

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,

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,

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,

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 {

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;

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';

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<CardAPI>(
-      `${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<CardAPI>(
-        `${baseRealm.url}card-api`,
+        '@cardstack/base/card-api',
       );
       if (cardApi.isCard(value)) {
         let doc = cardApi.serializeCard(value, {});