[WIP] Figuring out updating to a new version of Angular-Meteor and Me…

…teor

.meteor/.finished-upgraders

@@ -10,3 +10,6 @@ notices-for-facebook-graph-api-2
 1.2.0-meteor-platform-split
 1.2.0-cordova-changes
 1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package

.meteor/packages

@@ -5,27 +5,30 @@
 # but you can also edit it by hand.
 
 angularui:angular-ui-router
-accounts-password
-accounts-base
-less
+accounts-password@1.3.0
+accounts-base@1.2.11
+less@2.7.5_1
 tmeasday:publish-counts
-email
+email@1.1.17_1
 u2622:persistent-session
-[email protected]
-standard-minifiers
-meteor-base
-mobile-experience
-mongo
-session
-jquery
-tracker
-logging
-reload
-random
-ejson
-spacebars
-check
+[email protected]
+[email protected]
+[email protected]_1
+[email protected]
+[email protected]
+[email protected]
+[email protected]_1
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 kenton:accounts-sandstorm
-angular-meteor-auth
 divramod:angular-markdown-directive
 angular:angular-sanitize
+standard-minifier-css
+standard-minifier-js
+shell-server
+angular-templates
+angular-meteor-auth
+pbastowski:angular-babel

.meteor/release

@@ -1 +1 @@
-METEOR@1.2.1
+METEOR@1.4.1.2

.meteor/versions

@@ -1,90 +1,94 @@
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-angular:[email protected]
-angular:[email protected]
+[email protected]
+[email protected]
+[email protected]
+angular:[email protected]_1
+angular:[email protected]_1
 angularui:[email protected]
-[email protected].4
-babel-compiler@5.8.24_1
-[email protected].4
-[email protected].4
+[email protected].11
+babel-compiler@6.9.1_1
+[email protected].11_1
+[email protected].9
 benjamine:[email protected]_1
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]_1
+[email protected]
+[email protected]
 dburles:[email protected]
-[email protected].2
-[email protected].1
-[email protected].2
-[email protected].0
-[email protected].2
-[email protected].9
-[email protected].1
+[email protected].5
+[email protected].9
+[email protected].6
+[email protected].5
+[email protected].10
+[email protected].12
+[email protected].6
 divramod:[email protected]
-ecmascript@0.1.6
-ecmascript-runtime@0.2.6
-[email protected].7
-email@1.0.8
-[email protected].7
-[email protected].4
-[email protected].0
-[email protected].5
-[email protected].5
-[email protected].1
-[email protected].4
-[email protected].4
-kenton:accounts-sandstorm@0.4.0
+ecmascript@0.5.8_1
+ecmascript-runtime@0.3.14_1
+[email protected].12
+email@1.1.17_1
+[email protected].12
+[email protected].9
+[email protected].4
+[email protected].11
+[email protected].11
+[email protected].8
+[email protected].8
+[email protected].9
+kenton:accounts-sandstorm@0.5.1
 lai:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]_2
-[email protected]_1
-[email protected]
-[email protected]
-pbastowski:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-tmeasday:[email protected]
-[email protected]
+[email protected]
+[email protected]_1
+[email protected]
+[email protected]
+[email protected]_1
+[email protected]
+[email protected]_1
+[email protected]
+[email protected]_1
+[email protected]_1
+[email protected]
+[email protected]
+[email protected]
+[email protected]_1
+[email protected]_1
+[email protected]_1
+[email protected]
+[email protected]_1
+[email protected]
+[email protected]
+[email protected]
+pbastowski:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]_1
+tmeasday:[email protected]
+[email protected]
 u2622:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+urigo:[email protected]
+[email protected]
+[email protected]_1
+[email protected]

.sandstorm/.vagrant/machines/default/virtualbox/action_provision

@@ -1 +1 @@
-1.5:ced2c54e-1492-40d7-bba0-c13cd796cd7e
+1.5:567399dd-0152-4bf4-b2f5-7d04b9ee82a9

.sandstorm/.vagrant/machines/default/virtualbox/action_set_name

@@ -1 +1 @@
-1471395514
+1475875886

.sandstorm/.vagrant/machines/default/virtualbox/id

@@ -1 +1 @@
-ced2c54e-1492-40d7-bba0-c13cd796cd7e
+567399dd-0152-4bf4-b2f5-7d04b9ee82a9

.sandstorm/.vagrant/machines/default/virtualbox/index_uuid

@@ -1 +1 @@
-5a790573c07949299c30c21468527c88
+e1d7470426a64ac2b5a14de4d7b2ee19

.sandstorm/.vagrant/machines/default/virtualbox/private_key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

.sandstorm/setup.sh

@@ -1,11 +1,18 @@
 #!/bin/bash
+
+# Install a C++ compiler so that when 'npm build' tries to build the 'fibers' package,
+# it can do so.
+export DEBIAN_FRONTEND=noninteractive
+apt-get update
+apt-get install -y build-essential
+
 set -euo pipefail
 
 CURL_OPTS="--silent --show-error"
 
 cd /opt/
 
-PACKAGE=meteor-spk-0.1.8
+PACKAGE=meteor-spk-0.3.0
 PACKAGE_FILENAME="$PACKAGE.tar.xz"
 CACHE_TARGET="/host-dot-sandstorm/caches/${PACKAGE_FILENAME}"
 
@@ -32,7 +39,7 @@ cp -a /lib/x86_64-linux-gnu/libtinfo.so.* /opt/meteor-spk/meteor-spk.deps/lib/x8
 # Unfortunately, Meteor does not explicitly make it easy to cache packages, but
 # we know experimentally that the package is mostly directly extractable to a
 # user's $HOME/.meteor directory.
-METEOR_RELEASE=1.1.0.2
+METEOR_RELEASE=1.4.1.2
 METEOR_PLATFORM=os.linux.x86_64
 METEOR_TARBALL_FILENAME="meteor-bootstrap-${METEOR_PLATFORM}.tar.gz"
 METEOR_TARBALL_URL="https://d3sqy0vbqsdhku.cloudfront.net/packages-bootstrap/${METEOR_RELEASE}/${METEOR_TARBALL_FILENAME}"

client/index.html

@@ -9,9 +9,7 @@
       <div class="admin" ng-if="is_admin">
         <a href="/">survey</a>
         <a href="/manage">manage</a>
-        <a ng-if="!on_sandstorm" href="/admin">admin</a>
       </div>
-      <div ng-show="on_sandstorm === false" mr-account-buttons></div>
 
     </div>
     <div ui-view

client/js/lib/app.js

@@ -1,5 +1,7 @@
+import angularMeteor from 'angular-meteor';
+
 angular.module('quick-survey', [
-  'angular-meteor',
+  angularMeteor,
   'angular-meteor.auth',
   'ui.router',
   'ngSanitize',

client/js/navbar/navBarCtrl.ng.js

@@ -2,5 +2,4 @@
 angular.module('quick-survey').controller('NavBarCtrl',
   function ($scope, $state, $rootScope) {
     $scope.state = $state;
-
   });