Skip to content

Commit

Permalink
commit
Browse files Browse the repository at this point in the history
  • Loading branch information
jarle committed Mar 17, 2024
1 parent 66f7165 commit 361d19f
Show file tree
Hide file tree
Showing 30 changed files with 1,122 additions and 35 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ yarn-error.log
# Platform specific
.DS_Store

screenshots/
screenshots/
public/assets/
171 changes: 155 additions & 16 deletions package-lock.json

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

1 change: 1 addition & 0 deletions packages/adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"@adonisjs/http-server": "^7.1.0",
"@adonisjs/prettier-config": "^1.3.0",
"@adonisjs/tsconfig": "^1.3.0",
"@adonisjs/vite": "^3.0.0-8",
"@japa/assert": "^2.1.0",
"@japa/expect": "^3.0.1",
"@japa/runner": "^3.1.1",
Expand Down
19 changes: 5 additions & 14 deletions packages/adapter/providers/remix_provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { RequestHandler, createRequestHandler } from '../src/remix_adapter.js'

import { HttpContext } from '@adonisjs/core/http'
import { ApplicationService } from '@adonisjs/core/types'
import { ViteDevServer } from 'vite'
import '../src/types/main.js'

declare module '@adonisjs/core/types' {
Expand All @@ -21,23 +20,15 @@ declare module '@adonisjs/core/http' {
export default class RemixProvider {
static needsApplication = true
private remixBundle = path.join(process.cwd(), 'build/remix/server/server.js')
private viteDevServer?: ViteDevServer

constructor(protected app: ApplicationService) {}

async ready() {
if (this.app.inDev && this.app.getEnvironment() === 'web') {
this.viteDevServer = await import('vite').then((vite) =>
vite.createServer({
server: { middlewareMode: true },
})
)
}
}

async boot() {
const build = this.viteDevServer
? () => this.viteDevServer?.ssrLoadModule('virtual:remix/server-build')
const vite = await this.app.container.make('vite')
// @ts-ignore
const devServer = vite.getDevServer()
const build = devServer
? () => devServer?.ssrLoadModule('virtual:remix/server-build')
: await import(this.remixBundle)
const requestHandler = createRequestHandler({
build,
Expand Down
10 changes: 10 additions & 0 deletions packages/reference-app/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/.git
/node_modules
.dockerignore
.env
Dockerfile
fly.toml

/.cache
/build
/public/build
63 changes: 63 additions & 0 deletions packages/reference-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# syntax = docker/dockerfile:1

# Adjust NODE_VERSION as desired
ARG NODE_VERSION=20.10.0
FROM node:${NODE_VERSION}-slim as base

LABEL fly_launch_runtime="AdonisJS"

# AdonisJS app lives here
WORKDIR /app

# Set production environment
ENV NODE_ENV="production"


# Throw-away build stage to reduce size of final image
FROM base as build

# Install packages needed to build node modules
RUN apt-get update -qq && \
apt-get install --no-install-recommends -y build-essential node-gyp pkg-config python-is-python3

# Install node modules
COPY --link package.json ./
RUN npm install --include=dev

# Copy application code
COPY --link . .

# Build application
RUN npm run build


# Final stage for app image
FROM base

# Install packages needed for deployment
RUN apt-get update -qq && \
apt-get install --no-install-recommends -y sqlite3 && \
rm -rf /var/lib/apt/lists /var/cache/apt/archives

# Copy built application
COPY --from=build /app /app

# Setup sqlite3 on a separate volume
RUN mkdir -p /data
VOLUME /data

# add shortcut for connecting to database CLI
RUN echo "#!/bin/sh\nset -x\nsqlite3 \$DATABASE_URL" > /usr/local/bin/database-cli && chmod +x /usr/local/bin/database-cli

# Entrypoint sets up the container.
ENTRYPOINT [ "/app/docker-entrypoint.js" ]

# Start the server by default, this can be overwritten at runtime
EXPOSE 3000
ENV CACHE_VIEWS="true" \
DATABASE_URL="file:///data/sqlite.db" \
DRIVE_DISK="local" \
HOST="0.0.0.0" \
PORT="3000" \
SESSION_DRIVER="cookie"
CMD [ "node", "/app/build/server.js" ]
Loading

0 comments on commit 361d19f

Please sign in to comment.