@canonical/react-ds-app-launchpad 0.9.0-experimental.20 → 0.9.0-experimental.21

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.
Files changed (24) hide show
  1. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.js +23 -22
  2. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.js.map +1 -1
  3. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.js +1 -1
  4. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.js.map +1 -1
  5. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/styles.css +8 -12
  6. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/icons.js +3 -0
  7. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/common/icons.js.map +1 -0
  8. package/dist/esm/ui/GitDiffViewer/common/CodeDiffViewer/styles.css +4 -3
  9. package/dist/esm/ui/GitDiffViewer/styles.css +1 -1
  10. package/dist/esm/ui/GitDiffViewer/utils/highlightDiffHunkLines.js +18 -4
  11. package/dist/esm/ui/GitDiffViewer/utils/highlightDiffHunkLines.js.map +1 -1
  12. package/dist/esm/ui/RelativeTime/utils/formatHumanTime.js +1 -1
  13. package/dist/esm/ui/RelativeTime/utils/formatHumanTime.js.map +1 -1
  14. package/dist/esm/ui/RelativeTime/utils/getOptimalUpdateInterval.js +1 -1
  15. package/dist/esm/ui/RelativeTime/utils/getOptimalUpdateInterval.js.map +1 -1
  16. package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.d.ts.map +1 -1
  17. package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.d.ts.map +1 -1
  18. package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/icons.d.ts +2 -0
  19. package/dist/types/ui/GitDiffViewer/common/CodeDiffViewer/common/icons.d.ts.map +1 -0
  20. package/dist/types/ui/GitDiffViewer/utils/highlightDiffHunkLines.d.ts +1 -1
  21. package/dist/types/ui/GitDiffViewer/utils/highlightDiffHunkLines.d.ts.map +1 -1
  22. package/dist/types/ui/RelativeTime/utils/formatHumanTime.d.ts.map +1 -1
  23. package/dist/types/ui/RelativeTime/utils/getOptimalUpdateInterval.d.ts.map +1 -1
  24. package/package.json +21 -24
@@ -5,6 +5,7 @@ import { highlightDiffHunkLines } from "../../utils/index.js";
5
5
  import { DiffLine } from "./common/index.js";
6
6
  import "./HighlighTheme.css";
7
7
  import "./styles.css";
8
+ import * as icons from "./common/icons.js";
8
9
  import { AnnotatedDiffLine } from "./common/AnnotatedDiffLine/index.js";
9
10
  import { tableWidthCSSVar } from "./constants.js";
10
11
  const componentCssClassName = "ds code-diff-viewer";
@@ -20,7 +21,7 @@ const CodeDiffViewer = ({ id, AddComment, onLineClick, className, style, disable
20
21
  const highlightedLines = useMemo(() => {
21
22
  if (!diff)
22
23
  return [];
23
- return diff.hunks.map((hunk) => highlightDiffHunkLines(hunk.lines));
24
+ return diff.hunks.map((hunk) => highlightDiffHunkLines(diff.newPath, hunk.lines));
24
25
  }, [diff]);
25
26
  useImperativeHandle(ref, () => tableRef.current);
26
27
  /**
@@ -46,27 +47,27 @@ const CodeDiffViewer = ({ id, AddComment, onLineClick, className, style, disable
46
47
  }, [disableWidthCalculation, isCollapsed]);
47
48
  if (isCollapsed)
48
49
  return null;
49
- return (_jsx("div", { id: id, style: style, className: [componentCssClassName, className].filter(Boolean).join(" "), children: _jsx("div", { className: "diff-hunk", children: _jsx("table", { className: "diff-table", ref: tableRef, tabIndex: -1, children: _jsx("tbody", { children: diff.hunks.map((hunk, hunkIndex) => {
50
- // We'll track the counters for old and new lines
51
- // as we iterate through each hunk.
52
- let oldLineCounter = hunk.positions.old.start;
53
- let newLineCounter = hunk.positions.new.start;
54
- return (_jsxs(Fragment, { children: [_jsx(DiffLine, { type: "hunk", hunkHeader: hunk.header, hunkIndex: hunkIndex }), hunk.lines.map((line, lineIndex) => {
55
- const newLineNumber = newLineCounter;
56
- const oldLineNumber = oldLineCounter;
57
- if (line.type === "remove") {
58
- oldLineCounter++;
59
- }
60
- else if (line.type === "add") {
61
- newLineCounter++;
62
- }
63
- else {
64
- oldLineCounter++;
65
- newLineCounter++;
66
- }
67
- return (_jsx(AnnotatedDiffLine, { newLineNumber: newLineNumber, oldLineNumber: oldLineNumber, diffLineNumber: hunk.positions.diff.start + lineIndex, content: highlightedLines[hunkIndex][lineIndex], type: line.type, onLineClick: onLineClick, AddComment: AddComment }, `${diff.oldPath}-${hunkIndex}-${lineIndex}`));
68
- })] }, `${diff.oldPath}-${hunkIndex}`));
69
- }) }) }) }) }));
50
+ return (_jsxs("div", { id: id, style: style, className: [componentCssClassName, className].filter(Boolean).join(" "), children: [_jsx("div", { className: "diff-hunk", children: _jsx("table", { className: "diff-table", ref: tableRef, tabIndex: -1, children: _jsx("tbody", { children: diff.hunks.map((hunk, hunkIndex) => {
51
+ // We'll track the counters for old and new lines
52
+ // as we iterate through each hunk.
53
+ let oldLineCounter = hunk.positions.old.start;
54
+ let newLineCounter = hunk.positions.new.start;
55
+ return (_jsxs(Fragment, { children: [_jsx(DiffLine, { type: "hunk", hunkHeader: hunk.header, hunkIndex: hunkIndex }), hunk.lines.map((line, lineIndex) => {
56
+ const newLineNumber = newLineCounter;
57
+ const oldLineNumber = oldLineCounter;
58
+ if (line.type === "remove") {
59
+ oldLineCounter++;
60
+ }
61
+ else if (line.type === "add") {
62
+ newLineCounter++;
63
+ }
64
+ else {
65
+ oldLineCounter++;
66
+ newLineCounter++;
67
+ }
68
+ return (_jsx(AnnotatedDiffLine, { newLineNumber: newLineNumber, oldLineNumber: oldLineNumber, diffLineNumber: hunk.positions.diff.start + lineIndex, content: highlightedLines[hunkIndex][lineIndex], type: line.type, onLineClick: onLineClick, AddComment: AddComment }, `${diff.oldPath}-${hunkIndex}-${lineIndex}`));
69
+ })] }, `${diff.oldPath}-${hunkIndex}`));
70
+ }) }) }) }), _jsx("div", { className: "svg-refs", children: icons.CommentIcon })] }));
70
71
  };
71
72
  CodeDiffViewer.displayName = "GitDiffViewer.CodeDiff";
72
73
  export default forwardRef(CodeDiffViewer);
@@ -1 +1 @@
1
- {"version":3,"file":"CodeDiffViewer.js","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CodeDiffViewer.js","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":"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"}
@@ -26,7 +26,7 @@ const DiffLine = ({ id, className, style, onLineClick, ...props }) => {
26
26
  if (e.key === "Enter") {
27
27
  onLineClick?.();
28
28
  }
29
- }, onKeyDown: undefined, children: props.type === "hunk" ? ("\u00A0") : (_jsxs("div", { className: "diff-line-numbers", children: [_jsx("span", { className: "line-num", children: props.type === "add" ? "+" : props.removeLineNumber }), _jsx("span", { className: "line-num", children: props.type === "remove" ? "-" : props.addLineNumber })] })) }), _jsx("td", { className: `diff-content ${wrapLines ? "wrap" : ""}`, children: props.type === "hunk" ? (_jsx("pre", { children: props.hunkHeader })) : (_jsx("pre", {
29
+ }, onKeyDown: undefined, children: props.type === "hunk" ? ("\u00A0") : (_jsxs("div", { className: "diff-line-numbers", children: [isInteractive && (_jsx("span", { className: "comment-icon", children: _jsxs("svg", { width: 16, height: 16, viewBox: "0 0 16 16", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: [_jsx("use", { href: "#comment-icon" }), _jsx("title", { children: "Comment" })] }) })), _jsx("span", { className: "line-num", children: props.type === "add" ? "+" : props.removeLineNumber }), _jsx("span", { className: "line-num", children: props.type === "remove" ? "-" : props.addLineNumber })] })) }), _jsx("td", { className: `diff-content ${wrapLines ? "wrap" : ""}`, children: props.type === "hunk" ? (_jsx("pre", { children: props.hunkHeader })) : (_jsx("pre", {
30
30
  // biome-ignore lint/security/noDangerouslySetInnerHtml: syntax highlighting requires adding generated HTML
31
31
  dangerouslySetInnerHTML: {
32
32
  __html: props.content ? props.content : "\u00A0",
@@ -1 +1 @@
1
- {"version":3,"file":"DiffLine.js","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,cAAc,CAAC;AAGtB,MAAM,qBAAqB,GAAG,cAAc,CAAC;AAC7C,MAAM,yBAAyB,GAAG,eAAe,CAAC;AAElD;;;;GAIG;AACH,MAAM,QAAQ,GAAG,CAAC,EAChB,EAAE,EACF,SAAS,EACT,KAAK,EACL,WAAW,EACX,GAAG,KAAK,EACM,EAAsB,EAAE;IACtC,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,aAAa,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,CACL,cACE,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE;YACT,qBAAqB;YACrB,SAAS;YACT,aAAa,IAAI,aAAa;YAC9B,SAAS;YACT,KAAK,CAAC,IAAI,KAAK,MAAM;gBACnB,KAAK,CAAC,SAAS,KAAK,CAAC;gBACrB,yBAAyB;SAC5B;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,GAAG,CAAC,aAEZ,aACE,SAAS,EAAE,eAAe,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,EAAE,EACjE,QAAQ,EAAE,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAChE,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,IAAI,CAAC,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;wBACtB,WAAW,EAAE,EAAE,CAAC;oBAClB,CAAC;gBACH,CAAC,EACD,SAAS,EAAE,SAAS,YAEnB,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CACvB,QAAQ,CACT,CAAC,CAAC,CAAC,CACF,eAAK,SAAS,EAAC,mBAAmB,aAChC,eAAM,SAAS,EAAC,UAAU,YACvB,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,GAC/C,EACP,eAAM,SAAS,EAAC,UAAU,YACvB,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,GAC/C,IACH,CACP,GACE,EACL,aAAI,SAAS,EAAE,gBAAgB,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,YACrD,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CACvB,wBAAM,KAAK,CAAC,UAAU,GAAO,CAC9B,CAAC,CAAC,CAAC,CACF;oBACE,2GAA2G;oBAC3G,uBAAuB,EAAE;wBACvB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;qBACjD,GACD,CACH,GACE,IACF,CACN,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"DiffLine.js","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,cAAc,CAAC;AAGtB,MAAM,qBAAqB,GAAG,cAAc,CAAC;AAC7C,MAAM,yBAAyB,GAAG,eAAe,CAAC;AAElD;;;;GAIG;AACH,MAAM,QAAQ,GAAG,CAAC,EAChB,EAAE,EACF,SAAS,EACT,KAAK,EACL,WAAW,EACX,GAAG,KAAK,EACM,EAAsB,EAAE;IACtC,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,aAAa,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3C,OAAO,CACL,cACE,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE;YACT,qBAAqB;YACrB,SAAS;YACT,aAAa,IAAI,aAAa;YAC9B,SAAS;YACT,KAAK,CAAC,IAAI,KAAK,MAAM;gBACnB,KAAK,CAAC,SAAS,KAAK,CAAC;gBACrB,yBAAyB;SAC5B;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,GAAG,CAAC,aAEZ,aACE,SAAS,EAAE,eAAe,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,IAAI,EAAE,EACjE,QAAQ,EAAE,aAAa,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAChE,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,IAAI,CAAC,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;wBACtB,WAAW,EAAE,EAAE,CAAC;oBAClB,CAAC;gBACH,CAAC,EACD,SAAS,EAAE,SAAS,YAEnB,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CACvB,QAAQ,CACT,CAAC,CAAC,CAAC,CACF,eAAK,SAAS,EAAC,mBAAmB,aAC/B,aAAa,IAAI,CAChB,eAAM,SAAS,EAAC,cAAc,YAC5B,eACE,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,EACV,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,4BAA4B,aAElC,cAAK,IAAI,EAAC,eAAe,GAAG,EAC5B,sCAAsB,IAClB,GACD,CACR,EACD,eAAM,SAAS,EAAC,UAAU,YACvB,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,GAC/C,EACP,eAAM,SAAS,EAAC,UAAU,YACvB,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,GAC/C,IACH,CACP,GACE,EACL,aAAI,SAAS,EAAE,gBAAgB,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,YACrD,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CACvB,wBAAM,KAAK,CAAC,UAAU,GAAO,CAC9B,CAAC,CAAC,CAAC,CACF;oBACE,2GAA2G;oBAC3G,uBAAuB,EAAE;wBACvB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ;qBACjD,GACD,CACH,GACE,IACF,CACN,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -6,10 +6,6 @@
6
6
  min-width: var(--table-width);
7
7
  color: var(--git-diff-viewer-code-default-color);
8
8
 
9
- pre {
10
- color: var(--git-diff-viewer-code-default-color);
11
- }
12
-
13
9
  &.diff-line-add {
14
10
  background-color: var(--git-diff-viewer-code-insertion-background);
15
11
 
@@ -96,25 +92,25 @@
96
92
  font-family: var(--font-family-mono);
97
93
  }
98
94
  }
95
+
99
96
  &.interactive {
100
97
  --icon-opacity: 0;
98
+
101
99
  &:not(.diff-line-hunk) {
102
100
  .diff-gutter {
103
101
  cursor: pointer;
104
- .diff-line-numbers::before {
105
- content: var(--comment-icon);
106
- display: inline-block;
107
- width: var(--comment-icon-width);
102
+ .comment-icon {
108
103
  opacity: var(--icon-opacity);
109
104
  padding: 0 4px;
105
+ display: flex;
106
+ align-items: center;
107
+ justify-content: center;
110
108
  }
111
109
  }
112
110
 
113
- &:has(.diff-gutter:hover),
114
- &:has(.diff-gutter:focus) {
111
+ &:hover,
112
+ &:focus-within {
115
113
  filter: brightness(0.9);
116
- }
117
- &:has(.diff-gutter:hover) {
118
114
  --icon-opacity: 1;
119
115
  }
120
116
  }
@@ -0,0 +1,3 @@
1
+ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
+ export const CommentIcon = (_jsxs("svg", { xmlns: "http://www.w3.org/2000/svg", width: 16, height: 16, fill: "none", id: "comment-icon", children: [_jsx("path", { fill: "currentColor", d: "M12 2a3 3 0 0 1 3 3v5a3.002 3.002 0 0 1-2 2.829V16l-4.5-3H4a3 3 0 0 1-3-3V5a3 3 0 0 1 3-3h8Zm0 1.5H4a1.5 1.5 0 0 0-1.493 1.356L2.5 5v5a1.5 1.5 0 0 0 1.356 1.493L4 11.5h4.954l2.546 1.696.001-1.428 1-.353c.548-.194.935-.69.992-1.269L13.5 10V5a1.5 1.5 0 0 0-1.356-1.493L12 3.5ZM7.976 8.25v1.5H4.994v-1.5h2.982Zm3.005-3v1.5H4.994v-1.5h5.987Z" }), _jsx("title", { children: "Comment" })] }));
3
+ //# sourceMappingURL=icons.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"icons.js","sourceRoot":"","sources":["../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/icons.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,eACE,KAAK,EAAC,4BAA4B,EAClC,KAAK,EAAE,EAAE,EACT,MAAM,EAAE,EAAE,EACV,IAAI,EAAC,MAAM,EACX,EAAE,EAAC,cAAc,aAEjB,eACE,IAAI,EAAC,cAAc,EACnB,CAAC,EAAC,mVAAmV,GACrV,EACF,sCAAsB,IAClB,CACP,CAAC"}
@@ -4,9 +4,6 @@
4
4
  font-size: 13px;
5
5
 
6
6
  .diff-table {
7
- --comment-icon: url('data:image/svg+xml,<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12 2C12.7956 2 13.5587 2.31607 14.1213 2.87868C14.6839 3.44129 15 4.20435 15 5V10C15 10.6204 14.8076 11.2256 14.4495 11.7323C14.0913 12.2389 13.5849 12.622 13 12.829V16L8.5 13H4C3.20435 13 2.44129 12.6839 1.87868 12.1213C1.31607 11.5587 1 10.7956 1 10V5C1 4.20435 1.31607 3.44129 1.87868 2.87868C2.44129 2.31607 3.20435 2 4 2H12ZM12 3.5H4C3.62712 3.50002 3.26761 3.63892 2.99158 3.88962C2.71555 4.14032 2.5428 4.48484 2.507 4.856L2.5 5V10C2.50002 10.3729 2.63892 10.7324 2.88962 11.0084C3.14032 11.2844 3.48484 11.4572 3.856 11.493L4 11.5H8.954L11.5 13.196L11.501 11.768L12.501 11.415C13.049 11.221 13.436 10.725 13.493 10.146L13.5 10V5C13.5 4.62712 13.3611 4.26761 13.1104 3.99158C12.8597 3.71555 12.5152 3.5428 12.144 3.507L12 3.5ZM7.976 8.25V9.75H4.994V8.25H7.976ZM10.981 5.25V6.75H4.994V5.25H10.981Z" fill="currentColor"/></svg>');
8
- --comment-icon-width: 16px;
9
-
10
7
  /* updated dynamically on window resize */
11
8
  --table-width: 300px;
12
9
 
@@ -23,4 +20,8 @@
23
20
  margin-right: -1px;
24
21
  }
25
22
  }
23
+
24
+ > .svg-refs {
25
+ display: none;
26
+ }
26
27
  }
@@ -11,7 +11,7 @@
11
11
 
12
12
  --git-diff-viewer-gutter-width: 7.5em;
13
13
  --git-diff-viewer-hunk-header-background: #ffffff;
14
- --git-diff-viewer-hunk-header-color: rgba(0, 0, 0, 0.6);
14
+ --git-diff-viewer-hunk-header-color: #707070;
15
15
 
16
16
  --git-diff-file-header-horizontal-padding: 1em;
17
17
  --git-diff-file-header-vertical-padding: 0.4em;
@@ -1,8 +1,22 @@
1
1
  import hljs from "highlight.js";
2
- function highlight(code) {
2
+ function highlight(code, fileExtension) {
3
+ const formattedFileExtension = fileExtension?.toLowerCase();
4
+ if (!formattedFileExtension) {
5
+ return hljs.highlightAuto(code).value;
6
+ }
7
+ const languages = hljs.listLanguages();
8
+ for (const language of languages) {
9
+ const languageDefinition = hljs.getLanguage(language);
10
+ if (language.toLowerCase() === formattedFileExtension ||
11
+ languageDefinition?.aliases?.some((alias) => alias.toLowerCase() === formattedFileExtension)) {
12
+ return hljs.highlight(code, { language }).value;
13
+ }
14
+ }
15
+ // Fall back to auto-detection if no match found
3
16
  return hljs.highlightAuto(code).value;
4
17
  }
5
- function highlightDiffHunkLines(hunkLines) {
18
+ function highlightDiffHunkLines(filePath, hunkLines) {
19
+ const fileExtension = filePath.split(".").pop();
6
20
  const hunkContentAddedVersion = hunkLines
7
21
  .filter((line) => line.type === "add" || line.type === "context")
8
22
  .map((line) => line.content)
@@ -11,8 +25,8 @@ function highlightDiffHunkLines(hunkLines) {
11
25
  .filter((line) => line.type === "remove" || line.type === "context")
12
26
  .map((line) => line.content)
13
27
  .join("\n");
14
- const highlightedHunkAddedVersion = highlight(hunkContentAddedVersion).split("\n");
15
- const highlightedHunkDeletedVersion = highlight(hunkContentDeletedVersion).split("\n");
28
+ const highlightedHunkAddedVersion = highlight(hunkContentAddedVersion, fileExtension).split("\n");
29
+ const highlightedHunkDeletedVersion = highlight(hunkContentDeletedVersion, fileExtension).split("\n");
16
30
  const highlightedLines = [];
17
31
  let addedOffset = 0;
18
32
  let removedOffset = 0;
@@ -1 +1 @@
1
- {"version":3,"file":"highlightDiffHunkLines.js","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/highlightDiffHunkLines.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,cAAc,CAAC;AAGhC,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC;AACxC,CAAC;AAED,SAAS,sBAAsB,CAAC,SAAwB;IACtD,MAAM,uBAAuB,GAAG,SAAS;SACtC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;SAChE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;SAC3B,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,yBAAyB,GAAG,SAAS;SACxC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;SACnE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;SAC3B,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,2BAA2B,GAAG,SAAS,CAAC,uBAAuB,CAAC,CAAC,KAAK,CAC1E,IAAI,CACL,CAAC;IACF,MAAM,6BAA6B,GAAG,SAAS,CAC7C,yBAAyB,CAC1B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,gBAAgB,GAAa,EAAE,CAAC;IACtC,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,SAAS;gBACZ,gBAAgB,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;gBACtE,MAAM;YACR,KAAK,QAAQ;gBACX,gBAAgB,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;gBACtE,aAAa,EAAE,CAAC;gBAChB,MAAM;YACR,KAAK,KAAK;gBACR,gBAAgB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;gBACtE,WAAW,EAAE,CAAC;gBACd,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,eAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"highlightDiffHunkLines.js","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/highlightDiffHunkLines.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ import { Temporal } from "@js-temporal/polyfill";
7
7
  */
8
8
  function formatHumanTime(instant, options) {
9
9
  const now = Temporal.Now.instant();
10
- const deltaSeconds = instant.epochSeconds - now.epochSeconds;
10
+ const deltaSeconds = (instant.epochMilliseconds - now.epochMilliseconds) / 1000;
11
11
  const absDeltaSeconds = Math.abs(deltaSeconds);
12
12
  if (absDeltaSeconds < options.nowThreshold) {
13
13
  return options.nowKeyword;
@@ -1 +1 @@
1
- {"version":3,"file":"formatHumanTime.js","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/formatHumanTime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAgBjD;;;;;GAKG;AACH,SAAS,eAAe,CACtB,OAAyB,EACzB,OAAyB;IAEzB,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;IAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE/C,IAAI,eAAe,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;QAC3C,OAAO,OAAO,CAAC,UAAU,CAAC;IAC5B,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,KAAK,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;IAEhE,MAAM,KAAK,GAAG;QACZ,OAAO;QACP,QAAQ;QACR,MAAM;QACN,OAAO;QACP,SAAS;QACT,SAAS;KAC8B,CAAC;IAE1C,IAAI,OAAO,GAAgC,SAAS,CAAC;IACrD,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,GAAG,IAAI,CAAC;YACf,QAAQ,GAAG,KAAK,CAAC;YACjB,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,OAAO,CAAC,UAAU,CAAC;IAC5B,CAAC;IAED,OAAO,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AAED,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"formatHumanTime.js","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/formatHumanTime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAgBjD;;;;;GAKG;AACH,SAAS,eAAe,CACtB,OAAyB,EACzB,OAAyB;IAEzB,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,YAAY,GAChB,CAAC,OAAO,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;IAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE/C,IAAI,eAAe,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;QAC3C,OAAO,OAAO,CAAC,UAAU,CAAC;IAC5B,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,KAAK,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;IAEhE,MAAM,KAAK,GAAG;QACZ,OAAO;QACP,QAAQ;QACR,MAAM;QACN,OAAO;QACP,SAAS;QACT,SAAS;KAC8B,CAAC;IAE1C,IAAI,OAAO,GAAgC,SAAS,CAAC;IACrD,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,GAAG,IAAI,CAAC;YACf,QAAQ,GAAG,KAAK,CAAC;YACjB,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,OAAO,CAAC,UAAU,CAAC;IAC5B,CAAC;IAED,OAAO,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AAED,eAAe,eAAe,CAAC"}
@@ -6,7 +6,7 @@ import * as constants from "./constants.js";
6
6
  */
7
7
  function getOptimalUpdateInterval(instant) {
8
8
  const now = Temporal.Now.instant();
9
- const deltaSeconds = instant.epochSeconds - now.epochSeconds;
9
+ const deltaSeconds = (instant.epochMilliseconds - now.epochMilliseconds) / 1000;
10
10
  const absDeltaSeconds = Math.abs(deltaSeconds);
11
11
  if (absDeltaSeconds < constants.MINUTE_IN_SECONDS) {
12
12
  return 1000;
@@ -1 +1 @@
1
- {"version":3,"file":"getOptimalUpdateInterval.js","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/getOptimalUpdateInterval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAE5C;;;GAGG;AACH,SAAS,wBAAwB,CAAC,OAAyB;IACzD,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,GAAG,CAAC,YAAY,CAAC;IAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE/C,IAAI,eAAe,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,eAAe,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAC5C,CAAC;IAED,IAAI,eAAe,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;QAC/C,OAAO,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC;IAC1C,CAAC;IACD,iDAAiD;IACjD,OAAO,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC;AACzC,CAAC;AAED,eAAe,wBAAwB,CAAC"}
1
+ {"version":3,"file":"getOptimalUpdateInterval.js","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/getOptimalUpdateInterval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAE5C;;;GAGG;AACH,SAAS,wBAAwB,CAAC,OAAyB;IACzD,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnC,MAAM,YAAY,GAChB,CAAC,OAAO,CAAC,iBAAiB,GAAG,GAAG,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC;IAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE/C,IAAI,eAAe,GAAG,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,eAAe,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC;QAChD,OAAO,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAC5C,CAAC;IAED,IAAI,eAAe,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;QAC/C,OAAO,SAAS,CAAC,eAAe,GAAG,IAAI,CAAC;IAC1C,CAAC;IACD,iDAAiD;IACjD,OAAO,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC;AACzC,CAAC;AAED,eAAe,wBAAwB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"CodeDiffViewer.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;;AA0HtD,wBAA0C"}
1
+ {"version":3,"file":"CodeDiffViewer.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/CodeDiffViewer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAY/B,OAAO,qBAAqB,CAAC;AAC7B,OAAO,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;;AA6HtD,wBAA0C"}
@@ -1 +1 @@
1
- {"version":3,"file":"DiffLine.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAKhD;;;;GAIG;AACH,QAAA,MAAM,QAAQ,GAAI,iDAMf,aAAa,KAAG,KAAK,CAAC,YA2DxB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"DiffLine.d.ts","sourceRoot":"","sources":["../../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/DiffLine/DiffLine.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAKhD;;;;GAIG;AACH,QAAA,MAAM,QAAQ,GAAI,iDAMf,aAAa,KAAG,KAAK,CAAC,YAyExB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
@@ -0,0 +1,2 @@
1
+ export declare const CommentIcon: import("react/jsx-runtime").JSX.Element;
2
+ //# sourceMappingURL=icons.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/GitDiffViewer/common/CodeDiffViewer/common/icons.tsx"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,yCAcvB,CAAC"}
@@ -1,4 +1,4 @@
1
1
  import type { Hunk } from "../types.js";
2
- declare function highlightDiffHunkLines(hunkLines: Hunk["lines"]): string[];
2
+ declare function highlightDiffHunkLines(filePath: string, hunkLines: Hunk["lines"]): string[];
3
3
  export default highlightDiffHunkLines;
4
4
  //# sourceMappingURL=highlightDiffHunkLines.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"highlightDiffHunkLines.d.ts","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/highlightDiffHunkLines.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAMxC,iBAAS,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE,CAsClE;AAED,eAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"highlightDiffHunkLines.d.ts","sourceRoot":"","sources":["../../../../../src/ui/GitDiffViewer/utils/highlightDiffHunkLines.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AA0BxC,iBAAS,sBAAsB,CAC7B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,GACvB,MAAM,EAAE,CA0CV;AAED,eAAe,sBAAsB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"formatHumanTime.d.ts","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/formatHumanTime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,KAAK,gBAAgB,GAAG;IACtB,kEAAkE;IAClE,YAAY,EAAE,MAAM,CAAC;IAErB,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC;CAC7C,CAAC;AAEF;;;;;GAKG;AACH,iBAAS,eAAe,CACtB,OAAO,EAAE,QAAQ,CAAC,OAAO,EACzB,OAAO,EAAE,gBAAgB,GACxB,MAAM,CAwCR;AAED,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"formatHumanTime.d.ts","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/formatHumanTime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,KAAK,gBAAgB,GAAG;IACtB,kEAAkE;IAClE,YAAY,EAAE,MAAM,CAAC;IAErB,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC;CAC7C,CAAC;AAEF;;;;;GAKG;AACH,iBAAS,eAAe,CACtB,OAAO,EAAE,QAAQ,CAAC,OAAO,EACzB,OAAO,EAAE,gBAAgB,GACxB,MAAM,CAyCR;AAED,eAAe,eAAe,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"getOptimalUpdateInterval.d.ts","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/getOptimalUpdateInterval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD;;;GAGG;AACH,iBAAS,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,GAAG,MAAM,CAkBnE;AAED,eAAe,wBAAwB,CAAC"}
1
+ {"version":3,"file":"getOptimalUpdateInterval.d.ts","sourceRoot":"","sources":["../../../../../src/ui/RelativeTime/utils/getOptimalUpdateInterval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGjD;;;GAGG;AACH,iBAAS,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,GAAG,MAAM,CAmBnE;AAED,eAAe,wBAAwB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@canonical/react-ds-app-launchpad",
3
- "version": "0.9.0-experimental.20",
3
+ "version": "0.9.0-experimental.21",
4
4
  "type": "module",
5
5
  "module": "dist/esm/index.js",
6
6
  "types": "dist/types/index.d.ts",
@@ -38,40 +38,37 @@
38
38
  "test:vitest:watch": "vitest"
39
39
  },
40
40
  "dependencies": {
41
- "@canonical/storybook-config": "^0.9.0-experimental.19",
42
- "@canonical/styles": "^0.9.0-experimental.20",
43
- "@canonical/utils": "^0.9.0-experimental.12",
44
- "@js-temporal/polyfill": "^0.4.4",
41
+ "@canonical/storybook-config": "^0.9.0-experimental.21",
42
+ "@canonical/styles": "^0.9.0-experimental.21",
43
+ "@canonical/utils": "^0.9.0-experimental.21",
44
+ "@js-temporal/polyfill": "^0.5.1",
45
45
  "highlight.js": "^11.11.1",
46
46
  "react": ">=18.0.0 <20.0.0",
47
47
  "react-dom": ">=18.0.0 <20.0.0",
48
- "react-markdown": "^10.0.0",
49
- "react-tooltip": "^5.28.0",
48
+ "react-markdown": "^10.1.0",
49
+ "react-tooltip": "^5.29.0",
50
50
  "rehype-sanitize": "^6.0.0",
51
51
  "remark-gfm": "^4.0.1"
52
52
  },
53
53
  "devDependencies": {
54
54
  "@biomejs/biome": "^1.9.4",
55
55
  "@canonical/biome-config": "^0.9.0-experimental.12",
56
- "@canonical/typescript-config-react": "^0.9.0-experimental.12",
57
- "@chromatic-com/storybook": "^3.2.2",
58
- "@storybook/blocks": "^8.4.7",
59
- "@storybook/react": "^8.4.7",
60
- "@storybook/test": "^8.4.7",
56
+ "@canonical/typescript-config-react": "^0.9.0-experimental.21",
57
+ "@chromatic-com/storybook": "^4.0.0",
61
58
  "@testing-library/jest-dom": "^6.6.3",
62
- "@testing-library/react": "^16.1.0",
63
- "@types/node": "^22.10.1",
64
- "@types/react": "^19.0.1",
65
- "@types/react-dom": "^19.0.2",
66
- "@vitejs/plugin-react": "^4.3.4",
59
+ "@testing-library/react": "^16.3.0",
60
+ "@types/node": "^24.0.0",
61
+ "@types/react": "^19.1.8",
62
+ "@types/react-dom": "^19.1.6",
63
+ "@vitejs/plugin-react": "^4.5.2",
67
64
  "copyfiles": "^2.4.1",
68
- "globals": "^16.0.0",
69
- "jsdom": "^26.0.0",
70
- "storybook": "^8.4.7",
71
- "typescript": "^5.8.2",
72
- "vite": "^6.0.3",
65
+ "globals": "^16.2.0",
66
+ "jsdom": "^26.1.0",
67
+ "storybook": "^9.0.8",
68
+ "typescript": "^5.8.3",
69
+ "vite": "^6.3.5",
73
70
  "vite-tsconfig-paths": "^5.1.4",
74
- "vitest": "^3.0.9"
71
+ "vitest": "^3.2.3"
75
72
  },
76
- "gitHead": "5719cfd92b252c0007f5a64fc54bd8bbb825c8a3"
73
+ "gitHead": "f83d38235c8d92c3dc8abf5e0e37fb659658788b"
77
74
  }