diff options
| -rw-r--r-- | .meteor/packages | 1 | ||||
| -rw-r--r-- | .meteor/release | 2 | ||||
| -rw-r--r-- | .meteor/versions | 7 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | rebuild-wekan.bat | 4 | ||||
| -rwxr-xr-x | rebuild-wekan.sh | 4 | ||||
| -rw-r--r-- | snapcraft.yaml | 2 | ||||
| -rwxr-xr-x | stacksmith/user-scripts/build.sh | 2 |
9 files changed, 14 insertions, 12 deletions
diff --git a/.meteor/packages b/.meteor/packages index c2ebf4bf..c82c3c1b 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -10,6 +10,7 @@ ecmascript@0.14.0 standard-minifier-css@1.6.0 standard-minifier-js@2.6.0 mquandalle:jade +coffeescript@2.4.1! # Polyfills es5-shim@4.8.0 diff --git a/.meteor/release b/.meteor/release index c6ae8ec1..e9a1ca98 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.9 +METEOR@1.9.1 diff --git a/.meteor/versions b/.meteor/versions index 01593982..0df36679 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -12,7 +12,7 @@ allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 audit-argument-checks@1.0.7 autoupdate@1.6.0 -babel-compiler@7.5.1 +babel-compiler@7.5.2 babel-runtime@1.5.0 base64@1.0.12 binary-heap@1.0.11 @@ -45,7 +45,8 @@ cfs:worker@0.1.5 check@1.3.1 chuangbo:cookie@1.1.0 coagmano:stylus@2.0.0 -coffeescript@1.0.17 +coffeescript@2.4.1 +coffeescript-compiler@2.4.1 cottz:publish-relations@2.0.8 dburles:collection-helpers@1.1.0 ddp@1.4.0 @@ -57,7 +58,7 @@ deps@1.0.12 diff-sequence@1.1.1 dynamic-import@0.5.1 easylogic:summernote@0.8.8 -ecmascript@0.14.1 +ecmascript@0.14.2 ecmascript-runtime@0.7.0 ecmascript-runtime-client@0.10.0 ecmascript-runtime-server@0.9.0 @@ -6,7 +6,7 @@ LABEL maintainer="wekan" # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \ DEBUG=false \ - NODE_VERSION=v12.15.0 \ + NODE_VERSION=v12.16.1 \ METEOR_RELEASE=1.9.0 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ diff --git a/docker-compose.yml b/docker-compose.yml index 1aee54c9..dea7873f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,7 +93,7 @@ services: #------------------------------------------------------------------------------------- # ==== MONGODB AND METEOR VERSION ==== # a) For Wekan Meteor 1.8.x version at master branch, use mongo 4.x - image: mongo:4.2.2 + image: mongo:latest # b) For Wekan Meteor 1.6.x version at devel branch. # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x #image: mongo:3.2.21 diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index 08c6d057..0a9a8eac 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -18,8 +18,8 @@ REM Install chocolatey choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor
-curl -O https://nodejs.org/dist/v8.17.0/node-v12.15.0-x64.msi
-call node-v12.15.0-x64.msi
+curl -O https://nodejs.org/dist/v12.16.1/node-v12.16.1-x64.msi
+call node-v12.16.1-x64.msi
call npm config -g set msvs_version 2015
call meteor npm config -g set msvs_version 2015
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index f068059e..957e634f 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -5,7 +5,7 @@ echo " with 'sudo dpkg-reconfigure locales' , so that MongoDB works correct echo " You can still use any other locale as your main locale." #Below script installs newest node 8.x for Debian/Ubuntu/Mint. -#NODE_VERSION=12.15.0 +#NODE_VERSION=12.16.1 #X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz" function pause(){ @@ -79,7 +79,7 @@ do curl -0 -L https://npmjs.org/install.sh | sudo sh sudo chown -R $(id -u):$(id -g) $HOME/.npm sudo npm -g install n - sudo n 12.15.0 + sudo n 12.16.1 #curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - #sudo apt-get install -y nodejs elif [[ "$OSTYPE" == "darwin"* ]]; then diff --git a/snapcraft.yaml b/snapcraft.yaml index 254c84f7..2b6b1ef9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 12.15.0 + node-engine: 12.16.1 node-packages: - node-gyp - node-pre-gyp diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index bbedee35..00448514 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -2,7 +2,7 @@ set -euxo pipefail BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA" -NODE_VERSION=v12.15.0 +NODE_VERSION=v12.16.1 #METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer USE_EDGE=false METEOR_EDGE=1.5-beta.17 |