Skip to content

Commit e37682f

Browse files
committed
better support for dev without HMR
1 parent 0118d7a commit e37682f

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/packages/static/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
"webpack-prod": "NODE_OPTIONS=--max_old_space_size=8000 NODE_ENV=production npx webpack --progress --color --watch",
1616
"webpack-measure": "COCALC_OUTPUT=dist-measure MEASURE=true NODE_ENV=development pnpm webpack ",
1717
"webpack-measure-prod": "COCALC_OUTPUT=dist-prod-measure MEASURE=true pnpm webpack-prod",
18-
"build": "pnpm run build-dev && ./production-build.py",
19-
"build-dev": "pnpm run copy-css && cd src && ../../node_modules/.bin/tsc --build",
18+
"build0": "pnpm run copy-css && cd src && ../../node_modules/.bin/tsc --build",
19+
"build": "pnpm run build0 && ./production-build.py",
20+
"build-dev": "pnpm run build0 && NODE_ENV=development pnpm rspack build",
2021
"watch": "NODE_ENV=development pnpm rspack build -w",
2122
"test": "pnpm exec jest",
2223
"prepublishOnly": "pnpm test"

src/packages/static/src/rspack.config.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ export default function getConfig({ middleware }: Options = {}) {
7373
const BUILD_DATE = date.toISOString();
7474
const BUILD_TS = date.getTime();
7575
const COCALC_NOCLEAN = !!process.env.COCALC_NOCLEAN;
76-
const WEBPACK_DEV_SERVER =
77-
NODE_ENV != "production" && !process.env.NO_WEBPACK_DEV_SERVER;
76+
const RSPACK_DEV_SERVER =
77+
NODE_ENV != "production" && !process.env.NO_RSPACK_DEV_SERVER;
7878

7979
// output build variables
8080
console.log(`SMC_VERSION = ${SMC_VERSION}`);
@@ -83,7 +83,7 @@ export default function getConfig({ middleware }: Options = {}) {
8383
console.log(`MEASURE = ${MEASURE}`);
8484
console.log(`OUTPUT = ${OUTPUT}`);
8585
console.log(`COCALC_NOCLEAN = ${COCALC_NOCLEAN}`);
86-
console.log(`WEBPACK_DEV_SERVER = ${WEBPACK_DEV_SERVER}`);
86+
console.log(`RSPACK_DEV_SERVER = ${RSPACK_DEV_SERVER}`);
8787

8888
const plugins: WebpackPluginInstance[] = [];
8989
function registerPlugin(
@@ -136,13 +136,13 @@ export default function getConfig({ middleware }: Options = {}) {
136136
throw Error("measure: not implemented");
137137
}
138138

139-
if (WEBPACK_DEV_SERVER) {
139+
if (RSPACK_DEV_SERVER) {
140140
hotModuleReplacementPlugin(registerPlugin);
141141
}
142142

143143
function insertHotMiddlewareUrl(v: string[]): string[] {
144144
const hotMiddlewareUrl = getHotMiddlewareUrl();
145-
if (WEBPACK_DEV_SERVER) {
145+
if (RSPACK_DEV_SERVER) {
146146
v.unshift(hotMiddlewareUrl);
147147
}
148148
return v;
@@ -179,7 +179,7 @@ export default function getConfig({ middleware }: Options = {}) {
179179
chunkFilename: PRODMODE ? "[chunkhash].js" : "[id]-[chunkhash].js",
180180
},
181181
module: {
182-
rules: moduleRules(WEBPACK_DEV_SERVER),
182+
rules: moduleRules(RSPACK_DEV_SERVER),
183183
},
184184
resolve: {
185185
alias: {

0 commit comments

Comments
 (0)