Fixes and rebases

Dockerfile

@@ -1,27 +1,29 @@
 # Build assets
 FROM node:16-alpine as node
 
-RUN apk add --no-cache git openssh make g++ util-linux
+RUN apk add --no-cache git openssh make g++ util-linux curl && curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm
 
 WORKDIR /build
 
-# Install dependencies
-COPY package*.json yarn.lock ./
-RUN yarn install --ignore-scripts --network-timeout 1000000
+# Install dependencies from lock file
+COPY pnpm-lock.yaml ./
+RUN pnpm fetch
 
-# Copy config files
-COPY .* webpack*.js ./
+# Copy files
+COPY package.json .* webpack*.js ./
 
 # Copy assets to build
 COPY assets ./assets
 
+# Install dependencies
+RUN pnpm install -r --offline
+
 # Do the build
-RUN yarn build
+RUN pnpm build
 
 FROM golang:1.17.2-alpine AS builder
 
-RUN apk add --no-cache git ca-certificates
-RUN mkdir /dozzle
+RUN apk add --no-cache git ca-certificates && mkdir /dozzle
 
 WORKDIR /dozzle
 

Makefile

@@ -5,13 +5,13 @@ clean:
 
 .PHONY: static
 static:
-	@yarn build
+	@pnpm build
 
 .PHONY: fake_static
 fake_static:
-	@echo 'Skipping yarn build'
+	@echo 'Skipping asset build'
 	@mkdir -p static
-	@echo "yarn build was skipped" > static/index.html
+	@echo "assets build was skipped" > static/index.html
 
 .PHONY: test
 test: fake_static
@@ -27,7 +27,7 @@ docker:
 
 .PHONY: dev
 dev:
-	yarn dev
+	pnpm dev
 
 .PHONY: int
 int:

README.md

@@ -172,5 +172,5 @@ To Build and test locally:
 1. Install NodeJs.
 2. Install Go.
 3. Install [reflex](https://github.com/cespare/reflex) with `get -u github.com/cespare/reflex` outside of dozzle.
-4. Install node modules with `yarn`.
-5. Do `yarn dev`
+4. Install node modules with `pnpm`.
+5. Do `pnpm dev`

package.json

@@ -6,11 +6,9 @@
   "watch": "npm-run-all -p watch:*",
   "watch:assets": "webpack --mode=development --watch",
   "watch:server": "LIVE_FS=true reflex -c .reflex",
-  "predev": "make fake_static",
-  "dev": "npm-run-all -p dev-server watch:server",
+  "dev": "make fake_static && npm-run-all -p dev-server watch:server",
   "dev-server": "webpack serve --mode=development",
-  "prebuild": "yarn clean",
-  "build": "yarn webpack --mode=production",
+  "build": "rm -rf static && webpack --mode=production --progress",
   "clean": "rm -rf static",
   "release": "release-it",
   "test": "TZ=UTC jest",