Fix broken web deploy

.dockerignore

@@ -1,6 +1,7 @@
 .idea/
 .git/
 .github/
+.direnv
 node_modules/
 .DS_Store
 .dockerignore

.gitignore

@@ -1,10 +1,15 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+# Misc
+.DS_Store
+*.pem
+tsconfig.tsbuildinfo
+.direnv/
+
 # Dependencies
 node_modules
 .pnpm
 .pnp
-.pnp.js
 
 # Local env files
 .env
@@ -19,23 +24,7 @@ coverage
 # Turbo
 .turbo
 
-# Vercel
-.vercel
-
 # Build Outputs
-.next/
 out/
 build
 dist
-
-
-# Debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Misc
-.DS_Store
-*.pem
-tsconfig.tsbuildinfo
-.direnv/

.npmrc

@@ -60,7 +60,7 @@ enable-modules-dir = true
 ; Or you can set the virtual store to .pnpm and add it to .gitignore. This will
 ; make stacktraces cleaner as paths to dependencies will be one directory higher.
 ; default to `node_modules/.pnpm`
-virtual-store-dir = .pnpm
+virtual-store-dir = node_modules/.pnpm
 
 ; default to `auto`
 package-import-method = auto

.nvmrc

@@ -1 +1 @@
-23
+23.6

apps/web/.development.env

@@ -1,2 +1,2 @@
 NODE_ENV=development
-NODE_OPTIONS="--trace-warnings --inspect --experimental-strip-types --experimental-transform-types --watch-preserve-output"
+NODE_OPTIONS="--trace-warnings --inspect --experimental-transform-types --watch-preserve-output"

apps/web/.dockerignore

@@ -1,53 +1,34 @@
+### macOS template
+# General
+.DS_Store
+
+### Git
+.gitignore
+.git/
+
+### Docker
+.dockerignore
+Dockerfile
+
 ### Node template
 # Logs
 logs
 *.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
 .pnpm-debug.log*
 
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
 # Coverage directory used by tools like istanbul
-coverage
+coverage/
 *.lcov
 
-
-# node-waf configuration
-.lock-wscript
-
 # Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 
 # Dependency directories
 node_modules/
 
-
 # TypeScript cache
 *.tsbuildinfo
 
-
-# Optional eslint cache
-.eslintcache
-
-# Optional stylelint cache
-.stylelintcache
-
-# Yarn Integrity file
-.yarn-integrity
-
 # dotenv environment variable files
 .env
 .env.example
@@ -57,22 +38,6 @@ node_modules/
 .env.local
 
 
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-
-
-### Remix template
-node_modules
-/.cache
-/build
-/public/build
-.react-router
-
-
 ### Application
 web.iml
 README.md
@@ -81,15 +46,9 @@ fly.review.yaml
 docker-image-stages.md
 biome.json
 
-### macOS template
-# General
-.DS_Store
-
 
-### Docker
-.dockerignore
-Dockerfile
-
-### Git
-.gitignore
-.git/
+### Remix template
+/.cache
+/build
+/public/build
+.react-router

apps/web/Dockerfile

 RUN pnpm --filter @suddenlygiovanni/web --prod --no-optional deploy pruned 
 RUN apk add --no-cache jq 
 RUN corepack enable \ 
 RUN pnpm dlx turbo prune --docker "@suddenlygiovanni/web" 
 RUN cd ./apps/web 
 RUN cd ./apps/web 
 RUN pnpm --filter @suddenlygiovanni/web --prod --no-optional deploy pruned 
@@ -10,7 +10,7 @@ RUN apk add --no-cache jq
 RUN jq -r .packageManager package.json > pnpm-version.txt
 
 
-FROM node:current-alpine3.21 AS base
+FROM node:23.6-alpine3.21 AS base
 
 LABEL authors="suddenlyGiovanni"
 
@@ -84,4 +84,4 @@ USER node
 
 EXPOSE 5173
 
-CMD ["node", "--experimental-strip-types",  "--experimental-transform-types", "server/server.ts"]
+CMD ["node", "--experimental-transform-types", "server/server.ts"]

package.json

@@ -8,6 +8,7 @@
 	"description": "suddenlyGiovanni personal website monorepo",
 	"devDependencies": {
 		"@biomejs/biome": "nightly",
+		"@tailwindcss/language-server": "0.14.1",
 		"eslint": "9.18.0",
 		"scripty": "2.1.1",
 		"turbo": "2.3.3",
@@ -19,16 +20,12 @@
 	"packageManager": "[email protected]+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0",
 	"pnpm": {
 		"peerDependencyRules": {
-			"allowedVersions": {
-				"@react-router/[email protected]>vite": "^6",
-				"@vitest/[email protected]>vite": "^6"
-			}
+			"allowedVersions": {}
 		},
 		"overrides": {
 			"react": "^19.0.0",
-			"react-dom": "19.0.0",
-			"@types/react": "^19.0.0",
-			"vite": "^6"
+			"react-dom": "^19.0.0",
+			"@types/react": "^19.0.0"
 		}
 	},
 	"private": true,

packages/ui/.storybook/main.ts

@@ -1,28 +1,20 @@
 import type { StorybookConfig } from '@storybook/react-vite'
 
-// biome-ignore lint/correctness/noNodejsModules: <explanation>
-import { dirname, join } from 'node:path'
+ const defineConfig = (config: StorybookConfig): StorybookConfig => config
 
-/**
- * This function is used to resolve the absolute path of a package.
- * It is needed in projects that use Yarn PnP or are set up within a monorepo.
- */
-function getAbsolutePath(value: string): string {
-	return dirname(require.resolve(join(value, 'package.json')))
-}
-const config: StorybookConfig = {
+export default defineConfig({
 	stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
 	addons: [
-		getAbsolutePath('@storybook/addon-onboarding'),
-		getAbsolutePath('@storybook/addon-links'),
-		getAbsolutePath('@storybook/addon-essentials'),
-		getAbsolutePath('@chromatic-com/storybook'),
-		getAbsolutePath('@storybook/addon-interactions'),
-		getAbsolutePath('@storybook/addon-themes'),
-		getAbsolutePath('@storybook/addon-a11y'),
+		 '@storybook/addon-onboarding',
+		 '@storybook/addon-links',
+		 '@storybook/addon-essentials',
+		 '@chromatic-com/storybook',
+		 '@storybook/addon-interactions',
+		 '@storybook/addon-themes',
+		 '@storybook/addon-a11y',
 	],
 	framework: {
-		name: getAbsolutePath('@storybook/react-vite') as '@storybook/react-vite',
+		name: '@storybook/react-vite',
 		options: {
 			strictMode: true,
 		},
@@ -35,6 +27,4 @@ const config: StorybookConfig = {
 	typescript: {
 		reactDocgen: 'react-docgen-typescript',
 	},
-}
-
-export default config
+})