Merge remote-tracking branch 'origin/master'

Author: michael-yin

.github/workflows/ci.yml

@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ['3.10']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -27,17 +27,17 @@ jobs:
     needs: [build]
     strategy:
       matrix:
-        python-version: [3.8, 3.9]
-        node-version: [16.x, 18.x]
-        django-version: [3.2, 4.0]
+        python-version: ['3.8', '3.9', '3.10']
+        node-version: [18.x, 20.x]
+        django-version: [3.2, 4.2]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up Django ${{ matrix.django-version }}
@@ -60,17 +60,17 @@ jobs:
     needs: [build]
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
-        node-version: [16.x, 18.x]
-        flask-version: [1.1.4, 2.2.2]
+        python-version: ['3.8', '3.9', '3.10']
+        node-version: [18.x, 20.x]
+        flask-version: [1.1.4, 2.2.2, 3.0.0]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up Flask ${{ matrix.flask-version }}

docs/index.md

@@ -32,18 +32,19 @@ $ cd frontend
 
 # install dependency packages
 $ npm install
+
 # build js, scss files
 $ npm run start
 ```
 
-Now you can load bundle file in templates like
+Now you can load bundle js and css files in template
 
 ```html
 {% stylesheet_pack 'app' %}
-{% javascript_pack 'app' 'app2' attrs='charset="UTF-8"' %}
+{% javascript_pack 'app' %}
 ```
 
 !!! note
-    1. You can import multiple entry files using one `javascript_pack` statement
+    1. You can import **multiple entry files** using `stylesheet_pack` and `javascript_pack` (`{% javascript_pack 'app' 'app2'`)
     1. The `javascript_pack` would also **import dependency files automatically to handle code splitting**
-    1. You can use `attrs` to set custom attributes
+    1. You can use `attrs` to set custom attributes, (`{% javascript_pack 'app' attrs='charset="UTF-8"' %}`)

docs/setup_with_django.md

@@ -72,9 +72,9 @@ frontend
 
 ```bash
 $ node -v
-v18.12.1
+v20.9.0
 $ npm -v
-8.19.2
+10.1.0
 ```
 
 Now go to `frontend`
@@ -198,7 +198,7 @@ Add `index.html` to the above `example/templates`
   </div>
 </div>
 
-{% javascript_pack 'app' 'app2' attrs='charset="UTF-8"' %}
+{% javascript_pack 'app' %}
 
 </body>
 </html>

docs/setup_with_flask.md

@@ -61,9 +61,9 @@ frontend
 
 ```bash
 $ node -v
-v18.12.1
+v20.9.0
 $ npm -v
-8.19.2
+10.1.0
 ```
 
 Now go to `frontend`
@@ -166,7 +166,7 @@ Add `index.html` to `templates`
   </div>
 </div>
 
-{{ javascript_pack('app', 'app2', attrs='charset="UTF-8"') }}
+{{ javascript_pack('app', attrs='charset="UTF-8"') }}
 
 </body>
 </html>

tests/requirements/base.txt

@@ -1 +1 @@
-pytest==6.2.2
+pytest==7.4.3

webpack_boilerplate/frontend_template/{{cookiecutter.project_slug}}/.babelrc

@@ -10,6 +10,6 @@
   ],
   "plugins": [
     "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-proposal-class-properties"
+    "@babel/plugin-transform-class-properties"
   ]
 }

webpack_boilerplate/frontend_template/{{cookiecutter.project_slug}}/.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/iron