chore: Update bson to latest and exclude it from plugins dist by adding module to peer dependencies list (#2299)

gribnoysup · web-flow · commit 139c8dce462e · 2021-06-25T14:22:31.000+02:00
* chore: Update bson to latest and exclude it from plugins dist by adding module to peer dependencies list

* test(@mongodb-js/compass-query-history): Update assertion to match bson 4 output

* test(@mongodb-js/compass-import-export): Remove bson v1 test case

* fix(mongodb-compass): depcheck ignore bson, it's used by the app, but not directly
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json
@@ -31,6 +31,7 @@
     "@mongodb-js/compass-export-to-language": "*",
     "@mongodb-js/compass-field-store": "*",
     "async": "^1.5.2",
+    "bson": "*",
     "electron": "*",
     "hadron-react-bson": "*",
     "hadron-react-buttons": "*",
@@ -151,7 +152,7 @@
     "@mongodb-js/mongodb-redux-common": "^1.3.0",
     "acorn-loose": "^8.0.2",
     "astring": "^1.7.0",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "decomment": "^0.9.2",
     "is-electron-renderer": "^2.0.1",
     "lodash.debounce": "^4.0.8",
diff --git a/packages/compass-collection/package.json b/packages/compass-collection/package.json
@@ -68,7 +68,7 @@
     "autoprefixer": "^9.7.4",
     "babel-loader": "^8.2.2",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "bson-transpilers": "^0.15.0",
     "chai": "^4.2.0",
     "chai-enzyme": "1.0.0-beta.1",
diff --git a/packages/compass-crud/package.json b/packages/compass-crud/package.json
@@ -33,6 +33,7 @@
     "@hot-loader/react-dom": "^16.8.4",
     "@mongodb-js/compass-query-bar": "*",
     "@mongodb-js/compass-status": "*",
+    "bson": "*",
     "hadron-react-bson": "*",
     "hadron-react-buttons": "*",
     "hadron-react-components": "*",
@@ -140,7 +141,7 @@
     "ag-grid-community": "20.2.0",
     "ag-grid-react": "20.2.0",
     "brace": "^0.11.1",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "debug": "^4.1.1",
     "fast-json-parse": "^1.0.3",
     "hadron-document": "^7.3.0",
diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json
@@ -30,6 +30,7 @@
   },
   "license": "SSPL",
   "peerDependencies": {
+    "bson": "*",
     "hadron-react-buttons": "*",
     "mongodb-ace-theme": "*",
     "prop-types": "^15.5.8",
@@ -139,7 +140,7 @@
   "dependencies": {
     "JSONStream": "^1.3.5",
     "ansi-to-html": "^0.6.11",
-    "bson": "github:addaleax/js-bson#after-the-next-bson-release-you-can-just-use-the-npm-package-again",
+    "bson": "^4.4.0",
     "csv-parser": "^2.3.1",
     "fast-csv": "^3.4.0",
     "flat": "cipacda/flat",
diff --git a/packages/compass-import-export/src/utils/formatters.spec.js b/packages/compass-import-export/src/utils/formatters.spec.js
@@ -68,37 +68,26 @@ describe('formatters', () => {
         }
       });
 
-      for (const bsonVersion of ['v1', 'v4']) {
-        it(`works for input from bson version ${bsonVersion}`, async() => {
-          // The driver returns bson v1.x objects to us. They don't have a
-          // .toExtendedJSON() method, we simulate that.
-          class FakeBSON1Binary extends Binary {
-            get toExtendedJSON() { return undefined; }
-          }
+      it('works for input with Binary data', async() => {
+        const binary = new Binary(Buffer.from('56391cc226bc4affbe520f67856c09ec'), 4);
 
-          const binary = new Binary(Buffer.from('56391cc226bc4affbe520f67856c09ec'), 4);
-          if (bsonVersion === 'v1') {
-            Object.setPrototypeOf(binary, FakeBSON1Binary.prototype);
-          }
+        const docs = [
+          {
+            _id: new ObjectID('5e5ea7558d35931a05eafec0'),
+            test: binary
+          },
+        ];
+        const source = stream.Readable.from(docs);
+        const formatter = createJSONFormatter({brackets: true});
+        const dest = fs.createWriteStream(FIXTURES.JSON_MULTI_SMALL_DOCS);
 
-          const docs = [
-            {
-              _id: new ObjectID('5e5ea7558d35931a05eafec0'),
-              test: binary
-            },
-          ];
-          const source = stream.Readable.from(docs);
-          const formatter = createJSONFormatter({brackets: true});
-          const dest = fs.createWriteStream(FIXTURES.JSON_MULTI_SMALL_DOCS);
+        await pipeline(source, formatter, dest);
 
-          await pipeline(source, formatter, dest);
+        const contents = await readFile(FIXTURES.JSON_MULTI_SMALL_DOCS);
+        const parsed = EJSON.parse(contents);
 
-          const contents = await readFile(FIXTURES.JSON_MULTI_SMALL_DOCS);
-          const parsed = EJSON.parse(contents);
-
-          expect(parsed).to.deep.equal(docs);
-        });
-      }
+        expect(parsed).to.deep.equal(docs);
+      });
     });
   });
   describe('jsonl', () => {
diff --git a/packages/compass-query-history/package.json b/packages/compass-query-history/package.json
@@ -39,11 +39,12 @@
   },
   "dependencies": {
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "highlight.js": "^9.12.0",
     "lodash": "^4.17.15"
   },
   "peerDependencies": {
+    "bson": "*",
     "debug": "*",
     "hadron-react-components": "*",
     "mongodb-query-parser": "*",
diff --git a/packages/compass-query-history/src/utils/format-query.spec.js b/packages/compass-query-history/src/utils/format-query.spec.js
@@ -61,7 +61,7 @@ describe('formatQuery [Utils]', () => {
   describe('when the property has a Decimal128', () => {
     const value = new bson.Decimal128('0.00');
     const filter = { field: value };
-    const expected = '{\n field: NumberDecimal(\'0E-6176\')\n}';
+    const expected = '{\n field: NumberDecimal(\'0.00\')\n}';
 
     it('returns the shell syntax string', () => {
       expect(formatQuery(filter)).to.equal(expected);
diff --git a/packages/compass-schema-validation/package.json b/packages/compass-schema-validation/package.json
@@ -64,7 +64,7 @@
     "babel-loader": "^8.2.2",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
     "brace": "^0.11.1",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "chai": "^4.1.2",
     "chai-enzyme": "1.0.0-beta.1",
     "classnames": "^2.2.5",
diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json
@@ -26,7 +26,7 @@
   "peerDependencies": {
     "@mongodb-js/compass-query-bar": "*",
     "@mongodb-js/compass-status": "*",
-    "bson": "4.1.0",
+    "bson": "*",
     "d3": "3.5.17",
     "debug": "^3.0.1",
     "hadron-ipc": "*",
@@ -55,7 +55,7 @@
     "autoprefixer": "^9.4.6",
     "babel-loader": "^8.2.2",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "chai": "^4.1.2",
     "chai-enzyme": "1.0.0-beta.0",
     "classnames": "^2.2.5",
diff --git a/packages/compass/.depcheckrc b/packages/compass/.depcheckrc
@@ -76,5 +76,6 @@ ignores: [
   "enzyme-adapter-react-16",
   "jsdom",
   "mock-require",
-  "mongodb-runner"
+  "mongodb-runner",
+  "bson"
 ]
diff --git a/packages/compass/package.json b/packages/compass/package.json
@@ -203,7 +203,8 @@
           "**/bl/**",
           "**/nan/**",
           "**/node_modules/bindings/**",
-          "**/file-uri-to-path/**"
+          "**/file-uri-to-path/**",
+          "**/bson/**"
         ]
       },
       "rebuild": {
@@ -292,6 +293,7 @@
     "app-migrations": "^2.2.0",
     "async": "^1.5.2",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
+    "bson": "^4.4.0",
     "bson-transpilers": "^0.15.0",
     "clean-stack": "^2.0.0",
     "compass-preferences-model": "^1.4.0",
@@ -322,8 +324,8 @@
     "less": "^2.6.1",
     "local-links": "^1.4.0",
     "lodash.assign": "^ 3.2.0",
-    "lodash.defaults": "^3.1.2",
     "lodash.clone": "^3.0.3",
+    "lodash.defaults": "^3.1.2",
     "lodash.includes": "^3.1.3",
     "make-fetch-happen": "^8.0.14",
     "marky": "^1.2.0",
@@ -395,8 +397,8 @@
     "eslint-plugin-react": "^7.24.0",
     "execa": "^5.0.0",
     "fs-extra": "^9.1.0",
-    "jsdom": "^16.6.0",
     "hadron-build": "^24.4.0",
+    "jsdom": "^16.6.0",
     "listr": "^0.14.3",
     "lodash": "^4.17.21",
     "mocha": "^8.3.2",
diff --git a/packages/data-service/package.json b/packages/data-service/package.json
@@ -45,7 +45,7 @@
     "mongodb-url": "^3.0.3"
   },
   "devDependencies": {
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "chai": "^4.2.0",
     "depcheck": "^1.3.1",
     "eslint": "^7.18.0",
diff --git a/packages/hadron-document/package.json b/packages/hadron-document/package.json
@@ -47,7 +47,7 @@
     "@babel/preset-react": "^7.13.13",
     "@babel/register": "^7.13.16",
     "babel-loader": "^8.2.2",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "chai": "^4.2.0",
     "depcheck": "^1.4.0",
     "eslint": "^7.25.0",
diff --git a/packages/hadron-react-bson/package.json b/packages/hadron-react-bson/package.json
@@ -45,7 +45,7 @@
     "@babel/preset-react": "^7.13.13",
     "@babel/register": "^7.13.16",
     "babel-loader": "^8.2.2",
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "chai": "^4.1.2",
     "chai-enzyme": "1.0.0-beta.0",
     "core-js": "^3.12.1",
diff --git a/packages/hadron-type-checker/package.json b/packages/hadron-type-checker/package.json
@@ -22,7 +22,7 @@
     "test-ci": "npm run test"
   },
   "dependencies": {
-    "bson": "4.1.0",
+    "bson": "^4.4.0",
     "lodash": "^4.17.15"
   },
   "devDependencies": {
