Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ indent_style = tab
indent_size = 4

# Markdown
[*.{md,markdown}]
[*.{md,markdown,mdoc}]
trim_trailing_whitespace = false
indent_style = space
indent_size = 2
Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"recommendations": [
"astro-build.astro-vscode"
"astro-build.astro-vscode",
"stripe.markdoc-language-support"
],
"unwantedRecommendations": []
}
9 changes: 6 additions & 3 deletions app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ FROM test_base AS test_unit
ARG UID

# Copy source code
RUN chown "${UID}:0" .
COPY --link --chown="${UID}:0" ./app/ ./

# Run as non-root user
Expand All @@ -156,6 +157,7 @@ COPY --from=deps_dev --link --chown="${UID}:0" /app/package.json /app/pnpm-lock.
RUN pnpm exec playwright install --with-deps

# Copy source code
RUN chown "${UID}:0" .
COPY --link --chown="${UID}:0" ./app/ ./

# Build application
Expand Down Expand Up @@ -183,20 +185,21 @@ COPY --from=deps_dev --link --chown="${UID}:0" /app/.astro/ ./.astro/
COPY --from=deps_dev --link --chown="${UID}:0" /app/node_modules/ ./node_modules/

# Copy source code
RUN chown "${UID}:0" .
COPY --link --chown="${UID}:0" ./app/ ./

# Create user 'user' in group 'root'
# (hadolint: Ignore unchecked pipe failures)
# hadolint ignore=DL4006
RUN USERNAME="$(getent passwd "${UID}" 2>/dev/null | cut -d: -f1)"; \
RUN USERNAME="$(getent passwd "${UID}" 2>/dev/null | cut -d: -f1 || true)"; \
if [ -z "${USERNAME}" ]; then \
useradd -lm -u "${UID}" -U -G 0 user; \
else \
usermod -a -G 0 "${USERNAME}"; \
fi

# Run as non-root user
USER ${UID}:0
# Run as created non-root user
USER ${UID}

# Set exposed port
ARG PORT=8080
Expand Down
8 changes: 7 additions & 1 deletion app/app/astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { defineConfig, envField } from 'astro/config'
import markdoc from '@astrojs/markdoc'
import tailwindcss from '@tailwindcss/vite'

import { i18n } from '/src/config'
Expand All @@ -10,7 +11,12 @@ export default defineConfig({
build: {
assetsPrefix: process.env.ASTRO_ASSETS_PREFIX || undefined,
},
integrations: [],
integrations: [
markdoc({
allowHTML: true,
ignoreIndentation: true,
}),
],
vite: {
plugins: [
tailwindcss(),
Expand Down
10 changes: 10 additions & 0 deletions app/app/markdoc.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { defineMarkdocConfig, nodes } from '@astrojs/markdoc/config'

export default defineMarkdocConfig({
nodes: {
document: {
...nodes.document,
render: null,
},
},
})
1 change: 1 addition & 0 deletions app/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"homepage": "https://github.com/FluffEvent/files-website#readme",
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/markdoc": "^0.15.8",
"@fontsource-variable/noto-serif": "^5.2.9",
"@iconify-json/mdi": "^1.2.3",
"@iconify-json/twemoji": "^1.2.4",
Expand Down
143 changes: 143 additions & 0 deletions app/app/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading