Skip to content

Commit 350bda2

Browse files
authored
Merge branch 'master' into chore/v10
2 parents 103823d + 0afa04b commit 350bda2

File tree

10 files changed

+151
-88
lines changed

10 files changed

+151
-88
lines changed

examples/cli/watch-static/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CLI: Watch Content Base
1+
# CLI: Static
22

33
## Watching a single directory
44

@@ -29,6 +29,12 @@ module.exports = {
2929
npm run webpack-dev-server -- --open
3030
```
3131

32+
or via CLI only:
33+
34+
```console
35+
npm run webpack-dev-server -- --static assets --static css --open
36+
```
37+
3238
### What Should Happen
3339

3440
1. The script should open `http://localhost:8080/` in your default browser.

examples/cli/watch-static/assets/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<link rel="stylesheet" href="styles.css" type="text/css" charset="utf-8">
55
</head>
66
<body>
7-
<h1>Watch content base</h1>
7+
<h1>Static</h1>
88
<div id="mytext"></div>
99
<script src="bundle.js" type="text/javascript" charset="utf-8"></script>
1010
</body>

lib/Server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ class Server {
504504
}
505505

506506
if (this.options.https) {
507-
for (const property of ['ca', 'pfx', 'key', 'cert']) {
507+
for (const property of ['cacert', 'pfx', 'key', 'cert']) {
508508
const value = this.options.https[property];
509509
const isBuffer = value instanceof Buffer;
510510

lib/options.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"properties": {
88
"directory": {
99
"type": "string",
10-
"minLength": 1
10+
"minLength": 1,
11+
"description": "Directory for static contents."
1112
},
1213
"staticOptions": {
1314
"type": "object",
@@ -48,9 +49,11 @@
4849
"type": "boolean"
4950
},
5051
{
51-
"type": "object"
52+
"type": "object",
53+
"description": "options for watch, you can find at https://github.com/paulmillr/chokidar"
5254
}
53-
]
55+
],
56+
"description": "Watch for files in static content directory."
5457
}
5558
}
5659
},
@@ -309,7 +312,7 @@
309312
"requestCert": {
310313
"type": "boolean"
311314
},
312-
"ca": {
315+
"cacert": {
313316
"anyOf": [
314317
{
315318
"type": "string"

package-lock.json

Lines changed: 58 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"p-retry": "^4.5.0",
5353
"portfinder": "^1.0.28",
5454
"schema-utils": "^3.0.0",
55-
"selfsigned": "^1.10.8",
55+
"selfsigned": "^1.10.11",
5656
"serve-index": "^1.9.1",
5757
"sockjs": "^0.3.21",
5858
"spdy": "^4.0.2",
@@ -66,16 +66,16 @@
6666
"@babel/core": "^7.14.0",
6767
"@babel/plugin-transform-object-assign": "^7.12.13",
6868
"@babel/plugin-transform-runtime": "^7.13.15",
69-
"@babel/preset-env": "^7.14.0",
69+
"@babel/preset-env": "^7.14.1",
7070
"@babel/runtime": "^7.14.0",
7171
"@commitlint/cli": "^12.1.1",
7272
"@commitlint/config-conventional": "^12.1.1",
7373
"@jest/test-sequencer": "^26.6.3",
74-
"acorn": "^8.2.2",
74+
"acorn": "^8.2.4",
7575
"babel-jest": "^26.6.3",
7676
"babel-loader": "^8.2.2",
7777
"body-parser": "^1.19.0",
78-
"core-js": "^3.11.1",
78+
"core-js": "^3.11.2",
7979
"css-loader": "^5.2.4",
8080
"eslint": "^7.25.0",
8181
"eslint-config-prettier": "^8.3.0",
@@ -94,11 +94,11 @@
9494
"memfs": "^3.2.2",
9595
"npm-run-all": "^4.1.5",
9696
"prettier": "^2.2.1",
97-
"puppeteer": "^9.0.0",
97+
"puppeteer": "^9.1.1",
9898
"require-from-string": "^2.0.2",
9999
"rimraf": "^3.0.2",
100100
"sockjs-client": "^1.5.1",
101-
"standard-version": "^9.2.0",
101+
"standard-version": "^9.3.0",
102102
"style-loader": "^2.0.0",
103103
"supertest": "^6.1.3",
104104
"tcp-port-used": "^1.0.2",

0 commit comments

Comments
 (0)