@maplibre/maplibre-react-native 11.0.0 → 11.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/MapLibreReactNative.podspec +9 -1
- package/android/src/main/java/org/maplibre/reactnative/components/sources/geojsonsource/MLRNGeoJSONSourceManager.kt +4 -15
- package/lib/commonjs/plugin/ios.js +1 -26
- package/lib/commonjs/plugin/ios.js.map +1 -1
- package/lib/commonjs/plugin/withMapLibre.js +0 -1
- package/lib/commonjs/plugin/withMapLibre.js.map +1 -1
- package/lib/module/plugin/ios.js +0 -25
- package/lib/module/plugin/ios.js.map +1 -1
- package/lib/module/plugin/withMapLibre.js +0 -1
- package/lib/module/plugin/withMapLibre.js.map +1 -1
- package/lib/typescript/commonjs/plugin/ios.d.ts +0 -1
- package/lib/typescript/commonjs/plugin/ios.d.ts.map +1 -1
- package/lib/typescript/commonjs/plugin/withMapLibre.d.ts.map +1 -1
- package/lib/typescript/module/plugin/ios.d.ts +0 -1
- package/lib/typescript/module/plugin/ios.d.ts.map +1 -1
- package/lib/typescript/module/plugin/withMapLibre.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/plugin/ios.ts +0 -42
- package/src/plugin/withMapLibre.ts +0 -1
|
@@ -38,9 +38,10 @@ def $MLRN.post_install(installer)
|
|
|
38
38
|
spm_spec = $MLRN_SPM_SPEC
|
|
39
39
|
|
|
40
40
|
project = installer.pods_project
|
|
41
|
+
mlrn_target = project.targets.find { |t| t.name == "MapLibreReactNative" }
|
|
41
42
|
self._add_spm_to_target(
|
|
42
43
|
project,
|
|
43
|
-
|
|
44
|
+
mlrn_target,
|
|
44
45
|
spm_spec[:url],
|
|
45
46
|
spm_spec[:requirement],
|
|
46
47
|
spm_spec[:product_name]
|
|
@@ -56,6 +57,13 @@ def $MLRN.post_install(installer)
|
|
|
56
57
|
spm_spec[:requirement],
|
|
57
58
|
spm_spec[:product_name]
|
|
58
59
|
)
|
|
60
|
+
|
|
61
|
+
phase_name = "[MapLibre React Native] Remove MapLibre.xcframework-ios.signature"
|
|
62
|
+
unless user_target.shell_script_build_phases.any? { |p| p.name == phase_name }
|
|
63
|
+
phase = user_target.new_shell_script_build_phase(phase_name)
|
|
64
|
+
phase.shell_script = 'rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature"'
|
|
65
|
+
phase.always_out_of_date = "1"
|
|
66
|
+
end
|
|
59
67
|
end
|
|
60
68
|
end
|
|
61
69
|
end
|
|
@@ -10,12 +10,9 @@ import com.facebook.react.uimanager.ViewManagerDelegate
|
|
|
10
10
|
import com.facebook.react.uimanager.annotations.ReactProp
|
|
11
11
|
import com.facebook.react.viewmanagers.MLRNGeoJSONSourceManagerDelegate
|
|
12
12
|
import com.facebook.react.viewmanagers.MLRNGeoJSONSourceManagerInterface
|
|
13
|
-
import org.json.JSONException
|
|
14
|
-
import org.json.JSONObject
|
|
15
13
|
import org.maplibre.android.style.expressions.Expression
|
|
16
14
|
import org.maplibre.reactnative.components.sources.MLRNSourceManager
|
|
17
15
|
import org.maplibre.reactnative.utils.ExpressionParser
|
|
18
|
-
import java.net.MalformedURLException
|
|
19
16
|
import java.net.URI
|
|
20
17
|
import java.util.AbstractMap
|
|
21
18
|
|
|
@@ -38,28 +35,20 @@ class MLRNGeoJSONSourceManager(
|
|
|
38
35
|
|
|
39
36
|
override fun createViewInstance(themedReactContext: ThemedReactContext): MLRNGeoJSONSource = MLRNGeoJSONSource(themedReactContext)
|
|
40
37
|
|
|
41
|
-
fun isJSONValid(test: String): Boolean {
|
|
42
|
-
try {
|
|
43
|
-
JSONObject(test)
|
|
44
|
-
} catch (_: JSONException) {
|
|
45
|
-
return false
|
|
46
|
-
}
|
|
47
|
-
return true
|
|
48
|
-
}
|
|
49
|
-
|
|
50
38
|
@ReactProp(name = "data")
|
|
51
39
|
override fun setData(
|
|
52
40
|
source: MLRNGeoJSONSource,
|
|
53
41
|
value: String?,
|
|
54
42
|
) {
|
|
55
43
|
if (value != null) {
|
|
56
|
-
|
|
44
|
+
val trimmed = value.trimStart()
|
|
45
|
+
if (trimmed.startsWith("{")) {
|
|
57
46
|
source.setGeoJson(value)
|
|
58
47
|
} else {
|
|
59
48
|
try {
|
|
60
49
|
source.setURI(URI(value))
|
|
61
|
-
} catch (error:
|
|
62
|
-
Log.w(LOG_TAG, error.localizedMessage)
|
|
50
|
+
} catch (error: Exception) {
|
|
51
|
+
Log.w(LOG_TAG, "Invalid GeoJSON data or URL: ${error.localizedMessage}")
|
|
63
52
|
}
|
|
64
53
|
}
|
|
65
54
|
}
|
|
@@ -63,31 +63,6 @@ const withPodfileGlobalVariables = (config, props) => {
|
|
|
63
63
|
return c;
|
|
64
64
|
});
|
|
65
65
|
};
|
|
66
|
-
exports.withPodfileGlobalVariables = withPodfileGlobalVariables;
|
|
67
|
-
const withoutSignatures = config => {
|
|
68
|
-
return (0, _configPlugins.withXcodeProject)(config, c => {
|
|
69
|
-
const project = c.modResults;
|
|
70
|
-
const targetName = c.modRequest.projectName;
|
|
71
|
-
const phaseName = "[MapLibre React Native] Remove MapLibre.xcframework-ios.signature";
|
|
72
|
-
const nativeTargetId = project.findTargetKey(targetName ?? "");
|
|
73
|
-
if (!nativeTargetId) {
|
|
74
|
-
console.warn(`[MapLibre React Native] Could not find target "${targetName}" to add build phase script`);
|
|
75
|
-
return c;
|
|
76
|
-
}
|
|
77
|
-
const buildPhases = project.pbxNativeTargetSection()[nativeTargetId]?.buildPhases ?? [];
|
|
78
|
-
const alreadyExists = buildPhases.some(phase => phase.comment === phaseName);
|
|
79
|
-
if (!alreadyExists) {
|
|
80
|
-
project.addBuildPhase([], "PBXShellScriptBuildPhase", phaseName, nativeTargetId, {
|
|
81
|
-
shellPath: "/bin/sh",
|
|
82
|
-
shellScript: `
|
|
83
|
-
echo "[MapLibre React Native] Remove MapLibre.xcframework-ios.signature";
|
|
84
|
-
rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
|
|
85
|
-
`
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
return c;
|
|
89
|
-
});
|
|
90
|
-
};
|
|
91
66
|
|
|
92
67
|
/**
|
|
93
68
|
* Set the Debug Information Format to DWARF with dSYM File during EAS Build for
|
|
@@ -101,6 +76,7 @@ const withoutSignatures = config => {
|
|
|
101
76
|
* }
|
|
102
77
|
* ```
|
|
103
78
|
*/
|
|
79
|
+
exports.withPodfileGlobalVariables = withPodfileGlobalVariables;
|
|
104
80
|
const withDwarfDsym = config => {
|
|
105
81
|
return (0, _configPlugins.withXcodeProject)(config, c => {
|
|
106
82
|
c.modResults.debugInformationFormat = "dwarf-with-dsym";
|
|
@@ -110,7 +86,6 @@ const withDwarfDsym = config => {
|
|
|
110
86
|
const ios = exports.ios = {
|
|
111
87
|
withPodfilePostInstall,
|
|
112
88
|
withPodfileGlobalVariables,
|
|
113
|
-
withoutSignatures,
|
|
114
89
|
withDwarfDsym
|
|
115
90
|
};
|
|
116
91
|
//# sourceMappingURL=ios.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_configPlugins","require","_generateCode","TAG_PREFIX","applyPodfilePostInstall","contents","result","mergeContents","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","withPodfile","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","removeGeneratedContents","exports","withPodfileGlobalVariables","
|
|
1
|
+
{"version":3,"names":["_configPlugins","require","_generateCode","TAG_PREFIX","applyPodfilePostInstall","contents","result","mergeContents","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","withPodfile","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","removeGeneratedContents","exports","withPodfileGlobalVariables","withDwarfDsym","withXcodeProject","debugInformationFormat"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -21,7 +21,6 @@ const withMapLibre = (config, props) => {
|
|
|
21
21
|
|
|
22
22
|
// iOS
|
|
23
23
|
config = _ios.ios.withDwarfDsym(config);
|
|
24
|
-
config = _ios.ios.withoutSignatures(config);
|
|
25
24
|
config = _ios.ios.withPodfileGlobalVariables(config, props);
|
|
26
25
|
config = _ios.ios.withPodfilePostInstall(config);
|
|
27
26
|
return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_configPlugins","require","_android","_ios","pkg","name","withMapLibre","config","props","android","withGradleProperties","ios","withDwarfDsym","
|
|
1
|
+
{"version":3,"names":["_configPlugins","require","_android","_ios","pkg","name","withMapLibre","config","props","android","withGradleProperties","ios","withDwarfDsym","withPodfileGlobalVariables","withPodfilePostInstall","_default","exports","default","createRunOncePlugin","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AAEA,IAAIG,GAAuC,GAAG;EAC5CC,IAAI,EAAE;AACR,CAAC;AACD,IAAI;EACFD,GAAG,GAAGH,OAAO,CAAC,8CAA8C,CAAC;AAC/D,CAAC,CAAC,MAAM;EACN;AAAA;AAGF,MAAMK,YAA+C,GAAGA,CAACC,MAAM,EAAEC,KAAK,KAAK;EACzE;EACAD,MAAM,GAAGE,gBAAO,CAACC,oBAAoB,CAACH,MAAM,EAAEC,KAAK,CAAC;;EAEpD;EACAD,MAAM,GAAGI,QAAG,CAACC,aAAa,CAACL,MAAM,CAAC;EAClCA,MAAM,GAAGI,QAAG,CAACE,0BAA0B,CAACN,MAAM,EAAEC,KAAK,CAAC;EACtDD,MAAM,GAAGI,QAAG,CAACG,sBAAsB,CAACP,MAAM,CAAC;EAE3C,OAAOA,MAAM;AACf,CAAC;AAAC,IAAAQ,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa,IAAAC,kCAAmB,EAACZ,YAAY,EAAEF,GAAG,CAACC,IAAI,EAAED,GAAG,CAACe,OAAO,CAAC","ignoreList":[]}
|
package/lib/module/plugin/ios.js
CHANGED
|
@@ -56,30 +56,6 @@ export const withPodfileGlobalVariables = (config, props) => {
|
|
|
56
56
|
return c;
|
|
57
57
|
});
|
|
58
58
|
};
|
|
59
|
-
const withoutSignatures = config => {
|
|
60
|
-
return withXcodeProject(config, c => {
|
|
61
|
-
const project = c.modResults;
|
|
62
|
-
const targetName = c.modRequest.projectName;
|
|
63
|
-
const phaseName = "[MapLibre React Native] Remove MapLibre.xcframework-ios.signature";
|
|
64
|
-
const nativeTargetId = project.findTargetKey(targetName ?? "");
|
|
65
|
-
if (!nativeTargetId) {
|
|
66
|
-
console.warn(`[MapLibre React Native] Could not find target "${targetName}" to add build phase script`);
|
|
67
|
-
return c;
|
|
68
|
-
}
|
|
69
|
-
const buildPhases = project.pbxNativeTargetSection()[nativeTargetId]?.buildPhases ?? [];
|
|
70
|
-
const alreadyExists = buildPhases.some(phase => phase.comment === phaseName);
|
|
71
|
-
if (!alreadyExists) {
|
|
72
|
-
project.addBuildPhase([], "PBXShellScriptBuildPhase", phaseName, nativeTargetId, {
|
|
73
|
-
shellPath: "/bin/sh",
|
|
74
|
-
shellScript: `
|
|
75
|
-
echo "[MapLibre React Native] Remove MapLibre.xcframework-ios.signature";
|
|
76
|
-
rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
|
|
77
|
-
`
|
|
78
|
-
});
|
|
79
|
-
}
|
|
80
|
-
return c;
|
|
81
|
-
});
|
|
82
|
-
};
|
|
83
59
|
|
|
84
60
|
/**
|
|
85
61
|
* Set the Debug Information Format to DWARF with dSYM File during EAS Build for
|
|
@@ -102,7 +78,6 @@ const withDwarfDsym = config => {
|
|
|
102
78
|
export const ios = {
|
|
103
79
|
withPodfilePostInstall,
|
|
104
80
|
withPodfileGlobalVariables,
|
|
105
|
-
withoutSignatures,
|
|
106
81
|
withDwarfDsym
|
|
107
82
|
};
|
|
108
83
|
//# sourceMappingURL=ios.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["withPodfile","withXcodeProject","mergeContents","removeGeneratedContents","TAG_PREFIX","applyPodfilePostInstall","contents","result","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","withPodfileGlobalVariables","
|
|
1
|
+
{"version":3,"names":["withPodfile","withXcodeProject","mergeContents","removeGeneratedContents","TAG_PREFIX","applyPodfilePostInstall","contents","result","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","withPodfileGlobalVariables","withDwarfDsym","debugInformationFormat"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":";;AAAA,SAEEA,WAAW,EACXC,gBAAgB,QACX,sBAAsB;AAC7B,SACEC,aAAa,EACbC,uBAAuB,QAClB,+CAA+C;AAItD,MAAMC,UAAU,GAAG,iCAAiC;;AAEpD;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,QAAgB,EAAU;EAChE,MAAMC,MAAM,GAAGL,aAAa,CAAC;IAC3BM,GAAG,EAAE,GAAGJ,UAAU,eAAe;IACjCK,GAAG,EAAEH,QAAQ;IACbI,MAAM,EAAE,mCAAmC;IAC3CC,MAAM,EAAE,+BAA+B;IACvCC,MAAM,EAAE,CAAC;IACTC,OAAO,EAAE;EACX,CAAC,CAAC;EAEF,IAAIN,MAAM,CAACO,QAAQ,IAAIP,MAAM,CAACQ,QAAQ,EAAE;IACtC,OAAOR,MAAM,CAACD,QAAQ;EACxB;EAEA,OAAOA,QAAQ;AACjB;AAEA,MAAMU,sBAAoC,GAAIC,MAAM,IAAK;EACvD,OAAOjB,WAAW,CAACiB,MAAM,EAAGC,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAACb,QAAQ,GAAGD,uBAAuB,CAACa,CAAC,CAACC,UAAU,CAACb,QAAQ,CAAC;IAEtE,OAAOY,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAME,2BAA2B,GAAGA,CACzCd,QAAgB,EAChBe,KAA0B,KACf;EACX,MAAMb,GAAG,GAAG,GAAGJ,UAAU,mBAAmB;EAE5C,MAAMkB,eAAe,GAAG,EAAE;EAE1B,IAAID,KAAK,EAAEE,GAAG,EAAEC,aAAa,EAAE;IAC7BF,eAAe,CAACG,IAAI,CAAC,2BAA2BJ,KAAK,CAACE,GAAG,CAACC,aAAa,GAAG,CAAC;EAC7E;EAEA,IAAIH,KAAK,EAAEE,GAAG,EAAEG,OAAO,EAAE;IACvBJ,eAAe,CAACG,IAAI,CAAC,oBAAoBJ,KAAK,CAACE,GAAG,CAACG,OAAO,EAAE,CAAC;EAC/D;EAEA,IAAIJ,eAAe,CAACK,MAAM,GAAG,CAAC,EAAE;IAC9B,OAAOzB,aAAa,CAAC;MACnBM,GAAG;MACHC,GAAG,EAAEH,QAAQ;MACbI,MAAM,EAAEY,eAAe,CAACM,IAAI,CAAC,IAAI,CAAC;MAClCjB,MAAM,EAAE,cAAc;MACtBC,MAAM,EAAE,CAAC;MACTC,OAAO,EAAE;IACX,CAAC,CAAC,CAACP,QAAQ;EACb;EAEA,MAAMuB,QAAQ,GAAG1B,uBAAuB,CAACG,QAAQ,EAAEE,GAAG,CAAC;EAEvD,OAAOqB,QAAQ,IAAIvB,QAAQ;AAC7B,CAAC;AAED,OAAO,MAAMwB,0BAA6D,GAAGA,CAC3Eb,MAAM,EACNI,KAAK,KACF;EACH,OAAOrB,WAAW,CAACiB,MAAM,EAAGC,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAACb,QAAQ,GAAGc,2BAA2B,CACjDF,CAAC,CAACC,UAAU,CAACb,QAAQ,EACrBe,KACF,CAAC;IAED,OAAOH,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMa,aAA2B,GAAId,MAAM,IAAK;EAC9C,OAAOhB,gBAAgB,CAACgB,MAAM,EAAGC,CAAC,IAAK;IACrCA,CAAC,CAACC,UAAU,CAACa,sBAAsB,GAAG,iBAAiB;IAEvD,OAAOd,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMK,GAAG,GAAG;EACjBP,sBAAsB;EACtBc,0BAA0B;EAC1BC;AACF,CAAC","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createRunOncePlugin","android","ios","pkg","name","require","withMapLibre","config","props","withGradleProperties","withDwarfDsym","
|
|
1
|
+
{"version":3,"names":["createRunOncePlugin","android","ios","pkg","name","require","withMapLibre","config","props","withGradleProperties","withDwarfDsym","withPodfileGlobalVariables","withPodfilePostInstall","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":";;AAAA,SAA4BA,mBAAmB,QAAQ,sBAAsB;AAG7E,SAASC,OAAO,QAAQ,cAAW;AACnC,SAASC,GAAG,QAAQ,UAAO;AAE3B,IAAIC,GAAuC,GAAG;EAC5CC,IAAI,EAAE;AACR,CAAC;AACD,IAAI;EACFD,GAAG,GAAGE,OAAO,CAAC,8CAA8C,CAAC;AAC/D,CAAC,CAAC,MAAM;EACN;AAAA;AAGF,MAAMC,YAA+C,GAAGA,CAACC,MAAM,EAAEC,KAAK,KAAK;EACzE;EACAD,MAAM,GAAGN,OAAO,CAACQ,oBAAoB,CAACF,MAAM,EAAEC,KAAK,CAAC;;EAEpD;EACAD,MAAM,GAAGL,GAAG,CAACQ,aAAa,CAACH,MAAM,CAAC;EAClCA,MAAM,GAAGL,GAAG,CAACS,0BAA0B,CAACJ,MAAM,EAAEC,KAAK,CAAC;EACtDD,MAAM,GAAGL,GAAG,CAACU,sBAAsB,CAACL,MAAM,CAAC;EAE3C,OAAOA,MAAM;AACf,CAAC;AAED,eAAeP,mBAAmB,CAACM,YAAY,EAAEH,GAAG,CAACC,IAAI,EAAED,GAAG,CAACU,OAAO,CAAC","ignoreList":[]}
|
|
@@ -10,7 +10,6 @@ export declare const withPodfileGlobalVariables: ConfigPlugin<MapLibrePluginProp
|
|
|
10
10
|
export declare const ios: {
|
|
11
11
|
withPodfilePostInstall: ConfigPlugin;
|
|
12
12
|
withPodfileGlobalVariables: ConfigPlugin<MapLibrePluginProps>;
|
|
13
|
-
withoutSignatures: ConfigPlugin;
|
|
14
13
|
withDwarfDsym: ConfigPlugin;
|
|
15
14
|
};
|
|
16
15
|
//# sourceMappingURL=ios.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;
|
|
1
|
+
{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAsBF,eAAO,MAAM,GAAG;;;;CAIf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAE9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;
|
|
1
|
+
{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAE9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;AAyBjE,wBAAwE"}
|
|
@@ -10,7 +10,6 @@ export declare const withPodfileGlobalVariables: ConfigPlugin<MapLibrePluginProp
|
|
|
10
10
|
export declare const ios: {
|
|
11
11
|
withPodfilePostInstall: ConfigPlugin;
|
|
12
12
|
withPodfileGlobalVariables: ConfigPlugin<MapLibrePluginProps>;
|
|
13
|
-
withoutSignatures: ConfigPlugin;
|
|
14
13
|
withDwarfDsym: ConfigPlugin;
|
|
15
14
|
};
|
|
16
15
|
//# sourceMappingURL=ios.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;
|
|
1
|
+
{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAsBF,eAAO,MAAM,GAAG;;;;CAIf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAE9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;
|
|
1
|
+
{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAE9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;AAyBjE,wBAAwE"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@maplibre/maplibre-react-native",
|
|
3
3
|
"description": "React Native library for creating maps with MapLibre Native for Android & iOS",
|
|
4
|
-
"version": "11.0.
|
|
4
|
+
"version": "11.0.2",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
7
7
|
"provenance": true
|
|
@@ -156,10 +156,10 @@
|
|
|
156
156
|
},
|
|
157
157
|
"dependencies": {
|
|
158
158
|
"@maplibre/maplibre-gl-style-spec": "24.8.1",
|
|
159
|
-
"@turf/distance": "^7.
|
|
160
|
-
"@turf/helpers": "^7.
|
|
161
|
-
"@turf/length": "^7.
|
|
162
|
-
"@turf/nearest-point-on-line": "^7.
|
|
159
|
+
"@turf/distance": "^7.3.5",
|
|
160
|
+
"@turf/helpers": "^7.3.5",
|
|
161
|
+
"@turf/length": "^7.3.5",
|
|
162
|
+
"@turf/nearest-point-on-line": "^7.3.5"
|
|
163
163
|
},
|
|
164
164
|
"devDependencies": {
|
|
165
165
|
"@expo/config-plugins": "~55.0.4",
|
|
@@ -176,7 +176,7 @@
|
|
|
176
176
|
"eslint": "^8.57.1",
|
|
177
177
|
"eslint-config-universe": "15.0.3",
|
|
178
178
|
"jest": "^29.7.0",
|
|
179
|
-
"prettier": "3.8.
|
|
179
|
+
"prettier": "3.8.3",
|
|
180
180
|
"react": "19.2.3",
|
|
181
181
|
"react-native": "0.84.1",
|
|
182
182
|
"react-native-builder-bob": "0.40.17",
|
package/src/plugin/ios.ts
CHANGED
|
@@ -87,47 +87,6 @@ export const withPodfileGlobalVariables: ConfigPlugin<MapLibrePluginProps> = (
|
|
|
87
87
|
});
|
|
88
88
|
};
|
|
89
89
|
|
|
90
|
-
const withoutSignatures: ConfigPlugin = (config) => {
|
|
91
|
-
return withXcodeProject(config, (c) => {
|
|
92
|
-
const project = c.modResults;
|
|
93
|
-
const targetName = c.modRequest.projectName;
|
|
94
|
-
const phaseName =
|
|
95
|
-
"[MapLibre React Native] Remove MapLibre.xcframework-ios.signature";
|
|
96
|
-
|
|
97
|
-
const nativeTargetId = project.findTargetKey(targetName ?? "");
|
|
98
|
-
if (!nativeTargetId) {
|
|
99
|
-
console.warn(
|
|
100
|
-
`[MapLibre React Native] Could not find target "${targetName}" to add build phase script`,
|
|
101
|
-
);
|
|
102
|
-
return c;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
const buildPhases =
|
|
106
|
-
project.pbxNativeTargetSection()[nativeTargetId]?.buildPhases ?? [];
|
|
107
|
-
const alreadyExists = buildPhases.some(
|
|
108
|
-
(phase: { comment?: string }) => phase.comment === phaseName,
|
|
109
|
-
);
|
|
110
|
-
|
|
111
|
-
if (!alreadyExists) {
|
|
112
|
-
project.addBuildPhase(
|
|
113
|
-
[],
|
|
114
|
-
"PBXShellScriptBuildPhase",
|
|
115
|
-
phaseName,
|
|
116
|
-
nativeTargetId,
|
|
117
|
-
{
|
|
118
|
-
shellPath: "/bin/sh",
|
|
119
|
-
shellScript: `
|
|
120
|
-
echo "[MapLibre React Native] Remove MapLibre.xcframework-ios.signature";
|
|
121
|
-
rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
|
|
122
|
-
`,
|
|
123
|
-
},
|
|
124
|
-
);
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
return c;
|
|
128
|
-
});
|
|
129
|
-
};
|
|
130
|
-
|
|
131
90
|
/**
|
|
132
91
|
* Set the Debug Information Format to DWARF with dSYM File during EAS Build for
|
|
133
92
|
* Managed App https://github.com/expo/eas-cli/issues/968
|
|
@@ -151,6 +110,5 @@ const withDwarfDsym: ConfigPlugin = (config) => {
|
|
|
151
110
|
export const ios = {
|
|
152
111
|
withPodfilePostInstall,
|
|
153
112
|
withPodfileGlobalVariables,
|
|
154
|
-
withoutSignatures,
|
|
155
113
|
withDwarfDsym,
|
|
156
114
|
};
|
|
@@ -19,7 +19,6 @@ const withMapLibre: ConfigPlugin<MapLibrePluginProps> = (config, props) => {
|
|
|
19
19
|
|
|
20
20
|
// iOS
|
|
21
21
|
config = ios.withDwarfDsym(config);
|
|
22
|
-
config = ios.withoutSignatures(config);
|
|
23
22
|
config = ios.withPodfileGlobalVariables(config, props);
|
|
24
23
|
config = ios.withPodfilePostInstall(config);
|
|
25
24
|
|