From 1d8415a1091ca3d832305f6742cccf6ce0672e20 Mon Sep 17 00:00:00 2001 From: Daniel Lautzenheiser Date: Wed, 14 Jun 2023 09:55:26 -0400 Subject: [PATCH 1/5] fix: map widget duplication --- packages/core/dev-test/config.yml | 10 ++++++++++ packages/core/src/widgets/map/withMapControl.tsx | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/core/dev-test/config.yml b/packages/core/dev-test/config.yml index 7a04fe64..e980fe69 100644 --- a/packages/core/dev-test/config.yml +++ b/packages/core/dev-test/config.yml @@ -565,6 +565,16 @@ collections: widget: map pattern: ['\[-([7-9][0-9]|1[0-2][0-9])\.', 'Must be between latitude -70 and -129'] required: false + - name: line_string + label: Line String + type: LineString + widget: map + required: false + - name: polygon + label: Polygon + type: Polygon + widget: map + required: false - name: markdown label: Markdown file: _widgets/markdown.json diff --git a/packages/core/src/widgets/map/withMapControl.tsx b/packages/core/src/widgets/map/withMapControl.tsx index 186b2286..057beae9 100644 --- a/packages/core/src/widgets/map/withMapControl.tsx +++ b/packages/core/src/widgets/map/withMapControl.tsx @@ -38,7 +38,6 @@ interface WithMapControlProps { const withMapControl = ({ getFormat, getMap }: WithMapControlProps = {}) => { const MapControl: FC> = ({ - path, value, field, onChange, @@ -84,7 +83,8 @@ const withMapControl = ({ getFormat, getMap }: WithMapControlProps = {}) => { onChange(format.writeGeometry(geometry, writeOptions)); } }); - }, [disabled, field, mapContainer, onChange, path, value]); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); return ( Date: Wed, 14 Jun 2023 09:56:55 -0400 Subject: [PATCH 2/5] v2.5.1 --- lerna.json | 2 +- packages/app/package.json | 4 ++-- packages/core/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lerna.json b/lerna.json index d2ec24ba..a8d64323 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "2.5.0" + "version": "2.5.1" } diff --git a/packages/app/package.json b/packages/app/package.json index f2a37be6..983b7752 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@staticcms/app", - "version": "2.5.0", + "version": "2.5.1", "license": "MIT", "description": "Static CMS application.", "repository": "https://github.com/StaticJsCMS/static-cms", @@ -40,7 +40,7 @@ "@babel/eslint-parser": "7.21.3", "@babel/runtime": "7.21.0", "@emotion/babel-preset-css-prop": "11.10.0", - "@staticcms/core": "^2.5.0", + "@staticcms/core": "^2.5.1", "buffer": "6.0.3", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/packages/core/package.json b/packages/core/package.json index 4194368c..dbd3a60f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@staticcms/core", - "version": "2.5.0", + "version": "2.5.1", "license": "MIT", "description": "Static CMS core application.", "repository": "https://github.com/StaticJsCMS/static-cms", From d3fe23de4b4d320d4fe6a81c6c137ce663bdd78e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 09:58:52 -0400 Subject: [PATCH 3/5] chore(deps): update dependency vite to v4.3.9 [security] (#835) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/demo/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/demo/package.json b/packages/demo/package.json index c58491a9..df9fe4cd 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -32,7 +32,7 @@ "postcss": "8.4.23", "postcss-scss": "4.0.6", "prettier": "2.8.8", - "vite": "4.3.5", + "vite": "4.3.9", "vite-plugin-svgr": "3.2.0", "webpack": "5.80.0" }, diff --git a/yarn.lock b/yarn.lock index 92771b53..8efbd5a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17061,10 +17061,10 @@ vite-plugin-svgr@3.2.0: "@svgr/core" "^7.0.0" "@svgr/plugin-jsx" "^7.0.0" -vite@4.3.5: - version "4.3.5" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.5.tgz#3871fe0f4b582ea7f49a85386ac80e84826367d9" - integrity sha512-0gEnL9wiRFxgz40o/i/eTBwm+NEbpUeTWhzKrZDSdKm6nplj+z4lKz8ANDgildxHm47Vg8EUia0aicKbawUVVA== +vite@4.3.9: + version "4.3.9" + resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.9.tgz#db896200c0b1aa13b37cdc35c9e99ee2fdd5f96d" + integrity sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg== dependencies: esbuild "^0.17.5" postcss "^8.4.23" From 844438952eda68437c2aeeea1d4bae76ea8e2a18 Mon Sep 17 00:00:00 2001 From: Daniel Lautzenheiser Date: Wed, 14 Jun 2023 10:34:28 -0400 Subject: [PATCH 4/5] chore: update demo --- packages/demo/public/config.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/demo/public/config.yml b/packages/demo/public/config.yml index 95b9f182..3f69a9ea 100644 --- a/packages/demo/public/config.yml +++ b/packages/demo/public/config.yml @@ -565,6 +565,16 @@ collections: widget: map pattern: ['\[-([7-9][0-9]|1[0-2][0-9])\.', 'Must be between latitude -70 and -129'] required: false + - name: line_string + label: Line String + type: LineString + widget: map + required: false + - name: polygon + label: Polygon + type: Polygon + widget: map + required: false - name: markdown label: Markdown file: _widgets/markdown.json From e888f69fecf3351452b87bb4a9f0b90a7415908d Mon Sep 17 00:00:00 2001 From: Daniel Lautzenheiser Date: Wed, 14 Jun 2023 10:39:45 -0400 Subject: [PATCH 5/5] chore: add release 2.5.1 --- packages/docs/content/releases.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/docs/content/releases.json b/packages/docs/content/releases.json index 22945c6a..7e947211 100644 --- a/packages/docs/content/releases.json +++ b/packages/docs/content/releases.json @@ -1,5 +1,10 @@ { "releases": [ + { + "date": "2023-06-14T10:00:00.000Z", + "version": "v2.5.1", + "type": "patch" + }, { "date": "2023-06-13T10:00:00.000Z", "version": "v2.5.0",