Skip to content

Commit 1eb0da5

Browse files
authored
Update JS dependencies (#19281)
- Upgrade all JS dependencies minus vue and vue-loader - Adapt to breaking change of octicons - Update eslint rules - Tested Swagger UI, sortablejs and prod build
1 parent 08d1992 commit 1eb0da5

16 files changed

+188
-193
lines changed

.eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ rules:
280280
no-unused-expressions: [2]
281281
no-unused-labels: [2]
282282
no-unused-private-class-members: [2]
283-
no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, caughtErrorsIgnorePattern: ^_, ignoreRestSiblings: false}]
283+
no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, caughtErrorsIgnorePattern: ^_, destructuredArrayIgnorePattern: ^_, ignoreRestSiblings: false}]
284284
no-use-before-define: [2, nofunc]
285285
no-useless-backreference: [0]
286286
no-useless-call: [2]

integrations/repo_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func TestViewRepoWithSymlinks(t *testing.T) {
155155
return fmt.Sprintf("%s: %s", file, cls)
156156
})
157157
assert.Len(t, items, 5)
158-
assert.Equal(t, "a: svg octicon-file-directory", items[0])
158+
assert.Equal(t, "a: svg octicon-file-directory-fill", items[0])
159159
assert.Equal(t, "link_b: svg octicon-file-submodule", items[1])
160160
assert.Equal(t, "link_d: svg octicon-file-symlink-file", items[2])
161161
assert.Equal(t, "link_hi: svg octicon-file-symlink-file", items[3])

modules/base/tool.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ func EntryIcon(entry *git.TreeEntry) string {
279279
}
280280
return "file-symlink-file"
281281
case entry.IsDir():
282-
return "file-directory"
282+
return "file-directory-fill"
283283
case entry.IsSubModule():
284284
return "file-submodule"
285285
}

package-lock.json

+161-172
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
},
99
"dependencies": {
1010
"@claviska/jquery-minicolors": "2.3.6",
11-
"@primer/octicons": "16.3.1",
11+
"@primer/octicons": "17.0.0",
1212
"add-asset-webpack-plugin": "2.0.1",
13-
"css-loader": "6.6.0",
13+
"css-loader": "6.7.1",
1414
"dropzone": "6.0.0-beta.2",
1515
"easymde": "2.16.1",
1616
"esbuild-loader": "2.18.0",
@@ -23,40 +23,40 @@
2323
"less-loader": "10.2.0",
2424
"license-checker-webpack-plugin": "0.2.1",
2525
"mermaid": "8.14.0",
26-
"mini-css-extract-plugin": "2.5.3",
27-
"monaco-editor": "0.32.1",
26+
"mini-css-extract-plugin": "2.6.0",
27+
"monaco-editor": "0.33.0",
2828
"monaco-editor-webpack-plugin": "7.0.1",
2929
"pretty-ms": "7.0.1",
30-
"sortablejs": "1.14.0",
31-
"swagger-ui-dist": "4.5.2",
30+
"sortablejs": "1.15.0",
31+
"swagger-ui-dist": "4.10.0",
3232
"tributejs": "5.1.3",
3333
"uint8-to-base64": "0.2.0",
3434
"vue": "2.6.14",
3535
"vue-bar-graph": "1.3.1",
3636
"vue-calendar-heatmap": "0.8.4",
3737
"vue-loader": "15.9.8",
3838
"vue-template-compiler": "2.6.14",
39-
"webpack": "5.69.1",
39+
"webpack": "5.70.0",
4040
"webpack-cli": "4.9.2",
41-
"workbox-routing": "6.5.0",
42-
"workbox-strategies": "6.5.0",
41+
"workbox-routing": "6.5.2",
42+
"workbox-strategies": "6.5.2",
4343
"worker-loader": "3.0.8",
4444
"wrap-ansi": "8.0.1"
4545
},
4646
"devDependencies": {
47-
"eslint": "8.9.0",
47+
"eslint": "8.12.0",
4848
"eslint-plugin-html": "6.2.0",
4949
"eslint-plugin-import": "2.25.4",
50-
"eslint-plugin-unicorn": "41.0.0",
50+
"eslint-plugin-unicorn": "41.0.1",
5151
"eslint-plugin-vue": "8.5.0",
5252
"jest": "27.5.1",
5353
"jest-extended": "2.0.0",
5454
"jest-raw-loader": "1.0.1",
5555
"postcss-less": "6.0.0",
56-
"stylelint": "14.5.3",
56+
"stylelint": "14.6.1",
5757
"stylelint-config-standard": "25.0.0",
5858
"svgo": "2.8.0",
59-
"updates": "13.0.2"
59+
"updates": "13.0.4"
6060
},
6161
"browserslist": [
6262
"defaults",
+1
Loading
+1
Loading
+1
Loading
Loading
+1-1
Loading
+1
Loading

public/img/svg/octicon-trophy.svg

+1
Loading

templates/admin/repo/unadopted.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{{range $dirI, $dir := .Dirs}}
2626
<div class="item">
2727
<div class="content">
28-
<span class="icon">{{svg "octicon-file-directory"}}</span>
28+
<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
2929
<span class="name">{{$dir}}</span>
3030
<div class="right floated content">
3131
<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.i18n.Tr "repo.adopt_preexisting_label"}}</span></button>

templates/repo/view_list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
{{if $entry.IsDir}}
6363
{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
6464
{{$subJumpablePath := SubJumpablePath $subJumpablePathName}}
65-
{{svg "octicon-file-directory"}}
65+
{{svg "octicon-file-directory-fill"}}
6666
<a href="{{$.TreeLink}}/{{PathEscapeSegments $subJumpablePathName}}" title="{{$subJumpablePathName}}">
6767
{{if eq (len $subJumpablePath) 2}}
6868
<span class="jumpable-path">{{index $subJumpablePath 0}}</span>{{index $subJumpablePath 1}}

templates/user/settings/repos.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
3434
{{end}}
3535
{{else}}
36-
<span class="icon">{{svg "octicon-file-directory"}}</span>
36+
<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
3737
<span class="name">{{$.Owner.Name}}/{{$dir}}</span>
3838
<div class="right floated content">
3939
{{if $.allowAdopt}}

web_src/less/_repository.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
margin-right: 10px;
335335
}
336336

337-
&.octicon-file-directory,
337+
&.octicon-file-directory-fill,
338338
&.octicon-file-submodule {
339339
color: var(--color-primary);
340340
}

0 commit comments

Comments
 (0)