]> BookStack Code Mirror - bookstack/commitdiff
Updated esbuild options and version & updated npm deps
authorDan Brown <redacted>
Wed, 30 Sep 2020 21:28:53 +0000 (22:28 +0100)
committerDan Brown <redacted>
Wed, 30 Sep 2020 21:28:53 +0000 (22:28 +0100)
Had to change way sortable is imported due to changes, Still
seemed to have functioning multi-select.

package-lock.json
package.json
resources/js/components/book-sort.js

index cea03187cd0532014cef6e0ef355c29ad4f0b2a7..06f13e8d296d5b89c7d5c5e0daf688f561ae8359 100644 (file)
       }
     },
     "esbuild": {
-      "version": "0.6.30",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.6.30.tgz",
-      "integrity": "sha512-ZSZY461UPzTYYC3rqy1QiMtngk2WyXf+58MgC7tC22jkI90FXNgEl0hN3ipfn/UgZYzTW2GBcHiO7t0rSbHT7g==",
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.7.8.tgz",
+      "integrity": "sha512-6UT1nZB+8ja5avctUC6d3kGOUAhy6/ZYHljL4nk3++1ipadghBhUCAcwsTHsmUvdu04CcGKzo13mE+ZQ2O3zrA==",
       "dev": true
     },
     "escape-string-regexp": {
       "dev": true
     },
     "markdown-it": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz",
-      "integrity": "sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz",
+      "integrity": "sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==",
       "requires": {
         "argparse": "^1.0.7",
         "entities": "~2.0.0",
       }
     },
     "sass": {
-      "version": "1.26.10",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz",
-      "integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==",
+      "version": "1.26.11",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.11.tgz",
+      "integrity": "sha512-W1l/+vjGjIamsJ6OnTe0K37U2DBO/dgsv2Z4c89XQ8ZOO6l/VwkqwLSqoYzJeJs6CLuGSTRWc91GbQFL3lvrvw==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
       "dev": true
     },
     "sortablejs": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
-      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.12.0.tgz",
+      "integrity": "sha512-bPn57rCjBRlt2sC24RBsu40wZsmLkSo2XeqG8k6DC1zru5eObQUIPPZAQG7W2SJ8FZQYq+BEJmvuw1Zxb3chqg=="
     },
     "spdx-correct": {
       "version": "3.1.1",
index 0c3c69a07be6df87325c535b5f018a6125e08701..c3ca2add627a2bbaf145d42cf6857c63eef04243 100644 (file)
@@ -4,9 +4,9 @@
     "build:css:dev": "sass ./resources/sass:./public/dist",
     "build:css:watch": "sass ./resources/sass:./public/dist --watch",
     "build:css:production": "sass ./resources/sass:./public/dist -s compressed",
-    "build:js:dev": "esbuild --bundle ./resources/js/index.js --outfile=public/dist/app.js --sourcemap --target=es2020",
+    "build:js:dev": "esbuild --bundle ./resources/js/index.js --outfile=public/dist/app.js --sourcemap --target=es2019 --main-fields=module,main",
     "build:js:watch": "chokidar \"./resources/**/*.js\" -c \"npm run build:js:dev\"",
-    "build:js:production": "NODE_ENV=production esbuild --bundle ./resources/js/index.js --outfile=public/dist/app.js --sourcemap --minify",
+    "build:js:production": "NODE_ENV=production esbuild --bundle ./resources/js/index.js --outfile=public/dist/app.js --sourcemap --target=es2019 --main-fields=module,main --minify",
     "build": "npm-run-all --parallel build:*:dev",
     "production": "npm-run-all --parallel build:*:production",
     "dev": "npm-run-all --parallel watch livereload",
   },
   "devDependencies": {
     "chokidar-cli": "^2.1.0",
-    "esbuild": "0.6.30",
+    "esbuild": "0.7.8",
     "livereload": "^0.9.1",
     "npm-run-all": "^4.1.5",
     "punycode": "^2.1.1",
-    "sass": "^1.26.10"
+    "sass": "^1.26.11"
   },
   "dependencies": {
     "clipboard": "^2.0.6",
     "codemirror": "^5.58.1",
     "dropzone": "^5.7.2",
-    "markdown-it": "^11.0.0",
+    "markdown-it": "^11.0.1",
     "markdown-it-task-lists": "^2.1.1",
-    "sortablejs": "^1.10.2"
+    "sortablejs": "^1.12.0"
   }
 }
index b0d64ad172f1e0abe7b4e457a415c588a083da1c..2b94ca4a7a19a68ff82b31345efbc52fc28dc56e 100644 (file)
@@ -1,4 +1,4 @@
-import {Sortable, MultiDrag} from "sortablejs";
+import Sortable from "sortablejs";
 
 // Auto sort control
 const sortOperations = {
@@ -43,7 +43,6 @@ class BookSort {
         this.input = elem.querySelector('[book-sort-input]');
 
         const initialSortBox = elem.querySelector('.sort-box');
-        Sortable.mount(new MultiDrag());
         this.setupBookSortable(initialSortBox);
         this.setupSortPresets();