From 0460a7d9d3219ed7ba5aa5040349b9d56e6a45e0 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sun, 6 Feb 2022 11:03:04 +0200
Subject: [PATCH] Added building fibers.

Thanks to xet7 !
---
 .devcontainer/Dockerfile         | 4 +++-
 .devcontainer/build.sh           | 2 ++
 Dockerfile                       | 3 +++
 rebuild-wekan.sh                 | 2 ++
 snapcraft.yaml                   | 5 ++++-
 stacksmith/user-scripts/build.sh | 3 +++
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 74750be49..0a650ec1b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -238,7 +238,9 @@ RUN \
     set -o xtrace && \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     chmod u+w package.json npm-shrinkwrap.json && \
-    npm install
+    npm install && \
+    cd node_modules/fibers && \
+    node build.js
 
 USER root
 # Cleanup
diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
index e5343cab5..e6c89f78c 100644
--- a/.devcontainer/build.sh
+++ b/.devcontainer/build.sh
@@ -9,4 +9,6 @@ cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/pa
 cd .build/bundle/programs/server
 rm -rf node_modules
 /home/wekan/.meteor/meteor npm install
+cd node_modules/fibers
+node build.js
 cd /home/wekan/app
diff --git a/Dockerfile b/Dockerfile
index 114ce775c..575604f4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -307,6 +307,9 @@ RUN \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     chmod u+w *.json && \
     gosu wekan:wekan npm install && \
+    cd node_modules/fibers && \
+    node build.js && \
+    cd ../.. && \
     #gosu wekan:wekan npm install bcrypt && \
     # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
     rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh
index d764c4f2f..9bf23c9ef 100755
--- a/rebuild-wekan.sh
+++ b/rebuild-wekan.sh
@@ -93,6 +93,8 @@ do
 		rm -rf node_modules
                 chmod u+w *.json
 		meteor npm install
+		cd node_modules/fibers
+		node build.js
 		# Cleanup
 		popd
 		find . -type d -name '*-garbage*' | xargs rm -rf
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 24e382bd5..f42df3e05 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -86,6 +86,7 @@ parts:
             - node-pre-gyp
             - fibers
         build-packages:
+            - build-essential
             - ca-certificates
             - apt-utils
             - python
@@ -118,7 +119,9 @@ parts:
             cd .build/bundle/programs/server
             chmod u+w *.json
             npm install
-            cd ../../../..
+            cd node_modules/fibers
+            node build.js
+            cd ../../../../../..
             # Cleanup
             cd .build/bundle
             find . -type d -name '*-garbage*' | xargs rm -rf
diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh
index 4d98fdc7c..23a79df02 100755
--- a/stacksmith/user-scripts/build.sh
+++ b/stacksmith/user-scripts/build.sh
@@ -79,6 +79,9 @@ sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/raj
 rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy
 cd /home/wekan/app_build/bundle/programs/server/
 sudo npm install
+cd node_modules/fibers
+node build.js
+cd ../..
 sudo chown -R wekan:wekan ./node_modules
 
 #cd /home/wekan/app_build/bundle