Skip to content

Commit f2591d7

Browse files
authored
Update npm packages (#11836)
1 parent 43ebfb3 commit f2591d7

File tree

16 files changed

+2119
-1973
lines changed

16 files changed

+2119
-1973
lines changed

package-lock.json

Lines changed: 637 additions & 613 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"postinstall": "run-s install:*"
2727
},
2828
"devDependencies": {
29-
"@babel/core": "^7.17.10",
30-
"@babel/preset-env": "^7.17.10",
31-
"@babel/preset-flow": "7.16.7",
29+
"@babel/core": "^7.18.2",
30+
"@babel/preset-env": "^7.18.2",
31+
"@babel/preset-flow": "7.17.12",
3232
"all-contributors-cli": "^6.20.0",
3333
"es6-promise": "4.2.8",
34-
"glob": "^8.0.1",
34+
"glob": "^8.0.3",
3535
"graceful-fs": "4.2.10",
3636
"gulp": "^4.0.2",
3737
"gulp-babel": "8.0.0",
@@ -56,9 +56,9 @@
5656
"merge-stream": "2.0.0",
5757
"npm-run-all": "^4.1.5",
5858
"path-posix": "1.0.0",
59-
"postcss": "8.4.13",
59+
"postcss": "8.4.14",
6060
"postcss-rtl": "^1.7.3",
6161
"rtlcss": "3.5.0",
62-
"typescript": "^4.6.4"
62+
"typescript": "^4.7.3"
6363
}
6464
}

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/package-lock.json

Lines changed: 671 additions & 645 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
},
1414
"devDependencies": {
1515
"@babel/cli": "^7.17.10",
16-
"@babel/core": "^7.17.10",
17-
"@babel/preset-env": "^7.17.10",
18-
"@babel/preset-react": "^7.16.7",
19-
"@babel/preset-typescript": "^7.16.7",
16+
"@babel/core": "^7.18.2",
17+
"@babel/preset-env": "^7.18.2",
18+
"@babel/preset-react": "^7.17.12",
19+
"@babel/preset-typescript": "^7.17.12",
2020
"assert": "^2.0.0",
2121
"css-loader": "^6.7.1",
2222
"null-loader": "^4.0.1",
2323
"prop-types": "15.8.1",
2424
"style-loader": "^3.3.1",
2525
"ts-loader": "^9.3.0",
26-
"typescript": "^4.6.4",
27-
"webpack": "^5.72.0",
26+
"typescript": "^4.7.3",
27+
"webpack": "^5.73.0",
2828
"webpack-cli": "^4.9.2"
2929
},
3030
"scripts": {

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/wwwroot/Scripts/graphiql-orchard.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/OrchardCore.Modules/OrchardCore.AuditTrail/package-lock.json

Lines changed: 686 additions & 672 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/OrchardCore.Modules/OrchardCore.AuditTrail/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@
66
"description": "A diff module for OrchardCore.",
77
"dependencies": {
88
"bootstrap": "5.1.3",
9-
"diff": "5.0.0",
9+
"diff": "5.1.0",
1010
"react": "^18.1.0",
1111
"react-diff-viewer": "^3.1.1",
1212
"react-dom": "^18.1.0"
1313
},
1414
"devDependencies": {
1515
"@babel/cli": "^7.17.10",
16-
"@babel/core": "^7.17.10",
17-
"@babel/preset-env": "^7.17.10",
18-
"@babel/preset-react": "^7.16.7",
19-
"@babel/preset-typescript": "^7.16.7",
20-
"@types/react": "^18.0.8",
21-
"@types/react-dom": "^18.0.3",
16+
"@babel/core": "^7.18.2",
17+
"@babel/preset-env": "^7.18.2",
18+
"@babel/preset-react": "^7.17.12",
19+
"@babel/preset-typescript": "^7.17.12",
20+
"@types/react": "^18.0.12",
21+
"@types/react-dom": "^18.0.5",
2222
"assert": "^2.0.0",
2323
"css-loader": "^6.7.1",
2424
"null-loader": "^4.0.1",
2525
"prop-types": "15.8.1",
26-
"sass-loader": "^12.6.0",
26+
"sass-loader": "^13.0.0",
2727
"style-loader": "^3.3.1",
2828
"ts-loader": "^9.3.0",
29-
"typescript": "^4.6.4",
30-
"webpack": "^5.72.0",
29+
"typescript": "^4.7.3",
30+
"webpack": "^5.73.0",
3131
"webpack-cli": "^4.9.2"
3232
},
3333
"scripts": {

src/OrchardCore.Modules/OrchardCore.AuditTrail/wwwroot/Scripts/diff.js

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,43 @@
55

66
function _typeof2(obj) { "@babel/helpers - typeof"; return _typeof2 = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof2(obj); }
77

8+
/*!
9+
10+
diff v5.1.0
11+
12+
Software License Agreement (BSD License)
13+
14+
Copyright (c) 2009-2015, Kevin Decker <[email protected]>
15+
16+
All rights reserved.
17+
18+
Redistribution and use of this software in source and binary forms, with or without modification,
19+
are permitted provided that the following conditions are met:
20+
21+
* Redistributions of source code must retain the above
22+
copyright notice, this list of conditions and the
23+
following disclaimer.
24+
25+
* Redistributions in binary form must reproduce the above
26+
copyright notice, this list of conditions and the
27+
following disclaimer in the documentation and/or other
28+
materials provided with the distribution.
29+
30+
* Neither the name of Kevin Decker nor the names of its
31+
contributors may be used to endorse or promote products
32+
derived from this software without specific prior
33+
written permission.
34+
35+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
36+
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
37+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
38+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
39+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
40+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
41+
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
42+
OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43+
@license
44+
*/
845
(function (global, factory) {
946
(typeof exports === "undefined" ? "undefined" : _typeof2(exports)) === 'object' && typeof module !== 'undefined' ? factory(exports) : typeof define === 'function' && define.amd ? define(['exports'], factory) : (global = global || self, factory(global.Diff = {}));
1047
})(this, function (exports) {
@@ -45,6 +82,11 @@ function _typeof2(obj) { "@babel/helpers - typeof"; return _typeof2 = "function"
4582
oldLen = oldString.length;
4683
var editLength = 1;
4784
var maxEditLength = newLen + oldLen;
85+
86+
if (options.maxEditLength) {
87+
maxEditLength = Math.min(maxEditLength, options.maxEditLength);
88+
}
89+
4890
var bestPath = [{
4991
newPos: -1,
5092
components: []
@@ -109,15 +151,13 @@ function _typeof2(obj) { "@babel/helpers - typeof"; return _typeof2 = "function"
109151
editLength++;
110152
} // Performs the length of edit iteration. Is a bit fugly as this has to support the
111153
// sync and async mode which is never fun. Loops over execEditLength until a value
112-
// is produced.
154+
// is produced, or until the edit length exceeds options.maxEditLength (if given),
155+
// in which case it will return undefined.
113156

114157

115158
if (callback) {
116159
(function exec() {
117160
setTimeout(function () {
118-
// This should not happen, but we want to be safe.
119-
120-
/* istanbul ignore next */
121161
if (editLength > maxEditLength) {
122162
return callback();
123163
}
@@ -941,6 +981,11 @@ function _typeof2(obj) { "@babel/helpers - typeof"; return _typeof2 = "function"
941981
}
942982

943983
var diff = diffLines(oldStr, newStr, options);
984+
985+
if (!diff) {
986+
return;
987+
}
988+
944989
diff.push({
945990
value: '',
946991
lines: []

src/OrchardCore.Modules/OrchardCore.AuditTrail/wwwroot/Scripts/diff.min.js

Lines changed: 38 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/OrchardCore.Modules/OrchardCore.AuditTrail/wwwroot/Scripts/diffviewer.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)