Skip to content

Commit

Permalink
chore(server): remove dev middlewares + merge start:{dev-server,serve…
Browse files Browse the repository at this point in the history
…r} scripts (#8950)

Hot Module Reloading (HMR) still works without those dev middlewares,
because `webpack-dev-server` is configured in the client's webpack config.

Also, `start:dev-server` and `start:server` really seemed to do the same,
except that `start:server` did not auto-reload. This was a pity, because it
meant that `yarn start` was not actually a good shortcut for `yarn dev`.

Co-authored-by: Claas Augner <caugner@mozilla.com>
  • Loading branch information
OnkarRuikar and caugner authored Jul 18, 2023
1 parent ec97a3d commit 2805415
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 68 deletions.
2 changes: 1 addition & 1 deletion Procfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server: yarn start:dev-server
server: yarn start:server
type-check: cd client && tsc --noEmit --watch
web: yarn start:client
ssr: yarn watch:ssr
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
"prettier-format": "prettier --write .",
"start": "(test -f client/build/index.html || yarn build:client) && (test -f ssr/dist/main.js || yarn build:ssr) && (test -d client/build/en-us/_spas || yarn tool spas) && nf -j Procfile.start start",
"start:client": "cd client && cross-env NODE_ENV=development BABEL_ENV=development BROWSER=none PORT=3000 node scripts/start.js",
"start:dev-server": "node-dev --experimental-loader ts-node/esm server/index.ts",
"start:server": "ts-node server/index.ts",
"start:server": "node-dev --experimental-loader ts-node/esm server/index.ts",
"start:static-server": "ts-node server/static.ts",
"style-dictionary": "style-dictionary build -c sd-config.js",
"stylelint": "stylelint \"**/*.scss\"",
Expand Down Expand Up @@ -253,9 +252,7 @@
"use-debounce": "^9.0.4",
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4",
"webpack-dev-middleware": "^6.1.1",
"webpack-dev-server": "^4.15.1",
"webpack-hot-middleware": "^2.25.4",
"webpack-manifest-plugin": "^5.0.0",
"webpack-node-externals": "^3.0.0",
"workbox-webpack-plugin": "^7.0.0"
Expand Down
39 changes: 0 additions & 39 deletions server/dev.ts

This file was deleted.

2 changes: 0 additions & 2 deletions server/middlewares.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
import { STATIC_ROOT } from "../libs/env/index.js";
import { resolveFundamental } from "../libs/fundamental-redirects/index.js";
import { getLocale } from "../libs/locale-utils/index.js";
import { devMiddlewares } from "./dev.js";

// Lowercase every request because every possible file we might have
// on disk is always in lowercase.
Expand Down Expand Up @@ -53,7 +52,6 @@ const originRequest = (req, res, next) => {
};

export const staticMiddlewares = [
...devMiddlewares,
slugRewrite,
express.static(STATIC_ROOT, {
setHeaders: (res) => {
Expand Down
24 changes: 2 additions & 22 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3588,7 +3588,7 @@ ansi-escapes@^6.0.0:
dependencies:
type-fest "^3.0.0"

ansi-html-community@0.0.8, ansi-html-community@^0.0.8:
ansi-html-community@^0.0.8:
version "0.0.8"
resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
Expand Down Expand Up @@ -9744,7 +9744,7 @@ media-typer@0.3.0:
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==

memfs@^3.1.2, memfs@^3.4.12, memfs@^3.4.3:
memfs@^3.1.2, memfs@^3.4.3:
version "3.4.12"
resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.12.tgz#d00f8ad8dab132dc277c659dc85bfd14b07d03bd"
integrity sha512-BcjuQn6vfqP+k100e0E9m61Hyqa//Brp+I3f0OBmN0ATHlFA8vx3Lt8z57R3u2bPqe3WGDBC+nF72fTH7isyEw==
Expand Down Expand Up @@ -14752,17 +14752,6 @@ webpack-dev-middleware@^5.3.1:
range-parser "^1.2.1"
schema-utils "^4.0.0"

webpack-dev-middleware@^6.1.1:
version "6.1.1"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-6.1.1.tgz#6bbc257ec83ae15522de7a62f995630efde7cc3d"
integrity sha512-y51HrHaFeeWir0YO4f0g+9GwZawuigzcAdRNon6jErXy/SqV/+O6eaVAzDqE6t3e3NpGeR5CS+cCDaTC+V3yEQ==
dependencies:
colorette "^2.0.10"
memfs "^3.4.12"
mime-types "^2.1.31"
range-parser "^1.2.1"
schema-utils "^4.0.0"

webpack-dev-server@^4.15.1:
version "4.15.1"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
Expand Down Expand Up @@ -14799,15 +14788,6 @@ webpack-dev-server@^4.15.1:
webpack-dev-middleware "^5.3.1"
ws "^8.13.0"

webpack-hot-middleware@^2.25.4:
version "2.25.4"
resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.4.tgz#d8bc9e9cb664fc3105c8e83d2b9ed436bee4e193"
integrity sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w==
dependencies:
ansi-html-community "0.0.8"
html-entities "^2.1.0"
strip-ansi "^6.0.0"

webpack-manifest-plugin@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-5.0.0.tgz#084246c1f295d1b3222d36e955546433ca8df803"
Expand Down

0 comments on commit 2805415

Please sign in to comment.