From 9df00e09a490e29a8233117fe3169746755f68c4 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Mon, 5 Oct 2020 23:51:29 +0200
Subject: [PATCH] root: fix static docker's rollup build

---
 passbook/static/static/package.json | 2 +-
 static.Dockerfile                   | 7 +++++--
 swagger.yaml                        | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/passbook/static/static/package.json b/passbook/static/static/package.json
index 551f79c8d..83ff04aaa 100644
--- a/passbook/static/static/package.json
+++ b/passbook/static/static/package.json
@@ -1,7 +1,7 @@
 {
   "license": "MIT",
   "scripts": {
-    "build": "rollup -c",
+    "build": "rollup -c ./rollup.config.js",
     "watch": "rollup -c -w"
   },
   "dependencies": {
diff --git a/static.Dockerfile b/static.Dockerfile
index 6d343f4d7..6c367189f 100644
--- a/static.Dockerfile
+++ b/static.Dockerfile
@@ -36,8 +36,10 @@ ENV PASSBOOK_POSTGRESQL__USER=passbook
 ENV PASSBOOK_POSTGRESQL__PASSWORD="EK-5jnKfjrGRm<77"
 RUN ./manage.py collectstatic --no-input
 
-FROM node as npm-packager
+FROM node as npm-builder
 
+COPY --from=static-build /app/static/src /static/src
+COPY --from=static-build /app/static/rollup.config.js /static/rollup.config.js
 COPY --from=static-build /app/static/package.json /static/package.json
 COPY --from=static-build /app/static/package-lock.json /static/package-lock.json
 
@@ -47,4 +49,5 @@ FROM nginx
 
 COPY --from=static-build /app/static /usr/share/nginx/html/static
 COPY --from=static-build /app/static/robots.txt /usr/share/nginx/html/robots.txt
-COPY --from=npm-packager /static/node_modules /usr/share/nginx/html/static/node_modules
+COPY --from=npm-builder /static/node_modules /usr/share/nginx/html/static/node_modules
+COPY --from=npm-builder /static/passbook/passbook.js* /usr/share/nginx/html/static/passbook/
diff --git a/swagger.yaml b/swagger.yaml
index ee0dcd8af..9797a8c3f 100755
--- a/swagger.yaml
+++ b/swagger.yaml
@@ -6036,12 +6036,12 @@ definitions:
           - login
           - login_failed
           - logout
-          - sign_up
-          - authorize_application
+          - user_write
           - suspicious_request
           - password_set
           - invitation_created
           - invitation_used
+          - authorize_application
           - source_linked
           - impersonation_started
           - impersonation_ended