Skip to content

Commit

Permalink
Merge pull request #378 from Meteor-Community-Packages/feature/async
Browse files Browse the repository at this point in the history
Async
  • Loading branch information
StorytellerCZ authored Oct 17, 2023
2 parents 5814033 + 249eb0b commit 5fd6694
Show file tree
Hide file tree
Showing 13 changed files with 3,850 additions and 222 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/testsuite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ jobs:
strategy:
matrix:
meteorRelease:
- '2.3'
- '2.7.3'
- '2.12'
- '2.8.0'
- '2.13.3'
# Latest version
steps:
- name: Checkout code
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ npm-debug.log
smart.lock

.idea
.DS_Store
docs/
node_modules/
.npm/
Expand Down
7 changes: 5 additions & 2 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Package.describe({
})

Package.onUse(function (api) {
api.versionsFrom(['1.12', '2.3', '2.8.0'])
api.versionsFrom(['2.8.0'])

const both = ['client', 'server']

Expand All @@ -27,6 +27,7 @@ Package.onUse(function (api) {
api.export('Roles')

api.addFiles('roles/roles_common.js', both)
api.addFiles('roles/roles_common_async.js', both)
api.addFiles('roles/roles_server.js', 'server')
api.addFiles([
'roles/client/debug.js',
Expand All @@ -43,7 +44,7 @@ Package.onTest(function (api) {
'meteortesting:mocha@2.1.0'
])

api.versionsFrom('2.3')
api.versionsFrom(['2.3', '2.8.1'])

const both = ['client', 'server']

Expand All @@ -56,5 +57,7 @@ Package.onTest(function (api) {
], both)

api.addFiles('roles/tests/server.js', 'server')
api.addFiles('roles/tests/serverAsync.js', 'server')
api.addFiles('roles/tests/client.js', 'client')
api.addFiles('roles/tests/clientAsync.js', 'client')
})
1 change: 1 addition & 0 deletions roles/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.build*
.DS_Store
2 changes: 1 addition & 1 deletion roles/roles_common.js
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ Object.assign(Roles, {
* - `onlyAssigned`: return only assigned roles and not automatically inferred (like subroles)
* - `fullObjects`: return full roles objects (`true`) or just names (`false`) (`onlyAssigned` option is ignored) (default `false`)
* If you have a use-case for this option, please file a feature-request. You shouldn't need to use it as it's
* result strongly dependant on the internal data structure of this plugin.
* result strongly dependent on the internal data structure of this plugin.
*
* Alternatively, it can be a scope name string.
* @return {Array} Array of user's roles, unsorted.
Expand Down
Loading

0 comments on commit 5fd6694

Please sign in to comment.