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

feat: catch runtime error #4605

Merged
merged 9 commits into from Mar 12, 2023
Merged

feat: catch runtime error #4605

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a60e88
feat: catch runtime error
malcolm-kee Oct 16, 2022
178066d
fix: remove xstate
malcolm-kee Nov 27, 2022
d14aaf4
feat: display runtime error stack
malcolm-kee Nov 27, 2022
86c6c46
fix: snapshot
malcolm-kee Nov 27, 2022
5298888
fix: update snapshot
malcolm-kee Dec 2, 2022
10f69a1
fix: remove optional chaining syntax
malcolm-kee Dec 5, 2022
d450375
fix: remove non IE compatible feature
malcolm-kee Dec 6, 2022
cb17c06
fix: handle error event in IE
malcolm-kee Dec 19, 2022
4bc3bda
Merge branch 'master' into feat/overlay-catch-runtime-error
malcolm-kee Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 22 additions & 13 deletions client-src/index.js
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ import webpackHotLog from "webpack/hot/log.js";
import stripAnsi from "./utils/stripAnsi.js";
import parseURL from "./utils/parseURL.js";
import socket from "./socket.js";
import { formatProblem, show, hide } from "./overlay.js";
import { formatProblem, createOverlay } from "./overlay.js";
import { log, logEnabledFeatures, setLogLevel } from "./utils/log.js";
import sendMessage from "./utils/sendMessage.js";
import reloadApp from "./utils/reloadApp.js";
Expand Down Expand Up @@ -115,6 +115,13 @@ self.addEventListener("beforeunload", () => {
status.isUnloading = true;
});

const trustedTypesPolicyName =
typeof options.overlay === "object" && options.overlay.trustedTypesPolicyName;

const overlay = createOverlay({
trustedTypesPolicyName,
});

const onSocketMessage = {
hot() {
if (parsedResourceQuery.hot === "false") {
Expand All @@ -135,7 +142,7 @@ const onSocketMessage = {

// Fixes #1042. overlay doesn't clear if errors are fixed but warnings remain.
if (options.overlay) {
hide();
overlay.send({ type: "DISMISS" });
}

sendMessage("Invalid");
Expand Down Expand Up @@ -192,7 +199,7 @@ const onSocketMessage = {
log.info("Nothing changed.");

if (options.overlay) {
hide();
overlay.send({ type: "DISMISS" });
}

sendMessage("StillOk");
Expand All @@ -201,7 +208,7 @@ const onSocketMessage = {
sendMessage("Ok");

if (options.overlay) {
hide();
overlay.send({ type: "DISMISS" });
}

reloadApp(options, status);
Expand Down Expand Up @@ -256,10 +263,11 @@ const onSocketMessage = {
: options.overlay && options.overlay.warnings;

if (needShowOverlayForWarnings) {
const trustedTypesPolicyName =
typeof options.overlay === "object" &&
options.overlay.trustedTypesPolicyName;
show("warning", warnings, trustedTypesPolicyName || null);
overlay.send({
type: "BUILD_ERROR",
level: "warning",
messages: warnings,
});
}

if (params && params.preventReloading) {
Expand Down Expand Up @@ -292,10 +300,11 @@ const onSocketMessage = {
: options.overlay && options.overlay.errors;

if (needShowOverlayForErrors) {
const trustedTypesPolicyName =
typeof options.overlay === "object" &&
options.overlay.trustedTypesPolicyName;
show("error", errors, trustedTypesPolicyName || null);
overlay.send({
type: "BUILD_ERROR",
level: "error",
messages: errors,
});
}
},
/**
Expand All @@ -308,7 +317,7 @@ const onSocketMessage = {
log.info("Disconnected!");

if (options.overlay) {
hide();
overlay.send({ type: "DISMISS" });
}

sendMessage("Close");
Expand Down