@pierre/diffs 1.3.0-beta.1 → 1.3.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pierre/diffs",
-  "version": "1.3.0-beta.1",
+  "version": "1.3.0-beta.3",
   "license": "apache-2.0",
   "files": [
     "dist",
@@ -62,37 +62,38 @@
     "tag": "beta"
   },
   "scripts": {
+    "assert:bun-version": "bun ../../scripts/assert-bun-version.ts",
     "build": "tsdown --clean",
     "dev": "echo 'Watching for changes…' && tsdown --watch --log-level error",
     "benchmark:parse-merge-conflict": "bun run ./scripts/benchmarkParseMergeConflictDiffFromFile.ts",
     "test": "bun test",
     "tsc": "tsgo --noEmit --pretty",
-    "prepublishOnly": "bun run build"
+    "prepublishOnly": "bun run assert:bun-version && bun run build"
   },
   "dependencies": {
-    "@pierre/theme": "catalog:",
+    "@pierre/theme": "1.0.3",
     "@shikijs/transformers": "^3.0.0",
-    "diff": "catalog:",
-    "hast-util-to-html": "catalog:",
-    "lru_map": "catalog:",
+    "diff": "8.0.3",
+    "hast-util-to-html": "9.0.5",
+    "lru_map": "0.4.1",
     "shiki": "^3.0.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/core": "catalog:",
-    "@types/hast": "catalog:",
-    "@types/jsdom": "catalog:",
-    "@types/react": "catalog:",
-    "@types/react-dom": "catalog:",
-    "autoprefixer": "catalog:",
-    "jsdom": "catalog:",
-    "lightningcss": "catalog:",
-    "postcss": "catalog:",
-    "postcss-calc": "catalog:",
-    "postcss-nesting": "catalog:",
-    "react": "catalog:",
-    "react-dom": "catalog:",
-    "tsdown": "catalog:",
-    "typescript": "catalog:"
+    "@arethetypeswrong/core": "0.18.2",
+    "@types/hast": "3.0.4",
+    "@types/jsdom": "28.0.1",
+    "@types/react": "19.2.7",
+    "@types/react-dom": "19.2.3",
+    "autoprefixer": "10.4.22",
+    "jsdom": "26.1.0",
+    "lightningcss": "1.32.0",
+    "postcss": "8.5.6",
+    "postcss-calc": "10.1.1",
+    "postcss-nesting": "14.0.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "tsdown": "0.15.11",
+    "typescript": "5.9.2"
   },
   "peerDependencies": {
     "react": "^18.3.1 || ^19.0.0",

package/dist/editor/css.d.ts

@@ -1,6 +0,0 @@
-//#region src/editor/css.d.ts
-declare const editorCSS: string;
-declare const editorGlobalCSS = "\n  [data-annotation-slot] {\n    user-select: none;\n    -webkit-user-select: none;\n  }\n";
-//#endregion
-export { editorCSS, editorGlobalCSS };
-//# sourceMappingURL=css.d.ts.map

package/dist/editor/css.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"css.d.ts","names":["editorCSS","editorGlobalCSS"],"sources":["../../src/editor/css.d.ts"],"sourcesContent":["export declare const editorCSS: string;\nexport declare const editorGlobalCSS = \"\\n  [data-annotation-slot] {\\n    user-select: none;\\n    -webkit-user-select: none;\\n  }\\n\";\n//# sourceMappingURL=css.d.ts.map"],"mappings":";cAAqBA;AAAAA,cACAC,eAAAA,GADiB,6FAAA"}

package/dist/editor/css.js

@@ -1,218 +0,0 @@
-//#region src/editor/css.ts
-const editorCSS = `
-  ::selection {
-    background-color: transparent;
-  }
-  @keyframes blinking {
-    0% { opacity: 1; }
-    50% { opacity: 0; }
-    100% { opacity: 1; }
-  }
-  :host, /* for jump anchor */
-  [data-code], /* for editor overlay */
-  [data-content] /* for wrap line */
-  {
-    position: relative;
-  }
-  [data-content] {
-    background-color: transparent;
-    caret-color: var(--diffs-bg-caret);
-    outline: none;
-  }
-  @media (min-width: 480px) {
-    [data-content] {
-      caret-color: transparent;
-    }
-    [data-quick-edit] {
-      caret-color: currentColor;
-    }
-  }
-  [data-line] {
-    cursor: text;
-  }
-  [data-line]:not([data-selected-line]),
-  [data-line]:not([data-selected-line]) span {
-    background-color: transparent;
-  }
-  [data-line]:is([data-selected-line]),
-  [data-line]:is([data-selected-line]) span,
-  [data-line-annotation]:is([data-selected-line]) {
-    background-color: var(--diffs-editor-line-highlight-bg);
-  }
-  [data-column-number] {
-    color: var(--diffs-editor-line-number-fg);
-  }
-  [data-column-number]:is([data-selected-line]),
-  [data-gutter-buffer]:is([data-selected-line]) {
-    background-color: var(--diffs-editor-line-number-active-bg);
-    color: var(--diffs-editor-line-number-active-fg);
-  }
-  [data-column-number]:is([data-active]) {
-    color: var(--diffs-editor-line-number-active-fg);
-  }
-  [data-line]:is([data-line-type='change-deletion']) {
-    background-color: var(--diffs-line-bg);
-    -webkit-user-select: none;
-    user-select: none;
-  }
-  [data-caret], [data-selection-range] {
-    position: absolute;
-    top: 0;
-    left: 0;
-    line-height: var(--diffs-line-height);
-    pointer-events: none;
-  }
-  [data-caret] {
-    width: 2px;
-    height: 1lh;
-    background-color: var(--diffs-bg-caret);
-    animation: blinking 1.2s infinite;
-    animation-delay: 0.8s;
-    visibility: hidden;
-  }
-  [data-selection-range] {
-    height: 1lh;
-    z-index: -10;
-    background-color: var(--diffs-editor-selection-bg);
-  }
-  [data-editor-overlay] {
-    display: contents;
-  }
-  @media (min-width: 480px) {
-    [data-content]:focus ~ [data-editor-overlay] [data-caret] {
-      visibility: visible;
-    }
-  }
-
-  [data-quick-edit-icon] {
-    position: absolute;
-    top: 0;
-    left: calc(-1lh + 2px);
-    z-index: 10;
-    width: 1lh;
-    height: 1lh;
-    border-radius: 4px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: color-mix(in lab, var(--diffs-fg) 40%, var(--diffs-bg));
-    transition: background-color 0.1s ease-in-out, color 0.1s ease-in-out;
-    cursor: pointer;
-    visibility: hidden;
-  }
-  [data-quick-edit-icon][data-visible='true'] {
-    visibility: visible;
-  }
-  [data-quick-edit-icon]:hover {
-    background-color: color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));
-    color: var(--diffs-fg);
-  }
-  [data-quick-edit] {
-    padding-inline-end: 1ch;
-  }
-
-  [data-search-panel] {
-    position: sticky;
-    top: 8px;
-    left: 0;
-    z-index: 100;
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    margin-inline: 1ch;
-    margin-bottom: 4px;
-    background-color: color-mix(in lab, color-mix(in lab, var(--diffs-fg) 4%, var(--diffs-bg)), transparent 40%);
-    border: 1px solid color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));
-    padding: 6px;
-    border-radius: 6px;
-    box-shadow: 0 0 12px 0 color-mix(in lab, var(--diffs-fg) 16% var(--diffs-bg));
-    backdrop-filter: blur(8px);
-  }
-  [data-search-panel-row] {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
-    gap: 2px;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 14px;
-  }
-  [data-search-panel-row] input {
-    font-size: 14px;
-    line-height: 24px;
-    max-width: 50%;
-    padding-inline: 4px;
-    border: none;
-    outline: none;
-    background-color: transparent;
-    color: var(--diffs-fg);
-    field-sizing: content;
-  }
-  [data-search-panel-row] input::selection {
-    background-color: color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));
-  }
-  [data-search-panel-row] [data-matches] {
-    font-size: 12px;
-    font-weight: 500;
-    line-height: 20px;
-    padding-inline-start: 4px;
-    padding-inline-end: 8px;
-    color: color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg));
-  }
-  [data-search-panel-row] [data-matches][data-no-matches] {
-    color: color-mix(in lab, var(--diffs-deletion-base) 90%, var(--diffs-bg));
-  }
-  [data-search-panel-row] [data-icon] {
-    width: 24px;
-    height: 24px;
-    display: flex;
-    color: color-mix(in lab, var(--diffs-fg) 40%, var(--diffs-bg));
-    align-items: center;
-    justify-content: center;
-    border-radius: 4px;
-    cursor: pointer;
-    transition: background-color 0.1s ease-in-out, color 0.1s ease-in-out;
-  }
-  [data-search-panel-row] [data-icon][data-disabled='true'] {
-    visibility: hidden;
-  }
-  [data-search-panel-row] [data-icon]:not([data-icon='search']):hover {
-    background-color: color-mix(in lab, var(--diffs-fg) 6%, var(--diffs-bg));
-    color: var(--diffs-fg);
-  }
-  [data-search-panel-row] [data-settings] {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 8px;
-    height: 100%;
-    padding: 0 8px;
-  }
-  [data-search-panel-row] [data-checkbox] {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 4px;
-    font-size: 12px;
-    color: color-mix(in lab, var(--diffs-fg) 60%, var(--diffs-bg));
-  }
-  [data-search-panel-row] [data-checkbox] input {
-    margin: 0;
-  }
-  [data-search-panel-row] [data-checkbox]:hover,
-  [data-search-panel-row] [data-checkbox]:has(input:checked) {
-    color: var(--diffs-fg);
-  }
-  [data-search-panel-row] [data-spacer] {
-    flex: 1;
-  }
-`;
-const editorGlobalCSS = `
-  [data-annotation-slot] {
-    user-select: none;
-    -webkit-user-select: none;
-  }
-`;
-
-//#endregion
-export { editorCSS, editorGlobalCSS };
-//# sourceMappingURL=css.js.map

package/dist/editor/css.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"css.js","names":["editorCSS: string"],"sources":["../../src/editor/css.ts"],"sourcesContent":["const DEBUG_SELECTION = false;\n\nexport const editorCSS: string = /* CSS */ `\n  ::selection {\n    background-color: ${DEBUG_SELECTION ? 'rgba(255, 0, 0, 0.1)' : 'transparent'};\n  }\n  @keyframes blinking {\n    0% { opacity: 1; }\n    50% { opacity: 0; }\n    100% { opacity: 1; }\n  }\n  :host, /* for jump anchor */\n  [data-code], /* for editor overlay */\n  [data-content] /* for wrap line */\n  {\n    position: relative;\n  }\n  [data-content] {\n    background-color: transparent;\n    caret-color: var(--diffs-bg-caret);\n    outline: none;\n  }\n  @media (min-width: 480px) {\n    [data-content] {\n      caret-color: ${DEBUG_SELECTION ? 'red' : 'transparent'};\n    }\n    [data-quick-edit] {\n      caret-color: currentColor;\n    }\n  }\n  [data-line] {\n    cursor: text;\n  }\n  [data-line]:not([data-selected-line]),\n  [data-line]:not([data-selected-line]) span {\n    background-color: transparent;\n  }\n  [data-line]:is([data-selected-line]),\n  [data-line]:is([data-selected-line]) span,\n  [data-line-annotation]:is([data-selected-line]) {\n    background-color: var(--diffs-editor-line-highlight-bg);\n  }\n  [data-column-number] {\n    color: var(--diffs-editor-line-number-fg);\n  }\n  [data-column-number]:is([data-selected-line]),\n  [data-gutter-buffer]:is([data-selected-line]) {\n    background-color: var(--diffs-editor-line-number-active-bg);\n    color: var(--diffs-editor-line-number-active-fg);\n  }\n  [data-column-number]:is([data-active]) {\n    color: var(--diffs-editor-line-number-active-fg);\n  }\n  [data-line]:is([data-line-type='change-deletion']) {\n    background-color: var(--diffs-line-bg);\n    -webkit-user-select: none;\n    user-select: none;\n  }\n  [data-caret], [data-selection-range] {\n    position: absolute;\n    top: 0;\n    left: 0;\n    line-height: var(--diffs-line-height);\n    pointer-events: none;\n  }\n  [data-caret] {\n    width: 2px;\n    height: 1lh;\n    background-color: ${DEBUG_SELECTION ? 'transparent' : 'var(--diffs-bg-caret)'};\n    animation: blinking 1.2s infinite;\n    animation-delay: 0.8s;\n    visibility: hidden;\n  }\n  [data-selection-range] {\n    height: 1lh;\n    z-index: -10;\n    background-color: var(--diffs-editor-selection-bg);\n  }\n  [data-editor-overlay] {\n    display: contents;\n  }\n  @media (min-width: 480px) {\n    [data-content]:focus ~ [data-editor-overlay] [data-caret] {\n      visibility: visible;\n    }\n  }\n\n  [data-quick-edit-icon] {\n    position: absolute;\n    top: 0;\n    left: calc(-1lh + 2px);\n    z-index: 10;\n    width: 1lh;\n    height: 1lh;\n    border-radius: 4px;\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    color: color-mix(in lab, var(--diffs-fg) 40%, var(--diffs-bg));\n    transition: background-color 0.1s ease-in-out, color 0.1s ease-in-out;\n    cursor: pointer;\n    visibility: hidden;\n  }\n  [data-quick-edit-icon][data-visible='true'] {\n    visibility: visible;\n  }\n  [data-quick-edit-icon]:hover {\n    background-color: color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));\n    color: var(--diffs-fg);\n  }\n  [data-quick-edit] {\n    padding-inline-end: 1ch;\n  }\n\n  [data-search-panel] {\n    position: sticky;\n    top: 8px;\n    left: 0;\n    z-index: 100;\n    display: flex;\n    flex-direction: column;\n    gap: 4px;\n    margin-inline: 1ch;\n    margin-bottom: 4px;\n    background-color: color-mix(in lab, color-mix(in lab, var(--diffs-fg) 4%, var(--diffs-bg)), transparent 40%);\n    border: 1px solid color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));\n    padding: 6px;\n    border-radius: 6px;\n    box-shadow: 0 0 12px 0 color-mix(in lab, var(--diffs-fg) 16% var(--diffs-bg));\n    backdrop-filter: blur(8px);\n  }\n  [data-search-panel-row] {\n    display: flex;\n    align-items: center;\n    justify-content: flex-start;\n    gap: 2px;\n    font-family: Arial, Helvetica, sans-serif;\n    font-size: 14px;\n  }\n  [data-search-panel-row] input {\n    font-size: 14px;\n    line-height: 24px;\n    max-width: 50%;\n    padding-inline: 4px;\n    border: none;\n    outline: none;\n    background-color: transparent;\n    color: var(--diffs-fg);\n    field-sizing: content;\n  }\n  [data-search-panel-row] input::selection {\n    background-color: color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));\n  }\n  [data-search-panel-row] [data-matches] {\n    font-size: 12px;\n    font-weight: 500;\n    line-height: 20px;\n    padding-inline-start: 4px;\n    padding-inline-end: 8px;\n    color: color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg));\n  }\n  [data-search-panel-row] [data-matches][data-no-matches] {\n    color: color-mix(in lab, var(--diffs-deletion-base) 90%, var(--diffs-bg));\n  }\n  [data-search-panel-row] [data-icon] {\n    width: 24px;\n    height: 24px;\n    display: flex;\n    color: color-mix(in lab, var(--diffs-fg) 40%, var(--diffs-bg));\n    align-items: center;\n    justify-content: center;\n    border-radius: 4px;\n    cursor: pointer;\n    transition: background-color 0.1s ease-in-out, color 0.1s ease-in-out;\n  }\n  [data-search-panel-row] [data-icon][data-disabled='true'] {\n    visibility: hidden;\n  }\n  [data-search-panel-row] [data-icon]:not([data-icon='search']):hover {\n    background-color: color-mix(in lab, var(--diffs-fg) 6%, var(--diffs-bg));\n    color: var(--diffs-fg);\n  }\n  [data-search-panel-row] [data-settings] {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    gap: 8px;\n    height: 100%;\n    padding: 0 8px;\n  }\n  [data-search-panel-row] [data-checkbox] {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    gap: 4px;\n    font-size: 12px;\n    color: color-mix(in lab, var(--diffs-fg) 60%, var(--diffs-bg));\n  }\n  [data-search-panel-row] [data-checkbox] input {\n    margin: 0;\n  }\n  [data-search-panel-row] [data-checkbox]:hover,\n  [data-search-panel-row] [data-checkbox]:has(input:checked) {\n    color: var(--diffs-fg);\n  }\n  [data-search-panel-row] [data-spacer] {\n    flex: 1;\n  }\n`;\n\n// Safari doesn't support `::selection` for slot elements in ShadowDOM,\n// Add a global style to disable selection for slot elements\nexport const editorGlobalCSS = /* CSS */ `\n  [data-annotation-slot] {\n    user-select: none;\n    -webkit-user-select: none;\n  }\n`;\n"],"mappings":";AAEA,MAAaA,YAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkN3C,MAAa,kBAA4B"}