Merge branch 'main' into fix/pushDocs

.github/workflows/release.yml

@@ -6,13 +6,13 @@ on:
       semver:
         description: 'The semver to use'
         required: true
-        default: 'prerelease'
+        default: 'patch'
         type: choice
         options:
           # - auto
-          # - patch
-          # - minor
-          # - major
+          - patch
+          - minor
+          - major
           - prerelease
           # - prepatch
           # - preminor
@@ -51,10 +51,10 @@ jobs:
           sync-semver-tags: true
           access: 'public'
           # This prefix is added before the prerelease number, e.g. `v3.0.0-alpha.0`
-          prerelease-prefix: 'alpha'
+          # prerelease-prefix: 'alpha'
           semver: ${{ github.event.inputs.semver }}
           # Prereleases are published under the `alpha` npm dist-tag
-          npm-tag: ${{ startsWith(github.event.inputs.semver, 'pre') && 'alpha' || 'latest' }}
+          # npm-tag: ${{ startsWith(github.event.inputs.semver, 'pre') && 'alpha' || 'latest' }}
           # Don't notify linked issues
           notify-linked-issues: false
           # optional: set this secret in your repo config for publishing to NPM

README.md

@@ -1,20 +1,14 @@
-# Mapeo Core
+# CoMapeo Core
 
 > A local-first library for collaborating on mapping projects.
 
-## ⚠️ Early development
-
-This is the next version of @mapeo/core, hosted in its own repo for ease of testing.
-
-This library isn't ready for direct use yet!
-
 ## About
 
-Mapeo Core is a library used by the [mobile](https://github.com/digidem/mapeo-mobile) and [desktop](https://github.com/digidem/mapeo-desktop) Mapeo apps that provides the core features needed for offline-first peer to peer collaboration on mapping projects.
+CoMapeo Core is a library used by the [mobile](https://github.com/digidem/comapeo-mobile) and [desktop](https://github.com/digidem/comapeo-desktop) CoMapeo apps that provides the core features needed for offline-first peer to peer collaboration on mapping projects.
 
 ## Docs
 
-To learn more about Mapeo Core see the [docs](docs/) section of this repo.
+To learn more about CoMapeo Core see the [docs](docs/) section of this repo.
 
 ## Change log
 
@@ -25,7 +19,7 @@ The changes in each version are described in the [change log](CHANGELOG.md).
 > **⚠️ Warning:** this package is not ready for use!
 
 ```shell
-npm i digidem/mapeo-core-next
+npm install @comapeo/core
 ```
 
 ## Contributing

docs/development/setup.md

@@ -9,8 +9,8 @@
 
 ## Clone the repo
 
-- `git clone [email protected]:digidem/mapeo-core-next.git`
-- `cd mapeo-core-next`
+- `git clone [email protected]:digidem/comapeo-core.git`
+- `cd comapeo-core`
 
 ## Install dependencies
 

drizzle/client/0000_chemical_star_brand.sql → drizzle/client/0000_bumpy_carnage.sql

@@ -27,7 +27,6 @@ CREATE TABLE `projectSettings` (
 	`name` text,
 	`defaultPresets` text,
 	`configMetadata` text,
-	`isInitialProject` integer NOT NULL,
 	`forks` text NOT NULL
 );
 --> statement-breakpoint

drizzle/client/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "41e23fc3-463e-432a-9a5f-7c20366d6294",
+  "id": "e75103ab-bbcb-4ca9-a0c4-2d9095b63add",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "localDeviceInfo": {
@@ -176,13 +176,6 @@
           "notNull": false,
           "autoincrement": false
         },
-        "isInitialProject": {
-          "name": "isInitialProject",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
         "forks": {
           "name": "forks",
           "type": "text",

drizzle/client/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1725381616476,
-      "tag": "0000_chemical_star_brand",
+      "when": 1726514276007,
+      "tag": "0000_bumpy_carnage",
       "breakpoints": true
     }
   ]

drizzle/project/0000_tan_glorian.sql → drizzle/project/0000_spooky_lady_ursula.sql

@@ -38,7 +38,7 @@ CREATE TABLE `deviceInfo` (
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
 	`name` text NOT NULL,
-	`deviceType` text,
+	`deviceType` text NOT NULL,
 	`forks` text NOT NULL
 );
 --> statement-breakpoint
@@ -128,7 +128,7 @@ CREATE TABLE `preset` (
 	`fieldRefs` text NOT NULL,
 	`iconRef` text,
 	`terms` text NOT NULL,
-	`color` text NOT NULL,
+	`color` text,
 	`forks` text NOT NULL
 );
 --> statement-breakpoint
@@ -186,7 +186,7 @@ CREATE TABLE `translation` (
 	`docRefType` text NOT NULL,
 	`propertyRef` text NOT NULL,
 	`languageCode` text NOT NULL,
-	`regionCode` text NOT NULL,
+	`regionCode` text,
 	`message` text NOT NULL,
 	`forks` text NOT NULL
 );

drizzle/project/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "b06de2c5-6a4c-4578-a8f0-d15f9f20e902",
+  "id": "597b1fb1-5fe9-4601-abab-9cd02b6a77fe",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "coreOwnership_backlink": {
@@ -236,7 +236,7 @@
           "name": "deviceType",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "forks": {
@@ -770,7 +770,7 @@
           "name": "color",
           "type": "text",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoincrement": false
         },
         "forks": {
@@ -1104,7 +1104,7 @@
           "name": "regionCode",
           "type": "text",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoincrement": false
         },
         "message": {

drizzle/project/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1725381611574,
-      "tag": "0000_tan_glorian",
+      "when": 1726514275142,
+      "tag": "0000_spooky_lady_ursula",
       "breakpoints": true
     }
   ]

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@mapeo/core",
-  "version": "9.0.0-alpha.23",
+  "name": "@comapeo/core",
+  "version": "1.0.0",
   "description": "Offline p2p mapping library",
   "main": "src/index.js",
   "types": "dist/index.d.ts",
@@ -92,22 +92,24 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/digidem/mapeo-core.git"
+    "url": "git+https://github.com/digidem/comapeo-core.git"
   },
   "authors": [
-    "Karissa McKelvey",
-    "Gregor MacLennan",
-    "noffle"
+    "Andrew Chou <[email protected]>",
+    "Evan Hahn <[email protected]>",
+    "Gregor MacLennan <[email protected]>",
+    "Seth Vincent",
+    "Tomás Ciccola <[email protected]>"
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/digidem/mapeo-core/issues"
+    "url": "https://github.com/digidem/comapeo-core/issues"
   },
-  "homepage": "https://github.com/digidem/mapeo-core#readme",
+  "homepage": "https://github.com/digidem/comapeo-core#readme",
   "devDependencies": {
     "@bufbuild/buf": "^1.26.1",
-    "@mapeo/default-config": "4.0.0-alpha.8",
-    "@mapeo/mock-data": "^1.0.3-alpha.5",
+    "@mapeo/default-config": "5.0.0",
+    "@mapeo/mock-data": "2.0.0",
     "@sinonjs/fake-timers": "^10.0.2",
     "@types/b4a": "^1.6.0",
     "@types/bogon": "^1.0.2",
@@ -156,7 +158,7 @@
     "@fastify/type-provider-typebox": "^4.0.0",
     "@hyperswarm/secret-stream": "^6.1.2",
     "@mapeo/crypto": "1.0.0-alpha.10",
-    "@mapeo/schema": "^3.0.0-next.26",
+    "@comapeo/schema": "1.0.0",
     "@mapeo/sqlite-indexer": "1.0.0-alpha.9",
     "@sinclair/typebox": "^0.29.6",
     "b4a": "^1.6.3",