sandcms 0.7.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -4
- package/dist/admin/Admin.svelte +7 -5
- package/dist/admin/AssetAttachment.svelte +8 -3
- package/dist/admin/AssetAttachment.svelte.d.ts +3 -0
- package/dist/admin/Editor.svelte +5 -9
- package/dist/admin/Fields.svelte +2 -1
- package/dist/admin/Gallery.svelte +221 -76
- package/dist/admin/Inbox.svelte +3 -2
- package/dist/admin/MediaPicker.svelte +36 -20
- package/dist/admin/Navigation.svelte +13 -2
- package/dist/admin/Pages.svelte +195 -0
- package/dist/admin/Pages.svelte.d.ts +7 -0
- package/dist/admin/Shell.svelte +27 -5
- package/dist/admin/SortableList.svelte +82 -61
- package/dist/admin/SortableList.svelte.d.ts +3 -1
- package/dist/admin/Users.svelte +8 -3
- package/dist/admin/generated/admin.css +300 -20
- package/dist/admin/navigation.d.ts +9 -0
- package/dist/admin/navigation.js +20 -1
- package/dist/admin/types.d.ts +1 -0
- package/dist/blueprints/labels.d.ts +6 -0
- package/dist/blueprints/labels.js +14 -0
- package/dist/blueprints/load.js +11 -2
- package/dist/blueprints/types.d.ts +2 -2
- package/dist/cli/admin.d.ts +39 -0
- package/dist/cli/admin.js +95 -0
- package/dist/cli/backup.js +4 -4
- package/dist/cli/doctor.d.ts +8 -1
- package/dist/cli/doctor.js +19 -9
- package/dist/cli/email-test.d.ts +3 -0
- package/dist/cli/email-test.js +20 -0
- package/dist/cli/files.js +2 -1
- package/dist/cli/index.js +373 -135
- package/dist/cli/rebaseline.d.ts +10 -0
- package/dist/cli/rebaseline.js +117 -0
- package/dist/cli/upgrade.js +17 -9
- package/dist/env.d.ts +0 -8
- package/dist/env.js +0 -8
- package/dist/notification-fields.js +2 -1
- package/dist/server/admin-load.d.ts +72 -0
- package/dist/server/admin-load.js +20 -0
- package/dist/server/api-keys.d.ts +96 -0
- package/dist/server/api-keys.js +115 -0
- package/dist/server/api.js +16 -61
- package/dist/server/cms.d.ts +0 -5
- package/dist/server/cms.js +4 -3
- package/dist/server/db/auto-migrate.d.ts +0 -4
- package/dist/server/db/auto-migrate.js +12 -3
- package/dist/server/db/legacy.d.ts +13 -0
- package/dist/server/db/legacy.js +60 -0
- package/dist/server/db/migration-data.js +2 -38
- package/dist/server/db/migrations/{0000_foundation.sql → 0000_baseline.sql} +120 -4
- package/dist/server/db/migrations/meta/0000_snapshot.json +578 -3
- package/dist/server/db/migrations/meta/_journal.json +2 -65
- package/dist/server/db/schema.js +8 -6
- package/dist/server/db/store.d.ts +25 -2
- package/dist/server/db/store.js +90 -26
- package/dist/server/forms.js +2 -1
- package/dist/server/media/runner.d.ts +1 -1
- package/dist/server/media/runner.js +1 -1
- package/dist/server/media/service.d.ts +0 -4
- package/dist/server/media/service.js +0 -2
- package/dist/server/media/verify.d.ts +28 -0
- package/dist/server/media/verify.js +94 -2
- package/dist/server/platform/snapshots.js +3 -3
- package/docs/acceptance.md +2 -2
- package/docs/api.md +15 -1
- package/docs/cloudflare.md +9 -41
- package/docs/content.md +18 -3
- package/docs/deployment.md +97 -34
- package/docs/email.md +6 -0
- package/docs/forms.md +1 -1
- package/docs/media.md +10 -1
- package/docs/package.md +4 -4
- package/docs/releases.md +21 -1
- package/docs/upgrades.md +41 -7
- package/package.json +4 -10
- package/templates/Dockerfile +6 -2
- package/templates/integration.ts +10 -5
- package/templates/openship.json +9 -0
- package/templates/sandcms/config.yaml +1 -0
- package/dist/server/db/migrations/0001_independent_password_resets.sql +0 -3
- package/dist/server/db/migrations/0002_email_failure_reason.sql +0 -1
- package/dist/server/db/migrations/0003_direct_r2_uploads.sql +0 -10
- package/dist/server/db/migrations/0004_agent_api_keys.sql +0 -38
- package/dist/server/db/migrations/0005_api_retention_and_pagination.sql +0 -3
- package/dist/server/db/migrations/0006_durable_media_deletion.sql +0 -7
- package/dist/server/db/migrations/0007_content_and_job_indexes.sql +0 -2
- package/dist/server/db/migrations/0008_search_text_cache.sql +0 -45
- package/dist/server/db/migrations/0009_local_media.sql +0 -9
- package/dist/server/db/migrations/meta/0001_snapshot.json +0 -1197
- package/dist/server/db/migrations/meta/0002_snapshot.json +0 -1204
- package/dist/server/db/migrations/meta/0003_snapshot.json +0 -1281
- package/dist/server/db/migrations/meta/0004_snapshot.json +0 -1546
- package/dist/server/db/migrations/meta/0005_snapshot.json +0 -1572
- package/dist/server/db/migrations/meta/0006_snapshot.json +0 -1627
- package/dist/server/db/migrations/meta/0007_snapshot.json +0 -1643
- package/dist/server/db/migrations/meta/0008_snapshot.json +0 -1711
- package/dist/server/db/migrations/meta/0009_snapshot.json +0 -1763
- package/dist/server/media/import-r2.d.ts +0 -56
- package/dist/server/media/import-r2.js +0 -342
- package/dist/worker/index.d.ts +0 -10
- package/dist/worker/index.js +0 -460
- package/dist/worker/local.d.ts +0 -5
- package/dist/worker/local.js +0 -57
- package/dist/worker/source.d.ts +0 -2
- package/dist/worker/source.js +0 -31
- package/dist/worker/svg.d.ts +0 -1
- package/dist/worker/svg.js +0 -2
- package/dist/worker/uploads.d.ts +0 -22
- package/dist/worker/uploads.js +0 -48
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sandcms",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"dev": "bun run styles && bun --bun vite dev",
|
|
6
6
|
"build": "bun run validate && bun run styles && bun --bun vite build && bun run package",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"package": "bun scripts/migrations.ts && bun run styles && svelte-kit sync && svelte-package && publint",
|
|
11
11
|
"prepack": "bun run package",
|
|
12
12
|
"check": "bun run styles && svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
|
13
|
-
"test": "bun test tests",
|
|
13
|
+
"test": "bun test --parallel tests",
|
|
14
14
|
"test:e2e": "bun --bun x playwright test",
|
|
15
15
|
"cli": "bun src/lib/cli/index.ts",
|
|
16
16
|
"format": "prettier --write .",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"validate": "bun src/lib/cli/index.ts validate",
|
|
20
20
|
"test:container": "bun scripts/test-container.ts",
|
|
21
21
|
"preview:network": "bun scripts/preview-network.ts",
|
|
22
|
-
"release:check": "bun run check && bun test
|
|
22
|
+
"release:check": "bun run check && bun run test && bun run test:package",
|
|
23
23
|
"db:baseline": "bun scripts/migrations.ts --baseline",
|
|
24
24
|
"db:generate": "bun scripts/migrations.ts --generate"
|
|
25
25
|
},
|
|
@@ -55,11 +55,7 @@
|
|
|
55
55
|
"types": "./dist/env.d.ts",
|
|
56
56
|
"default": "./dist/env.js"
|
|
57
57
|
},
|
|
58
|
-
"./media-processor": "./dist/server/media/processor-child.js"
|
|
59
|
-
"./worker": "./dist/worker/index.js",
|
|
60
|
-
"./worker/local": {
|
|
61
|
-
"default": "./dist/worker/local.js"
|
|
62
|
-
}
|
|
58
|
+
"./media-processor": "./dist/server/media/processor-child.js"
|
|
63
59
|
},
|
|
64
60
|
"peerDependencies": {
|
|
65
61
|
"svelte": "^5.57.1",
|
|
@@ -96,13 +92,11 @@
|
|
|
96
92
|
"dependencies": {
|
|
97
93
|
"@better-auth/api-key": "1.7.25",
|
|
98
94
|
"@clack/prompts": "1.9.0",
|
|
99
|
-
"@cloudflare/workers-types": "5.20261117.1",
|
|
100
95
|
"@internationalized/date": "3.12.4",
|
|
101
96
|
"@lucide/svelte": "1.73.0",
|
|
102
97
|
"@tiptap/core": "3.34.0",
|
|
103
98
|
"@tiptap/starter-kit": "3.34.0",
|
|
104
99
|
"@types/bun": "1.4.4",
|
|
105
|
-
"aws4fetch": "1.0.20",
|
|
106
100
|
"better-auth": "1.7.25",
|
|
107
101
|
"bits-ui": "2.21.0",
|
|
108
102
|
"cn": "0.5.2",
|
package/templates/Dockerfile
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# Generated by SandCMS. Run one container per site with one persistent volume mounted at /data.
|
|
2
|
-
#
|
|
2
|
+
# Deploys overlap: the new container starts and must pass the health check (which runs pending migrations)
|
|
3
|
+
# before the old one is stopped. See docs/deployment.md for OpenShip, Dokploy and Coolify settings.
|
|
3
4
|
FROM oven/bun:1.4.4 AS build
|
|
4
5
|
WORKDIR /app
|
|
5
6
|
COPY package.json bun.lock ./
|
|
@@ -17,12 +18,15 @@ WORKDIR /app
|
|
|
17
18
|
ENV NODE_ENV=production \
|
|
18
19
|
PORT=3000 \
|
|
19
20
|
BODY_SIZE_LIMIT=10M \
|
|
21
|
+
SHUTDOWN_TIMEOUT=8 \
|
|
22
|
+
SANDCMS_AUTO_MIGRATE=true \
|
|
20
23
|
SANDCMS_DATABASE=/data/sandcms.sqlite
|
|
21
24
|
COPY --from=deps /app/node_modules ./node_modules
|
|
22
25
|
COPY --from=build /app/package.json ./
|
|
23
26
|
COPY --from=build /app/build ./build
|
|
24
27
|
COPY --from=build /app/sandcms ./sandcms
|
|
25
28
|
EXPOSE 3000
|
|
26
|
-
|
|
29
|
+
# Hosts switch traffic once this passes: probe often, and allow about two minutes for migrations.
|
|
30
|
+
HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=24 \
|
|
27
31
|
CMD ["bun", "-e", "fetch('http://127.0.0.1:' + (process.env.PORT || 3000) + '/_sandcms/health').then((r) => process.exit(r.ok ? 0 : 1), () => process.exit(1))"]
|
|
28
32
|
CMD ["bun", "build/index.js"]
|
package/templates/integration.ts
CHANGED
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { createCMS, emailOptionsFromEnv, type CMS } from 'sandcms/server';
|
|
2
2
|
import * as env from '$app/env/private';
|
|
3
|
-
let instance: CMS;
|
|
3
|
+
let instance: CMS | undefined, stopBackground: (() => void) | undefined;
|
|
4
|
+
// The adapter emits this after draining requests on SIGTERM (at most SHUTDOWN_TIMEOUT seconds). Overlapping
|
|
5
|
+
// deploys stop the old container this way, so stop background work, close the database and exit before the
|
|
6
|
+
// host's stop timeout. Leases left by unfinished work expire on their own.
|
|
7
|
+
process.once('sveltekit:shutdown', () => {
|
|
8
|
+
stopBackground?.();
|
|
9
|
+
instance?.close();
|
|
10
|
+
process.exit(0);
|
|
11
|
+
});
|
|
4
12
|
export function getCMS() {
|
|
5
13
|
if (!instance) {
|
|
6
14
|
// A start-up failure (e.g. another server holds the data volume) fails every request, so the
|
|
@@ -19,14 +27,11 @@ export function getCMS() {
|
|
|
19
27
|
indexing: env.SANDCMS_INDEXING,
|
|
20
28
|
canonicalRedirect: env.SANDCMS_CANONICAL_REDIRECT,
|
|
21
29
|
bootstrapEmail: env.SANDCMS_BOOTSTRAP_EMAIL,
|
|
22
|
-
// Deprecated; kept for sandcms media import-r2 from the legacy Cloudflare Worker.
|
|
23
|
-
workerToken: env.SANDCMS_WORKER_TOKEN,
|
|
24
|
-
workerUrl: env.SANDCMS_WORKER_URL,
|
|
25
30
|
trustedProxyHeader: env.SANDCMS_TRUSTED_PROXY_HEADER,
|
|
26
31
|
autoMigrate: env.SANDCMS_AUTO_MIGRATE
|
|
27
32
|
});
|
|
28
33
|
try {
|
|
29
|
-
cms.media.start();
|
|
34
|
+
stopBackground = cms.media.start();
|
|
30
35
|
} catch (cause) {
|
|
31
36
|
cms.close();
|
|
32
37
|
throw cause;
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
DROP INDEX `access_link_recipient`;--> statement-breakpoint
|
|
2
|
-
CREATE UNIQUE INDEX `access_invite_recipient` ON `access_links` (`kind`,`email`) WHERE "access_links"."kind" = 'invite';--> statement-breakpoint
|
|
3
|
-
CREATE INDEX `access_link_recipient` ON `access_links` (`kind`,`email`);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
ALTER TABLE `access_links` ADD `failureReason` text;
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
CREATE TABLE `upload_sessions` (
|
|
2
|
-
`mediaId` text PRIMARY KEY NOT NULL,
|
|
3
|
-
`attempt` text NOT NULL,
|
|
4
|
-
`expiresAt` integer NOT NULL,
|
|
5
|
-
`status` text DEFAULT 'uploading' NOT NULL,
|
|
6
|
-
`attempts` integer DEFAULT 0 NOT NULL,
|
|
7
|
-
`nextAttempt` integer DEFAULT 0 NOT NULL,
|
|
8
|
-
`leaseUntil` integer DEFAULT 0 NOT NULL,
|
|
9
|
-
FOREIGN KEY (`mediaId`) REFERENCES `media`(`id`) ON UPDATE no action ON DELETE cascade
|
|
10
|
-
);
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
CREATE TABLE `api_requests` (
|
|
2
|
-
`id` text PRIMARY KEY NOT NULL,
|
|
3
|
-
`userId` text NOT NULL,
|
|
4
|
-
`fingerprint` text NOT NULL,
|
|
5
|
-
`response` text NOT NULL,
|
|
6
|
-
`createdAt` integer NOT NULL,
|
|
7
|
-
FOREIGN KEY (`userId`) REFERENCES `user`(`id`) ON UPDATE no action ON DELETE cascade
|
|
8
|
-
);
|
|
9
|
-
--> statement-breakpoint
|
|
10
|
-
CREATE TABLE `apikey` (
|
|
11
|
-
`id` text PRIMARY KEY NOT NULL,
|
|
12
|
-
`configId` text DEFAULT 'default' NOT NULL,
|
|
13
|
-
`name` text,
|
|
14
|
-
`start` text,
|
|
15
|
-
`prefix` text,
|
|
16
|
-
`key` text NOT NULL,
|
|
17
|
-
`referenceId` text NOT NULL,
|
|
18
|
-
`refillInterval` integer,
|
|
19
|
-
`refillAmount` integer,
|
|
20
|
-
`lastRefillAt` integer,
|
|
21
|
-
`enabled` integer DEFAULT true,
|
|
22
|
-
`rateLimitEnabled` integer DEFAULT true,
|
|
23
|
-
`rateLimitTimeWindow` integer DEFAULT 60000,
|
|
24
|
-
`rateLimitMax` integer DEFAULT 120,
|
|
25
|
-
`requestCount` integer DEFAULT 0,
|
|
26
|
-
`remaining` integer,
|
|
27
|
-
`lastRequest` integer,
|
|
28
|
-
`expiresAt` integer,
|
|
29
|
-
`createdAt` integer NOT NULL,
|
|
30
|
-
`updatedAt` integer NOT NULL,
|
|
31
|
-
`permissions` text,
|
|
32
|
-
`metadata` text,
|
|
33
|
-
FOREIGN KEY (`referenceId`) REFERENCES `user`(`id`) ON UPDATE no action ON DELETE cascade
|
|
34
|
-
);
|
|
35
|
-
--> statement-breakpoint
|
|
36
|
-
CREATE INDEX `apikey_owner` ON `apikey` (`referenceId`);--> statement-breakpoint
|
|
37
|
-
CREATE INDEX `apikey_config` ON `apikey` (`configId`);--> statement-breakpoint
|
|
38
|
-
CREATE UNIQUE INDEX `apikey_hash` ON `apikey` (`key`);
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
CREATE TABLE `media_deletions` (
|
|
2
|
-
`mediaId` text PRIMARY KEY NOT NULL,
|
|
3
|
-
`attempts` integer DEFAULT 0 NOT NULL,
|
|
4
|
-
`nextAttempt` integer DEFAULT 0 NOT NULL,
|
|
5
|
-
`leaseUntil` integer DEFAULT 0 NOT NULL,
|
|
6
|
-
FOREIGN KEY (`mediaId`) REFERENCES `media`(`id`) ON UPDATE no action ON DELETE cascade
|
|
7
|
-
);
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
CREATE TABLE `media_document_links` (
|
|
2
|
-
`mediaId` text NOT NULL,
|
|
3
|
-
`documentId` text NOT NULL,
|
|
4
|
-
PRIMARY KEY(`mediaId`, `documentId`),
|
|
5
|
-
FOREIGN KEY (`mediaId`) REFERENCES `media`(`id`) ON UPDATE no action ON DELETE cascade
|
|
6
|
-
);
|
|
7
|
-
--> statement-breakpoint
|
|
8
|
-
CREATE INDEX `media_document_link_document` ON `media_document_links` (`documentId`);--> statement-breakpoint
|
|
9
|
-
ALTER TABLE `documents` ADD `searchText` text;--> statement-breakpoint
|
|
10
|
-
ALTER TABLE `media` ADD `searchText` text;--> statement-breakpoint
|
|
11
|
-
INSERT OR IGNORE INTO `media_document_links` (`mediaId`, `documentId`)
|
|
12
|
-
SELECT `media`.`id`, `documents`.`id` FROM `media`, json_tree(`media`.`metadata`) AS `node`
|
|
13
|
-
JOIN `documents` ON `documents`.`id` = `node`.`value` WHERE `node`.`type` = 'text';--> statement-breakpoint
|
|
14
|
-
CREATE TRIGGER `media_document_links_inserted` AFTER INSERT ON `media` BEGIN
|
|
15
|
-
INSERT OR IGNORE INTO `media_document_links` (`mediaId`, `documentId`)
|
|
16
|
-
SELECT NEW.`id`, `documents`.`id` FROM json_tree(NEW.`metadata`) AS `node`
|
|
17
|
-
JOIN `documents` ON `documents`.`id` = `node`.`value` WHERE `node`.`type` = 'text';
|
|
18
|
-
END;--> statement-breakpoint
|
|
19
|
-
CREATE TRIGGER `media_document_links_updated` AFTER UPDATE OF `metadata` ON `media` BEGIN
|
|
20
|
-
DELETE FROM `media_document_links` WHERE `mediaId` = NEW.`id`;
|
|
21
|
-
INSERT OR IGNORE INTO `media_document_links` (`mediaId`, `documentId`)
|
|
22
|
-
SELECT NEW.`id`, `documents`.`id` FROM json_tree(NEW.`metadata`) AS `node`
|
|
23
|
-
JOIN `documents` ON `documents`.`id` = `node`.`value` WHERE `node`.`type` = 'text';
|
|
24
|
-
END;--> statement-breakpoint
|
|
25
|
-
CREATE TRIGGER `documents_search_text_stale` AFTER UPDATE OF `draft`, `blueprint` ON `documents` BEGIN
|
|
26
|
-
UPDATE `documents` SET `searchText` = NULL WHERE `id` = NEW.`id`;
|
|
27
|
-
END;--> statement-breakpoint
|
|
28
|
-
CREATE TRIGGER `documents_search_text_label` AFTER UPDATE OF `draft`, `blueprint` ON `documents`
|
|
29
|
-
WHEN json_extract(OLD.`draft`, '$.title') IS NOT json_extract(NEW.`draft`, '$.title')
|
|
30
|
-
OR json_extract(OLD.`draft`, '$.name') IS NOT json_extract(NEW.`draft`, '$.name')
|
|
31
|
-
OR OLD.`blueprint` IS NOT NEW.`blueprint`
|
|
32
|
-
BEGIN
|
|
33
|
-
UPDATE `media` SET `searchText` = NULL WHERE `id` IN (
|
|
34
|
-
SELECT `mediaId` FROM `media_document_links` WHERE `documentId` = NEW.`id`
|
|
35
|
-
);
|
|
36
|
-
END;--> statement-breakpoint
|
|
37
|
-
CREATE TRIGGER `documents_search_text_deleted` AFTER DELETE ON `documents` BEGIN
|
|
38
|
-
UPDATE `media` SET `searchText` = NULL WHERE `id` IN (
|
|
39
|
-
SELECT `mediaId` FROM `media_document_links` WHERE `documentId` = OLD.`id`
|
|
40
|
-
);
|
|
41
|
-
DELETE FROM `media_document_links` WHERE `documentId` = OLD.`id`;
|
|
42
|
-
END;--> statement-breakpoint
|
|
43
|
-
CREATE TRIGGER `media_search_text_stale` AFTER UPDATE OF `metadata`, `filename`, `blueprint` ON `media` BEGIN
|
|
44
|
-
UPDATE `media` SET `searchText` = NULL WHERE `id` = NEW.`id`;
|
|
45
|
-
END;
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
CREATE TABLE `leases` (
|
|
2
|
-
`name` text PRIMARY KEY NOT NULL,
|
|
3
|
-
`owner` text NOT NULL,
|
|
4
|
-
`leaseUntil` integer NOT NULL
|
|
5
|
-
);
|
|
6
|
-
--> statement-breakpoint
|
|
7
|
-
ALTER TABLE `media` ADD `width` integer;--> statement-breakpoint
|
|
8
|
-
ALTER TABLE `media` ADD `height` integer;--> statement-breakpoint
|
|
9
|
-
ALTER TABLE `media` ADD `uploadAttempt` text;
|