From: Dan Brown <redacted>
Date: Mon, 30 May 2022 16:01:46 +0000 (+0100)
Subject: Merge branch 'development' of github.com:BookStackApp/BookStack into development
X-Git-Tag: v22.06~1^2~21
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/43cbab28220c5c9cb16222c22bf2090268b83e7f?hp=-c

Merge branch 'development' of github.com:BookStackApp/BookStack into development
---

43cbab28220c5c9cb16222c22bf2090268b83e7f
diff --combined package.json
index 4b16f6f46,7a85af47a..539e05057
--- a/package.json
+++ b/package.json
@@@ -1,8 -1,8 +1,8 @@@
  {
    "private": true,
    "scripts": {
-     "build:css:dev": "sass ./resources/sass:./public/dist",
-     "build:css:watch": "sass ./resources/sass:./public/dist --watch",
+     "build:css:dev": "sass ./resources/sass:./public/dist --embed-sources",
+     "build:css:watch": "sass ./resources/sass:./public/dist --watch --embed-sources",
      "build:css:production": "sass ./resources/sass:./public/dist -s compressed",
      "build:js:dev": "node dev/build/esbuild.js",
      "build:js:watch": "chokidar --initial \"./resources/**/*.js\" -c \"npm run build:js:dev\"",
@@@ -16,17 -16,17 +16,17 @@@
    },
    "devDependencies": {
      "chokidar-cli": "^3.0",
 -    "esbuild": "0.14.36",
 +    "esbuild": "0.14.42",
      "livereload": "^0.9.3",
      "npm-run-all": "^4.1.5",
      "punycode": "^2.1.1",
 -    "sass": "^1.50.0"
 +    "sass": "^1.52.1"
    },
    "dependencies": {
 -    "clipboard": "^2.0.10",
 -    "codemirror": "^5.65.2",
 +    "clipboard": "^2.0.11",
 +    "codemirror": "^5.65.5",
      "dropzone": "^5.9.3",
 -    "markdown-it": "^12.3.2",
 +    "markdown-it": "^13.0.1",
      "markdown-it-task-lists": "^2.1.1",
      "sortablejs": "^1.15.0"
    }