github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-02-22 07:34:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated esbuild options and version & updated npm deps

Browse Source 
Had to change way sortable is imported due to changes, Still
seemed to have functioning multi-select.
This commit is contained in:
Dan Brown 2020-09-30 22:28:53 +01:00
parent 465d405926
commit ea406690f5
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package-lock.json generated
View File

@ -253,9 +253,9 @@
} }
}, },
"esbuild": { "esbuild": {
"version": "0.6.30", "version": "0.7.8",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.6.30.tgz", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.7.8.tgz",
"integrity": "sha512-ZSZY461UPzTYYC3rqy1QiMtngk2WyXf+58MgC7tC22jkI90FXNgEl0hN3ipfn/UgZYzTW2GBcHiO7t0rSbHT7g==", "integrity": "sha512-6UT1nZB+8ja5avctUC6d3kGOUAhy6/ZYHljL4nk3++1ipadghBhUCAcwsTHsmUvdu04CcGKzo13mE+ZQ2O3zrA==",
"dev": true "dev": true
}, },
"escape-string-regexp": { "escape-string-regexp": {
@ -496,9 +496,9 @@
"dev": true "dev": true
}, },
"markdown-it": { "markdown-it": {
"version": "11.0.0", "version": "11.0.1",
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz",
"integrity": "sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==", "integrity": "sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==",
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^1.0.7",
"entities": "~2.0.0", "entities": "~2.0.0",
@ -730,9 +730,9 @@
} }
}, },
"sass": { "sass": {
"version": "1.26.10", "version": "1.26.11",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.11.tgz",
"integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==", "integrity": "sha512-W1l/+vjGjIamsJ6OnTe0K37U2DBO/dgsv2Z4c89XQ8ZOO6l/VwkqwLSqoYzJeJs6CLuGSTRWc91GbQFL3lvrvw==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=2.0.0 <4.0.0"
@ -777,9 +777,9 @@
"dev": true "dev": true
}, },
"sortablejs": { "sortablejs": {
"version": "1.10.2", "version": "1.12.0",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz", "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.12.0.tgz",
"integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==" "integrity": "sha512-bPn57rCjBRlt2sC24RBsu40wZsmLkSo2XeqG8k6DC1zru5eObQUIPPZAQG7W2SJ8FZQYq+BEJmvuw1Zxb3chqg=="
}, },
"spdx-correct": { "spdx-correct": {
"version": "3.1.1", "version": "3.1.1",

12
package.json
View File

@ -4,9 +4,9 @@
"build:css:dev": "sass ./resources/sass:./public/dist", "build:css:dev": "sass ./resources/sass:./public/dist",
"build:css:watch": "sass ./resources/sass:./public/dist --watch", "build:css:watch": "sass ./resources/sass:./public/dist --watch",
"build:css:production": "sass ./resources/sass:./public/dist -s compressed", "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: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", "build": "npm-run-all --parallel build:*:dev",
"production": "npm-run-all --parallel build:*:production", "production": "npm-run-all --parallel build:*:production",
"dev": "npm-run-all --parallel watch livereload", "dev": "npm-run-all --parallel watch livereload",
@ -16,18 +16,18 @@
}, },
"devDependencies": { "devDependencies": {
"chokidar-cli": "^2.1.0", "chokidar-cli": "^2.1.0",
"esbuild": "0.6.30", "esbuild": "0.7.8",
"livereload": "^0.9.1", "livereload": "^0.9.1",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"punycode": "^2.1.1", "punycode": "^2.1.1",
"sass": "^1.26.10" "sass": "^1.26.11"
}, },
"dependencies": { "dependencies": {
"clipboard": "^2.0.6", "clipboard": "^2.0.6",
"codemirror": "^5.58.1", "codemirror": "^5.58.1",
"dropzone": "^5.7.2", "dropzone": "^5.7.2",
"markdown-it": "^11.0.0", "markdown-it": "^11.0.1",
"markdown-it-task-lists": "^2.1.1", "markdown-it-task-lists": "^2.1.1",
"sortablejs": "^1.10.2" "sortablejs": "^1.12.0"
} }
} }

3
resources/js/components/book-sort.js
View File

@ -1,4 +1,4 @@
import {Sortable, MultiDrag} from "sortablejs"; import Sortable from "sortablejs";
// Auto sort control // Auto sort control
const sortOperations = { const sortOperations = {
@ -43,7 +43,6 @@ class BookSort {
this.input = elem.querySelector('[book-sort-input]'); this.input = elem.querySelector('[book-sort-input]');
const initialSortBox = elem.querySelector('.sort-box'); const initialSortBox = elem.querySelector('.sort-box');
Sortable.mount(new MultiDrag());
this.setupBookSortable(initialSortBox); this.setupBookSortable(initialSortBox);
this.setupSortPresets(); this.setupSortPresets();