Incorporate changes from the original react-meteor-data package

.github/workflows/test-react-packages.yml

@@ -0,0 +1,44 @@
+name: Meteor CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    name: Meteor react-packages tests
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Cache Meteor
+        uses: actions/cache@v4
+        with:
+          path: ~/.meteor
+          key: meteor-cache
+
+      - name: Setup Meteor
+        uses: meteorengineer/setup-meteor@v2
+        with:
+          meteor-release: '3.1.2'
+
+      - name: Prepare mtest
+        run: |
+          meteor npm i -g @zodern/mtest
+
+      - name: Install and test in react-meteor-data
+        working-directory: tests/react-meteor-data-harness
+        run: |
+          meteor npm install
+          meteor npm run test:ci
+
+      - name: Install and test in react-meteor-accounts-harness
+        working-directory: tests/react-meteor-accounts-harness
+        run: |
+          meteor npm install
+          meteor npm run test:ci

README.md

@@ -1,25 +1,30 @@
 # Meteor react-packages (npm)
+
 > This is a npm-published fork of the official Meteor [`react-packages`](https://github.com/meteor/react-packages) repository.
-> This allows us leave bundling of React up to Vite, instead of relying on Meteor's bundling system. Giving a little 
+> This allows us leave bundling of React up to Vite, instead of relying on Meteor's bundling system. Giving a little
 > bit more flexibility in terms of configuration through Vite.
-> 
+>
 > See [`meteor-vite`](https://github.com/JorgenVatle/meteor-vite) for more details and examples.
 
 ## Installation
+
 ```shell
 meteor npm i @meteor-vite/react-meteor-data
 ```
 
 ## Usage
+
 The API is exactly the same as Meteor's [`react-meteor-data`](https://github.com/meteor/react-packages/tree/master/packages/react-meteor-data) package.
 Just replace your `meteor/react-meteor-data` imports with `@meteor-vite/react-meteor-data`
 
 ```tsx
-import { Meteor } from 'meteor/meteor';
-import { useTracker } from '@meteor-vite/react-meteor-data';
+import { Meteor } from "meteor/meteor";
+import { useTracker } from "@meteor-vite/react-meteor-data";
 
 export function UserID() {
-    const user = useTracker(() => Meteor.user(), []);
-    return (<div>User ID: { user._id }</div>)
+  const user = useTracker(() => Meteor.user(), []);
+  return <div>User ID: {user._id}</div>;
 }
 ```
+
+To run tests for a Meteor react package, navigate to its `tests/*` app and execute `npm test`.

packages/react-meteor-accounts/package.json

@@ -2,16 +2,5 @@
   "name": "meteor-react-accounts",
   "scripts": {
     "make-types": "npx typescript react-accounts.tsx --jsx preserve --declaration --emitDeclarationOnly --esModuleInterop --outDir types --strict"
-  },
-  "devDependencies": {
-    "@testing-library/react": "^10.0.2",
-    "@testing-library/react-hooks": "^7.0.2",
-    "@tsconfig/recommended": "^1.0.1",
-    "@types/meteor": "^1.4.42",
-    "@types/react": "^16.9.34",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "react-test-renderer": "16.13.1",
-    "typescript": "^4.0.3"
   }
 }

packages/react-meteor-accounts/react-accounts.tests.tsx

@@ -22,8 +22,8 @@ import {
 // Prepare method for clearing DB (doesn't need to be isomorphic).
 if (Meteor.isServer) {
   Meteor.methods({
-    reset() {
-      Meteor.users.remove({});
+    async reset() {
+      await Meteor.users.removeAsync({});
     },
   });
 }
@@ -54,19 +54,9 @@ if (Meteor.isClient) {
   // common test arrangements
   async function beforeEach() {
     // reset DB; must complete before creation to avoid potential overlap
-    await new Promise((resolve, reject) => {
-      Meteor.call("reset", (error, result) => {
-        if (error) reject(error);
-        else resolve(result);
-      });
-    });
+    await Meteor.callAsync("reset");
     // prepare sample user
-    await new Promise<void>((resolve, reject) => {
-      Accounts.createUser({ username, password }, (error) => {
-        if (error) reject(error);
-        else resolve();
-      });
-    });
+    await Accounts.createUserAsync({ username, password });
     // logout since `createUser` auto-logs-in
     await logout();
   }

packages/react-meteor-data/.versions

@@ -1,5 +1,5 @@
-allow-deny@2.0.0
-[email protected].1
+allow-deny@2.1.0
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -9,50 +9,52 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-ddp-client@3.0.2
+ddp-client@3.1.0
 [email protected]
-ddp-server@3.0.2
+ddp-server@3.1.2
 [email protected]
 [email protected]
-[email protected].9
+[email protected].10
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
-[email protected].5
+[email protected].6
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-local-test:[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+local-test:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
-mongo@2.0.2
-mongo-decimal@0.1.4-beta300.7
+mongo@2.1.1
+mongo-decimal@0.2.0
 [email protected]
 [email protected]
-npm-mongo@4.17.4
+npm-mongo@6.10.2
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-react-meteor-data@3.0.3
+react-meteor-data@4.0.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-socket-stream-client@0.5.3
-[email protected].1
-[email protected].0
+socket-stream-client@0.6.0
+[email protected].3
+[email protected].1
 [email protected]
-typescript@5.4.3
+typescript@5.6.3
 [email protected]
-[email protected].3
+[email protected].6
 [email protected]
+zodern:[email protected]

packages/react-meteor-data/index.js → packages/react-meteor-data/index.ts

@@ -9,6 +9,6 @@ if (Meteor.isDevelopment) {
 }
 
 export { useTracker } from './useTracker';
-export { withTracker } from './withTracker.tsx';
+export { withTracker } from './withTracker';
 export { useFind } from './useFind';
 export { useSubscribe } from './useSubscribe';

packages/react-meteor-data/package-types.json

@@ -0,0 +1,6 @@
+{
+  "typesEntry": "react-meteor-data.d.ts",
+  "modules": {
+    "suspense": "./suspense/react-meteor-data.d.ts"
+  }
+}

packages/react-meteor-data/package.js

@@ -3,30 +3,30 @@
 Package.describe({
   name: 'react-meteor-data',
   summary: 'React hook for reactively tracking Meteor data',
-  version: '3.0.3',
+  version: '4.0.0',
   documentation: 'README.md',
   git: 'https://github.com/meteor/react-packages'
 })
 
 Npm.depends({
-  'lodash.isequal': '4.5.0',
-  'lodash.remove': '4.7.0'
+  'fast-equals': '5.2.2'
 })
 
 Package.onUse((api) => {
   api.versionsFrom(['1.8.2', '1.12', '2.0', '2.3', '3.0'])
   api.use('tracker')
   api.use('ecmascript')
   api.use('typescript')
-  api.addAssets('react-meteor-data.d.ts', 'server')
-  api.addAssets('suspense/react-meteor-data.d.ts', 'server')
+  api.use('zodern:[email protected]', 'server')
 
-  api.mainModule('index.js', ['client', 'server'], { lazy: true })
+  api.mainModule('index.ts', ['client', 'server'], { lazy: true })
 })
 
 Package.onTest((api) => {
   api.use(['ecmascript', 'typescript', 'reactive-dict', 'reactive-var', 'tracker', 'tinytest', 'underscore', 'mongo'])
   api.use('test-helpers')
   api.use('react-meteor-data')
-  api.mainModule('tests.js')
+  api.use('[email protected]', 'client');
+
+  api.mainModule('tests.js');
 })