Compare commits

...

2 Commits

Author SHA1 Message Date
Rainer Killinger
f82933c0ab refactor: update to node 22
refactor: remove deprecated "jetifier"
refactor: base migration to Angular v18
fix: angular warning
refactor: update capacitor to v6
refactor: update ngx-markdown to v18
refactor: update to ionic v8
refactor: remove deprecated @ionic-native/core (replaced by @awesome-cordova-plugins/core)
fix: build
fix: test
feat: temporarily use external node image in ci
feat: update to node 22
refactor: rebase
fix: prettier depencencies
ci: update android commandline tools
fix: prettier package type
ci: let pnpm handle build dependencies
refactor: revert to pnpm 8, angular 17
2025-06-30 14:30:24 +02:00
Rainer Killinger
4b55d80995 refactor: update pnpm to v10 2025-06-30 14:04:00 +02:00
12 changed files with 12286 additions and 10163 deletions

View File

@@ -21,13 +21,7 @@ include:
- local: /.gitlab/publishing.gitlab-ci.yml - local: /.gitlab/publishing.gitlab-ci.yml
variables: variables:
TURBO_CACHE_BYPASS: TURBO_CACHE_BYPASS: "--force --no-cache"
value: ''
options:
- '--force'
- '--no-cache'
- ''
description: Bypass turbo cache
default: default:
image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22 image: registry.gitlab.com/openstapps/openstapps/node-builder:node-22
@@ -36,10 +30,7 @@ default:
interruptible: true interruptible: true
before_script: before_script:
- corepack enable - corepack enable
- corepack prepare pnpm@latest-8 --activate - corepack prepare pnpm@latest-10 --activate
# - echo TURBO_API=$TURBO_API >> .env.local
# - echo TURBO_TOKEN=$TURBO_TOKEN >> .env.local
# - echo TURBO_TEAM=$TURBO_TEAM >> .env.local
- pnpm config set store-dir .pnpm-store - pnpm config set store-dir .pnpm-store
cache: &pnpm_cache cache: &pnpm_cache
key: key:
@@ -115,13 +106,7 @@ unit:
stage: test stage: test
needs: ['build'] needs: ['build']
script: script:
# - pnpm config set recursive-install false
# - pnpm i --prefer-offline
# - pnpm test:skip || pnpm i -r --prefer-offline
- pnpm install - pnpm install
- cd node_modules/.pnpm/re2*/node_modules/re2
- npm run install
- cd $CI_PROJECT_DIR
- pnpm test $TURBO_CACHE_BYPASS - pnpm test $TURBO_CACHE_BYPASS
coverage: '/Statements[^:]*\:[^:]*\s+([\d\.]+)%/' coverage: '/Statements[^:]*\:[^:]*\s+([\d\.]+)%/'
artifacts: artifacts:

View File

@@ -27,7 +27,7 @@ publish image:
- tags - tags
needs: ['deploy'] needs: ['deploy']
image: image:
name: gcr.io/kaniko-project/executor:v1.12.1-debug name: gcr.io/kaniko-project/executor:v1.24.0-debug
entrypoint: [""] entrypoint: [""]
script: script:
- > - >

View File

@@ -1,3 +1,3 @@
nodejs 22.16.0 nodejs 22.16.0
pnpm 8.15.9 pnpm 10.12.3
python 3.11.5 python 3.11.5

View File

@@ -9,8 +9,8 @@ integration:
- name: registry.gitlab.com/openstapps/openstapps/database:latest - name: registry.gitlab.com/openstapps/openstapps/database:latest
alias: elasticsearch alias: elasticsearch
script: script:
- pnpm --filter=@openstapps/backend install - pnpm install
- pnpm test:integration:backend - pnpm test:integration:backend --force --no-cache
artifacts: artifacts:
when: on_failure when: on_failure
paths: paths:

View File

@@ -2,12 +2,9 @@ e2e:
image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-22 image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-22
stage: test stage: test
script: script:
- pnpm --filter=@openstapps/app install - pnpm install
- pnpm --filter=@openstapps/app exec cypress install - pnpm --filter=@openstapps/app exec cypress install
- cd node_modules/.pnpm/re2*/node_modules/re2 - pnpm test:integration:app --force --no-cache
- npm run install
- cd $CI_PROJECT_DIR
- pnpm test:integration:app
artifacts: artifacts:
when: on_failure when: on_failure
paths: paths:

View File

@@ -115,7 +115,7 @@ RUN cd / && ionic start $TMP_PROJECT_NAME blank --type=angular --capacitor --no-
RUN ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 RUN ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
### PNPM ### PNPM
RUN corepack enable && corepack prepare pnpm@latest-8 --activate RUN corepack enable && corepack prepare pnpm@latest-10 --activate
### Set working directory ### Set working directory
WORKDIR /app WORKDIR /app

View File

@@ -84,7 +84,7 @@ RUN apt-get update && \
RUN ln -s /usr/bin/microsoft-edge /usr/bin/edge RUN ln -s /usr/bin/microsoft-edge /usr/bin/edge
### PNPM ### PNPM
RUN corepack enable && corepack prepare pnpm@latest-8 --activate RUN corepack enable && corepack prepare pnpm@latest-10 --activate
# versions of local tools # versions of local tools
RUN echo " node version: $(node -v) \n" \ RUN echo " node version: $(node -v) \n" \

View File

@@ -2,7 +2,7 @@ FROM node:22-alpine
RUN apk update && apk add git curl jq && mkdir -p /opt RUN apk update && apk add git curl jq && mkdir -p /opt
RUN corepack enable && corepack prepare pnpm@latest-8 --activate RUN corepack enable && corepack prepare pnpm@latest-10 --activate
COPY --chown=root:root wait-for.sh /opt/wait-for COPY --chown=root:root wait-for.sh /opt/wait-for

View File

@@ -2,6 +2,6 @@ FROM node:22-alpine
RUN apk update && apk add git jq curl python3 build-base RUN apk update && apk add git jq curl python3 build-base
RUN npm install turbo --global && corepack enable && corepack prepare pnpm@latest-8 --activate RUN npm install turbo --global && corepack enable && corepack prepare pnpm@latest-10 --activate
CMD [] CMD []

View File

@@ -3,12 +3,12 @@
"private": true, "private": true,
"engines": { "engines": {
"node": "^22.16.0", "node": "^22.16.0",
"pnpm": "^8.15.9" "pnpm": "^10.12.3"
}, },
"packageManager": "pnpm@8.15.9+sha512.499434c9d8fdd1a2794ebf4552b3b25c0a633abcee5bb15e7b5de90f32f47b513aca98cd5cfd001c31f0db454bc3804edccd578501e4ca293a6816166bbd9f81", "packageManager": "pnpm@10.12.3+sha512.467df2c586056165580ad6dfb54ceaad94c5a30f80893ebdec5a44c5aa73c205ae4a5bb9d5ed6bb84ea7c249ece786642bbb49d06a307df218d03da41c317417",
"scripts": { "scripts": {
"build": "dotenv -c -- turbo run build --concurrency 80%", "build": "dotenv -c -- turbo run build",
"build:full": "dotenv -c -- turbo run syncpack build lint format --concurrency 80% --summarize", "build:full": "dotenv -c -- turbo run syncpack build lint format --summarize",
"build:full:skip": "dotenv -c -- turbo-ignore --task='build lint format'", "build:full:skip": "dotenv -c -- turbo-ignore --task='build lint format'",
"changeset:status": "changeset status", "changeset:status": "changeset status",
"deploy": "dotenv -c -- turbo run deploy --concurrency=1", "deploy": "dotenv -c -- turbo run deploy --concurrency=1",

22371
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,23 @@
packages: packages:
- "backend/*" - backend/*
- "configuration/*" - configuration/*
- "examples/*" - examples/*
- "frontend/*" - frontend/*
- "packages/*" - packages/*
- "images/*" - images/*
onlyBuiltDependencies:
- '@compodoc/compodoc'
- cpu-features
- cypress
- esbuild
- nice-napi
- re2
- sharp
- ssh2
- swiper
# PNPM 8 defaults:
# linkWorkspacePackages: true
# hoistWorkspacePackages: false
# dedupePeerDependents: false