Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies for ol and react #1515

Merged
merged 68 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
ae45fbe
chore(deps-dev): update dependencies
mholthausen Mar 14, 2024
33753b5
fix: update imports for new utils and versions
mholthausen Mar 14, 2024
e8a8f13
feat: add Toolbar component
mholthausen Apr 5, 2024
1aaa178
feat: add UserChip component
mholthausen Apr 5, 2024
45a13ad
test: adjust tests
mholthausen Apr 5, 2024
7a15eed
chore: update dependencies
mholthausen Apr 5, 2024
319f6c4
test: update jest setup
mholthausen Apr 5, 2024
6e7aa1c
fix: adjust the application for react 18
mholthausen Apr 5, 2024
ff86b0a
fix: adjust components for new react-geo components
mholthausen Apr 5, 2024
a8d8a3a
refactor: fix typechecks
mholthausen Apr 25, 2024
c1b28a4
chore: uses node20 image to build client
mholthausen Apr 29, 2024
2d7c1bc
chore: update antd to v5 and several further dependencies
mholthausen Apr 29, 2024
c35af6a
refactor: transfers the theming via antd token into the ConfigProvider
mholthausen Apr 29, 2024
970c2b1
refactor: change by antd codemod cli for v5
mholthausen Apr 29, 2024
a86fac0
fix: uses the currently valid ToggleGroup implementation and the butt…
mholthausen Apr 29, 2024
7dd1ad5
fix: fixes an import error
mholthausen May 2, 2024
c3c37ce
refactor: fixes curly brackets warning
mholthausen May 2, 2024
4163d95
fix: uses items property instead of children in ToolMenu
mholthausen May 2, 2024
c332716
fix: uses useCoordinateInfo from react-util
mholthausen May 2, 2024
ced006c
fix: fixes typeing error
mholthausen May 2, 2024
7329f14
style: removes padding as the arrow down wasn't visible
mholthausen May 2, 2024
c878777
refactor: remove unneeded state copy of the feature attributes
dnlkoch Mar 6, 2024
562bf51
chore(deps-dev): update dependencies
mholthausen Mar 14, 2024
91c14d0
chore: update dependencies
mholthausen Apr 5, 2024
5e09779
refactor: fix typechecks
mholthausen Apr 25, 2024
ab18bdb
chore: update antd to v5 and several further dependencies
mholthausen Apr 29, 2024
5fa8a8e
fix: uses the currently valid ToggleGroup implementation and the butt…
mholthausen Apr 29, 2024
6403182
chore: make use of new react util and react-geo library
FritzHoing May 10, 2024
320a7de
fix: trigger rerender when layer gets added to the map
FritzHoing May 10, 2024
698910c
fix: update imports and adjust propertys to new react-geo
FritzHoing May 10, 2024
cedf9db
fix: fixing css
FritzHoing May 10, 2024
fb98d04
fix: post rebase fixes
dnlkoch May 24, 2024
b64f5b0
chore: update dependencies
dnlkoch May 27, 2024
d8875ea
chore: update to latest react-geo
dnlkoch May 27, 2024
871e775
chore: enable noUnusedLocals
dnlkoch May 27, 2024
9731c85
chore: fix imports
dnlkoch May 27, 2024
5eb0631
chore: remove unused function
dnlkoch May 27, 2024
ad49c04
chore: update dependencies
dnlkoch May 29, 2024
067bf71
ci: switch to rspack
dnlkoch Jul 5, 2024
6f6ac84
chore: update dependencies
dnlkoch Aug 16, 2024
fe6104a
ci: fix husky script due to update
dnlkoch Aug 16, 2024
908916d
chore: fix broken imports due to update
dnlkoch Aug 16, 2024
fc1d1fe
ci: temporarily disable some broken tests
dnlkoch Aug 16, 2024
1d21c84
fix: ignore ts errors
dnlkoch Aug 16, 2024
a863809
fix: adjust broken test
dnlkoch Aug 16, 2024
7febe1e
fix: remove outdated prop
dnlkoch Aug 16, 2024
6a552ba
chore: finalize switch to rspack 1.0.0
simonseyock Sep 2, 2024
4b3a17e
fix: remove unused docs variable in UserMenu
simonseyock Sep 2, 2024
789f2e2
fix: open attribute drawer on feature select and pass selected feature
simonseyock Sep 2, 2024
8c6ad49
fix: migrate featureinfo
simonseyock Sep 2, 2024
50ba2dc
test: fix broken tests
simonseyock Sep 2, 2024
92f0589
chore: update base images
dnlkoch Sep 19, 2024
7f80ea7
chore: update dependencies
dnlkoch Oct 8, 2024
1c67430
ci: fix invalid package engine config (and update npm)
dnlkoch Oct 11, 2024
909a886
chore: update to latest eslint and fix linter warnings/errors
dnlkoch Oct 11, 2024
c4aeb5d
ci: enable tsc for spec files as well
dnlkoch Oct 11, 2024
6c2e552
Merge pull request #1751 from terrestris/update-dependencies-again
dnlkoch Oct 16, 2024
0cf4aa5
ci: replace watch with chokidar
dnlkoch Oct 17, 2024
107c5dc
Merge pull request #1752 from terrestris/replace-watch-chokidar
dnlkoch Oct 17, 2024
2029fd0
fix: update dependencies, pin ol version
hwbllmnn Oct 18, 2024
fc1f9bc
fix: fix typecheck
hwbllmnn Oct 18, 2024
c135508
fix: sort dependencies
hwbllmnn Oct 18, 2024
a4508c3
fix: minor fixes
dnlkoch Oct 18, 2024
58b285c
chore: update to latest shogun-util (and keycloak 26)
dnlkoch Oct 18, 2024
78067ea
fix: remove unwanted global event dispatcher
dnlkoch Oct 18, 2024
e13a778
chore: fix invalid usage of the wrapper
dnlkoch Oct 18, 2024
1fe286c
Merge pull request #1754 from terrestris/fix-index-page
dnlkoch Oct 18, 2024
b378564
chore: :lipstick:
dnlkoch Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions .eslintrc.js

This file was deleted.

3 changes: 1 addition & 2 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# diasble CI
# disable in CI
[ -n "$CI" ] && exit 0

npx --no-install commitlint --edit $1
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.18.2-alpine3.17 AS build
FROM node:20.17.0-alpine3.19 AS build

WORKDIR /app

Expand All @@ -11,7 +11,7 @@ COPY . ./

RUN npm run build

FROM nginx:1.25.3-alpine-slim
FROM nginx:1.27.1-alpine-slim

COPY --from=build /app/build /usr/share/nginx/html
COPY default.conf /etc/nginx/conf.d/default.conf
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.18.2-alpine3.17
FROM node:20.17.0-alpine3.19

WORKDIR /app

Expand Down
111 changes: 111 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
import reactPlugin from 'eslint-plugin-react';
import importPlugin from 'eslint-plugin-import';
import reactHooksPlugin from 'eslint-plugin-react-hooks';
import reactRefreshPlugin from 'eslint-plugin-react-refresh';
import stylisticPlugin from '@stylistic/eslint-plugin'

import tsEslint from 'typescript-eslint';
import eslint from '@eslint/js';
import globals from 'globals';

import eslintTerrestris from '@terrestris/eslint-config-typescript';

export default tsEslint.config({
extends: [
eslint.configs.recommended,
...tsEslint.configs.recommended,
...tsEslint.configs.stylistic,
importPlugin.flatConfigs.recommended
],
files: [
'src/**/*.{js,mjs,cjs,ts,jsx,tsx}'
],
plugins: {
react: reactPlugin,
'@stylistic': stylisticPlugin,
'react-hooks': reactHooksPlugin,
'react-refresh': reactRefreshPlugin
},
languageOptions: {
globals: globals.browser,
ecmaVersion: 'latest',
parserOptions: {
project: true,
tsconfigRootDir: import.meta.dirname
}
},
rules: {
...eslintTerrestris.rules,
...reactHooksPlugin.configs.recommended.rules,
'max-len': [
'warn',
{
'code': 160
}
],

'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/member-ordering': 'off',
'@typescript-eslint/consistent-type-definitions': 'off',

'no-unused-vars': 'warn',
'arrow-spacing': 'warn',
'comma-spacing': 'warn',
'comma-dangle': 'warn',
'eol-last': 'warn',
'no-multi-spaces': 'warn',
'no-multiple-empty-lines': ['warn', {
max: 1
}],
'object-property-newline': 'warn',
'object-curly-newline': ['warn', {
consistent: true,
minProperties: 2
}],
'space-before-function-paren': ['warn', {
anonymous: 'always',
named: 'never',
asyncArrow: 'always'
}],

'react/jsx-max-props-per-line': ['warn', {
maximum: 1
}],
'react/jsx-closing-tag-location': ['warn'],
'react/jsx-closing-bracket-location': ['warn'],

'import/no-unresolved': 'off',
'import/named': 'off',
'import/order': ['warn', {
groups: [
'builtin',
'external',
'parent',
'sibling',
'index',
'object'
],
'pathGroups': [{
pattern: 'react',
group: 'external',
position: 'before'
}, {
pattern: '@terrestris/**',
group: 'external',
position: 'after'
}],
'pathGroupsExcludedImportTypes': ['react'],
'newlines-between': 'always-and-inside-groups',
'alphabetize': {
order: 'asc',
caseInsensitive: true
}
}]
},
settings: {
react: {
version: 'detect'
}
}
});
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ module.exports = {
],
testEnvironment: './jest/CustomTestEnvironment.js',
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!(ol|antd|@babel|jest-runtime|(rc-*[a-z]*)|@ant-design|@terrestris|query-string|decode-uri-component|split-on-first|filter-obj))'
'<rootDir>/node_modules/(?!(ol|antd|@babel|jest-runtime|(rc-*[a-z]*)|@ant-design|@terrestris|color-*[a-z]*|@camptocamp|d3-*[a-z]*|' +
'query-string|decode-uri-component|strict-uri-encode|split-on-first|filter-obj|shpjs|geostyler))'
],
moduleNameMapper: {
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
Expand Down
10 changes: 9 additions & 1 deletion jest.setup.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
import '@testing-library/jest-dom';
import '@testing-library/jest-dom/extend-expect';
import {
TextDecoder,
TextEncoder
} from 'util';

Object.assign(global, {
TextDecoder,
TextEncoder
});
Loading
Loading