diff --git a/.prettierignore b/.prettierignore index 5ab5d58..30a9f10 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,3 +5,4 @@ example/ios example/android android/build example/vendor/bundle/ +ios/DerivedData diff --git a/CHANGELOG.md b/CHANGELOG.md index 57c7888..7d57e32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +# [1.7.0-beta.1](https://github.com/react-native-maps/react-native-maps/compare/v1.6.1-beta.1...v1.7.0-beta.1) (2023-04-21) + + +### Features + +* **android:** bump android-maps-utils to 3.4.0 ([#4699](https://github.com/react-native-maps/react-native-maps/issues/4699)) ([6b26c23](https://github.com/react-native-maps/react-native-maps/commit/6b26c235a26e2708497e5caf31176d8599441d9e)) + +## [1.6.1-beta.1](https://github.com/react-native-maps/react-native-maps/compare/v1.6.0...v1.6.1-beta.1) (2023-04-21) + + +### Bug Fixes + +* **ios:** followsUserLocation changes zoom level ([#4696](https://github.com/react-native-maps/react-native-maps/issues/4696)) ([3b9491e](https://github.com/react-native-maps/react-native-maps/commit/3b9491e39529f11b32b4da9eb4ef36353c0033d9)), closes [#4585](https://github.com/react-native-maps/react-native-maps/issues/4585) + # [1.6.0](https://github.com/react-native-maps/react-native-maps/compare/v1.5.0...v1.6.0) (2023-04-20) diff --git a/README.md b/README.md index 00a5bb8..0ebfc69 100644 --- a/README.md +++ b/README.md @@ -607,6 +607,25 @@ Source: https://github.com/react-native-maps/react-native-maps/issues/1901 Source: https://github.com/react-native-maps/react-native-maps/issues/3957#issuecomment-924161121 +#### onRegionChangeComplete() callback is called infinitely + +If changing the state in `onRegionChangeComplete` is called infinitely, add a condition to limit these calls to occur only when the region change was done as a result of a user's action. + +```javascript +onRegionChangeComplete={ (region, gesture) => { + // This fix only works on Google Maps because isGesture is NOT available on Apple Maps + if (!gesture.isGesture) { + return; + } + + // You can use + dispatch({ type: "map_region", payload: { mapRegion: region }}); // if using useReducer + // setMapRegionState(region); // if using useState +}} +``` + +Source: https://github.com/react-native-maps/react-native-maps/issues/846#issuecomment-1210079461 + ## License Copyright (c) 2017 Airbnb diff --git a/android/build.gradle b/android/build.gradle index bd4bdce..88b8991 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -47,6 +47,6 @@ dependencies { implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.1.0')}" implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.0.2')}" implementation "com.google.android.gms:play-services-location:20.0.0" - implementation 'com.google.maps.android:android-maps-utils:0.5' + implementation 'com.google.maps.android:android-maps-utils:3.4.0' implementation "androidx.work:work-runtime:2.7.1" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 69a9715..ffed3a2 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew index 744e882..1b6c787 100755 --- a/android/gradlew +++ b/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/android/src/main/java/com/rnmaps/maps/MapCircle.java b/android/src/main/java/com/rnmaps/maps/MapCircle.java index 54f1b67..e641b98 100644 --- a/android/src/main/java/com/rnmaps/maps/MapCircle.java +++ b/android/src/main/java/com/rnmaps/maps/MapCircle.java @@ -2,10 +2,10 @@ import android.content.Context; -import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.model.Circle; import com.google.android.gms.maps.model.CircleOptions; import com.google.android.gms.maps.model.LatLng; +import com.google.maps.android.collections.CircleManager; public class MapCircle extends MapFeature { @@ -89,12 +89,14 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - circle = map.addCircle(getCircleOptions()); + public void addToMap(Object collection) { + CircleManager.Collection circleCollection = (CircleManager.Collection) collection; + circle = circleCollection.addCircle(getCircleOptions()); } @Override - public void removeFromMap(GoogleMap map) { - circle.remove(); + public void removeFromMap(Object collection) { + CircleManager.Collection circleCollection = (CircleManager.Collection) collection; + circleCollection.remove(circle); } } diff --git a/android/src/main/java/com/rnmaps/maps/MapFeature.java b/android/src/main/java/com/rnmaps/maps/MapFeature.java index 3b1f32e..876936a 100644 --- a/android/src/main/java/com/rnmaps/maps/MapFeature.java +++ b/android/src/main/java/com/rnmaps/maps/MapFeature.java @@ -3,16 +3,15 @@ import android.content.Context; import com.facebook.react.views.view.ReactViewGroup; -import com.google.android.gms.maps.GoogleMap; public abstract class MapFeature extends ReactViewGroup { public MapFeature(Context context) { super(context); } - public abstract void addToMap(GoogleMap map); + public abstract void addToMap(Object mapOrCollection); - public abstract void removeFromMap(GoogleMap map); + public abstract void removeFromMap(Object mapOrCollection); public abstract Object getFeature(); } diff --git a/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java b/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java index ba48066..e3bed5b 100644 --- a/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java +++ b/android/src/main/java/com/rnmaps/maps/MapGradientPolyline.java @@ -321,14 +321,13 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - Log.d("AirMapGradientPolyline", "ADDTOMAP"); - this.map = map; - this.tileOverlay = map.addTileOverlay(createTileOverlayOptions()); + public void addToMap(Object map) { + this.map = (GoogleMap) map; + this.tileOverlay = this.map.addTileOverlay(createTileOverlayOptions()); } @Override - public void removeFromMap(GoogleMap map) { + public void removeFromMap(Object map) { tileOverlay.remove(); } diff --git a/android/src/main/java/com/rnmaps/maps/MapHeatmap.java b/android/src/main/java/com/rnmaps/maps/MapHeatmap.java index e68cbf7..6b781b3 100644 --- a/android/src/main/java/com/rnmaps/maps/MapHeatmap.java +++ b/android/src/main/java/com/rnmaps/maps/MapHeatmap.java @@ -101,13 +101,12 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - Log.d("AirMapHeatmap", "ADD TO MAP"); - heatmap = map.addTileOverlay(getHeatmapOptions()); + public void addToMap(Object map) { + heatmap = ((GoogleMap) map).addTileOverlay(getHeatmapOptions()); } @Override - public void removeFromMap(GoogleMap map) { + public void removeFromMap(Object map) { heatmap.remove(); } diff --git a/android/src/main/java/com/rnmaps/maps/MapLocalTile.java b/android/src/main/java/com/rnmaps/maps/MapLocalTile.java index f0876ca..fe9b4cc 100644 --- a/android/src/main/java/com/rnmaps/maps/MapLocalTile.java +++ b/android/src/main/java/com/rnmaps/maps/MapLocalTile.java @@ -140,12 +140,12 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - this.tileOverlay = map.addTileOverlay(getTileOverlayOptions()); + public void addToMap(Object map) { + this.tileOverlay = ((GoogleMap) map).addTileOverlay(getTileOverlayOptions()); } @Override - public void removeFromMap(GoogleMap map) { + public void removeFromMap(Object map) { tileOverlay.remove(); } } diff --git a/android/src/main/java/com/rnmaps/maps/MapMarker.java b/android/src/main/java/com/rnmaps/maps/MapMarker.java index e3fdd5c..40b2de0 100644 --- a/android/src/main/java/com/rnmaps/maps/MapMarker.java +++ b/android/src/main/java/com/rnmaps/maps/MapMarker.java @@ -33,12 +33,12 @@ import com.facebook.imagepipeline.request.ImageRequest; import com.facebook.imagepipeline.request.ImageRequestBuilder; import com.facebook.react.bridge.ReadableMap; -import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.model.BitmapDescriptor; import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Marker; import com.google.android.gms.maps.model.MarkerOptions; +import com.google.maps.android.collections.MarkerManager; public class MapMarker extends MapFeature { @@ -427,17 +427,19 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - marker = map.addMarker(getMarkerOptions()); + public void addToMap(Object collection) { + MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection; + marker = markerCollection.addMarker(getMarkerOptions()); updateTracksViewChanges(); } @Override - public void removeFromMap(GoogleMap map) { + public void removeFromMap(Object collection) { if (marker == null) { return; } - marker.remove(); + MarkerManager.Collection markerCollection = (MarkerManager.Collection) collection; + markerCollection.remove(marker); marker = null; updateTracksViewChanges(); } diff --git a/android/src/main/java/com/rnmaps/maps/MapOverlay.java b/android/src/main/java/com/rnmaps/maps/MapOverlay.java index ac87bb0..fc74c9b 100644 --- a/android/src/main/java/com/rnmaps/maps/MapOverlay.java +++ b/android/src/main/java/com/rnmaps/maps/MapOverlay.java @@ -4,13 +4,13 @@ import android.graphics.Bitmap; import com.facebook.react.bridge.ReadableArray; -import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.model.BitmapDescriptor; import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.GroundOverlay; import com.google.android.gms.maps.model.GroundOverlayOptions; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.LatLngBounds; +import com.google.maps.android.collections.GroundOverlayManager; public class MapOverlay extends MapFeature implements ImageReadable { @@ -24,7 +24,7 @@ public class MapOverlay extends MapFeature implements ImageReadable { private float transparency; private final ImageReader mImageReader; - private GoogleMap map; + private GroundOverlayManager.Collection groundOverlayCollection; public MapOverlay(Context context) { super(context); @@ -107,24 +107,26 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { + public void addToMap(Object collection) { + GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection; GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions(); if (groundOverlayOptions != null) { - this.groundOverlay = map.addGroundOverlay(groundOverlayOptions); - this.groundOverlay.setClickable(this.tappable); + groundOverlay = groundOverlayCollection.addGroundOverlay(groundOverlayOptions); + groundOverlay.setClickable(this.tappable); } else { - this.map = map; + this.groundOverlayCollection = groundOverlayCollection; } } @Override - public void removeFromMap(GoogleMap map) { - this.map = null; - if (this.groundOverlay != null) { - this.groundOverlay.remove(); - this.groundOverlay = null; - this.groundOverlayOptions = null; + public void removeFromMap(Object collection) { + if (groundOverlay != null) { + GroundOverlayManager.Collection groundOverlayCollection = (GroundOverlayManager.Collection) collection; + groundOverlayCollection.remove(groundOverlay); + groundOverlay = null; + groundOverlayOptions = null; } + groundOverlayCollection = null; } @Override @@ -152,12 +154,12 @@ private GroundOverlay getGroundOverlay() { if (this.groundOverlay != null) { return this.groundOverlay; } - if (this.map == null) { + if (this.groundOverlayCollection == null) { return null; } GroundOverlayOptions groundOverlayOptions = getGroundOverlayOptions(); if (groundOverlayOptions != null) { - return this.map.addGroundOverlay(groundOverlayOptions); + return this.groundOverlayCollection.addGroundOverlay(groundOverlayOptions); } return null; } diff --git a/android/src/main/java/com/rnmaps/maps/MapPolygon.java b/android/src/main/java/com/rnmaps/maps/MapPolygon.java index 8a44a1b..98ea142 100644 --- a/android/src/main/java/com/rnmaps/maps/MapPolygon.java +++ b/android/src/main/java/com/rnmaps/maps/MapPolygon.java @@ -4,10 +4,10 @@ import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; -import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.Polygon; import com.google.android.gms.maps.model.PolygonOptions; +import com.google.maps.android.collections.PolygonManager; import java.util.ArrayList; import java.util.List; @@ -148,13 +148,15 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - polygon = map.addPolygon(getPolygonOptions()); + public void addToMap(Object collection) { + PolygonManager.Collection polygonCollection = (PolygonManager.Collection) collection; + polygon = polygonCollection.addPolygon(getPolygonOptions()); polygon.setClickable(this.tappable); } @Override - public void removeFromMap(GoogleMap map) { - polygon.remove(); + public void removeFromMap(Object collection) { + PolygonManager.Collection polygonCollection = (PolygonManager.Collection) collection; + polygonCollection.remove(polygon); } } diff --git a/android/src/main/java/com/rnmaps/maps/MapPolyline.java b/android/src/main/java/com/rnmaps/maps/MapPolyline.java index 7749930..f008b88 100644 --- a/android/src/main/java/com/rnmaps/maps/MapPolyline.java +++ b/android/src/main/java/com/rnmaps/maps/MapPolyline.java @@ -4,7 +4,6 @@ import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; -import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.model.Cap; import com.google.android.gms.maps.model.Dash; import com.google.android.gms.maps.model.Dot; @@ -14,6 +13,7 @@ import com.google.android.gms.maps.model.Polyline; import com.google.android.gms.maps.model.PolylineOptions; import com.google.android.gms.maps.model.RoundCap; +import com.google.maps.android.collections.PolylineManager; import java.util.ArrayList; import java.util.List; @@ -150,13 +150,15 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - polyline = map.addPolyline(getPolylineOptions()); + public void addToMap(Object collection) { + PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection; + polyline = polylineCollection.addPolyline(getPolylineOptions()); polyline.setClickable(this.tappable); } @Override - public void removeFromMap(GoogleMap map) { - polyline.remove(); + public void removeFromMap(Object collection) { + PolylineManager.Collection polylineCollection = (PolylineManager.Collection) collection; + polylineCollection.remove(polyline); } } diff --git a/android/src/main/java/com/rnmaps/maps/MapUrlTile.java b/android/src/main/java/com/rnmaps/maps/MapUrlTile.java index 4ee3ded..968d58a 100644 --- a/android/src/main/java/com/rnmaps/maps/MapUrlTile.java +++ b/android/src/main/java/com/rnmaps/maps/MapUrlTile.java @@ -196,12 +196,12 @@ public Object getFeature() { } @Override - public void addToMap(GoogleMap map) { - this.tileOverlay = map.addTileOverlay(getTileOverlayOptions()); + public void addToMap(Object map) { + this.tileOverlay = ((GoogleMap) map).addTileOverlay(getTileOverlayOptions()); } @Override - public void removeFromMap(GoogleMap map) { + public void removeFromMap(Object map) { tileOverlay.remove(); } } diff --git a/android/src/main/java/com/rnmaps/maps/MapView.java b/android/src/main/java/com/rnmaps/maps/MapView.java index cee8cc8..05fb050 100644 --- a/android/src/main/java/com/rnmaps/maps/MapView.java +++ b/android/src/main/java/com/rnmaps/maps/MapView.java @@ -52,6 +52,11 @@ import com.google.android.gms.maps.model.TileOverlay; import com.google.android.gms.maps.model.IndoorBuilding; import com.google.android.gms.maps.model.IndoorLevel; +import com.google.maps.android.collections.CircleManager; +import com.google.maps.android.collections.GroundOverlayManager; +import com.google.maps.android.collections.MarkerManager; +import com.google.maps.android.collections.PolygonManager; +import com.google.maps.android.collections.PolylineManager; import com.google.maps.android.data.kml.KmlContainer; import com.google.maps.android.data.kml.KmlLayer; import com.google.maps.android.data.kml.KmlPlacemark; @@ -73,6 +78,15 @@ public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter, GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener { public GoogleMap map; + private MarkerManager markerManager; + private MarkerManager.Collection markerCollection; + private PolylineManager polylineManager; + private PolylineManager.Collection polylineCollection; + private PolygonManager polygonManager; + private PolygonManager.Collection polygonCollection; + private CircleManager.Collection circleCollection; + private GroundOverlayManager groundOverlayManager; + private GroundOverlayManager.Collection groundOverlayCollection; private ProgressBar mapLoadingProgressBar; private RelativeLayout mapLoadingLayout; private ImageView cacheImageView; @@ -214,8 +228,20 @@ public void onMapReady(@NonNull final GoogleMap map) { return; } this.map = map; - this.map.setInfoWindowAdapter(this); - this.map.setOnMarkerDragListener(this); + + markerManager = new MarkerManager(map); + markerCollection = markerManager.newCollection(); + polylineManager = new PolylineManager(map); + polylineCollection = polylineManager.newCollection(); + polygonManager = new PolygonManager(map); + polygonCollection = polygonManager.newCollection(); + CircleManager circleManager = new CircleManager(map); + circleCollection = circleManager.newCollection(); + groundOverlayManager = new GroundOverlayManager(map); + groundOverlayCollection = groundOverlayManager.newCollection(); + + markerCollection.setInfoWindowAdapter(this); + markerCollection.setOnMarkerDragListener(this); this.map.setOnPoiClickListener(this); this.map.setOnIndoorStateChangeListener(this); @@ -246,13 +272,12 @@ public void onMyLocationChange(Location location){ } }); - map.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() { + markerCollection.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() { @Override - public boolean onMarkerClick(Marker marker) { - WritableMap event; + public boolean onMarkerClick(@NonNull Marker marker) { MapMarker airMapMarker = getMarkerMap(marker); - event = makeClickEventData(marker.getPosition()); + WritableMap event = makeClickEventData(marker.getPosition()); event.putString("action", "marker-press"); event.putString("id", airMapMarker.getIdentifier()); manager.pushEvent(context, view, "onMarkerPress", event); @@ -274,30 +299,28 @@ public boolean onMarkerClick(Marker marker) { } }); - map.setOnPolygonClickListener(new GoogleMap.OnPolygonClickListener() { + polygonCollection.setOnPolygonClickListener(new GoogleMap.OnPolygonClickListener() { @Override - public void onPolygonClick(Polygon polygon) { + public void onPolygonClick(@NonNull Polygon polygon) { WritableMap event = makeClickEventData(tapLocation); event.putString("action", "polygon-press"); manager.pushEvent(context, polygonMap.get(polygon), "onPress", event); } }); - map.setOnPolylineClickListener(new GoogleMap.OnPolylineClickListener() { + polylineCollection.setOnPolylineClickListener(new GoogleMap.OnPolylineClickListener() { @Override - public void onPolylineClick(Polyline polyline) { + public void onPolylineClick(@NonNull Polyline polyline) { WritableMap event = makeClickEventData(tapLocation); event.putString("action", "polyline-press"); manager.pushEvent(context, polylineMap.get(polyline), "onPress", event); } }); - map.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() { + markerCollection.setOnInfoWindowClickListener(new GoogleMap.OnInfoWindowClickListener() { @Override - public void onInfoWindowClick(Marker marker) { - WritableMap event; - - event = makeClickEventData(marker.getPosition()); + public void onInfoWindowClick(@NonNull Marker marker) { + WritableMap event = makeClickEventData(marker.getPosition()); event.putString("action", "callout-press"); manager.pushEvent(context, view, "onCalloutPress", event); @@ -315,7 +338,7 @@ public void onInfoWindowClick(Marker marker) { map.setOnMapClickListener(new GoogleMap.OnMapClickListener() { @Override - public void onMapClick(LatLng point) { + public void onMapClick(@NonNull LatLng point) { WritableMap event = makeClickEventData(point); event.putString("action", "press"); manager.pushEvent(context, view, "onPress", event); @@ -324,16 +347,16 @@ public void onMapClick(LatLng point) { map.setOnMapLongClickListener(new GoogleMap.OnMapLongClickListener() { @Override - public void onMapLongClick(LatLng point) { + public void onMapLongClick(@NonNull LatLng point) { WritableMap event = makeClickEventData(point); event.putString("action", "long-press"); manager.pushEvent(context, view, "onLongPress", makeClickEventData(point)); } }); - map.setOnGroundOverlayClickListener(new GoogleMap.OnGroundOverlayClickListener() { + groundOverlayCollection.setOnGroundOverlayClickListener(new GoogleMap.OnGroundOverlayClickListener() { @Override - public void onGroundOverlayClick(GroundOverlay groundOverlay) { + public void onGroundOverlayClick(@NonNull GroundOverlay groundOverlay) { WritableMap event = makeClickEventData(groundOverlay.getPosition()); event.putString("action", "overlay-press"); manager.pushEvent(context, overlayMap.get(groundOverlay), "onPress", event); @@ -655,7 +678,7 @@ public void addFeature(View child, int index) { // This is where we intercept them and do the appropriate underlying mapview action. if (child instanceof MapMarker) { MapMarker annotation = (MapMarker) child; - annotation.addToMap(map); + annotation.addToMap(markerCollection); features.add(index, annotation); // Allow visibility event to be triggered later @@ -681,7 +704,7 @@ public void addFeature(View child, int index) { markerMap.put(marker, annotation); } else if (child instanceof MapPolyline) { MapPolyline polylineView = (MapPolyline) child; - polylineView.addToMap(map); + polylineView.addToMap(polylineCollection); features.add(index, polylineView); Polyline polyline = (Polyline) polylineView.getFeature(); polylineMap.put(polyline, polylineView); @@ -693,13 +716,13 @@ public void addFeature(View child, int index) { gradientPolylineMap.put(tileOverlay, polylineView); } else if (child instanceof MapPolygon) { MapPolygon polygonView = (MapPolygon) child; - polygonView.addToMap(map); + polygonView.addToMap(polygonCollection); features.add(index, polygonView); Polygon polygon = (Polygon) polygonView.getFeature(); polygonMap.put(polygon, polygonView); } else if (child instanceof MapCircle) { MapCircle circleView = (MapCircle) child; - circleView.addToMap(map); + circleView.addToMap(circleCollection); features.add(index, circleView); } else if (child instanceof MapUrlTile) { MapUrlTile urlTileView = (MapUrlTile) child; @@ -715,7 +738,7 @@ public void addFeature(View child, int index) { features.add(index, localTileView); } else if (child instanceof MapOverlay) { MapOverlay overlayView = (MapOverlay) child; - overlayView.addToMap(map); + overlayView.addToMap(groundOverlayCollection); features.add(index, overlayView); GroundOverlay overlay = (GroundOverlay) overlayView.getFeature(); overlayMap.put(overlay, overlayView); @@ -1185,7 +1208,7 @@ public void setKmlSrc(String kmlSrc) { return; } - KmlLayer kmlLayer = new KmlLayer(map, kmlStream, context); + KmlLayer kmlLayer = new KmlLayer(map, kmlStream, context, markerManager, polygonManager, polylineManager, groundOverlayManager, null); kmlLayer.addLayerToMap(); WritableMap pointers = new WritableNativeMap(); diff --git a/example/Gemfile.lock b/example/Gemfile.lock index 637a203..7c32b19 100644 --- a/example/Gemfile.lock +++ b/example/Gemfile.lock @@ -15,10 +15,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.12.0) + cocoapods (1.12.1) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.0) + cocoapods-core (= 1.12.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -33,7 +33,7 @@ GEM nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.0) + cocoapods-core (1.12.1) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 1481c64..8beadb8 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,14 +1,14 @@ PODS: - boost (1.76.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.70.8) - - FBReactNativeSpec (0.70.8): + - FBLazyVector (0.70.9) + - FBReactNativeSpec (0.70.9): - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.8) - - RCTTypeSafety (= 0.70.8) - - React-Core (= 0.70.8) - - React-jsi (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) + - RCTRequired (= 0.70.9) + - RCTTypeSafety (= 0.70.9) + - React-Core (= 0.70.9) + - React-jsi (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) - fmt (6.2.1) - glog (0.3.5) - Google-Maps-iOS-Utils (4.1.0): @@ -35,7 +35,7 @@ PODS: - GoogleMaps/Base (7.4.0) - GoogleMaps/Maps (7.4.0): - GoogleMaps/Base - - hermes-engine (0.70.8) + - hermes-engine (0.70.9) - libevent (2.1.12) - RCT-Folly (2021.07.22.00): - boost @@ -54,214 +54,214 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.70.8) - - RCTTypeSafety (0.70.8): - - FBLazyVector (= 0.70.8) - - RCTRequired (= 0.70.8) - - React-Core (= 0.70.8) - - React (0.70.8): - - React-Core (= 0.70.8) - - React-Core/DevSupport (= 0.70.8) - - React-Core/RCTWebSocket (= 0.70.8) - - React-RCTActionSheet (= 0.70.8) - - React-RCTAnimation (= 0.70.8) - - React-RCTBlob (= 0.70.8) - - React-RCTImage (= 0.70.8) - - React-RCTLinking (= 0.70.8) - - React-RCTNetwork (= 0.70.8) - - React-RCTSettings (= 0.70.8) - - React-RCTText (= 0.70.8) - - React-RCTVibration (= 0.70.8) - - React-bridging (0.70.8): + - RCTRequired (0.70.9) + - RCTTypeSafety (0.70.9): + - FBLazyVector (= 0.70.9) + - RCTRequired (= 0.70.9) + - React-Core (= 0.70.9) + - React (0.70.9): + - React-Core (= 0.70.9) + - React-Core/DevSupport (= 0.70.9) + - React-Core/RCTWebSocket (= 0.70.9) + - React-RCTActionSheet (= 0.70.9) + - React-RCTAnimation (= 0.70.9) + - React-RCTBlob (= 0.70.9) + - React-RCTImage (= 0.70.9) + - React-RCTLinking (= 0.70.9) + - React-RCTNetwork (= 0.70.9) + - React-RCTSettings (= 0.70.9) + - React-RCTText (= 0.70.9) + - React-RCTVibration (= 0.70.9) + - React-bridging (0.70.9): - RCT-Folly (= 2021.07.22.00) - - React-jsi (= 0.70.8) - - React-callinvoker (0.70.8) - - React-Codegen (0.70.8): - - FBReactNativeSpec (= 0.70.8) + - React-jsi (= 0.70.9) + - React-callinvoker (0.70.9) + - React-Codegen (0.70.9): + - FBReactNativeSpec (= 0.70.9) - RCT-Folly (= 2021.07.22.00) - - RCTRequired (= 0.70.8) - - RCTTypeSafety (= 0.70.8) - - React-Core (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-Core (0.70.8): + - RCTRequired (= 0.70.9) + - RCTTypeSafety (= 0.70.9) + - React-Core (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-Core (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.8) - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-Core/Default (= 0.70.9) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/CoreModulesHeaders (0.70.8): + - React-Core/CoreModulesHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/Default (0.70.8): + - React-Core/Default (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/DevSupport (0.70.8): + - React-Core/DevSupport (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.8) - - React-Core/RCTWebSocket (= 0.70.8) - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-jsinspector (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-Core/Default (= 0.70.9) + - React-Core/RCTWebSocket (= 0.70.9) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-jsinspector (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTActionSheetHeaders (0.70.8): + - React-Core/RCTActionSheetHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTAnimationHeaders (0.70.8): + - React-Core/RCTAnimationHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTBlobHeaders (0.70.8): + - React-Core/RCTBlobHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTImageHeaders (0.70.8): + - React-Core/RCTImageHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTLinkingHeaders (0.70.8): + - React-Core/RCTLinkingHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTNetworkHeaders (0.70.8): + - React-Core/RCTNetworkHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTSettingsHeaders (0.70.8): + - React-Core/RCTSettingsHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTTextHeaders (0.70.8): + - React-Core/RCTTextHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTVibrationHeaders (0.70.8): + - React-Core/RCTVibrationHeaders (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-Core/RCTWebSocket (0.70.8): + - React-Core/RCTWebSocket (0.70.9): - glog - RCT-Folly (= 2021.07.22.00) - - React-Core/Default (= 0.70.8) - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-Core/Default (= 0.70.9) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga - - React-CoreModules (0.70.8): + - React-CoreModules (0.70.9): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.8) - - React-Codegen (= 0.70.8) - - React-Core/CoreModulesHeaders (= 0.70.8) - - React-jsi (= 0.70.8) - - React-RCTImage (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-cxxreact (0.70.8): + - RCTTypeSafety (= 0.70.9) + - React-Codegen (= 0.70.9) + - React-Core/CoreModulesHeaders (= 0.70.9) + - React-jsi (= 0.70.9) + - React-RCTImage (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-cxxreact (0.70.9): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-callinvoker (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsinspector (= 0.70.8) - - React-logger (= 0.70.8) - - React-perflogger (= 0.70.8) - - React-runtimeexecutor (= 0.70.8) - - React-hermes (0.70.8): + - React-callinvoker (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsinspector (= 0.70.9) + - React-logger (= 0.70.9) + - React-perflogger (= 0.70.9) + - React-runtimeexecutor (= 0.70.9) + - React-hermes (0.70.9): - DoubleConversion - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - RCT-Folly/Futures (= 2021.07.22.00) - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-jsiexecutor (= 0.70.8) - - React-jsinspector (= 0.70.8) - - React-perflogger (= 0.70.8) - - React-jsi (0.70.8): + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-jsiexecutor (= 0.70.9) + - React-jsinspector (= 0.70.9) + - React-perflogger (= 0.70.9) + - React-jsi (0.70.9): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsi/Default (= 0.70.8) - - React-jsi/Default (0.70.8): + - React-jsi/Default (= 0.70.9) + - React-jsi/Default (0.70.9): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-jsiexecutor (0.70.8): + - React-jsiexecutor (0.70.9): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-perflogger (= 0.70.8) - - React-jsinspector (0.70.8) - - React-logger (0.70.8): + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-perflogger (= 0.70.9) + - React-jsinspector (0.70.9) + - React-logger (0.70.9): - glog - react-native-google-maps (0.0.0): - Google-Maps-iOS-Utils (= 4.1.0) @@ -269,72 +269,72 @@ PODS: - React-Core - react-native-maps (0.0.0): - React-Core - - React-perflogger (0.70.8) - - React-RCTActionSheet (0.70.8): - - React-Core/RCTActionSheetHeaders (= 0.70.8) - - React-RCTAnimation (0.70.8): + - React-perflogger (0.70.9) + - React-RCTActionSheet (0.70.9): + - React-Core/RCTActionSheetHeaders (= 0.70.9) + - React-RCTAnimation (0.70.9): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.8) - - React-Codegen (= 0.70.8) - - React-Core/RCTAnimationHeaders (= 0.70.8) - - React-jsi (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-RCTBlob (0.70.8): + - RCTTypeSafety (= 0.70.9) + - React-Codegen (= 0.70.9) + - React-Core/RCTAnimationHeaders (= 0.70.9) + - React-jsi (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-RCTBlob (0.70.9): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.8) - - React-Core/RCTBlobHeaders (= 0.70.8) - - React-Core/RCTWebSocket (= 0.70.8) - - React-jsi (= 0.70.8) - - React-RCTNetwork (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-RCTImage (0.70.8): + - React-Codegen (= 0.70.9) + - React-Core/RCTBlobHeaders (= 0.70.9) + - React-Core/RCTWebSocket (= 0.70.9) + - React-jsi (= 0.70.9) + - React-RCTNetwork (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-RCTImage (0.70.9): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.8) - - React-Codegen (= 0.70.8) - - React-Core/RCTImageHeaders (= 0.70.8) - - React-jsi (= 0.70.8) - - React-RCTNetwork (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-RCTLinking (0.70.8): - - React-Codegen (= 0.70.8) - - React-Core/RCTLinkingHeaders (= 0.70.8) - - React-jsi (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-RCTNetwork (0.70.8): + - RCTTypeSafety (= 0.70.9) + - React-Codegen (= 0.70.9) + - React-Core/RCTImageHeaders (= 0.70.9) + - React-jsi (= 0.70.9) + - React-RCTNetwork (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-RCTLinking (0.70.9): + - React-Codegen (= 0.70.9) + - React-Core/RCTLinkingHeaders (= 0.70.9) + - React-jsi (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-RCTNetwork (0.70.9): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.8) - - React-Codegen (= 0.70.8) - - React-Core/RCTNetworkHeaders (= 0.70.8) - - React-jsi (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-RCTSettings (0.70.8): + - RCTTypeSafety (= 0.70.9) + - React-Codegen (= 0.70.9) + - React-Core/RCTNetworkHeaders (= 0.70.9) + - React-jsi (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-RCTSettings (0.70.9): - RCT-Folly (= 2021.07.22.00) - - RCTTypeSafety (= 0.70.8) - - React-Codegen (= 0.70.8) - - React-Core/RCTSettingsHeaders (= 0.70.8) - - React-jsi (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-RCTText (0.70.8): - - React-Core/RCTTextHeaders (= 0.70.8) - - React-RCTVibration (0.70.8): + - RCTTypeSafety (= 0.70.9) + - React-Codegen (= 0.70.9) + - React-Core/RCTSettingsHeaders (= 0.70.9) + - React-jsi (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-RCTText (0.70.9): + - React-Core/RCTTextHeaders (= 0.70.9) + - React-RCTVibration (0.70.9): - RCT-Folly (= 2021.07.22.00) - - React-Codegen (= 0.70.8) - - React-Core/RCTVibrationHeaders (= 0.70.8) - - React-jsi (= 0.70.8) - - ReactCommon/turbomodule/core (= 0.70.8) - - React-runtimeexecutor (0.70.8): - - React-jsi (= 0.70.8) - - ReactCommon/turbomodule/core (0.70.8): + - React-Codegen (= 0.70.9) + - React-Core/RCTVibrationHeaders (= 0.70.9) + - React-jsi (= 0.70.9) + - ReactCommon/turbomodule/core (= 0.70.9) + - React-runtimeexecutor (0.70.9): + - React-jsi (= 0.70.9) + - ReactCommon/turbomodule/core (0.70.9): - DoubleConversion - glog - RCT-Folly (= 2021.07.22.00) - - React-bridging (= 0.70.8) - - React-callinvoker (= 0.70.8) - - React-Core (= 0.70.8) - - React-cxxreact (= 0.70.8) - - React-jsi (= 0.70.8) - - React-logger (= 0.70.8) - - React-perflogger (= 0.70.8) + - React-bridging (= 0.70.9) + - React-callinvoker (= 0.70.9) + - React-Core (= 0.70.9) + - React-cxxreact (= 0.70.9) + - React-jsi (= 0.70.9) + - React-logger (= 0.70.9) + - React-perflogger (= 0.70.9) - Yoga (1.14.0) DEPENDENCIES: @@ -469,45 +469,45 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: ce6c993e675c5e9684e3b83aa0c346eb116c3ec6 - FBReactNativeSpec: d8772db98ada3c2daf8f65e2105ada77bf209c02 + FBLazyVector: bc76253beb7463b688aa6af913b822ed631de31a + FBReactNativeSpec: 85d34420d92cb178897de05e3aba90e7a8568162 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b Google-Maps-iOS-Utils: d3fdfd57db799771418f06189e33981597553aa8 GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac - hermes-engine: 0b19f33a9c2ec1dbdede3232606eeb1101db4cec + hermes-engine: 918ec5addfbc430c9f443376d739f088b6dc96c3 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda - RCTRequired: 35a7977a5a3cb2d3830c3fef7352b7b116115829 - RCTTypeSafety: 259790fb8b16c94e57e0d3d1e2479e69a2b93f50 - React: 89f0551b8f7a555e38ce016a81c50bc68f1972a8 - React-bridging: 2e425b6bc8536206918fa55bf9dd37016f99bb33 - React-callinvoker: 1c733126b1e4d95d0d412d95c51cedf06b3b979d - React-Codegen: 41d2ddcd966eac2a5f2698d5cd21e3d741e999bd - React-Core: 3021f04b6b1a2064952e166470a58db671ed65b1 - React-CoreModules: f569f295874d0864bfd7a686dad3f828f4e8813a - React-cxxreact: a6c952ae24061777510f7e60b808b673e624009e - React-hermes: be32d1db90d052cc025a38ec2ea4e1a493d33c6a - React-jsi: 3d7bafe69dddd780fb3527b7f939dfcbfd6790b5 - React-jsiexecutor: bc8556d76f83a1a9075cdee207aad7c0b7b30a33 - React-jsinspector: 5e5497c844f2381e8648ec3a7d0ad25b3f27f23e - React-logger: b277ad8f4473f2506fb30b762b6348534a3de10e + RCTRequired: db184d894eed9e15f1fa80c3372595b7ec360580 + RCTTypeSafety: c9bf4c53ad246e4c94a49d91353ed19a8df5952f + React: 3ccb97e5c4672199746cefa622fd595d4cc9319d + React-bridging: 60a99ddb74281e2047f1a85912c7075a75269285 + React-callinvoker: aea0b555a18d03e91d1d10b1c4eacc9d9dfb581a + React-Codegen: 3d757143a6f27a84958f49466a3b18716845d192 + React-Core: b1e6334eedacb3dc3adae163ccdde5e6ca26d18b + React-CoreModules: 74122da11de87771f2461c757ab0c29defddd4ea + React-cxxreact: bbca1cdf5165761529edff94ed117b95ccbc877a + React-hermes: ee7245fc80f61eee8918a5046ed84b0b740a15f4 + React-jsi: a015cacfe56047914e425d0177133c35409e2462 + React-jsiexecutor: d3f6d9242d4c93e7f0bdb27cb5510003bc98445c + React-jsinspector: d76d32327f21d4f40dcf696231fdbbca60de4711 + React-logger: 1b3522f1e05c6360e93df3607a016c39e30a7351 react-native-google-maps: ee3ad79c32fda4f29fe9949e70e259bb31d7f849 react-native-maps: 30d24060fb0abe9998d31a4cf37421ff14c59e25 - React-perflogger: e9249a18e055cae96fdf685bf6145cbea62506c8 - React-RCTActionSheet: a6d2a544a4605a111ce80fa9319cc870ca3ea778 - React-RCTAnimation: 21b776b15aa5451a0b5bcb342fd2f346817c1101 - React-RCTBlob: 95f54d45305b4103b29d8b2c1e705b5c3183239a - React-RCTImage: 1b76ab9e3b60313edd85bc3fd3e07c29cec6ab68 - React-RCTLinking: 7176da2a80f3056152a51587812d6d0c451b1f7b - React-RCTNetwork: d36f896304e6ef2998f58cd4199a0239bd312318 - React-RCTSettings: 004b9a1afb5870f4bcd06521c088e738c1558940 - React-RCTText: a2606a79fdb52dd2bde0d7fde7726160fa16b70c - React-RCTVibration: 19d21a3ed620352180800447771f68a101f196e9 - React-runtimeexecutor: f795fd426264709901c09432c6ce072f8400147e - ReactCommon: c440e7f15075e81eb29802521c58a1f38b1aa903 - Yoga: d6133108734e69e8c0becc6ba587294b94829687 + React-perflogger: cce000b5caa4bcecbb29ee9cfdb47f26202d2599 + React-RCTActionSheet: ba29f52a82d970e2aba5804490ecaea587c7a751 + React-RCTAnimation: 36efe35933875c9aeea612f7d2c0394fa22552c1 + React-RCTBlob: 8dd4dd76ab8384ceae2bd78141880cb0fdd6640a + React-RCTImage: 3e779bb3f8e5184b5af19134c7d866f22d60d966 + React-RCTLinking: 5051e59b8a625a82a7bc613687855193a567765c + React-RCTNetwork: e160ffdb54f0f054911341c2889fd2c541ce0ba7 + React-RCTSettings: 2fc3aaaad0bea7adc1596ff2c54b97a1febe2f7b + React-RCTText: eb1c72e61dd7dbe2c291c1d6f342cc5da351545b + React-RCTVibration: 7fee53a28038a1b3c5c66dfd7656e29ac6d5c04d + React-runtimeexecutor: ed23be8c1e02b73e7e2f88ac7eaab8faf6961a38 + ReactCommon: 153bd73ed963731a8e3e7f03a747b353fed7363e + Yoga: dc109b79db907f0f589fc423e991b09ec42d2295 PODFILE CHECKSUM: 1d755277e5648e128501c8fe0a40074bd2f373b1 -COCOAPODS: 1.12.0 +COCOAPODS: 1.12.1 diff --git a/example/package.json b/example/package.json index aa59577..f69a8b6 100644 --- a/example/package.json +++ b/example/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "react": "18.1.0", - "react-native": "0.70.8" + "react-native": "0.70.9" }, "devDependencies": { "@babel/core": "^7.12.9", diff --git a/example/yarn.lock b/example/yarn.lock index 99217c3..0b762f2 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -1014,9 +1014,9 @@ "@types/istanbul-lib-report" "*" "@types/node@*": - version "18.15.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" - integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== + version "18.15.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" + integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== "@types/yargs-parser@*": version "21.0.0" @@ -1400,9 +1400,9 @@ camelcase@^6.0.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001449: - version "1.0.30001480" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001480.tgz#9bbd35ee44c2480a1e3a3b9f4496f5066817164a" - integrity sha512-q7cpoPPvZYgtyC4VaBSN0Bt+PJ4c4EYRf0DrduInOz2SkFpHD5p3LnvEpqBp7UnJn+8x1Ogl1s38saUxe+ihQQ== + version "1.0.30001481" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912" + integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ== chalk@^2.0.0: version "2.4.2" @@ -1700,9 +1700,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.284: - version "1.4.367" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.367.tgz#d9ddc529ba2315fc852b722c359e4a40e86aa742" - integrity sha512-mNuDxb+HpLhPGUKrg0hSxbTjHWw8EziwkwlJNkFUj3W60ypigLDRVz04vU+VRsJPi8Gub+FDhYUpuTm9xiEwRQ== + version "1.4.368" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.368.tgz#75901f97d3e23da2e66feb1e61fbb8e70ac96430" + integrity sha512-e2aeCAixCj9M7nJxdB/wDjO6mbYX+lJJxSJCXDzlr5YPGYVofuJwGN9nKg2o6wWInjX6XmxRinn3AeJMK81ltw== emoji-regex@^8.0.0: version "8.0.0" @@ -3339,10 +3339,10 @@ react-native-gradle-plugin@^0.70.3: resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.70.3.tgz#cbcf0619cbfbddaa9128701aa2d7b4145f9c4fc8" integrity sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A== -react-native@0.70.8: - version "0.70.8" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.70.8.tgz#aa9aae8e6291589908db74fe69e0ec1d9a9c5490" - integrity sha512-O3ONJed9W/VEEVWsbZcwyMDhnEvw7v9l9enqWqgbSGLzHfh6HeIGMCNmjz+kRsHnC7AiF47fupWfgYX7hNnhoQ== +react-native@0.70.9: + version "0.70.9" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.70.9.tgz#08a962b72cf2a922e4cd471049eb0b624079dba6" + integrity sha512-Z8K7BayzswIVdmDzF/VS6RG1mCkNJSCgA3NjrXl8YmadCDDuDbEIM5BE+Qiiz8UK5XzNsF9NxH/FVojty/1I4A== dependencies: "@jest/create-cache-key-function" "^27.0.1" "@react-native-community/cli" "9.3.2" diff --git a/ios/AirMaps/AIRMap.h b/ios/AirMaps/AIRMap.h index 734de1a..84514f3 100644 --- a/ios/AirMaps/AIRMap.h +++ b/ios/AirMaps/AIRMap.h @@ -17,7 +17,6 @@ @class AIRMapMarker; -extern const CLLocationDegrees AIRMapDefaultSpan; extern const NSTimeInterval AIRMapRegionChangeObserveInterval; extern const CGFloat AIRMapZoomBoundBuffer; extern const NSInteger AIRMapMaxZoomLevel; diff --git a/ios/AirMaps/AIRMap.m b/ios/AirMaps/AIRMap.m index 0c9da1b..fe1ae13 100644 --- a/ios/AirMaps/AIRMap.m +++ b/ios/AirMaps/AIRMap.m @@ -21,7 +21,6 @@ #import "AIRMapLocalTile.h" #import "AIRMapOverlay.h" -const CLLocationDegrees AIRMapDefaultSpan = 0.005; const NSTimeInterval AIRMapRegionChangeObserveInterval = 0.1; const CGFloat AIRMapZoomBoundBuffer = 0.01; const NSInteger AIRMapMaxZoomLevel = 20; diff --git a/ios/AirMaps/AIRMapManager.m b/ios/AirMaps/AIRMapManager.m index 8c2bae4..58217e2 100644 --- a/ios/AirMaps/AIRMapManager.m +++ b/ios/AirMaps/AIRMapManager.m @@ -928,14 +928,7 @@ - (void)mapView:(AIRMap *)mapView didUpdateUserLocation:(MKUserLocation *)locati } if (mapView.followUserLocation) { - MKCoordinateRegion region; - region.span.latitudeDelta = AIRMapDefaultSpan; - region.span.longitudeDelta = AIRMapDefaultSpan; - region.center = location.coordinate; - [mapView setRegion:region animated:YES]; - - // Move to user location only for the first time it loads up. - // mapView.followUserLocation = NO; + [mapView setCenterCoordinate:location.coordinate animated:YES]; } } diff --git a/package.json b/package.json index 1924b49..9503ce6 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@react-native-community/eslint-config": "3.2.0", "@semantic-release/changelog": "6.0.3", "@semantic-release/git": "10.0.1", - "@types/jest": "29.5.0", + "@types/jest": "29.5.1", "@types/react-native": "0.70.13", "babel-jest": "29.5.0", "detox": "20.7.0", @@ -69,7 +69,7 @@ "jest": "29.5.0", "prettier": "2.8.7", "react": "18.1.0", - "react-native": "0.70.8", + "react-native": "0.70.9", "semantic-release": "21.0.1", "typescript": "5.0.4" }, diff --git a/yarn.lock b/yarn.lock index c9bbbc7..338f3e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1340,10 +1340,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/arborist@^6.2.7": - version "6.2.7" - resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-6.2.7.tgz#434b66fb90c598b25d4d0ba116b124bf504d6e65" - integrity sha512-7Gp1lZEweW1GzoMOo0Z10zAm4SKZsVYUWtFSCrahXmV5H3Mp4Pgwg1nIgkXj4LkjqT+fLsXmjK6rQBauDH64Jg== +"@npmcli/arborist@^6.2.8": + version "6.2.8" + resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-6.2.8.tgz#bfc53ab964b157fd220c3c138b88e958c209be8b" + integrity sha512-z8qQIbuZBk476/S5rATAS4zwWb7QHzYbtH0468K9c8gfxcH6VeZF5a6MqUiEcdg41OWwiBHqq0I65jdH2Alidw== dependencies: "@isaacs/string-locale-compare" "^1.1.0" "@npmcli/fs" "^3.1.0" @@ -1377,20 +1377,20 @@ semver "^7.3.7" ssri "^10.0.1" treeverse "^3.0.0" - walk-up-path "^1.0.0" + walk-up-path "^3.0.1" -"@npmcli/config@^6.1.5": - version "6.1.5" - resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-6.1.5.tgz#79f6e84dbe13f0ad14133898cb4cb904cab7097a" - integrity sha512-nUjJ4+Xo2/XWoq5wsF9ajRtm5xADlLjtyBQGdGlWFRgHpYggZtxQP1XteM6SvEQsHI3P9vDyLGIYO0MlNrQZwQ== +"@npmcli/config@^6.1.6": + version "6.1.6" + resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-6.1.6.tgz#2a7f3cb63a23242f80063d4625e6754969681440" + integrity sha512-TM5dwgaz3Un2T5rdHQ6lX+Jj3TQxK6aV1U5OLByZiUS5qnA0NgC6U0aSESQVy80emToz8dtX3aniXD24wRnBaw== dependencies: "@npmcli/map-workspaces" "^3.0.2" - ini "^3.0.0" + ini "^4.1.0" nopt "^7.0.0" proc-log "^3.0.0" read-package-json-fast "^3.0.2" semver "^7.3.5" - walk-up-path "^1.0.0" + walk-up-path "^3.0.1" "@npmcli/disparity-colors@^3.0.0": version "3.0.0" @@ -1544,10 +1544,10 @@ "@octokit/types" "^9.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^16.0.0": - version "16.0.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-16.0.0.tgz#d92838a6cd9fb4639ca875ddb3437f1045cc625e" - integrity sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA== +"@octokit/openapi-types@^17.0.0": + version "17.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.0.0.tgz#7356d287f48b20e9a1f497ef8dfaabdff9cf8622" + integrity sha512-V8BVJGN0ZmMlURF55VFHFd/L92XQQ43KvFjNmY1IYbCN3V/h/uUFV6iQi19WEHM395Nn+1qhUbViCAD/1czzog== "@octokit/plugin-paginate-rest@^6.0.0": version "6.0.0" @@ -1601,11 +1601,11 @@ "@octokit/plugin-rest-endpoint-methods" "^7.0.0" "@octokit/types@^9.0.0": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.0.0.tgz#6050db04ddf4188ec92d60e4da1a2ce0633ff635" - integrity sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw== + version "9.1.1" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.1.1.tgz#8a71f05c4e72fe51aac2c66ed71999abdd7e2777" + integrity sha512-hFheiHJEZzE5qn/u4R2IeMLXqUzXgd1vSokHS5x4oq+klHhXNFLL69kanAtrlTqj3K9Dps9XhOqOtDhDmPdlxQ== dependencies: - "@octokit/openapi-types" "^16.0.0" + "@octokit/openapi-types" "^17.0.0" "@pnpm/config.env-replace@^1.1.0": version "1.1.0" @@ -1998,13 +1998,13 @@ resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31" integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ== -"@tufjs/models@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.2.tgz#6c1e99210ada62c057b1742b5528d85acbfe0a47" - integrity sha512-uxarDtxTIK3f8hJS4yFhW/lvTa3tsiQU5iDCRut+NCnOXvNtEul0Ct58NIIcIx9Rkt7OFEK31Ndpqsd663nsew== +"@tufjs/models@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.3.tgz#e6cb8a86834da7459a7c836cd892dee56b4bab44" + integrity sha512-mkFEqqRisi13DmR5pX4x+Zk97EiU8djTtpNW1GeuX410y/raAsq/T3ZCjwoRIZ8/cIBfW0olK/sywlAiWevDVw== dependencies: "@tufjs/canonical-json" "1.0.0" - minimatch "^8.0.3" + minimatch "^7.4.6" "@types/babel__core@^7.1.14": version "7.20.0" @@ -2070,10 +2070,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@29.5.0": - version "29.5.0" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.0.tgz#337b90bbcfe42158f39c2fb5619ad044bbb518ac" - integrity sha512-3Emr5VOl/aoBwnWcH/EFQvlSAmjV+XtV9GGu5mwdYew5vhQh0IUZx/60x0TzHDu09Bi7HMx10t/namdJw5QIcg== +"@types/jest@29.5.1": + version "29.5.1" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.1.tgz#83c818aa9a87da27d6da85d3378e5a34d2f31a47" + integrity sha512-tEuVcHrpaixS36w7hpsfLBLpjtMRJUE09/MHXn923LOVojDwyC14cWcfc0rDs0VEfUyYmt/+iX1kxxp+gZMcaQ== dependencies: expect "^29.0.0" pretty-format "^29.0.0" @@ -2089,9 +2089,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*": - version "18.15.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" - integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== + version "18.15.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469" + integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q== "@types/normalize-package-data@^2.4.0", "@types/normalize-package-data@^2.4.1": version "2.4.1" @@ -2116,9 +2116,9 @@ "@types/react" "*" "@types/react@*": - version "18.0.35" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.35.tgz#192061cb1044fe01f2d3a94272cd35dd50502741" - integrity sha512-6Laome31HpetaIUGFWl1VQ3mdSImwxtFZ39rh059a1MNnKGqBpC88J6NJ8n/Is3Qx7CefDGLgf/KhN/sYCf7ag== + version "18.0.37" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.37.tgz#7a784e2a8b8f83abb04dc6b9ed9c9b4c0aee9be7" + integrity sha512-4yaZZtkRN3ZIQD3KSEwkfcik8s0SWV+82dlJot1AbGYHCzJkWP3ENBY6wYeDRmKZ6HkrgoGAmR2HqdwYGp6OEw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2171,14 +2171,14 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.30.5": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.58.0.tgz#b1d4b0ad20243269d020ef9bbb036a40b0849829" - integrity sha512-vxHvLhH0qgBd3/tW6/VccptSfc8FxPQIkmNTVLWcCOVqSBvqpnKkBTYrhcGlXfSnd78azwe+PsjYFj0X34/njA== + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.0.tgz#c0e10eeb936debe5d1c3433cf36206a95befefd0" + integrity sha512-p0QgrEyrxAWBecR56gyn3wkG15TJdI//eetInP3zYRewDh0XS+DhB3VUAd3QqvziFsfaQIoIuZMxZRB7vXYaYw== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.58.0" - "@typescript-eslint/type-utils" "5.58.0" - "@typescript-eslint/utils" "5.58.0" + "@typescript-eslint/scope-manager" "5.59.0" + "@typescript-eslint/type-utils" "5.59.0" + "@typescript-eslint/utils" "5.59.0" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -2187,71 +2187,71 @@ tsutils "^3.21.0" "@typescript-eslint/parser@^5.30.5": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.58.0.tgz#2ac4464cf48bef2e3234cb178ede5af352dddbc6" - integrity sha512-ixaM3gRtlfrKzP8N6lRhBbjTow1t6ztfBvQNGuRM8qH1bjFFXIJ35XY+FC0RRBKn3C6cT+7VW1y8tNm7DwPHDQ== + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.0.tgz#0ad7cd019346cc5d150363f64869eca10ca9977c" + integrity sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w== dependencies: - "@typescript-eslint/scope-manager" "5.58.0" - "@typescript-eslint/types" "5.58.0" - "@typescript-eslint/typescript-estree" "5.58.0" + "@typescript-eslint/scope-manager" "5.59.0" + "@typescript-eslint/types" "5.59.0" + "@typescript-eslint/typescript-estree" "5.59.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.58.0": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.58.0.tgz#5e023a48352afc6a87be6ce3c8e763bc9e2f0bc8" - integrity sha512-b+w8ypN5CFvrXWQb9Ow9T4/6LC2MikNf1viLkYTiTbkQl46CnR69w7lajz1icW0TBsYmlpg+mRzFJ4LEJ8X9NA== +"@typescript-eslint/scope-manager@5.59.0": + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz#86501d7a17885710b6716a23be2e93fc54a4fe8c" + integrity sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ== dependencies: - "@typescript-eslint/types" "5.58.0" - "@typescript-eslint/visitor-keys" "5.58.0" + "@typescript-eslint/types" "5.59.0" + "@typescript-eslint/visitor-keys" "5.59.0" -"@typescript-eslint/type-utils@5.58.0": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.58.0.tgz#f7d5b3971483d4015a470d8a9e5b8a7d10066e52" - integrity sha512-FF5vP/SKAFJ+LmR9PENql7fQVVgGDOS+dq3j+cKl9iW/9VuZC/8CFmzIP0DLKXfWKpRHawJiG70rVH+xZZbp8w== +"@typescript-eslint/type-utils@5.59.0": + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.0.tgz#8e8d1420fc2265989fa3a0d897bde37f3851e8c9" + integrity sha512-d/B6VSWnZwu70kcKQSCqjcXpVH+7ABKH8P1KNn4K7j5PXXuycZTPXF44Nui0TEm6rbWGi8kc78xRgOC4n7xFgA== dependencies: - "@typescript-eslint/typescript-estree" "5.58.0" - "@typescript-eslint/utils" "5.58.0" + "@typescript-eslint/typescript-estree" "5.59.0" + "@typescript-eslint/utils" "5.59.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.58.0": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.58.0.tgz#54c490b8522c18986004df7674c644ffe2ed77d8" - integrity sha512-JYV4eITHPzVQMnHZcYJXl2ZloC7thuUHrcUmxtzvItyKPvQ50kb9QXBkgNAt90OYMqwaodQh2kHutWZl1fc+1g== +"@typescript-eslint/types@5.59.0": + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.0.tgz#3fcdac7dbf923ec5251545acdd9f1d42d7c4fe32" + integrity sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA== -"@typescript-eslint/typescript-estree@5.58.0": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.58.0.tgz#4966e6ff57eaf6e0fce2586497edc097e2ab3e61" - integrity sha512-cRACvGTodA+UxnYM2uwA2KCwRL7VAzo45syNysqlMyNyjw0Z35Icc9ihPJZjIYuA5bXJYiJ2YGUB59BqlOZT1Q== +"@typescript-eslint/typescript-estree@5.59.0": + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz#8869156ee1dcfc5a95be3ed0e2809969ea28e965" + integrity sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg== dependencies: - "@typescript-eslint/types" "5.58.0" - "@typescript-eslint/visitor-keys" "5.58.0" + "@typescript-eslint/types" "5.59.0" + "@typescript-eslint/visitor-keys" "5.59.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.58.0", "@typescript-eslint/utils@^5.10.0": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.58.0.tgz#430d7c95f23ec457b05be5520c1700a0dfd559d5" - integrity sha512-gAmLOTFXMXOC+zP1fsqm3VceKSBQJNzV385Ok3+yzlavNHZoedajjS4UyS21gabJYcobuigQPs/z71A9MdJFqQ== +"@typescript-eslint/utils@5.59.0", "@typescript-eslint/utils@^5.10.0": + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.0.tgz#063d066b3bc4850c18872649ed0da9ee72d833d5" + integrity sha512-GGLFd+86drlHSvPgN/el6dRQNYYGOvRSDVydsUaQluwIW3HvbXuxyuD5JETvBt/9qGYe+lOrDk6gRrWOHb/FvA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.58.0" - "@typescript-eslint/types" "5.58.0" - "@typescript-eslint/typescript-estree" "5.58.0" + "@typescript-eslint/scope-manager" "5.59.0" + "@typescript-eslint/types" "5.59.0" + "@typescript-eslint/typescript-estree" "5.59.0" eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.58.0": - version "5.58.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.58.0.tgz#eb9de3a61d2331829e6761ce7fd13061781168b4" - integrity sha512-/fBraTlPj0jwdyTwLyrRTxv/3lnU2H96pNTVM6z3esTWLtA5MZ9ghSMJ7Rb+TtUAdtEw9EyJzJ0EydIMKxQ9gA== +"@typescript-eslint/visitor-keys@5.59.0": + version "5.59.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz#a59913f2bf0baeb61b5cfcb6135d3926c3854365" + integrity sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA== dependencies: - "@typescript-eslint/types" "5.58.0" + "@typescript-eslint/types" "5.59.0" eslint-visitor-keys "^3.3.0" JSONStream@^1.0.4: @@ -3013,9 +3013,9 @@ camelcase@^6.0.0, camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001449: - version "1.0.30001478" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001478.tgz#0ef8a1cf8b16be47a0f9fc4ecfc952232724b32a" - integrity sha512-gMhDyXGItTHipJj2ApIvR+iVB5hd0KP3svMWWXDvZOmjzJJassGLMfxRkQCSYgGd2gtdL/ReeiyvMSFD1Ss6Mw== + version "1.0.30001481" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912" + integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ== cardinal@^2.1.1: version "2.1.1" @@ -3569,7 +3569,7 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" -define-properties@^1.1.3, define-properties@^1.1.4: +define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== @@ -3737,9 +3737,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.284: - version "1.4.365" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.365.tgz#ccd9e352d4493aa288d87e6ea36f3edf350c045e" - integrity sha512-FRHZO+1tUNO4TOPXmlxetkoaIY8uwHzd1kKopK/Gx2SKn1L47wJXWD44wxP5CGRyyP98z/c8e1eBzJrgPeiBOg== + version "1.4.368" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.368.tgz#75901f97d3e23da2e66feb1e61fbb8e70ac96430" + integrity sha512-e2aeCAixCj9M7nJxdB/wDjO6mbYX+lJJxSJCXDzlr5YPGYVofuJwGN9nKg2o6wWInjX6XmxRinn3AeJMK81ltw== emittery@^0.13.1: version "0.13.1" @@ -4511,7 +4511,7 @@ function.prototype.name@^1.1.5: es-abstract "^1.19.0" functions-have-names "^1.2.2" -functions-have-names@^1.2.2: +functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -5037,10 +5037,10 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -ini@^3.0.0, ini@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d" - integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ== +ini@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.0.tgz#3bca65a0ae224f07f8f8b3392d8c94a7f1bb007b" + integrity sha512-HLR38RSF2iulAzc3I/sma4CoYxQP844rPYCNfzGDOHqa/YqVlwuuZgBx6M50/X8dKgzk0cm1qRg3+47mK2N+cQ== init-package-json@^5.0.0: version "5.0.0" @@ -5154,7 +5154,7 @@ is-cidr@^4.0.2: dependencies: cidr-regex "^3.1.1" -is-core-module@^2.12.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0: +is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0: version "2.12.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== @@ -5980,9 +5980,9 @@ jsesc@~0.5.0: integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== json-cycle@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/json-cycle/-/json-cycle-1.4.0.tgz#05387602a4a0fe814db8668856cb3bde03c9662c" - integrity sha512-rU9PIQLyR7sSoefX9OjU8eoTOg0Ulzx5mVvNzplTe6WZTSvEYurxtC+Ar1wGC4Busiq+1vL6g42GproF4HQcEQ== + version "1.5.0" + resolved "https://registry.yarnpkg.com/json-cycle/-/json-cycle-1.5.0.tgz#b1f1d976eee16cef51d5f3d3b3caece3e90ba23a" + integrity sha512-GOehvd5PO2FeZ5T4c+RxobeT5a1PiGpF4u9/3+UvrMU4bhnVqzJY7hm39wg8PDCqkU91fWGH8qjWR4bn+wgq9w== json-parse-better-errors@^1.0.1: version "1.0.2" @@ -6132,12 +6132,12 @@ libnpmaccess@^7.0.2: npm-package-arg "^10.1.0" npm-registry-fetch "^14.0.3" -libnpmdiff@^5.0.15: - version "5.0.15" - resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-5.0.15.tgz#e358fbc271301ccc4ee117083b0c2594a700ea3f" - integrity sha512-Rxj7GpRC/17Szkf1Yf8vaplnwxzXQdAvnaA5l7gvw1X1KECOal8+GF8Z61QgNQsyDePRcwe1AgbKqUIcInS0lQ== +libnpmdiff@^5.0.16: + version "5.0.16" + resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-5.0.16.tgz#5d53d23b19dda6de4bfef80c60d793fa6c6bab68" + integrity sha512-Hu6Jhernk9MP8poIZh6JffJFZNgG+GCWXBP+tO+xQ0/Nc8W38TcAyEHp13pyVB3iXva8aUzcY/UO3gnoeOki7w== dependencies: - "@npmcli/arborist" "^6.2.7" + "@npmcli/arborist" "^6.2.8" "@npmcli/disparity-colors" "^3.0.0" "@npmcli/installed-package-contents" "^2.0.2" binary-extensions "^2.2.0" @@ -6147,12 +6147,12 @@ libnpmdiff@^5.0.15: pacote "^15.0.8" tar "^6.1.13" -libnpmexec@^5.0.15: - version "5.0.15" - resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-5.0.15.tgz#e40e9163700489a3fd7e2d92497c79b07da1d006" - integrity sha512-Y5u9tpJShOe4+In5POEzYsOagFLYjOOU4NhVQ4WfCnNho49VDJqXiej7RzMl3pqm7Z2nrLWqj+gbYDmUjnLzGQ== +libnpmexec@^5.0.16: + version "5.0.16" + resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-5.0.16.tgz#d85e13d1a53cade1e4b9febefa243dfa06b0faf4" + integrity sha512-HpGl1Oi7G7iPiCfECbe/l51bsUM7H7FxEgeFkLNXldE8Px+3SAlaWG5mJf5i+BmxMLCbigNWa/jlvErcu1eVKA== dependencies: - "@npmcli/arborist" "^6.2.7" + "@npmcli/arborist" "^6.2.8" "@npmcli/run-script" "^6.0.0" chalk "^4.1.0" ci-info "^3.7.1" @@ -6163,14 +6163,14 @@ libnpmexec@^5.0.15: read "^2.0.0" read-package-json-fast "^3.0.2" semver "^7.3.7" - walk-up-path "^1.0.0" + walk-up-path "^3.0.1" -libnpmfund@^4.0.15: - version "4.0.15" - resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-4.0.15.tgz#b524f6a6271379d7ce480aed300e4f53cef04392" - integrity sha512-r4CvEfh0fO+RfL3WaF1bN7L68axVXBtWRIHfzFGAf48FHriCM1j6IF8KisrT4xnVDXujOErFUR4wiTWZuj8UeQ== +libnpmfund@^4.0.16: + version "4.0.16" + resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-4.0.16.tgz#13203679403c5cff75f926cf1831089057c01b16" + integrity sha512-IYRsfuK1WRgpdvmaXyKzpBQZGIxkvclKiYC4RYE56BiZWf3gwwcSdZU4a+ZuanF3Ovy6aOfNGa9jxLfYc8fMpg== dependencies: - "@npmcli/arborist" "^6.2.7" + "@npmcli/arborist" "^6.2.8" libnpmhook@^9.0.3: version "9.0.3" @@ -6188,12 +6188,12 @@ libnpmorg@^5.0.3: aproba "^2.0.0" npm-registry-fetch "^14.0.3" -libnpmpack@^5.0.15: - version "5.0.15" - resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-5.0.15.tgz#3061bf25c90fce77e5cdc00373f43a36c1aabca3" - integrity sha512-Y5NhWNL86Tb1IhazPHJ/C2GUgkHDOttarvjIFLH/t+q/ReKSTy1HKlB/c2+AdVHYjWHuVo1rXdnY22SoD8U69A== +libnpmpack@^5.0.16: + version "5.0.16" + resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-5.0.16.tgz#15d170bdadcba044ffad271cda1ac3d86c3d6131" + integrity sha512-gbxL4Amc4eEWoRZaC/XZQdQMHB9e42vrdcLAklbaLmj7gGz94tP9e3/fH3HAegATOgSXUNipGxadXs00HAl4BA== dependencies: - "@npmcli/arborist" "^6.2.7" + "@npmcli/arborist" "^6.2.8" "@npmcli/run-script" "^6.0.0" npm-package-arg "^10.1.0" pacote "^15.0.8" @@ -6442,9 +6442,9 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== lru-cache@^9.0.0: - version "9.0.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.0.3.tgz#8a04f282df5320227bb7215c55df2660d3e4e25b" - integrity sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg== + version "9.1.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.0.tgz#19efafa9d08d1c08eb8efd78876075f0b8b1b07b" + integrity sha512-qFXQEwchrZcMVen2uIDceR8Tii6kCJak5rzDStfEM0qA3YLMswaxIEZO0DhIbJ3aqaJiDjt+3crlplOb0tDtKQ== make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" @@ -6488,7 +6488,7 @@ make-fetch-happen@^10.0.3: socks-proxy-agent "^7.0.0" ssri "^9.0.0" -make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.0.3: +make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.0.tgz#f26b05e89317e960b75fd5e080e40d40f8d7b2a5" integrity sha512-7ChuOzCb1LzdQZrTy0ky6RsCoMYeM+Fh4cY0+4zsJVhNcH5Q3OJojLY1mGkD0xAhWB29lskECVb6ZopofwjldA== @@ -6940,14 +6940,14 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^7.4.2, minimatch@^7.4.3: +minimatch@^7.4.2, minimatch@^7.4.6: version "7.4.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb" integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw== dependencies: brace-expansion "^2.0.1" -minimatch@^8.0.2, minimatch@^8.0.3: +minimatch@^8.0.2: version "8.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229" integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA== @@ -7033,7 +7033,7 @@ minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: dependencies: yallist "^4.0.0" -minipass@^4.0.0, minipass@^4.2.4, minipass@^4.2.5: +minipass@^4.0.0, minipass@^4.2.4, minipass@^4.2.8: version "4.2.8" resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== @@ -7319,7 +7319,7 @@ npm-bundled@^3.0.0: dependencies: npm-normalize-package-bin "^3.0.0" -npm-install-checks@^6.0.0, npm-install-checks@^6.1.0: +npm-install-checks@^6.0.0, npm-install-checks@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-6.1.1.tgz#b459b621634d06546664207fde16810815808db1" integrity sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw== @@ -7366,7 +7366,7 @@ npm-profile@^7.0.1: npm-registry-fetch "^14.0.0" proc-log "^3.0.0" -npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3: +npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3, npm-registry-fetch@^14.0.4: version "14.0.4" resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.4.tgz#43dfa55ce7c0d0c545d625c7a916bab5b95f7038" integrity sha512-pMS2DRkwg+M44ct65zrN/Cr9IHK1+n6weuefAo6Er4lc+/8YBCU0Czq04H3ZiSigluh7pb2rMM5JpgcytctB+Q== @@ -7406,13 +7406,13 @@ npm-user-validate@^2.0.0: integrity sha512-sSWeqAYJ2dUPStJB+AEj0DyLRltr/f6YNcvCA7phkB8/RMLMnVsQ41GMwHo/ERZLYNDsyB2wPm7pZo1mqPOl7Q== npm@^9.5.0: - version "9.6.4" - resolved "https://registry.yarnpkg.com/npm/-/npm-9.6.4.tgz#ff4798c9778badac2fae83078ead9a88680978c2" - integrity sha512-8/Mct0X/w77PmgIpSlXfNIOlrZBfT+8966zLCxOhwi1qZ2Ueyy99uWPSDW6bt2OKw1NzrvHJBSgkzAvn1iWuhw== + version "9.6.5" + resolved "https://registry.yarnpkg.com/npm/-/npm-9.6.5.tgz#272c06687abfcb80d37b47955cb33b9292949dc2" + integrity sha512-0SYs9lz1ND7V3+Lz6EbsnUdZ4OxjQOHbaIKdWd8OgsbZ2hCC2ZeiXMEaBEPEVBaILW+huFA0pJ1YME+52iZI5g== dependencies: "@isaacs/string-locale-compare" "^1.1.0" - "@npmcli/arborist" "^6.2.7" - "@npmcli/config" "^6.1.5" + "@npmcli/arborist" "^6.2.8" + "@npmcli/config" "^6.1.6" "@npmcli/map-workspaces" "^3.0.3" "@npmcli/package-json" "^3.0.0" "@npmcli/run-script" "^6.0.0" @@ -7429,34 +7429,34 @@ npm@^9.5.0: glob "^9.3.2" graceful-fs "^4.2.11" hosted-git-info "^6.1.1" - ini "^3.0.1" + ini "^4.1.0" init-package-json "^5.0.0" is-cidr "^4.0.2" json-parse-even-better-errors "^3.0.0" libnpmaccess "^7.0.2" - libnpmdiff "^5.0.15" - libnpmexec "^5.0.15" - libnpmfund "^4.0.15" + libnpmdiff "^5.0.16" + libnpmexec "^5.0.16" + libnpmfund "^4.0.16" libnpmhook "^9.0.3" libnpmorg "^5.0.3" - libnpmpack "^5.0.15" + libnpmpack "^5.0.16" libnpmpublish "^7.1.3" libnpmsearch "^6.0.2" libnpmteam "^5.0.3" libnpmversion "^4.0.2" - make-fetch-happen "^11.0.3" - minimatch "^7.4.3" - minipass "^4.2.5" + make-fetch-happen "^11.1.0" + minimatch "^7.4.6" + minipass "^4.2.8" minipass-pipeline "^1.2.4" ms "^2.1.2" node-gyp "^9.3.1" nopt "^7.1.0" npm-audit-report "^4.0.0" - npm-install-checks "^6.1.0" + npm-install-checks "^6.1.1" npm-package-arg "^10.1.0" npm-pick-manifest "^8.0.1" npm-profile "^7.0.1" - npm-registry-fetch "^14.0.3" + npm-registry-fetch "^14.0.4" npm-user-validate "^2.0.0" npmlog "^7.0.1" p-map "^4.0.0" @@ -7464,11 +7464,11 @@ npm@^9.5.0: parse-conflict-json "^3.0.1" proc-log "^3.0.0" qrcode-terminal "^0.12.0" - read "^2.0.0" + read "^2.1.0" read-package-json "^6.0.1" read-package-json-fast "^3.0.2" - semver "^7.3.8" - ssri "^10.0.2" + semver "^7.5.0" + ssri "^10.0.3" tar "^6.1.13" text-table "~0.2.0" tiny-relative-date "^1.3.0" @@ -7795,9 +7795,9 @@ p-try@^2.0.0: integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== pacote@^15.0.0, pacote@^15.0.8, pacote@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348" - integrity sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ== + version "15.1.2" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.2.tgz#78b4c1403231fab368c752943f1969c6d8f026bb" + integrity sha512-EAGJrMiIjBTBB6tWGrx9hFJTOo14B3HSAoa/W9SawFEBhUqjxN7qqaFlGVF9jfY/mIri8Mb2xafmkRgWxYXxIQ== dependencies: "@npmcli/git" "^4.0.0" "@npmcli/installed-package-contents" "^2.0.1" @@ -7814,7 +7814,7 @@ pacote@^15.0.0, pacote@^15.0.8, pacote@^15.1.1: promise-retry "^2.0.1" read-package-json "^6.0.0" read-package-json-fast "^3.0.0" - sigstore "^1.0.0" + sigstore "^1.3.0" ssri "^10.0.0" tar "^6.1.11" @@ -8206,10 +8206,10 @@ react-native-gradle-plugin@^0.70.3: resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.70.3.tgz#cbcf0619cbfbddaa9128701aa2d7b4145f9c4fc8" integrity sha512-oOanj84fJEXUg9FoEAQomA8ISG+DVIrTZ3qF7m69VQUJyOGYyDZmPqKcjvRku4KXlEH6hWO9i4ACLzNBh8gC0A== -react-native@0.70.8: - version "0.70.8" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.70.8.tgz#aa9aae8e6291589908db74fe69e0ec1d9a9c5490" - integrity sha512-O3ONJed9W/VEEVWsbZcwyMDhnEvw7v9l9enqWqgbSGLzHfh6HeIGMCNmjz+kRsHnC7AiF47fupWfgYX7hNnhoQ== +react-native@0.70.9: + version "0.70.9" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.70.9.tgz#08a962b72cf2a922e4cd471049eb0b624079dba6" + integrity sha512-Z8K7BayzswIVdmDzF/VS6RG1mCkNJSCgA3NjrXl8YmadCDDuDbEIM5BE+Qiiz8UK5XzNsF9NxH/FVojty/1I4A== dependencies: "@jest/create-cache-key-function" "^27.0.1" "@react-native-community/cli" "9.3.2" @@ -8335,7 +8335,7 @@ read-pkg@^8.0.0: parse-json "^7.0.0" type-fest "^3.8.0" -read@^2.0.0: +read@^2.0.0, read@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/read/-/read-2.1.0.tgz#69409372c54fe3381092bc363a00650b6ac37218" integrity sha512-bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ== @@ -8430,13 +8430,13 @@ regex-not@^1.0.0, regex-not@^1.0.2: safe-regex "^1.1.0" regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== + version "1.5.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + functions-have-names "^1.2.3" regexpu-core@^5.3.1: version "5.3.2" @@ -8529,11 +8529,11 @@ resolve.exports@^2.0.0: integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0: - version "1.22.3" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283" - integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw== + version "1.22.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" + integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== dependencies: - is-core-module "^2.12.0" + is-core-module "^2.11.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -8727,10 +8727,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: - version "7.4.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.4.0.tgz#8481c92feffc531ab1e012a8ffc15bdd3a0f4318" - integrity sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw== +semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" + integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== dependencies: lru-cache "^6.0.0" @@ -8854,14 +8854,14 @@ signale@^1.2.1: figures "^2.0.0" pkg-conf "^2.1.0" -sigstore@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.2.0.tgz#ae5b31dac75c2d31e7873897e2862f0d0b205bce" - integrity sha512-Fr9+W1nkBSIZCkJQR7jDn/zI0UXNsVpp+7mDQkCnZOIxG9p6yNXBx9xntHsfUyYHE55XDkkVV3+rYbrkzAeesA== +sigstore@^1.0.0, sigstore@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.3.2.tgz#2f70ec3e1192911484d9d148ecd9c98345cd172d" + integrity sha512-0KT1DjpVB11FK15ep7BIsZQV6j1jBm4SnXIInbBCRvql6II39IKONOMO+j036sGsArU/+2xqa1NDJwJkic0neA== dependencies: "@sigstore/protobuf-specs" "^0.1.0" make-fetch-happen "^11.0.1" - tuf-js "^1.0.0" + tuf-js "^1.1.3" sisteransi@^1.0.5: version "1.0.5" @@ -9045,7 +9045,7 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -ssri@^10.0.0, ssri@^10.0.1, ssri@^10.0.2: +ssri@^10.0.0, ssri@^10.0.1, ssri@^10.0.3: version "10.0.3" resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.3.tgz#7f83da39058ca1d599d174e9eee4237659710bf4" integrity sha512-lJtX/BFPI/VEtxZmLfeh7pzisIs6micwZ3eruD3+ds9aPsXKlYpwDS2Q7omD6WC42WO9+bnUSzlMmfv8uK8meg== @@ -9517,12 +9517,12 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tuf-js@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.3.tgz#db3aada70fbf91fd9def9ad255645eaf81309f69" - integrity sha512-jGYi5nG/kqgfTFQSdoN6PW9eIn+XRZqdXku+fSwNk6UpWIsWaV7pzAqPgFr85edOPhoyJDyBqCS+DCnHroMvrw== +tuf-js@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.4.tgz#e85a936b16859c7fae23e5f040bc0f7b559b3192" + integrity sha512-Lw2JRM3HTYhEtQJM2Th3aNCPbnXirtWMl065BawwmM2pX6XStH/ZO9e8T2hh0zk/HUa+1i6j+Lv6eDitKTau6A== dependencies: - "@tufjs/models" "1.0.2" + "@tufjs/models" "1.0.3" make-fetch-happen "^11.0.1" type-check@^0.4.0, type-check@~0.4.0: @@ -9809,10 +9809,10 @@ vlq@^1.0.0: resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468" integrity sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w== -walk-up-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" - integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg== +walk-up-path@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-3.0.1.tgz#c8d78d5375b4966c717eb17ada73dbd41490e886" + integrity sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA== walker@^1.0.7, walker@^1.0.8: version "1.0.8"