Merge branch 'esm-compatibility' into mitar

Author: mitar

lib/index.js

@@ -14,32 +14,30 @@ const poolFactory = (Client) => {
   }
 }
 
-module.exports = {
-  defaults: defaults,
-  _pools: [],
-  Connection: Connection,
-  types: require('pg-types'),
-  DatabaseError: DatabaseError,
+var PG = function (exports, clientConstructor) {
+  exports.defaults = defaults
+  exports.Client = clientConstructor
+  exports.Query = exports.Client.Query
+  exports.Pool = poolFactory(exports.Client)
+  exports._pools = []
+  exports.Connection = Connection
+  exports.types = require('pg-types')
+  exports.DatabaseError = DatabaseError
 }
 
 if (typeof process.env.NODE_PG_FORCE_NATIVE !== 'undefined') {
-  var nativeClient = require('./native')
-  module.exports.Client = nativeClient
-  module.exports.Query = nativeClient.Query
-  module.exports.Pool = poolFactory(nativeClient)
+  PG(module.exports, require('./native'))
 } else {
-  module.exports.Client = Client
-  module.exports.Query = Client.Query
-  module.exports.Pool = poolFactory(Client)
+  PG(module.exports, Client)
 
   // lazy require native module...the native module may not have installed
   Object.defineProperty(module.exports, 'native', {
     configurable: true,
     enumerable: false,
     get() {
-      var native = null
+      var native = {}
       try {
-        native = new PG(require('./native'))
+        PG(native, require('./native'))
       } catch (err) {
         if (err.code !== 'MODULE_NOT_FOUND') {
           throw err