forked from meteorhacks/kadira
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from KoenLav/fixed-meteorx-dependency
fixed-meteorx: Fixed MeteorX dependency
- Loading branch information
Showing
1 changed file
with
123 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| Package.describe({ | ||
| "summary": "Performance Monitoring for Meteor", | ||
| "version": "2.30.8", | ||
| "git": "https://github.com/lmachens/kadira.git", | ||
| "name": "lmachens:kadira" | ||
| summary: 'Performance Monitoring for Meteor', | ||
| version: '2.30.8', | ||
| git: 'https://github.com/lmachens/kadira.git', | ||
| name: 'lmachens:kadira', | ||
| }); | ||
|
|
||
| var npmModules = { | ||
| "debug": "0.7.4", | ||
| "kadira-core": "1.3.2", | ||
| "pidusage": "1.0.1", | ||
| "evloop-monitor": "0.1.0", | ||
| "pidusage": "0.1.1", | ||
| "lru-cache": "4.0.0", | ||
| "json-stringify-safe": "5.0.1" | ||
| const npmModules = { | ||
| debug: '0.7.4', | ||
| 'kadira-core': '1.3.2', | ||
| pidusage: '1.0.1', | ||
| 'evloop-monitor': '0.1.0', | ||
| pidusage: '0.1.1', | ||
| 'lru-cache': '4.0.0', | ||
| 'json-stringify-safe': '5.0.1', | ||
| }; | ||
|
|
||
| Npm.depends(npmModules); | ||
|
|
@@ -24,141 +24,139 @@ Package.on_use(function(api) { | |
|
|
||
| Package.on_test(function(api) { | ||
| configurePackage(api); | ||
| api.use([ | ||
| 'tinytest', | ||
| 'test-helpers' | ||
| ], ['client', 'server']); | ||
| api.use(['tinytest', 'test-helpers'], ['client', 'server']); | ||
|
|
||
| // common before | ||
| api.add_files([ | ||
| 'tests/models/base_error.js' | ||
| ], ['client', 'server']); | ||
| api.add_files(['tests/models/base_error.js'], ['client', 'server']); | ||
|
|
||
| // common server | ||
| api.add_files([ | ||
| 'tests/utils.js', | ||
| 'tests/ntp.js', | ||
| 'tests/jobs.js', | ||
| 'tests/_helpers/globals.js', | ||
| 'tests/_helpers/helpers.js', | ||
| 'tests/_helpers/init.js', | ||
| 'tests/ping.js', | ||
| 'tests/hijack/info.js', | ||
| 'tests/hijack/user.js', | ||
| 'tests/hijack/email.js', | ||
| 'tests/hijack/base.js', | ||
| 'tests/hijack/async.js', | ||
| 'tests/hijack/http.js', | ||
| 'tests/hijack/db.js', | ||
| 'tests/hijack/subscriptions.js', | ||
| 'tests/hijack/error.js', | ||
| 'tests/models/methods.js', | ||
| 'tests/models/pubsub.js', | ||
| 'tests/models/system.js', | ||
| 'tests/models/errors.js', | ||
| 'tests/tracer/tracer_store.js', | ||
| 'tests/tracer/tracer.js', | ||
| 'tests/tracer/default_filters.js', | ||
| 'tests/check_for_oplog.js', | ||
| 'tests/error_tracking.js', | ||
| 'tests/wait_time_builder.js', | ||
| 'tests/hijack/set_labels.js', | ||
| 'tests/environment_variables.js', | ||
| 'tests/docsize_cache.js', | ||
| ], 'server'); | ||
| api.add_files( | ||
| [ | ||
| 'tests/utils.js', | ||
| 'tests/ntp.js', | ||
| 'tests/jobs.js', | ||
| 'tests/_helpers/globals.js', | ||
| 'tests/_helpers/helpers.js', | ||
| 'tests/_helpers/init.js', | ||
| 'tests/ping.js', | ||
| 'tests/hijack/info.js', | ||
| 'tests/hijack/user.js', | ||
| 'tests/hijack/email.js', | ||
| 'tests/hijack/base.js', | ||
| 'tests/hijack/async.js', | ||
| 'tests/hijack/http.js', | ||
| 'tests/hijack/db.js', | ||
| 'tests/hijack/subscriptions.js', | ||
| 'tests/hijack/error.js', | ||
| 'tests/models/methods.js', | ||
| 'tests/models/pubsub.js', | ||
| 'tests/models/system.js', | ||
| 'tests/models/errors.js', | ||
| 'tests/tracer/tracer_store.js', | ||
| 'tests/tracer/tracer.js', | ||
| 'tests/tracer/default_filters.js', | ||
| 'tests/check_for_oplog.js', | ||
| 'tests/error_tracking.js', | ||
| 'tests/wait_time_builder.js', | ||
| 'tests/hijack/set_labels.js', | ||
| 'tests/environment_variables.js', | ||
| 'tests/docsize_cache.js', | ||
| ], | ||
| 'server' | ||
| ); | ||
|
|
||
| // common client | ||
| api.add_files([ | ||
| 'tests/client/utils.js', | ||
| 'tests/client/error_tracking.js', | ||
| 'tests/client/models/error.js', | ||
| 'tests/client/error_reporters/window_error.js', | ||
| 'tests/client/error_reporters/zone.js', | ||
| 'tests/client/error_reporters/meteor_debug.js', | ||
| ], 'client'); | ||
| api.add_files( | ||
| [ | ||
| 'tests/client/utils.js', | ||
| 'tests/client/error_tracking.js', | ||
| 'tests/client/models/error.js', | ||
| 'tests/client/error_reporters/window_error.js', | ||
| 'tests/client/error_reporters/zone.js', | ||
| 'tests/client/error_reporters/meteor_debug.js', | ||
| ], | ||
| 'client' | ||
| ); | ||
|
|
||
| // common after | ||
| api.add_files([ | ||
| 'tests/common/default_error_filters.js', | ||
| 'tests/common/send.js' | ||
| ], ['client', 'server']); | ||
| api.add_files(['tests/common/default_error_filters.js', 'tests/common/send.js'], ['client', 'server']); | ||
| }); | ||
|
|
||
| function configurePackage(api) { | ||
| if(api.versionsFrom) { | ||
| if (api.versionsFrom) { | ||
| api.versionsFrom('[email protected]'); | ||
| api.use('meteorhacks:meteorx@1.4.1', ['server']); | ||
| api.use('meteorhacks:[email protected]', {weak: true}); | ||
| api.use('lamhieu:meteorx@2.0.1', ['server']); | ||
| api.use('meteorhacks:[email protected]', { weak: true }); | ||
| } | ||
|
|
||
| api.use([ | ||
| 'minimongo', 'livedata', 'mongo-livedata', 'ejson', 'ddp-common', | ||
| 'underscore', 'http', 'email', 'random' | ||
| ], ['server']); | ||
| api.use(['minimongo', 'livedata', 'mongo-livedata', 'ejson', 'ddp-common', 'underscore', 'http', 'email', 'random'], ['server']); | ||
| api.use(['underscore', 'random', 'http', 'localstorage'], ['client']); | ||
|
|
||
| // common before | ||
| api.add_files([ | ||
| 'lib/common/unify.js', | ||
| 'lib/models/base_error.js' | ||
| ], ['client', 'server']); | ||
| api.add_files(['lib/common/unify.js', 'lib/models/base_error.js'], ['client', 'server']); | ||
|
|
||
| // only server | ||
| api.add_files([ | ||
| 'lib/jobs.js', | ||
| 'lib/retry.js', | ||
| 'lib/utils.js', | ||
| 'lib/ntp.js', | ||
| 'lib/wait_time_builder.js', | ||
| 'lib/check_for_oplog.js', | ||
| 'lib/tracer/tracer.js', | ||
| 'lib/tracer/default_filters.js', | ||
| 'lib/tracer/tracer_store.js', | ||
| 'lib/models/0model.js', | ||
| 'lib/models/methods.js', | ||
| 'lib/models/pubsub.js', | ||
| 'lib/models/system.js', | ||
| 'lib/models/errors.js', | ||
| 'lib/docsize_cache.js', | ||
| 'lib/kadira.js', | ||
| 'lib/hijack/wrap_server.js', | ||
| 'lib/hijack/wrap_session.js', | ||
| 'lib/hijack/wrap_subscription.js', | ||
| 'lib/hijack/wrap_observers.js', | ||
| 'lib/hijack/wrap_ddp_stringify.js', | ||
| 'lib/hijack/instrument.js', | ||
| 'lib/hijack/db.js', | ||
| 'lib/hijack/http.js', | ||
| 'lib/hijack/email.js', | ||
| 'lib/hijack/async.js', | ||
| 'lib/hijack/error.js', | ||
| 'lib/hijack/set_labels.js', | ||
| 'lib/environment_variables.js', | ||
| 'lib/auto_connect.js', | ||
| ], 'server'); | ||
| api.add_files( | ||
| [ | ||
| 'lib/jobs.js', | ||
| 'lib/retry.js', | ||
| 'lib/utils.js', | ||
| 'lib/ntp.js', | ||
| 'lib/wait_time_builder.js', | ||
| 'lib/check_for_oplog.js', | ||
| 'lib/tracer/tracer.js', | ||
| 'lib/tracer/default_filters.js', | ||
| 'lib/tracer/tracer_store.js', | ||
| 'lib/models/0model.js', | ||
| 'lib/models/methods.js', | ||
| 'lib/models/pubsub.js', | ||
| 'lib/models/system.js', | ||
| 'lib/models/errors.js', | ||
| 'lib/docsize_cache.js', | ||
| 'lib/kadira.js', | ||
| 'lib/hijack/wrap_server.js', | ||
| 'lib/hijack/wrap_session.js', | ||
| 'lib/hijack/wrap_subscription.js', | ||
| 'lib/hijack/wrap_observers.js', | ||
| 'lib/hijack/wrap_ddp_stringify.js', | ||
| 'lib/hijack/instrument.js', | ||
| 'lib/hijack/db.js', | ||
| 'lib/hijack/http.js', | ||
| 'lib/hijack/email.js', | ||
| 'lib/hijack/async.js', | ||
| 'lib/hijack/error.js', | ||
| 'lib/hijack/set_labels.js', | ||
| 'lib/environment_variables.js', | ||
| 'lib/auto_connect.js', | ||
| ], | ||
| 'server' | ||
| ); | ||
|
|
||
| // only client | ||
| api.add_files([ | ||
| 'lib/retry.js', | ||
| 'lib/ntp.js', | ||
| 'lib/client/utils.js', | ||
| 'lib/client/models/error.js', | ||
| 'lib/client/error_reporters/zone.js', | ||
| 'lib/client/error_reporters/window_error.js', | ||
| 'lib/client/error_reporters/meteor_debug.js', | ||
| 'lib/client/kadira.js' | ||
| ], 'client'); | ||
| api.add_files( | ||
| [ | ||
| 'lib/retry.js', | ||
| 'lib/ntp.js', | ||
| 'lib/client/utils.js', | ||
| 'lib/client/models/error.js', | ||
| 'lib/client/error_reporters/zone.js', | ||
| 'lib/client/error_reporters/window_error.js', | ||
| 'lib/client/error_reporters/meteor_debug.js', | ||
| 'lib/client/kadira.js', | ||
| ], | ||
| 'client' | ||
| ); | ||
|
|
||
| api.add_files([ | ||
| // It's possible to remove this file after some since this just contains | ||
| // a notice to the user. | ||
| // Actual implementation is in the meteorhacks:kadira-profiler package | ||
| 'lib/profiler/client.js', | ||
| ], 'client'); | ||
| api.add_files( | ||
| [ | ||
| // It's possible to remove this file after some since this just contains | ||
| // a notice to the user. | ||
| // Actual implementation is in the meteorhacks:kadira-profiler package | ||
| 'lib/profiler/client.js', | ||
| ], | ||
| 'client' | ||
| ); | ||
|
|
||
| // common after | ||
| api.add_files([ | ||
| 'lib/common/default_error_filters.js', | ||
| 'lib/common/send.js' | ||
| ], ['client', 'server']); | ||
| api.add_files(['lib/common/default_error_filters.js', 'lib/common/send.js'], ['client', 'server']); | ||
| } | ||