feat: use pnpm
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
Dominik Pschenitschni 2022-04-09 20:12:38 +02:00
parent 1ce89b1440
commit 922badd4da
Signed by: dpschen
GPG Key ID: B257AC0149F43A77
10 changed files with 13569 additions and 14206 deletions

View File

@ -34,7 +34,7 @@ steps:
# endpoint: https://s3.fr-par.scw.cloud
# region: fr-par
# path_style: true
# cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
# cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
# mount:
# - '.cache'
@ -42,10 +42,10 @@ steps:
image: node:16
pull: true
environment:
YARN_CACHE_FOLDER: .cache/yarn/
PNPM_CACHE_FOLDER: .cache/pnpm/
CYPRESS_CACHE_FOLDER: .cache/cypress/
commands:
- yarn --frozen-lockfile --network-timeout 100000
- pnpm install --fetch-timeout 100000
# depends_on:
# - restore-cache
@ -63,7 +63,7 @@ steps:
# endpoint: https://s3.fr-par.scw.cloud
# region: fr-par
# path_style: true
# cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
# cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
# mount:
# - '.cache'
# depends_on:
@ -73,10 +73,10 @@ steps:
image: node:16
pull: true
environment:
YARN_CACHE_FOLDER: .cache/yarn/
PNPM_CACHE_FOLDER: .cache/pnpm/
CYPRESS_CACHE_FOLDER: .cache/cypress/
commands:
- yarn run lint
- pnpm run lint
depends_on:
- dependencies
@ -84,9 +84,9 @@ steps:
image: node:16
pull: true
environment:
YARN_CACHE_FOLDER: .cache/yarn/
PNPM_CACHE_FOLDER: .cache/pnpm/
commands:
- yarn build
- pnpm run build
depends_on:
- dependencies
@ -94,7 +94,7 @@ steps:
image: node:16
pull: true
commands:
- yarn test:unit
- pnpm run test:unit
depends_on:
- dependencies
@ -103,7 +103,7 @@ steps:
image: node:16
pull: true
commands:
- yarn typecheck
- pnpm run typecheck
depends_on:
- dependencies
@ -113,15 +113,15 @@ steps:
environment:
CYPRESS_API_URL: http://api:3456/api/v1
CYPRESS_TEST_SECRET: averyLongSecretToSe33dtheDB
YARN_CACHE_FOLDER: .cache/yarn/
PNPM_CACHE_FOLDER: .cache/pnpm/
CYPRESS_CACHE_FOLDER: .cache/cypress/
CYPRESS_DEFAULT_COMMAND_TIMEOUT: 60000
CYPRESS_RECORD_KEY:
from_secret: cypress_project_key
commands:
- sed -i 's/localhost/api/g' dist/index.html
- yarn serve:dist & npx wait-on http://localhost:4173
- yarn test:frontend --browser chrome --record
- pnpm run serve:dist & npx wait-on http://localhost:4173
- pnpm run test:frontend --browser chrome --record
depends_on:
- build-prod
@ -181,7 +181,7 @@ steps:
# endpoint: https://s3.fr-par.scw.cloud
# region: fr-par
# path_style: true
# cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
# cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
# mount:
# - '.cache'
@ -190,12 +190,12 @@ steps:
pull: true
group: build-static
environment:
YARN_CACHE_FOLDER: .cache/yarn/
PNPM_CACHE_FOLDER: .cache/pnpm/
commands:
- yarn --frozen-lockfile --network-timeout 100000
- yarn run lint
- pnpm install --fetch-timeout 100000
- pnpm run lint
- "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json"
- yarn run build
- pnpm run build
- sed -i 's/http\:\\/\\/localhost\\:3456\\/api\\/v1/\\/api\\/v1/g' dist/index.html # Override the default api url used for developing
# depends_on:
# - restore-cache
@ -256,7 +256,7 @@ steps:
# endpoint: https://s3.fr-par.scw.cloud
# region: fr-par
# path_style: true
# cache_key: '{{ .Repo.Name }}_{{ checksum "yarn.lock" }}_{{ arch }}_{{ os }}'
# cache_key: '{{ .Repo.Name }}_{{ checksum "pnpm-lock.yaml" }}_{{ arch }}_{{ os }}'
# mount:
# - '.cache'
@ -265,12 +265,12 @@ steps:
pull: true
group: build-static
environment:
YARN_CACHE_FOLDER: .cache/yarn/
PNPM_CACHE_FOLDER: .cache/pnpm/
commands:
- yarn --frozen-lockfile --network-timeout 100000
- yarn run lint
- pnpm install --fetch-timeout 100000
- pnpm run lint
- "echo '{\"VERSION\": \"'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'\"}' > src/version.json"
- yarn run build
- pnpm run build
- sed -i 's/http\:\\/\\/localhost\\:3456\\/api\\/v1/\\/api\\/v1/g' dist/index.html # Override the default api url used for developing
# depends_on:
# - restore-cache

4
.gitignore vendored
View File

@ -8,10 +8,14 @@ node_modules
.env.*.local
# Log files
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
stats.html
pnpm-debug.log*
lerna-debug.log*
# Editor directories and files
.idea

View File

@ -1,5 +1,5 @@
{
"eslint.packageManager": "yarn",
"eslint.packageManager": "pnpm",
"editor.formatOnSave": false,
"editor.codeActionsOnSave": {
"source.fixAll": true

View File

@ -6,7 +6,7 @@ WORKDIR /build
ARG USE_RELEASE=false
ARG RELEASE_VERSION=main
ENV YARN_CACHE_FOLDER .cache/yarn/
ENV PNPM_CACHE_FOLDER .cache/pnpm/
COPY . ./
RUN \
@ -16,10 +16,13 @@ RUN \
unzip frontend-release.zip -d dist/ && \
exit 0; \
fi && \
# https://pnpm.io/installation#using-corepack
corepack enable \
corepack prepare pnpm@7.0.0-rc.3 --activate \
# Build the frontend
yarn install --frozen-lockfile --network-timeout 100000 && \
pnpm install --fetch-timeout 100000 && \
echo '{"VERSION": "'$(git describe --tags --always --abbrev=10 | sed 's/-/+/' | sed 's/^v//' | sed 's/-g/-/')'"}' > src/version.json && \
yarn run build
pnpm run build
# Stage 2: copy
FROM nginx

View File

@ -22,23 +22,23 @@ There is a [docker image available](https://hub.docker.com/r/vikunja/api) with s
## Project setup
```shell
yarn install
pnpm install
```
### Compiles and hot-reloads for development
```shell
yarn run serve
pnpm run serve
```
### Compiles and minifies for production
```shell
yarn run build
pnpm run build
```
### Lints and fixes files
```shell
yarn run lint
pnpm run lint
```

View File

@ -36,7 +36,7 @@ to get a shell inside the cypress container.
In that shell you can then execute the tests with
```shell
yarn test:frontend
pnpm run test:frontend
```
### Using The Cypress Dashboard
@ -44,5 +44,5 @@ yarn test:frontend
To open the Cypress Dashboard and run tests from there, run
```shell
yarn cypress:open
pnpm run cypress:open
```

View File

@ -1,5 +1,5 @@
[build]
command = "yarn build"
command = "pnpm run build"
publish = "dist-preview"
[[redirects]]

View File

@ -147,5 +147,5 @@
}
},
"license": "AGPL-3.0-or-later",
"packageManager": "yarn@1.22.18"
"packageManager": "pnpm@7.0.0-rc.3"
}

13527
pnpm-lock.yaml Normal file

File diff suppressed because it is too large Load Diff

14171
yarn.lock

File diff suppressed because it is too large Load Diff