Skip to content

Commit

Permalink
upgrade to Meteor 0.9 (resolves #27)
Browse files Browse the repository at this point in the history
  • Loading branch information
seanrose committed Aug 28, 2014
1 parent 39dfb2b commit 40d99f8
Show file tree
Hide file tree
Showing 17 changed files with 260 additions and 99 deletions.
5 changes: 5 additions & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This file contains information which helps Meteor properly upgrade your
# app when you run 'meteor update'. You should check it into version control
# with your project.

notices-for-0.9.0
7 changes: 7 additions & 0 deletions .meteor/.id
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file contains a token that is unique to your project.
# Check it into your repository along with the rest of this directory.
# It can be used for purposes such as:
# - ensuring you don't accidentally deploy one app on top of another
# - providing package authors with aggregated statistics

59puyv187auw3btwm6l
18 changes: 10 additions & 8 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
# but you can also edit it by hand.

standard-app-packages
bootstrap-3
iron-router
jquery
viewer
iron-router-progress
filepicker
mrt:iron-router-progress@0.4.1
mrt:filepicker@0.4.0
http
cron
mrt:cron@0.0.1
force-ssl
npm
fastclick
kadira
meteorhacks:npm
percolatestudio:[email protected]
iron:router
mizzao:bootstrap-3


npm-container
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.3
[email protected]
1 change: 0 additions & 1 deletion packages.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"node-uuid": "1.4.0",
"sleep": "1.1.4",
"box-view": "0.1.8"
}
1 change: 1 addition & 0 deletions packages/npm-container/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.build*
1 change: 1 addition & 0 deletions packages/npm-container/.npm/package/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
7 changes: 7 additions & 0 deletions packages/npm-container/.npm/package/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This directory and the files immediately inside it are automatically generated
when you change this package's NPM dependencies. Commit the files in this
directory (npm-shrinkwrap.json, .gitignore, and this README) to source control
so that others run the same versions of sub-dependencies.

You should NOT check in the node_modules directory that Meteor automatically
creates; if you are using git, the .gitignore file tells git to ignore it.
105 changes: 105 additions & 0 deletions packages/npm-container/.npm/package/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions packages/npm-container/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Meteor.npmRequire = function(moduleName) { // 74
var module = Npm.require(moduleName); // 75
return module; // 76
}; // 77
// 78
Meteor.require = function(moduleName) { // 79
console.warn('Meteor.require is deprecated. Please use Meteor.npmRequire instead!'); // 80
return Meteor.npmRequire(moduleName); // 81
}; // 82
21 changes: 21 additions & 0 deletions packages/npm-container/package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
var path = Npm.require('path'); // 86
var fs = Npm.require('fs'); // 87
// 88
Package.describe({ // 89
summary: 'Contains all your npm dependencies', // 90
version: '1.0.0', // 91
name: 'npm-container' // 92
}); // 93
// 94
var packagesJsonFile = path.resolve('./packages.json'); // 95
try { // 96
var fileContent = fs.readFileSync(packagesJsonFile); // 97
var packages = JSON.parse(fileContent.toString()); // 98
Npm.depends(packages); // 99
} catch(ex) { // 100
console.error('ERROR: packages.json parsing error [ ' + ex.message + ' ]'); // 101
} // 102
// 103
Package.onUse(function(api) { // 104
api.add_files(['index.js', '../../packages.json'], 'server'); // 105
}); // 106
15 changes: 15 additions & 0 deletions packages/npm-container/versions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"dependencies": [
[
"meteor",
"1.0.2"
],
[
"underscore",
"1.0.0"
]
],
"pluginDependencies": [],
"toolVersion": "[email protected]",
"format": "1.0"
}
19 changes: 19 additions & 0 deletions packages/viewer/versions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"dependencies": [
[
"jquery",
"1.0.0"
],
[
"meteor",
"1.0.2"
],
[
"underscore",
"1.0.0"
]
],
"pluginDependencies": [],
"toolVersion": "[email protected]",
"format": "1.0"
}
4 changes: 2 additions & 2 deletions server/api.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
function generateUUID() {
var nodeUUID = Meteor.require('node-uuid');
var nodeUUID = Meteor.npmRequire('node-uuid');
return nodeUUID.v4();
}

var boxViewClient = Meteor.require('box-view').createClient(Meteor.settings.box.token);
var boxViewClient = Meteor.npmRequire('box-view').createClient(Meteor.settings.box.token);
// Wrapped async methods from the Box View API
var documentsUploadURL = Async.wrap(boxViewClient.documents, 'uploadURL');
var sessionsCreate = Async.wrap(boxViewClient.sessions, 'create');
Expand Down
11 changes: 1 addition & 10 deletions smart.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
{
"packages": {
"bootstrap-3": {},
"iron-router": "0.8.2",
"iron-router-progress": {},
"filepicker": {},
"viewer": {
"path": "packages/viewer"
},
"cron": {},
"npm": {},
"fastclick": {},
"kadira": {},
"iron-router-ga": {}
}
}
}
Loading

0 comments on commit 40d99f8

Please sign in to comment.