fix: Backport bundler-safe optional module lookups (#2254)

Author: dcodeIO

.release-please-manifest.json

@@ -5,7 +5,7 @@
   "lib/base64": "1.1.2",
   "lib/codegen": "2.0.5",
   "lib/eventemitter": "1.1.0",
-  "lib/fetch": "1.1.1",
+  "lib/fetch": "1.1.0",
   "lib/float": "1.0.2",
   "lib/inquire": "1.1.1",
   "lib/path": "1.1.2",

index.d.ts

@@ -2484,6 +2484,7 @@ export namespace util {
      * Requires a module only if available.
      * @param moduleName Module to require
      * @returns Required module if available and not empty, otherwise `null`
+     * @deprecated Legacy optional require helper. Will be removed in a future release.
      */
     function inquire(moduleName: string): object;
 

lib/fetch/index.js

@@ -2,9 +2,7 @@
 module.exports = fetch;
 
 var asPromise = require("@protobufjs/aspromise"),
-    inquire   = require("@protobufjs/inquire");
-
-var fs = inquire("fs");
+    fs        = require("./util/fs");
 
 /**
  * Node-style callback as used by {@link util.fetch}.

lib/fetch/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@protobufjs/fetch",
   "description": "Fetches the contents of a file accross node and browsers.",
-  "version": "1.1.1",
+  "version": "1.1.0",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",
   "repository": {
     "type": "git",
     "url": "https://github.com/dcodeIO/protobuf.js.git"
   },
   "dependencies": {
-    "@protobufjs/aspromise": "^1.1.1",
-    "@protobufjs/inquire": "^1.1.0"
+    "@protobufjs/aspromise": "^1.1.1"
   },
   "license": "BSD-3-Clause",
   "main": "index.js",
   "types": "index.d.ts",
+  "browser": {
+    "fs": false
+  },
   "devDependencies": {
     "istanbul": "^0.4.5",
     "tape": "^5.0.0"
@@ -22,4 +24,4 @@
     "test": "tape tests/*.js",
     "coverage": "istanbul cover node_modules/tape/bin/tape tests/*.js"
   }
-}
+}

lib/fetch/util/fs.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var fs = null;
+try {
+    fs = require(/* webpackIgnore: true */ "fs");
+    if (!fs || !fs.readFile || !fs.readFileSync)
+        fs = null;
+} catch (e) {
+    // `fs` is unavailable in browsers and browser-like bundles.
+}
+module.exports = fs;

lib/inquire/index.d.ts

@@ -5,5 +5,6 @@ export = inquire;
  * @memberof util
  * @param {string} moduleName Module to require
  * @returns {?Object} Required module if available and not empty, otherwise `null`
+ * @deprecated Legacy optional require helper. Will be removed in a future release.
  */
 declare function inquire(moduleName: string): object;

lib/inquire/index.js

@@ -6,6 +6,7 @@ module.exports = inquire;
  * @memberof util
  * @param {string} moduleName Module to require
  * @returns {?Object} Required module if available and not empty, otherwise `null`
+ * @deprecated Legacy optional require helper. Will be removed in a future release.
  */
 function inquire(moduleName) {
   try {

package.json

@@ -27,6 +27,9 @@
   ],
   "main": "index.js",
   "types": "index.d.ts",
+  "browser": {
+    "fs": false
+  },
   "publishConfig": {
     "tag": "latest-7"
   },

src/util.js

@@ -23,7 +23,7 @@ var reservedRe = util.patterns.reservedRe,
  * Node's fs module if available.
  * @type {Object.<string,*>}
  */
-util.fs = util.inquire("fs");
+util.fs = require("./util/fs");
 
 /**
  * Checks a recursion depth.

src/util/fs.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var fs = null;
+try {
+    fs = require(/* webpackIgnore: true */ "fs");
+    if (!fs || !fs.readFile || !fs.readFileSync)
+        fs = null;
+} catch (e) {
+    // `fs` is unavailable in browsers and browser-like bundles.
+}
+module.exports = fs;