Skip to content

Commit a78869a

Browse files
saboooorsaboooor
committed
update to tailwind v4 and get rid of lum-pad-equal
1 parent 01d3bd4 commit a78869a

Some content is hidden

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

71 files changed

+1134
-2809
lines changed

‎README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,11 @@ To use the Luminescent UI Tailwind Library, you need to install the package from
66
pnpm install @luminescent/ui
77
```
88

9-
Once installed, include the following to your tailwind config
9+
Once installed, include the following to css file
1010

11-
```javascript
12-
/** @type {import('tailwindcss').Config} */
13-
14-
import tailwindConfig from '@luminescent/ui/config';
15-
16-
export default {
17-
plugins: [
18-
require('@luminescent/ui'),
19-
],
20-
};
11+
```css
12+
@import "@luminescent/ui/css";
13+
@plugin "@luminescent/ui";
2114
```
2215

2316
Once finished, you can use the classes included, shown in the documentation.

‎packages/ui-docs/.eslintignore

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎packages/ui-docs/.eslintrc.cjs

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎packages/ui-docs/.ncurc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
reject:
2+
- "vite" # building broken on v6

‎packages/ui-docs/.nvmrc

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

‎packages/ui-docs/adapters/cloudflare-pages/vite.config.ts renamed to ‎packages/ui-docs/adapters/cloudflare-pages/vite.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { cloudflarePagesAdapter } from "@builder.io/qwik-city/adapters/cloudflare-pages/vite";
22
import { extendConfig } from "@builder.io/qwik-city/vite";
3-
import baseConfig from "../../vite.config";
3+
import baseConfig from "../../vite.config.mts";
44

55
export default extendConfig(baseConfig, () => {
66
return {

‎packages/ui-docs/eslint.config.js

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// eslint.config.mjs
2+
import js from '@eslint/js';
3+
import globals from 'globals';
4+
import tseslint from 'typescript-eslint';
5+
import { globalIgnores } from 'eslint/config';
6+
import { qwikEslint9Plugin } from 'eslint-plugin-qwik';
7+
8+
export default tseslint.config(
9+
globalIgnores(['node_modules/*', 'dist/*', 'server/*', 'tmp/*']),
10+
js.configs.recommended,
11+
tseslint.configs.recommendedTypeChecked,
12+
qwikEslint9Plugin.configs.recommended,
13+
{
14+
files: ['src/**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}'],
15+
languageOptions: {
16+
globals: {
17+
...globals.serviceworker,
18+
...globals.browser,
19+
...globals.node,
20+
},
21+
parserOptions: {
22+
projectService: true,
23+
tsconfigRootDir: import.meta.dirname,
24+
},
25+
},
26+
rules: {
27+
'@typescript-eslint/no-explicit-any': 'off',
28+
'@typescript-eslint/no-unsafe-member-access': 'off',
29+
'@typescript-eslint/no-unsafe-assignment': 'off',
30+
'@typescript-eslint/no-unsafe-return': 'off',
31+
'@typescript-eslint/no-unsafe-call': 'off',
32+
'@typescript-eslint/no-unsafe-argument': 'off',
33+
'@typescript-eslint/no-redundant-type-constituents': 'off',
34+
'@typescript-eslint/no-duplicate-type-constituents': 'off',
35+
'@typescript-eslint/no-base-to-string': 'off',
36+
'@typescript-eslint/restrict-template-expressions': 'off',
37+
'@typescript-eslint/ban-ts-comment': 'off',
38+
'@typescript-eslint/only-throw-error': 'off',
39+
'indent': ['error', 2],
40+
'quotes': ['error', 'single'],
41+
'semi': ['error', 'always'],
42+
'comma-dangle': ['error', 'always-multiline'],
43+
'no-trailing-spaces': ['error'],
44+
'no-multiple-empty-lines': ['error', { max: 1 }],
45+
'block-spacing': ['error', 'always'],
46+
'object-curly-spacing': ['error', 'always'],
47+
'array-bracket-spacing': ['error', 'never'],
48+
'key-spacing': ['error', { beforeColon: false, afterColon: true }],
49+
'keyword-spacing': ['error', { before: true, after: true }],
50+
},
51+
}
52+
);

‎packages/ui-docs/package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"build": "qwik build",
1414
"build.client": "vite build",
1515
"build.preview": "vite build --ssr src/entry.preview.tsx",
16-
"build.server": "vite build -c adapters/cloudflare-pages/vite.config.ts",
16+
"build.server": "vite build -c adapters/cloudflare-pages/vite.config.mts",
1717
"build.types": "tsc --noEmit",
1818
"deploy": "wrangler pages dev ./dist",
1919
"lint": "eslint \"src/**/*.ts*\"",
@@ -24,24 +24,24 @@
2424
},
2525
"devDependencies": {
2626
"@anuragroy/tailwindcss-animate": "^1.0.6",
27-
"@builder.io/qwik": "^1.8.0",
28-
"@builder.io/qwik-city": "^1.8.0",
29-
"@luminescent/ui": "^1.2.4",
30-
"@luminescent/ui-qwik": "^1.2.4",
31-
"@types/eslint": "^8.56.11",
32-
"@types/node": "^22.4.2",
33-
"@typescript-eslint/eslint-plugin": "^8.2.0",
34-
"@typescript-eslint/parser": "^8.2.0",
35-
"autoprefixer": "^10.4.20",
36-
"eslint": "^8.57.0",
37-
"eslint-plugin-qwik": "^1.8.0",
38-
"postcss": "^8.4.41",
39-
"qwik-ionicons": "^1.0.5",
40-
"tailwindcss": "3.4.10",
41-
"typescript": "5.5.4",
42-
"undici": "^6.19.8",
43-
"vite": "^5.4.2",
44-
"vite-tsconfig-paths": "^5.0.1",
45-
"wrangler": "^3.72.1"
27+
"@builder.io/qwik": "1.13.0",
28+
"@builder.io/qwik-city": "1.13.0",
29+
"@cloudflare/workers-types": "^4.20250430.0",
30+
"@eslint/js": "^9.25.1",
31+
"@luminescent/ui": "workspace:*",
32+
"@luminescent/ui-qwik": "workspace:*",
33+
"@tailwindcss/vite": "^4.1.5",
34+
"@types/eslint": "^9.6.1",
35+
"@types/node": "^22.15.3",
36+
"eslint": "^9.25.1",
37+
"eslint-plugin-qwik": "1.13.0",
38+
"globals": "^16.0.0",
39+
"lucide-icons-qwik": "^0.487.0",
40+
"tailwindcss": "^4.1.5",
41+
"typescript": "5.8.3",
42+
"typescript-eslint": "^8.31.1",
43+
"undici": "^7.8.0",
44+
"vite": "5.4.14",
45+
"vite-tsconfig-paths": "5.1.4"
4646
}
4747
}

‎packages/ui-docs/postcss.config.cjs

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎packages/ui-docs/src/components/Nav.tsx

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,53 @@
11
import { component$ } from '@builder.io/qwik';
22
import { Link } from '@builder.io/qwik-city';
3-
import { LogoDiscord, LogoLuminescent, LogoLuminescentFull, Nav } from '@luminescent/ui-qwik';
4-
import { CubeOutline, LogoGithub } from 'qwik-ionicons';
3+
import { LogoDiscord, LogoLuminescentFull, Nav } from '@luminescent/ui-qwik';
4+
import { Book, Github } from 'lucide-icons-qwik';
55

66
export default component$(() => {
77
return (
8-
<Nav floating fixed>
9-
<Link q:slot="start" href="/" class="lum-btn lum-bg-transparent text-[#f0ccfb] fill-[#f0ccfb]">
8+
<Nav floating fixed colorClass="lum-bg-gray-800/50 !text-gray-100">
9+
<Link q:slot="start" href="/" class="lum-btn lum-bg-transparent">
1010
<div class="font-semibold flex items-center gap-1 text-[#f0ccfb] fill-[#f0ccfb]" style="filter: drop-shadow(0 0 1rem #CB6CE6);">
11-
<LogoLuminescentFull width={100} class="mt-1" /> / ui
11+
<LogoLuminescentFull width={100} class="mt-1" />
1212
</div>
1313
</Link>
1414

15-
<Link q:slot="end" href="/docs" class="lum-btn lum-bg-transparent hidden sm:flex">
16-
<CubeOutline width={24} /> Docs
15+
<Link q:slot="end" href="/docs" class={{
16+
'hidden sm:flex lum-btn lum-bg-transparent': true,
17+
}}>
18+
<Book size={20} /> Docs
1719
</Link>
18-
<a q:slot="end" href="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/luminescentDev/ui" class="lum-btn lum-bg-transparent lum-pad-equal-md hidden sm:flex">
19-
<LogoGithub width={24} class="fill-current" />
20-
</a>
21-
<a q:slot="end" href="https://luminescent.dev/discord" class="lum-btn lum-bg-transparent lum-pad-equal-md hidden sm:flex">
22-
<LogoDiscord width={24} />
23-
</a>
24-
<a q:slot="end" href="https://luminescent.dev" class="lum-btn lum-bg-transparent lum-pad-equal-md hidden sm:flex">
25-
<LogoLuminescent width={24} />
20+
<a q:slot="end" href="https://luminescent.dev" class="lum-btn lum-bg-transparent">
21+
<div class="font-semibold flex items-center gap-1">
22+
<LogoLuminescentFull width={100} class="mt-1" />
23+
</div>
2624
</a>
25+
<div q:slot='end' class="hidden sm:flex gap-2">
26+
<SocialButtons />
27+
</div>
2728

28-
<Link q:slot="mobile" href="/docs" class="lum-btn lum-bg-transparent w-full">
29-
<CubeOutline width={24} /> Docs
29+
<Link q:slot="mobile" href="/docs" class="lum-btn lum-bg-transparent">
30+
<Book size={20} /> Docs
3031
</Link>
32+
<a q:slot="mobile" href="https://luminescent.dev" class="lum-btn lum-bg-transparent">
33+
<div class="font-semibold flex items-center gap-1">
34+
<LogoLuminescentFull width={100} class="mt-1" />
35+
</div>
36+
</a>
3137
<div q:slot='mobile' class="flex justify-evenly">
32-
<a q:slot="" href="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/luminescentDev/ui">
33-
<LogoGithub width={24} />
34-
</a>
35-
<a q:slot="end" href="https://luminescent.dev/discord">
36-
<LogoDiscord width={24} />
37-
</a>
38-
<a q:slot="end" href="https://luminescent.dev">
39-
<LogoLuminescent width={24} />
40-
</a>
38+
<SocialButtons />
4139
</div>
4240
</Nav>
4341
);
4442
});
43+
44+
export const SocialButtons = component$(() => {
45+
return <>
46+
<a href="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/LuminescentDev" title="GitHub" class="lum-btn lum-bg-transparent p-2">
47+
<Github size={20} />
48+
</a>
49+
<a href="/discord" title="Discord" class="lum-btn lum-bg-transparent p-2">
50+
<LogoDiscord width="20" />
51+
</a>
52+
</>;
53+
});

0 commit comments

Comments
 (0)