Skip to content

Commit bd8812f

Browse files
ahennrsimonseyock
authored andcommitted
chore: migrate to typescript v5
BREAKING CHANGE: Typescript configuration
1 parent f646ed5 commit bd8812f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+470
-373
lines changed

jest.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = {
2020
'<rootDir>/dist/'
2121
],
2222
transformIgnorePatterns: [
23-
'node_modules/(?!(ol|@camptocamp/inkmap|@terrestris/react-util|d3-selection)/)'
23+
'node_modules/(?!(ol|@camptocamp/inkmap|@terrestris/react-util|d3-selection|color-space|color-*[a-z]*)|(rc-*[a-z]*)/)'
2424
],
2525
setupFiles: [
2626
'<rootDir>/jest/__mocks__/matchMediaMock.js'

jest/setup.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import Enzyme from 'enzyme';
2-
import Adapter from '@cfaester/enzyme-adapter-react-18';
31
import 'whatwg-fetch';
42
import 'jest-canvas-mock';
53
import '@testing-library/jest-dom';
64
import 'regenerator-runtime/runtime';
5+
6+
import Adapter from '@cfaester/enzyme-adapter-react-18';
7+
import Enzyme from 'enzyme';
78
import {
8-
TextEncoder,
9-
TextDecoder
9+
TextDecoder,
10+
TextEncoder
1011
} from 'util';
1112

1213
Object.assign(global, {

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"@terrestris/eslint-config-typescript": "^5.0.0",
105105
"@terrestris/ol-util": "^14.0.0",
106106
"@testing-library/dom": "^9.3.3",
107-
"@testing-library/jest-dom": "^6.1.4",
107+
"@testing-library/jest-dom": "^6.4.2",
108108
"@testing-library/react": "^14.0.0",
109109
"@testing-library/user-event": "^14.5.1",
110110
"@types/enzyme": "^3.10.15",

src/Button/CopyButton/CopyButton.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import AnimateUtil from '@terrestris/ol-util/dist/AnimateUtil/AnimateUtil';
22
import useMap from '@terrestris/react-util/dist/Hooks/useMap/useMap';
33
import { DigitizeUtil } from '@terrestris/react-util/dist/Util/DigitizeUtil';
4-
import OlGeometry from 'ol/geom/Geometry';
54
import { SelectEvent as OlSelectEvent } from 'ol/interaction/Select';
65
import OlVectorLayer from 'ol/layer/Vector';
76
import OlVectorSource from 'ol/source/Vector';
@@ -19,7 +18,7 @@ interface OwnProps {
1918
* The vector layer which will be used for digitize features.
2019
* The standard digitizeLayer can be retrieved via `DigitizeUtil.getDigitizeLayer(map)`.
2120
*/
22-
digitizeLayer?: OlVectorLayer<OlVectorSource<OlGeometry>>;
21+
digitizeLayer?: OlVectorLayer<OlVectorSource>;
2322
/**
2423
* Listener function for the 'select' event of the ol.interaction.Select
2524
* if in `Copy` mode.
@@ -42,7 +41,7 @@ const CopyButton: React.FC<CopyButtonProps> = ({
4241
...passThroughProps
4342
}) => {
4443

45-
const [layers, setLayers] = useState<[OlVectorLayer<OlVectorSource<OlGeometry>>]|null>(null);
44+
const [layers, setLayers] = useState<[OlVectorLayer<OlVectorSource>]|null>(null);
4645

4746
const map = useMap();
4847

src/Button/DeleteButton/DeleteButton.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import useMap from '@terrestris/react-util/dist/Hooks/useMap/useMap';
22
import { DigitizeUtil } from '@terrestris/react-util/dist/Util/DigitizeUtil';
3-
import OlGeometry from 'ol/geom/Geometry';
43
import { SelectEvent as OlSelectEvent } from 'ol/interaction/Select';
54
import OlVectorLayer from 'ol/layer/Vector';
65
import OlVectorSource from 'ol/source/Vector';
@@ -15,7 +14,7 @@ interface OwnProps {
1514
* The vector layer which will be used for digitize features.
1615
* The standard digitizeLayer can be retrieved via `DigitizeUtil.getDigitizeLayer(map)`.
1716
*/
18-
digitizeLayer?: OlVectorLayer<OlVectorSource<OlGeometry>>;
17+
digitizeLayer?: OlVectorLayer<OlVectorSource>;
1918
/**
2019
* Listener function for the 'select' event of the ol.interaction.Select
2120
* if in `Delete` mode.
@@ -39,7 +38,7 @@ export const DeleteButton: React.FC<DeleteButtonProps> = ({
3938
onFeatureRemove,
4039
...passThroughProps
4140
}) => {
42-
const [layers, setLayers] = useState<[OlVectorLayer<OlVectorSource<OlGeometry>>]|null>(null);
41+
const [layers, setLayers] = useState<[OlVectorLayer<OlVectorSource>]|null>(null);
4342

4443
const map = useMap();
4544

src/Button/DrawButton/DrawButton.spec.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import DrawButton from './DrawButton';
1414

1515
describe('<DrawButton />', () => {
1616

17-
let map;
17+
let map: OlMap;
1818

1919
beforeEach(() => {
2020
map = new OlMap({

src/Button/DrawButton/DrawButton.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ interface OwnProps {
5858
* The vector layer which will be used for digitize features.
5959
* The standard digitizeLayer can be retrieved via `DigitizeUtil.getDigitizeLayer(map)`.
6060
*/
61-
digitizeLayer?: OlVectorLayer<OlVectorSource<OlGeometry>>;
61+
digitizeLayer?: OlVectorLayer<OlVectorSource>;
6262
/**
6363
* Title for modal used for input of labels for digitize features.
6464
*/
@@ -112,10 +112,10 @@ const DrawButton: React.FC<DrawButtonProps> = ({
112112
}) => {
113113

114114
const [drawInteraction, setDrawInteraction] = useState<OlInteractionDraw>();
115-
const [layer, setLayer] = useState<OlVectorLayer<OlVectorSource<OlGeometry>> | null>(null);
115+
const [layer, setLayer] = useState<OlVectorLayer<OlVectorSource> | null>(null);
116116

117117
/**
118-
* Currently drawn feature which should be represent as label or postit.
118+
* Currently drawn feature which should be represented as label or post-it.
119119
*/
120120
const [digitizeTextFeature, setDigitizeTextFeature] = useState<OlFeature<OlGeometry> | null>(null);
121121

src/Button/GeoLocationButton/GeoLocationButton.spec.tsx

-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ import { render, within } from '@testing-library/react';
77
import userEvent from '@testing-library/user-event';
88
import * as React from 'react';
99

10-
import TestUtil from '../../Util/TestUtil';
1110
import GeoLocationButton from './GeoLocationButton';
1211

1312
describe('<GeoLocationButton />', () => {
1413

15-
let map;
16-
1714
beforeAll(() => {
1815
enableGeolocationMock();
1916
});
@@ -22,10 +19,6 @@ describe('<GeoLocationButton />', () => {
2219
disableGeolocationMock();
2320
});
2421

25-
beforeEach(() => {
26-
map = TestUtil.createMap();
27-
});
28-
2922
describe('#Basics', () => {
3023

3124
it('is defined', () => {

0 commit comments

Comments
 (0)