Skip to content

Commit 1b51835

Browse files
committed
test: replace http-server with serve to create a test server (#4056)
Fixes Windows compatibility caused by http-party/http-server#525 And, serve is better maintained than http-server or ecstatic. (cherry picked from commit 3648a51)
1 parent 7597c60 commit 1b51835

File tree

14 files changed

+25
-12
lines changed

14 files changed

+25
-12
lines changed

packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(50000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const path = require('path')
22
const portfinder = require('portfinder')
3-
const { createServer } = require('http-server')
3+
const createServer = require('@vue/cli-test-utils/createServer')
44
const create = require('@vue/cli-test-utils/createTestProject')
55
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
66
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service-global/__tests__/globalService.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(40000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const execa = require('execa')
88
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
99
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(20000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const execa = require('execa')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
99

packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(20000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const execa = require('execa')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
99

packages/@vue/cli-service/__tests__/build.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service/__tests__/buildLib.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(40000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service/__tests__/buildWc.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service/__tests__/buildWcAsync.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(15000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service/__tests__/cors.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service/__tests__/modernMode.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ jest.setTimeout(50000)
33
const fs = require('fs-extra')
44
const path = require('path')
55
const portfinder = require('portfinder')
6-
const { createServer } = require('http-server')
6+
const createServer = require('@vue/cli-test-utils/createServer')
77
const { defaultPreset } = require('@vue/cli/lib/options')
88
const create = require('@vue/cli-test-utils/createTestProject')
99
const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')

packages/@vue/cli-service/__tests__/multiPage.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.setTimeout(80000)
22

33
const path = require('path')
44
const portfinder = require('portfinder')
5-
const { createServer } = require('http-server')
5+
const createServer = require('@vue/cli-test-utils/createServer')
66
const { defaultPreset } = require('@vue/cli/lib/options')
77
const create = require('@vue/cli-test-utils/createTestProject')
88
const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const handler = require('serve-handler')
2+
const http = require('http')
3+
4+
module.exports = function createServer (options) {
5+
const server = http.createServer((request, response) => {
6+
return handler(request, response, {
7+
public: options.root
8+
})
9+
})
10+
11+
return server
12+
}

packages/@vue/cli-test-utils/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"fs-extra": "^7.0.1",
2727
"json-server": "^0.14.0",
2828
"puppeteer": "^1.11.0",
29+
"serve-handler": "^6.0.1",
2930
"strip-ansi": "^5.2.0"
3031
}
3132
}

0 commit comments

Comments
 (0)