From 5fd2016730cdf2356a9e3a6b87fdd77abbbf6be5 Mon Sep 17 00:00:00 2001 From: Adam Harris Date: Wed, 13 Jan 2016 23:07:49 -0800 Subject: [PATCH 1/2] Adds missing 'random' dependency to package tests, and updates package.js to 1.2-compatible syntax --- .npm/package/.gitignore | 1 + .npm/package/README | 7 +++++++ .npm/package/npm-shrinkwrap.json | 7 +++++++ package.js | 25 ++++++++++++------------- 4 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 .npm/package/.gitignore create mode 100644 .npm/package/README create mode 100644 .npm/package/npm-shrinkwrap.json diff --git a/.npm/package/.gitignore b/.npm/package/.gitignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.npm/package/.gitignore @@ -0,0 +1 @@ +node_modules diff --git a/.npm/package/README b/.npm/package/README new file mode 100644 index 0000000..3d49255 --- /dev/null +++ b/.npm/package/README @@ -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. diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json new file mode 100644 index 0000000..2f8a456 --- /dev/null +++ b/.npm/package/npm-shrinkwrap.json @@ -0,0 +1,7 @@ +{ + "dependencies": { + "path-to-regexp": { + "version": "1.0.1" + } + } +} diff --git a/package.js b/package.js index c8e4638..3207dc5 100644 --- a/package.js +++ b/package.js @@ -1,35 +1,34 @@ Package.describe({ - "summary": "Server Side Router for Meteor", - "version": "1.0.3", - "git": "https://github.com/meteorhacks/picker.git", - "name": "meteorhacks:picker" + name: 'meteorhacks:picker', + summary: 'Server Side Router for Meteor', + version: '1.0.3', + git: 'https://github.com/meteorhacks/picker.git' }); Npm.depends({ - "path-to-regexp": "1.0.1" + 'path-to-regexp': '1.0.1' }); -Package.on_use(function(api) { +Package.onUse(function(api) { configurePackage(api); api.export(['Picker']); }); -Package.on_test(function(api) { +Package.onTest(function(api) { configurePackage(api); - - api.use(['tinytest', 'http'], ['server']); - api.add_files([ + api.use(['tinytest', 'http', 'random'], ['server']); + api.addFiles([ 'test/instance.js' ], ['server']); }); function configurePackage(api) { if(api.versionsFrom) { - api.versionsFrom('METEOR@0.9.0'); + api.versionsFrom('METEOR@1.2'); } - + api.use(['webapp', 'underscore'], ['server']); - api.add_files([ + api.addFiles([ 'lib/implementation.js', 'lib/instance.js', ], ['server']); From c1cc969aa2bb37769e1ee3c73f18ad0bd93a6bca Mon Sep 17 00:00:00 2001 From: Adam Harris Date: Wed, 13 Jan 2016 23:08:49 -0800 Subject: [PATCH 2/2] Updates path-to-regexp to v1.2.1 for consistency --- .npm/package/npm-shrinkwrap.json | 7 ++++++- package.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json index 2f8a456..a8981d5 100644 --- a/.npm/package/npm-shrinkwrap.json +++ b/.npm/package/npm-shrinkwrap.json @@ -1,7 +1,12 @@ { "dependencies": { "path-to-regexp": { - "version": "1.0.1" + "version": "1.2.1", + "dependencies": { + "isarray": { + "version": "0.0.1" + } + } } } } diff --git a/package.js b/package.js index 3207dc5..427e3cb 100644 --- a/package.js +++ b/package.js @@ -6,7 +6,7 @@ Package.describe({ }); Npm.depends({ - 'path-to-regexp': '1.0.1' + 'path-to-regexp': '1.2.1' }); Package.onUse(function(api) {