diff --git a/.changeset/fluffy-dingos-appear.md b/.changeset/fluffy-dingos-appear.md new file mode 100644 index 000000000..f5512795f --- /dev/null +++ b/.changeset/fluffy-dingos-appear.md @@ -0,0 +1,5 @@ +--- +"@pandacss/generator": patch +--- + +Fix issue where `mergeCss` import in `styled-system/jsx/*` could be unused. diff --git a/package.json b/package.json index 0f8790754..3aebcfe2a 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "git add --all packages/studio/" ] }, - "packageManager": "pnpm@9.0.5", + "packageManager": "pnpm@9.0.6", "pnpm": { "overrides": { "@swc/helpers@~0.4": "0.4.36" diff --git a/packages/generator/src/artifacts/preact-jsx/pattern.ts b/packages/generator/src/artifacts/preact-jsx/pattern.ts index a3fb19900..fb6cc6785 100644 --- a/packages/generator/src/artifacts/preact-jsx/pattern.ts +++ b/packages/generator/src/artifacts/preact-jsx/pattern.ts @@ -17,7 +17,7 @@ export function generatePreactJsxPattern(ctx: Context, filters?: ArtifactFilters js: outdent` import { h } from 'preact' import { forwardRef } from 'preact/compat' - ${ctx.file.import('mergeCss', '../css/css')} + ${jsxStyleProps === 'minimal' && ctx.file.import('mergeCss', '../css/css')} ${ctx.file.import('splitProps', '../helpers')} ${ctx.file.import(styleFnName, `../patterns/${dashName}`)} ${ctx.file.import(factoryName, './factory')} diff --git a/packages/generator/src/artifacts/qwik-jsx/pattern.ts b/packages/generator/src/artifacts/qwik-jsx/pattern.ts index 22e925ce0..6592e9d4c 100644 --- a/packages/generator/src/artifacts/qwik-jsx/pattern.ts +++ b/packages/generator/src/artifacts/qwik-jsx/pattern.ts @@ -16,7 +16,7 @@ export function generateQwikJsxPattern(ctx: Context, filters?: ArtifactFilters) name: dashName, js: outdent` import { h } from '@builder.io/qwik' - ${ctx.file.import('mergeCss', '../css/css')} + ${jsxStyleProps === 'minimal' && ctx.file.import('mergeCss', '../css/css')} ${ctx.file.import('splitProps', '../helpers')} ${ctx.file.import(styleFnName, `../patterns/${dashName}`)} ${ctx.file.import(factoryName, './factory')} diff --git a/packages/generator/src/artifacts/react-jsx/pattern.ts b/packages/generator/src/artifacts/react-jsx/pattern.ts index 5107ee765..d3e62e8c1 100644 --- a/packages/generator/src/artifacts/react-jsx/pattern.ts +++ b/packages/generator/src/artifacts/react-jsx/pattern.ts @@ -16,7 +16,7 @@ export function generateReactJsxPattern(ctx: Context, filters?: ArtifactFilters) name: dashName, js: outdent` import { createElement, forwardRef } from 'react' - ${ctx.file.import('mergeCss', '../css/css')} + ${jsxStyleProps === 'minimal' && ctx.file.import('mergeCss', '../css/css')} ${ctx.file.import('splitProps', '../helpers')} ${ctx.file.import(styleFnName, `../patterns/${dashName}`)} ${ctx.file.import(factoryName, './factory')} diff --git a/packages/generator/src/artifacts/solid-jsx/pattern.ts b/packages/generator/src/artifacts/solid-jsx/pattern.ts index 52563a111..98d3f8885 100644 --- a/packages/generator/src/artifacts/solid-jsx/pattern.ts +++ b/packages/generator/src/artifacts/solid-jsx/pattern.ts @@ -17,7 +17,7 @@ export function generateSolidJsxPattern(ctx: Context, filters?: ArtifactFilters) js: outdent` import { createMemo, mergeProps, splitProps } from 'solid-js' import { createComponent } from 'solid-js/web' - ${ctx.file.import('mergeCss', '../css/css')} + ${jsxStyleProps === 'minimal' && ctx.file.import('mergeCss', '../css/css')} ${ctx.file.import(styleFnName, `../patterns/${dashName}`)} ${ctx.file.import(factoryName, './factory')} diff --git a/packages/generator/src/artifacts/vue-jsx/pattern.ts b/packages/generator/src/artifacts/vue-jsx/pattern.ts index 0abc59a0e..c53a891fe 100644 --- a/packages/generator/src/artifacts/vue-jsx/pattern.ts +++ b/packages/generator/src/artifacts/vue-jsx/pattern.ts @@ -16,7 +16,7 @@ export function generateVueJsxPattern(ctx: Context, filters?: ArtifactFilters) { name: dashName, js: outdent` import { defineComponent, h, computed } from 'vue' - ${ctx.file.import('mergeCss', '../css/css')} + ${jsxStyleProps === 'minimal' && ctx.file.import('mergeCss', '../css/css')} ${ctx.file.import(styleFnName, `../patterns/${dashName}`)} ${ctx.file.import(factoryName, './factory')} diff --git a/packages/studio/styled-system/jsx/aspect-ratio.mjs b/packages/studio/styled-system/jsx/aspect-ratio.mjs index d544a8a2a..eee2f6364 100644 --- a/packages/studio/styled-system/jsx/aspect-ratio.mjs +++ b/packages/studio/styled-system/jsx/aspect-ratio.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getAspectRatioStyle } from '../patterns/aspect-ratio.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/bleed.mjs b/packages/studio/styled-system/jsx/bleed.mjs index 00bf8c6d9..fff0c9b45 100644 --- a/packages/studio/styled-system/jsx/bleed.mjs +++ b/packages/studio/styled-system/jsx/bleed.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getBleedStyle } from '../patterns/bleed.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/box.mjs b/packages/studio/styled-system/jsx/box.mjs index e972e8116..57b6fa5f7 100644 --- a/packages/studio/styled-system/jsx/box.mjs +++ b/packages/studio/styled-system/jsx/box.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getBoxStyle } from '../patterns/box.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/center.mjs b/packages/studio/styled-system/jsx/center.mjs index 2250f642a..634ab2745 100644 --- a/packages/studio/styled-system/jsx/center.mjs +++ b/packages/studio/styled-system/jsx/center.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getCenterStyle } from '../patterns/center.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/circle.mjs b/packages/studio/styled-system/jsx/circle.mjs index 17317f0d1..eef6e977d 100644 --- a/packages/studio/styled-system/jsx/circle.mjs +++ b/packages/studio/styled-system/jsx/circle.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getCircleStyle } from '../patterns/circle.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/container.mjs b/packages/studio/styled-system/jsx/container.mjs index 1eab43710..0fee507de 100644 --- a/packages/studio/styled-system/jsx/container.mjs +++ b/packages/studio/styled-system/jsx/container.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getContainerStyle } from '../patterns/container.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/cq.mjs b/packages/studio/styled-system/jsx/cq.mjs index ac0ba7ece..7b559eb6b 100644 --- a/packages/studio/styled-system/jsx/cq.mjs +++ b/packages/studio/styled-system/jsx/cq.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getCqStyle } from '../patterns/cq.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/divider.mjs b/packages/studio/styled-system/jsx/divider.mjs index 4e7228e5a..4472f5a85 100644 --- a/packages/studio/styled-system/jsx/divider.mjs +++ b/packages/studio/styled-system/jsx/divider.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getDividerStyle } from '../patterns/divider.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/flex.mjs b/packages/studio/styled-system/jsx/flex.mjs index f48ca78ba..906732c5d 100644 --- a/packages/studio/styled-system/jsx/flex.mjs +++ b/packages/studio/styled-system/jsx/flex.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getFlexStyle } from '../patterns/flex.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/float.mjs b/packages/studio/styled-system/jsx/float.mjs index 8a1081f54..f28d6fad4 100644 --- a/packages/studio/styled-system/jsx/float.mjs +++ b/packages/studio/styled-system/jsx/float.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getFloatStyle } from '../patterns/float.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/grid-item.mjs b/packages/studio/styled-system/jsx/grid-item.mjs index 8ba8aed4a..53656422f 100644 --- a/packages/studio/styled-system/jsx/grid-item.mjs +++ b/packages/studio/styled-system/jsx/grid-item.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getGridItemStyle } from '../patterns/grid-item.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/grid.mjs b/packages/studio/styled-system/jsx/grid.mjs index 7edf8511a..30cba671a 100644 --- a/packages/studio/styled-system/jsx/grid.mjs +++ b/packages/studio/styled-system/jsx/grid.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getGridStyle } from '../patterns/grid.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/hstack.mjs b/packages/studio/styled-system/jsx/hstack.mjs index b3af0db42..97c94e161 100644 --- a/packages/studio/styled-system/jsx/hstack.mjs +++ b/packages/studio/styled-system/jsx/hstack.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getHstackStyle } from '../patterns/hstack.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/link-box.mjs b/packages/studio/styled-system/jsx/link-box.mjs index efe72d6dd..9dc627484 100644 --- a/packages/studio/styled-system/jsx/link-box.mjs +++ b/packages/studio/styled-system/jsx/link-box.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getLinkBoxStyle } from '../patterns/link-box.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/link-overlay.mjs b/packages/studio/styled-system/jsx/link-overlay.mjs index b5c54beb9..2bd7f6f56 100644 --- a/packages/studio/styled-system/jsx/link-overlay.mjs +++ b/packages/studio/styled-system/jsx/link-overlay.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getLinkOverlayStyle } from '../patterns/link-overlay.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/spacer.mjs b/packages/studio/styled-system/jsx/spacer.mjs index 09bfb0b3d..b81d8e07e 100644 --- a/packages/studio/styled-system/jsx/spacer.mjs +++ b/packages/studio/styled-system/jsx/spacer.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getSpacerStyle } from '../patterns/spacer.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/square.mjs b/packages/studio/styled-system/jsx/square.mjs index 44109483e..c9058f18e 100644 --- a/packages/studio/styled-system/jsx/square.mjs +++ b/packages/studio/styled-system/jsx/square.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getSquareStyle } from '../patterns/square.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/stack.mjs b/packages/studio/styled-system/jsx/stack.mjs index 05d411d3c..448ed2fb6 100644 --- a/packages/studio/styled-system/jsx/stack.mjs +++ b/packages/studio/styled-system/jsx/stack.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getStackStyle } from '../patterns/stack.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/visually-hidden.mjs b/packages/studio/styled-system/jsx/visually-hidden.mjs index d73fc724e..4fea98ea1 100644 --- a/packages/studio/styled-system/jsx/visually-hidden.mjs +++ b/packages/studio/styled-system/jsx/visually-hidden.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getVisuallyHiddenStyle } from '../patterns/visually-hidden.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/vstack.mjs b/packages/studio/styled-system/jsx/vstack.mjs index 4ac779d69..512998652 100644 --- a/packages/studio/styled-system/jsx/vstack.mjs +++ b/packages/studio/styled-system/jsx/vstack.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getVstackStyle } from '../patterns/vstack.mjs'; import { panda } from './factory.mjs'; diff --git a/packages/studio/styled-system/jsx/wrap.mjs b/packages/studio/styled-system/jsx/wrap.mjs index 3dc7854b9..492b088bd 100644 --- a/packages/studio/styled-system/jsx/wrap.mjs +++ b/packages/studio/styled-system/jsx/wrap.mjs @@ -1,5 +1,5 @@ import { createElement, forwardRef } from 'react' -import { mergeCss } from '../css/css.mjs'; +false import { splitProps } from '../helpers.mjs'; import { getWrapStyle } from '../patterns/wrap.mjs'; import { panda } from './factory.mjs';