Move TS client into packages folder

.github/workflows/clients_typescript_tests.yml → .github/workflows/client_tests.yml

@@ -8,12 +8,12 @@ on:
   pull_request:
     paths:
       - "pnpm-lock.yaml"
-      - "clients/typescript/**"
-      - "!clients/typescript/**.md"
+      - "packages/client/**"
+      - "!packages/client/**.md"
 
 defaults:
   run:
-    working-directory: clients/typescript
+    working-directory: packages/client
 
 concurrency:
   group: clients-typescript-${{ github.ref }}

Makefile

@@ -3,10 +3,10 @@ build_all:
 
 test_all:
 	make -C packages/electric deps tests
-	make -C clients/typescript deps tests
+	make -C packages/client deps tests
 	make -C generator deps tests
 	make -C e2e test
 
 update_protobuf:
 	make -C packages/electric update_protobuf
-	make -C clients/typescript update_protobuf
+	make -C packages/client update_protobuf

README.md

@@ -64,7 +64,7 @@ ElectricSQL then provides a whole developer experience for you to control what d
 
 This is the main repository for the ElectricSQL source code. Key components include:
 
-- [clients/typescript](https://github.com/electric-sql/electric/tree/main/clients/typescript) — TypeScript client that provides SQLite driver adapters, reactivity and a type-safe data access library
+- [packages/client](https://github.com/electric-sql/electric/tree/main/packages/client) — TypeScript client that provides SQLite driver adapters, reactivity and a type-safe data access library
 - [packages/electric](https://github.com/electric-sql/electric/tree/main/packages/electric) — Elixir sync service that manages active-active replication between Postgres and SQLite
 - [generator](https://github.com/electric-sql/electric/tree/main/generator) — Prisma generator that creates the type safe data access library
 - [protocol/satellite.proto](https://github.com/electric-sql/electric/tree/main/protocol/satellite.proto) — Protocol Buffers definition of the Satellite replication protocol

e2e/satellite_client/Dockerfile

@@ -12,7 +12,7 @@ RUN pnpm fetch
 COPY pnpm-workspace.yaml ./
 
 # E2E Client deps install + build
-COPY clients/typescript ./clients/typescript
+COPY packages/client ./packages/client
 COPY common ./common
 COPY generator ./generator
 COPY packages/drivers ./packages/drivers

e2e/satellite_client/Makefile

@@ -17,6 +17,6 @@ build:
 local-build:
 	make -C ../../packages/drivers build
 	pnpm i --frozen-lockfile
-	make -C ../../clients/typescript build
+	make -C ../../packages/client build
 	pnpm run build
 

packages/cli/Makefile

@@ -1,7 +1,7 @@
 deps:
-	make -C ../../clients/typescript deps
+	make -C ../../packages/client deps
 	pnpm install --frozen-lockfile
-	make -C ../../clients/typescript build
+	make -C ../../packages/client build
 	make -C ../../generator build
 
 build: node_modules

packages/cli/test/migrations/builder.test.ts

@@ -7,7 +7,7 @@ import { loadMigrations } from '../../src/migrations/builder'
 import { Relation } from 'electric-sql/client/model'
 
 const migrationsFolder = path.join(
-  '../../clients/typescript/test/migrators/support/migrations'
+  '../../packages/client/test/migrators/support/migrations'
 )
 
 test('write migration to configuration file', async (t) => {

clients/typescript/package.json → packages/client/package.json

@@ -2,7 +2,7 @@
   "version": "0.12.1",
   "name": "electric-sql",
   "description": "ElectricSQL TypeScript client for developing local-first SQL apps. Supports JavaScript based mobile, web and edge applications.",
-  "repository": "https://github.com/electric-sql/electric/tree/main/clients/typescript",
+  "repository": "https://github.com/electric-sql/electric/tree/main/packages/client",
   "author": "Electric DB Limited",
   "homepage": "https://electric-sql.com",
   "license": "Apache-2.0",

packages/toolbar/Makefile

@@ -1,7 +1,7 @@
 deps:
-	make -C ../../clients/typescript deps
+	make -C ../../packages/client deps
 	pnpm install --frozen-lockfile
-	make -C ../../clients/typescript build
+	make -C ../../packages/client build
 
 build:
 	deps