Merge branch 'master' into pr/hasezoey/375

nodkz · nodkz · commit 825792656a2a · 2020-09-17T01:30:32.000+06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [6.7.5](https://github.com/nodkz/mongodb-memory-server/compare/v6.7.4...v6.7.5) (2020-09-12)
+
+
+### Bug Fixes
+
+* **postinstall:** skip postinstall if "SYSTEM_BINARY" is set ([34b1f1f](https://github.com/nodkz/mongodb-memory-server/commit/34b1f1f052c628bf8b434e2d07e801643dc5ad14)), closes [#370](https://github.com/nodkz/mongodb-memory-server/issues/370)
+
 ## [6.7.4](https://github.com/nodkz/mongodb-memory-server/compare/v6.7.3...v6.7.4) (2020-09-11)
 
 
diff --git a/packages/mongodb-memory-server-core/package.json b/packages/mongodb-memory-server-core/package.json
@@ -43,8 +43,7 @@
     "@types/semver": "7.3.4",
     "@types/tar-stream": "^2.1.0",
     "@types/uuid": "^8.0.0",
-    "@types/yauzl": "^2.9.1",
-    "mongodb": "3.5.4"
+    "@types/yauzl": "^2.9.1"
   },
   "dependencies": {
     "@types/tmp": "^0.2.0",
diff --git a/packages/mongodb-memory-server-global-3.4/package.json b/packages/mongodb-memory-server-global-3.4/package.json
@@ -22,7 +22,7 @@
     "mongomem"
   ],
   "dependencies": {
-    "mongodb-memory-server": "6.7.4",
+    "mongodb-memory-server": "6.7.5",
     "os": "^0.1.1"
   },
   "scripts": {
diff --git a/packages/mongodb-memory-server-global-3.4/postinstall.js b/packages/mongodb-memory-server-global-3.4/postinstall.js
@@ -1,3 +1,5 @@
+/* eslint @typescript-eslint/no-var-requires: 0 */
+
 function isModuleExists(name) {
   try {
     return !!require.resolve(name);
diff --git a/packages/mongodb-memory-server-global-3.6/package.json b/packages/mongodb-memory-server-global-3.6/package.json
@@ -22,7 +22,7 @@
     "mongomem"
   ],
   "dependencies": {
-    "mongodb-memory-server": "6.7.4",
+    "mongodb-memory-server": "6.7.5",
     "os": "^0.1.1"
   },
   "scripts": {
diff --git a/packages/mongodb-memory-server-global-3.6/postinstall.js b/packages/mongodb-memory-server-global-3.6/postinstall.js
@@ -1,3 +1,5 @@
+/* eslint @typescript-eslint/no-var-requires: 0 */
+
 function isModuleExists(name) {
   try {
     return !!require.resolve(name);
diff --git a/packages/mongodb-memory-server-global-4.0/package.json b/packages/mongodb-memory-server-global-4.0/package.json
@@ -22,7 +22,7 @@
     "mongomem"
   ],
   "dependencies": {
-    "mongodb-memory-server": "6.7.4",
+    "mongodb-memory-server": "6.7.5",
     "os": "^0.1.1"
   },
   "scripts": {
diff --git a/packages/mongodb-memory-server-global-4.0/postinstall.js b/packages/mongodb-memory-server-global-4.0/postinstall.js
@@ -1,3 +1,5 @@
+/* eslint @typescript-eslint/no-var-requires: 0 */
+
 function isModuleExists(name) {
   try {
     return !!require.resolve(name);
diff --git a/packages/mongodb-memory-server-global-4.2/package.json b/packages/mongodb-memory-server-global-4.2/package.json
@@ -22,7 +22,7 @@
     "mongomem"
   ],
   "dependencies": {
-    "mongodb-memory-server": "6.7.4",
+    "mongodb-memory-server": "6.7.5",
     "os": "^0.1.1"
   },
   "scripts": {
diff --git a/packages/mongodb-memory-server-global-4.2/postinstall.js b/packages/mongodb-memory-server-global-4.2/postinstall.js
@@ -1,3 +1,5 @@
+/* eslint @typescript-eslint/no-var-requires: 0 */
+
 function isModuleExists(name) {
   try {
     return !!require.resolve(name);
diff --git a/packages/mongodb-memory-server-global-4.4/package.json b/packages/mongodb-memory-server-global-4.4/package.json
@@ -22,7 +22,7 @@
     "mongomem"
   ],
   "dependencies": {
-    "mongodb-memory-server": "6.7.4",
+    "mongodb-memory-server": "6.7.5",
     "os": "^0.1.1"
   },
   "scripts": {
diff --git a/packages/mongodb-memory-server-global-4.4/postinstall.js b/packages/mongodb-memory-server-global-4.4/postinstall.js
@@ -1,3 +1,5 @@
+/* eslint @typescript-eslint/no-var-requires: 0 */
+
 function isModuleExists(name) {
   try {
     return !!require.resolve(name);
diff --git a/packages/mongodb-memory-server-global/package.json b/packages/mongodb-memory-server-global/package.json
@@ -21,7 +21,7 @@
     "mongomem"
   ],
   "dependencies": {
-    "mongodb-memory-server": "6.7.4",
+    "mongodb-memory-server": "6.7.5",
     "os": "^0.1.1"
   },
   "scripts": {
diff --git a/packages/mongodb-memory-server-global/postinstall.js b/packages/mongodb-memory-server-global/postinstall.js
@@ -1,3 +1,5 @@
+/* eslint @typescript-eslint/no-var-requires: 0 */
+
 function isModuleExists(name) {
   try {
     return !!require.resolve(name);
diff --git a/packages/mongodb-memory-server/package.json b/packages/mongodb-memory-server/package.json
@@ -21,7 +21,7 @@
     "mongomem"
   ],
   "dependencies": {
-    "mongodb-memory-server-core": "6.7.4"
+    "mongodb-memory-server-core": "6.7.5"
   },
   "scripts": {
     "postinstall": "node ./postinstall.js"
diff --git a/packages/mongodb-memory-server/postinstall.js b/packages/mongodb-memory-server/postinstall.js
@@ -1,3 +1,5 @@
+/* eslint @typescript-eslint/no-var-requires: 0 */
+
 /*
 This script is used as postinstall hook.
 
@@ -20,19 +22,24 @@ if (!isModuleExists('../mongodb-memory-server-core/lib/util/resolve-config')) {
   console.log('Could not resolve postinstall configuration');
   return;
 }
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+
 const rc = require('../mongodb-memory-server-core/lib/util/resolve-config');
 rc.reInitializePackageJson(process.env.INIT_CWD);
 
 const envDisablePostinstall = rc.default('DISABLE_POSTINSTALL');
-const skipDownload =
-  typeof envDisablePostinstall === 'string' && rc.envToBool(envDisablePostinstall);
 
-if (skipDownload) {
+if (typeof envDisablePostinstall === 'string' && rc.envToBool(envDisablePostinstall)) {
   console.log('Download is skipped by MONGOMS_DISABLE_POSTINSTALL variable');
   process.exit(0);
 }
 
+const envSystemBinary = rc.default('SYSTEM_BINARY');
+
+if (typeof envSystemBinary === 'string') {
+  console.log('Download is skipped by MONGOMS_SYSTEM_BINARY variable');
+  process.exit(0);
+}
+
 const mongoBinaryModule = '../mongodb-memory-server-core/lib/util/MongoBinary';
 if (isModuleExists(mongoBinaryModule)) {
   const MongoBinary = require(mongoBinaryModule).default;
diff --git a/yarn.lock b/yarn.lock
@@ -6967,10 +6967,10 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-mongodb-memory-server-core@6.7.4:
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-6.7.4.tgz#5870e92451433d5d47ed4510e97dca8b7507786b"
-  integrity sha512-jvlx5+OUpJOagSyQXHHH/HhT63cJtdN5yruvSrjQ5Ivfq1lITI7fq6vTxZe4USlGoygqQiJN+MX8b1JYX2sLnw==
+mongodb-memory-server-core@6.7.5:
+  version "6.7.5"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server-core/-/mongodb-memory-server-core-6.7.5.tgz#f3fd1e517e8f798af8a93bb1d37a6cd0b04e7427"
+  integrity sha512-G4Wv1MAQg5B/aXpRwD5jy6Ubspcd7w4LsFl+rYJHhUgj8VMZGa4hX1pcEW26ghaw7gm24YsyXwDezHZPtxijKA==
   dependencies:
     "@types/tmp" "^0.2.0"
     camelcase "^6.0.0"
@@ -6991,12 +6991,12 @@ mongodb-memory-server-core@6.7.4:
   optionalDependencies:
     mongodb "3.6.2"
 
-mongodb-memory-server@6.7.4:
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-6.7.4.tgz#d34edbbd0fc8c9728260d4ae9d5178feab5f30df"
-  integrity sha512-VucLjrv6PBzmz36KlReBv62uPg4JkAywHvDHUXO/LXtAroWcH7HjECbCSTlwJIhGwpWcoeuZstlsrgu2btsn7A==
+mongodb-memory-server@6.7.5:
+  version "6.7.5"
+  resolved "https://registry.yarnpkg.com/mongodb-memory-server/-/mongodb-memory-server-6.7.5.tgz#3eb4033bba56bd1822b73f581e0badc12af05401"
+  integrity sha512-Ws4IRrFqCEoD27jzFHfST9lXyrgDddpLXcoQ7B0S4Sc5v3N5tpchmvueuZ0BMj4bwwBJlWl64nXNgCoooYvupw==
   dependencies:
-    mongodb-memory-server-core "6.7.4"
+    mongodb-memory-server-core "6.7.5"
 
 mongodb@3.6.2:
   version "3.6.2"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+/* eslint @typescript-eslint/no-var-requires: 0 */`
	`2`	`+`
`1`	`3`	`function isModuleExists(name) {`
`2`	`4`	`try {`
`3`	`5`	`return !!require.resolve(name);`