Fix express response pages

douglasmuraoka · douglasmuraoka · commit 04c370df65c4 · 2018-06-05T16:08:20.000-03:00
diff --git a/Parse-Dashboard/app.js b/Parse-Dashboard/app.js
@@ -60,6 +60,15 @@ module.exports = function(config, options) {
   // wait for app to mount in order to get mountpath
   app.on('mount', function() {
     const mountPath = getMount(app.mountpath);
+    let dashboardUrl = '';
+    let loginUrl = '';
+
+    // Reads files from public/bundles folder, looking for dashboard.<hash>.js and login.<hash>.js
+    fs.readdir(path.join(__dirname, 'public', 'bundles'), function(err, items) {
+      dashboardUrl = items.filter(file => file.indexOf('dashboard.') === 0)[0] || 'dashboard.bundle.js';
+      loginUrl = items.filter(file => file.indexOf('login.') === 0)[0] || 'login.bundle.js';
+    });
+
     const users = config.users;
     const useEncryptedPasswords = config.useEncryptedPasswords ? true : false;
     const authInstance = new Authentication(users, useEncryptedPasswords, mountPath);
@@ -180,7 +189,6 @@ module.exports = function(config, options) {
       res.send(`<!DOCTYPE html>
         <head>
           <link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
-          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
           <base href="${mountPath}"/>
           <script>
             PARSE_DASHBOARD_PATH = "${mountPath}";
@@ -192,7 +200,7 @@ module.exports = function(config, options) {
             <div id="login_mount"></div>
             ${errors}
             <script id="csrf" type="application/json">"${req.csrfToken()}"</script>
-            <script src="${mountPath}bundles/login.bundle.js"></script>
+            <script src="${mountPath}bundles/${loginUrl}"></script>
           </body>
         </html>
       `);
@@ -206,7 +214,6 @@ module.exports = function(config, options) {
       res.send(`<!DOCTYPE html>
         <head>
           <link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
-          <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
           <base href="${mountPath}"/>
           <script>
             PARSE_DASHBOARD_PATH = "${mountPath}";
@@ -216,7 +223,7 @@ module.exports = function(config, options) {
           <title>Parse Dashboard</title>
           <body>
             <div id="browser_mount"></div>
-            <script src="${mountPath}bundles/dashboard.bundle.js"></script>
+            <script src="${mountPath}bundles/${dashboardUrl}"></script>
             <script src="https://static.back4app.com/back4app-navigation.bundle.js"></script>
           </body>
         </html>
diff --git a/Parse-Dashboard/index.template.html b/Parse-Dashboard/index.template.html
@@ -4,10 +4,8 @@
     <base href="/"/>
     <script>
         PARSE_DASHBOARD_PATH = "/";
-        console.log('hello')
     </script>
   <script src="https://static.back4app.com/back4app-navigation.bundle.js"></script>
-  <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">-->
 </head>
 <html>
 <title>Parse Dashboard</title>
diff --git a/webpack/build.config.js b/webpack/build.config.js
@@ -6,11 +6,21 @@
  * the root directory of this source tree.
  */
 var configuration = require('./base.config.js');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
+var path = require('path');
 
 configuration.entry = {
   dashboard: './dashboard/index.js',
   login: './login/index.js'
 };
 configuration.output.path = require('path').resolve('./Parse-Dashboard/public/bundles');
+configuration.output.filename = "[name].[chunkhash].js";
+
+configuration.plugins.push(
+  new HtmlWebpackPlugin({
+    template: '../Parse-Dashboard/index.template.html',
+    filename: path.resolve('./Parse-Dashboard/public/index.html')
+  })
+);
 
 module.exports = configuration;
diff --git a/webpack/publish.config.js b/webpack/publish.config.js
@@ -33,7 +33,7 @@ configuration.plugins.push(
   new webpack.optimize.OccurrenceOrderPlugin(),
   new HtmlWebpackPlugin({
     template: '../Parse-Dashboard/index.template.html',
-    filename: path.resolve('./Parse-Dashboard/index.html')
+    filename: path.resolve('./Parse-Dashboard/public/index.html')
   }),
   function() {
     this.plugin('done', function(stats) {
