Override javascript base url at runtime (#304)

ONSdigital · Apr 4, 2019 · 513113c · 513113c
1 parent aa166f8
commit 513113c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/js/public-path-override.js b/src/js/public-path-override.js
@@ -0,0 +1,5 @@
+const baseURL = window.ONS_assets_base_URL;
+
+if (baseURL) {
+  __webpack_public_path__ = baseURL;
+}
diff --git a/src/styles/page-template/_template.njk b/src/styles/page-template/_template.njk
@@ -85,6 +85,9 @@
             {% endblock %}
             {% block bodyEnd %}{% endblock %}
         </div>
+        {% if data.version %}
+            <script>window.ONS_assets_base_URL = "/{{ data.version }}/" </script>
+        {% endif %}
         <script type="module" src="{{ "/" + data.version if data.version  }}{{ "https://cdn.ons.gov.uk/sdc/" + page.cdn if page.cdn }}/scripts/bundle.js"></script>
         <script nomodule src="{{ "/" + data.version if data.version  }}{{ "https://cdn.ons.gov.uk/sdc/" + page.cdn if page.cdn }}/scripts/bundle.es5.js"></script>
         <script>document.documentElement.className = document.documentElement.className.replace("no-js","has-js")</script>

diff --git a/webpack.common.js b/webpack.common.js
@@ -53,12 +53,11 @@ const core = {
 
 const jsCore = merge(core, {
   entry: {
-    'scripts/bundle': ['./js/polyfills/index.js', './js/index.js'],
+    'scripts/bundle': ['./js/public-path-override.js', './js/polyfills/index.js', './js/index.js'],
     'scripts/patternlib': ['./js/patternlib/index.js']
   },
 
   output: {
-    publicPath: '/',
     chunkFilename: 'scripts/[name].js'
   },