Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1a6ac87

Browse files
ci: update
2 parents9767162 +535cc98 commit1a6ac87

File tree

5 files changed

+91
-58
lines changed

5 files changed

+91
-58
lines changed

‎.github/workflows/test.yml‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
-name:Use Node.js
4040
uses:actions/setup-node@v4
4141
with:
42-
node-version:16.x
42+
node-version:lts/*
4343
cache:"yarn"
4444
-run:yarn --frozen-lockfile
4545
-run:yarn link --frozen-lockfile || true
@@ -68,7 +68,7 @@ jobs:
6868
-name:Use Node.js
6969
uses:actions/setup-node@v4
7070
with:
71-
node-version:16.x
71+
node-version:lts/*
7272
cache:"yarn"
7373
-run:yarn --frozen-lockfile
7474
-run:yarn link --frozen-lockfile || true
@@ -92,9 +92,30 @@ jobs:
9292
node-version:[10.x, 20.x]
9393
part:[a, b]
9494
include:
95+
# Test with main branches of webpack dependencies
96+
-os:ubuntu-latest
97+
node-version:lts/*
98+
part:a
99+
use_main_branches:1
100+
-os:ubuntu-latest
101+
node-version:lts/*
102+
part:b
103+
use_main_branches:1
104+
# Test on the latest version of Node.js
105+
-os:ubuntu-latest
106+
node-version:21.x
107+
part:a
108+
-os:ubuntu-latest
109+
node-version:21.x
110+
part:b
111+
# Test on the old LTS version of Node.js
95112
-os:ubuntu-latest
96113
node-version:18.x
97114
part:a
115+
-os:ubuntu-latest
116+
node-version:18.x
117+
part:b
118+
# Test on old Node.js versions
98119
-os:ubuntu-latest
99120
node-version:16.x
100121
part:a
@@ -104,15 +125,6 @@ jobs:
104125
-os:ubuntu-latest
105126
node-version:12.x
106127
part:a
107-
# Test with main branches of webpack dependencies
108-
-os:ubuntu-latest
109-
node-version:16.x
110-
part:a
111-
use_main_branches:1
112-
-os:ubuntu-latest
113-
node-version:16.x
114-
part:b
115-
use_main_branches:1
116128
runs-on:${{ matrix.os }}
117129
steps:
118130
-uses:actions/checkout@v4
@@ -126,12 +138,16 @@ jobs:
126138
yarn upgrade jest@^27.5.0 jest-circus@^27.5.0 jest-cli@^27.5.0 jest-diff@^27.5.0 jest-environment-node@^27.5.0 jest-junit@^13.0.0 @types/jest@^27.4.0 pretty-format@^27.0.2 --ignore-engines
127139
yarn --frozen-lockfile --ignore-engines
128140
if: matrix.node-version == '10.x' || matrix.node-version == '12.x' || matrix.node-version == '14.x'
141+
-run:|
142+
yarn upgrade eslint-plugin-jsdoc@^47.0.0
143+
yarn --frozen-lockfile
144+
if: matrix.node-version == '16.x'
129145
# Install main version of our deps
130146
-run:yarn upgrade enhanced-resolve@webpack/enhanced-resolve#main loader-runner@webpack/loader-runner#main webpack-sources@webpack/webpack-sources#main watchpack@webpack/watchpack#main tapable@webpack/tapable#master
131147
if:matrix.use_main_branches == '1'
132148
# Install dependencies for LTS node versions
133149
-run:yarn --frozen-lockfile
134-
if:matrix.node-version != '10.x' && matrix.node-version != '12.x' && matrix.node-version != '14.x'
150+
if:matrix.node-version != '10.x' && matrix.node-version != '12.x' && matrix.node-version != '14.x' && matrix.node-version != '16.x'
135151
-run:yarn link --frozen-lockfile || true
136152
-run:yarn link webpack --frozen-lockfile
137153
-uses:actions/cache@v4

‎azure-pipelines.yml‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
-task:NodeTool@0
1010
inputs:
11-
versionSpec:"^16.0.0"
11+
versionSpec:"^18.0.0"
1212
displayName:"Install Node.js"
1313
-script:|
1414
curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -60,7 +60,7 @@ jobs:
6060
steps:
6161
-task:NodeTool@0
6262
inputs:
63-
versionSpec:"^16.0.0"
63+
versionSpec:"^18.0.0"
6464
displayName:"Install Node.js"
6565
-script:|
6666
curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -113,16 +113,16 @@ jobs:
113113
node_version:^10.13.0
114114
part:b
115115
node-12-a:
116-
node_version:^12.4.0
116+
node_version:^18.0.0
117117
part:a
118118
node-12-b:
119-
node_version:^12.4.0
119+
node_version:^18.0.0
120120
part:b
121121
node-16-a:
122-
node_version:^16.0.0
122+
node_version:^20.0.0
123123
part:a
124124
node-16-b:
125-
node_version:^16.0.0
125+
node_version:^20.0.0
126126
part:b
127127
steps:
128128
-task:NodeTool@0
@@ -146,10 +146,10 @@ jobs:
146146
yarn upgrade jest@^27.5.0 jest-circus@^27.5.0 jest-cli@^27.5.0 jest-diff@^27.5.0 jest-environment-node@^27.5.0 jest-junit@^13.0.0 @types/jest@^27.4.0 pretty-format@^27.0.2 --ignore-engines
147147
yarn --frozen-lockfile --ignore-engines
148148
displayName: "Install dependencies (old node.js version)"
149-
condition:or(eq(variables['node_version'], '^10.13.0'), eq(variables['node_version'], '^12.4.0'))
149+
condition: eq(variables['node_version'], '^10.13.0')
150150
-script:yarn --frozen-lockfile
151151
displayName:"Install dependencies"
152-
condition:and(not(eq(variables['node_version'], '^10.13.0')), not(eq(variables['node_version'], '^12.4.0')))
152+
condition:not(eq(variables['node_version'], '^10.13.0'))
153153
-script:yarn link --frozen-lockfile || true
154154
displayName:"Link webpack"
155155
continueOnError:true
@@ -184,16 +184,16 @@ jobs:
184184
node_version:^10.13.0
185185
part:b
186186
node-12-a:
187-
node_version:^12.4.0
188-
part:a
189-
node-14-a:
190-
node_version:^14.0.0
187+
node_version:^18.0.0
191188
part:a
189+
node-12-b:
190+
node_version:^18.0.0
191+
part:b
192192
node-16-a:
193-
node_version:^16.0.0
193+
node_version:^20.0.0
194194
part:a
195195
node-16-b:
196-
node_version:^16.0.0
196+
node_version:^20.0.0
197197
part:b
198198
steps:
199199
-task:NodeTool@0
@@ -223,15 +223,15 @@ jobs:
223223
yarn link --frozen-lockfile ||true
224224
yarn link webpack --frozen-lockfile
225225
displayName: "Install dependencies (old node.js version)"
226-
condition:or(eq(variables['node_version'], '^10.13.0'), eq(variables['node_version'], '^12.4.0'), eq(variables['node_version'], '^14.0.0'))
226+
condition: eq(variables['node_version'], '^10.13.0')
227227
-script:|
228228
set -e
229229
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
230230
yarn --frozen-lockfile
231231
yarn link --frozen-lockfile ||true
232232
yarn link webpack --frozen-lockfile
233233
displayName: "Install dependencies"
234-
condition:and(not(eq(variables['node_version'], '^10.13.0')), not(eq(variables['node_version'], '^12.4.0')), not(eq(variables['node_version'], '^14.0.0')))
234+
condition: not(eq(variables['node_version'], '^10.13.0'))
235235
-script:|
236236
set -e
237237
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
@@ -254,19 +254,25 @@ jobs:
254254
pool:
255255
vmImage:macOS-latest
256256
strategy:
257-
maxParallel:4
257+
maxParallel:6
258258
matrix:
259+
node-10-a:
260+
node_version:^10.13.0
261+
part:a
262+
node-10-b:
263+
node_version:^10.13.0
264+
part:b
259265
node-12-a:
260-
node_version:^12.4.0
266+
node_version:^18.0.0
261267
part:a
262268
node-12-b:
263-
node_version:^12.4.0
269+
node_version:^18.0.0
264270
part:b
265271
node-16-a:
266-
node_version:^16.0.0
272+
node_version:^20.0.0
267273
part:a
268274
node-16-b:
269-
node_version:^16.0.0
275+
node_version:^20.0.0
270276
part:b
271277
steps:
272278
-task:NodeTool@0
@@ -295,15 +301,15 @@ jobs:
295301
yarn link --frozen-lockfile ||true
296302
yarn link webpack --frozen-lockfile
297303
displayName: "Install dependencies (old node.js version)"
298-
condition:or(eq(variables['node_version'], '^10.13.0'), eq(variables['node_version'], '^12.4.0'))
304+
condition: eq(variables['node_version'], '^10.13.0')
299305
-script:|
300306
set -e
301307
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
302308
yarn --frozen-lockfile
303309
yarn link --frozen-lockfile ||true
304310
yarn link webpack --frozen-lockfile
305311
displayName: "Install dependencies"
306-
condition:and(not(eq(variables['node_version'], '^10.13.0')), not(eq(variables['node_version'], '^12.4.0')))
312+
condition: not(eq(variables['node_version'], '^10.13.0'))
307313
-script:|
308314
set -e
309315
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"

‎cspell.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
"jsons",
118118
"junit",
119119
"Junya",
120+
"jsdoc",
120121
"kaios",
121122
"Kees",
122123
"kibibytes",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"eslint":"^8.48.0",
5858
"eslint-config-prettier":"^9.1.0",
5959
"eslint-plugin-jest":"^27.6.3",
60-
"eslint-plugin-jsdoc":"^43.0.5",
60+
"eslint-plugin-jsdoc":"^48.1.0",
6161
"eslint-plugin-n":"^16.6.2",
6262
"eslint-plugin-prettier":"^5.1.3",
6363
"file-loader":"^6.0.0",

‎yarn.lock‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -678,12 +678,12 @@
678678
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
679679
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
680680

681-
"@es-joy/jsdoccomment@~0.37.0":
682-
version "0.37.1"
683-
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.37.1.tgz#fa32a41ba12097452693343e09ad4d26d157aedd"
684-
integrity sha512-5vxWJ1gEkEF0yRd0O+uK6dHJf7adrxwQSX8PuRiPfFSAbNLnY0ZJfXaZucoz14Jj2N11xn2DnlEPwWRpYpvRjg==
681+
"@es-joy/jsdoccomment@~0.42.0":
682+
version "0.42.0"
683+
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.42.0.tgz#59e878708336aaee88c2b34c894f73dbf77ae2b0"
684+
integrity sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==
685685
dependencies:
686-
comment-parser "1.3.1"
686+
comment-parser "1.4.1"
687687
esquery "^1.5.0"
688688
jsdoc-type-pratt-parser "~4.0.0"
689689

@@ -2095,10 +2095,10 @@ comment-json@^4.2.3:
20952095
has-own-prop "^2.0.0"
20962096
repeat-string "^1.6.1"
20972097

2098-
comment-parser@1.3.1:
2099-
version "1.3.1"
2100-
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
2101-
integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
2098+
comment-parser@1.4.1:
2099+
version "1.4.1"
2100+
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
2101+
integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
21022102

21032103
commondir@^1.0.1:
21042104
version "1.0.1"
@@ -2666,19 +2666,20 @@ eslint-plugin-jest@^27.6.3:
26662666
dependencies:
26672667
"@typescript-eslint/utils""^5.10.0"
26682668

2669-
eslint-plugin-jsdoc@^43.0.5:
2670-
version "43.0.5"
2671-
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-43.0.5.tgz#5b19487f6bb8d9cda64eafd992f8ec190bcec043"
2672-
integrity sha512-4+hN5jrwcElXwK+J6GiUYbgHl+C063lu1gR2ajUA1L4bs+rBsAoV37dP2gISfqzoU83VsY1/sSD4wvH87JHCsQ==
2669+
eslint-plugin-jsdoc@^48.1.0:
2670+
version "48.1.0"
2671+
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.1.0.tgz#565363770b433485bfc70dc862b50b7f780529ec"
2672+
integrity sha512-g9S8ukmTd1DVcV/xeBYPPXOZ6rc8WJ4yi0+MVxJ1jBOrz5kmxV9gJJQ64ltCqIWFnBChLIhLVx3tbTSarqVyFA==
26732673
dependencies:
2674-
"@es-joy/jsdoccomment""~0.37.0"
2674+
"@es-joy/jsdoccomment""~0.42.0"
26752675
are-docs-informative "^0.0.2"
2676-
comment-parser "1.3.1"
2676+
comment-parser "1.4.1"
26772677
debug "^4.3.4"
26782678
escape-string-regexp "^4.0.0"
26792679
esquery "^1.5.0"
2680-
semver "^7.5.0"
2681-
spdx-expression-parse "^3.0.1"
2680+
is-builtin-module "^3.2.1"
2681+
semver "^7.6.0"
2682+
spdx-expression-parse "^4.0.0"
26822683

26832684
eslint-plugin-n@^16.6.2:
26842685
version "16.6.2"
@@ -5132,6 +5133,7 @@ prelude-ls@~1.1.2:
51325133
integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
51335134

51345135
"prettier-2@npm:prettier@^2", prettier@^2.0.5:
5136+
name prettier-2
51355137
version "2.8.8"
51365138
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
51375139
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
@@ -5632,10 +5634,10 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
56325634
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
56335635
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
56345636

5635-
semver@^7.0.0, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.3, semver@^7.5.4:
5636-
version "7.5.4"
5637-
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
5638-
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
5637+
semver@^7.0.0, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
5638+
version "7.6.0"
5639+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
5640+
integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
56395641
dependencies:
56405642
lru-cache "^6.0.0"
56415643

@@ -5783,14 +5785,22 @@ spdx-exceptions@^2.1.0:
57835785
resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
57845786
integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
57855787

5786-
spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
5788+
spdx-expression-parse@^3.0.0:
57875789
version "3.0.1"
57885790
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
57895791
integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
57905792
dependencies:
57915793
spdx-exceptions "^2.1.0"
57925794
spdx-license-ids "^3.0.0"
57935795

5796+
spdx-expression-parse@^4.0.0:
5797+
version "4.0.0"
5798+
resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz#a23af9f3132115465dac215c099303e4ceac5794"
5799+
integrity sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==
5800+
dependencies:
5801+
spdx-exceptions "^2.1.0"
5802+
spdx-license-ids "^3.0.0"
5803+
57945804
spdx-license-ids@^3.0.0:
57955805
version "3.0.13"
57965806
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp