Skip to content

Commit

Permalink
chore: prepare release v24.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nimdanitro committed Aug 23, 2024
2 parents c515487 + 05b5f8c commit e13560f
Show file tree
Hide file tree
Showing 21 changed files with 3,502 additions and 4,692 deletions.
52 changes: 48 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,63 @@ updates:
# Enable version updates for npm
- package-ecosystem: "npm"
# Look for `package.json` and `lock` files in the `root` directory
directory: "/"
directory: "/ui"
target-branch: "develop"
reviewers:
- "@Redgecko/Reviewers"
- "@f-eld-ch/Reviewers"
schedule:
interval: "weekly"
interval: "daily"
time: "20:00"
open-pull-requests-limit: 10
labels:
- "javascript"
- "dependencies"
ignore:
- dependency-name: "@types/mapbox-gl"
versions: "> 2.x"
- dependency-name: "@types/mapbox__mapbox-gl-draw"
versions: "> 1.4.6"
- dependency-name: "@types/node"
versions: ">= 22.x, < 23"
- dependency-name: maplibre-gl
versions: ">= 4.a, < 5"

# Enable version updates for Docker
- package-ecosystem: "docker"
# Look for a `Dockerfile` in the `root` directory
directory: "/"
target-branch: "develop"
reviewers:
- "@Redgecko/Reviewers"
- "@f-eld-ch/Reviewers"
schedule:
interval: "weekly"
labels:
- "docker"
- "dependencies"

# Enable version updates for Go
- package-ecosystem: "gomod"
directory: "/"
target-branch: "develop"
reviewers:
- "@f-eld-ch/Reviewers"
schedule:
interval: "daily"
time: "20:00"
open-pull-requests-limit: 10
labels:
- "golang"
- "dependencies"

# Enable version updates for Github Actions
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "develop"
reviewers:
- "@f-eld-ch/Reviewers"
schedule:
interval: "daily"
time: "20:00"
labels:
- "gh-actions"
- "dependencies"
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
type=sha
- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile.hasura
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/oauth2-proxy/oauth2-proxy:v7.5.1
FROM quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
ENV OAUTH2_PROXY_PROXY_WEBSOCKETS=true \

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / Test and Build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "OAUTH2_PROXY_SKIP_AUTH_ROUTES") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / Test and Build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "OAUTH2_PROXY_PASS_ACCESS_TOKEN") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / Test and Build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "OAUTH2_PROXY_SKIP_AUTH_ROUTES") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / Test and Build

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "OAUTH2_PROXY_PASS_ACCESS_TOKEN") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
OAUTH2_PROXY_PASS_AUTHORIZATION_HEADER=true \
OAUTH2_PROXY_SKIP_AUTH_ROUTES='^\/(manifest\.json|favicon\.ico|asset-manifest\.json|service-worker\.js\.map|service-worker\.js|robots\.txt|logo\d+\.png)' \
Expand Down
894 changes: 0 additions & 894 deletions ui/.yarn/releases/yarn-4.2.2.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions ui/.yarn/releases/yarn-4.4.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/.yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.2.cjs
yarnPath: .yarn/releases/yarn-4.4.0.cjs
37 changes: 37 additions & 0 deletions ui/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import react from "eslint-plugin-react";
import globals from "globals";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [...compat.extends("eslint:recommended", "plugin:react/recommended"), {
plugins: {
react,
},

languageOptions: {
globals: {
...globals.browser,
},

ecmaVersion: 12,
sourceType: "module",

parserOptions: {
ecmaFeatures: {
jsx: true,
},
},
},

rules: {},
}];
110 changes: 53 additions & 57 deletions ui/package.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
{
"name": "sitrep",
"version": "24.6.0",
"version": "24.8.0",
"private": true,
"type": "module",
"dependencies": {
"@apollo/client": "^3.10.3",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@apollo/client": "^3.11.4",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@mapbox/mapbox-gl-draw": "~1.4.3",
"@turf/bearing": "^6.5.0",
"@turf/center": "^6.5.0",
"@turf/helpers": "^6.5.0",
"@watergis/maplibre-gl-export": "~2.0.1",
"bulma": "^1.0.0",
"@turf/bearing": "^7.1.0",
"@turf/center": "^7.1.0",
"@turf/helpers": "^7.1.0",
"@watergis/maplibre-gl-export": "~3.8.2",
"bulma": "^1.0.2",
"classnames": "^2.5.1",
"dayjs": "^1.11.11",
"graphql": "^16.8.1",
"dayjs": "^1.11.13",
"graphql": "^16.9.0",
"hat": "^0.0.3",
"i18next": "^23.11.4",
"i18next": "^23.14.0",
"i18next-browser-languagedetector": "^8.0.0",
"lodash": "^4.17.21",
"mapbox-gl-style-switcher": "^1.0.11",
"maplibre-gl": "^2.4.0",
"maplibre-gl": "4.5.2",
"react": "^18.3.1",
"react-autocomplete-hint": "^2.0.0",
"react-color": "^2.19.3",
"react-dom": "^18.3.1",
"react-i18next": "^14.1.1",
"react-i18next": "^15.0.1",
"react-map-gl": "~7.1.7",
"react-markdown": "^9.0.1",
"react-router-dom": "^6.23.1",
"react-router-dom": "^6.26.1",
"usehooks-ts": "^3.1.0",
"uuid": "^9.0.1",
"web-vitals": "^3.5.2"
"uuid": "^10.0.0",
"web-vitals": "^4.2.3"
},
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
Expand All @@ -44,12 +44,6 @@
"preview": "vite preview",
"generate-pwa-assets": "pwa-assets-generator"
},
"eslintConfig": {
"extends": [
"react-app"
],
"overrides": []
},
"browserslist": {
"production": [
"defaults and supports es6-module"
Expand All @@ -66,52 +60,54 @@
]
},
"devDependencies": {
"@testing-library/dom": "^10.1.0",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"@eslint/compat": "^1.1.1",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.9.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.5.2",
"@types/hat": "^0.0.4",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.1",
"@types/mapbox-gl": "^2.7.21",
"@types/lodash": "^4.17.7",
"@types/mapbox__mapbox-gl-draw": "~1.4.6",
"@types/node": "^20.12.11",
"@types/react": "^18.3.2",
"@types/node": "^20.16.1",
"@types/react": "^18.3.4",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^18.3.0",
"@types/react-router-dom": "^5.3.3",
"@types/semver": "^7.5.8",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.2.0",
"@typescript-eslint/parser": "^8.2.0",
"@vite-pwa/assets-generator": "^0.2.4",
"@vitejs/plugin-react-swc": "^3.6.0",
"@vitest/coverage-v8": "^1.6.0",
"eslint": "^8.57.0",
"eslint-config-react-app": "^7.0.1",
"husky": "^9.0.11",
"@vitejs/plugin-react-swc": "^3.7.0",
"@vitest/coverage-v8": "^2.0.5",
"eslint": "^9.9.0",
"eslint-plugin-react": "^7.35.0",
"globals": "^15.9.0",
"husky": "^9.1.5",
"jest": "^29.7.0",
"jsdom": "^24.0.0",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"sass": "^1.77.1",
"semver": "^7.6.2",
"jsdom": "^24.1.1",
"lint-staged": "^15.2.9",
"prettier": "^3.3.3",
"sass": "^1.77.8",
"semver": "^7.6.3",
"source-map-explorer": "^2.5.3",
"ts-jest": "^29.1.2",
"typescript": "^5.4.5",
"vite": "^5.2.11",
"vite-plugin-checker": "^0.6.4",
"ts-jest": "^29.2.4",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vite-plugin-checker": "^0.7.2",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-pwa": "^0.20.0",
"vite-plugin-pwa": "^0.20.1",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "^1.6.0"
"vite-tsconfig-paths": "^5.0.1",
"vitest": "^2.0.5"
},
"resolutions": {
"json5": "^2.2.3",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.18",
"sharp": "^0.33.2"
"vite": "^5.4.2",
"sharp": "^0.33.5",
"braces": "^3.0.3"
},
"packageManager": "yarn@4.2.2"
"packageManager": "yarn@4.4.0"
}
Loading

0 comments on commit e13560f

Please sign in to comment.