Merge pull request #183 from Meteor-Community-Packages/feature/meteor-3

Meteor 3

Author: harryadel

.eslintignore

@@ -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

.eslintrc

@@ -1,4 +1,4 @@
-# the test suite runs the tests (headless, server+client) for multiple Meteor releases
+# the test suite runs the tests (headless, server+client) for Meteor 3
 name: Test suite
 on:
   push:
@@ -10,20 +10,18 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         meteorRelease:
-          - "--release 2.7"
-          - "--release 2.8.1"
-          - "--release 2.15"
-          # Latest version
+          - "--release 3.0"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "14.x"
+          node-version: "20.x"
 
       - name: Install Dependencies
         run: |

.github/workflows/lint.yml

@@ -14,15 +14,18 @@ In order to `meteor publish`, you will need to be added as a maintainer to this
 meteor admin maintainers mizzao:user-status --list
 ```
 
-# Travis CI
+# GitHub Actions
 
-To be written.
+Continuous integration runs with GitHub Actions:
+
+- lint checks run in `.github/workflows/lint.yml`
+- package tests run in `.github/workflows/testsuite.yml`
+- CodeQL analysis runs in `.github/workflows/codeql.yml`
 
-See https://travis-ci.org/Meteor-Community-Packages/meteor-user-status
+See https://github.com/Meteor-Community-Packages/meteor-user-status/actions
 
 # Pushing a demo
 
 To be written.
 
 We host the demo at https://user-status.meteorapp.com.
-

.github/workflows/testsuite.yml

@@ -1,7 +1,15 @@
 ## vNEXT
 
-## v1.1.1
+## v2.0.0
 * Add newer Meteor versions to `versionsFrom`
+* Minimum Meteor version is 3.0
+* onStartup add defer and default query [PR](https://github.com/Meteor-Community-Packages/meteor-user-status/pull/163) [@Sergeant61](https://github.com/Sergeant61)
+* Completed async/Fibers compatibility work for Meteor 3
+* Updated to eslint v9
+* Updated `mizzao:timesync` compatibility to use the stable Meteor 3 `1.0.0` release
+* Published release candidate `2.0.0-rc.3`
+* Published release candidate `2.0.0-rc.4` targeting Meteor 3 only
+* Removed remaining legacy CI documentation and completed the move to GitHub Actions
 
 ## v1.1.0
 
@@ -24,7 +32,7 @@
 * Upgraded timesync to 0.5.1
 * Formatted all JS, CSS, and HTML files to jsbeautify specs
 * Updated all references of github.com/mizzao to github.com/Meteor-Community-Packages
-* Changed TravisCI to use Node 8.15.1 and added lint checks
+* Updated CI to use Node 8.15.1 and added lint checks
 * Added Visual Studio Code settings.json
 * Changed all tabs to 2 spaces
 * Minimum meteor requirement now 1.7.0.5

Contributing.md

@@ -24,6 +24,12 @@ Install using Meteor:
 $ meteor add mizzao:user-status
 ```
 
+### Compatibility
+
+The `2.0.0` release candidates target Meteor 3.0 and newer, and use the stable
+`mizzao:timesync@1.0.0` package. Meteor 2.x applications should stay on the
+`1.x` line of this package until the application is ready to migrate to Meteor 3.
+
 Additionally, note that to read client IP addresses properly, you must set the
 `HTTP_FORWARDED_COUNT` environment variable for your app, and make sure that IP
 address headers are forwarded for any reverse proxy installed in front of the
@@ -117,7 +123,9 @@ The `UserStatus.connections` (in-memory) collection contains information for all
 
 #### startupQuerySelector (Optional)
 
-On startup `meteor-user-status` automatically resets all users to `offline` and then marks each `online` as connections are reestablished. 
+On startup `meteor-user-status` automatically resets online users to `offline`
+using the default selector `{ "status.online": true }`, then marks users
+`online` again as connections are reestablished.
 
 To customize this functionality you can use the `startupQuerySelector` [Meteor package option](https://docs.meteor.com/api/packagejs.html#options) like this:
 ```javascript
@@ -199,8 +207,9 @@ The `UserStatus.events` object is an `EventEmitter` on which you can listen for
 Check out https://github.com/mizzao/meteor-accounts-testing for a simple accounts drop-in that you can use to test your app - this is also used in the demo.
 
 #### Startup selector
-By default, the startup selector for resetting user status is `{}`.
-If you want to change that you can set the default selector in your settings.json file:
+By default, the startup selector for resetting user status is
+`{ "status.online": true }`. If you want to change that you can set the default
+selector in your settings.json file:
 
 ```json
 {

History.md

@@ -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);
   }
 
 };

README.md

@@ -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",
+    },
+}];