Merge branch 'master' into fix-typo-error

Author: Xrumet

lib/utils/normalizeOptions.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const path = require('path');
 const isAbsoluteUrl = require('is-absolute-url');
 const getCompilerConfigArray = require('./getCompilerConfigArray');
 
@@ -14,7 +15,7 @@ function normalizeOptions(compiler, options) {
     : {};
 
   const defaultOptionsForStatic = {
-    directory: process.cwd(),
+    directory: path.join(process.cwd(), 'static'),
     staticOptions: {},
     publicPath: ['/'],
     serveIndex: { icons: true },

package-lock.json

@@ -83,7 +83,7 @@
     "eslint-config-prettier": "^6.15.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.22.1",
-    "execa": "^4.1.0",
+    "execa": "^5.0.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^4.5.0",
     "husky": "^4.3.0",

package.json

@@ -0,0 +1 @@
+Heyo.

test/fixtures/contentbase-config/static/index.html

@@ -1,10 +1,16 @@
 'use strict';
 
+const path = require('path');
 const request = require('supertest');
 const config = require('../fixtures/simple-config/webpack.config');
 const testServer = require('../helpers/test-server');
 const port = require('../ports-map')['host-option'];
 
+const staticDirectory = path.resolve(
+  __dirname,
+  '../fixtures/contentbase-config'
+);
+
 describe('host option', () => {
   let server = null;
   let req = null;
@@ -15,6 +21,7 @@ describe('host option', () => {
         config,
         {
           static: {
+            directory: staticDirectory,
             watch: false,
           },
           port,
@@ -44,6 +51,7 @@ describe('host option', () => {
         config,
         {
           static: {
+            directory: staticDirectory,
             watch: false,
           },
           // eslint-disable-next-line no-undefined
@@ -75,6 +83,7 @@ describe('host option', () => {
         config,
         {
           static: {
+            directory: staticDirectory,
             watch: false,
           },
           host: null,
@@ -105,6 +114,7 @@ describe('host option', () => {
         config,
         {
           static: {
+            directory: staticDirectory,
             watch: false,
           },
           host: '127.0.0.1',
@@ -135,6 +145,7 @@ describe('host option', () => {
         config,
         {
           static: {
+            directory: staticDirectory,
             watch: false,
           },
           host: 'localhost',
@@ -165,6 +176,7 @@ describe('host option', () => {
         config,
         {
           static: {
+            directory: staticDirectory,
             watch: false,
           },
           host: '0.0.0.0',