Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix: vue 3 log warning causes error on iOS #6993

Merged
merged 10 commits into from
Mar 22, 2024
Merged

fix: vue 3 log warning causes error on iOS #6993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f804c7b
fix #6615
ciekawy Oct 14, 2023
d73bad5
Merge branch 'main' into serializeConsoleMessage-fix
markemer Jan 18, 2024
aa85159
Merge branch 'main' into serializeConsoleMessage-fix
markemer Feb 5, 2024
4f0d283
Merge branch 'main' into serializeConsoleMessage-fix
ciekawy Mar 7, 2024
ef6eda9
fmt
ciekawy Mar 7, 2024
434f9a4
return empty string for non serializable objects
ciekawy Mar 7, 2024
cd64d34
Merge branch 'main' into serializeConsoleMessage-fix
ciekawy Mar 8, 2024
1435ff1
Merge branch 'main' into serializeConsoleMessage-fix
jcesarmobile Mar 15, 2024
bda6d7c
Merge branch 'main' into serializeConsoleMessage-fix
ciekawy Mar 20, 2024
a1f79f6
Merge branch 'main' into serializeConsoleMessage-fix
markemer Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions android/capacitor/src/main/assets/native-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,15 +375,15 @@ var nativeBridge = (function (exports) {
typeof c.dir === 'function');
};
const serializeConsoleMessage = (msg) => {
if (typeof msg === 'object') {
try {
try {
if (typeof msg === 'object') {
msg = JSON.stringify(msg);
}
catch (e) {
// ignore
}
return String(msg);
}
catch (e) {
return '';
}
return String(msg);
};
const platform = getPlatformId(win);
if (platform == 'android' || platform == 'ios') {
Expand Down
11 changes: 5 additions & 6 deletions core/native-bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,15 +403,14 @@ const initBridge = (w: any): void => {
};

const serializeConsoleMessage = (msg: any): string => {
if (typeof msg === 'object') {
try {
try {
if (typeof msg === 'object') {
msg = JSON.stringify(msg);
} catch (e) {
// ignore
}
return String(msg);
} catch (e) {
return '';
}

return String(msg);
};

const platform = getPlatformId(win);
Expand Down
12 changes: 6 additions & 6 deletions ios/Capacitor/Capacitor/assets/native-bridge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,15 +375,15 @@ var nativeBridge = (function (exports) {
typeof c.dir === 'function');
};
const serializeConsoleMessage = (msg) => {
if (typeof msg === 'object') {
try {
try {
if (typeof msg === 'object') {
msg = JSON.stringify(msg);
}
catch (e) {
// ignore
}
return String(msg);
}
catch (e) {
return '';
}
return String(msg);
};
const platform = getPlatformId(win);
if (platform == 'android' || platform == 'ios') {
Expand Down