Merge pull request #62 from back4app/parse-sdk-back4app

paivaric · web-flow · commit c23f7671eecc · 2018-06-06T14:48:05.000-03:00
Parse sdk back4app
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,10 @@
 .DS_Store
 node_modules/
 bundles/
+PIG/index.html
 PIG/bundles/
+production/
+Parse-Dashboard/public/index.html
 Parse-Dashboard/public/bundles/
 npm-debug.log
 .eslintcache
diff --git a/PIG/index.template.html b/PIG/index.template.html
@@ -3,6 +3,5 @@
   <title>PIG Component Explorer</title>
   <body>
     <div id="browser_mount"></div>
-    <script src="/bundles/PIG.bundle.js"></script>
   </body>
 </html>
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,16 +4,13 @@
     <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>
 <body>
 <div id="browser_mount"></div>
-<script src="/bundles/dashboard.bundle.js"></script>
 <script type="text/javascript">
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
                 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "cookie-session": "^2.0.0-alpha.1",
     "csurf": "^1.9.0",
     "express": "^4.13.4",
+    "html-webpack-plugin": "^3.2.0",
     "jquery": "^3.2.1",
     "json-file-plus": "^3.2.0",
     "material-design-iconic-font": "^2.2.0",
@@ -75,7 +76,7 @@
     "js-beautify": "~1.6.14",
     "marked": "^0.3.5",
     "node-sass": "^4.5.3",
-    "parse": "1.9.2",
+    "parse": "git+https://github.com/back4app/Parse-SDK-JS.git",
     "prismjs": "~1.6.0",
     "react": "^15.0.1",
     "react-addons-test-utils": "^15.0.1",
diff --git a/webpack/PIG.config.js b/webpack/PIG.config.js
@@ -6,8 +6,18 @@
  * 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 = {PIG: './parse-interface-guide/index.js'};
 configuration.output.path = require('path').resolve('./PIG/bundles');
+configuration.output.filename = "[name].[chunkhash].js";
+
+configuration.plugins.push(
+  new HtmlWebpackPlugin({
+    template: '../PIG/index.template.html',
+    filename: path.resolve('./PIG/index.html')
+  }),
+);
 
 module.exports = configuration;
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
@@ -6,12 +6,15 @@
  * 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.path = path.resolve('./Parse-Dashboard/public/bundles');
+configuration.output.filename = "[name].[chunkhash].js";
 
 var webpack = require('webpack');
 
@@ -28,6 +31,10 @@ configuration.plugins.push(
     }
   }),
   new webpack.optimize.OccurrenceOrderPlugin(),
+  new HtmlWebpackPlugin({
+    template: '../Parse-Dashboard/index.template.html',
+    filename: path.resolve('./Parse-Dashboard/public/index.html')
+  }),
   function() {
     this.plugin('done', function(stats) {
       if (stats.compilation.errors && stats.compilation.errors.length) {
