Skip to content

Move react-vectorstyle out, as the js-vectorstyle submodule #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wf9a5m75 merged 1 commit into from
Oct 28, 2026
Merged

Move react-vectorstyle out, as the js-vectorstyle submodule #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,4 @@ ios-final.xcresult
# The Rust style compiler and renderer (wasm + their JS bindings), fetched from a
# MapConductor/vectortile release by scripts/fetch-vector-assets.mjs. The tag and
# checksums are pinned in scripts/vector-assets.json; the bytes are not tracked.
react-vectorstyle/vendor/
react-vectortile/vendor/
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,6 @@
[submodule "react-for-deckgl"]
path = react-for-deckgl
url = git@github.com:MapConductor/react-for-deckgl.git
[submodule "js-vectorstyle"]
path = js-vectorstyle
url = git@github.com:mapconductor/js-vectorstyle.git
2 changes: 1 addition & 1 deletion examples/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@mapconductor/react-heatmap": "*",
"@mapconductor/react-icons": "*",
"@mapconductor/react-marker-clustering": "*",
"@mapconductor/react-vectorstyle": "*",
"@mapconductor/js-vectorstyle": "*",
"@mapconductor/react-vectortile": "*",
"@zip.js/zip.js": "^2.8.26",
"maplibre-gl": "^6.15.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/src/pages/vectorstyle/StyleAdjustmentsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useMemo, useState } from 'react';
import type { MapDesignTypeInterface, MapViewStateInterface } from '@mapconductor/js-sdk-core';
import { buildStyleRules, createVectorStyle, LayerRole, NO_STYLE_RULES } from '@mapconductor/react-vectorstyle';
import { buildStyleRules, createVectorStyle, LayerRole, NO_STYLE_RULES } from '@mapconductor/js-vectorstyle';
import { VectorTileRasteriser } from '@mapconductor/react-vectortile';
import { ControlPanel, SliderControl } from '../../components/ControlPanel';
import { MapViewContainer } from '../../MapViewContainer';
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/src/pages/vectortile/categories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LayerRole, buildStyleRules, NO_STYLE_RULES, type StyleRules } from '@mapconductor/react-vectorstyle';
import { LayerRole, buildStyleRules, NO_STYLE_RULES, type StyleRules } from '@mapconductor/js-vectorstyle';

/** A category that can be painted as well as switched off. */
export type ColourCategory = 'water' | 'land' | 'street' | 'building';
Expand Down
1 change: 1 addition & 0 deletions js-vectorstyle
Open in desktop
Submodule js-vectorstyle added at e36c41
34 changes: 19 additions & 15 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@
"react-geojson/",
"react-kml/",
"react-heatmap/",
"react-vectorstyle/",
"js-vectorstyle/",
"react-vectortile/",
"react-marker-clustering/",
"examples/*"
],
"scripts": {
"build": "npm run build --workspaces --if-present",
"build:packages": "npm run build --if-present --workspace @mapconductor/js-sdk-core --workspace @mapconductor/js-sdk-react --workspace @mapconductor/react-icons --workspace @mapconductor/react-for-googlemaps --workspace @mapconductor/react-for-maplibre --workspace @mapconductor/react-for-mapbox --workspace @mapconductor/react-for-leaflet --workspace @mapconductor/react-for-openlayers --workspace @mapconductor/react-for-arcgis --workspace @mapconductor/react-for-mapkit --workspace @mapconductor/react-for-azuremaps --workspace @mapconductor/react-for-cesium --workspace @mapconductor/react-for-here --workspace @mapconductor/react-for-tomtom --workspace @mapconductor/react-for-maptiler --workspace @mapconductor/react-for-longdo --workspace @mapconductor/react-for-mappls --workspace @mapconductor/react-for-deckgl --workspace @mapconductor/reactnative-for-googlemaps --workspace @mapconductor/reactnative-for-maplibre --workspace @mapconductor/reactnative-for-arcgis --workspace @mapconductor/reactnative-for-longdo --workspace @mapconductor/reactnative-for-maptiler --workspace @mapconductor/reactnative-for-tomtom --workspace @mapconductor/reactnative-for-mapbox --workspace @mapconductor/react-geojson --workspace @mapconductor/react-kml --workspace @mapconductor/react-heatmap --workspace @mapconductor/react-vectorstyle --workspace @mapconductor/react-vectortile --workspace @mapconductor/react-marker-clustering",
"build:packages": "npm run build --if-present --workspace @mapconductor/js-sdk-core --workspace @mapconductor/js-sdk-react --workspace @mapconductor/react-icons --workspace @mapconductor/react-for-googlemaps --workspace @mapconductor/react-for-maplibre --workspace @mapconductor/react-for-mapbox --workspace @mapconductor/react-for-leaflet --workspace @mapconductor/react-for-openlayers --workspace @mapconductor/react-for-arcgis --workspace @mapconductor/react-for-mapkit --workspace @mapconductor/react-for-azuremaps --workspace @mapconductor/react-for-cesium --workspace @mapconductor/react-for-here --workspace @mapconductor/react-for-tomtom --workspace @mapconductor/react-for-maptiler --workspace @mapconductor/react-for-longdo --workspace @mapconductor/react-for-mappls --workspace @mapconductor/react-for-deckgl --workspace @mapconductor/reactnative-for-googlemaps --workspace @mapconductor/reactnative-for-maplibre --workspace @mapconductor/reactnative-for-arcgis --workspace @mapconductor/reactnative-for-longdo --workspace @mapconductor/reactnative-for-maptiler --workspace @mapconductor/reactnative-for-tomtom --workspace @mapconductor/reactnative-for-mapbox --workspace @mapconductor/react-geojson --workspace @mapconductor/react-kml --workspace @mapconductor/react-heatmap --workspace @mapconductor/js-vectorstyle --workspace @mapconductor/react-vectortile --workspace @mapconductor/react-marker-clustering",
"dev": "npm run build:packages && (npm run dev:packages & npm run dev:examples & wait)",
"dev:rn": "npm run build:packages && (npm run dev:packages & npm run dev:rn:examples & wait)",
"dev:rn:android": "npm run build && npm run expo:android --workspace @mapconductor/example-rn-basic",
"dev:rn:ios": "npm run build && npm run expo:prebuild:ios --workspace @mapconductor/example-rn-basic && npm run expo:ios --workspace @mapconductor/example-rn-basic",
"dev:packages": "(npm run dev --workspace @mapconductor/js-sdk-core -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/js-sdk-react -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-icons -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-googlemaps -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-maplibre -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-mapbox -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-leaflet -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-openlayers -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-mapkit -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-azuremaps -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-cesium -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-maptiler -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-longdo -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-mappls -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-deckgl -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-googlemaps -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-maplibre -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-arcgis -- --tsconfig ../tsconfig.dev.json & npm run dev -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-longdo -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-maptiler --workspace @mapconductor/reactnative-for-tomtom -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-mapbox -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-geojson -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-kml -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-heatmap -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-marker-clustering -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-vectorstyle -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-vectortile -- --tsconfig ../tsconfig.dev.json & wait)",
"dev:packages": "(npm run dev --workspace @mapconductor/js-sdk-core -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/js-sdk-react -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-icons -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-googlemaps -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-maplibre -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-mapbox -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-leaflet -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-openlayers -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-mapkit -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-azuremaps -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-cesium -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-maptiler -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-longdo -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-mappls -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-for-deckgl -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-googlemaps -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-maplibre -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-arcgis -- --tsconfig ../tsconfig.dev.json & npm run dev -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-longdo -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-maptiler --workspace @mapconductor/reactnative-for-tomtom -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/reactnative-for-mapbox -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-geojson -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-kml -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-heatmap -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-marker-clustering -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/js-vectorstyle -- --tsconfig ../tsconfig.dev.json & npm run dev --workspace @mapconductor/react-vectortile -- --tsconfig ../tsconfig.dev.json & wait)",
"dev:examples": "npm run dev --workspace @mapconductor/example-basic",
"dev:rn:examples": "npm run expo:start --workspace @mapconductor/example-rn-basic -- --clear",
"link:local": "node scripts/link-local-workspaces.mjs",
Expand Down
Loading
Loading