Selaa lähdekoodia

Remove not needed packages. Upgrade packages. Update Sandstorm capnp path.
Note: This version does not work on Sandstorm yet.

Lauri Ojansivu 7 vuotta sitten
vanhempi
sitoutus
ba9e163dd5
4 muutettua tiedostoa jossa 9 lisäystä ja 14 poistoa
  1. 1 0
      .meteor/packages
  2. 3 3
      .meteor/versions
  3. 1 1
      sandstorm.js
  4. 4 10
      snapcraft.yaml

+ 1 - 0
.meteor/packages

@@ -81,3 +81,4 @@ horka:swipebox
 dynamic-import
 staringatlights:fast-render
 staringatlights:flow-router
+

+ 3 - 3
.meteor/versions

@@ -93,7 +93,7 @@ meteorspark:util@0.2.0
 minifier-css@1.2.16
 minifier-js@2.2.2
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.4.2
+minimongo@1.4.3
 mobile-status-bar@1.0.14
 modules@0.11.0
 modules-runtime@0.9.1
@@ -119,7 +119,7 @@ ordered-dict@1.0.9
 peerlibrary:assert@0.2.5
 peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
-peerlibrary:computed-field@0.6.1
+peerlibrary:computed-field@0.7.0
 peerlibrary:reactive-field@0.3.0
 perak:markdown@1.0.5
 promise@0.10.0
@@ -137,7 +137,7 @@ seriousm:emoji-continued@1.4.0
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
-shell-server@0.3.0
+shell-server@0.3.1
 simple:authenticate-user-by-token@1.0.1
 simple:json-routes@2.1.0
 simple:rest-accounts-password@1.1.2

+ 1 - 1
sandstorm.js

@@ -22,7 +22,7 @@ const sandstormBoard = {
 
 if (isSandstorm && Meteor.isServer) {
   const fs = require('fs');
-  const Capnp = require('capnp');
+  const Capnp = require("/node_modules/capnp.js");
   const Package = Capnp.importSystem('sandstorm/package.capnp');
   const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp');
   const Identity = Capnp.importSystem('sandstorm/identity.capnp');

+ 4 - 10
snapcraft.yaml

@@ -70,12 +70,12 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 4.8.4
+        node-engine: 6.12
         node-packages:
-            - npm@4.6.1
+            - npm@5.6.0
             - node-gyp
             - node-pre-gyp
-            - fibers@1.0.15
+            - fibers@2.0.0
         build-packages:
             - python
             - g++
@@ -88,16 +88,10 @@ parts:
             rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
             echo "installing meteor first"
             curl https://install.meteor.com/ -o install_meteor.sh
-            sed -i "s|RELEASE=.*|RELEASE=\"1.4.4.1\"|g" install_meteor.sh
+            sed -i "s|RELEASE=.*|RELEASE=\"1.6\"|g" install_meteor.sh
             chmod +x install_meteor.sh
             sh install_meteor.sh
             rm install_meteor.sh
-            mkdir packages
-            cd packages
-            git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
-            git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
-            sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/.meteor/packages/meteor-useraccounts-core/package.js
-            cd ..
         build: |
             rm -rf package-lock.json .build
             meteor add standard-minifier-js --allow-superuser