Merge remote-tracking branch 'origin/master' into next

# Conflicts:
#	package-lock.json
#	src/public/app/services/note_content_renderer.js
#	src/public/stylesheets/style.css
#	src/routes/api/files.js
#	src/routes/routes.js

src/public/app/services/bundle.js

@@ -64,13 +64,12 @@ async function getWidgetBundlesByParent() {
 
         try {
             widget = await executeBundle(bundle);
+            widgetsByParent.add(widget);
         }
         catch (e) {
             logError("Widget initialization failed: ", e);
             continue;
         }
-
-        widgetsByParent.add(widget);
     }
 
     return widgetsByParent;