@@ -22,13 +22,10 @@ const Server = require('../lib/Server');
22
22
23
23
const colors = require ( '../lib/utils/colors' ) ;
24
24
const createConfig = require ( '../lib/utils/createConfig' ) ;
25
- const createDomain = require ( '../lib/utils/createDomain' ) ;
26
25
const createLogger = require ( '../lib/utils/createLogger' ) ;
27
26
const defaultTo = require ( '../lib/utils/defaultTo' ) ;
28
27
const findPort = require ( '../lib/utils/findPort' ) ;
29
28
const getVersions = require ( '../lib/utils/getVersions' ) ;
30
- const runBonjour = require ( '../lib/utils/runBonjour' ) ;
31
- const status = require ( '../lib/utils/status' ) ;
32
29
const tryParseInt = require ( '../lib/utils/tryParseInt' ) ;
33
30
34
31
let server ;
@@ -159,11 +156,6 @@ function startDevServer(config, options) {
159
156
} ) . apply ( compiler ) ;
160
157
}
161
158
162
- const suffix =
163
- options . inline !== false || options . lazy === true
164
- ? '/'
165
- : '/webpack-dev-server/' ;
166
-
167
159
try {
168
160
server = new Server ( compiler , options , log ) ;
169
161
} catch ( err ) {
@@ -200,52 +192,27 @@ function startDevServer(config, options) {
200
192
}
201
193
} ) ;
202
194
203
- server . listen ( options . socket , options . host , ( err ) => {
195
+ runServer ( ) ;
196
+ } else if ( options . port ) {
197
+ runServer ( ) ;
198
+ } else {
199
+ // only run port finder if no port as been specified
200
+ findPort ( server , DEFAULT_PORT , defaultPortRetry , ( err , port ) => {
204
201
if ( err ) {
205
202
throw err ;
206
203
}
207
- // chmod 666 (rw rw rw)
208
- const READ_WRITE = 438 ;
209
-
210
- fs . chmod ( options . socket , READ_WRITE , ( err ) => {
211
- if ( err ) {
212
- throw err ;
213
- }
214
-
215
- const uri = createDomain ( options , server . listeningApp ) + suffix ;
216
-
217
- status ( uri , options , log , argv . color ) ;
218
- } ) ;
204
+ options . port = port ;
205
+ runServer ( ) ;
219
206
} ) ;
220
- return ;
221
207
}
222
208
223
- const startServer = ( ) => {
209
+ function runServer ( ) {
224
210
server . listen ( options . port , options . host , ( err ) => {
225
211
if ( err ) {
226
212
throw err ;
227
213
}
228
- if ( options . bonjour ) {
229
- runBonjour ( options ) ;
230
- }
231
- const uri = createDomain ( options , server . listeningApp ) + suffix ;
232
- status ( uri , options , log , argv . color ) ;
233
214
} ) ;
234
- } ;
235
-
236
- if ( options . port ) {
237
- startServer ( ) ;
238
- return ;
239
215
}
240
-
241
- // only run port finder if no port as been specified
242
- findPort ( server , DEFAULT_PORT , defaultPortRetry , ( err , port ) => {
243
- if ( err ) {
244
- throw err ;
245
- }
246
- options . port = port ;
247
- startServer ( ) ;
248
- } ) ;
249
216
}
250
217
251
218
processOptions ( config ) ;
0 commit comments