Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NEXT Dependency Bump - December 4, 2024 #3022

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
cache: pnpm

- name: Install dependencies
Expand All @@ -37,7 +37,7 @@ jobs:
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
cache: pnpm

- name: Install dependencies
Expand All @@ -54,7 +54,7 @@ jobs:
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
cache: pnpm

- name: Install dependencies
Expand All @@ -71,7 +71,7 @@ jobs:
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
cache: pnpm

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-next.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
- name: Use PNPM
uses: pnpm/action-setup@v4

- name: Use Node v18
- name: Use Node v22
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
cache: pnpm

- name: Install dependencies
Expand Down
18 changes: 9 additions & 9 deletions packages/skeleton-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,24 @@
"devDependencies": {
"@skeletonlabs/skeleton": "workspace:*",
"@tailwindcss/forms": "^0.5.9",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/react": "^18.3.12",
"@types/react": "^18.3.13",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"jsdom": "^25.0.1",
"lucide-react": "^0.453.0",
"postcss": "^8.4.47",
"lucide-react": "^0.465.0",
"postcss": "^8.4.49",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.27.0",
"tailwindcss": "^3.4.14",
"react-router-dom": "^7.0.2",
"tailwindcss": "^3.4.16",
"typescript": "catalog:",
"vite": "^5.4.10",
"vite": "^6.0.2",
"vite-plugin-remix-router": "^2.0.0",
"vite-plugin-tw-plugin-watcher": "workspace:*",
"vitest": "^2.1.3"
"vitest": "^2.1.8"
}
}
20 changes: 3 additions & 17 deletions packages/skeleton-react/src/lib/components/Accordion/Accordion.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
'use client';

import { createContext, useContext, useId } from 'react';
import { useContext, useId } from 'react';
import type { FC } from 'react';
import * as accordion from '@zag-js/accordion';
import { useMachine, normalizeProps } from '@zag-js/react';

import type { AccordionContextState, AccordionControlProps, AccordionItemProps, AccordionPanelProps, AccordionProps } from './types.js';
import type { AccordionControlProps, AccordionItemProps, AccordionPanelProps, AccordionProps } from './types.js';
import { AccordionContext, AccordionItemContext } from './contexts.js';
import { noop } from '../../internal/noop.js';

// Contexts ---

export const AccordionContext = createContext<AccordionContextState>({
animDuration: 0.2,
iconOpen: '-',
iconClosed: '+',
api: {} as ReturnType<typeof accordion.connect>
});
export const AccordionItemContext = createContext<accordion.ItemProps>({
value: '',
disabled: false
});

// Components ---

const AccordionRoot: FC<AccordionProps> = ({
animDuration = 0.2,
// Root
Expand Down
16 changes: 16 additions & 0 deletions packages/skeleton-react/src/lib/components/Accordion/contexts.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Accordion Contexts

import { createContext } from 'react';
import { AccordionContextState } from './types';
import * as accordion from '@zag-js/accordion';

export const AccordionContext = createContext<AccordionContextState>({
animDuration: 0.2,
iconOpen: '-',
iconClosed: '+',
api: {} as ReturnType<typeof accordion.connect>
});
export const AccordionItemContext = createContext<accordion.ItemProps>({
value: '',
disabled: false
});
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
'use client';

import React, { createContext, useContext } from 'react';
import React, { useContext } from 'react';
import { NavContextState, NavRailProps, NavBarProps, NavTileProps } from './types.js';

// Contexts ---

export const NavContext = createContext<NavContextState>({
parent: 'none',
value: '',
expanded: false,
onSelectionHandler: () => {}
});

// Components ---
import { NavContext } from './contexts.js';

export const NavRail: React.FC<NavRailProps> = ({
value = '',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { createContext } from 'react';
import { NavContextState } from './types';

export const NavContext = createContext<NavContextState>({
parent: 'none',
value: '',
expanded: false,
onSelectionHandler: () => {}
});
14 changes: 3 additions & 11 deletions packages/skeleton-react/src/lib/components/Segment/Segment.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
'use client';

import { FC, createContext, useContext, useId } from 'react';
import { FC, useContext, useId } from 'react';
import * as radio from '@zag-js/radio-group';
import { useMachine, normalizeProps } from '@zag-js/react';
import type { SegmentContextState, SegmentProps, SegmentItemsProps } from './types.js';
import type { SegmentProps, SegmentItemsProps } from './types.js';
import { SegmentContext } from './contexts.js';
import { noop } from '../../internal/noop.js';

// Contexts ---

export const SegmentContext = createContext<SegmentContextState>({
api: {} as ReturnType<typeof radio.connect>,
indicatorText: ''
});

// Components ---

const SegmentRoot: FC<SegmentProps> = ({
orientation = 'horizontal',
// Root
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { createContext } from 'react';
import { SegmentContextState } from './types';
import * as radio from '@zag-js/radio-group';

export const SegmentContext = createContext<SegmentContextState>({
api: {} as ReturnType<typeof radio.connect>,
indicatorText: ''
});
14 changes: 3 additions & 11 deletions packages/skeleton-react/src/lib/components/Tabs/Tabs.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
'use client';

import { createContext, FC, useContext, useId } from 'react';
import { FC, useContext, useId } from 'react';
import * as tabs from '@zag-js/tabs';
import { useMachine, normalizeProps } from '@zag-js/react';
import { TabsContextState, TabsRootProps, TabsListProps, TabsControlProps, TabsContentProps, TabsPanelProps } from './types.js';
import { TabsRootProps, TabsListProps, TabsControlProps, TabsContentProps, TabsPanelProps } from './types.js';
import { TabsContext } from './contexts.js';
import { noop } from '../../internal/noop.js';

// Context ---

export const TabsContext = createContext<TabsContextState>({
fluid: false,
api: {} as ReturnType<typeof tabs.connect>
});

// Components ---

const TabsRoot: FC<TabsRootProps> = ({
fluid = false,
// Root
Expand Down
8 changes: 8 additions & 0 deletions packages/skeleton-react/src/lib/components/Tabs/contexts.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { createContext } from 'react';
import { TabsContextState } from './types';
import * as tabs from '@zag-js/tabs';

export const TabsContext = createContext<TabsContextState>({
fluid: false,
api: {} as ReturnType<typeof tabs.connect>
});
36 changes: 18 additions & 18 deletions packages/skeleton-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,27 @@
},
"devDependencies": {
"@skeletonlabs/skeleton": "workspace:*",
"@sveltejs/adapter-auto": "^3.2.2",
"@sveltejs/kit": "^2.5.18",
"@sveltejs/package": "^2.3.2",
"@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
"@tailwindcss/forms": "^0.5.7",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/svelte": "^5.2.4",
"autoprefixer": "^10.4.19",
"@sveltejs/adapter-auto": "^3.3.1",
"@sveltejs/kit": "^2.9.0",
"@sveltejs/package": "^2.3.7",
"@sveltejs/vite-plugin-svelte": "^5.0.1",
"@tailwindcss/forms": "^0.5.9",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/svelte": "^5.2.6",
"autoprefixer": "^10.4.20",
"jsdom": "^25.0.1",
"lucide-svelte": "^0.436.0",
"postcss": "^8.4.39",
"postcss-load-config": "^5.1.0",
"publint": "^0.1.16",
"svelte": "^5.0.5",
"svelte-check": "^3.8.4",
"tailwindcss": "^3.4.6",
"tslib": "^2.6.3",
"lucide-svelte": "^0.465.0",
"postcss": "^8.4.49",
"postcss-load-config": "^6.0.1",
"publint": "^0.2.12",
"svelte": "^5.6.2",
"svelte-check": "^4.1.1",
"tailwindcss": "^3.4.16",
"tslib": "^2.8.1",
"typescript": "catalog:",
"vite": "^5.3.4",
"vite": "^6.0.2",
"vite-plugin-tw-plugin-watcher": "workspace:*",
"vitest": "^2.1.5"
"vitest": "^2.1.8"
},
"type": "module"
}
5 changes: 5 additions & 0 deletions packages/skeleton-svelte/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ import path from 'node:path';

export default defineConfig({
plugins: [
// NOTE: confirmed the following with @CokaKola on the Skeleton Discord after the Vite 6 upgrade:
// There is a known Vitest issue where they reverted their peer dep of vite 6 so the types are now mismatched.
// He advised reverting back to Vitest 2.1.6 or adding an ignore comment, with emphasis on the latter.
// @ts-expect-error due to vitest peer dependency issue per Vite 6 update
sveltekit(),
// @ts-expect-error due to vitest peer dependency issue per Vite 6 update
svelteTesting(),
skeletonPluginWatcher(path.resolve(path.join('..', '..', 'packages', 'skeleton', 'src', 'plugin')))
],
Expand Down
6 changes: 3 additions & 3 deletions packages/skeleton/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"homepage": "https://skeleton.dev/",
"devDependencies": {
"@types/postcss-import": "^14.0.3",
"postcss": "8.4.47",
"postcss": "8.4.49",
"postcss-import": "16.1.0",
"postcss-load-config": "6.0.1",
"tailwindcss": "3.4.14",
"tslib": "2.8.0",
"tailwindcss": "3.4.16",
"tslib": "2.8.1",
"tsup": "^8.3.0",
"tsx": "^4.19.1",
"typescript": "catalog:"
Expand Down
Loading
Loading