Skip to content

Commit 4dfb89b

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ji/slots-for-arrays
Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>
2 parents cbeb009 + e8cd130 commit 4dfb89b

63 files changed

Lines changed: 6679 additions & 182 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/web.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
cache-dependency-path: vortex-web/package-lock.json
5959
- run: npm ci
6060
- run: npm run wasm
61+
- run: npm run format:check
6162
- run: npm run lint
6263
- run: npm run typecheck
6364
- run: npm run build-storybook

Cargo.lock

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

vortex-web/.prettierrc.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "all",
4+
"bracketSpacing": true,
5+
"printWidth": 100,
6+
"tabWidth": 2
7+
}

vortex-web/.storybook/main.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44
import type { StorybookConfig } from '@storybook/react-vite';
55

66
const config: StorybookConfig = {
7-
"stories": [
8-
"../src/**/*.mdx",
9-
"../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"
10-
],
11-
"addons": [
12-
"@storybook/addon-docs",
13-
],
14-
"framework": "@storybook/react-vite"
7+
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
8+
addons: ['@storybook/addon-docs'],
9+
framework: '@storybook/react-vite',
1510
};
16-
export default config;
11+
export default config;

vortex-web/.storybook/preview.ts

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,43 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4-
import type { Preview } from '@storybook/react-vite'
5-
import '../src/index.css'
4+
import type { Preview } from '@storybook/react-vite';
5+
import '../src/index.css';
66

77
const preview: Preview = {
8+
globalTypes: {
9+
theme: {
10+
description: 'Color theme',
11+
toolbar: {
12+
title: 'Theme',
13+
icon: 'paintbrush',
14+
items: [
15+
{ value: 'light', title: 'Light', icon: 'sun' },
16+
{ value: 'dark', title: 'Dark', icon: 'moon' },
17+
],
18+
dynamicTitle: true,
19+
},
20+
},
21+
},
22+
initialGlobals: {
23+
theme: 'light',
24+
},
25+
decorators: [
26+
(Story, context) => {
27+
const theme = context.globals.theme || 'light';
28+
document.documentElement.classList.toggle('dark', theme === 'dark');
29+
document.documentElement.classList.toggle('light', theme === 'light');
30+
return Story();
31+
},
32+
],
833
parameters: {
934
controls: {
1035
matchers: {
11-
color: /(background|color)$/i,
12-
date: /Date$/i,
36+
color: /(background|color)$/i,
37+
date: /Date$/i,
1338
},
1439
},
1540
},
1641
};
1742

18-
export default preview;
43+
export default preview;

vortex-web/crate/Cargo.toml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,27 @@ publish = false
1111
crate-type = ["cdylib", "rlib"]
1212

1313
[dependencies]
14+
arrow-array = { workspace = true }
15+
arrow-ipc = { workspace = true }
16+
arrow-schema = { workspace = true }
17+
serde = { workspace = true, features = ["derive"] }
18+
serde_json = { workspace = true }
1419
vortex = { path = "../../vortex", default-features = false, features = [
1520
"files",
1621
] }
1722

1823
[target.'cfg(target_arch = "wasm32")'.dependencies]
24+
futures = { workspace = true }
1925
wasm-bindgen = "0.2.104"
2026
wasm-bindgen-futures = { workspace = true }
2127
console_error_panic_hook = "0.1.7"
2228
js-sys = "0.3.81"
23-
web-sys = { version = "0.3.81", features = ["console", "File", "FileReader"] }
29+
web-sys = { version = "0.3.81", features = [
30+
"Blob",
31+
"console",
32+
"File",
33+
"FileReader",
34+
] }
2435

2536
[lints]
2637
workspace = true

0 commit comments

Comments
 (0)