From 3a752fde5117e800d65e26cbe7b15d65eb5b491e Mon Sep 17 00:00:00 2001
From: Literallie
Date: Thu, 2 Nov 2017 17:57:44 +0100
Subject: Revert "Load js-url lib using legacy-loader"

Didn't work in Firefox for some reason.

`[Script Loader] ReferenceError: module is not defined`

This reverts commit 5b83deb043296c23ff912a2472703c1f7faddb4b.
---
 webpackBaseConfig.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'webpackBaseConfig.js')

diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 71a8f2ef..41a63e7d 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -190,7 +190,7 @@ module.exports = {
     index: [
       'babel-polyfill',
       'script!jquery-ui-resizable',
-      'js-url',
+      'script!js-url',
       'expose?filterXSS!xss',
       'script!Idle.Js',
       'expose?LZString!lz-string',
@@ -241,7 +241,7 @@ module.exports = {
       'expose?jsyaml!js-yaml',
       'script!mermaid',
       'expose?moment!moment',
-      'js-url',
+      'script!js-url',
       'script!handlebars',
       'expose?hljs!highlight.js',
       'expose?emojify!emojify.js',
@@ -374,8 +374,7 @@ module.exports = {
       'bootstrap-tooltip': path.join(__dirname, 'public/vendor/bootstrap/tooltip.min.js'),
       'headjs': path.join(__dirname, 'node_modules/reveal.js/lib/js/head.min.js'),
       'reveal-markdown': path.join(__dirname, 'public/js/reveal-markdown.js'),
-      abcjs: path.join(__dirname, 'public/vendor/abcjs_basic_3.1.1-min.js'),
-      'js-url': path.join(__dirname, 'node_modules/js-url/url.js')
+      abcjs: path.join(__dirname, 'public/vendor/abcjs_basic_3.1.1-min.js')
     }
   },
 
@@ -430,9 +429,6 @@ module.exports = {
     }, {
       test: /\.gif(\?v=\d+\.\d+\.\d+)?$/,
       loader: 'url?limit=10000&mimetype=image/gif'
-    }, {
-      test: /\/node_modules\/js-url\/url.js/,
-      loader: 'legacy'
     }]
   },
   node: {
-- 
cgit v1.2.3