mailgun.js 3.5.6 → 3.6.0

package/index.ts

@@ -2,14 +2,16 @@ import Client from './lib/client';
 import Options from './lib/interfaces/Options';
 import IFormData from './lib/interfaces/IFormData';
 
-export default class Mailgun {
+class Mailgun {
   private formData: new () => IFormData
 
   constructor(FormData: new (...args: any[]) => IFormData) {
     this.formData = FormData;
   }
 
-  client(options: Options) : any {
+  client(options: Options) : Client {
     return new Client(options, this.formData);
   }
 }
+
+export = Mailgun;

package/lib/events.ts

@@ -20,13 +20,16 @@ export default class EventClient {
   _parsePageLinks(response: { body: { paging: any } }) {
     const pages = Object.entries(response.body.paging);
     return pages.reduce(
-      (acc: any, [id, url]: [url: string, id: string]) => {
-        acc[id] = this._parsePage(id, url)
-        return acc
-      }, {});
+      (acc: any, entrie: [url: string, id: string]) => {
+        const id = entrie[0];
+        const url = entrie[1];
+        acc[id] = this._parsePage(id, url);
+        return acc;
+      }, {}
+    );
   }
 
-  _parseEventList(response: { body: { items: any, paging: any }  }) {
+  _parseEventList(response: { body: { items: any, paging: any } }) {
     return {
       items: response.body.items,
       pages: this._parsePageLinks(response)

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "mailgun.js",
-  "version": "3.5.6",
-  "main": "dist/mailgun.js",
+  "version": "3.6.0",
+  "main": "dist/mailgun.node.js",
+  "browser": "dist/mailgun.web.js",
   "types": "dist/index.d.ts",
   "author": "Mailgun",
   "license": "MIT",
@@ -18,8 +19,9 @@
   },
   "homepage": "https://github.com/mailgun/mailgun-js#readme",
   "scripts": {
-    "build": "webpack --config ./webpack.config.js --progress --color",
-    "start": "webpack --watch --config ./webpack.config.js --progress --color",
+    "build": "webpack --config ./webpack/webpack.dev.config.js --progress --color",
+    "build:release": "webpack --config ./webpack/webpack.release.config.js --progress --color",
+    "start": "webpack --watch --config ./webpack/webpack.dev.config.js --progress --color",
     "release": "standard-version -a",
     "test": "multi='dot=- xunit=./results.xml' mocha -t 10000 -R mocha-multi -r ts-node/register test/*.test.ts",
     "test-watch": "mocha -r ts-node/register -w -R dot test/*.test.ts",
@@ -40,7 +42,7 @@
   "devDependencies": {
     "@babel/core": "^7.12.3",
     "@babel/preset-env": "^7.12.1",
-    "@commitlint/cli": "^12.1.4",
+    "@commitlint/cli": "^13.1.0",
     "@commitlint/config-conventional": "^12.1.4",
     "@types/base-64": "^1.0.0",
     "@types/chai": "^4.2.14",
@@ -64,6 +66,7 @@
     "path-browserify": "^1.0.1",
     "should": "^4.1.0",
     "standard-version": "^9.3.1",
+    "terser-webpack-plugin": "^5.2.0",
     "ts-loader": "^8.0.12",
     "ts-node": "^9.1.1",
     "typedoc": "^0.20.36",
@@ -103,7 +106,7 @@
     "commitUrlFormat": "https://github.com/mailgun/mailgun-js/commits/{{hash}}",
     "compareUrlFormat": "https://github.com/mailgun/mailgun-js/compare/{{previousTag}}...{{currentTag}}",
     "scripts": {
-      "prerelease": "npm test && webpack --config ./webpack.release.config.js --progress --color && git add -A dist",
+      "prerelease": "npm test && webpack --config ./webpack/webpack.release.config.js --progress --color && git add -A dist",
       "posttag": "git push && git push --tags && rm -rf build"
     }
   }

package/tsconfig.json

@@ -11,6 +11,7 @@
     "allowSyntheticDefaultImports": true,
     "incremental": true,
     "skipLibCheck": true
+    // "strict": true,
   },
   "typedocOptions": {
     "mode": "modules",

package/tsconfig.webpack.json

@@ -7,4 +7,4 @@
     "**/*.test.ts",
     "node_modules"
   ]
-}
+}

package/webpack/webpack.common.config.js

@@ -0,0 +1,48 @@
+const webpack = require('webpack');
+const path = require('path');
+const pkg = require('../package.json');
+
+
+const SRC_DIR = path.join(__dirname, '../');
+
+const outputDir = 'dist';
+const commonConfig = {
+  mode: 'development',
+  context: SRC_DIR,
+  entry: {
+    mailgun: path.join(SRC_DIR, 'index.ts'),
+    'mailgun.min': path.join(SRC_DIR, 'index.ts')
+  },
+  output: {
+    path: path.join(SRC_DIR, outputDir),
+    filename: 'mailgun.js',
+    library: 'mailgun',
+    libraryTarget: 'umd',
+    globalObject: 'this',
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(ts|js)?/,
+        use: [
+          {
+            loader: 'babel-loader',
+          },
+          {
+            loader: 'ts-loader?configFile='+path.join(SRC_DIR,'tsconfig.webpack.json')
+          }
+        ],
+        exclude: /(node_modules|test)/
+      }
+    ]
+  },
+  plugins: [
+    new webpack.BannerPlugin(`${pkg.name} v${pkg.version}`)
+  ],
+  resolve: {
+    extensions: ['.ts', '.js', '.json']
+  },
+  devtool: 'inline-source-map'
+};
+
+module.exports = commonConfig;

package/webpack/webpack.dev.config.js

@@ -0,0 +1,19 @@
+const commonConfig = require('./webpack.common.config');
+
+const { merge } = require('webpack-merge');
+
+const nodeConf = merge(commonConfig, {
+  target: 'node',
+  output: {
+    filename: 'mailgun.node.js'
+  }
+});
+
+const webConf = merge(commonConfig, {
+  target: 'web',
+  output: {
+    filename: 'mailgun.web.js'
+  }
+});
+
+module.exports = [nodeConf, webConf];

package/webpack/webpack.release.config.js

@@ -0,0 +1,38 @@
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable @typescript-eslint/no-var-requires */
+
+const TerserPlugin = require('terser-webpack-plugin');
+const baseConfig = require('./webpack.common.config');
+
+const { merge } = require('webpack-merge');
+
+const productionConfig = merge(baseConfig, {
+  mode: 'production',
+  devtool: undefined,
+  optimization: {
+      minimize: true,
+    minimizer: [
+      new TerserPlugin({
+        parallel: true,
+        terserOptions: {
+          keep_classnames: true,
+        }
+      }),
+    ],
+  },
+});
+
+const nodeConf = merge(productionConfig, {
+  target: 'node',
+  output: {
+    filename: 'mailgun.node.js'
+  }
+});
+
+const webConf = merge(productionConfig, {
+  target: 'web',
+  output: {
+    filename: 'mailgun.web.js'
+  }
+});
+module.exports = [nodeConf, webConf];

package/.eslintignore

@@ -1,2 +0,0 @@
-dist/*
-docs/assets/js/*

package/webpack.config.js

@@ -1,49 +0,0 @@
-const webpack = require('webpack');
-const path = require('path');
-
-const pkg = require('./package.json');
-
-module.exports = () => {
-  const outputDir = 'dist';
-
-  return {
-    mode: 'development',
-    target: 'node',
-    context: __dirname,
-    entry: {
-      mailgun: path.resolve(__dirname, './index.ts'),
-      'mailgun.min': path.resolve(__dirname, './index.ts')
-    },
-    output: {
-      path: path.resolve('./', outputDir),
-      filename: 'mailgun.js',
-      library: 'mailgun',
-      libraryExport: 'default',
-      libraryTarget: 'umd',
-      globalObject: 'this',
-    },
-    module: {
-      rules: [
-        {
-          test: /\.(ts|js)?/,
-          use: [
-            {
-              loader: 'babel-loader',
-            },
-            {
-              loader: 'ts-loader?configFile=tsconfig.webpack.json',
-            }
-          ],
-          exclude: /(node_modules|test)/
-        }
-      ]
-    },
-    plugins: [
-      new webpack.BannerPlugin(`${pkg.name} v${pkg.version}`)
-    ],
-    resolve: {
-      extensions: ['.ts', '.js', '.json']
-    },
-    devtool: 'inline-source-map'
-  };
-};

package/webpack.release.config.js

@@ -1,16 +0,0 @@
-const path = require('path');
-const { merge } = require('webpack-merge');
-
-const baseConfig = require('./webpack.config.js');
-
-module.exports = (env) => {
-  const outputDir = 'dist';
-
-  return merge(baseConfig(env), {
-    mode: 'production',
-    output: {
-      path: path.resolve('./', outputDir),
-    },
-    devtool: undefined
-  });
-};