Skip to content

Commit

Permalink
switch from yarn to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewpi committed Feb 23, 2023
1 parent 0d225b0 commit 8320c64
Show file tree
Hide file tree
Showing 10 changed files with 5,745 additions and 5,571 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/laravel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
analysis:
name: Static Analysis
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
APP_ENV: testing
APP_DEBUG: "true"
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:

lint:
name: Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Code checkout
uses: actions/checkout@v3
Expand All @@ -64,7 +64,7 @@ jobs:

mysql:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:

postgres:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
strategy:
fail-fast: false
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: Release
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Code checkout
uses: actions/checkout@v3
Expand All @@ -17,13 +17,13 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: pnpm

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm install

- name: Build
run: yarn build
run: pnpm run build

- name: Create release branch and bump version
env:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Code checkout
uses: actions/checkout@v3
Expand All @@ -22,17 +22,17 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn
cache: pnpm

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm install

- name: Lint
run: yarn run lint
run: pnpm run lint

tests:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -45,13 +45,13 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: yarn
cache: pnpm

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm install

- name: Build
run: yarn run build
run: pnpm run build

- name: Tests
run: yarn run test
run: pnpm run test
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shamefully-hoist=true
63 changes: 0 additions & 63 deletions BUILDING.md

This file was deleted.

3 changes: 1 addition & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
buildInputs = [];

buildPhase = ''
yarn run build
pnpm run build
'';

installPhase = ''
Expand Down Expand Up @@ -224,7 +224,6 @@
nodejs-18_x
nodePackages.npm
nodePackages.pnpm
nodePackages.yarn
php81WithExtensions
postgresql_14
];
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"name": "@pterodactyl/panel",
"version": "1.0.0",
"license": "MIT",
"private": true,
"packageManager": "pnpm@7.26.3",
"engines": {
"node": ">=16.0"
"node": ">=16.13"
},
"scripts": {
"build": "vite build",
Expand Down
Loading

0 comments on commit 8320c64

Please sign in to comment.