Merge pull request webpack#7310 from kleinph/webpack-serve-config

sokra · web-flow · commit 4c8a8fdcc7af · 2018-05-15T17:10:15.000+02:00
Allow serve property in webpack configuration
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1679,6 +1679,10 @@
         }
       ]
     },
+    "serve": {
+      "description": "Options for webpack-serve",
+      "type": "object"
+    },
     "stats": {
       "description": "Used by the webpack CLI program to pass stats options.",
       "anyOf": [
diff --git a/test/Validation.test.js b/test/Validation.test.js
@@ -199,7 +199,7 @@ describe("Validation", () => {
 				" - configuration has an unknown property 'postcss'. These properties are valid:",
 				"   object { mode?, amd?, bail?, cache?, context?, dependencies?, devServer?, devtool?, entry?, externals?, " +
 					"loader?, module?, name?, node?, output?, optimization?, parallelism?, performance?, plugins?, profile?, recordsInputPath?, " +
-					"recordsOutputPath?, recordsPath?, resolve?, resolveLoader?, stats?, target?, watch?, watchOptions? }",
+					"recordsOutputPath?, recordsPath?, resolve?, resolveLoader?, serve?, stats?, target?, watch?, watchOptions? }",
 				"   For typos: please correct them.",
 				"   For loader options: webpack >= v2.0.0 no longer allows custom properties in configuration.",
 				"     Loaders should be updated to allow passing options via loader options in module.rules.",

Original file line number	Diff line number	Diff line change
`@@ -1679,6 +1679,10 @@`
`1679`	`1679`	`}`
`1680`	`1680`	`]`
`1681`	`1681`	`},`
	`1682`	`+ "serve": {`
	`1683`	`+ "description": "Options for webpack-serve",`
	`1684`	`+ "type": "object"`
	`1685`	`+ },`
`1682`	`1686`	`"stats": {`
`1683`	`1687`	`"description": "Used by the webpack CLI program to pass stats options.",`
`1684`	`1688`	`"anyOf": [`