Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2194687
feat: upgrade antd v5→v6, react 17→18+
jared-dickman Dec 18, 2025
daff517
chore(release): 1.62.0-antd-v6-react-v19.1 [skip ci]
mparticle-automation Dec 18, 2025
310e9e8
feat: update peer deps for react 19
jared-dickman Dec 19, 2025
f114fad
chore(release): 1.62.0-aquarium-2-blurple.1 [skip ci]
mparticle-automation Dec 19, 2025
14f5bb4
fix: externalize react-dom and dayjs in vite build config
jared-dickman Dec 19, 2025
f49cb18
ci: update github actions to latest versions
jared-dickman Dec 19, 2025
8ccdcc1
ci: add github-actions to dependabot config
jared-dickman Dec 19, 2025
7eebd84
chore: require node >=24 in engines
jared-dickman Dec 19, 2025
296c3b1
feat: upgrade to storybook 10, eslint 9 flat config, node 24
jared-dickman Dec 19, 2025
7a7bccd
fix: remove mdx patterns from storybook config
jared-dickman Dec 19, 2025
0ffab67
feat: add addon-docs for mdx support
jared-dickman Dec 19, 2025
9c69a86
chore: merge main, fix eslint 9 compatibility
jared-dickman Dec 19, 2025
60b2c48
fix: use destructured variant in Button component
jared-dickman Dec 19, 2025
fb803e7
chore(release): 1.62.0-aquarium-2-upgrade.1 [skip ci]
mparticle-automation Dec 19, 2025
4f536ac
chore: remove engines, add .npmrc for dev node version
jared-dickman Dec 19, 2025
b0ffb78
fix: resolve typescript-eslint peer dep and TS5.9 type errors
jared-dickman Dec 19, 2025
f8aa277
chore: add tsc validation to pre-commit hook
jared-dickman Dec 19, 2025
d138ad3
chore: use incremental tsc for faster pre-commit
jared-dickman Dec 19, 2025
2a54fe5
chore(release): 1.62.0-aquarium-2-upgrade.2 [skip ci]
mparticle-automation Dec 19, 2025
645543f
feat: add play tests for Select, Drawer, Popconfirm, Tabs, AutoComplete
jared-dickman Dec 19, 2025
0c6e776
chore: resolve merge conflicts
nastyastavitskaya Jan 21, 2026
c80a1c3
chore: fix docs
nastyastavitskaya Jan 21, 2026
75fd668
chore: some fixes from another branch
nastyastavitskaya Jan 21, 2026
996c9f2
chore(release): 1.63.0-aquarium-2-upgrade.1 [skip ci]
mparticle-automation Jan 21, 2026
945781c
chore: fix styles and component lint errors
jared-dickman Jan 22, 2026
9ad3ed8
chore(release): 1.63.0-aquarium-2-upgrade.2 [skip ci]
mparticle-automation Jan 22, 2026
564273a
chore: clean up
nastyastavitskaya Jan 27, 2026
f2ca72a
chore(release): 1.63.0-aquarium-2-upgrade.3 [skip ci]
mparticle-automation Jan 27, 2026
6c4d7c0
chore: attempt to fix few components in cdp platform
nastyastavitskaya Jan 27, 2026
bb14f82
chore: revert unnecessary forwardRef changes
nastyastavitskaya Jan 27, 2026
d62a5ab
chore: more components fixes
nastyastavitskaya Jan 27, 2026
1dc2056
Merge branch 'feat/aquarium-2-upgrade' of github-aquarium:mParticle/a…
nastyastavitskaya Jan 27, 2026
ed3f445
chore(release): 1.63.0-aquarium-2-upgrade.4 [skip ci]
mparticle-automation Jan 27, 2026
2ebc3bf
chore: actual fix, as always founded by me not silly cursor
nastyastavitskaya Jan 27, 2026
1637a9b
Merge branch 'feat/aquarium-2-upgrade' of github-aquarium:mParticle/a…
nastyastavitskaya Jan 27, 2026
6ae0ad6
chore(release): 1.63.0-aquarium-2-upgrade.5 [skip ci]
mparticle-automation Jan 27, 2026
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
133 changes: 0 additions & 133 deletions .eslintrc.cjs

This file was deleted.

12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,15 @@ updates:
day: 'monday'
time: '15:00'
target-branch: 'chore/dependabot'

- commit-message:
prefix: 'ci'
directory: '/'
labels: ['dependabot', 'github-actions']
open-pull-requests-limit: 3
package-ecosystem: 'github-actions'
schedule:
interval: 'weekly'
day: 'monday'
time: '15:00'
target-branch: 'chore/dependabot'
4 changes: 2 additions & 2 deletions .github/workflows/publish-storybook-pr-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
GIT_COMMITTER_EMAIL: developers@mparticle.com
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v6.0.1

- name: Setup Node.js
uses: actions/setup-node@v6
uses: actions/setup-node@v6.1.0
with:
node-version: '24.12.0'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v6
uses: actions/checkout@v6.0.1

- name: Setup Node.js
uses: actions/setup-node@v6
uses: actions/setup-node@v6.1.0
with:
node-version: '24.12.0'
cache: 'npm'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ jobs:

steps:
- name: Checkout public main branch
uses: actions/checkout@v6
uses: actions/checkout@v6.0.1
with:
token: ${{ secrets.MP_SEMANTIC_RELEASE_BOT }}
fetch-depth: 0

- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v6
uses: crazy-max/ghaction-import-gpg@v6.3.0
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
git_user_signingkey: true
git_commit_gpgsign: true

- name: Setup Node.js
uses: actions/setup-node@v6
uses: actions/setup-node@v6.1.0
with:
node-version: '24.12.0'

Expand All @@ -62,7 +62,7 @@ jobs:
npx semantic-release

- name: Archive npm failure logs
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6.0.0
if: failure()
with:
name: npm-logs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/storybook-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v6.0.1
with:
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@v6
uses: actions/setup-node@v6.1.0
with:
node-version: '24.12.0'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
name: typescript
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v6.0.1
with:
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@v6
uses: actions/setup-node@v6.1.0
with:
node-version: '24.12.0'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v6.0.1
with:
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@v6
uses: actions/setup-node@v6.1.0
with:
node-version: '24.12.0'

Expand Down
3 changes: 2 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
npx lint-staged
npx lint-staged
npx tsc --noEmit --incremental --tsBuildInfoFile .tsbuildinfo
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use-node-version=24.12.0
20 changes: 2 additions & 18 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import type { StorybookConfig } from '@storybook/react-vite'
import react from '@vitejs/plugin-react'
import type { PluginOption, Plugin } from 'vite'
import { withoutVitePlugins } from '@storybook/builder-vite'
import remarkGfm from 'remark-gfm'

type StorybookVitePlugins = { plugins: (PluginOption[] | Plugin)[] }

Expand All @@ -15,22 +14,7 @@ const config: StorybookConfig & StorybookVitePlugins = {

stories: ['../src/**/*.mdx', '../src/**/*.stories.@(ts|tsx)', '../docs/**/*.stories.@(ts|tsx)', '../docs/**/*.mdx'],

addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
{
name: '@storybook/addon-docs',
options: {
mdxPluginOptions: {
mdxCompileOptions: {
// needed for rendering markdown tables in .mdx
remarkPlugins: [remarkGfm],
},
},
},
},
],
addons: ['@storybook/addon-docs'],

docs: {
defaultName: 'Documentation',
Expand All @@ -46,7 +30,7 @@ const config: StorybookConfig & StorybookVitePlugins = {
},

core: {
disableTelemetry: true, // requested by security
disableTelemetry: true,
},

typescript: {
Expand Down
2 changes: 1 addition & 1 deletion .storybook/manager.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { addons } from '@storybook/manager-api'
import { addons } from 'storybook/manager-api'
import customTheme from './theme'
import { Badge } from 'antd'

Expand Down
12 changes: 12 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
import type { Preview } from '@storybook/react'
import React from 'react'
import { ConfigProvider } from '../src/components'
import { FontFamily } from '../src/styles/style'

const preview: Preview = {
decorators: [
Story => (
<ConfigProvider>
<div style={{ fontFamily: FontFamily }}>
<Story />
</div>
</ConfigProvider>
),
],
parameters: {
layout: 'centered',
options: {
Expand Down
2 changes: 1 addition & 1 deletion .storybook/theme.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { create } from '@storybook/theming'
import { create } from 'storybook/theming'
import { LightTheme } from '../design/LightTheme'

export default create({
Expand Down
3 changes: 1 addition & 2 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": ["stylelint-config-standard"],
"plugins": ["stylelint-no-indistinguishable-colors"],
"rules": {
"rules": {
"selector-class-pattern": null,
"block-no-empty": true,
"comment-no-empty": true,
Expand Down
1 change: 0 additions & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
- start all new branches with either fix/ feat/ chore/
- Always read CONTRIBUTING.md before executing any git action
13 changes: 4 additions & 9 deletions LLM_SETUP_PROMPT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,14 @@

**Required Dependencies:**

```bash
yarn add @mparticle/aquarium antd@5 dayjs@1
```

**Dependency Matrix:**
| Package | Required | Purpose |
|---------|----------|---------|
| `@mparticle/aquarium` | ✅ Yes | Main Aquarium component library |
| `antd` | ✅ Yes | Peer dependency - Ant Design UI framework |
| `dayjs` | ✅ Yes | Peer dependency - Date handling for DatePicker, Calendar, etc. |
| `react` | ✅ Yes | Peer dependency (>=17.0.2) |
| `react-dom` | ✅ Yes | Peer dependency (>=17.0.2) |

| `antd` | ✅ Yes | Peer dependency (6.1.x) - Ant Design UI framework |
| `dayjs` | ✅ Yes | Peer dependency (1.11.x) - Date handling for DatePicker, Calendar, etc. |
| `react` | ✅ Yes | Peer dependency (>=19.0.2) |
| `react-dom` | ✅ Yes | Peer dependency (>=19.0.0) |
**Post-Installation:**

1. Add aquarium CSS to app styles entry point (ex `main.scss`, `style.less`, or global entry):
Expand Down
2 changes: 1 addition & 1 deletion docs/About/Changelog.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Markdown } from "@storybook/blocks"
import { Markdown } from "@storybook/addon-docs/blocks"

import changelog from '../../CHANGELOG.md?raw'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story } from '@storybook/blocks';
import { Meta, Story } from '@storybook/addon-docs/blocks';

import * as SelectWithRangePickerStories from './SelectWithRangePicker.stories';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Meta, StoryObj } from '@storybook/react'
import { SelectWithRangePicker as Component } from './SelectWithRangePicker'
import { fn } from '@storybook/test'
import { useArgs } from '@storybook/preview-api'
import { fn } from 'storybook/test'
import { useArgs } from 'storybook/preview-api'

const meta: Meta<typeof Component> = {
title: 'Candidate Components/Directory/Date Range Filter',
Expand Down
Loading