From 2c8f9f8e307bdc08f0faa4ebbd0f0616a0edb8f5 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Sun, 22 Oct 2023 22:23:12 +0000
Subject: [PATCH] ci: fix build

---
 .github/workflows/build.yml | 4 ++--
 dev/build/Dockerfile        | 4 +++-
 ux/.npmrc                   | 1 -
 ux/quasar.config.js         | 2 --
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9dc28e31..e1cc4d1d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,13 +46,13 @@ jobs:
     - name: Build Assets
       working-directory: ux
       run: |
-        pnpm install
+        pnpm install --frozen-lockfile --shamefully-hoist
         pnpm build
 
     - name: Build Blocks
       working-directory: blocks
       run: |
-        pnpm install
+        pnpm install --frozen-lockfile
         pnpm build
 
     - name: Login to GitHub Container Registry
diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile
index 0b130fca..78e9d360 100644
--- a/dev/build/Dockerfile
+++ b/dev/build/Dockerfile
@@ -14,6 +14,8 @@ RUN mkdir -p /wiki && \
     mkdir -p /logs && \
     mkdir -p /wiki/data/content && \
     chown -R node:node /wiki /logs
+RUN corepack enable && \
+    corepack prepare pnpm@latest --activate
 
 WORKDIR /wiki
 
@@ -28,7 +30,7 @@ USER node
 ENV NODE_ENV=production
 
 WORKDIR /wiki/server
-RUN npm ci --foreground-scripts --omit=dev --audit=false --fund=false
+RUN pnpm install --prod --frozen-lockfile
 
 WORKDIR /wiki
 
diff --git a/ux/.npmrc b/ux/.npmrc
index 34629cc4..870e47c7 100644
--- a/ux/.npmrc
+++ b/ux/.npmrc
@@ -2,4 +2,3 @@ audit = false
 fund = false
 save-exact = true
 save-prefix = ""
-shamefully-hoist = true
diff --git a/ux/quasar.config.js b/ux/quasar.config.js
index e0b233d4..bd7f7764 100644
--- a/ux/quasar.config.js
+++ b/ux/quasar.config.js
@@ -90,8 +90,6 @@ module.exports = configure(function (ctx) {
       distDir: '../assets',
 
       extendViteConf (viteConf) {
-        viteConf.resolve.preserveSymlinks = true
-
         if (ctx.prod) {
           viteConf.build.assetsDir = '_assets'
           viteConf.build.rollupOptions = {