From 785f3cf88b61f687ef5ad4a529768221d1a54c86 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 10 Jan 2020 00:04:43 +0200 Subject: Upgrade to Meteor 1.9, Node 12.14.1 and MongoDB 4.2.2. Thanks to xet7 ! --- .meteor/packages | 8 ++++---- .meteor/release | 2 +- .meteor/versions | 32 ++++++++++++++++---------------- Dockerfile | 4 ++-- docker-compose.yml | 2 +- rebuild-wekan.bat | 4 ++-- rebuild-wekan.sh | 4 ++-- snapcraft.yaml | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 8d25f206..c2ebf4bf 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -6,9 +6,9 @@ meteor-base@1.4.0 # Build system -ecmascript@0.13.2 -standard-minifier-css@1.5.4 -standard-minifier-js@2.5.2 +ecmascript@0.14.0 +standard-minifier-css@1.6.0 +standard-minifier-js@2.6.0 mquandalle:jade # Polyfills @@ -22,7 +22,7 @@ dburles:collection-helpers idmontie:migrations matb33:collection-hooks matteodem:easy-search -mongo@1.7.0 +mongo@1.8.0 mquandalle:collection-mutations # Account system diff --git a/.meteor/release b/.meteor/release index bfccdc2c..c6ae8ec1 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.8.3 +METEOR@1.9 diff --git a/.meteor/versions b/.meteor/versions index ce5a6635..fe85ab0a 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,5 +1,5 @@ 3stack:presence@1.1.2 -accounts-base@1.4.5 +accounts-base@1.5.0 accounts-oauth@1.1.16 accounts-password@1.5.2 aldeed:collection2@2.10.0 @@ -12,8 +12,8 @@ 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.4.2 -babel-runtime@1.4.0 +babel-compiler@7.5.0 +babel-runtime@1.5.0 base64@1.0.12 binary-heap@1.0.11 blaze@2.3.4 @@ -23,7 +23,7 @@ browser-policy-common@1.0.11 browser-policy-framing@1.1.0 caching-compiler@1.2.1 caching-html-compiler@1.1.3 -callback-hook@1.2.0 +callback-hook@1.3.0 cfs:access-point@0.1.49 cfs:base-package@0.0.30 cfs:collection@0.5.5 @@ -57,10 +57,10 @@ deps@1.0.12 diff-sequence@1.1.1 dynamic-import@0.5.1 easylogic:summernote@0.8.8 -ecmascript@0.13.2 +ecmascript@0.14.0 ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.9.0 -ecmascript-runtime-server@0.8.0 +ecmascript-runtime-client@0.10.0 +ecmascript-runtime-server@0.9.0 ejson@1.1.1 email@1.2.3 es5-shim@4.8.0 @@ -101,16 +101,16 @@ meteorhacks:collection-utils@1.2.0 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 meteorspark:util@0.2.0 -minifier-css@1.4.3 -minifier-js@2.5.1 +minifier-css@1.5.0 +minifier-js@2.6.0 minifiers@1.1.8-faster-rebuild.0 minimongo@1.4.5 mobile-status-bar@1.0.14 modern-browsers@0.1.4 -modules@0.14.0 -modules-runtime@0.11.0 +modules@0.15.0 +modules-runtime@0.12.0 momentjs:moment@2.24.0 -mongo@1.7.0 +mongo@1.8.0 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 mongo-id@1.0.7 @@ -127,7 +127,7 @@ mquandalle:mousetrap-bindglobal@0.0.1 mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.8.0 npm-bcrypt@0.9.3 -npm-mongo@3.2.0 +npm-mongo@3.3.0 oauth@1.2.8 oauth2@1.2.1 observe-sequence@1.0.16 @@ -167,8 +167,8 @@ softwarerero:accounts-t9n@1.3.11 spacebars@1.0.15 spacebars-compiler@1.1.3 srp@1.0.12 -standard-minifier-css@1.5.4 -standard-minifier-js@2.5.2 +standard-minifier-css@1.6.0 +standard-minifier-js@2.6.0 staringatlights:fast-render@3.2.0 staringatlights:inject-data@2.3.0 tap:i18n@1.8.2 @@ -186,7 +186,7 @@ useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 -webapp@1.7.5 +webapp@1.8.0 webapp-hashing@1.0.9 wekan-accounts-cas@0.1.0 wekan-accounts-oidc@1.0.10 diff --git a/Dockerfile b/Dockerfile index 62c60390..4d173306 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ 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=v8.17.0 \ - METEOR_RELEASE=1.8.1 \ + NODE_VERSION=v12.14.1 \ + METEOR_RELEASE=1.9.0 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ NPM_VERSION=latest \ diff --git a/docker-compose.yml b/docker-compose.yml index b33bda24..4e4fcc9d 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.0.12 + image: mongo:4.2.2 # 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 486289c1..652b99ac 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -13,8 +13,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-v8.17.0-x64.msi -call node-v8.17.0-x64.msi +curl -O https://nodejs.org/dist/v8.17.0/node-v12.14.1-x64.msi +call node-v12.14.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 03279ce7..7e61854e 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=8.16.0 +#NODE_VERSION=12.14.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 8.17.0 + sudo n 12.14.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 2f965fe1..8973b9d9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -65,7 +65,7 @@ apps: parts: mongodb: - source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.2.2.tgz plugin: dump stage-packages: [libssl1.0.0] filesets: @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 8.17.0 + node-engine: 12.14.1 node-packages: - node-gyp - node-pre-gyp -- cgit v1.2.3-1-g7c22