From b42cc5d68c1c8bae480b2a6619976f054d8dbcf5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 6 Feb 2023 15:02:01 +0000
Subject: [PATCH 1/3] Rename loader.py -> loader.py

---
 webpack_loader/{loader.py => loaders.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename webpack_loader/{loader.py => loaders.py} (100%)

diff --git a/webpack_loader/loader.py b/webpack_loader/loaders.py
similarity index 100%
rename from webpack_loader/loader.py
rename to webpack_loader/loaders.py

From 3ee0b18598c91688fd7abb921cb6d5599efc2bf9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 6 Feb 2023 15:02:10 +0000
Subject: [PATCH 2/3] Rename references

---
 README.md                              | 6 +++---
 tests/app/tests/test_custom_loaders.py | 4 ++--
 webpack_loader/config.py               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a7971479..65e4a289 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ The `STATS_FILE` parameter represents the output file produced by `webpack-bundl
 
 - `INTEGRITY` is flag enabling [Subresource Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity) on rendered `<script>` and `<link>` tags.  Integrity hash is get from stats file and configuration on side of `BundleTracker`, where configuration option `integrity: true` is required.
 
-- `LOADER_CLASS` is the fully qualified name of a python class as a string that holds the custom webpack loader. This is where behavior can be customized as to how the stats file is loaded. Examples include loading the stats file from a database, cache, external url, etc. For convenience, `webpack_loader.loader.WebpackLoader` can be extended. The `load_assets` method is likely where custom behavior will be added. This should return the stats file as an object.
+- `LOADER_CLASS` is the fully qualified name of a python class as a string that holds the custom webpack loader. This is where behavior can be customized as to how the stats file is loaded. Examples include loading the stats file from a database, cache, external url, etc. For convenience, `webpack_loader.loaders.WebpackLoader` can be extended. The `load_assets` method is likely where custom behavior will be added. This should return the stats file as an object.
 
 - `SKIP_COMMON_CHUNKS` is a flag which prevents already generated chunks from being included again in the same page. This should only happen if you use more than one entrypoint per Django template (multiple `render_bundle` calls). By enabling this, you can get the same default behavior of the [HtmlWebpackPlugin](https://webpack.js.org/plugins/html-webpack-plugin/). The same caveats apply as when using `skip_common_chunks` on `render_bundle`, see that section below for more details.
 
@@ -117,7 +117,7 @@ Here's a simple example of loading from an external url:
 
   ```py
   import requests
-  from webpack_loader.loader import WebpackLoader
+  from webpack_loader.loaders import WebpackLoader
 
   class ExternalWebpackLoader(WebpackLoader):
     def load_assets(self):
@@ -183,7 +183,7 @@ However, production usage for this package is **fairly flexible**. Other approac
 To run tests where `render_bundle` shows up, since we don't have `webpack-bundle-tracker` at that point to generate the stats file, the calls to render the bundle will fail. The solution is to use the `FakeWebpackLoader` in your test settings:
 
 ```python
-WEBPACK_LOADER['DEFAULT']['LOADER_CLASS'] = 'webpack_loader.loader.FakeWebpackLoader'
+WEBPACK_LOADER['DEFAULT']['LOADER_CLASS'] = 'webpack_loader.loaders.FakeWebpackLoader'
 ```
 
 ## Advanced Usage
diff --git a/tests/app/tests/test_custom_loaders.py b/tests/app/tests/test_custom_loaders.py
index 7d8d3995..44808501 100644
--- a/tests/app/tests/test_custom_loaders.py
+++ b/tests/app/tests/test_custom_loaders.py
@@ -1,13 +1,13 @@
 from imp import reload
 from django.test import TestCase
-from webpack_loader import utils, config, loader
+from webpack_loader import utils, config, loaders
 
 
 DEFAULT_CONFIG = 'DEFAULT'
 LOADER_PAYLOAD = {'status': 'done', 'chunks': []}
 
 
-class ValidCustomLoader(loader.WebpackLoader):
+class ValidCustomLoader(loaders.WebpackLoader):
 
     def load_assets(self):
         return LOADER_PAYLOAD
diff --git a/webpack_loader/config.py b/webpack_loader/config.py
index 9a49faed..7045224d 100644
--- a/webpack_loader/config.py
+++ b/webpack_loader/config.py
@@ -14,7 +14,7 @@
         'POLL_INTERVAL': 0.1,
         'TIMEOUT': None,
         'IGNORE': [r'.+\.hot-update.js', r'.+\.map'],
-        'LOADER_CLASS': 'webpack_loader.loader.WebpackLoader',
+        'LOADER_CLASS': 'webpack_loader.loaders.WebpackLoader',
         'INTEGRITY': False,
         # Whenever the global setting for SKIP_COMMON_CHUNKS is changed, please
         # update the fallback value in get_skip_common_chunks (utils.py).

From e5f46defb97e1e07b5238d1c85d2965fae976230 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 6 Feb 2023 15:03:00 +0000
Subject: [PATCH 3/3] Add back old file with deprecation warning

---
 webpack_loader/loader.py | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 webpack_loader/loader.py

diff --git a/webpack_loader/loader.py b/webpack_loader/loader.py
new file mode 100644
index 00000000..7f4dfc6b
--- /dev/null
+++ b/webpack_loader/loader.py
@@ -0,0 +1,9 @@
+import warnings
+
+from .loaders import *  # noqa
+
+warnings.warn(
+    "The 'webpack_loader.loader' module has been renamed to 'webpack_loader.loaders'. "
+    "Please update your imports and config to use the new module.",
+    DeprecationWarning,
+)