From fefea5108772d8f7024ceb331134b33e3ae5537e Mon Sep 17 00:00:00 2001 From: M3DZIK Date: Sat, 9 Mar 2024 19:51:15 +0100 Subject: [PATCH] Fix build --- package-lock.json | 16 +++++++++++----- package.json | 2 ++ src/app.html | 2 +- src/app.postcss | 6 +++++- src/routes/+layout.svelte | 2 -- svelte.config.js | 4 +++- tailwind.config.cjs | 15 --------------- tailwind.config.ts | 21 +++++++++++++++++++++ 8 files changed, 43 insertions(+), 25 deletions(-) delete mode 100644 tailwind.config.cjs create mode 100644 tailwind.config.ts diff --git a/package-lock.json b/package-lock.json index 109d25c..6315341 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,10 @@ "devDependencies": { "@floating-ui/dom": "^1.6.3", "@skeletonlabs/skeleton": "^2.9.0", + "@skeletonlabs/tw-plugin": "^0.3.1", "@sveltejs/adapter-auto": "^3.1.1", "@sveltejs/kit": "^2.5.3", + "@sveltejs/vite-plugin-svelte": "^3.0.2", "@typescript-eslint/eslint-plugin": "^7.1.1", "@typescript-eslint/parser": "^7.1.1", "autoprefixer": "^10.4.18", @@ -914,6 +916,15 @@ "svelte": "^3.56.0 || ^4.0.0" } }, + "node_modules/@skeletonlabs/tw-plugin": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@skeletonlabs/tw-plugin/-/tw-plugin-0.3.1.tgz", + "integrity": "sha512-DjjeOHN3HhFQf6gYPT2MUZMkIdw1jeB9mbuKC8etQxUlOR4XitfC7hssRWFJ8RJsvrrN0myCBbdWkVG1JVA96g==", + "dev": true, + "peerDependencies": { + "tailwindcss": ">=3.0.0" + } + }, "node_modules/@sveltejs/adapter-auto": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-3.1.1.tgz", @@ -963,7 +974,6 @@ "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-3.0.2.tgz", "integrity": "sha512-MpmF/cju2HqUls50WyTHQBZUV3ovV/Uk8k66AN2gwHogNAG8wnW8xtZDhzNBsFJJuvmq1qnzA5kE7YfMJNFv2Q==", "dev": true, - "peer": true, "dependencies": { "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0", "debug": "^4.3.4", @@ -986,7 +996,6 @@ "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-2.0.0.tgz", "integrity": "sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==", "dev": true, - "peer": true, "dependencies": { "debug": "^4.3.4" }, @@ -1670,7 +1679,6 @@ "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -3796,7 +3804,6 @@ "resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.3.tgz", "integrity": "sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==", "dev": true, - "peer": true, "engines": { "node": "^12.20 || ^14.13.1 || >= 16" }, @@ -4193,7 +4200,6 @@ "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz", "integrity": "sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==", "dev": true, - "peer": true, "peerDependencies": { "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" }, diff --git a/package.json b/package.json index abc1dd9..5572735 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,10 @@ "devDependencies": { "@floating-ui/dom": "^1.6.3", "@skeletonlabs/skeleton": "^2.9.0", + "@skeletonlabs/tw-plugin": "^0.3.1", "@sveltejs/adapter-auto": "^3.1.1", "@sveltejs/kit": "^2.5.3", + "@sveltejs/vite-plugin-svelte": "^3.0.2", "@typescript-eslint/eslint-plugin": "^7.1.1", "@typescript-eslint/parser": "^7.1.1", "autoprefixer": "^10.4.18", diff --git a/src/app.html b/src/app.html index 8a2e0fc..26f9d69 100644 --- a/src/app.html +++ b/src/app.html @@ -6,7 +6,7 @@ %sveltekit.head% - +
%sveltekit.body%
diff --git a/src/app.postcss b/src/app.postcss index 3b088cb..64b7c2b 100644 --- a/src/app.postcss +++ b/src/app.postcss @@ -1,4 +1,8 @@ -/*place global styles here */ +@tailwind base; +@tailwind components; +@tailwind utilities; +@tailwind variants; + html, body { @apply h-full; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index d1aa1d9..6e8ef19 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,6 +1,4 @@ diff --git a/svelte.config.js b/svelte.config.js index 67369ab..9e44a74 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,5 +1,6 @@ import adapter from '@sveltejs/adapter-auto'; -import { vitePreprocess } from '@sveltejs/kit/vite'; +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; + /** @type {import('@sveltejs/kit').Config} */ const config = { // Consult https://kit.svelte.dev/docs/integrations#preprocessors @@ -16,4 +17,5 @@ const config = { adapter: adapter() } }; + export default config; diff --git a/tailwind.config.cjs b/tailwind.config.cjs deleted file mode 100644 index 9562899..0000000 --- a/tailwind.config.cjs +++ /dev/null @@ -1,15 +0,0 @@ -import { join } from 'path'; -import skeleton from '@skeletonlabs/skeleton/tailwind/skeleton.cjs'; - -/** @type {import('tailwindcss').Config} */ -module.exports = { - darkMode: 'class', - content: [ - './src/**/*.{html,js,svelte,ts}', - join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}') - ], - theme: { - extend: {} - }, - plugins: [...skeleton()] -}; diff --git a/tailwind.config.ts b/tailwind.config.ts new file mode 100644 index 0000000..e648701 --- /dev/null +++ b/tailwind.config.ts @@ -0,0 +1,21 @@ +import { skeleton } from '@skeletonlabs/tw-plugin'; +import { join } from 'path'; +import type { Config } from 'tailwindcss'; + +export default { + darkMode: 'class', + content: [ + './src/**/*.{html,js,svelte,ts}', + join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}') + ], + theme: { + extend: {} + }, + plugins: [ + skeleton({ + themes: { + preset: ['skeleton'] + } + }) + ] +} satisfies Config;