diff --git a/.github/workflows/cd-host.yml b/.github/workflows/cd-host.yml index 9583fce5e..b75d31c4a 100644 --- a/.github/workflows/cd-host.yml +++ b/.github/workflows/cd-host.yml @@ -23,12 +23,6 @@ jobs: with: node-version: 18 - - name: Install Yarn - run: npm install --location=global yarn - - - name: Add fixed sharp - run: yarn add sharp@0.33.1 --ignore-engines - - name: Download release assets run: | DOWNLOAD_URL=$(curl -s https://api.github.com/repos/tresabhi/blitzkrieg/releases/latest \ diff --git a/package.json b/package.json index 7629c485c..bd4bfae64 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "build:assets": "vite-node --max_old_space_size=16384 --script scripts/buildAssets/index", "build:test": "vite-node --script scripts/buildTest", "build:ratingsplot": "vite-node --script scripts/buildRatingsPlot", - "dev:bot": "yarn build:bot && yarn start:bot", + "dev:bot": "yarn build:bot --dev && yarn start:bot", "dev:docs": "vitepress dev docs", "dev:website": "next dev", "start:bot": "node --enable-source-maps dist/bot/index.cjs", diff --git a/scripts/build.ts b/scripts/build.ts index 9a6efefcc..73973f30d 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -1,5 +1,8 @@ import { build } from 'esbuild'; import { cp, readdir } from 'fs/promises'; +import { argv } from 'process'; + +const isDev = argv.includes('--dev'); readdir('src/workers').then((workers) => { const files = [ @@ -25,6 +28,7 @@ readdir('src/workers').then((workers) => { '.js': '.cjs', }, + external: ['sharp'], bundle: true, sourcemap: true, minifyIdentifiers: false, // causes goofy errors @@ -42,3 +46,8 @@ readdir('node_modules/prisma').then((files) => .filter((file) => file.endsWith('.node')) .map((file) => cp(`node_modules/prisma/${file}`, `dist/bot/${file}`)), ); + +// copy sharp as is +if (!isDev) { + cp('node_modules/sharp', 'dist/bot/node_modules/sharp', { recursive: true }); +}