diff --git a/.github/workflows/buildDev.yml b/.github/workflows/buildDev.yml index 720dd9e70..6ae23fef9 100644 --- a/.github/workflows/buildDev.yml +++ b/.github/workflows/buildDev.yml @@ -35,29 +35,60 @@ jobs: ref: ${{ github.event.inputs.branch || github.ref }} - uses: pnpm/action-setup@v3 + if: github.ref_name != 'bun' - name: Use Node.js 20 + if: github.ref_name != 'bun' uses: actions/setup-node@v4 with: node-version: 20 cache: "pnpm" - name: Install dependencies + if: github.ref_name != 'bun' run: pnpm install --frozen-lockfile - name: Build web + if: github.ref_name != 'bun' run: pnpm buildWebStandalone - name: Build + if: github.ref_name != 'bun' run: pnpm buildStandalone - name: Generate plugin lists + if: github.ref_name != 'bun' run: | pnpm generatePluginJson dist/plugins.json pnpm generateEquicordPluginJson dist/equicordplugins.json pnpm generateVencordPluginJson dist/vencordplugins.json pnpm generateDevsList dist/devs.json + - uses: actions/checkout@v4 + if: github.ref_name == 'bun' + - uses: oven-sh/setup-bun@v2 + with: + bun-version: latest + - name: Install dependencies + if: github.ref_name == 'bun' + run: bun install + + - name: Build web + if: github.ref_name == 'bun' + run: bun run buildWebStandalone + + - name: Build + if: github.ref_name == 'bun' + run: bun run buildStandalone + + - name: Generate plugin lists + if: github.ref_name == 'bun' + run: | + bun run generatePluginJson dist/plugins.json + bun run generateEquicordPluginJson dist/equicordplugins.json + bun run generateVencordPluginJson dist/vencordplugins.json + bun run generateDevsList dist/devs.json + - name: Upload to Equibuilds repo run: | BRANCH="${{ github.event.inputs.branch || github.ref_name }}" diff --git a/src/equicordplugins/dragify/index.tsx b/src/equicordplugins/dragify/index.tsx index b224d4a1a..ea819273e 100644 --- a/src/equicordplugins/dragify/index.tsx +++ b/src/equicordplugins/dragify/index.tsx @@ -158,7 +158,7 @@ export default definePlugin({ find: '"system:click_outside","user:escape"', replacement: { match: /(?<=GuildChannelUserContextMenu.{0,150})"data-dnd-name":\i/, - replace: "$&\"data-dragify-user\":!0,\"data-user-id\":arguments[0].user?.id,draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].user)," + replace: "\"data-dragify-user\":!0,\"data-user-id\":arguments[0].user?.id,draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].user),$&" } }, {