Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meteor 3 #183

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

34 changes: 0 additions & 34 deletions .eslintrc

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ jobs:
name: Javascript standard lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- name: cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-18-${{ hashFiles('**/package-lock.json') }}
key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-18-
${{ runner.os }}-node-20-
- name: Install dependencies
run: npm ci
- name: Run lint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testsuite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
strategy:
matrix:
meteorRelease:
- "--release 2.7"
- "--release 2.8.1"
- "--release 2.15"
- "--release 3.0"
# Latest version
steps:
- name: Checkout code
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: "14.x"
node-version: "20.x"

- name: Install Dependencies
run: |
Expand Down
6 changes: 5 additions & 1 deletion History.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
## vNEXT

## v1.1.1
## v2.0.0
* Add newer Meteor versions to `versionsFrom`
* Minimum Meteor version is 2.8.1
* onStartup add defer and default query [PR](https://github.com/Meteor-Community-Packages/meteor-user-status/pull/163) [@Sergeant61](https://github.com/Sergeant61)
* Updated for Meteor 3
* Updated to eslint v9

## v1.1.0

Expand Down
4 changes: 2 additions & 2 deletions client/monitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ export const MonitorInternals = {
},

reportIdle(time) {
return Meteor.call('user-status-idle', time);
return Meteor.callAsync('user-status-idle', time);
},

reportActive(time) {
return Meteor.call('user-status-active', time);
return Meteor.callAsync('user-status-active', time);
}

};
Expand Down
43 changes: 43 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import globals from 'globals';
import babelParser from '@babel/eslint-parser';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [{
ignores: ["node_modules/*", "packages/*", "**/phantom_runner.js", "**/start_test.js", "**/eslint.config.mjs"],
}, ...compat.extends("eslint:recommended"), {
languageOptions: {
globals: {
...globals.node,
...globals.commonjs,
Atomics: "readonly",
SharedArrayBuffer: "readonly",
},

parser: babelParser,
ecmaVersion: 2018,
sourceType: "module",

parserOptions: {
allowImportExportEverywhere: true,
requireConfigFile: false,
},
},

rules: {
"linebreak-style": ["error", "unix"],
quotes: ["error", "single"],
semi: ["error", "always"],
"no-console": "off",
},
}];
Loading
Loading