diff --git a/templates/zerver/login.html b/templates/zerver/login.html index 16b8cbe95f..070f8e36db 100644 --- a/templates/zerver/login.html +++ b/templates/zerver/login.html @@ -3,7 +3,7 @@ {% block customhead %} {{ super() }} - {{ minified_js('signup')|safe }} + {{ render_bundle('signup') }} {% endblock %} {% block portico_content %} diff --git a/templates/zerver/portico_signup.html b/templates/zerver/portico_signup.html index 1d9706a772..e36512f93e 100644 --- a/templates/zerver/portico_signup.html +++ b/templates/zerver/portico_signup.html @@ -4,5 +4,5 @@ {% block customhead %} {{ super() }} -{{ minified_js('signup')|safe }} +{{ render_bundle('signup') }} {% endblock %} diff --git a/tools/travis/success-http-headers.txt b/tools/travis/success-http-headers.txt index 2d5e55ba4a..716e0c2056 100644 --- a/tools/travis/success-http-headers.txt +++ b/tools/travis/success-http-headers.txt @@ -22,10 +22,10 @@ Reusing existing connection to localhost:443. HTTP/1.1 200 OK Server: nginx/1.4.6 (Ubuntu) Content-Type: text/html; charset=utf-8 - Content-Length: 6187 + Content-Length: 6205 Connection: keep-alive Strict-Transport-Security: max-age=15768000 -Length: 6187 (6.0K) [text/html] +Length: 6205 (6.1K) [text/html] Saving to: ‘/tmp/index.html’ diff --git a/tools/webpack.assets.json b/tools/webpack.assets.json index 37ebac232c..d855e7571e 100644 --- a/tools/webpack.assets.json +++ b/tools/webpack.assets.json @@ -3,6 +3,10 @@ "api": "./static/js/portico/api.js", "katex": ["./node_modules/katex/dist/katex.min.js"], "landing-page": "./static/js/portico/landing-page.js", + "signup": [ + "./static/js/portico/signup.js", + "./node_modules/jquery-validation/dist/jquery.validate.min.js" + ], "stats": [ "./static/js/stats/stats.js", "./node_modules/plotly.js/dist/plotly-basic.min.js" diff --git a/zproject/settings.py b/zproject/settings.py index 3431cbf19d..39cc49777d 100644 --- a/zproject/settings.py +++ b/zproject/settings.py @@ -822,13 +822,6 @@ JS_SPECS = { ], 'output_filename': 'min/common.js' }, - 'signup': { - 'source_filenames': [ - 'js/portico/signup.js', - 'node_modules/jquery-validation/dist/jquery.validate.js', - ], - 'output_filename': 'min/signup.js' - }, 'app': { 'source_filenames': [ 'third/bootstrap-notify/js/bootstrap-notify.js',