Merge branch 'devel' into setup-security-policy

History.md

@@ -1,4 +1,4 @@
-## v2.2.1, UNRELEASED
+## v2.3.0, UNRELEASED
 
 #### Independent Releases
 
@@ -8,6 +8,10 @@
 
 * Released `mongo@1.11.1` fixing a `Timestamp.ONE is undefined` bug.
 
+* Released `mongo-id@1.0.8` removing unused dependency `id-map`.
+
+* Released `dev-error-overlay@0.1.1` fixing sometimes page content being on top of error overlay
+
 ## v2.2, 2021-04-15
 
 #### Highlights

packages/ddp-client/.npm/package/npm-shrinkwrap.json

@@ -1,10 +1,20 @@
 {
   "lockfileVersion": 1,
   "dependencies": {
-    "lolex": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
-      "integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng=="
+    "@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ=="
+    },
+    "@sinonjs/fake-timers": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.0.5.tgz",
+      "integrity": "sha512-fUt6b15bjV/VW93UP5opNXJxdwZSbK1EdiwnhN7XrQrcpaOhMJpZ/CjwFpM3THpxwA+YviBUJKSuEqKlCK5alw=="
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
     }
   }
 }

packages/ddp-client/package.js

@@ -5,7 +5,7 @@ Package.describe({
 });
 
 Npm.depends({
-  lolex: '2.3.2'
+  '@sinonjs/fake-timers': '7.0.5'
 });
 
 Package.onUse((api) => {

packages/ddp-client/test/livedata_connection_tests.js

@@ -1,4 +1,4 @@
-import lolex from 'lolex';
+import FakeTimers from '@sinonjs/fake-timers';
 import { DDP } from '../common/namespace.js';
 import { Connection } from '../common/livedata_connection.js';
 
@@ -114,7 +114,7 @@ Tinytest.add('livedata stub - receive data', function(test) {
 Tinytest.add('livedata stub - buffering data', function(test) {
   // Install special setTimeout that allows tick-by-tick control in tests using sinonjs 'lolex'
   // This needs to be before the connection is instantiated.
-  const clock = lolex.install();
+  const clock = FakeTimers.install();
   const tick = timeout => clock.tick(timeout);
 
   const stream = new StubStream();

packages/dev-error-overlay/client.js

@@ -13,6 +13,7 @@ const styles = `
     box-shadow: inset 0 0 100px #e411111f, 0 0 20px #00000085;
     box-sizing: border-box;
     overflow-y: auto;
+    z-index: 1000000;
   }
 
   .section {

packages/dev-error-overlay/package.js

@@ -1,5 +1,5 @@
 Package.describe({
-  version: '0.1.0',
+  version: '0.1.1',
   summary: 'Show build errors in client when using HMR',
   documentation: 'README.md',
   devOnly: true

packages/mongo-id/package.js

@@ -1,11 +1,11 @@
 Package.describe({
   summary: 'JS simulation of MongoDB ObjectIDs',
-  version: '1.0.7',
+  version: '1.0.8',
   documentation: null
 });
 
 Package.onUse(function (api) {
   api.export('MongoID');
-  api.use(['ejson', 'id-map', 'random', 'ecmascript']);
+  api.use(['ejson', 'random', 'ecmascript']);
   api.mainModule('id.js');
 });

tools/tests/apps/modules/package-lock.json

@@ -2352,9 +2352,9 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "ua-parser-js": {
-      "version": "0.7.20",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
-      "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
+      "version": "0.7.28",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
+      "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
     },
     "unherit": {
       "version": "1.1.2",