@scaleway/regex 2.2.2 → 2.2.3

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### 2.2.3 (2022-04-26)
+
+
+### Bug Fixes
+
+* **regex:** improve url regex ([#736](https://github.com/scaleway/scaleway-lib/issues/736)) ([c340227](https://github.com/scaleway/scaleway-lib/commit/c340227da34141c978237e7659404df84e680d7a))
+
+
+
 ### 2.2.2 (2022-04-05)
 
 **Note:** Version bump only for package @scaleway/regex

package/dist/index.browser.js

@@ -12,21 +12,19 @@ const alphanumLowercase = /^[a-z0-9]+$/;
 const alphanumSpacesDotsUnderscoreDash = /^[a-zA-Z0-9-.\s_]*$/;
 const alphanumUnderscoreDash = /^[a-zA-Z0-9_-]*$/;
 const alphanumUnderscoreDollarDash = /^[a-zA-Z0-9_$-]*$/;
-const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/; // eslint-disable-next-line no-control-regex
-
+const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/;
 const ascii = /^[\x00-\x7F]+$/;
 const backupKey = /^[A-Z0-9]{32}$/;
 const basicDomain = /^[a-z0-9-]+(\.[a-z0-9-]{1,63})+$/;
 const cron = /^[0-9,/*-]+$/;
 const digits = /^[0-9]*$/;
-const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/; // Used by W3C
-
+const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/;
 const email = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 const fourDigitsCode = /^[0-9]{4}$/;
 const phone = /^\+[0-9]*/;
 const spaces = /^\s*$/;
 const sixDigitsCode = /^[0-9]{6}$/;
-const url = /^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([-.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/;
+const url = /^http(s)?:\/\/?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/;
 const hexadecimal = /^[0-9a-fA-F]+$/;
 
 export { absoluteLinuxPath, alpha, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, macAddress, phone, sixDigitsCode, spaces, url };

package/dist/index.js

@@ -12,21 +12,19 @@ const alphanumLowercase = /^[a-z0-9]+$/;
 const alphanumSpacesDotsUnderscoreDash = /^[a-zA-Z0-9-.\s_]*$/;
 const alphanumUnderscoreDash = /^[a-zA-Z0-9_-]*$/;
 const alphanumUnderscoreDollarDash = /^[a-zA-Z0-9_$-]*$/;
-const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/; // eslint-disable-next-line no-control-regex
-
+const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/;
 const ascii = /^[\x00-\x7F]+$/;
 const backupKey = /^[A-Z0-9]{32}$/;
 const basicDomain = /^[a-z0-9-]+(\.[a-z0-9-]{1,63})+$/;
 const cron = /^[0-9,/*-]+$/;
 const digits = /^[0-9]*$/;
-const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/; // Used by W3C
-
+const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/;
 const email = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 const fourDigitsCode = /^[0-9]{4}$/;
 const phone = /^\+[0-9]*/;
 const spaces = /^\s*$/;
 const sixDigitsCode = /^[0-9]{6}$/;
-const url = /^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([-.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/;
+const url = /^http(s)?:\/\/?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/;
 const hexadecimal = /^[0-9a-fA-F]+$/;
 
 export { absoluteLinuxPath, alpha, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, macAddress, phone, sixDigitsCode, spaces, url };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/regex",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "A small utility to use regex",
   "type": "module",
   "main": "dist/index.js",
@@ -18,5 +18,5 @@
     "directory": "packages/regex"
   },
   "license": "MIT",
-  "gitHead": "f5789858da50231e50baa15f68e757696c838a65"
+  "gitHead": "ff7f6755c6eac35e88d2c8f177fc74c678095800"
 }