Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10,666 changes: 6,445 additions & 4,221 deletions package-lock.json

Large diffs are not rendered by default.

80 changes: 74 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,76 @@
},
"overrides": {
"nx": {
"@parcel/watcher": "2.4.1"
}
"@parcel/watcher": "2.4.1",
"brace-expansion": "^5.0.5",
"follow-redirects": "^1.16.0",
"yaml": "^2.8.3"
},
"@jest/environment-jsdom-abstract": {
"jsdom": "$jsdom"
},
"rehype-mathjax": {
"jsdom": "^26.1.0"
},
"jsdom": "^26.1.0",
"uuid": "^14.0.0",
"@react-spectrum/accordion": "3.0.9",
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a lot of react-spectrum overrides. What are they for, and when can we delete them?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea now that they're locked into the package-lock.json, don't think I need to keep the explicit overrides in here... removing.

"@react-spectrum/actionbar": "3.6.10",
"@react-spectrum/actiongroup": "3.11.0",
"@react-spectrum/avatar": "3.0.24",
"@react-spectrum/badge": "3.1.26",
"@react-spectrum/breadcrumbs": "3.9.20",
"@react-spectrum/button": "3.17.0",
"@react-spectrum/buttongroup": "3.6.24",
"@react-spectrum/calendar": "3.7.4",
"@react-spectrum/checkbox": "3.10.0",
"@react-spectrum/color": "3.1.0",
"@react-spectrum/combobox": "3.16.0",
"@react-spectrum/contextualhelp": "3.6.24",
"@react-spectrum/datepicker": "3.14.4",
"@react-spectrum/dialog": "3.9.0",
"@react-spectrum/divider": "3.5.25",
"@react-spectrum/dnd": "3.5.8",
"@react-spectrum/dropzone": "3.0.14",
"@react-spectrum/filetrigger": "3.0.14",
"@react-spectrum/form": "3.7.17",
"@react-spectrum/icon": "3.8.7",
"@react-spectrum/illustratedmessage": "3.5.12",
"@react-spectrum/image": "3.6.0",
"@react-spectrum/inlinealert": "3.2.18",
"@react-spectrum/label": "3.16.17",
"@react-spectrum/labeledvalue": "3.2.5",
"@react-spectrum/layout": "3.6.17",
"@react-spectrum/link": "3.6.20",
"@react-spectrum/list": "3.10.4",
"@react-spectrum/listbox": "3.15.4",
"@react-spectrum/menu": "3.22.4",
"@react-spectrum/meter": "3.5.12",
"@react-spectrum/numberfield": "3.10.0",
"@react-spectrum/overlays": "5.8.0",
"@react-spectrum/picker": "3.16.0",
"@react-spectrum/progress": "3.7.18",
"@react-spectrum/provider": "3.10.8",
"@react-spectrum/radio": "3.7.19",
"@react-spectrum/searchfield": "3.8.19",
"@react-spectrum/slider": "3.8.0",
"@react-spectrum/statuslight": "3.5.24",
"@react-spectrum/switch": "3.6.4",
"@react-spectrum/table": "3.17.4",
"@react-spectrum/tabs": "3.8.23",
"@react-spectrum/tag": "3.3.3",
"@react-spectrum/text": "3.5.18",
"@react-spectrum/textfield": "3.14.0",
"@react-spectrum/theme-dark": "3.5.20",
"@react-spectrum/theme-default": "3.5.20",
"@react-spectrum/theme-light": "3.4.20",
"@react-spectrum/toast": "3.1.0",
"@react-spectrum/tooltip": "3.7.8",
"@react-spectrum/utils": "3.12.7",
"@react-spectrum/view": "3.6.21",
"@react-spectrum/well": "3.4.25",
"@spectrum-icons/ui": "3.6.18",
"@spectrum-icons/workflow": "4.2.23"
},
"scripts": {
"clean:build": "rimraf packages/*/dist packages/*/build",
Expand Down Expand Up @@ -113,25 +181,25 @@
"jasmine": "4.0.2",
"jest": "^29.3.1",
"jest-canvas-mock": "^2.4.0",
"jest-environment-jsdom": "^29.3.1",
"jest-environment-jsdom": "^30.0.0",
"jest-runner-eslint": "^1.1.0",
"jest-runner-stylelint": "^2.3.7",
"jest-watch-select-projects": "^2.0.0",
"jest-watch-typeahead": "^2.2.1",
"lerna": "^9.0.1",
"nanoid": "^5.0.7",
"nanoid": "^5.1.9",
"npm-run-all": "^4.1.5",
"prettier": "3.0.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^7.2.7",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"sass": "1.49.9",
"sass": "^1.70.0",
"source-map-explorer": "^2.5.2",
"stylelint": "^14.5.1",
"typescript": "~5.6.2",
"vite": "^5.4.2"
"vite": "^7.0.0"
},
"prettier": "@deephaven/prettier-config",
"stylelint": {
Expand Down
6 changes: 3 additions & 3 deletions packages/code-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
"memoize-one": "^5.1.1",
"memoizee": "^0.4.15",
"monaco-editor": "^0.43.0",
"nanoid": "^5.0.7",
"pouchdb-browser": "^7.2.2",
"pouchdb-find": "^7.2.2",
"nanoid": "^5.1.9",
"pouchdb-browser": "^9.0.0",
"pouchdb-find": "^9.0.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^7.2.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"lodash.debounce": "^4.0.8",
"lodash.flatten": "^4.4.0",
"memoizee": "^0.4.15",
"nanoid": "^5.0.7",
"nanoid": "^5.1.9",
"popper.js": "^1.16.1",
"react-reverse-portal": "^2.3.0",
"react-transition-group": "^4.4.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/TimeInput.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -534,12 +534,12 @@ it('ignores value prop changes matching displayed value', async () => {
initialSelectionEnd: 8,
});

expect(textbox.value).toEqual('00:00:0');
expect(textbox.value).toEqual('00:00');
expect(onChange).toBeCalledWith(0);

// Ignore prop update matching internal state
rerender(<TimeInput value={0} onChange={onChange} />);
expect(textbox.value).toEqual('00:00:0');
expect(textbox.value).toEqual('00:00');
expect(onChange).toBeCalledTimes(1);

// Update internal value
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/spectrum/Heading.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ describe('Heading', () => {
);
const HeadingElement = getByTestId('Heading');
expect(HeadingElement).toBeInTheDocument();
expect(HeadingElement).toHaveStyle(`color: ${color}`);
expect(HeadingElement).toHaveStyle(`color: rgb(255, 0, 0)`);
});
});
2 changes: 1 addition & 1 deletion packages/components/src/spectrum/TabPanels.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ describe('TabPanels', () => {
);

expect(screen.getByLabelText('panels')).toHaveStyle(
'background-color: red'
'background-color: rgb(255, 0, 0)'
);
});

Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/spectrum/Text.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ describe('Text', () => {
);
const TextElement = getByTestId('Text');
expect(TextElement).toBeInTheDocument();
expect(TextElement).toHaveStyle(`color: ${color}`);
expect(TextElement).toHaveStyle(`color: rgb(255, 0, 0)`);
});
});
2 changes: 1 addition & 1 deletion packages/components/src/spectrum/View.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ describe('View', () => {
);
const viewElement = getByTestId('view');
expect(viewElement).toBeInTheDocument();
expect(viewElement).toHaveStyle(`background-color: ${backgroundColor}`);
expect(viewElement).toHaveStyle(`background-color: rgb(255, 0, 0)`);
});
});
34 changes: 28 additions & 6 deletions packages/components/src/theme/ThemeUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,13 @@ describe('isExternalThemeEnabled', () => {
])(
'should return true if external theme is enabled: %s',
(themeKey, expected) => {
window.location.search =
themeKey == null ? '' : `${THEME_KEY_OVERRIDE_QUERY_PARAM}=${themeKey}`;
window.history.pushState(
{},
'',
themeKey == null
? '/'
: `/?${THEME_KEY_OVERRIDE_QUERY_PARAM}=${themeKey}`
);
expect(isExternalThemeEnabled()).toBe(expected);
}
);
Expand All @@ -183,8 +188,13 @@ describe('isPreloadTransparentTheme: %s', () => {
['false', false],
[null, false],
])('should', (value, expected) => {
window.location.search =
value == null ? '' : `${PRELOAD_TRANSPARENT_THEME_QUERY_PARAM}=${value}`;
window.history.pushState(
{},
'',
value == null
? '/'
: `/?${PRELOAD_TRANSPARENT_THEME_QUERY_PARAM}=${value}`
);
expect(isPreloadTransparentTheme()).toBe(expected);
});
});
Expand Down Expand Up @@ -438,7 +448,13 @@ describe('getDefaultSelectedThemeKey', () => {
'should coalesce overide key -> preload key -> default key: %s, %s, %s',
(overrideKey, preloadKey, expected) => {
if (overrideKey != null) {
window.location.search = `?${THEME_KEY_OVERRIDE_QUERY_PARAM}=${overrideKey}`;
window.history.pushState(
{},
'',
`/?${THEME_KEY_OVERRIDE_QUERY_PARAM}=${overrideKey}`
);
} else {
window.history.pushState({}, '', '/');
}

localStorage.setItem(
Expand Down Expand Up @@ -691,7 +707,13 @@ describe('preloadTheme', () => {
}

if (preloadTransparent) {
window.location.search = `${PRELOAD_TRANSPARENT_THEME_QUERY_PARAM}=true`;
window.history.pushState(
{},
'',
`/?${PRELOAD_TRANSPARENT_THEME_QUERY_PARAM}=true`
);
} else {
window.history.pushState({}, '', '/');
}

preloadTheme();
Expand Down
2 changes: 1 addition & 1 deletion packages/console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"memoize-one": "^5.1.1",
"memoizee": "^0.4.15",
"monaco-editor": "^0.43.0",
"nanoid": "^5.0.7",
"nanoid": "^5.1.9",
"papaparse": "5.3.2",
"popper.js": "^1.16.1",
"shell-quote": "^1.7.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard-core-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"lodash.throttle": "^4.1.1",
"memoize-one": "^5.1.1",
"memoizee": "^0.4.15",
"nanoid": "^5.0.7",
"nanoid": "^5.1.9",
"prop-types": "^15.7.2",
"react-markdown": "^8.0.7",
"redux": "^4.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"lodash.ismatch": "^4.1.1",
"lodash.throttle": "^4.1.1",
"memoize-one": "^5.1.1",
"nanoid": "^5.0.7",
"nanoid": "^5.1.9",
"prop-types": "^15.7.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/embed-widget/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@deephaven/utils": "file:../utils",
"@fontsource/fira-mono": "5.0.13",
"@fontsource/fira-sans": "5.0.20",
"nanoid": "5.0.7",
"nanoid": "5.1.9",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-redux": "^7.2.7"
Expand Down
14 changes: 2 additions & 12 deletions packages/embed-widget/src/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,7 @@ describe('App', () => {
document.title = 'Deephaven Embedded Widget';

// Mock window.location.search
Object.defineProperty(window, 'location', {
value: {
search: '?name=testWidget',
},
writable: true,
});
window.history.pushState({}, '', '/?name=testWidget');
});

it('should update document title with widget name from URL parameter', async () => {
Expand All @@ -83,12 +78,7 @@ describe('App', () => {
});

it('should not update document title when name parameter is missing', async () => {
Object.defineProperty(window, 'location', {
value: {
search: '',
},
writable: true,
});
window.history.pushState({}, '', '/');

render(
<Provider store={store}>
Expand Down
2 changes: 1 addition & 1 deletion packages/golden-layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@deephaven/components": "file:../components",
"jquery": "^3.6.0",
"nanoid": "^5.0.7"
"nanoid": "^5.1.9"
},
"peerDependencies": {
"react": ">=16.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/iris-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"memoize-one": "^5.1.1",
"memoizee": "^0.4.15",
"monaco-editor": "^0.43.0",
"nanoid": "^5.0.7",
"nanoid": "^5.1.9",
"react-transition-group": "^4.4.2"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/jsapi-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@deephaven/log": "file:../log",
"@deephaven/utils": "file:../utils",
"lodash.clamp": "^4.0.3",
"nanoid": "^5.0.7"
"nanoid": "^5.1.9"
},
"devDependencies": {
"@deephaven/jsapi-shim": "file:../jsapi-shim",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@deephaven/react-hooks": "file:../react-hooks",
"@fortawesome/fontawesome-common-types": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"nanoid": "^5.0.7"
"nanoid": "^5.1.9"
},
"peerDependencies": {
"react": ">=16.8.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/pouch-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@deephaven/storage": "file:../storage",
"@deephaven/utils": "file:../utils",
"lodash.throttle": "^4.1.1",
"pouchdb-browser": "^7.3.0",
"pouchdb-find": "^7.3.0"
"pouchdb-browser": "^9.0.0",
"pouchdb-find": "^9.0.0"
},
"peerDependencies": {
"react": ">=16.8.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@deephaven/utils": "file:../utils",
"lodash.debounce": "^4.0.8",
"lodash.throttle": "^4.1.1",
"nanoid": "^5.0.7"
"nanoid": "^5.1.9"
},
"devDependencies": {
"@deephaven/test-utils": "file:../test-utils"
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"dependencies": {
"@deephaven/log": "file:../log",
"nanoid": "^5.0.7"
"nanoid": "^5.1.9"
},
"devDependencies": {
"@deephaven/test-utils": "file:../test-utils"
Expand Down
4 changes: 0 additions & 4 deletions packages/utils/src/ColorUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,6 @@ describe('isDark', () => {
expect(ColorUtils.isDark('rgba(255,255,255,1)')).toBe(false);
expect(ColorUtils.isDark('hsl(0,100%,100%)')).toBe(false);
});

it('throws an error if the color is not a valid value', () => {
expect(() => ColorUtils.isDark('')).toThrowError(/Invalid color received/);
});
});

describe('normalizeCssColor', () => {
Expand Down
Loading