Merge branch 'master' into dependabot/npm_and_yarn/postcss-loader-5.0.0

docker-compose.yml

@@ -0,0 +1,64 @@
+version: "3"
+
+networks:
+  proxy:
+    name: proxy
+    external: true
+  internal:
+    name: internal
+    external: false
+
+services:
+  artsite:
+    image: artsite:latest
+    container_name: artsite
+    labels:
+      - traefik.http.routers.artsite.rule=Host(`arthurdanjou.fr`)
+      - traefik.http.routers.artsite.tls=true
+      - traefik.http.routers.artsite.tls.certresolver=lets-encrypt
+      - traefik.docker.network=proxy
+      - traefik.port=443
+    ports:
+    - 3333:3333
+    networks:
+      - internal
+      - proxy
+    depends_on:
+      - artapi
+  artapi:
+    image: artapi:latest
+    container_name: artapi
+    labels:
+      - traefik.http.routers.artapi.rule=Host(`api.arthurdanjou.fr`)
+      - traefik.http.routers.artapi.tls=true
+      - traefik.http.routers.artapi.tls.certresolver=lets-encrypt
+      - traefik.docker.network=proxy
+      - traefik.port=443
+    ports:
+      - 5555:5555
+    networks:
+      - internal
+      - proxy
+    depends_on:
+      - mariadb
+      - redis
+  mariadb:
+    image: mariadb:10.5.8-focal
+    container_name: mariadb
+    environment:
+      MYSQL_ROOT_PASSWORD:
+    networks:
+      - internal
+    labels:
+      - traefik.enable=false
+    volumes:
+      - "/root/mariadb/data:/var/lib/mysql"
+  redis:
+    image: redis:6.0.10
+    container_name: redis
+    networks:
+      - internal
+    labels:
+      - traefik.enable=false
+    volumes:
+      - "/root/redis/redis.conf:/usr/local/etc/redis/redis.conf"

package.json

@@ -18,8 +18,8 @@
     "nuxt": "2.15.0",
     "nuxt-i18n": "6.20.1",
     "prism-themes": "1.5.0",
-    "sass": "1.32.7",
-    "sass-loader": "10.1.1"
+    "sass": "1.32.8",
+    "sass-loader": "11.0.1"
   },
   "devDependencies": {
     "@nuxtjs/color-mode": "2.0.3",
@@ -27,7 +27,7 @@
     "autoprefixer": "^10.2.4",
     "css-loader": "^5.0.0",
     "postcss": "^8.1.10",
-    "postcss-import": "^13.0.0",
+    "postcss-import": "^14.0.0",
     "postcss-loader": "^5.0.0",
     "postcss-url": "^10.1.1",
     "tailwindcss": "2.0.3"

yarn.lock

@@ -7076,10 +7076,10 @@ postcss-import@^12.0.1:
     read-cache "^1.0.0"
     resolve "^1.1.7"
 
-postcss-import@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-13.0.0.tgz#d6960cd9e3de5464743b04dd8cd9d870662f8b8c"
-  integrity sha512-LPUbm3ytpYopwQQjqgUH4S3EM/Gb9QsaSPP/5vnoi+oKVy3/mIk2sc0Paqw7RL57GpScm9MdIMUypw2znWiBpg==
+postcss-import@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.0.tgz#3ed1dadac5a16650bde3f4cdea6633b9c3c78296"
+  integrity sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==
   dependencies:
     postcss-value-parser "^4.0.0"
     read-cache "^1.0.0"
@@ -8267,7 +8267,15 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@10.1.1, sass-loader@^10.1.1:
+sass-loader@11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.0.1.tgz#8672f896593466573b904f47693e0695368e38c9"
+  integrity sha512-Vp1LcP4slTsTNLEiDkTcm8zGN/XYYrZz2BZybQbliWA8eXveqA/AxsEjllQTpJbg2MzCsx/qNO48sHdZtOaxTw==
+  dependencies:
+    klona "^2.0.4"
+    neo-async "^2.6.2"
+
+sass-loader@^10.1.1:
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d"
   integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==
@@ -8278,10 +8286,10 @@ sass-loader@10.1.1, sass-loader@^10.1.1:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@1.32.7:
-  version "1.32.7"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.7.tgz#632a9df2b85dc4b346977fcaf2d5e6f2b7039fd8"
-  integrity sha512-C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A==
+sass@1.32.8:
+  version "1.32.8"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
+  integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"