Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded php and npm deps

Browse Source 
- Sass upgrade had some breaking changes where division was used
hence updated for newer sass version support.
This commit is contained in:
Dan Brown 2021-05-29 13:08:28 +01:00
parent ed6ec341df
commit d62cdd58d3
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
8 changed files with 261 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

356
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

139
package-lock.json generated
View File

@ -6,19 +6,19 @@
"": { "": {
"dependencies": { "dependencies": {
"clipboard": "^2.0.8", "clipboard": "^2.0.8",
"codemirror": "^5.60.0", "codemirror": "^5.61.1",
"dropzone": "^5.9.2", "dropzone": "^5.9.2",
"markdown-it": "^11.0.1", "markdown-it": "^12.0.6",
"markdown-it-task-lists": "^2.1.1", "markdown-it-task-lists": "^2.1.1",
"sortablejs": "^1.13.0" "sortablejs": "^1.13.0"
}, },
"devDependencies": { "devDependencies": {
"chokidar-cli": "^2.1.0", "chokidar-cli": "^2.1.0",
"esbuild": "0.7.8", "esbuild": "0.12.5",
"livereload": "^0.9.3", "livereload": "^0.9.3",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"punycode": "^2.1.1", "punycode": "^2.1.1",
"sass": "^1.32.8" "sass": "^1.34.0"
} }
}, },
"node_modules/ansi-regex": { "node_modules/ansi-regex": {
@ -56,12 +56,9 @@
} }
}, },
"node_modules/argparse": { "node_modules/argparse": {
"version": "1.0.10", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
"dependencies": {
"sprintf-js": "~1.0.2"
}
}, },
"node_modules/balanced-match": { "node_modules/balanced-match": {
"version": "1.0.0", "version": "1.0.0",
@ -184,9 +181,9 @@
} }
}, },
"node_modules/codemirror": { "node_modules/codemirror": {
"version": "5.60.0", "version": "5.61.1",
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.60.0.tgz", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
"integrity": "sha512-AEL7LhFOlxPlCL8IdTcJDblJm8yrAGib7I+DErJPdZd4l6imx8IMgKK3RblVgBQqz3TZJR4oknQ03bz+uNjBYA==" "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
}, },
"node_modules/color-convert": { "node_modules/color-convert": {
"version": "1.9.3", "version": "1.9.3",
@ -263,9 +260,12 @@
"dev": true "dev": true
}, },
"node_modules/entities": { "node_modules/entities": {
"version": "2.0.3", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==" "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
"funding": {
"url": "https://github.com/fb55/entities?sponsor=1"
}
}, },
"node_modules/error-ex": { "node_modules/error-ex": {
"version": "1.3.2", "version": "1.3.2",
@ -313,10 +313,11 @@
} }
}, },
"node_modules/esbuild": { "node_modules/esbuild": {
"version": "0.7.8", "version": "0.12.5",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.7.8.tgz", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.5.tgz",
"integrity": "sha512-6UT1nZB+8ja5avctUC6d3kGOUAhy6/ZYHljL4nk3++1ipadghBhUCAcwsTHsmUvdu04CcGKzo13mE+ZQ2O3zrA==", "integrity": "sha512-vcuP53pA5XiwUU4FnlXM+2PnVjTfHGthM7uP1gtp+9yfheGvFFbq/KyuESThmtoHPUrfZH5JpxGVJIFDVD1Egw==",
"dev": true, "dev": true,
"hasInstallScript": true,
"bin": { "bin": {
"esbuild": "bin/esbuild" "esbuild": "bin/esbuild"
} }
@ -674,12 +675,12 @@
"dev": true "dev": true
}, },
"node_modules/markdown-it": { "node_modules/markdown-it": {
"version": "11.0.1", "version": "12.0.6",
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.6.tgz",
"integrity": "sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==", "integrity": "sha512-qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w==",
"dependencies": { "dependencies": {
"argparse": "^1.0.7", "argparse": "^2.0.1",
"entities": "~2.0.0", "entities": "~2.1.0",
"linkify-it": "^3.0.1", "linkify-it": "^3.0.1",
"mdurl": "^1.0.1", "mdurl": "^1.0.1",
"uc.micro": "^1.0.5" "uc.micro": "^1.0.5"
@ -979,12 +980,12 @@
} }
}, },
"node_modules/sass": { "node_modules/sass": {
"version": "1.32.8", "version": "1.34.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
"integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==", "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=3.0.0 <4.0.0"
}, },
"bin": { "bin": {
"sass": "sass.js" "sass": "sass.js"
@ -1077,11 +1078,6 @@
"integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
"dev": true "dev": true
}, },
"node_modules/sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"node_modules/string-width": { "node_modules/string-width": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@ -1227,12 +1223,24 @@
} }
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "7.4.4", "version": "7.4.6",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
"integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=8.3.0" "node": ">=8.3.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
"utf-8-validate": "^5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
"optional": true
},
"utf-8-validate": {
"optional": true
}
} }
}, },
"node_modules/y18n": { "node_modules/y18n": {
@ -1297,12 +1305,9 @@
} }
}, },
"argparse": { "argparse": {
"version": "1.0.10", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
"requires": {
"sprintf-js": "~1.0.2"
}
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
@ -1402,9 +1407,9 @@
} }
}, },
"codemirror": { "codemirror": {
"version": "5.60.0", "version": "5.61.1",
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.60.0.tgz", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.1.tgz",
"integrity": "sha512-AEL7LhFOlxPlCL8IdTcJDblJm8yrAGib7I+DErJPdZd4l6imx8IMgKK3RblVgBQqz3TZJR4oknQ03bz+uNjBYA==" "integrity": "sha512-+D1NZjAucuzE93vJGbAaXzvoBHwp9nJZWWWF9utjv25+5AZUiah6CIlfb4ikG4MoDsFsCG8niiJH5++OO2LgIQ=="
}, },
"color-convert": { "color-convert": {
"version": "1.9.3", "version": "1.9.3",
@ -1472,9 +1477,9 @@
"dev": true "dev": true
}, },
"entities": { "entities": {
"version": "2.0.3", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==" "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="
}, },
"error-ex": { "error-ex": {
"version": "1.3.2", "version": "1.3.2",
@ -1516,9 +1521,9 @@
} }
}, },
"esbuild": { "esbuild": {
"version": "0.7.8", "version": "0.12.5",
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.7.8.tgz", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.12.5.tgz",
"integrity": "sha512-6UT1nZB+8ja5avctUC6d3kGOUAhy6/ZYHljL4nk3++1ipadghBhUCAcwsTHsmUvdu04CcGKzo13mE+ZQ2O3zrA==", "integrity": "sha512-vcuP53pA5XiwUU4FnlXM+2PnVjTfHGthM7uP1gtp+9yfheGvFFbq/KyuESThmtoHPUrfZH5JpxGVJIFDVD1Egw==",
"dev": true "dev": true
}, },
"escape-string-regexp": { "escape-string-regexp": {
@ -1793,12 +1798,12 @@
"dev": true "dev": true
}, },
"markdown-it": { "markdown-it": {
"version": "11.0.1", "version": "12.0.6",
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.6.tgz",
"integrity": "sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==", "integrity": "sha512-qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w==",
"requires": { "requires": {
"argparse": "^1.0.7", "argparse": "^2.0.1",
"entities": "~2.0.0", "entities": "~2.1.0",
"linkify-it": "^3.0.1", "linkify-it": "^3.0.1",
"mdurl": "^1.0.1", "mdurl": "^1.0.1",
"uc.micro": "^1.0.5" "uc.micro": "^1.0.5"
@ -2027,12 +2032,12 @@
} }
}, },
"sass": { "sass": {
"version": "1.32.8", "version": "1.34.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz", "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
"integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==", "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": ">=2.0.0 <4.0.0" "chokidar": ">=3.0.0 <4.0.0"
} }
}, },
"select": { "select": {
@ -2110,11 +2115,6 @@
"integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
"dev": true "dev": true
}, },
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"string-width": { "string-width": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@ -2236,10 +2236,11 @@
} }
}, },
"ws": { "ws": {
"version": "7.4.4", "version": "7.4.6",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
"integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
"dev": true "dev": true,
"requires": {}
}, },
"y18n": { "y18n": {
"version": "4.0.1", "version": "4.0.1",

8
package.json
View File

@ -16,17 +16,17 @@
}, },
"devDependencies": { "devDependencies": {
"chokidar-cli": "^2.1.0", "chokidar-cli": "^2.1.0",
"esbuild": "0.7.8", "esbuild": "0.12.5",
"livereload": "^0.9.3", "livereload": "^0.9.3",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"punycode": "^2.1.1", "punycode": "^2.1.1",
"sass": "^1.32.8" "sass": "^1.34.0"
}, },
"dependencies": { "dependencies": {
"clipboard": "^2.0.8", "clipboard": "^2.0.8",
"codemirror": "^5.60.0", "codemirror": "^5.61.1",
"dropzone": "^5.9.2", "dropzone": "^5.9.2",
"markdown-it": "^11.0.1", "markdown-it": "^12.0.6",
"markdown-it-task-lists": "^2.1.1", "markdown-it-task-lists": "^2.1.1",
"sortablejs": "^1.13.0" "sortablejs": "^1.13.0"
} }

4
resources/sass/_components.scss
View File

@ -190,7 +190,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
float: left; float: left;
margin: 0; margin: 0;
cursor: pointer; cursor: pointer;
width: (100%/6); width: math.div(100%, 6);
height: auto; height: auto;
@include lightDark(border-color, #ddd, #000); @include lightDark(border-color, #ddd, #000);
box-shadow: 0 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 0 rgba(0, 0, 0, 0);
@ -219,7 +219,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
} }
} }
@include smaller-than($xl) { @include smaller-than($xl) {
width: (100%/4); width: math.div(100%, 4);
} }
@include smaller-than($m) { @include smaller-than($m) {
.image-meta { .image-meta {

2
resources/sass/_forms.scss
View File

@ -187,7 +187,7 @@ table.form-table {
max-width: 100%; max-width: 100%;
td { td {
overflow: hidden; overflow: hidden;
padding: $-xxs/2 0; padding: math.div($-xxs, 2) 0;
} }
} }

1
resources/sass/export-styles.scss
View File

@ -1,3 +1,4 @@
@use "sass:math";
@import "variables"; @import "variables";
@import "mixins"; @import "mixins";
@import "html"; @import "html";

1
resources/sass/print-styles.scss
View File

@ -1,3 +1,4 @@
@use "sass:math";
@import "variables"; @import "variables";
header { header {

6
resources/sass/styles.scss
View File

@ -1,3 +1,5 @@
@use "sass:math";
@import "reset"; @import "reset";
@import "variables"; @import "variables";
@import "mixins"; @import "mixins";
@ -109,8 +111,8 @@ $btt-size: 40px;
color: #FFF; color: #FFF;
fill: #FFF; fill: #FFF;
svg { svg {
width: $btt-size / 1.5; width: math.div($btt-size, 1.5);
height: $btt-size / 1.5; height: math.div($btt-size, 1.5);
margin-inline-end: 4px; margin-inline-end: 4px;
} }
width: $btt-size; width: $btt-size;