chore: revert 17.8.x line

API.md

@@ -2727,7 +2727,6 @@ Requires the string value to be a valid domain name.
 - `options` - optional settings:
     - `allowFullyQualified` - if `true`, domains ending with a `.` character are permitted. Defaults to `false`.
     - `allowUnicode` - if `true`, Unicode characters are permitted. Defaults to `true`.
-    - `allowUnderscore` - if `true`, underscores (`_`) are allowed in the domain name. Defaults to `false`.
     - `minDomainSegments` - number of segments required for the domain. Defaults to `2`.
     - `maxDomainSegments` - maximum number of allowed domain segments. Default to no limit.
     - `tlds` - options for TLD (top level domain) validation. By default, the TLD must be a valid
@@ -2755,7 +2754,6 @@ Requires the string value to be a valid email address.
 - `options` - optional settings:
     - `allowFullyQualified` - if `true`, domains ending with a `.` character are permitted. Defaults to `false`.
     - `allowUnicode` - if `true`, Unicode characters are permitted. Defaults to `true`.
-    - `allowUnderscore` - if `true`, underscores (`_`) are allowed in the domain name. Defaults to `false`.
     - `ignoreLength` - if `true`, ignore invalid email length errors. Defaults to `false`.
     - `minDomainSegments` - number of segments required for the domain. The default setting excludes
       single segment domains such as `example@io` which is a valid email but very uncommon. Defaults

benchmarks/bench.js

@@ -2,7 +2,7 @@
 
 const Fs = require('fs');
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 const Benchmark = require('benchmark');
 const Bossy = require('@hapi/bossy');
 const Chalk = require('chalk');

benchmarks/package.json

@@ -7,13 +7,13 @@
     "full-bench": "npm run bench-update -- --joi @hapi/joi && npm test"
   },
   "dependencies": {
-    "@hapi/bossy": "^6.0.1",
-    "@hapi/hoek": "^11.0.2",
+    "@hapi/bossy": "^4.0.3",
+    "@hapi/hoek": "^6.2.4",
     "@hapi/joi": "^15.1.0",
     "benchmark": "^2.1.4",
     "chalk": "^2.4.1",
-    "cli-table": "^0.3.11",
+    "cli-table": "^0.3.1",
     "d3-format": "^1.3.2",
-    "joi": "^17.8.1"
+    "joi": "^17.6.4"
   }
 }

browser/package.json

@@ -7,22 +7,21 @@
         "test": "karma start"
     },
     "devDependencies": {
-        "@babel/core": "^7.20.12",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/preset-env": "^7.20.2",
-        "@mixer/webpack-bundle-compare": "^0.1.1",
+        "@babel/core": "^7.4.5",
+        "@babel/plugin-proposal-class-properties": "^7.7.4",
+        "@babel/preset-env": "^7.4.5",
         "assert": "^2.0.0",
-        "babel-loader": "^9.1.2",
+        "babel-loader": "^8.0.6",
         "karma": "^4.2.0",
         "karma-chrome-launcher": "^3.0.0",
         "karma-mocha": "^1.3.0",
         "karma-sourcemap-loader": "^0.3.7",
         "karma-webpack": "^5.0.0",
         "mocha": "^6.2.0",
         "mocha-loader": "^2.0.1",
-        "util": "^0.12.5",
-        "webpack": "^5.75.0",
+        "util": "^0.12.4",
+        "webpack": "^5.40.0",
         "webpack-bundle-analyzer": "^3.4.1",
-        "webpack-cli": "^4.10.0"
+        "webpack-cli": "^4.7.2"
     }
 }

browser/tests/index.js

@@ -7,12 +7,7 @@ describe('Joi', () => {
 
     it('should be able to create schemas', () => {
 
-        Joi.boolean().truthy('true');
-        Joi.number().min(5).max(10).multiple(2);
-        Joi.array().items(Joi.number().required());
-        Joi.object({
-            key: Joi.string().required()
-        });
+        Joi.string().min(5);
     });
 
     it('should be able to validate data', () => {
@@ -34,23 +29,5 @@ describe('Joi', () => {
         Assert.ok(!schema.validate('test@example.com').error);
         Assert.ok(schema.validate('test@example.com ').error);
         Assert.ok(!schema.validate('伊昭傑@郵件.商務').error);
-
-        const schema2 = Joi.string().email({ tlds: { allow: false } }).required();
-        Assert.ok(!schema2.validate('test@example.com').error);
-        Assert.ok(schema2.validate('test@example.com ').error);
-        Assert.ok(!schema2.validate('伊昭傑@郵件.商務').error);
-    });
-
-    it('validates domain', () => {
-
-        const schema = Joi.string().domain().required();
-        Assert.ok(!schema.validate('example.com').error);
-        Assert.ok(schema.validate('example.com ').error);
-        Assert.ok(!schema.validate('example.商務').error);
-
-        const schema2 = Joi.string().domain({ tlds: { allow: false } }).required();
-        Assert.ok(!schema2.validate('example.com').error);
-        Assert.ok(schema2.validate('example.com ').error);
-        Assert.ok(!schema2.validate('example.商務').error);
     });
 });

browser/webpack.config.js

@@ -3,7 +3,6 @@
 const Path = require('path');
 
 const Webpack = require('webpack');
-const { BundleComparisonPlugin } = require('@mixer/webpack-bundle-compare');
 
 
 module.exports = {
@@ -17,11 +16,6 @@ module.exports = {
     plugins: [
         new Webpack.DefinePlugin({
             Buffer: false
-        }),
-        new BundleComparisonPlugin({
-            file: '../stats.msp.gz',
-            format: 'msgpack',
-            gzip: true,
         })
     ],
     module: {
@@ -46,16 +40,10 @@ module.exports = {
                             ]
                         ],
                         plugins: [
-                            '@babel/plugin-proposal-class-properties',
-                            '@babel/plugin-proposal-optional-chaining',
-                            '@babel/plugin-proposal-nullish-coalescing-operator',
+                            '@babel/plugin-proposal-class-properties'
                         ]
                     }
                 }
-            },
-            {
-                test: /@(hapi|sideway)\//,
-                sideEffects: false
             }
         ]
     },
@@ -66,8 +54,7 @@ module.exports = {
           [Path.join(__dirname, '../lib/manifest.js')]: false,
           [Path.join(__dirname, '../lib/trace.js')]: false,
           [Path.join(__dirname, '../lib/types/binary.js')]: false,
-          [Path.join(__dirname, '../node_modules/@hapi/tlds/esm/index.js')]: false,
-          [Path.join(__dirname, '../node_modules/@hapi/address/esm/decode.js')]: false,
+          [Path.join(__dirname, '../node_modules/@sideway/address/lib/tlds.js')]: false,
       },
       fallback: {
         url: false,

lib/annotate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Clone = require('@hapi/hoek/clone');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 

lib/base.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
-const DeepEqual = require('@hapi/hoek/deepEqual');
-const Merge = require('@hapi/hoek/merge');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
+const DeepEqual = require('@hapi/hoek/lib/deepEqual');
+const Merge = require('@hapi/hoek/lib/merge');
 
 const Cache = require('./cache');
 const Common = require('./common');

lib/cache.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 

lib/common.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const AssertError = require('@hapi/hoek/assertError');
+const Assert = require('@hapi/hoek/lib/assert');
+const AssertError = require('@hapi/hoek/lib/error');
 
 const Pkg = require('../package.json');
 

lib/compile.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Common = require('./common');
 const Ref = require('./ref');

lib/extend.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 const Messages = require('./messages');

lib/index.d.ts

@@ -290,12 +290,6 @@ declare namespace Joi {
          * @default true
          */
         allowUnicode?: boolean;
-        /**
-         * If `true`, underscores (`_`) are allowed in the domain name
-         *
-         * @default false
-         */
-        allowUnderscore?: boolean;
         /**
          * if `true`, ignore invalid email length errors.
          *
@@ -347,12 +341,7 @@ declare namespace Joi {
          * @default true
          */
         allowUnicode?: boolean;
-        /**
-         * If `true`, underscores (`_`) are allowed in the domain name
-         *
-         * @default false
-         */
-        allowUnderscore?: boolean;
+
         /**
          * Options for TLD (top level domain) validation. By default, the TLD must be a valid name listed on the [IANA registry](http://data.iana.org/TLD/tlds-alpha-by-domain.txt)
          *

lib/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Cache = require('./cache');
 const Common = require('./common');

lib/manifest.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Common = require('./common');
 const Messages = require('./messages');

lib/messages.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
 
 const Template = require('./template');
 

lib/modify.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Common = require('./common');
 const Ref = require('./ref');

lib/ref.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
-const Reach = require('@hapi/hoek/reach');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
+const Reach = require('@hapi/hoek/lib/reach');
 
 const Common = require('./common');
 

lib/state.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Clone = require('@hapi/hoek/clone');
-const Reach = require('@hapi/hoek/reach');
+const Clone = require('@hapi/hoek/lib/clone');
+const Reach = require('@hapi/hoek/lib/reach');
 
 const Common = require('./common');
 

lib/template.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Clone = require('@hapi/hoek/clone');
-const EscapeHtml = require('@hapi/hoek/escapeHtml');
-const Formula = require('@hapi/formula');
+const Assert = require('@hapi/hoek/lib/assert');
+const Clone = require('@hapi/hoek/lib/clone');
+const EscapeHtml = require('@hapi/hoek/lib/escapeHtml');
+const Formula = require('@sideway/formula');
 
 const Common = require('./common');
 const Errors = require('./errors');

lib/trace.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const DeepEqual = require('@hapi/hoek/deepEqual');
-const Pinpoint = require('@hapi/pinpoint');
+const DeepEqual = require('@hapi/hoek/lib/deepEqual');
+const Pinpoint = require('@sideway/pinpoint');
 
 const Errors = require('./errors');
 

lib/types/alternatives.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const Merge = require('@hapi/hoek/merge');
+const Assert = require('@hapi/hoek/lib/assert');
+const Merge = require('@hapi/hoek/lib/merge');
 
 const Any = require('./any');
 const Common = require('../common');

lib/types/any.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Base = require('../base');
 const Common = require('../common');

lib/types/array.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
-const DeepEqual = require('@hapi/hoek/deepEqual');
-const Reach = require('@hapi/hoek/reach');
+const Assert = require('@hapi/hoek/lib/assert');
+const DeepEqual = require('@hapi/hoek/lib/deepEqual');
+const Reach = require('@hapi/hoek/lib/reach');
 
 const Any = require('./any');
 const Common = require('../common');

lib/types/binary.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

lib/types/boolean.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

lib/types/date.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Any = require('./any');
 const Common = require('../common');

lib/types/function.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Assert = require('@hapi/hoek/assert');
+const Assert = require('@hapi/hoek/lib/assert');
 
 const Keys = require('./keys');