diff --git a/package.json b/package.json index c660ce4d50..9d5051bb08 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "@types/semver": "^7.1.0", "@types/shelljs": "^0.8.6", "@types/wait-on": "^5.2.0", - "@types/webpack-dev-server": "^4.1.0", + "@types/webpack-dev-server": "^4.5.0", "@typescript-eslint/eslint-plugin": "^5.4.0", "@typescript-eslint/parser": "^5.4.0", "concurrently": "^6.2.1", diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json index a8c6f575f0..9a7a22a4b5 100644 --- a/packages/docusaurus/package.json +++ b/packages/docusaurus/package.json @@ -118,7 +118,7 @@ "wait-on": "^6.0.0", "webpack": "^5.61.0", "webpack-bundle-analyzer": "^4.4.2", - "webpack-dev-server": "^4.4.0", + "webpack-dev-server": "^4.5.0", "webpack-merge": "^5.8.0", "webpackbar": "^5.0.0-3" }, diff --git a/packages/docusaurus/src/commands/start.ts b/packages/docusaurus/src/commands/start.ts index a8ac0ed6d1..d6bad0d75f 100644 --- a/packages/docusaurus/src/commands/start.ts +++ b/packages/docusaurus/src/commands/start.ts @@ -8,7 +8,6 @@ import {normalizeUrl, posixPath} from '@docusaurus/utils'; import chalk = require('chalk'); import chokidar from 'chokidar'; - import HtmlWebpackPlugin from 'html-webpack-plugin'; import path from 'path'; import {debounce} from 'lodash'; @@ -114,6 +113,7 @@ export default async function start( ? (cliOptions.poll as number) : undefined, }; + const httpsConfig = getHttpsConfig(); const fsWatcher = chokidar.watch(pathsToWatch, { cwd: siteDir, ignoreInitial: true, @@ -177,7 +177,6 @@ export default async function start( errors: true, }, }, - https: getHttpsConfig(), headers: { 'access-control-allow-origin': '*', }, @@ -197,6 +196,15 @@ export default async function start( ...{pollingOptions}, }, })), + ...(httpsConfig && { + server: + typeof httpsConfig === 'object' + ? { + type: 'https', + options: httpsConfig, + } + : 'https', + }), historyApiFallback: { rewrites: [{from: /\/*/, to: baseUrl}], }, diff --git a/yarn.lock b/yarn.lock index 094867335d..bd1a342f57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4674,7 +4674,7 @@ "@types/webpack" "^4" http-proxy-middleware "^1.0.0" -"@types/webpack-dev-server@^4.1.0": +"@types/webpack-dev-server@^4.5.0": version "4.5.0" resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-4.5.0.tgz#52a983de97db81a38b7309a8cf8a730c3e02f28e" integrity sha512-HMb6pZPANObue3LwbdpQLWzQyF9O0wntiPyXj4vGutlAbNKTXH4hDCHaZyfvfZDmFn+5HprrWHm1TGt3awNr/A== @@ -20417,7 +20417,7 @@ webpack-dev-middleware@^5.2.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.4.0: +webpack-dev-server@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.5.0.tgz#614b5112cfa4730a4801bb4ddebb3be5b0d70497" integrity sha512-Ss4WptsUjYa+3hPI4iYZYEc8FrtnfkaPrm5WTjk9ux5kiCS718836srs0ppKMHRaCHP5mQ6g4JZGcfDdGbCjpQ==