Skip to content

Commit 2e5b038

Browse files
authored
Merge pull request #398 from shairez:pr-fluffy-experiment
WIP: first experiment of fluffy
2 parents 4939005 + 013c777 commit 2e5b038

File tree

152 files changed

+5823
-5020
lines changed

Some content is hidden

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

152 files changed

+5823
-5020
lines changed

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
12-
"enforceBuildableLibDependency": true,
12+
"enforceBuildableLibDependency": false,
1313
"allow": [],
1414
"depConstraints": [
1515
{

.github/actions/test/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ runs:
4444
# storybookBuildDir: dist/storybook/headless
4545
# zip: true
4646

47-
# - name: Build Tailwind Theme
47+
# - name: Build the fluffy kit
4848
# shell: bash
49-
# run: npx nx build tailwind
49+
# run: npx nx build fluffy
5050

5151
# - name: Build
5252
# shell: bash

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Build
22
dist
3-
lib
43
lib-types
54
/server
65

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
save-exact = true
22
auto-install-peers=true
3+
dedupe-peer-dependents=true
34
public-hoist-pattern[]=@types*

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
**/*.log
33
**/.DS_Store
44
*.
5+
.vscode
56
dist
67
node_modules
78
coverage

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"semi": true,
33
"singleQuote": true,
44
"trailingComma": "all",
5-
"printWidth": 90
5+
"printWidth": 90,
6+
"plugins": ["prettier-plugin-tailwindcss"]
67
}

.verdaccio/config.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# path to a directory with all packages
2+
storage: ../tmp/local-registry/storage
3+
4+
# a list of other known repositories we can talk to
5+
uplinks:
6+
npmjs:
7+
url: https://registry.npmjs.org/
8+
maxage: 60m
9+
10+
packages:
11+
'**':
12+
# give all users (including non-authenticated users) full access
13+
# because it is a local registry
14+
access: $all
15+
publish: $all
16+
unpublish: $all
17+
18+
# if package is not available locally, proxy requests to npm registry
19+
proxy: npmjs
20+
21+
# log settings
22+
logs:
23+
type: stdout
24+
format: pretty
25+
level: warn
26+
27+
publish:
28+
allow_offline: true # set offline to true to allow publish offline

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"git.pullTags": false,
3-
"conventionalCommits.scopes": ["tailwind"],
3+
"conventionalCommits.scopes": ["fluffy", "headless", "docs"],
4+
"tailwindCSS.experimental.classRegex": [
5+
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
6+
],
47
"editor.codeActionsOnSave": {
58
"source.removeUnusedImports": true
69
}

CODING_STANDARDS.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export type TooltipProps = QwikIntrinsicElements['div'] & {
6464
};
6565
```
6666

67-
For **Tailwind, Material and other components variations**, you can define the new props in a new type, named with the component name and the variation as prefix. For example:
67+
For **Fluffy, Material and other components variations**, you can define the new props in a new type, named with the component name and the variation as prefix. For example:
6868

6969
```ts
7070
type TailwindTooltipProps = {
@@ -104,12 +104,11 @@ return (
104104
- Use accessibility attributes whenever they are needed.
105105
- For simple primitive states use signals. For object state, use stores.
106106

107-
## Example of headless button customisation with Tailwind
107+
## Example of headless button customization with Tailwind
108108

109109
```tsx
110110
import { component$, QwikIntrinsicElements, Slot } from '@builder.io/qwik';
111111
import { Button as HeadlessButton, ButtonProps as ButtonHeadlessProps } from '@qwik-ui/headless';
112-
import { clsq } from '@qwik-ui/shared';
113112

114113
type TailwindButtonProps = { size?: 'sm' | 'md', ... };
115114
export type ButtonProps = ButtonHeadlessProps & TailwindButtonProps;
@@ -118,7 +117,7 @@ export const Button = component$(
118117
({ size = 'md', class: classNames, ...rest }: ButtonProps) => {
119118
const { sizes, ... } = { sizes: { sm: 'btn-sm', md: 'btn-md', ... } };
120119
return (
121-
<HeadlessButton {...rest} class={clsq('btn', sizes[size], classNames)}>
120+
<HeadlessButton {...rest} class={['btn', sizes[size], classNames]}>
122121
<Slot />
123122
</HeadlessButton>
124123
);

apps/website/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
"description": "The Qwik UI Website",
44
"private": true,
55
"dependencies": {
6+
"@qwik-ui/cva": "workspace:*",
67
"@qwik-ui/headless": "workspace:*",
78
"@qwik-ui/tailwind": "workspace:*",
9+
"@qwik-ui/fluffy": "workspace:*",
810
"@qwik-ui/material": "workspace:*",
911
"@qwik-ui/primitives": "workspace:*"
1012
}

0 commit comments

Comments
 (0)