Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Merge pull request #376 from Bayer-Group/update-deps
Browse files Browse the repository at this point in the history 
Updated deps with security issues
  • Loading branch information
@gabe647
gabe647 authored Jan 31, 2022
2 parents 7f795bc + cdf4d63 commit c33f1f3
Show file tree
Hide file tree
Showing 14 changed files with 3,165 additions and 2,873 deletions.
6 changes: 4 additions & 2 deletions jest.setup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ require('jest-fetch-mock').enableMocks()
global.URL.createObjectURL = jest.fn()

// add mock to keep map snapshots consistent
jest.mock('nanoid', () => () => 'test_id')
jest.mock('nanoid', () => {
return { nanoid: () => 'test_id' }
})

configure({ adapter: new Adapter() })

// this fixes 'TypeError: Illegal invocation' from smooth-dnd
Object.defineProperty(global, 'Node', {
value: {firstElementChild: 'firstElementChild'}
value: { firstElementChild: 'firstElementChild' }
})
5,877 changes: 3,080 additions & 2,797 deletions package-lock.json
View file

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bayer/ol-kit",
"version": "1.20.0",
"version": "1.21.0",
"license": "BSD",
"description": "Mapping components & utils built with openlayers + react",
"keywords": [
Expand Down Expand Up @@ -95,10 +95,10 @@
},
"dependencies": {
"@date-io/moment": "~1.3.13",
"@material-ui/core": ">=4.0.0",
"@material-ui/icons": ">=4.0.0",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/pickers": "~3.2.10",
"@material-ui/styles": ">=4.0.0",
"@material-ui/styles": "^4.11.4",
"@mdi/js": "~5.1.45",
"@mdi/react": "1.4.0",
"@turf/bbox": "~6.0.1",
Expand All @@ -109,29 +109,29 @@
"@turf/transform-translate": "~6.3.0",
"@turf/union": "^6.5.0",
"child-process-promise": "~2.2.1",
"clipboard": "~2.0.6",
"clipboard": "^2.0.9",
"clsx": "~1.1.1",
"depcheck": "~1.2.0",
"exifreader": "~4.1.0",
"exifreader": "^4.2.0",
"geostyler-openlayers-parser": "~2.1.0",
"jspdf": "~2.3.1",
"jszip": "~3.7.0",
"jszip": "^3.7.1",
"lodash.clonedeep": "~4.5.0",
"lodash.debounce": "~4.0.8",
"lodash.escaperegexp": "~4.1.2",
"lodash.isequal": "~4.5.0",
"moment": "~2.26.0",
"nanoid": "~3.1.31",
"papaparse": "~5.3.0",
"nanoid": "^3.2.0",
"papaparse": "^5.3.1",
"process": "~0.11.10",
"prop-types": "~15.7.2",
"qs": "~6.9.3",
"qs": "^6.10.3",
"react-color": "~2.18.0",
"react-draggable": "~4.4.3",
"react-dropzone": "~11.3.1",
"react-draggable": "^4.4.4",
"react-dropzone": "^11.5.1",
"react-hook-form": "~5.7.2",
"react-rotary-knob": "^1.1.8",
"react-select": "~3.1.0",
"react-select": "^3.2.0",
"react-viewer": "~3.2.2",
"react-virtuoso": "~1.10.8",
"shp-write": "~0.3.2",
Expand All @@ -140,32 +140,32 @@
"uuid": "~7.0.3"
},
"devDependencies": {
"@babel/cli": "~7.16.0",
"@babel/cli": "^7.16.8",
"@babel/core": "~7.7.7",
"@babel/plugin-proposal-class-properties": "~7.7.4",
"@babel/plugin-proposal-optional-chaining": "~7.9.0",
"@babel/plugin-transform-runtime": "~7.6.2",
"@babel/polyfill": "~7.8.3",
"@babel/preset-env": "~7.7.1",
"@babel/preset-react": "~7.7.0",
"@babel/runtime": "~7.7.2",
"@babel/runtime": "^7.16.7",
"@hot-loader/react-dom": "~16.13.0",
"@seneca/vorpal": "^2.1.1",
"@testing-library/dom": "~8.11.1",
"@testing-library/dom": "^8.11.3",
"@testing-library/jest-dom": "~5.5.0",
"@testing-library/react": "~10.0.1",
"@turf/difference": "6.0.1",
"apollo-boost": "~0.4.9",
"babel-eslint": "~10.0.1",
"babel-jest": "~24.9.0",
"babel-loader": "~8.2.2",
"babel-loader": "^8.2.3",
"babel-plugin-inline-react-svg": "~2.0.1",
"babel-plugin-module-resolver": "~3.2.0",
"child_process": "~1.0.2",
"cross-env": "~7.0.2",
"cross-env": "^7.0.3",
"css-loader": "~6.2.0",
"enzyme": "~3.10.0",
"enzyme-adapter-react-16": "~1.15.2",
"enzyme-adapter-react-16": "^1.15.6",
"enzyme-to-json": "~3.4.4",
"eslint": "7.32.0",
"eslint-config-standard": "~14.1.1",
Expand All @@ -175,9 +175,9 @@
"eslint-plugin-promise": "~3.5.0",
"eslint-plugin-react": "~7.19.0",
"eslint-plugin-react-hooks": "~4.1.0",
"eslint-plugin-standard": "~4.0.1",
"eslint-plugin-standard": "^4.1.0",
"file-loader": "~6.2.0",
"file-saver": "~2.0.2",
"file-saver": "^2.0.5",
"graphql": "~14.7.0",
"html-webpack-plugin": "~5.3.2",
"husky": "~7.0.4",
Expand All @@ -187,8 +187,8 @@
"jest-environment-jsdom-global": "~2.0.2",
"jest-fetch-mock": "~3.0.3",
"jest-puppeteer": "~4.4.0",
"jest-styled-components": "~7.0.2",
"jsdoc": "~3.6.7",
"jest-styled-components": "^7.0.8",
"jsdoc": "^3.6.10",
"mui-datatables": "~3.8.2",
"ol": "6.5.0",
"parcel": "2.0.1",
Expand All @@ -198,10 +198,10 @@
"react-bootstrap": "~1.3.0",
"react-dom": "~16.11.0",
"react-hot-loader": "~4.12.21",
"react-router-dom": "~5.2.0",
"react-router-dom": "^5.3.0",
"recharts": "~1.8.5",
"semver": "~7.3.2",
"styled-components": "~5.2.0",
"semver": "^7.3.5",
"styled-components": "^5.3.3",
"webpack": "~5.46.0",
"webpack-cli": "~4.7.2",
"webpack-dev-server": "~3.11.3",
Expand Down
2 changes: 1 addition & 1 deletion src/Draw/DrawContainer.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
import nanoid from 'nanoid'
import { nanoid } from 'nanoid'
import { VectorLayer, Preferences } from '../classes'
import olSourceVector from 'ol/source/Vector'
import { createBox } from 'ol/interaction/Draw'
Expand Down
38 changes: 19 additions & 19 deletions src/Draw/__snapshots__/DrawContainer.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
exports[`<DrawContainer /> should render a basic prebuilt DrawContainer component 1`] = `
"[36m<div>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-hKFyIo gQSimQ\\"[39m
[33mclass[39m=[32m\\"sc-hKwDye kptXzQ\\"[39m
[33mid[39m=[32m\\"_ol_kit_map_test_id\\"[39m
[36m>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-bdnylx kHErEJ\\"[39m
[33mclass[39m=[32m\\"sc-bdvvtL dyYWiY\\"[39m
[36m>[39m
[36m<p[39m
[33mclass[39m=[32m\\"sc-dlnjPT kmmhpS\\"[39m
[33mclass[39m=[32m\\"sc-dkPtRN fXgxXr\\"[39m
[36m>[39m
[0mPowered by ol-kit[0m
[36m</p>[39m
[36m<a[39m
[33mclass[39m=[32m\\"sc-gtssRu fBppYk\\"[39m
[33mclass[39m=[32m\\"sc-gsDKAQ iJJRQN\\"[39m
[33mhref[39m=[32m\\"https://ol-kit.com/\\"[39m
[33mtarget[39m=[32m\\"_blank\\"[39m
[33mtitle[39m=[32m\\"Powered by ol-kit v1.19.0\\"[39m
[33mtitle[39m=[32m\\"Powered by ol-kit v1.21.0\\"[39m
[36m>[39m
[36m<svg[39m
[33mviewBox[39m=[32m\\"0 0 204.76 236.44\\"[39m
Expand Down Expand Up @@ -50,18 +50,18 @@ exports[`<DrawContainer /> should render a basic prebuilt DrawContainer componen
[36m</div>[39m
[36m</div>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-kEqYlL iNtNNs\\"[39m
[33mclass[39m=[32m\\"sc-kDTinF nNJzm\\"[39m
[36m>[39m
[36m<div>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-dIsAE cezkQS\\"[39m
[33mclass[39m=[32m\\"sc-egiyK fpHmav\\"[39m
[36m>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-bqGHjH dDEWGd\\"[39m
[33mclass[39m=[32m\\"sc-bqiRlB da-dPPv\\"[39m
[33mid[39m=[32m\\"_POINT_LABELS_ENABLED\\"[39m
[36m>[39m
[36m<label[39m
[33mclass[39m=[32m\\"sc-ksluoS blZtgg\\"[39m
[33mclass[39m=[32m\\"sc-ksdxgE fmCYnt\\"[39m
[33mfor[39m=[32m\\"_POINT_LABELS_ENABLED\\"[39m
[36m>[39m
[0mCoordinate Labels[0m
Expand All @@ -71,13 +71,13 @@ exports[`<DrawContainer /> should render a basic prebuilt DrawContainer componen
[36m>[39m
[36m<span[39m
[33maria-disabled[39m=[32m\\"false\\"[39m
[33mclass[39m=[32m\\"MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-16 MuiSwitch-switchBase WithStyles(ForwardRef(Switch))-switchBase-1 MuiSwitch-colorPrimary\\"[39m
[33mclass[39m=[32m\\"MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-4 MuiSwitch-switchBase WithStyles(ForwardRef(Switch))-switchBase-1 MuiSwitch-colorPrimary\\"[39m
[36m>[39m
[36m<span[39m
[33mclass[39m=[32m\\"MuiIconButton-label\\"[39m
[36m>[39m
[36m<input[39m
[33mclass[39m=[32m\\"PrivateSwitchBase-input-19 MuiSwitch-input\\"[39m
[33mclass[39m=[32m\\"PrivateSwitchBase-input-7 MuiSwitch-input\\"[39m
[33mtype[39m=[32m\\"checkbox\\"[39m
[33mvalue[39m=[32m\\"false\\"[39m
[36m/>[39m
Expand All @@ -97,33 +97,33 @@ exports[`<DrawContainer /> should render a basic prebuilt DrawContainer componen
[36m</div>[39m
[36m</div>[39m
[36m<div[39m
[33mclass[39m=[32m\\"MuiContainer-root WithStyles(ForwardRef(Container))-root-32 MuiContainer-maxWidthLg\\"[39m
[33mclass[39m=[32m\\"MuiContainer-root WithStyles(ForwardRef(Container))-root-8 MuiContainer-maxWidthLg\\"[39m
[36m>[39m
[36m<div[39m
[33mclass[39m=[32m\\"MuiContainer-root WithStyles(ForwardRef(Container))-root-41 MuiContainer-maxWidthLg\\"[39m
[33mclass[39m=[32m\\"MuiContainer-root WithStyles(ForwardRef(Container))-root-9 MuiContainer-maxWidthLg\\"[39m
[36m>[39m
[36m<div[39m
[33mstyle[39m=[32m\\"width: 100%;\\"[39m
[36m>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-dIsAE cezkQS\\"[39m
[33mclass[39m=[32m\\"sc-egiyK fpHmav\\"[39m
[36m>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-bqGHjH dDEWGd\\"[39m
[33mclass[39m=[32m\\"sc-bqiRlB da-dPPv\\"[39m
[33mid[39m=[32m\\"_DISTANCE_LABEL_ENABLED\\"[39m
[36m>[39m
[36m<span[39m
[33mclass[39m=[32m\\"MuiSwitch-root\\"[39m
[36m>[39m
[36m<span[39m
[33maria-disabled[39m=[32m\\"false\\"[39m
[33mclass[39m=[32m\\"MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-16 MuiSwitch-switchBase WithStyles(ForwardRef(Switch))-switchBase-1 MuiSwitch-colorPrimary\\"[39m
[33mclass[39m=[32m\\"MuiButtonBase-root MuiIconButton-root PrivateSwitchBase-root-4 MuiSwitch-switchBase WithStyles(ForwardRef(Switch))-switchBase-1 MuiSwitch-colorPrimary\\"[39m
[36m>[39m
[36m<span[39m
[33mclass[39m=[32m\\"MuiIconButton-label\\"[39m
[36m>[39m
[36m<input[39m
[33mclass[39m=[32m\\"PrivateSwitchBase-input-19 MuiSwitch-input\\"[39m
[33mclass[39m=[32m\\"PrivateSwitchBase-input-7 MuiSwitch-input\\"[39m
[33mdata-testid[39m=[32m\\"geokit-MeasureLabelPreference-uomToggle\\"[39m
[33mtype[39m=[32m\\"checkbox\\"[39m
[33mvalue[39m=[32m\\"false\\"[39m
Expand All @@ -142,7 +142,7 @@ exports[`<DrawContainer /> should render a basic prebuilt DrawContainer componen
[36m</span>[39m
[36m</div>[39m
[36m<div[39m
[33mclass[39m=[32m\\"sc-hBMVcZ cksXlh\\"[39m
[33mclass[39m=[32m\\"sc-hBUSln gltFyh\\"[39m
[36m>[39m
[36m<span>[39m
[0mDistance: [0m
Expand All @@ -156,5 +156,5 @@ exports[`<DrawContainer /> should render a basic prebuilt DrawContainer componen
[36m>[39m
[36m<div[39m
[33maria-haspopup[39m=[32m\\"listbox\\"[39m
[33mclass[39m=[32m\\"MuiSelect-root WithStyles(ForwardRef(Select))-root-42 WithStyles(ForwardRef(Select))-root-43 MuiSelect-select MuiSelect-selectMenu Mui..."
[33mclass[39m=[32m\\"MuiSelect-root WithStyles(ForwardRef(Select))-root-10 WithStyles(ForwardRef(Select))-root-11 MuiSelect-select MuiSelect-selectMenu MuiInput..."
`;
2 changes: 1 addition & 1 deletion src/LayerPanel/LayerPanelList/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { Component } from 'react'

import List from '@material-ui/core/List'
import LayerPanelListItem from 'LayerPanel/LayerPanelListItem'
import nanoid from 'nanoid'
import { nanoid } from 'nanoid'
import PropTypes from 'prop-types'

const applyDrag = (arr, dragResult) => {
Expand Down
2 changes: 1 addition & 1 deletion src/LayerStyler/_AttributesFilter/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
import nanoid from 'nanoid'
import { nanoid } from 'nanoid'

import CloseIcon from '@material-ui/icons/Close'
import Select from '@material-ui/core/Select'
Expand Down
2 changes: 1 addition & 1 deletion src/LayerStyler/_Selector/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import nanoid from 'nanoid'
import { nanoid } from 'nanoid'
import { Container, Header, SubHeader, TextInput, Bar, Highlight, Group } from './styled'

class Selector extends Component {
Expand Down
4 changes: 3 additions & 1 deletion src/LayerStyler/__snapshots__/LayerStyler.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,16 @@ Array [
exports[`<LayerStyler /> should change an ol-kit vector layer's style 1`] = `
Array [
Object {
"_index": 0,
"filter": Array [
"&&",
Array [
"==",
"",
"testData",
"",
],
],
"hidden": false,
"name": "New Auto Style",
"symbolizers": Array [
Object {
Expand Down
2 changes: 1 addition & 1 deletion src/Map/Map.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
import nanoid from 'nanoid'
import { nanoid } from 'nanoid'
import debounce from 'lodash.debounce'

import MapLogo from './MapLogo'
Expand Down
2 changes: 1 addition & 1 deletion src/Measure/Measure.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import nanoid from 'nanoid'
import { nanoid } from 'nanoid'
import React from 'react'
import PropTypes from 'prop-types'

Expand Down
Loading

0 comments on commit c33f1f3

Please sign in to comment.