update scripts, lockfiles

Author: korewaChino

.github/workflows/docker-image.yml

@@ -2,7 +2,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "develop", "c/bun-port" ]
   pull_request:
     branches: [ "develop" ]
 

Dockerfile

@@ -6,10 +6,12 @@ ARG BUN_VERSION=1.1.13-alpine
 # FROM node:${NODE_VERSION} as build
 FROM oven/bun:${BUN_VERSION} as build
 
-RUN apk add git linux-headers build-base
-
+# we need nodejs for node-gyp anyway :sob:
+RUN apk add git linux-headers build-base nodejs npm
+# RUN apt update && apt install -y git build-essential
 ENV PYTHONUNBUFFERED=1
 RUN apk add --update python3 && ln -sf python3 /usr/bin/python
+# RUN apt install -y python3 python3-pip
 RUN python3 -m ensurepip
 RUN pip3 install --no-cache --upgrade pip setuptools
 
@@ -22,26 +24,25 @@ COPY --link . ./
 RUN git submodule update --init --recursive
 # RUN pnpm config set fetch-retries 5
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
-	bun i --frozen-lockfile --aggregate-output --build_v8_with_gn=false
+	bun i --aggregate-output
 RUN bun run --bun build
 RUN bun scripts/trim-deps.mjs
 RUN mv packages/frontend/assets sharkey-assets
-RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
-	bun run --bun prune
+# RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
+	# bun run --bun prune
 RUN rm -r node_modules packages/frontend packages/sw
 RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \
-	bun i --prod --frozen-lockfile --aggregate-output
+	bun i --production --aggregate-output
 RUN rm -rf .git
 
-FROM oven/bun:1.1.13-debian
+FROM oven/bun:${BUN_VERSION}
 
 ARG UID="991"
 ARG GID="991"
 
-RUN apt update && apt install -y ffmpeg tini
-
-RUN groupadd -g ${GID} sharkey \
- 	&& useradd -u ${UID} -g ${GID} sharkey \
+RUN apk add ffmpeg tini jemalloc \
+	&& addgroup -g "${GID}" sharkey \
+	&& adduser -D -u "${UID}" -G sharkey -h /sharkey sharkey \
 	&& find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /u+s -exec chmod u-s {} \; \
 	&& find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /g+s -exec chmod g-s {} \;
 

bun.lockb

@@ -43,10 +43,15 @@
     "lodash": "4.17.21"
   },
   "dependencies": {
+    "cssnano": "^7.0.2",
     "fast-glob": "3.3.2",
     "ignore-walk": "6.0.4",
     "js-yaml": "4.1.0",
-    "tar": "6.2.0"
+    "postcss": "^8.4.38",
+    "re2": "^1.21.3",
+    "tar": "6.2.0",
+    "terser": "^5.31.1",
+    "yaml": "^2.4.5"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "7.1.0",

package.json

@@ -34,12 +34,14 @@ async function loadConfig() {
 	return fs.readFile(configPath, 'utf-8').then(data => yaml.load(data)).catch(() => null);
 }
 
+// We are now building with Bun, so these files will now be in the global node_modules folder
+
 async function copyFrontendFonts() {
-  await fs.cp('./packages/frontend/node_modules/three/examples/fonts', './built/_frontend_dist_/fonts', { dereference: true, recursive: true });
+  await fs.cp('./node_modules/three/examples/fonts', './built/_frontend_dist_/fonts', { dereference: true, recursive: true });
 }
 
 async function copyFrontendTablerIcons() {
-  await fs.cp('./packages/frontend/node_modules/@phosphor-icons/web/src', './built/_frontend_dist_/phosphor-icons', { dereference: true, recursive: true });
+  await fs.cp('./node_modules/@phosphor-icons/web/src', './built/_frontend_dist_/phosphor-icons', { dereference: true, recursive: true });
 }
 
 async function copyFrontendLocales() {

scripts/build-assets.mjs

@@ -30,8 +30,8 @@ const fs = require('fs');
 	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
 
-	execSync('pnpm store prune', {
-		cwd: __dirname + '/../',
-		stdio: 'inherit',
-	});
+	// execSync('pnpm store prune', {
+	// 	cwd: __dirname + '/../',
+	// 	stdio: 'inherit',
+	// });
 })();