Merge pull request #283 from CaptainN/typescript

Typescript
meteor · Apr 22, 2020 · dd53fc2 · dd53fc2
2 parents 04195fc + 9500f14
commit dd53fc2
Show file tree

Hide file tree

Showing 11 changed files with 939 additions and 679 deletions.
diff --git a/packages/react-meteor-data/CHANGELOG.md b/packages/react-meteor-data/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+* Update and fix tests.
+* Convert to TypeScript.
+* Seporate deps and no-deps implementation for easier to read implementation.
+* Fix a problem in StrictMode when using no-deps (and withTracker) where
+  updates get lost after first render.
+  https://github.com/meteor/react-packages/issues/278
+
 ## v2.0.1, 2019-12-13
 
 * Makes main module lazy. Fixes [Issue #264](https://github.com/meteor/react-packages/issues/264). Thanks [@moberegger](https://github.com/moberegger)
@@ -11,5 +18,5 @@
 ## v1.0.0, 2019-12-13
 
 * Renames deprecated lifecycle to support React 16.9
-* Publishes branch v1. 
+* Publishes branch v1.
   - This branch is not synced with devel as it requires at least version 16.8 of react.
diff --git a/packages/react-meteor-data/index.js b/packages/react-meteor-data/index.js
@@ -9,4 +9,4 @@ if (Meteor.isDevelopment) {
 }
 
 export { default as useTracker } from './useTracker';
-export { default as withTracker } from './withTracker.jsx';
+export { default as withTracker } from './withTracker.tsx';
diff --git a/packages/react-meteor-data/package-lock.json b/packages/react-meteor-data/package-lock.json
diff --git a/packages/react-meteor-data/package.js b/packages/react-meteor-data/package.js
@@ -12,12 +12,13 @@ Package.onUse(function (api) {
   api.versionsFrom('1.3');
   api.use('tracker');
   api.use('ecmascript');
+  api.use('typescript');
 
   api.mainModule('index.js', ['client', 'server'], { lazy: true });
 });
 
 Package.onTest(function (api) {
-  api.use(['ecmascript', 'reactive-dict', 'reactive-var', 'tracker', 'tinytest', 'underscore', 'mongo']);
+  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');

diff --git a/packages/react-meteor-data/package.json b/packages/react-meteor-data/package.json
@@ -1,10 +1,11 @@
 {
   "name": "react-meteor-data",
   "dependencies": {
-    "react": "16.8.6",
-    "react-dom": "16.8.6",
-    "react-test-renderer": "16.8.6",
-    "@testing-library/react": "^8.0.7",
-    "@testing-library/react-hooks": "1.1.0"
+    "react": "16.13.1",
+    "react-dom": "16.13.1",
+    "react-test-renderer": "16.13.1",
+    "@testing-library/react": "^10.0.2",
+    "@types/meteor": "^1.4.42",
+    "@types/react": "^16.9.34"
   }
 }
diff --git a/packages/react-meteor-data/useTracker.js b/packages/react-meteor-data/useTracker.js