Merge pull request #45 from ZBoxApp/bundle_with_no_cache

add config to generate html and bundle dynamically, bundle with a sim…

Merge pull request #45 from ZBoxApp/bundle_with_no_cache
add config to generate html and bundle dynamically, bundle with a sim…
c82ac91a · Patricio Bruna · e175ee70 · cf1a0d3f · c82ac91a · c82ac91a
Commit c82ac91a authored May 18, 2016 by Patricio Bruna
5 changed files
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
    "js-powerdns": "ZBoxApp/js-powerdns"
  },
  "devDependencies": {
+    "assets-webpack-plugin": "^3.4.0",
    "babel-cli": "^6.7.5",
    "babel-eslint": "6.0.4",
    "babel-loader": "6.2.4",
@@ -51,6 +52,7 @@
    "extract-text-webpack-plugin": "1.0.1",
    "file-loader": "0.8.5",
    "html-loader": "0.4.3",
+    "html-webpack-plugin": "^2.17.0",
    "http-proxy": "^1.13.2",
    "imports-loader": "0.6.5",
    "json-loader": "0.5.4",

--- a/path.json
+++ b/path.json
+module.exports = {"main":{"js":"/244695bundle.js"}}
\ No newline at end of file
--- a/src/components/distribution/distribution_lists.jsx
+++ b/src/components/distribution/distribution_lists.jsx
@@ -57,7 +57,6 @@ export default class DistributionLists extends React.Component {
            if (domain) {
                response.domain = domain;
                const dl = DomainStore.getDistributionListById(id, domain);
-                console.log(domain, dl);
                response.distributionsList = dl;

                dl.getOwners((error, owners) => {
@@ -383,8 +382,6 @@ export default class DistributionLists extends React.Component {
        let panelTabs;
        let isPrivate = null;

-        console.log(this.state);
-
        if (this.state.distributionsList && this.state.owners) {
            const data = this.state.distributionsList;
            const domain = this.state.domain;

--- a/src/index.html
+++ b/src/index.html
@@ -31,17 +31,6 @@
    <link rel='icon' type='image/png' sizes='192x192' href='images/favicon/android-chrome-192x192.png'>
    <link rel='manifest' href='config/manifest.json'>
    <!-- Android add to homescreen -->
-
-    <style id='antiClickjack'>body{display:none !important;}</style>
-
-    <script src='/bundle.js'></script>
-
-    <script type='text/javascript'>
-        if (self === top) {
-            var blocker = document.getElementById('antiClickjack');
-            blocker.parentNode.removeChild(blocker);
-        }
-    </script>
 </head>
 <body class='show-sidebar'>
 <div id='root'/>

--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,11 +2,24 @@ const webpack = require('webpack');
 const path = require('path');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const AssetsPlugin = require('assets-webpack-plugin');
+const assetsPluginInstance = new AssetsPlugin({
+    filename: 'path.json',
+    processOutput: function (assets) {
+        return 'module.exports = ' + JSON.stringify(assets);
+    }
+});
+const HtmlWebpackPlugin = require('html-webpack-plugin');

 const htmlExtract = new ExtractTextPlugin('html', 'index.html');
+const Instancehtmlwebpackplugin = new HtmlWebpackPlugin({template: './src/index.html', inject: 'head'});

 const NPM_TARGET = process.env.npm_lifecycle_event; //eslint-disable-line no-process-env

+// Create a simple hash based on timestamp promp
+const timestamp = new Date().getTime().toString();
+const hash = timestamp.slice(-6, timestamp.length);
+
 var DEV = false;
 var FULLMAP = false;
 if (NPM_TARGET === 'run' || NPM_TARGET === 'run-fullmap') {
@@ -17,11 +30,11 @@ if (NPM_TARGET === 'run' || NPM_TARGET === 'run-fullmap') {
 }

 var config = {
-    entry: ['babel-polyfill', './src/index.jsx', 'src/index.html'],
+    entry: ['babel-polyfill', './src/index.jsx'],
    output: {
        path: 'dist',
        publicPath: '/',
-        filename: 'bundle.js'
+        filename: hash + 'bundle.js'
    },
    module: {
        loaders: [
@@ -61,14 +74,12 @@ var config = {
                query: {
                    name: 'files/[hash].[ext]'
                }
-            },
-            {
-                test: /\.html$/,
-                loader: htmlExtract.extract('html?attrs=link:href')
            }
        ]
    },
    plugins: [
+        Instancehtmlwebpackplugin,
+        assetsPluginInstance,
        new CopyWebpackPlugin([
            {from: 'src/config', to: 'config'}
        ]),