Merge branch 'master' of github.com:metabase/metabase-init into tooltip_rounding

e5b0370a · Tom Robinson · 78c0ea9b · 7fa93c50 · e5b0370a · e5b0370a
Commit e5b0370a authored 9 years ago by Tom Robinson
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ profiles.clj
 /*.lock.db
 /*.trace.db
 /resources/frontend_client/app/dist/
+/resources/frontend_client/index.html
 /node_modules/
 /.babel_cache
 /coverage

--- a/deploy/deploy_prototype.sh
+++ b/deploy/deploy_prototype.sh
 #!/bin/bash
+set -eo pipefail

 BASEDIR=$(dirname $0)
 source "$BASEDIR/functions"

--- a/deploy/deploy_staging.sh
+++ b/deploy/deploy_staging.sh
 #!/bin/bash
+set -eo pipefail

 BASEDIR=$(dirname $0)
 source "$BASEDIR/functions"

--- a/deploy/deploy_version.sh
+++ b/deploy/deploy_version.sh
 #!/bin/bash
+set -eo pipefail

 BASEDIR=$(dirname $0)
 source "$BASEDIR/functions"

--- a/deploy/functions
+++ b/deploy/functions
 #!/bin/bash
+set -eo pipefail

 BASEDIR=$(dirname $0)
 PROJECT_ROOT=$(cd ${BASEDIR}/..; pwd)
@@ -7,6 +8,9 @@ ARTIFACTS_DIR="$PROJECT_ROOT/deploy/artifacts"
 ARTIFACTS_S3BUCKET=${S3BUCKET:=metabase-artifacts}

 BRANCH=$(cd ${PROJECT_ROOT}; $(which git) rev-parse --abbrev-ref HEAD)
+# OpsWorks creates a deploy branch. We'll use master in this case
+[[ "$BRANCH" == "deploy" ]] && BRANCH="master"
+
 COMMITISH=$(cd ${PROJECT_ROOT}; $(which git) rev-parse --short HEAD)
 DATE=$(date +%Y-%m-%d)
 DEFAULT_RELEASE_ZIP_FILE_NAME="metabase-$BRANCH-$DATE-$COMMITISH.zip"
@@ -24,9 +28,6 @@ upload_release_artifacts() {
 }

 mk_release_artifacts() {
-    # OpsWorks creates a deploy branch. We'll use master in this case
-    [[ "$BRANCH" == "deploy" ]] && BRANCH="master"
-
    METABASE_JAR_NAME="metabase-standalone.jar"
    RELEASE_TYPE="aws-eb-docker"
    RELEASE_JAR_FILE_NAME=${METABASE_JAR_NAME%-standalone.jar}-$BRANCH-$DATE-$COMMITISH.jar

--- a/deploy/mk_release.sh
+++ b/deploy/mk_release.sh
 #!/bin/bash
+set -eo pipefail

 BASEDIR=$(dirname $0)
 source "$BASEDIR/functions"

--- a/deploy/upload_version.sh
+++ b/deploy/upload_version.sh
 #!/bin/bash
+set -eo pipefail

 BASEDIR=$(dirname $0)
 source "$BASEDIR/functions"

--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
    "eslint-plugin-react": "^2.5.0",
    "extract-text-webpack-plugin": "^0.8.1",
    "glob": "^5.0.10",
+    "html-webpack-plugin": "git://github.com/tlrobinson/html-webpack-plugin.git#562acca0363224f156c0bcc87d064a1e2f72611c",
    "istanbul-instrumenter-loader": "^0.1.3",
    "jasmine-core": "^2.3.4",
    "karma": "^0.12.36",

--- a/resources/frontend_client/index.html
+++ b/resources/frontend_client/index.html
@@ -8,9 +8,6 @@
        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
        <title>Metabase</title>

-        <link rel="stylesheet" href="/app/dist/styles.bundle.css"/>
-        <script charset="utf-8" src="/app/dist/vendor.bundle.js"></script>
-        <script charset="utf-8" src="/app/dist/app.bundle.js"></script>
    </head>

    <body ng-controller="Corvus">

--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,6 +7,7 @@ var webpackPostcssTools = require('webpack-postcss-tools');
 var CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
 var NgAnnotatePlugin = require('ng-annotate-webpack-plugin');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var HtmlWebpackPlugin = require('html-webpack-plugin');

 var _ = require('underscore');
 var glob = require('glob');
@@ -42,7 +43,9 @@ module.exports = {
    // output to "dist"
    output: {
        path: __dirname + '/resources/frontend_client/app/dist',
-        filename: '[name].bundle.js'
+        // NOTE: the filename on disk won't include "?[chunkhash]" but the URL in index.html generated by HtmlWebpackPlugin will:
+        filename: '[name].bundle.js?[chunkhash]',
+        publicPath: '/app/dist'
    },

    module: {
@@ -114,7 +117,13 @@ module.exports = {
            minChunks: Infinity // (with more entries, this ensures that no other module goes into the vendor chunk)
        }),
        // Extracts initial CSS into a standard stylesheet that can be loaded in parallel with JavaScript
-        new ExtractTextPlugin('styles.bundle.css')
+        // NOTE: the filename on disk won't include "?[chunkhash]" but the URL in index.html generated by HtmlWebpackPlugin will:
+        new ExtractTextPlugin('[name].bundle.css?[contenthash]'),
+        new HtmlWebpackPlugin({
+          filename: '../../index.html',
+          template: 'resources/frontend_client/index_template.html',
+          inject: 'head'
+        })
    ],

    // CSSNext configuration