Skip to content

Commit

Permalink
Merge pull request #128 from jere-a/christmas
Browse files Browse the repository at this point in the history
Christmas Big update
  • Loading branch information
jere-a authored Dec 2, 2024
2 parents 30fb6a5 + cdb67a9 commit 3490275
Show file tree
Hide file tree
Showing 30 changed files with 10,960 additions and 7,911 deletions.
27 changes: 9 additions & 18 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { defineConfig } from 'astro/config';
import partytown from '@astrojs/partytown';
import mdx from '@astrojs/mdx';
import vue from '@astrojs/vue';
import svelte from '@astrojs/svelte';
import preact from '@astrojs/preact';
import solidJs from '@astrojs/solid-js';
import lit from '@astrojs/lit';
import partytown from '@astrojs/partytown';
import purgecss from 'astro-purgecss';
import { defineConfig } from 'astro/config';

import serviceWorker from 'astrojs-service-worker';

Expand All @@ -15,18 +10,17 @@ import { siteConfig } from './src/config';

// Helper imports
import react from '@astrojs/react';
import tailwind from '@astrojs/tailwind';
import sitemap from '@astrojs/sitemap';
import tailwind from '@astrojs/tailwind';
import playformCompress from '@playform/compress';
import qwikdev from '@qwikdev/astro';

import alpinejs from '@astrojs/alpinejs';
import { visualizer } from "rollup-plugin-visualizer";

import stylify from '@stylify/astro';
import { hooks } from '@stylify/bundler';
import fastGlob from 'fast-glob';
import path from 'path';
import fs from 'fs';
import path from 'path';
import { fileURLToPath } from 'url';

const pagesDir = 'src/pages';
Expand Down Expand Up @@ -169,9 +163,9 @@ export default defineConfig({
//}), //preact({
// include: '**/preact/*'
//}),
react({
include: ['**/react/*', '**/components/ui/*'],
}),
//react({
// include: ['**/react/*', '**/components/ui/*'],
//}),
tailwind(),
stylifyIntegration,
purgecss({
Expand Down Expand Up @@ -199,10 +193,6 @@ export default defineConfig({
'/articles/[...slug]': '/blog/[...slug]',
'/articles': '/blog',
},
prefetch: {
defaultStrategy: 'viewport',
prefetchAll: true,
},
i18n: {
defaultLocale: 'fi',
locales: ['fi', 'en'],
Expand All @@ -220,5 +210,6 @@ export default defineConfig({
},
},
},
//plugins: [visualizer({ emitFile: true, filename: "stats.html" })]
},
});
74 changes: 39 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,31 @@
"@astrojs/lit": "^4.3.0",
"@astrojs/mdx": "^3.1.9",
"@astrojs/partytown": "^2.1.2",
"@astrojs/preact": "^3.5.3",
"@astrojs/react": "^3.6.2",
"@astrojs/preact": "^3.5.4",
"@astrojs/react": "^3.6.3",
"@astrojs/rss": "^4.0.9",
"@astrojs/sitemap": "^3.2.1",
"@astrojs/solid-js": "^4.4.3",
"@astrojs/svelte": "^5.7.3",
"@astrojs/solid-js": "^4.4.4",
"@astrojs/svelte": "^6.0.2",
"@astrojs/tailwind": "^5.1.2",
"@astrojs/ts-plugin": "^1.10.4",
"@astrojs/vue": "^4.5.2",
"@builder.io/qwik": "^1.10.0",
"@astrojs/vue": "^4.5.3",
"@builder.io/qwik": "^1.11.0",
"@nanostores/persistent": "^0.10.2",
"@nanostores/react": "^0.7.3",
"@playform/compress": "^0.0.13",
"@nanostores/react": "^0.8.2",
"@playform/compress": "^0.1.6",
"@qwikdev/astro": "^0.6.3",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-icons": "^1.3.2",
"@radix-ui/react-navigation-menu": "^1.2.1",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-slot": "^1.1.0",
"@sentry/astro": "^8.40.0",
"@spotlightjs/astro": "^2.1.11",
"@sentry/astro": "^8.41.0",
"@spotlightjs/astro": "^2.1.15",
"@stylify/astro": "^0.6.2",
"@stylify/bundler": "^0.7.0",
"@types/alpinejs": "^3.13.10",
"@types/alpinejs": "^3.13.11",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@videojs/http-streaming": "^3.15.0",
Expand All @@ -60,14 +60,14 @@
"@zxcvbn-ts/language-common": "^3.0.4",
"@zxcvbn-ts/language-en": "^3.0.2",
"@zxcvbn-ts/language-fi": "^3.0.2",
"alpinejs": "^3.14.3",
"alpinejs": "^3.14.5",
"animate.css": "^4.1.1",
"astro": "^4.16.16",
"astro-embed": "^0.8.0",
"astro-embed": "^0.9.0",
"astro-fuse": "^1.0.1",
"astro-google-analytics": "^1.0.3",
"astro-particles": "^2.10.0",
"astro-purgecss": "^4.8.0",
"astro-purgecss": "^4.9.0",
"astro-robots-txt": "^1.0.0",
"astro-seo-metadata": "^0.6.0",
"astrojs-service-worker": "^2.0.0",
Expand All @@ -76,7 +76,7 @@
"biome": "^0.3.3",
"bootstrap": "^5.3.3",
"bowser": "^2.11.0",
"class-variance-authority": "^0.7.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cssnano": "^7.0.6",
"dayjs": "^1.11.13",
Expand All @@ -90,21 +90,21 @@
"ldrs": "^1.0.2",
"leaflet": "^1.9.4",
"let-it-go": "^1.1.0",
"lightningcss": "^1.28.1",
"lightningcss": "^1.28.2",
"lit": "^3.2.1",
"lite-youtube-embed": "^0.3.3",
"lucide-react": "^0.456.0",
"lucide-react": "^0.462.0",
"nanostores": "^0.11.3",
"next": "^14.2.18",
"next": "^15.0.3",
"normalize.css": "^8.0.1",
"offline-js": "^0.7.19",
"picnic": "^7.1.0",
"postcss": "^8.4.49",
"postcss-prefixer": "^3.0.0",
"preact": "^10.24.3",
"preact": "^10.25.0",
"prettier-plugin-astro": "^0.14.1",
"purgecss": "^6.0.0",
"purgecss-from-html": "^6.0.0",
"purgecss": "^7.0.2",
"purgecss-from-html": "^7.0.2",
"query-string": "^9.1.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand All @@ -115,49 +115,53 @@
"socket.io": "^4.8.1",
"socket.io-client": "^4.8.1",
"solid-js": "^1.9.3",
"svelte": "^4.2.19",
"tailwind-merge": "^2.5.4",
"svelte": "^5.2.12",
"tailwind-merge": "^2.5.5",
"tailwindcss": "^3.4.15",
"tailwindcss-animate": "^1.0.7",
"umbrellajs": "^3.3.3",
"use-sound": "^4.0.3",
"validator": "^13.12.0",
"video.js": "^8.19.1",
"video.js": "^8.20.0",
"vite": "^6.0.1",
"vite-plugin-pwa": "^0.20.5",
"vite-plugin-pwa": "^0.21.1",
"vite-react": "^3.0.0",
"vue": "^3.5.13"
"vue": "^3.5.13",
"workbox-build": "^7.3.0",
"workbox-window": "^7.3.0"
},
"devDependencies": {
"@biomejs/biome": "1.9.4",
"@fullhuman/postcss-purgecss": "^6.0.0",
"@playwright/test": "^1.48.2",
"@fullhuman/postcss-purgecss": "^7.0.2",
"@playwright/test": "^1.49.0",
"@types/bootstrap": "^5.2.10",
"@types/easeljs": "^1.0.5",
"@types/fs-extra": "^11.0.4",
"@types/jquery": "^3.5.32",
"@types/markdown-it": "^14.1.2",
"@types/node": "^22.9.0",
"@types/node": "^22.10.1",
"@types/offline-js": "^0.7.32",
"@types/sanitize-html": "^2.13.0",
"@types/zepto": "^1.0.36",
"@vite-pwa/astro": "^0.4.3",
"eslint": "^9.15.0",
"eslint": "^9.16.0",
"eslint-plugin-astro": "^1.3.1",
"gun": "^0.2020.1240",
"hash-wasm": "^4.11.0",
"hash-wasm": "^4.12.0",
"jotai": "^2.10.3",
"markdown-it": "^14.1.0",
"postcss-atomizer": "^1.0.2",
"postcss-import": "^16.1.0",
"postcss-nesting": "^13.0.1",
"postcss-preset-env": "^9.6.0",
"postcss-preset-env": "^10.1.1",
"putout": "^36.15.0",
"rollup-plugin-visualizer": "^5.12.0",
"sanitize-html": "^2.13.1",
"terser": "^5.36.0",
"turbo": "^2.3.0",
"turbo": "^2.3.3",
"typescript": "^5.7.2",
"vitest": "^2.1.5",
"vitest": "^2.1.6",
"wretch": "^2.11.0"
},
"packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
"packageManager": "pnpm@9.14.4"
}
Loading

0 comments on commit 3490275

Please sign in to comment.