Explorar o código

Fix Wekan not load at all in Firefox v.68 for Android.

Thanks to xet7 !

Closes #3021
Lauri Ojansivu %!s(int64=5) %!d(string=hai) anos
pai
achega
1235363465
Modificáronse 6 ficheiros con 13 adicións e 0 borrados
  1. 2 0
      Dockerfile
  2. 3 0
      rebuild-wekan.bat
  3. 2 0
      rebuild-wekan.sh
  4. 2 0
      releases/rebuild-release.sh
  5. 2 0
      snapcraft.yaml
  6. 2 0
      stacksmith/user-scripts/build.sh

+ 2 - 0
Dockerfile

@@ -271,6 +271,8 @@ RUN \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     cd /home/wekan/app_build/bundle/programs/server/ && \
     gosu wekan:wekan npm install && \
     gosu wekan:wekan npm install && \
     #gosu wekan:wekan npm install bcrypt && \
     #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 && \
     mv /home/wekan/app_build/bundle /build && \
     mv /home/wekan/app_build/bundle /build && \
     \
     \
     # Put back the original tar
     # Put back the original tar

+ 3 - 0
rebuild-wekan.bat

@@ -53,6 +53,9 @@ call meteor npm install
 REM del /S /F /Q .build
 REM del /S /F /Q .build
 call meteor build .build --directory
 call meteor build .build --directory
 copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js
 copy fix-download-unicode\cfs_access-point.txt .build\bundle\programs\server\packages\cfs_access-point.js
+REM ## Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+del /S /F /Q rm .build/bundle/programs/web.browser.legacy
+REM ## Install some NPM packages
 cd .build\bundle\programs\server
 cd .build\bundle\programs\server
 call meteor npm install
 call meteor npm install
 REM cd C:\repos\wekan\.meteor\local\build\programs\server
 REM cd C:\repos\wekan\.meteor\local\build\programs\server

+ 2 - 0
rebuild-wekan.sh

@@ -148,6 +148,8 @@ do
 		rm -rf .build
 		rm -rf .build
 		meteor build .build --directory
 		meteor build .build --directory
 		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
 		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+		rm -rf .build/bundle/programs/web.browser.legacy
 		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
 		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
 		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
 		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
 		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
 		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c

+ 2 - 0
releases/rebuild-release.sh

@@ -11,6 +11,8 @@ meteor npm install
 rm -rf .build
 rm -rf .build
 METEOR_PROFILE=100 meteor build .build --directory
 METEOR_PROFILE=100 meteor build .build --directory
 cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
 cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+# Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+rm -rf .build/bundle/programs/web.browser.legacy
 cd .build/bundle/programs/server
 cd .build/bundle/programs/server
 rm -rf node_modules
 rm -rf node_modules
 meteor npm install
 meteor npm install

+ 2 - 0
snapcraft.yaml

@@ -216,6 +216,8 @@ parts:
             #meteor npm install --save bcrypt
             #meteor npm install --save bcrypt
             # Change from npm-bcrypt directory back to .build/bundle/programs/server directory.
             # Change from npm-bcrypt directory back to .build/bundle/programs/server directory.
             #cd ../../../../
             #cd ../../../../
+            # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
+            rm -rf .build/bundle/programs/web.browser.legacy
             # Change to directory .build/bundle/programs/server
             # Change to directory .build/bundle/programs/server
             cd .build/bundle/programs/server
             cd .build/bundle/programs/server
             npm install
             npm install

+ 2 - 0
stacksmith/user-scripts/build.sh

@@ -75,6 +75,8 @@ sudo -u wekan ${meteor} build --directory /home/wekan/app_build
 sudo cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
 sudo cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
 sudo chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
 sudo chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js
 sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
 sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
+# 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
 cd /home/wekan/app_build/bundle/programs/server/
 cd /home/wekan/app_build/bundle/programs/server/
 sudo npm install
 sudo npm install
 sudo chown -R wekan:wekan ./node_modules
 sudo chown -R wekan:wekan ./node_modules