Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Renovate Bot
renovate
Commits
e90d34f8
Unverified
Commit
e90d34f8
authored
5 years ago
by
Rhys Arkins
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix(html): allow reverse sorting (#5523)
parent
37d8bbf4
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/manager/html/__snapshots__/extract.spec.ts.snap
+10
-10
10 additions, 10 deletions
lib/manager/html/__snapshots__/extract.spec.ts.snap
lib/manager/html/extract.ts
+3
-2
3 additions, 2 deletions
lib/manager/html/extract.ts
lib/manager/html/update.ts
+8
-5
8 additions, 5 deletions
lib/manager/html/update.ts
with
21 additions
and
17 deletions
lib/manager/html/__snapshots__/extract.spec.ts.snap
+
10
−
10
View file @
e90d34f8
...
@@ -7,100 +7,100 @@ Object {
...
@@ -7,100 +7,100 @@ Object {
"currentValue": "15.6.1",
"currentValue": "15.6.1",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "prop-types",
"depName": "prop-types",
"fileReplacePosition": 201,
"lookupName": "prop-types/prop-types.min.js",
"lookupName": "prop-types/prop-types.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 124,
"tagLength": 124,
"tagPosition": 201,
},
},
},
},
Object {
Object {
"currentValue": "16.3.2",
"currentValue": "16.3.2",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "react",
"depName": "react",
"fileReplacePosition": 339,
"lookupName": "react/umd/react.production.min.js",
"lookupName": "react/umd/react.production.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 129,
"tagLength": 129,
"tagPosition": 339,
},
},
},
},
Object {
Object {
"currentValue": "16.3.2",
"currentValue": "16.3.2",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "react-dom",
"depName": "react-dom",
"fileReplacePosition": 482,
"lookupName": "react-dom/umd/react-dom.production.min.js",
"lookupName": "react-dom/umd/react-dom.production.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 137,
"tagLength": 137,
"tagPosition": 482,
},
},
},
},
Object {
Object {
"currentValue": "2.2.1",
"currentValue": "2.2.1",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "react-transition-group",
"depName": "react-transition-group",
"fileReplacePosition": 984,
"lookupName": "react-transition-group/react-transition-group.min.js",
"lookupName": "react-transition-group/react-transition-group.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 147,
"tagLength": 147,
"tagPosition": 984,
},
},
},
},
Object {
Object {
"currentValue": "1.14.3",
"currentValue": "1.14.3",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "popper.js",
"depName": "popper.js",
"fileReplacePosition": 1145,
"lookupName": "popper.js/umd/popper.min.js",
"lookupName": "popper.js/umd/popper.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 123,
"tagLength": 123,
"tagPosition": 1145,
},
},
},
},
Object {
Object {
"currentValue": "0.10.4",
"currentValue": "0.10.4",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "react-popper",
"depName": "react-popper",
"fileReplacePosition": 1282,
"lookupName": "react-popper/umd/react-popper.min.js",
"lookupName": "react-popper/umd/react-popper.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 132,
"tagLength": 132,
"tagPosition": 1282,
},
},
},
},
Object {
Object {
"currentValue": "7.1.0",
"currentValue": "7.1.0",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "reactstrap",
"depName": "reactstrap",
"fileReplacePosition": 1452,
"lookupName": "reactstrap/reactstrap.min.js",
"lookupName": "reactstrap/reactstrap.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 88,
"tagLength": 88,
"tagPosition": 1452,
},
},
},
},
Object {
Object {
"currentValue": "4.3.1",
"currentValue": "4.3.1",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "react-router",
"depName": "react-router",
"fileReplacePosition": 1554,
"lookupName": "react-router/react-router.min.js",
"lookupName": "react-router/react-router.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 93,
"tagLength": 93,
"tagPosition": 1554,
},
},
},
},
Object {
Object {
"currentValue": "4.0.6",
"currentValue": "4.0.6",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "react-markdown",
"depName": "react-markdown",
"fileReplacePosition": 1663,
"lookupName": "react-markdown/react-markdown.js",
"lookupName": "react-markdown/react-markdown.js",
"managerData": Object {
"managerData": Object {
"tagLength": 92,
"tagLength": 92,
"tagPosition": 1663,
},
},
},
},
Object {
Object {
"currentValue": "0.18.0",
"currentValue": "0.18.0",
"datasource": "cdnjs",
"datasource": "cdnjs",
"depName": "axios",
"depName": "axios",
"fileReplacePosition": 1866,
"lookupName": "axios/axios.min.js",
"lookupName": "axios/axios.min.js",
"managerData": Object {
"managerData": Object {
"tagLength": 179,
"tagLength": 179,
"tagPosition": 1866,
},
},
},
},
],
],
...
...
This diff is collapsed.
Click to expand it.
lib/manager/html/extract.ts
+
3
−
2
View file @
e90d34f8
...
@@ -27,7 +27,7 @@ export function extractPackageFile(content: string): PackageFile {
...
@@ -27,7 +27,7 @@ export function extractPackageFile(content: string): PackageFile {
while
(
match
)
{
while
(
match
)
{
const
[
tag
]
=
match
;
const
[
tag
]
=
match
;
const
tagLength
=
tag
.
length
;
const
tagLength
=
tag
.
length
;
const
tag
Position
=
offset
+
match
.
index
;
const
fileReplace
Position
=
offset
+
match
.
index
;
offset
+=
match
.
index
+
tag
.
length
;
offset
+=
match
.
index
+
tag
.
length
;
rest
=
content
.
slice
(
offset
);
rest
=
content
.
slice
(
offset
);
...
@@ -37,7 +37,8 @@ export function extractPackageFile(content: string): PackageFile {
...
@@ -37,7 +37,8 @@ export function extractPackageFile(content: string): PackageFile {
if
(
dep
)
{
if
(
dep
)
{
deps
.
push
({
deps
.
push
({
...
dep
,
...
dep
,
managerData
:
{
tagLength
,
tagPosition
},
fileReplacePosition
,
managerData
:
{
tagLength
},
});
});
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/manager/html/update.ts
+
8
−
5
View file @
e90d34f8
...
@@ -41,11 +41,14 @@ export async function updateDependency({
...
@@ -41,11 +41,14 @@ export async function updateDependency({
fileContent
,
fileContent
,
upgrade
,
upgrade
,
}:
UpdateDependencyConfig
):
Promise
<
string
>
{
}:
UpdateDependencyConfig
):
Promise
<
string
>
{
const
{
currentValue
,
newValue
,
managerData
}
=
upgrade
;
const
{
currentValue
,
fileReplacePosition
,
newValue
,
managerData
}
=
upgrade
;
const
{
tagPosition
,
tagLength
}
=
managerData
;
const
{
tagLength
}
=
managerData
;
const
leftPart
=
fileContent
.
slice
(
0
,
tagPosition
);
const
leftPart
=
fileContent
.
slice
(
0
,
fileReplacePosition
);
const
tagPart
=
fileContent
.
slice
(
tagPosition
,
tagPosition
+
tagLength
);
const
tagPart
=
fileContent
.
slice
(
const
rightPart
=
fileContent
.
slice
(
tagPosition
+
tagLength
);
fileReplacePosition
,
fileReplacePosition
+
tagLength
);
const
rightPart
=
fileContent
.
slice
(
fileReplacePosition
+
tagLength
);
const
dep
=
extractDep
(
tagPart
);
const
dep
=
extractDep
(
tagPart
);
/* istanbul ignore if */
/* istanbul ignore if */
if
(
!
dep
)
{
if
(
!
dep
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment