refactor: rebase

This commit is contained in:
Rainer Killinger
2025-06-12 11:41:09 +02:00
parent a962a35a8b
commit cbd4225ab5
22 changed files with 14682 additions and 13889 deletions

View File

@@ -61,7 +61,7 @@ build:
# - pnpm i --prefer-offline
# - pnpm build:full:skip || pnpm i -r --prefer-offline
- pnpm install
# TODO: whats the benifit for CI? something doesn't work with git here...
# TODO: whats the benfit for CI? something doesn't work with git here...
# "🦋 error Error: Failed to find where HEAD diverged from master. Does master exist?"
# - pnpm changeset:status
- pnpm build:full $TURBO_CACHE_BYPASS

View File

@@ -1,6 +1,6 @@
.limit_scheduled_pipelines:
rules:
- if: $CI_COMMIT_BRANCH == 'main' && $CI_PIPELINE_SOURCE == "schedule"
- if: $CI_COMMIT_BRANCH == 'ionic-8-update' && $CI_PIPELINE_SOURCE == "schedule"
base image:
image: docker
@@ -16,8 +16,7 @@ base image:
- >
docker login -u "${CI_REGISTRY_USER}" -p "${CI_JOB_TOKEN}" "${CI_REGISTRY}" &&
docker build
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:$(grep -o '"version": "[^"]*' "${DEPLOY_DIR}/package.json" | cut -d'"' -f4)"
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest" "${CI_PROJECT_DIR}/${DEPLOY_DIR}" &&
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:node-22" "${CI_PROJECT_DIR}/${DEPLOY_DIR}" &&
docker push "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}" --all-tags
cache: {} # disable irrelevant cache for this job
before_script: [] # do not run irrelevant before script for this job

View File

@@ -1,3 +1,3 @@
nodejs 22.2.0
pnpm 8.15.5
nodejs 22.16.0
pnpm 10.12.1
python 3.11.5

View File

@@ -51,7 +51,7 @@
"@types/cors": "2.8.13",
"@types/express": "4.17.17",
"@types/geojson": "1.0.6",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"@types/node-cron": "3.0.7",
"@types/nodemailer": "6.4.7",
"@types/promise-queue": "2.2.0",

View File

@@ -44,7 +44,7 @@
"@openstapps/logger": "workspace:*",
"@types/config": "3.3.0",
"@types/dockerode": "3.3.17",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"@types/sha1": "1.1.3",
"config": "3.3.9",
"dockerode": "3.3.5",
@@ -63,7 +63,7 @@
"@types/dockerode": "3.3.17",
"@types/mocha": "10.0.1",
"@types/mustache": "4.2.2",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"@types/proxyquire": "1.3.28",
"@types/semver": "7.5.8",
"@types/sha1": "1.1.3",

View File

@@ -17,7 +17,7 @@
],
"devDependencies": {
"@openstapps/tsconfig": "workspace:*",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"eslint": "8.57.0",
"typescript": "5.4.2"
},

View File

@@ -56,7 +56,7 @@
"@types/glob": "8.1.0",
"@types/mocha": "10.0.1",
"@types/mustache": "4.2.2",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"@types/tmp": "0.2.3",
"c8": "7.14.0",
"chai": "4.3.7",

View File

@@ -45,7 +45,7 @@
"@types/chai": "4.3.5",
"@types/chai-as-promised": "7.1.5",
"@types/mocha": "10.0.1",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"c8": "7.14.0",
"chai": "4.3.7",
"chai-as-promised": "7.1.1",

View File

@@ -42,7 +42,7 @@
"@openstapps/prettier-config": "workspace:*",
"@openstapps/tsconfig": "workspace:*",
"@types/express": "4.17.17",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"tsup": "6.7.0",
"typescript": "5.4.2"
},

View File

@@ -94,7 +94,7 @@
"form-data": "4.0.0",
"geojson": "0.5.0",
"ionic-appauth": "0.9.0",
"jsonpath-plus": "10.0.7",
"jsonpath-plus": "10.3.0",
"maplibre-gl": "4.0.2",
"material-symbols": "0.17.1",
"moment": "2.30.1",
@@ -129,7 +129,7 @@
"@angular/platform-browser-dynamic": "18.0.1",
"@capacitor/android": "6.1.1",
"@capacitor/assets": "3.0.4",
"@capacitor/cli": "6.1.1",
"@capacitor/cli": "7.3.0",
"@capacitor/ios": "6.1.1",
"@compodoc/compodoc": "1.1.23",
"@cypress/schematic": "2.5.1",
@@ -146,7 +146,7 @@
"@types/karma": "6.3.8",
"@types/karma-coverage": "2.0.3",
"@types/karma-jasmine": "4.0.5",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"@types/semver": "7.5.8",
"@typescript-eslint/eslint-plugin": "7.2.0",
"@typescript-eslint/parser": "7.2.0",

View File

@@ -1,5 +1,5 @@
### Set base image
FROM ubuntu:20.04
FROM ubuntu:22.04
LABEL version="2.0.0" \
description="Build environment for the StApps app." \
@@ -10,7 +10,7 @@ ENV ANDROID_APIS="android-34" \
ANDROID_BUILD_TOOLS_VERSION="34.0.0" \
NODE_VERSION="22.x" \
NPM_VERSION="^10.0.0" \
IONIC_VERSION="^6.0.0" \
IONIC_VERSION="^7.0.0" \
CORDOVA_RES_VERSION="latest" \
### Configure download URLs
ANDROID_SDK_TOOLS_DOWNLOAD_URL="https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip" \
@@ -43,7 +43,7 @@ RUN apt-get update && \
git \
gradle \
ca-certificates-java \
python \
python3 \
python3-pip \
software-properties-common \
ssh \
@@ -54,9 +54,9 @@ RUN apt-get update && \
musl-dev \
&& rm -rf /var/lib/apt/lists/*
### Install Java Development Kit 17
### Install Java Development Kit 21
RUN add-apt-repository -y ppa:openjdk-r/ppa && apt-get update && \
apt-get install --no-install-recommends -y openjdk-17-jdk \
apt-get install --no-install-recommends -y openjdk-21-jdk \
&& rm -rf /var/lib/apt/lists/*
### Setup the locale

View File

@@ -1,5 +1,5 @@
### Set base image
FROM cypress/base:22.0.0
FROM cypress/base:22.16.0
USER root
@@ -61,9 +61,9 @@ ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
# install Firefox browser
RUN export FIREFOX_VERSION=$(curl -fsSL https://product-details.mozilla.org/1.0/firefox_versions.json | jq -r '.LATEST_FIREFOX_VERSION') && \
wget --no-verbose -O /tmp/firefox.tar.bz2 "https://download-installer.cdn.mozilla.net/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.bz2" && \
tar -C /opt -xjf /tmp/firefox.tar.bz2 && \
rm /tmp/firefox.tar.bz2 && \
wget --no-verbose -O /tmp/firefox.tar.xz "https://download-installer.cdn.mozilla.net/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/firefox-${FIREFOX_VERSION}.tar.xz" && \
tar -C /opt -xJf /tmp/firefox.tar.xz && \
rm /tmp/firefox.tar.xz && \
ln -fs /opt/firefox/firefox /usr/bin/firefox
RUN echo "Downloading Latest Edge version..."

View File

@@ -2,10 +2,10 @@
"name": "@openstapps/openstapps",
"private": true,
"engines": {
"node": "^22.0.0",
"pnpm": "^8.15.5"
"node": "^22.16.0",
"pnpm": "^10.12.1"
},
"packageManager": "pnpm@8.15.5",
"packageManager": "pnpm@10.12.1",
"scripts": {
"build": "dotenv -c -- turbo run build",
"build:full": "dotenv -c -- turbo run syncpack build lint format --summarize",

View File

@@ -46,7 +46,7 @@
"@types/json-schema": "7.0.15",
"@types/junit-report-builder": "3.0.0",
"@types/mocha": "10.0.1",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"@types/wait-on": "5.3.1",
"cli-progress": "3.12.0",
"commander": "10.0.0",

View File

@@ -24,7 +24,7 @@
"@openstapps/tsconfig": "workspace:*",
"@types/chai": "4.3.5",
"@types/mocha": "10.0.1",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"c8": "7.14.0",
"chai": "4.3.7",
"mocha": "10.2.0",

View File

@@ -76,7 +76,7 @@
"@types/json-schema": "7.0.15",
"@types/mocha": "10.0.1",
"@types/mustache": "4.2.2",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"c8": "7.14.0",
"chai": "4.3.7",
"mocha": "10.2.0",

View File

@@ -62,7 +62,7 @@
"@types/json-patch": "0.0.30",
"@types/json-schema": "7.0.15",
"@types/mocha": "10.0.1",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"c8": "7.14.0",
"chai": "4.3.7",
"conditional-type-checks": "1.0.6",

View File

@@ -34,7 +34,7 @@
"@openstapps/tsconfig": "workspace:*",
"@types/chai": "4.3.5",
"@types/mocha": "10.0.1",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"c8": "7.14.0",
"chai": "4.3.7",
"mocha": "10.2.0",

View File

@@ -37,7 +37,7 @@
"@openstapps/eslint-config": "workspace:*",
"@openstapps/prettier-config": "workspace:*",
"@openstapps/tsconfig": "workspace:*",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"ts-node": "10.9.2",
"tsup": "6.7.0",
"typedoc": "0.25.12",

View File

@@ -41,7 +41,7 @@
"@types/chai-as-promised": "7.1.5",
"@types/chai-spies": "1.0.3",
"@types/mocha": "10.0.1",
"@types/node": "18.15.3",
"@types/node": "22.15.31",
"c8": "7.14.0",
"chai": "4.3.7",
"chai-as-promised": "7.1.1",

28486
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -5,3 +5,17 @@ packages:
- "frontend/*"
- "packages/*"
- "images/*"
onlyBuiltDependencies:
- '@compodoc/compodoc'
- cpu-features
- cypress
- esbuild
- lmdb
- msgpackr-extract
- nice-napi
- nx
- re2
- sharp
- ssh2
- swiper