Upgrade to Webpack 5 (torchbox#192)

Co-authored-by: Thibaud Colas <[email protected]>

Author: nickmoreton

.github/workflows/ci.yml

@@ -27,11 +27,11 @@ jobs:
           # See https://docs.djangoproject.com/en/4.0/faq/install/#what-python-version-can-i-use-with-django for the official matrix.
           # Additionally test on Django’s main branch with the most recent Python version.
           - python: "3.7"
-            toxenv: py37-dj22,py37-dj32
+            toxenv: py37-dj32
           - python: "3.8"
-            toxenv: py38-dj22,py38-dj32,py38-dj40,py38-dj41
+            toxenv: py38-dj32,py38-dj40,py38-dj41
           - python: "3.9"
-            toxenv: py39-dj22,py39-dj32,py39-dj40,py39-dj41
+            toxenv: py39-dj32,py39-dj40,py39-dj41
           - python: "3.10"
             # Skip testing Django 4.0, already tested in previous workflow job.
             toxenv: py310-dj32,py310-dj41,py310-djmain

.github/workflows/codeql-analysis.yml

@@ -23,8 +23,8 @@ jobs:
         language: ["javascript", "python"]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: github/codeql-action/init@v1
+      - uses: actions/checkout@v3
+      - uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
-      - uses: github/codeql-action/analyze@v1
+      - uses: github/codeql-action/analyze@v2

docs/getting-started.md

@@ -17,7 +17,7 @@ poetry add --dev django-pattern-library
 
 We support:
 
-- Django 2.2, 3.2, 4.0, 4.1 (experimental), 4.2 (experimental)
+- Django 3.2, 4.0, 4.1 (experimental), 4.2 (experimental)
 - Python 3.7, 3.8, 3.9, 3.10, 3.11 (experimental)
 - Django Templates only, no Jinja support
 - Modern “evergreen” desktop and mobile browsers

package-lock.json

@@ -18,17 +18,17 @@
         "build": "webpack --mode production"
     },
     "devDependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/preset-env": "^7.11.5",
-        "babel-loader": "^8.1.0",
-        "css-loader": "^4.3.0",
-        "sass": "^1.26.11",
-        "sass-loader": "^10.0.2",
-        "style-loader": "^1.2.1",
-        "webpack": "^4.44.2",
-        "webpack-cli": "^3.3.12"
+        "@babel/core": "^7.17.8",
+        "@babel/preset-env": "^7.16.11",
+        "babel-loader": "^8.2.4",
+        "css-loader": "^6.7.1",
+        "sass": "^1.52.1",
+        "sass-loader": "^12.6.0",
+        "style-loader": "^3.3.1",
+        "webpack": "^5.70.0",
+        "webpack-cli": "^4.9.2"
     },
     "dependencies": {
-        "highlight.js": "^10.2.0"
+        "highlight.js": "^11.5.0"
     }
 }

package.json

@@ -1,9 +1,9 @@
 import hljs from 'highlight.js/lib/core';
+import django from 'highlight.js/lib/languages/django';
+import yaml from 'highlight.js/lib/languages/yaml';
 
 export default function() {
-    hljs.initHighlightingOnLoad();
-    ['django', 'yaml'].forEach((langName) => {
-        const langModule = require(`highlight.js/lib/languages/${langName}`);
-        hljs.registerLanguage(langName, langModule);
-    });
+    hljs.registerLanguage('django', django);
+    hljs.registerLanguage('yaml', yaml);
+    hljs.highlightAll();
 }

pattern_library/static/pattern_library/src/js/components/syntax-highlighting.js

@@ -23,7 +23,6 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Framework :: Django",
-    "Framework :: Django :: 2.2",
     "Framework :: Django :: 3.2",
     "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.1",
@@ -45,7 +44,7 @@ exclude = [
 
 [tool.poetry.dependencies]
 python = "^3.7"
-Django = ">=2.2,<4.2"
+Django = ">=3.2,<4.2"
 PyYAML = ">=5.1,<7.0"
 Markdown = "^3.1"
 

pyproject.toml

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{37,38,39,310,311}-dj{22,32,40,41,main}, lint
+envlist = py{37,38,39,310,311}-dj{32,40,41,main}, lint
 skipsdist = true
 
 [testenv]
@@ -11,7 +11,6 @@ commands =
     poetry run python -X dev -W error runtests.py
     poetry run django-admin render_patterns --settings=tests.settings.dev --pythonpath=. --dry-run
 deps =
-    dj22: Django>=2.2,<2.3
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0,<4.1
     ; Switch to version range upon stable release.

tox.ini

@@ -1,6 +1,4 @@
 const path = require('path');
-const webpack = require('webpack');
-const sass = require('sass');
 
 const staticDir = path.resolve(__dirname, 'pattern_library', 'static', 'pattern_library');
 
@@ -31,7 +29,6 @@ module.exports = {
                     {
                         loader: 'sass-loader', // compiles Sass to CSS
                         options: {
-                            implementation: sass,
                             sassOptions: {
                                 outputStyle: 'compressed',
                             },
@@ -41,14 +38,4 @@ module.exports = {
             }
         ]
     },
-    plugins: [
-        // Rather than import the entire contents of the
-        // highlight lib (which includes languages we’re not using)
-        // you can just import the languages you want to highlight,
-        // therefore drastically reducing the bundle size
-        new webpack.ContextReplacementPlugin(
-            /highlight\.js\/lib\/languages$/,
-            new RegExp(`^./(${['django', 'yaml'].join('|')})$`)
-        )
-    ],
 };