Update build tooling and exports

.babelrc

@@ -1,24 +1,5 @@
 {
-    "env": {
-        "es": {
-            "presets": [
-                ["@babel/preset-env", {
-                    "modules": false
-                }]
-            ]
-        },
-        "development": {
-            "presets": [
-                ["@babel/preset-env", { "targets": { "node": "0.10" } }]
-            ],
-            "plugins": [
-                [
-                    "add-module-exports",
-                    {
-                        "addDefaultProperty": true
-                    }
-                ]
-            ]
-        }
-    }
+    "presets": [
+        "@babel/preset-env"
+    ]
 }

.eslintrc.json

@@ -1,40 +1,51 @@
 {
   "extends": "airbnb-base",
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "parserOptions": {
-    "ecmaVersion": 6,
-    "sourceType": "module"
+    "sourceType": "module",
+    "allowImportExportEverywhere": false
   },
   "env": {
-    "es6": true,
+    "es2017": true,
     "browser": true,
     "node": true,
     "mocha": true
   },
   "rules": {
+    "arrow-parens": 0,
     "camelcase": 0,
+    "comma-dangle": [
+      2,
+      {
+        "arrays": "always-multiline",
+        "objects": "always-multiline",
+        "imports": "always-multiline",
+        "exports": "always-multiline",
+        "functions": "never"
+      }
+    ],    
+    "func-names": 0,
+    "implicit-arrow-linebreak": 0,
+    "linebreak-style": 0,
+    "newline-per-chained-call": 0,
+    "no-console": 0,
+    "no-misleading-character-class": 0,
+    "no-multiple-empty-lines": 0,
     "no-param-reassign": 0,
+    "no-prototype-builtins": 0,
+    "no-plusplus": [
+      2,
+      {
+        "allowForLoopAfterthoughts": true
+      }
+    ],
+    "no-restricted-globals": 0,
+    "no-restricted-syntax": [2, "DebuggerStatement", "LabeledStatement", "WithStatement"],
+    "no-useless-escape": 0,
     "one-var": 0,
     "one-var-declaration-per-line": 0,
-    "func-names": 0,
-    "no-console": 0,
-    "newline-per-chained-call": 0,
+    "operator-linebreak": 0,
     "prefer-const": 0,
-    "linebreak-style": 0,
-    "no-restricted-syntax": [2, "DebuggerStatement", "LabeledStatement", "WithStatement"],
-    "no-restricted-globals": 0,
-    "prefer-destructuring": 0,
-    "comma-dangle": [2, {
-      "arrays": "always-multiline",
-      "objects": "always-multiline",
-      "imports": "always-multiline",
-      "exports": "always-multiline",
-      "functions": "never"
-    }],
-    "no-plusplus": [2, {
-      "allowForLoopAfterthoughts": true
-    }],
-    "no-prototype-builtins": 0,
-    "no-useless-escape": 0
+    "prefer-destructuring": 0
   }
 }

.github/workflows/ci.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        node-version: [14, 12, 10, 8, 6]
+        node-version: [16, 14, 12]
     name: Run tests on Node.js ${{ matrix.node-version }}
     steps:
     - name: Setup Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2-beta
+      uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
         check-latest: true
@@ -23,8 +23,5 @@ jobs:
       run: npm install
     - name: Run tests
       run: npm test
-    - if: matrix.node-version == 14
-      name: Send coverage info to Codecov
-      uses: codecov/codecov-action@v1
-      with:
-        file: ./coverage/cobertura-coverage.xml
+    - name: Send coverage info to Codecov
+      uses: codecov/codecov-action@v2

.github/workflows/npm-publish.yml

@@ -6,10 +6,10 @@ jobs:
   publish:
     runs-on: ubuntu-20.04
     steps:
-    - name: Setup Node.js 14
-      uses: actions/setup-node@v2-beta
+    - name: Setup Node.js
+      uses: actions/setup-node@v2
       with:
-        node-version: 14
+        node-version: 16
         check-latest: true
         registry-url: https://registry.npmjs.org/
     - name: Checkout Repository

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Chris O'Hara <cohara87@gmail.com>
+Copyright (c) 2021 Chris O'Hara <cohara87@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -20,57 +20,76 @@ Passing anything other than a string will result in an error.
 
 ## Installation and Usage
 
-### Server-side usage
-
 Install the library with `npm install validator`
 
-#### No ES6
+### CommonJS (Node.js)
+
+The library can be imported in node using the `require` syntax:
 
 ```javascript
-var validator = require('validator');
+const validator = require('validator');
 
 validator.isEmail('foo@bar.com'); //=> true
 ```
 
-#### ES6
+### ECMAScript modules
+
+The library can be used as an ECMAScript module with the `import` syntax:
 
 ```javascript
 import validator from 'validator';
-```
-
-Or, import only a subset of the library:
 
-```javascript
-import isEmail from 'validator/lib/isEmail';
+validator.isEmail('foo@bar.com'); //=> true
 ```
 
-#### Tree-shakeable ES imports
+You can also import only a subset of the library:
+
 
 ```javascript
-import isEmail from 'validator/es/lib/isEmail';
-```
+import { isEmail, isURL } from 'validator';
 
-### Client-side usage
+isEmail('foo@bar.com'); //=> true
+isURL('bar.com'); // => true
+```
 
-The library can be loaded either as a standalone script, or through an [AMD][amd]-compatible loader
+### UMD (Browsers)
+The library can be loaded either as a standalone script, or through an [AMD][amd]-compatible loader:
 
 ```html
 <script type="text/javascript" src="validator.min.js"></script>
 <script type="text/javascript">
   validator.isEmail('foo@bar.com'); //=> true
 </script>
 ```
+### CDN
+
+For CDN, you can use [unpkg][unpkg] or [jsDelivr][jsdelivr] and if you need a specific version you can just replace `latest` with the version number.
 
-The library can also be installed through [bower][bower]
+```html
+<script src="https://unpkg.com/validator@latest"></script>
+<script type="text/javascript">
+  validator.isEmail('foo@bar.com'); //=> true
+</script>
+```
 
-```bash
-$ bower install validator-js
+```html
+<script src="https://cdn.jsdelivr.net/npm/validator@latest"></script>
+<script type="text/javascript">
+  validator.isEmail('foo@bar.com'); //=> true
+</script>
 ```
 
-CDN
+#### JavaScript modules
 
+If you target browsers that [support](https://caniuse.com/es6-module) JavaScript module scripts (aka ES6 modules), you can import the library as a module from `unpkg` or `jsDelivr`.
 ```html
-<script src="https://unpkg.com/validator@latest/validator.min.js"></script>
+<script type="module">
+  import { isEmail, isURL } from 'https://unpkg.com/validator?module'; // or https://cdn.jsdelivr.net/npm/validator/+esm if you want to use jsDelivr
+
+  isEmail('foo@bar.com'); //=> true
+  isURL('bar.com'); // => true
+</script>
+
 ```
 
 ## Contributors
@@ -206,7 +225,6 @@ In general, we follow the "fork-and-pull" Git workflow.
 3. Work on your fork
     1. Make your changes and additions
         - Most of your changes should be focused on `src/` and `test/` folders and/or `README.md`.
-        - Files such as `validator.js`, `validator.min.js` and files in `lib/` folder are autogenerated when running tests (`npm test`) and need not to be changed **manually**.
     2. Change or add tests if needed
     3. Run tests and make sure they pass
     4. Add changes to README.md if needed
@@ -238,7 +256,7 @@ Remember, validating can be troublesome sometimes. See [A list of articles about
 ## License (MIT)
 
 ```
-Copyright (c) 2018 Chris O'Hara <cohara87@gmail.com>
+Copyright (c) 2021 Chris O'Hara <cohara87@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -278,7 +296,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 [huntr-image]: https://cdn.huntr.dev/huntr_security_badge_mono.svg
 
 [amd]: http://requirejs.org/docs/whyamd.html
-[bower]: http://bower.io/
-
+[unpkg]: http://unpkg.com/
+[jsdelivr]: https://jsdelivr.com/
 [mongoid]: http://docs.mongodb.org/manual/reference/object-id/
 [ISIN]: https://en.wikipedia.org/wiki/International_Securities_Identification_Number