From a316fe6ddeac69e40eb382e1a1b04b11def9f729 Mon Sep 17 00:00:00 2001 From: Andre Henn Date: Wed, 6 Sep 2023 09:55:57 +0200 Subject: [PATCH 1/5] chore: homogenize / sort imports using simple-sort-plugin --- .eslintrc | 12 +++++++++ .eslintrc.js | 3 --- package-lock.json | 10 ++++++++ package.json | 7 +++--- .../BackgroundLayerChooser.tsx | 15 +++++------ .../BackgroundLayerPreview.tsx | 11 ++++---- src/Context/MapContext/MapContext.spec.tsx | 7 +++--- .../DropTargetMap/DropTargetMap.spec.tsx | 4 +-- .../DropTargetMap/DropTargetMap.tsx | 2 +- .../TimeLayerAware/TimeLayerAware.spec.tsx | 4 +-- .../TimeLayerAware/TimeLayerAware.tsx | 4 +-- .../FloatingMapLogo/FloatingMapLogo.spec.tsx | 1 - src/Map/FloatingMapLogo/FloatingMapLogo.tsx | 3 +-- src/Map/MapComponent/MapComponent.spec.tsx | 1 - src/Map/MapComponent/MapComponent.tsx | 3 +-- src/Util/DigitizeUtil.ts | 22 ++++++++-------- src/Util/PrintUtil.ts | 11 ++++---- src/Util/TestUtil.tsx | 12 ++++----- src/Util/rtlTestUtils.tsx | 11 ++++---- src/Util/typeUtils.spec.tsx | 16 ++++++------ src/Util/typeUtils.ts | 4 +-- .../useAsyncEffect/useAsyncEffect.spec.ts | 4 +-- .../useDebouncedState/useDebouncedState.ts | 2 +- src/hooks/useMap.ts | 3 +-- .../useObjectState/useObjectState.spec.tsx | 6 ++--- src/hooks/useOlInteraction.ts | 12 ++++----- src/hooks/useOlLayer.ts | 9 +++---- src/hooks/useOlListener.ts | 9 +++---- src/hooks/usePermalink/index.ts | 6 ++--- src/index.ts | 25 +++++++++---------- 30 files changed, 118 insertions(+), 121 deletions(-) create mode 100644 .eslintrc delete mode 100644 .eslintrc.js diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 00000000..c3f27512 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,12 @@ +{ + "extends": [ + "@terrestris/eslint-config-typescript" + ], + "plugins": ["simple-import-sort"], + "rules": { + "@typescript-eslint/member-ordering": "off", + "no-underscore-dangle": "off", + "simple-import-sort/exports": "warn", + "simple-import-sort/imports": "warn" + } +} diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 935c3248..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - extends: '@terrestris/eslint-config-typescript' -}; diff --git a/package-lock.json b/package-lock.json index 8142f490..7b0d3487 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,6 +37,7 @@ "core-js": "^3.12.0", "enzyme": "^3.11.0", "eslint": "^8.14.0", + "eslint-plugin-simple-import-sort": "^10.0.0", "jest": "^29.6.4", "jest-canvas-mock": "^2.5.2", "jest-environment-jsdom": "^29.6.4", @@ -8080,6 +8081,15 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-plugin-simple-import-sort": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", + "integrity": "sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==", + "dev": true, + "peerDependencies": { + "eslint": ">=5.0.0" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", diff --git a/package.json b/package.json index d37dde0c..8c4fe90b 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,8 @@ ], "scripts": { "build": "rimraf ./dist/* && tsc -p tsconfig.json", - "eslint": "eslint -c .eslintrc.js --ext .js,.ts,.tsx && tsc --noEmit --project tsconfig.json", - "lint:test:build": "npm run lint:test && npm run build", - "lint:test": "npm run lint && npm run test", - "lint": "npm run typecheck && npm run eslint ", + "lint": "eslint -c .eslintrc --ext .tsx,.ts src/", + "lint:fix": "eslint -c .eslintrc --ext .tsx,.ts src/ --fix", "prepublishOnly": "npm run lint:test:build", "release": "np --no-yarn && git push https://github.com/terrestris/react-util.git main", "test-ci": "jest --ci --coverage", @@ -50,6 +48,7 @@ "@babel/plugin-proposal-optional-chaining": "^7.13.12", "@babel/preset-env": "^7.14.1", "@babel/preset-react": "^7.13.13", + "eslint-plugin-simple-import-sort": "^10.0.0", "@babel/preset-typescript": "^7.13.0", "@cfaester/enzyme-adapter-react-18": "^0.7.1", "@terrestris/eslint-config-typescript": "^3.0.0", diff --git a/src/BackgroundLayerChooser/BackgroundLayerChooser.tsx b/src/BackgroundLayerChooser/BackgroundLayerChooser.tsx index df96f24a..b09d7da1 100644 --- a/src/BackgroundLayerChooser/BackgroundLayerChooser.tsx +++ b/src/BackgroundLayerChooser/BackgroundLayerChooser.tsx @@ -1,22 +1,19 @@ -import React, { - useState, - useEffect, - useRef -} from 'react'; - import OlOverviewMap from 'ol/control/OverviewMap'; import OlLayerBase from 'ol/layer/Base'; +import OlLayerImage from 'ol/layer/Image'; import OlLayer from 'ol/layer/Layer'; -import OlView from 'ol/View'; import OlLayerTile from 'ol/layer/Tile'; -import OlLayerImage from 'ol/layer/Image'; import { ObjectEvent } from 'ol/Object'; import { getUid } from 'ol/util'; +import OlView from 'ol/View'; +import React, { + useEffect, + useRef, + useState} from 'react'; import BackgroundLayerPreview, { BackgroundLayerLoadingMaskProps } from '../BackgroundLayerPreview/BackgroundLayerPreview'; - import useMap from '../hooks/useMap'; export type BackgroundLayerButtonProps = { diff --git a/src/BackgroundLayerPreview/BackgroundLayerPreview.tsx b/src/BackgroundLayerPreview/BackgroundLayerPreview.tsx index 44f290a8..5c642fa6 100644 --- a/src/BackgroundLayerPreview/BackgroundLayerPreview.tsx +++ b/src/BackgroundLayerPreview/BackgroundLayerPreview.tsx @@ -1,14 +1,13 @@ -import React, { useState, useEffect } from 'react'; - +import { Coordinate } from 'ol/coordinate'; import OlLayerBase from 'ol/layer/Base'; +import OlLayerImage from 'ol/layer/Image'; import OlLayer from 'ol/layer/Layer'; -import OlMap from 'ol/Map'; -import OlView from 'ol/View'; import OlLayerTile from 'ol/layer/Tile'; -import OlLayerImage from 'ol/layer/Image'; +import OlMap from 'ol/Map'; import { getUid } from 'ol/util'; +import OlView from 'ol/View'; +import React, { useEffect,useState } from 'react'; -import { Coordinate } from 'ol/coordinate'; import useMap from '../hooks/useMap'; import MapComponent from '../Map/MapComponent/MapComponent'; diff --git a/src/Context/MapContext/MapContext.spec.tsx b/src/Context/MapContext/MapContext.spec.tsx index 2146289a..b7b31b8d 100644 --- a/src/Context/MapContext/MapContext.spec.tsx +++ b/src/Context/MapContext/MapContext.spec.tsx @@ -1,9 +1,10 @@ -import React from 'react'; +import { mount,shallow } from 'enzyme'; import OlMap from 'ol/Map'; -import { shallow, mount } from 'enzyme'; +import React from 'react'; + import { useMap } from '../../hooks/useMap'; -import MapContext from './MapContext'; import { TestUtil } from '../../Util/TestUtil'; +import MapContext from './MapContext'; describe('MapContext', () => { const olMap = TestUtil.createMap(); diff --git a/src/HigherOrderComponent/DropTargetMap/DropTargetMap.spec.tsx b/src/HigherOrderComponent/DropTargetMap/DropTargetMap.spec.tsx index 2d3d35f4..6d795ab3 100644 --- a/src/HigherOrderComponent/DropTargetMap/DropTargetMap.spec.tsx +++ b/src/HigherOrderComponent/DropTargetMap/DropTargetMap.spec.tsx @@ -1,11 +1,9 @@ +import FileUtil from '@terrestris/ol-util/dist/FileUtil/FileUtil'; import * as React from 'react'; import TestUtil from '../../Util/TestUtil'; - import { onDropAware } from './DropTargetMap'; -import FileUtil from '@terrestris/ol-util/dist/FileUtil/FileUtil'; - describe('onDropAware', () => { let EnhancedComponent; diff --git a/src/HigherOrderComponent/DropTargetMap/DropTargetMap.tsx b/src/HigherOrderComponent/DropTargetMap/DropTargetMap.tsx index b59d7d60..4466eb59 100644 --- a/src/HigherOrderComponent/DropTargetMap/DropTargetMap.tsx +++ b/src/HigherOrderComponent/DropTargetMap/DropTargetMap.tsx @@ -1,6 +1,6 @@ +import FileUtil from '@terrestris/ol-util/dist/FileUtil/FileUtil'; import * as React from 'react'; -import FileUtil from '@terrestris/ol-util/dist/FileUtil/FileUtil'; import { MapComponentProps } from '../../Map/MapComponent/MapComponent'; /** diff --git a/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.spec.tsx b/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.spec.tsx index cabacc50..5115b3a9 100644 --- a/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.spec.tsx +++ b/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.spec.tsx @@ -1,11 +1,9 @@ -import * as React from 'react'; import moment from 'moment'; - import OlTileLayer from 'ol/layer/Tile'; import OlTileWMS from 'ol/source/TileWMS'; +import * as React from 'react'; import TestUtil from '../../Util/TestUtil'; - import { timeLayerAware } from './TimeLayerAware'; describe('timeLayerAware', () => { diff --git a/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.tsx b/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.tsx index 48107ec5..ddbc3788 100644 --- a/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.tsx +++ b/src/HigherOrderComponent/TimeLayerAware/TimeLayerAware.tsx @@ -1,10 +1,8 @@ -import * as React from 'react'; - import _isArray from 'lodash/isArray'; - import OlLayer from 'ol/layer/Layer'; import OlImageWMS from 'ol/source/ImageWMS'; import OlTileWMS from 'ol/source/TileWMS'; +import * as React from 'react'; export type TimeLayerAwareConfig = { isWmsTime?: boolean; diff --git a/src/Map/FloatingMapLogo/FloatingMapLogo.spec.tsx b/src/Map/FloatingMapLogo/FloatingMapLogo.spec.tsx index 018a1721..7016e46f 100644 --- a/src/Map/FloatingMapLogo/FloatingMapLogo.spec.tsx +++ b/src/Map/FloatingMapLogo/FloatingMapLogo.spec.tsx @@ -1,6 +1,5 @@ import testLogo from '../../../assets/user.png'; import TestUtil from '../../Util/TestUtil'; - import FloatingMapLogo from './FloatingMapLogo'; describe('', () => { diff --git a/src/Map/FloatingMapLogo/FloatingMapLogo.tsx b/src/Map/FloatingMapLogo/FloatingMapLogo.tsx index 26e1e179..53cfdafb 100644 --- a/src/Map/FloatingMapLogo/FloatingMapLogo.tsx +++ b/src/Map/FloatingMapLogo/FloatingMapLogo.tsx @@ -1,6 +1,5 @@ -import * as React from 'react'; - import _cloneDeep from 'lodash/cloneDeep'; +import * as React from 'react'; import { CSS_PREFIX } from '../../constants'; diff --git a/src/Map/MapComponent/MapComponent.spec.tsx b/src/Map/MapComponent/MapComponent.spec.tsx index 936b4009..589097ab 100644 --- a/src/Map/MapComponent/MapComponent.spec.tsx +++ b/src/Map/MapComponent/MapComponent.spec.tsx @@ -1,5 +1,4 @@ import TestUtil from '../../Util/TestUtil'; - import MapComponent from './MapComponent'; describe('', () => { diff --git a/src/Map/MapComponent/MapComponent.tsx b/src/Map/MapComponent/MapComponent.tsx index b04d8b7d..4bd121a5 100644 --- a/src/Map/MapComponent/MapComponent.tsx +++ b/src/Map/MapComponent/MapComponent.tsx @@ -1,9 +1,8 @@ +import OlMap from 'ol/Map'; import React, { useCallback } from 'react'; -import OlMap from 'ol/Map'; - export interface MapComponentProps extends React.ComponentProps<'div'> { map: OlMap; mapDivId?: string; diff --git a/src/Util/DigitizeUtil.ts b/src/Util/DigitizeUtil.ts index db5494e2..c131b0e9 100644 --- a/src/Util/DigitizeUtil.ts +++ b/src/Util/DigitizeUtil.ts @@ -1,19 +1,19 @@ -import OlVectorLayer from 'ol/layer/Vector'; -import OlStyleStyle, { StyleLike as OlStyleLike } from 'ol/style/Style'; -import OlStyleCircle from 'ol/style/Circle'; -import OlStyleFill from 'ol/style/Fill'; -import OlStyleStroke from 'ol/style/Stroke'; -import OlStyleText from 'ol/style/Text'; -import OlStyle from 'ol/style/Style'; -import OlLayerVector from 'ol/layer/Vector'; -import OlSourceVector from 'ol/source/Vector'; -import OlCollection from 'ol/Collection'; -import OlMap from 'ol/Map'; import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil'; +import OlCollection from 'ol/Collection'; import OlFeature from 'ol/Feature'; import OlGeometry from 'ol/geom/Geometry'; import Geometry from 'ol/geom/Geometry'; +import OlVectorLayer from 'ol/layer/Vector'; +import OlLayerVector from 'ol/layer/Vector'; +import OlMap from 'ol/Map'; import RenderFeature from 'ol/render/Feature'; +import OlSourceVector from 'ol/source/Vector'; +import OlStyleCircle from 'ol/style/Circle'; +import OlStyleFill from 'ol/style/Fill'; +import OlStyleStroke from 'ol/style/Stroke'; +import OlStyleStyle, { StyleLike as OlStyleLike } from 'ol/style/Style'; +import OlStyle from 'ol/style/Style'; +import OlStyleText from 'ol/style/Text'; export class DigitizeUtil { /** diff --git a/src/Util/PrintUtil.ts b/src/Util/PrintUtil.ts index 12e55062..4f8d2d6e 100644 --- a/src/Util/PrintUtil.ts +++ b/src/Util/PrintUtil.ts @@ -1,16 +1,17 @@ -import OlMap from 'ol/Map'; -import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil'; import { downloadBlob, getJobStatus, queuePrint } from '@camptocamp/inkmap'; +import Logger from '@terrestris/base-util/dist/Logger'; +import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil'; +import { jsPDF } from 'jspdf'; +import _isString from 'lodash/isString'; +import OlMap from 'ol/Map'; + import { InkmapPrintSpec } from './InkmapTypes'; -import { jsPDF } from 'jspdf'; -import _isString from 'lodash/isString'; -import Logger from '@terrestris/base-util/dist/Logger'; export class PrintUtil { diff --git a/src/Util/TestUtil.tsx b/src/Util/TestUtil.tsx index 1a73843a..2c976467 100644 --- a/src/Util/TestUtil.tsx +++ b/src/Util/TestUtil.tsx @@ -1,12 +1,12 @@ -import * as React from 'react'; -import { mount, shallow, ShallowWrapper, ReactWrapper, MountRendererProps } from 'enzyme'; -import OlView from 'ol/View'; -import OlMap from 'ol/Map'; -import OlSourceVector from 'ol/source/Vector'; -import OlLayerVector from 'ol/layer/Vector'; +import { mount, MountRendererProps,ReactWrapper, shallow, ShallowWrapper } from 'enzyme'; import OlFeature from 'ol/Feature'; import OlGeomPoint from 'ol/geom/Point'; +import OlLayerVector from 'ol/layer/Vector'; +import OlMap from 'ol/Map'; import OlMapBrowserEvent from 'ol/MapBrowserEvent'; +import OlSourceVector from 'ol/source/Vector'; +import OlView from 'ol/View'; +import * as React from 'react'; type Wrapper = ShallowWrapper | ReactWrapper; diff --git a/src/Util/rtlTestUtils.tsx b/src/Util/rtlTestUtils.tsx index 20ad55c3..39411abb 100644 --- a/src/Util/rtlTestUtils.tsx +++ b/src/Util/rtlTestUtils.tsx @@ -1,13 +1,14 @@ import { act, fireEvent, render } from '@testing-library/react'; -import OlMap from 'ol/Map'; -import MapContext from '../Context/MapContext/MapContext'; -import MapComponent from '../Map/MapComponent/MapComponent'; -import * as React from 'react'; -import { ReactElement } from 'react'; import OlFeature from 'ol/Feature'; import OlGeometry from 'ol/geom/Geometry'; import OlVectorLayer from 'ol/layer/Vector'; +import OlMap from 'ol/Map'; import OlVectorSource from 'ol/source/Vector'; +import * as React from 'react'; +import { ReactElement } from 'react'; + +import MapContext from '../Context/MapContext/MapContext'; +import MapComponent from '../Map/MapComponent/MapComponent'; export async function actSetTimeout(time: number): Promise { // @ts-ignore diff --git a/src/Util/typeUtils.spec.tsx b/src/Util/typeUtils.spec.tsx index aab509c4..82c99b50 100644 --- a/src/Util/typeUtils.spec.tsx +++ b/src/Util/typeUtils.spec.tsx @@ -1,18 +1,16 @@ -import { isWmsLayer } from './typeUtils'; - import OlBaseLayer from 'ol/layer/Base'; -import OlLayer from 'ol/layer/Layer'; -import OlImageWMS from 'ol/source/ImageWMS'; -import OlTileWMS from 'ol/source/TileWMS'; +import OlHeatmapLayer from 'ol/layer/Heatmap'; import OlImageLayer from 'ol/layer/Image'; +import OlLayer from 'ol/layer/Layer'; import OlTileLayer from 'ol/layer/Tile'; - import OlVectorLayer from 'ol/layer/Vector'; -import OlHeatmapLayer from 'ol/layer/Heatmap'; - +import OlSourceCluster from 'ol/source/Cluster'; +import OlImageWMS from 'ol/source/ImageWMS'; +import OlTileWMS from 'ol/source/TileWMS'; import OlSourceVector from 'ol/source/Vector'; import OlSourceVectorTile from 'ol/source/VectorTile'; -import OlSourceCluster from 'ol/source/Cluster'; + +import { isWmsLayer } from './typeUtils'; const getWmsLikeLayers = () => { return { diff --git a/src/Util/typeUtils.ts b/src/Util/typeUtils.ts index e5d5e7b1..c3cc9b59 100644 --- a/src/Util/typeUtils.ts +++ b/src/Util/typeUtils.ts @@ -1,9 +1,9 @@ import OlBaseLayer from 'ol/layer/Base'; +import OlImageLayer from 'ol/layer/Image'; import OlLayer from 'ol/layer/Layer'; +import OlTileLayer from 'ol/layer/Tile'; import OlImageWMS from 'ol/source/ImageWMS'; import OlTileWMS from 'ol/source/TileWMS'; -import OlImageLayer from 'ol/layer/Image'; -import OlTileLayer from 'ol/layer/Tile'; export type WmsLayer = OlImageLayer | OlTileLayer | OlLayer; diff --git a/src/hooks/useAsyncEffect/useAsyncEffect.spec.ts b/src/hooks/useAsyncEffect/useAsyncEffect.spec.ts index a43dc6a7..d4aaa999 100644 --- a/src/hooks/useAsyncEffect/useAsyncEffect.spec.ts +++ b/src/hooks/useAsyncEffect/useAsyncEffect.spec.ts @@ -1,8 +1,8 @@ -import { useAsyncEffect } from './useAsyncEffect'; - // @ts-ignore import fetch from 'jest-fetch-mock'; +import { useAsyncEffect } from './useAsyncEffect'; + jest.mock('react'); import { useEffect } from 'react'; diff --git a/src/hooks/useDebouncedState/useDebouncedState.ts b/src/hooks/useDebouncedState/useDebouncedState.ts index eb6d1bdd..4992ea35 100644 --- a/src/hooks/useDebouncedState/useDebouncedState.ts +++ b/src/hooks/useDebouncedState/useDebouncedState.ts @@ -25,4 +25,4 @@ export const useDebouncedState = ({ initialValue, time = 100 }: UseDebouncedS }; return [state, setDelayedState]; -} +}; diff --git a/src/hooks/useMap.ts b/src/hooks/useMap.ts index f659e5a0..81ed6bf6 100644 --- a/src/hooks/useMap.ts +++ b/src/hooks/useMap.ts @@ -1,9 +1,8 @@ +import OlMap from 'ol/Map'; import { useContext } from 'react'; -import OlMap from 'ol/Map'; - import MapContext from '../Context/MapContext/MapContext'; export const useMap = (): (OlMap | undefined) => { diff --git a/src/hooks/useObjectState/useObjectState.spec.tsx b/src/hooks/useObjectState/useObjectState.spec.tsx index 79e0652b..19b61ccd 100644 --- a/src/hooks/useObjectState/useObjectState.spec.tsx +++ b/src/hooks/useObjectState/useObjectState.spec.tsx @@ -1,7 +1,7 @@ -import { useObjectState } from './useObjectState'; -import { renderHook, act } from '@testing-library/react'; - import { Logger } from '@terrestris/base-util'; +import { act,renderHook } from '@testing-library/react'; + +import { useObjectState } from './useObjectState'; type User = { name: string; diff --git a/src/hooks/useOlInteraction.ts b/src/hooks/useOlInteraction.ts index fbd11a8d..5aa36794 100644 --- a/src/hooks/useOlInteraction.ts +++ b/src/hooks/useOlInteraction.ts @@ -1,16 +1,14 @@ -import { - DependencyList, - useEffect, - useState -} from 'react'; - import { isNil } from 'lodash'; - import { Interaction } from 'ol/interaction'; +import { + DependencyList, + useEffect, + useState +} from 'react'; import useMap from './useMap'; diff --git a/src/hooks/useOlLayer.ts b/src/hooks/useOlLayer.ts index 2ab6a9ac..19073535 100644 --- a/src/hooks/useOlLayer.ts +++ b/src/hooks/useOlLayer.ts @@ -1,14 +1,13 @@ +import { + isNil +} from 'lodash'; +import BaseLayer from 'ol/layer/Base'; import { DependencyList, useEffect, useState } from 'react'; -import { - isNil -} from 'lodash'; -import BaseLayer from 'ol/layer/Base'; - import useMap from './useMap'; /** diff --git a/src/hooks/useOlListener.ts b/src/hooks/useOlListener.ts index f5eb7e39..dd330101 100644 --- a/src/hooks/useOlListener.ts +++ b/src/hooks/useOlListener.ts @@ -1,8 +1,3 @@ -import { - DependencyList, - useEffect -} from 'react'; - import { Observable } from 'ol'; @@ -12,6 +7,10 @@ import { import { unByKey } from 'ol/Observable'; +import { + DependencyList, + useEffect +} from 'react'; /** * This hook unregisters listeners if the dependency array changes diff --git a/src/hooks/usePermalink/index.ts b/src/hooks/usePermalink/index.ts index 56bf6f7c..8eed8bde 100644 --- a/src/hooks/usePermalink/index.ts +++ b/src/hooks/usePermalink/index.ts @@ -1,12 +1,10 @@ +import OlInteractionLink from 'ol/interaction/Link'; +import OlMap from 'ol/Map'; import { useEffect, useRef } from 'react'; -import OlInteractionLink from 'ol/interaction/Link'; - -import OlMap from 'ol/Map'; - export const usePermalink = (map: OlMap|undefined) => { const linkInteractionRef = useRef(); diff --git a/src/index.ts b/src/index.ts index 9a740484..19109bc3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,28 +1,27 @@ import BackgroundLayerChooser from './BackgroundLayerChooser/BackgroundLayerChooser'; import BackgroundLayerPreview from './BackgroundLayerPreview/BackgroundLayerPreview'; -import useMap from './hooks/useMap'; -import MapComponent from './Map/MapComponent/MapComponent'; -import FloatingMapLogo from './Map/FloatingMapLogo/FloatingMapLogo'; import onDropAware from './HigherOrderComponent/DropTargetMap/DropTargetMap'; import timeLayerAware from './HigherOrderComponent/TimeLayerAware/TimeLayerAware'; +import useMap from './hooks/useMap'; +import FloatingMapLogo from './Map/FloatingMapLogo/FloatingMapLogo'; +import MapComponent from './Map/MapComponent/MapComponent'; import ClickAwayListener from './Util/ClickAwayListener/ClickAwayListener'; import { DigitizeUtil } from './Util/DigitizeUtil'; -import { WmsLayer, isWmsLayer } from './Util/typeUtils'; -import { PrintUtil } from './Util/PrintUtil'; import { InkmapPrintSpec } from './Util/InkmapTypes'; +import { PrintUtil } from './Util/PrintUtil'; +import { isWmsLayer,WmsLayer } from './Util/typeUtils'; export { BackgroundLayerChooser, BackgroundLayerPreview, - useMap, - MapComponent, - FloatingMapLogo, - onDropAware, - timeLayerAware, ClickAwayListener, DigitizeUtil, + FloatingMapLogo, + InkmapPrintSpec, isWmsLayer, - WmsLayer, + MapComponent, + onDropAware, PrintUtil, - InkmapPrintSpec -}; + timeLayerAware, + useMap, + WmsLayer}; From 810a04445c400410a80beb18edf34349a9931450 Mon Sep 17 00:00:00 2001 From: Andre Henn Date: Wed, 6 Sep 2023 09:56:20 +0200 Subject: [PATCH 2/5] chore: ignore intelliJ specific files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 813cb152..dec543d2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,7 @@ target/ npm-debug.log* yarn-debug.log* yarn-error.log* + +# intellij +.idea +*.iml From b5c7f14f076205133c6dc572618d2212798274cd Mon Sep 17 00:00:00 2001 From: Andre Henn Date: Wed, 6 Sep 2023 09:56:31 +0200 Subject: [PATCH 3/5] chore: introduce .npmrc --- .nvmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..3f430af8 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v18 From ac8660b4fd616fe2fa55832050a7ffe0cc443189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Henn?= Date: Wed, 6 Sep 2023 10:13:05 +0200 Subject: [PATCH 4/5] Update src/index.ts Co-authored-by: Anna Rieger --- src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 19109bc3..e5b57cf6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -24,4 +24,5 @@ export { PrintUtil, timeLayerAware, useMap, - WmsLayer}; + WmsLayer +}; From 21646e6b0eae1e66dae74551847ba2b2181e5d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Henn?= Date: Wed, 6 Sep 2023 10:13:16 +0200 Subject: [PATCH 5/5] Update src/index.ts Co-authored-by: Lukas Lohoff --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index e5b57cf6..ef8fe2a7 100644 --- a/src/index.ts +++ b/src/index.ts @@ -9,7 +9,7 @@ import ClickAwayListener from './Util/ClickAwayListener/ClickAwayListener'; import { DigitizeUtil } from './Util/DigitizeUtil'; import { InkmapPrintSpec } from './Util/InkmapTypes'; import { PrintUtil } from './Util/PrintUtil'; -import { isWmsLayer,WmsLayer } from './Util/typeUtils'; +import { isWmsLayer, WmsLayer } from './Util/typeUtils'; export { BackgroundLayerChooser,