Merge pull request #2363 from TeamPiped/pnpm-migration

Migrate project to pnpm.
This commit is contained in:
Kavin 2023-06-17 05:34:26 +01:00 committed by GitHub
commit 184f2ffb44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 4796 additions and 4304 deletions

View File

@ -9,10 +9,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
cache: "yarn" cache: "pnpm"
- run: yarn install --prefer-offline - run: pnpm install
- run: yarn build - run: pnpm build
- run: yarn lint --no-fix - run: pnpm lint --no-fix

View File

@ -12,12 +12,16 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
cache: "yarn" cache: "pnpm"
- run: yarn install --prefer-offline - run: pnpm install
- run: yarn build && ./localizefonts.sh && mv dist/ dist-ci/ - run: pnpm build && ./localizefonts.sh && mv dist/ dist-ci/
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v2
with: with:

View File

@ -1,31 +1,35 @@
name: Build and Deploy name: Build and Deploy
on: on:
push: push:
paths-ignore: paths-ignore:
- "**.md" - "**.md"
branches: branches:
- master - master
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup Node.js - name: Setup pnpm
uses: actions/setup-node@v3 uses: pnpm/action-setup@v2
with: with:
cache: "yarn" version: latest
- run: yarn install --prefer-offline - name: Setup Node.js
- run: yarn build && ./localizefonts.sh && cp dist/index.html dist/ipfs-404.html uses: actions/setup-node@v3
- uses: aquiladev/ipfs-action@v0.3.1-alpha.2 with:
id: ipfs-add cache: "pnpm"
with: - run: pnpm install
path: ./dist - run: pnpm build && ./localizefonts.sh && cp dist/index.html dist/ipfs-404.html
service: infura - uses: aquiladev/ipfs-action@v0.3.1-alpha.2
infuraProjectId: ${{ secrets.INFURA_PROJECT_ID }} id: ipfs-add
infuraProjectSecret: ${{ secrets.INFURA_PROJECT_SECRET }} with:
- name: Update DNSLink path: ./dist
run: npx dnslink-cloudflare -d kavin.rocks -l /ipfs/${{ steps.ipfs-add.outputs.hash }} -r _dnslink.piped-ipfs service: infura
env: infuraProjectId: ${{ secrets.INFURA_PROJECT_ID }}
CF_API_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} infuraProjectSecret: ${{ secrets.INFURA_PROJECT_SECRET }}
- name: Update DNSLink
run: npx dnslink-cloudflare -d kavin.rocks -l /ipfs/${{ steps.ipfs-add.outputs.hash }} -r _dnslink.piped-ipfs
env:
CF_API_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}

View File

@ -8,10 +8,12 @@ RUN --mount=type=cache,target=/var/cache/apk \
COPY . . COPY . .
RUN --mount=type=cache,target=/root/.cache/yarn \ RUN corepack enable && corepack prepare pnpm@latest --activate
RUN --mount=type=cache,target=/root/.local/share/pnpm \
--mount=type=cache,target=/app/node_modules \ --mount=type=cache,target=/app/node_modules \
yarn install --prefer-offline && \ pnpm install --prefer-offline && \
yarn build && ./localizefonts.sh pnpm build && ./localizefonts.sh
FROM nginx:alpine FROM nginx:alpine

View File

@ -32,6 +32,7 @@
"@intlify/vite-plugin-vue-i18n": "6.0.3", "@intlify/vite-plugin-vue-i18n": "6.0.3",
"@unocss/preset-icons": "0.53.1", "@unocss/preset-icons": "0.53.1",
"@unocss/preset-web-fonts": "0.53.1", "@unocss/preset-web-fonts": "0.53.1",
"@unocss/reset": "0.53.1",
"@unocss/transformer-directives": "0.53.1", "@unocss/transformer-directives": "0.53.1",
"@unocss/transformer-variant-group": "0.53.1", "@unocss/transformer-variant-group": "0.53.1",
"@vitejs/plugin-legacy": "4.0.4", "@vitejs/plugin-legacy": "4.0.4",
@ -45,7 +46,8 @@
"unocss": "0.53.1", "unocss": "0.53.1",
"vite": "4.3.9", "vite": "4.3.9",
"vite-plugin-eslint": "1.8.1", "vite-plugin-eslint": "1.8.1",
"vite-plugin-pwa": "0.16.4" "vite-plugin-pwa": "0.16.4",
"workbox-window": "6.5.4"
}, },
"eslintConfig": { "eslintConfig": {
"root": true, "root": true,

4743
pnpm-lock.yaml Normal file

File diff suppressed because it is too large Load Diff

4267
yarn.lock

File diff suppressed because it is too large Load Diff