diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fd74bd4..52acaeea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,31 @@ +## 1.6.4-6 (2025-12-22) + +This was a version bump only, there were no code changes. + +## 1.6.4-5 (2025-12-22) + +This was a version bump only, there were no code changes. + +## 1.6.4-4 (2025-12-22) + +This was a version bump only, there were no code changes. + +## 1.6.4-3 (2025-12-22) + +This was a version bump only, there were no code changes. + +## 1.6.4-2 (2025-12-22) + +This was a version bump only, there were no code changes. + +## 1.6.4-1 (2025-12-22) + +This was a version bump only, there were no code changes. + +## 1.6.4-0 (2025-12-22) + +This was a version bump only, there were no code changes. + ## [1.6.3] (2025-11-01) ## @mapcomponents/react-maplibre diff --git a/packages/create-mapcomponents-app/package.json b/packages/create-mapcomponents-app/package.json index 3bb0d01d..783f413f 100644 --- a/packages/create-mapcomponents-app/package.json +++ b/packages/create-mapcomponents-app/package.json @@ -1,6 +1,6 @@ { "name": "create-mapcomponents-app", - "version": "1.6.3", + "version": "1.6.4-6", "files": [ "index.js" ], diff --git a/packages/deck-gl/package.json b/packages/deck-gl/package.json index ebae80c9..f494e779 100644 --- a/packages/deck-gl/package.json +++ b/packages/deck-gl/package.json @@ -1,6 +1,6 @@ { "name": "@mapcomponents/deck-gl", - "version": "1.6.3", + "version": "1.6.4-6", "description": "", "main": "src/index.ts", "module": "dist/index.mjs", diff --git a/packages/ra-geospatial/package.json b/packages/ra-geospatial/package.json index d5b03d35..55c52e86 100644 --- a/packages/ra-geospatial/package.json +++ b/packages/ra-geospatial/package.json @@ -1,6 +1,6 @@ { "name": "@mapcomponents/ra-geospatial", - "version": "1.6.3", + "version": "1.6.4-6", "main": "src/index.ts", "types": "src/index.d.ts", "module": "dist/index.js", diff --git a/packages/react-maplibre/package.json b/packages/react-maplibre/package.json index 24d87428..4788dd4d 100644 --- a/packages/react-maplibre/package.json +++ b/packages/react-maplibre/package.json @@ -1,6 +1,6 @@ { "name": "@mapcomponents/react-maplibre", - "version": "1.6.3", + "version": "1.6.4-6", "main": "dist/index.cjs.js", "license": "MIT", "module": "dist/index.mjs", @@ -43,7 +43,6 @@ "csv2geojson": "^5.1.2", "d3": "^7.9.0", "jspdf": "^3.0.2", - "maplibre-gl": "5.6.0", "osm2geojson-lite": "^1.1.2", "pako": "^2.1.0", "react-color": "^2.19.3", @@ -54,10 +53,17 @@ "three": "^0.179.1", "topojson-client": "^3.1.0", "uuid": "^11.1.0", + "maplibre-gl": "5.6.0", "wms-capabilities": "^0.6.0" }, + "peerDependencies": { + "react": "^19.1.0", + "react-dom": "^19.1.0" + }, "devDependencies": { "@testing-library/react": "^16.3.0", + "react": "^19.1.0", + "react-dom": "^19.1.0", "@types/chai": "^5.2.2", "@types/elasticlunr": "^0.9.9", "@types/enzyme": "^3.10.19", diff --git a/packages/react-maplibre/src/components/MlGlobeButton/MlGlobeButton.cy.tsx b/packages/react-maplibre/src/components/MlGlobeButton/MlGlobeButton.cy.tsx index edbd68b4..eb13855d 100644 --- a/packages/react-maplibre/src/components/MlGlobeButton/MlGlobeButton.cy.tsx +++ b/packages/react-maplibre/src/components/MlGlobeButton/MlGlobeButton.cy.tsx @@ -21,7 +21,7 @@ describe('MlGlobeButton', () => { it('shows MapIcon as start state and toggles between MapIcon and PublicIcon', () => { mount(); - cy.window() + cy.window({ timeout: 10000 }) .should((win) => expect((win as any)._map).to.exist) .then((win) => { const map = (win as any)._map; @@ -46,7 +46,7 @@ describe('MlGlobeButton', () => { it('changes the projection on the map instance attached to window', () => { mount(); - cy.window() + cy.window({ timeout: 10000 }) .should((win) => expect((win as any)._map).to.exist) .then((win) => { const map = (win as any)._map; @@ -59,19 +59,19 @@ describe('MlGlobeButton', () => { }); }); - cy.window().should((win) => { + cy.window({ timeout: 10000 }).should((win) => { const map = (win as any)._map; expect(map.getProjection()).to.equal(undefined); }); cy.get('button').click(); - cy.window().should((win) => { + cy.window({ timeout: 10000 }).should((win) => { const map = (win as any)._map; expect(map.getProjection()?.type).to.eq('globe'); }); cy.get('button').click(); - cy.window().should((win) => { + cy.window({ timeout: 10000 }).should((win) => { const map = (win as any)._map; expect(map.getProjection()?.type).to.eq('mercator'); }); diff --git a/packages/react-maplibre/vite.config.ts b/packages/react-maplibre/vite.config.ts index 1762d477..5d6165ea 100644 --- a/packages/react-maplibre/vite.config.ts +++ b/packages/react-maplibre/vite.config.ts @@ -5,9 +5,9 @@ import dts from 'vite-plugin-dts'; import * as path from 'path'; import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin'; import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin'; -/*import * as fs from 'node:fs'; +import * as fs from 'node:fs'; -const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));*/ +const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); export default defineConfig(() => ({ root: __dirname, @@ -52,8 +52,10 @@ export default defineConfig(() => ({ 'react-dom', 'd3', 'sql.js', - /* ...Object.keys(pkg.dependencies), - ...Object.keys(pkg.devDependencies),*/ + 'maplibre-gl/dist/maplibre-gl.css', + 'maplibre-gl', + //...Object.keys(pkg.dependencies), + ...Object.keys(pkg.devDependencies), ], input: [path.join(__dirname, 'src/index.ts')], }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b49b22c0..e42ee07e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -529,12 +529,289 @@ importers: postcss: specifier: ^8.5.6 version: 8.5.6 + react: + specifier: ^19.1.0 + version: 19.1.0 + react-app-polyfill: + specifier: ^3.0.0 + version: 3.0.0 + react-dev-utils: + specifier: ^12.0.1 + version: 12.0.1(eslint@9.34.0(jiti@2.4.2))(typescript@5.9.2)(webpack@5.101.3(@swc/core@1.12.14(@swc/helpers@0.5.17))(esbuild@0.25.9)) + react-dom: + specifier: ^19.1.0 + version: 19.1.0(react@19.1.0) + react-draggable: + specifier: ^4.5.0 + version: 4.5.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + react-i18next: + specifier: ^15.7.3 + version: 15.7.3(i18next@25.5.1(typescript@5.9.2))(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.9.2) + showdown: + specifier: ^2.1.0 + version: 2.1.0 + sql.js: + specifier: ^1.13.0 + version: 1.13.0 + ts-jest: + specifier: ^29.4.1 + version: 29.4.1(@babel/core@7.28.3)(@jest/transform@30.1.2)(@jest/types@30.0.5)(babel-jest@30.1.2(@babel/core@7.28.3))(esbuild@0.25.9)(jest-util@30.0.5)(jest@30.0.5(@types/node@24.3.1)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.25.9))(ts-node@10.9.2(@swc/core@1.12.14(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.9.2)))(typescript@5.9.2) + ts-loader: + specifier: ^9.5.4 + version: 9.5.4(typescript@5.9.2)(webpack@5.101.3(@swc/core@1.12.14(@swc/helpers@0.5.17))(esbuild@0.25.9)) + + packages/react-maplibre/dist: + dependencies: + '@dnd-kit/core': + specifier: ^6.3.1 + version: 6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@dnd-kit/modifiers': + specifier: ^9.0.0 + version: 9.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) + '@dnd-kit/sortable': + specifier: ^10.0.0 + version: 10.0.0(@dnd-kit/core@6.3.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(react@19.1.0) + '@dnd-kit/utilities': + specifier: ^3.2.2 + version: 3.2.2(react@19.1.0) + '@emotion/css': + specifier: ^11.13.5 + version: 11.13.5 + '@emotion/react': + specifier: ^11.14.0 + version: 11.14.0(@types/react@19.1.12)(react@19.1.0) + '@emotion/styled': + specifier: ^11.14.1 + version: 11.14.1(@emotion/react@11.14.0(@types/react@19.1.12)(react@19.1.0))(@types/react@19.1.12)(react@19.1.0) + '@mapbox/mapbox-gl-draw': + specifier: 1.4.3 + version: 1.4.3 + '@mapbox/mapbox-gl-sync-move': + specifier: ^0.3.1 + version: 0.3.1 + '@mui/icons-material': + specifier: ^7.3.2 + version: 7.3.2(@mui/material@7.3.2(@emotion/react@11.14.0(@types/react@19.1.12)(react@19.1.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.12)(react@19.1.0))(@types/react@19.1.12)(react@19.1.0))(@types/react@19.1.12)(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(@types/react@19.1.12)(react@19.1.0) + '@mui/material': + specifier: ^7.3.2 + version: 7.3.2(@emotion/react@11.14.0(@types/react@19.1.12)(react@19.1.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.12)(react@19.1.0))(@types/react@19.1.12)(react@19.1.0))(@types/react@19.1.12)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@mui/system': + specifier: ^7.3.2 + version: 7.3.2(@emotion/react@11.14.0(@types/react@19.1.12)(react@19.1.0))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.12)(react@19.1.0))(@types/react@19.1.12)(react@19.1.0))(@types/react@19.1.12)(react@19.1.0) + '@reduxjs/toolkit': + specifier: ^2.9.0 + version: 2.9.0(react-redux@9.2.0(@types/react@19.1.12)(react@19.1.0)(redux@5.0.1))(react@19.1.0) + '@testing-library/dom': + specifier: ^10.4.1 + version: 10.4.1 + '@testing-library/jest-dom': + specifier: ^6.8.0 + version: 6.8.0 + '@testing-library/user-event': + specifier: ^14.6.1 + version: 14.6.1(@testing-library/dom@10.4.1) + '@tmcw/togeojson': + specifier: ^7.1.2 + version: 7.1.2 + '@turf/helpers': + specifier: ^7.2.0 + version: 7.2.0 + '@turf/turf': + specifier: ^7.2.0 + version: 7.2.0 + '@types/d3': + specifier: ^7.4.3 + version: 7.4.3 + '@types/geojson': + specifier: ^7946.0.16 + version: 7946.0.16 + '@types/react-color': + specifier: ^3.0.13 + version: 3.0.13(@types/react@19.1.12) + '@types/topojson-client': + specifier: ^3.1.5 + version: 3.1.5 + '@types/topojson-specification': + specifier: ^1.0.5 + version: 1.0.5 + '@xmldom/xmldom': + specifier: ^0.9.8 + version: 0.9.8 + camelcase: + specifier: ^8.0.0 + version: 8.0.0 + csv2geojson: + specifier: ^5.1.2 + version: 5.1.2 + d3: + specifier: ^7.9.0 + version: 7.9.0 + jspdf: + specifier: ^3.0.2 + version: 3.0.2 + maplibre-gl: + specifier: 5.6.0 + version: 5.6.0 + osm2geojson-lite: + specifier: ^1.1.2 + version: 1.1.2 + pako: + specifier: ^2.1.0 + version: 2.1.0 + react-color: + specifier: ^2.19.3 + version: 2.19.3(react@19.1.0) + react-moveable: + specifier: ^0.56.0 + version: 0.56.0 + react-redux: + specifier: ^9.2.0 + version: 9.2.0(@types/react@19.1.12)(react@19.1.0)(redux@5.0.1) + redux: + specifier: ^5.0.1 + version: 5.0.1 + redux-thunk: + specifier: ^3.1.0 + version: 3.1.0(redux@5.0.1) + three: + specifier: ^0.179.1 + version: 0.179.1 + topojson-client: + specifier: ^3.1.0 + version: 3.1.0 + uuid: + specifier: ^11.1.0 + version: 11.1.0 + wms-capabilities: + specifier: ^0.6.0 + version: 0.6.0 + devDependencies: + '@testing-library/react': + specifier: ^16.3.0 + version: 16.3.0(@testing-library/dom@10.4.1)(@types/react-dom@19.1.9(@types/react@19.1.12))(@types/react@19.1.12)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@types/chai': + specifier: ^5.2.2 + version: 5.2.2 + '@types/elasticlunr': + specifier: ^0.9.9 + version: 0.9.9 + '@types/enzyme': + specifier: ^3.10.19 + version: 3.10.19 + '@types/expect': + specifier: ^24.3.2 + version: 24.3.2 + '@types/jest': + specifier: ^30.0.0 + version: 30.0.0 + '@types/mapbox__mapbox-gl-draw': + specifier: ^1.4.9 + version: 1.4.9 + '@types/mapbox__point-geometry': + specifier: ^0.1.4 + version: 0.1.4 + '@types/mapbox__vector-tile': + specifier: ^2.0.0 + version: 2.0.0 + '@types/mocha': + specifier: ^10.0.10 + version: 10.0.10 + '@types/pako': + specifier: ^2.0.4 + version: 2.0.4 + '@types/react': + specifier: ^19.1.12 + version: 19.1.12 + '@types/react-dom': + specifier: ^19.1.9 + version: 19.1.9(@types/react@19.1.12) + '@types/sql.js': + specifier: ^1.4.9 + version: 1.4.9 + '@types/three': + specifier: ^0.179.0 + version: 0.179.0 + '@types/uuid': + specifier: ^10.0.0 + version: 10.0.0 + '@typescript-eslint/eslint-plugin': + specifier: ^8.42.0 + version: 8.42.0(@typescript-eslint/parser@8.42.0(eslint@9.34.0(jiti@2.4.2))(typescript@5.9.2))(eslint@9.34.0(jiti@2.4.2))(typescript@5.9.2) + '@typescript-eslint/parser': + specifier: ^8.42.0 + version: 8.42.0(eslint@9.34.0(jiti@2.4.2))(typescript@5.9.2) + avj: + specifier: ^0.0.0 + version: 0.0.0 + babel-jest: + specifier: ^30.1.2 + version: 30.1.2(@babel/core@7.28.3) + babel-loader: + specifier: ^10.0.0 + version: 10.0.0(@babel/core@7.28.3)(webpack@5.101.3(@swc/core@1.12.14(@swc/helpers@0.5.17))(esbuild@0.25.9)) + babel-plugin-inline-react-svg: + specifier: ^2.0.2 + version: 2.0.2(@babel/core@7.28.3) + babel-plugin-styled-components: + specifier: ^2.1.4 + version: 2.1.4(@babel/core@7.28.3)(styled-components@6.1.19(react-dom@19.1.0(react@19.1.0))(react@19.1.0)) + babel-preset-react-app: + specifier: ^10.1.0 + version: 10.1.0 + chai: + specifier: ^6.0.1 + version: 6.0.1 + elasticlunr: + specifier: ^0.9.5 + version: 0.9.5 + eslint-plugin-storybook: + specifier: ^9.1.4 + version: 9.1.4(eslint@9.34.0(jiti@2.4.2))(storybook@9.1.1(@testing-library/dom@10.4.1)(prettier@3.6.2)(vite@7.1.4(@types/node@24.3.1)(jiti@2.4.2)(terser@5.44.0)(yaml@2.8.1)))(typescript@5.9.2) + glob: + specifier: ^11.0.3 + version: 11.0.3 + jest: + specifier: 30.0.5 + version: 30.0.5(@types/node@24.3.1)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.25.9))(ts-node@10.9.2(@swc/core@1.12.14(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.9.2)) + jest-circus: + specifier: 30.0.5 + version: 30.0.5(babel-plugin-macros@3.1.0) + jest-environment-jsdom: + specifier: ^30.1.2 + version: 30.1.2 + jest-enzyme: + specifier: ^7.1.2 + version: 7.1.2(enzyme@3.11.0)(jest@30.0.5(@types/node@24.3.1)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.25.9))(ts-node@10.9.2(@swc/core@1.12.14(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.9.2)))(react@19.1.0) + jest-resolve: + specifier: 30.0.5 + version: 30.0.5 + jest-watch-typeahead: + specifier: 3.0.1 + version: 3.0.1(jest@30.0.5(@types/node@24.3.1)(babel-plugin-macros@3.1.0)(esbuild-register@3.6.0(esbuild@0.25.9))(ts-node@10.9.2(@swc/core@1.12.14(@swc/helpers@0.5.17))(@types/node@24.3.1)(typescript@5.9.2))) + mocha: + specifier: ^11.7.2 + version: 11.7.2 + node-fetch: + specifier: ^3.3.2 + version: 3.3.2 + path-browserify: + specifier: ^1.0.1 + version: 1.0.1 + postcss: + specifier: ^8.5.6 + version: 8.5.6 + react: + specifier: ^19.1.0 + version: 19.1.0 react-app-polyfill: specifier: ^3.0.0 version: 3.0.0 react-dev-utils: specifier: ^12.0.1 version: 12.0.1(eslint@9.34.0(jiti@2.4.2))(typescript@5.9.2)(webpack@5.101.3(@swc/core@1.12.14(@swc/helpers@0.5.17))(esbuild@0.25.9)) + react-dom: + specifier: ^19.1.0 + version: 19.1.0(react@19.1.0) react-draggable: specifier: ^4.5.0 version: 4.5.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) @@ -9256,7 +9533,6 @@ packages: osm2geojson-lite@1.1.2: resolution: {integrity: sha512-6s1uW548fdyLTJ4Cp/hQTKvdgCl/E8nUvBMEzUXnAJPHAFHoIhwMqZ3KGdph2A1g48rsCeA6gVnkPruWGiwupw==} hasBin: true - bundledDependencies: [] ospath@1.2.2: resolution: {integrity: sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==}