diff --git a/Dockerfile b/Dockerfile index ae5e2bc..f5a2dc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,13 @@ COPY . . # Build your application. RUN npm run build +ARG POCKETBASE_URL +ARG PORT=4321 # Set environment variables and expose the appropriate port. ENV HOST=0.0.0.0 -ENV PORT=4321 -EXPOSE 4321 +ENV PORT=${PORT} +ENV POCKETBASE_URL=${POCKETBASE_URL} +EXPOSE ${PORT} # Define the command to run your application. CMD node ./dist/server/entry.mjs \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0d9b5f2..910252e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,12 +14,13 @@ "@astrojs/tailwind": "^5.1.0", "@types/react": "^18.3.2", "@types/react-dom": "^18.3.0", - "astro": "^4.11.3", + "astro": "^4.12.2", "nanostores": "^0.10.3", - "pocketbase": "^0.21.2", + "pocketbase": "^0.21.3", "react": "^18.3.1", "react-dom": "^18.3.1", "react-icons": "^5.2.1", + "rimraf": "^6.0.1", "tailwindcss": "^3.4.3", "typescript": "^5.4.5" }, @@ -2120,9 +2121,9 @@ } }, "node_modules/astro": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/astro/-/astro-4.12.1.tgz", - "integrity": "sha512-KwBoXYL4L1XLTTjoj4z6q1g/tZfWDKR1pKSTAshVqt5FH2eu82pnGW737SxcT/Ssg/hLlb9KnWiclXmqWpcbCQ==", + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/astro/-/astro-4.12.2.tgz", + "integrity": "sha512-l6OmqlL+FiuSi9x6F+EGZitteOznq1JffOil7st7cdqeMCTEIym4oagI1a6zp6QekliKWEEZWdplGhgh1k1f7Q==", "dependencies": { "@astrojs/compiler": "^2.9.0", "@astrojs/internal-helpers": "0.4.1", @@ -5824,6 +5825,100 @@ "node": ">=0.10.0" } }, + "node_modules/rimraf": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz", + "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==", + "dependencies": { + "glob": "^11.0.0", + "package-json-from-dist": "^1.0.0" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", + "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/jackspeak": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", + "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/rimraf/node_modules/lru-cache": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", + "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/path-scurry": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "dependencies": { + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/rollup": { "version": "4.18.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.1.tgz", diff --git a/package.json b/package.json index 13ac097..8f6891b 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "astro dev", "start": "astro dev", - "build": "astro check && astro build", + "build": "rimraf dist && astro check && astro build", "preview": "astro preview", "astro": "astro" }, @@ -16,12 +16,13 @@ "@astrojs/tailwind": "^5.1.0", "@types/react": "^18.3.2", "@types/react-dom": "^18.3.0", - "astro": "^4.11.3", + "astro": "^4.12.2", "nanostores": "^0.10.3", - "pocketbase": "^0.21.2", + "pocketbase": "^0.21.3", "react": "^18.3.1", "react-dom": "^18.3.1", "react-icons": "^5.2.1", + "rimraf": "^6.0.1", "tailwindcss": "^3.4.3", "typescript": "^5.4.5" }, @@ -31,4 +32,4 @@ "prettier-plugin-tailwindcss": "^0.5.14", "sass": "^1.77.3" } -} \ No newline at end of file +} diff --git a/src/components/IndexSidebar.astro b/src/components/IndexSidebar.astro index b3b7169..a15e21e 100644 --- a/src/components/IndexSidebar.astro +++ b/src/components/IndexSidebar.astro @@ -33,10 +33,6 @@ const {} = Astro.props; config.socials && config.socials.map((s) => ( - // - // {/* {s.name} */} - // {s.name} - // )) } diff --git a/src/components/Sidebar.astro b/src/components/Sidebar.astro index 1039f13..faddd5e 100644 --- a/src/components/Sidebar.astro +++ b/src/components/Sidebar.astro @@ -26,14 +26,10 @@ const {} = Astro.props; config.socials && config.socials.map((s) => ( - // - // {/* {s.name} */} - // {s.name} - // )) }
- +