From b87e0b32ac3cc5a02b2254a1fc1d41aed731e19c Mon Sep 17 00:00:00 2001
From: Grace Guo <grace.guo@airbnb.com>
Date: Tue, 17 Aug 2021 16:12:05 -0700
Subject: [PATCH] refactor: rearrange dashboard page js bundles (#16285)

---
 superset-frontend/src/dashboard/containers/DashboardPage.tsx | 2 ++
 superset-frontend/src/views/App.tsx                          | 2 --
 superset/templates/superset/partials/asset_bundle.html       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/dashboard/containers/DashboardPage.tsx b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
index cc39b3b212..d98e6ed7a1 100644
--- a/superset-frontend/src/dashboard/containers/DashboardPage.tsx
+++ b/superset-frontend/src/dashboard/containers/DashboardPage.tsx
@@ -30,7 +30,9 @@ import {
 import { hydrateDashboard } from 'src/dashboard/actions/hydrate';
 import { setDatasources } from 'src/dashboard/actions/datasources';
 import injectCustomCss from 'src/dashboard/util/injectCustomCss';
+import setupPlugins from 'src/setup/setupPlugins';
 
+setupPlugins();
 const DashboardContainer = React.lazy(
   () =>
     import(
diff --git a/superset-frontend/src/views/App.tsx b/superset-frontend/src/views/App.tsx
index e36dd80398..445a87527f 100644
--- a/superset-frontend/src/views/App.tsx
+++ b/superset-frontend/src/views/App.tsx
@@ -32,13 +32,11 @@ import Menu from 'src/components/Menu/Menu';
 import FlashProvider from 'src/components/FlashProvider';
 import { theme } from 'src/preamble';
 import ToastPresenter from 'src/messageToasts/containers/ToastPresenter';
-import setupPlugins from 'src/setup/setupPlugins';
 import setupApp from 'src/setup/setupApp';
 import { routes, isFrontendRoute } from 'src/views/routes';
 import { store } from './store';
 
 setupApp();
-setupPlugins();
 
 const container = document.getElementById('app');
 const bootstrap = JSON.parse(container?.getAttribute('data-bootstrap') ?? '{}');
diff --git a/superset/templates/superset/partials/asset_bundle.html b/superset/templates/superset/partials/asset_bundle.html
index 281ac74c7d..066c9f64e6 100644
--- a/superset/templates/superset/partials/asset_bundle.html
+++ b/superset/templates/superset/partials/asset_bundle.html
@@ -21,7 +21,7 @@
      with development version #}
   <!-- Bundle js {{ filename }} START -->
   {% for entry in js_manifest(filename) %}
-    <script src="{{ entry }}"></script>
+    <script src="{{ entry }}" async></script>
   {% endfor %}
   <!-- Bundle js {{ filename }} END -->
 {% endmacro %}