diff --git a/package-lock.json b/package-lock.json index df2101bc..a7047024 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,11 +11,11 @@ "license": "GPL-3.0", "dependencies": { "@comapeo/core": "5.1.2", + "@comapeo/default-categories": "1.0.1", "@comapeo/fallback-smp": "1.0.0", "@comapeo/ipc": "6.0.1", "@formatjs/intl": "3.1.8", "@homebridge/ciao": "1.3.4", - "@mapeo/default-config": "6.0.0", "@sentry/electron": "7.3.0", "atomically": "2.1.0", "debug": "4.4.3", @@ -719,6 +719,12 @@ "react": "^18 || ^19" } }, + "node_modules/@comapeo/default-categories": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@comapeo/default-categories/-/default-categories-1.0.1.tgz", + "integrity": "sha512-UqHVmmJtDT2cBJ43YmYjlMVuj6N+FafVcfI50FV6jhNZTqJCLUnmiFwd+fS4qjCN28+YKN83RT+nR3nfPZrxqw==", + "license": "CC-BY-NC-4.0" + }, "node_modules/@comapeo/fallback-smp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@comapeo/fallback-smp/-/fallback-smp-1.0.0.tgz", @@ -3604,12 +3610,6 @@ "z32": "^1.0.0" } }, - "node_modules/@mapeo/default-config": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@mapeo/default-config/-/default-config-6.0.0.tgz", - "integrity": "sha512-nAnTbcKQRntsExuQAsAHal+EOd2OkDWrsl0ewcic/yVo+WpJ25ZTryKSPMVyFyHLihElX1cUH2r8C3YkZMoClA==", - "license": "CC-BY-NC-4.0" - }, "node_modules/@mapeo/sqlite-indexer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@mapeo/sqlite-indexer/-/sqlite-indexer-1.0.2.tgz", diff --git a/package.json b/package.json index 7b90635a..53334b70 100644 --- a/package.json +++ b/package.json @@ -70,11 +70,11 @@ }, "dependencies": { "@comapeo/core": "5.1.2", + "@comapeo/default-categories": "1.0.1", "@comapeo/fallback-smp": "1.0.0", "@comapeo/ipc": "6.0.1", "@formatjs/intl": "3.1.8", "@homebridge/ciao": "1.3.4", - "@mapeo/default-config": "6.0.0", "@sentry/electron": "7.3.0", "atomically": "2.1.0", "debug": "4.4.3", diff --git a/src/renderer/src/routes/app/projects/$projectId_/settings/categories.tsx b/src/renderer/src/routes/app/projects/$projectId_/settings/categories.tsx index d9bf3e2e..ff3b3cad 100644 --- a/src/renderer/src/routes/app/projects/$projectId_/settings/categories.tsx +++ b/src/renderer/src/routes/app/projects/$projectId_/settings/categories.tsx @@ -44,7 +44,7 @@ export const Route = createFileRoute( component: RouteComponent, }) -const DEFAULT_CATEGORIES_NAME = `@mapeo/default-config` +const DEFAULT_CATEGORIES_NAME = `@comapeo/default-categories` const SELECT_AND_IMPORT_CATEGORY_MUTATION_KEY = createGlobalMutationsKey([ 'category', diff --git a/src/services/core.ts b/src/services/core.ts index 13d0abd6..423024da 100644 --- a/src/services/core.ts +++ b/src/services/core.ts @@ -38,7 +38,7 @@ const DATABASE_MIGRATIONS_DIRECTORY = fileURLToPath( const DEFAULT_CONFIG_PATH = fileURLToPath( import.meta.resolve( - '@mapeo/default-config/dist/mapeo-default-config.comapeocat', + '@comapeo/default-categories/dist/comapeo-default-categories.comapeocat', ), ) diff --git a/tests-e2e/app.spec.ts b/tests-e2e/app.spec.ts index 876439cf..9ac9e519 100644 --- a/tests-e2e/app.spec.ts +++ b/tests-e2e/app.spec.ts @@ -931,7 +931,7 @@ test.describe('project settings', () => { }), ).toBeVisible() await expect( - categoriesSetItem.getByText('CoMapeo Default Config'), + categoriesSetItem.getByText('CoMapeo Default Categories'), ).toBeVisible() await expect( categoriesSetItem.getByRole('link', { @@ -1396,7 +1396,7 @@ test.describe('project settings', () => { { await expect( main.getByRole('heading', { - name: 'CoMapeo Default Config', + name: 'CoMapeo Default Categories', exact: true, }), ).toBeVisible() @@ -1519,7 +1519,7 @@ test.describe('project settings', () => { await stubDialog(electronApp, 'showOpenDialog', { canceled: false, filePaths: [ - createRequire(import.meta.url).resolve('@mapeo/default-config'), + createRequire(import.meta.url).resolve('@comapeo/default-categories'), ], }) @@ -1529,7 +1529,7 @@ test.describe('project settings', () => { await expect( main.getByRole('heading', { - name: 'CoMapeo Default Config', + name: 'CoMapeo Default Categories', exact: true, }), ).toBeVisible() @@ -1549,7 +1549,7 @@ test.describe('project settings', () => { const categoriesSetItem = main.getByRole('listitem').last() await expect( - categoriesSetItem.getByText('CoMapeo Default Config', { + categoriesSetItem.getByText('CoMapeo Default Categories', { exact: true, }), ).toBeVisible()