Merge branch 'master' of github.com:hapijs/joi

.gitignore

@@ -13,3 +13,5 @@ coverage.*
 **/.idea
 
 sandbox.js
+
+dist

.travis.yml

@@ -24,3 +24,13 @@ os:
   - "linux"
   - "osx"
   - "windows"
+
+matrix:
+    include:
+        -   node_js: "node"
+            os: "linux"
+            name: "Browser tests"
+            addons:
+                chrome: stable
+            install: "npm install && cd browser && npm install"
+            script: "pwd && npm test"

browser/.gitignore

@@ -1,3 +1,2 @@
-dist/
 stats.json
 

browser/karma.conf.js

@@ -24,7 +24,7 @@ module.exports = function (config) {
         colors: true,
         logLevel: config.LOG_ERROR,
         autoWatch: true,
-        browsers: ['Chrome'],
+        browsers: ['ChromeHeadless'],
         singleRun: true,
         concurrency: Infinity,
         webpack: WebpackMocha,

browser/webpack.config.js

@@ -6,7 +6,8 @@ const Webpack = require('webpack');
 module.exports = {
     entry: '../lib/index.js',
     output: {
-        filename: './joi-browser.min.js',
+        filename: 'joi-browser.min.js',
+        path: Path.join(__dirname, '../dist'),
         library: 'joi',
         libraryTarget: 'umd'
     },

package.json

@@ -4,6 +4,7 @@
   "version": "16.0.0-preview",
   "repository": "git://github.com/hapijs/joi",
   "main": "lib/index.js",
+  "browser": "dist/joi-browser.min.js",
   "keywords": [
     "schema",
     "validation"
@@ -22,8 +23,13 @@
     "@hapi/joi-legacy-test": "npm:@hapi/[email protected]"
   },
   "scripts": {
+    "prepublishOnly": "cd browser && npm install && npm run build",
     "test": "lab -t 100 -a @hapi/code -L",
     "test-cov-html": "lab -r html -o coverage.html -a @hapi/code"
   },
+  "files": [
+    "lib/**/*",
+    "dist/*"
+  ],
   "license": "BSD-3-Clause"
 }