Oleg Isonen d339dc55cf feat: Add token conflict detection and resolution for marketplace templates (#5609) ...

- Add Token class and token() helper in template package for JSX token
support
- Refactor insertFragmentWithConflictResolution to
detectFragmentTokenConflicts
- Refactor insertPageWithConflictResolution to detectPageTokenConflicts
- Move dialog display to callers for better testability
- Add conflictResolution parameter to page-utils
- Add comprehensive tests for token functionality and conflict detection
- Fix bug: remove .values() call on arrays in breakpoint handling

2026-02-05 22:34:17 +01:00

..

$resources

fix: Fix asset resource on published sites (#5565)

2026-01-15 18:26:32 +01:00

breakpoints

feat: Support any media query condition as a breakpoint (#5547)

2026-01-04 18:48:45 +01:00

copy-paste

feat: Add token conflict detection and resolution for marketplace templates (#5609)

2026-02-05 22:34:17 +01:00

db

feat: add more flags for mini plan (#5440)

2026-01-30 13:15:16 +01:00

dom-hooks

fix: show token name when convert local styles to token (#5123)

2025-04-15 14:29:37 +07:00

entri

feat: improve automatic domain configuration (#5289)

2025-06-26 15:22:31 +03:00

error

fix: remove Text Content property from Image component (#5195)

2025-05-11 01:10:27 +04:00

form-utils

experimental: Live animation setting update (#5005)

2025-03-17 14:23:57 +05:00

hook-utils

feat: Manage CSS variables (#5490)

2025-12-08 21:48:45 +01:00

images

Icons update (#1558)

2023-05-03 00:00:16 +02:00

marketplace

chore: new Domain publish prepare steps (#4125)

2024-09-19 09:50:29 +03:00

nano-states

feat: add more flags for mini plan (#5440)

2026-01-30 13:15:16 +01:00

pages

fix: navigate to home page when undo page creation (#4995)

2025-03-13 22:32:59 +07:00

project-settings

feat: add more flags for mini plan (#5440)

2026-01-30 13:15:16 +01:00

pubsub

feat: New token conflict resolution logic (#5524)

2025-12-18 17:31:31 +01:00

router-utils

feat: add more flags for mini plan (#5440)

2026-01-30 13:15:16 +01:00

session

refactor: drop unused sentry (#3100)

2024-04-05 23:21:45 +07:00

share-project

feat: add more flags for mini plan (#5440)

2026-01-30 13:15:16 +01:00

sync

feat: When asset is deleted or uploaded - refresh asset resource (#5568)

2026-01-16 21:05:16 +01:00

tailwind

fix: Add tests for breakpoint creation in tailwind conversion (#5582)

2026-01-25 11:36:01 +01:00

trpc

fix: Image upload via share link (#4083)

2024-09-07 18:43:03 +03:00

app.css

Fix hydration (#1621)

2023-05-13 11:52:03 +04:00

array-utils.test.ts

refactor: migrate builder tests to vitest (#4415)

2024-11-13 14:39:17 +04:00

array-utils.ts

experimental: migrate image control to style object model (#4102)

2024-09-10 20:29:25 +02:00

asset-client.ts

refactor: hardcode asset and upload path in builder (#4579)

2024-12-13 23:18:22 +07:00

awareness.test.tsx

feat: navigate to pro features on publish dialog (#5036)

2025-03-24 02:19:54 +07:00

awareness.ts

feat: Open current page in the publish dialog (#5277)

2025-06-13 19:18:18 +02:00

breakpoints-utils.test.ts

feat: Support any media query condition as a breakpoint (#5547)

2026-01-04 18:48:45 +01:00

breakpoints-utils.ts

feat: Support any media query condition as a breakpoint (#5547)

2026-01-04 18:48:45 +01:00

builder-api.ts

chore: Refactor assets without any changes in functionality (#5560)

2026-01-08 16:53:43 +01:00

builder-data.ts

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

canvas-api.ts

perf: compute tags statically (#4687)

2024-12-31 17:22:28 +07:00

client-only.ts

refactor: render canvas only client side (#3199)

2024-04-18 13:58:26 +07:00

client-supports.ts

chore: Advanced properties performance (chrome only) (#4238)

2024-10-07 17:14:01 +03:00

clone-project.tsx

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

cms-upgrade-banner.svg

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

code-editor-base.tsx

feat: Pseudo elements (#5572)

2026-01-19 17:28:47 +01:00

code-editor.stories.tsx

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

code-editor.tsx

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

code-highlight.ts

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

commands-emitter.ts

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

content-model.test.tsx

fix: consider Text and Link components as rich text (#5334)

2025-07-23 20:50:24 +02:00

content-model.ts

fix: consider Text and Link components as rich text (#5334)

2025-07-23 20:50:24 +02:00

context.server.ts

chore: rename postrest package to postgrest and enable publishing (#5592)

2026-01-28 21:32:34 +01:00

copy-paste.test.tsx

fix: copy paste search params in resources (#5412)

2025-09-27 16:47:49 +03:00

copy-to-clipboard.tsx

feat: Copy domain button with pass/user (#5530)

2025-12-19 00:18:46 +01:00

csrf.client.ts

chore: Add CSRF protection to prevent Canvas script execution vulnerability (#4047)

2024-09-04 17:08:08 +03:00

data-variables.test.tsx

feat: Manage data variables (#5488)

2025-12-07 23:15:48 +01:00

data-variables.ts

feat: Manage data variables (#5488)

2025-12-07 23:15:48 +01:00

debug-track.ts

fix: Reduce amount of draw on resize (#4544)

2024-12-10 09:37:33 +03:00

debug.ts

chore: Project login (#3990)

2024-08-24 08:58:54 +03:00

dom-utils.stories.tsx

chore: Cleanup storybook structure (#5457)

2025-11-23 20:25:10 +01:00

dom-utils.test.ts

refactor: migrate builder tests to vitest (#4415)

2024-11-13 14:39:17 +04:00

dom-utils.ts

perf: improve instance selection performance (#5240)

2025-06-01 14:42:10 +03:00

empty.ts

chore: Make code "Remix" friendly (#4005)

2024-08-24 07:55:20 +03:00

event-utils.test.ts

feat: Backspace to reset the value in CSS Value Input (#4878)

2025-02-15 17:53:28 +01:00

event-utils.ts

feat: Backspace to reset the value in CSS Value Input (#4878)

2025-02-15 17:53:28 +01:00

fetch.client.ts

fix: Image upload via share link (#4083)

2024-09-07 18:43:03 +03:00

help.tsx

feat: allow restore from published backup (#5320)

2025-07-11 19:05:31 +02:00

html.test.tsx

feat: Support script and style tag when pasting HTML (#5447)

2025-11-11 14:26:55 +01:00

html.ts

feat: Support script and style tag when pasting HTML (#5447)

2025-11-11 14:26:55 +01:00

instance-utils.test.tsx

feat: Add token conflict detection and resolution for marketplace templates (#5609)

2026-02-05 22:34:17 +01:00

instance-utils.ts

feat: Add token conflict detection and resolution for marketplace templates (#5609)

2026-02-05 22:34:17 +01:00

logout.client.tsx

chore: Fast project opening (on subsequent openings) (#4100)

2024-09-13 10:51:00 +03:00

matcher.test.tsx

refactor: drop legacy matchers (#5146)

2025-04-20 16:59:22 +07:00

matcher.ts

refactor: drop legacy matchers (#5146)

2025-04-20 16:59:22 +07:00

math-utils.ts

feat: Scrub improvements (#2904)

2024-02-13 20:12:09 +01:00

nano-hash.test.ts

refactor: migrate builder tests to vitest (#4415)

2024-11-13 14:39:17 +04:00

nano-hash.ts

chore: Add nanoid hash function (#3618)

2024-06-25 22:14:58 +03:00

page-utils.test.tsx

feat: add global system variable in builder (#4896)

2025-02-23 01:46:21 +07:00

page-utils.ts

feat: Add token conflict detection and resolution for marketplace templates (#5609)

2026-02-05 22:34:17 +01:00

resource-utils.ts

feat: When asset is deleted or uploaded - refresh asset resource (#5568)

2026-01-16 21:05:16 +01:00

resources.test.ts

feat: When asset is deleted or uploaded - refresh asset resource (#5568)

2026-01-16 21:05:16 +01:00

resources.ts

feat: When asset is deleted or uploaded - refresh asset resource (#5568)

2026-01-16 21:05:16 +01:00

shim.test.ts

refactor: use content model to detect rich text (#5109)

2025-04-10 14:16:34 +07:00

shim.ts

feat: show when asset is used (#5365)

2025-08-09 15:14:22 +02:00

store-utils.test.ts

refactor: migrate builder tests to vitest (#4415)

2024-11-13 14:39:17 +04:00

store-utils.ts

refactor: support nanostores as sync objects (#4454)

2024-11-21 18:17:28 +07:00

string-utils.ts

feat: Keep original case of custom attributes (#3777)

2024-07-23 19:46:59 +02:00

style-object-model.test.tsx

feat: Pseudo elements (#5572)

2026-01-19 17:28:47 +01:00

style-object-model.ts

feat: Pseudo elements (#5572)

2026-01-19 17:28:47 +01:00

style-source-utils.test.tsx

feat: New token conflict resolution logic (#5524)

2025-12-18 17:31:31 +01:00

style-source-utils.ts

feat: New token conflict resolution logic (#5524)

2025-12-18 17:31:31 +01:00

sync-client.test.ts

refactor: add server as storage to sync engine (#4475)

2024-12-03 21:43:39 +07:00

sync-client.ts

fix: catch iframe errors (#5279)

2025-06-14 18:53:36 +03:00

system.test.ts

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

system.ts

feat: Project settings dialog accessible from dashboard (#5514)

2025-12-15 17:23:16 +01:00

token-conflict-dialog.tsx

feat: Pseudo elements (#5572)

2026-01-19 17:28:47 +01:00

tree-utils.test.ts

refactor: use content model to detect rich text (#5109)

2025-04-10 14:16:34 +07:00

tree-utils.ts

feat: wrap text with span element when droppping instances into it (#5237)

2025-05-28 12:11:10 +03:00

use-set-features.ts

feat: Enable features via url (#2459)

2023-10-12 19:35:18 +02:00

visually-hidden.ts

Attempt to hover/select without element (#2014)

2023-08-04 13:34:14 +03:00

webstudio-data-migrator.test.ts

feat: add global system variable in builder (#4896)

2025-02-23 01:46:21 +07:00

webstudio-data-migrator.ts

refactor: migrate border and outline to hyphenated properties (#4960)

2025-03-07 17:16:16 +07:00