Deploy v3 (#386)

* fix: copy needed highlight sources

* chore: pnpm frozen lockfile

* deploy: remove s3 proxy

* upstream on everything

* test

Author: soyuka

api/Dockerfile

@@ -105,5 +105,5 @@ FROM caddy:2-alpine AS app_caddy
 WORKDIR /srv/app
 
 COPY --from=app_caddy_builder --link /usr/bin/caddy /usr/bin/caddy
-COPY --from=app_php --link /srv/app/public public/
+# COPY --from=app_php --link /srv/app/public public/
 COPY --link docker/caddy/Caddyfile /etc/caddy/Caddyfile

api/docker/caddy/Caddyfile

@@ -8,63 +8,10 @@
 log {
 	output file /var/log/caddy/access.log
 }
-# Matches requests for HTML documents, for static files and for Next.js files,
-# except for known API paths and paths with extensions handled by API Platform
-
-@pwa expression `path('/con/*','/con', '/fr/con/*', '/fr/con', '/en/con/*', '/en/con', '/favicon.ico', '/manifest.json', '/robots.txt', '/_next*', '/images*')`
-
-@bucket_s3 expression `(
-    path('/*')
-&& !path ('/con/*', '/con', '/fr/con/*', '/fr/con', '/en/con/*', '/en/con', '/favicon.ico', '/manifest.json', '/robots.txt', '/_next*', '/images/*')
-)`
-
-@withoutExtension not path_regexp \.\w+$
-@withTld path_regexp \.(org|io|fr|com|pl|me|de|gg|dev)$
-@withTrailingSlash path_regexp ^(.*)/+$
 
 route {
-    root * /srv/app/public
-    mercure {
-        # Transport to use (default to Bolt)
-        transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
-        # Publisher JWT key
-        publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
-        # Subscriber JWT key
-        subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
-        # Allow anonymous subscribers (double-check that it's what you want)
-        anonymous
-        # Enable the subscription API (double-check that it's what you want)
-        subscriptions
-        # Extra directives
-        {$MERCURE_EXTRA_DIRECTIVES}
-    }
-    vulcain
-
-    # Add links to the API docs and to the Mercure Hub if not set explicitly (e.g. the PWA)
-    header ?Link `</docs.jsonld>; rel="http://www.w3.org/ns/hydra/core#apiDocumentation", </.well-known/mercure>; rel="mercure"`
     # Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
     header ?Permissions-Policy "browsing-topics=()"
-    # Comment the following line if you don't want Next.js to catch requests for HTML documents.
-    # In this case, they will be handled by the PHP app.
-
-    reverse_proxy @pwa http://{$PWA_UPSTREAM}
-
-    handle @bucket_s3 {
-
-        reverse_proxy {$BUCKET_S3_UPSTREAM} {
-            header_up Host {http.reverse_proxy.upstream.hostport}
-        }
-
-        # Handles DocumentIndices
-        rewrite @withTld /{$BUCKET_S3_NAME}{path}/index.html
-        rewrite @withTrailingSlash /{$BUCKET_S3_NAME}{path}index.html
-        rewrite @withoutExtension /{$BUCKET_S3_NAME}{path}/index.html
-
-        # Everything else should be prefixed
-        rewrite * /{$BUCKET_S3_NAME}{path}
-    }
 
-    php_fastcgi unix//var/run/php/php-fpm.sock
-    encode zstd gzip
-    file_server
+    reverse_proxy http://{$PWA_UPSTREAM}
 }

pwa/Dockerfile

@@ -24,16 +24,15 @@ COPY pnpm-lock.yaml ./
 RUN pnpm fetch
 
 COPY --link . .
-RUN pnpm install -r --offline
-
+RUN pnpm install --offline --frozen-lock
 
 # Development image
 FROM deps as dev
 
 EXPOSE 3000
 ENV PORT 3000
 
-CMD ["sh", "-c", "pnpm install -r --offline; pnpm dev"]
+CMD ["sh", "-c", "pnpm install --offline --frozen-lock; pnpm dev"]
 
 
 FROM builder_base AS builder
@@ -46,7 +45,8 @@ RUN --mount=type=secret,id=GITHUB_KEY \
 		 echo "Please set the GITHUB_KEY secret" && exit 1 ; \
 	fi  \
 	&& pnpm run prebuild \
-	&& pnpm run build
+	&& pnpm run build \
+	&& pnpm run postbuild
 
 # Production image, copy all the files and run next
 FROM node:18-alpine AS prod
@@ -64,6 +64,7 @@ COPY --from=builder --link /srv/app/public ./public
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/standalone ./
+COPY --from=builder --link --chown=nextjs:nodejs /srv/app/public/* ./public/
 COPY --from=builder --link --chown=nextjs:nodejs /srv/app/.next/static ./.next/static
 
 USER nextjs

pwa/package.json

@@ -8,7 +8,8 @@
     "start": "next start",
     "lint": "next lint",
     "i18n": "ts-node ./update-i18n.ts; prettier ./i18n/dictionaries/*.json --write",
-    "prebuild": "ts-node ./prebuild.ts"
+    "prebuild": "ts-node ./prebuild.ts",
+    "postbuild": "ts-node ./postbuild.ts"
   },
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
@@ -54,6 +55,7 @@
     "@types/sharp": "^0.31.1",
     "@typescript-eslint/eslint-plugin": "^5.59.9",
     "autoprefixer": "^10.4.14",
+    "cpr": "^3.0.1",
     "encoding": "^0.1.13",
     "eslint": "^8.42.0",
     "eslint-config-next": "^13.4.4",

pwa/pnpm-lock.yaml

@@ -0,0 +1,11 @@
+const cpr = require("cpr");
+const path = require("path");
+
+cpr(path.join(__dirname, 'node_modules/shiki/themes'), path.join(__dirname, '.next/standalone/node_modules/shiki/themes'), function(err: any, files: any) {
+  err && console.error(err)
+});
+
+cpr(path.join(__dirname, 'node_modules/shiki/languages'), path.join(__dirname, '.next/standalone/node_modules/shiki/languages'), function(err: any, files: any) {
+  err && console.error(err)
+});
+