Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ harness/test-results/
harness/playwright-report/
harness/ui-recolored.png

# Native build products, produced by scripts/build-android.sh and build-ios.sh
# Native build products, produced by scripts/build-*.sh. The SDKs take them from
# a release (.github/workflows/release.yml), so a copy here would only be a stale
# second answer to "which build is this".
bindings/android/core/jniLibs/
bindings/android/style/jniLibs/
bindings/ios-core/lib/
bindings/ios-core/TilePng.xcframework/
bindings/ios-style/lib/
bindings/ios-style/MvtStyle.xcframework/
bindings/android/build/
bindings/android/vectortile/build/
bindings/android/.gradle/
Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ members = [
]

[workspace.package]
version = "0.1.0"
version = "0.1.1"
edition = "2021"
license = "Apache-2.0"

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
43 changes: 0 additions & 43 deletions bindings/ios-core/TilePng.xcframework/Info.plist

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file removed bindings/ios-core/lib/device/libtile_png_ffi.a
Binary file not shown.
Binary file removed bindings/ios-core/lib/sim/libtile_png_ffi.a
Binary file not shown.
43 changes: 0 additions & 43 deletions bindings/ios-style/MvtStyle.xcframework/Info.plist

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file removed bindings/ios-style/lib/device/libmvt_style_ffi.a
Binary file not shown.
Binary file removed bindings/ios-style/lib/sim/libmvt_style_ffi.a
Binary file not shown.
4 changes: 2 additions & 2 deletions bindings/js-style/package-lock.json

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

2 changes: 1 addition & 1 deletion bindings/js-style/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mapconductor/vectorstyle",
"version": "0.1.0",
"version": "0.1.1",
"description": "Declarative adjustments to a MapLibre style, applied the same way on every renderer",
"type": "module",
"main": "./dist/index.js",
Expand Down
4 changes: 2 additions & 2 deletions bindings/js/package-lock.json

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

2 changes: 1 addition & 1 deletion bindings/js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mapconductor/vectortile",
"version": "0.1.0",
"version": "0.1.1",
"description": "MapLibre-style vector tiles rendered to raster tiles in the browser, via a Rust/wasm core",
"type": "module",
"main": "./dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion crates/mvt-style-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "C ABI bindings for mvt-style, for MapConductorVectorStyle"

[lib]
name = "mvt_style_ffi"
crate-type = ["staticlib", "rlib"]
crate-type = ["staticlib"]

[dependencies]
mvt-style = { path = "../mvt-style" }
56 changes: 17 additions & 39 deletions scripts/sync-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,37 +60,24 @@ sync_ios() {
}

sync_web() {
# The framework-neutral package. React is one 120-line component on top of
# this, and nothing here knows about it — the provider talks to a host tile
# server through the structural TileServerLike interface, so the same build
# serves React, Vue, or plain script tags.
local dest="$sdks/react-sdk/vectortile"
[[ -d "$dest" ]] || { echo "skip web: $dest not found"; return; }
rm -rf "$dest/pkg" "$dest/dist"
cp -R "$root/bindings/js/pkg" "$dest/pkg"
cp -R "$root/bindings/js/dist" "$dest/dist"
cp "$root/bindings/js/README.md" "$dest/README.md" 2>/dev/null || true
# Into react-vectortile's vendor/, where scripts/fetch-vector-assets.mjs
# otherwise unpacks the pinned release. The stamp says this is a local
# build, so the next plain fetch puts the release back.
web_vendor bindings/js "$sdks/react-sdk/react-vectortile/vendor/vectortile" README.md
}

web_vendor() {
local src="$root/$1" dest="$2"
shift 2
local package="${dest%/vendor/*}"
[[ -d "$package" ]] || { echo "skip web: $package not found"; return; }
rm -rf "$dest"
mkdir -p "$dest"
cp -R "$src/pkg" "$src/dist" "$src/package.json" "$dest/"
for extra in "$@"; do cp "$src/$extra" "$dest/" 2>/dev/null || true; done
# wasm-pack writes a `.gitignore` containing `*` into its output directory.
# Copied verbatim it makes the vendored wasm untrackable, which is how the
# package ends up unbuildable from a clean checkout.
rm -f "$dest/pkg/.gitignore"

# The version, and only the version. The copy's `package.json` is not this
# one: its scripts say the build lives here rather than there, which is the
# whole point of it being a copy. But the version has been hand-maintained
# on both sides, so the vendored renderer could silently stop being the one
# its version claims — and the React binding pins a range against it.
node -e '
const fs = require("fs");
const [from, to] = process.argv.slice(1);
const version = JSON.parse(fs.readFileSync(from, "utf8")).version;
const target = JSON.parse(fs.readFileSync(to, "utf8"));
if (target.version === version) process.exit(0);
target.version = version;
fs.writeFileSync(to, JSON.stringify(target, null, 2) + "\n");
console.error(` version -> ${version}`);
' "$root/bindings/js/package.json" "$dest/package.json"

echo "local $src" > "$dest/.release"
echo "web -> $dest"
}

Expand Down Expand Up @@ -118,16 +105,7 @@ sync_ios_style() {
}

sync_web_style() {
local dest="$sdks/react-sdk/vectorstyle"
[[ -d "$dest" ]] || { echo "skip web style: $dest not found"; return; }
rm -rf "$dest/pkg" "$dest/dist"
cp -R "$root/bindings/js-style/pkg" "$dest/pkg"
cp -R "$root/bindings/js-style/dist" "$dest/dist"
# wasm-pack writes a `.gitignore` containing `*` into its output
# directory. Copied verbatim it makes the vendored wasm untrackable,
# which is how the package ends up unbuildable from a clean checkout.
rm -f "$dest/pkg/.gitignore"
echo "web style -> $dest"
web_vendor bindings/js-style "$sdks/react-sdk/react-vectorstyle/vendor/vectorstyle"
}


Expand Down
Loading