Unverified Commit 2c8f9f8e authored by NGPixel's avatar NGPixel

ci: fix build

parent dadfae40
...@@ -46,13 +46,13 @@ jobs: ...@@ -46,13 +46,13 @@ jobs:
- name: Build Assets - name: Build Assets
working-directory: ux working-directory: ux
run: | run: |
pnpm install pnpm install --frozen-lockfile --shamefully-hoist
pnpm build pnpm build
- name: Build Blocks - name: Build Blocks
working-directory: blocks working-directory: blocks
run: | run: |
pnpm install pnpm install --frozen-lockfile
pnpm build pnpm build
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
......
...@@ -14,6 +14,8 @@ RUN mkdir -p /wiki && \ ...@@ -14,6 +14,8 @@ RUN mkdir -p /wiki && \
mkdir -p /logs && \ mkdir -p /logs && \
mkdir -p /wiki/data/content && \ mkdir -p /wiki/data/content && \
chown -R node:node /wiki /logs chown -R node:node /wiki /logs
RUN corepack enable && \
corepack prepare pnpm@latest --activate
WORKDIR /wiki WORKDIR /wiki
...@@ -28,7 +30,7 @@ USER node ...@@ -28,7 +30,7 @@ USER node
ENV NODE_ENV=production ENV NODE_ENV=production
WORKDIR /wiki/server WORKDIR /wiki/server
RUN npm ci --foreground-scripts --omit=dev --audit=false --fund=false RUN pnpm install --prod --frozen-lockfile
WORKDIR /wiki WORKDIR /wiki
......
...@@ -2,4 +2,3 @@ audit = false ...@@ -2,4 +2,3 @@ audit = false
fund = false fund = false
save-exact = true save-exact = true
save-prefix = "" save-prefix = ""
shamefully-hoist = true
...@@ -90,8 +90,6 @@ module.exports = configure(function (ctx) { ...@@ -90,8 +90,6 @@ module.exports = configure(function (ctx) {
distDir: '../assets', distDir: '../assets',
extendViteConf (viteConf) { extendViteConf (viteConf) {
viteConf.resolve.preserveSymlinks = true
if (ctx.prod) { if (ctx.prod) {
viteConf.build.assetsDir = '_assets' viteConf.build.assetsDir = '_assets'
viteConf.build.rollupOptions = { viteConf.build.rollupOptions = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment