Skip to content

Commit 9716147

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev' into releases/v4
2 parents 36ee275 + d556f38 commit 9716147

File tree

3 files changed

+83
-83
lines changed

3 files changed

+83
-83
lines changed

‎package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@jamesives/github-pages-deploy-action",
33
"description": "GitHub action for building a project and deploying it to GitHub pages.",
44
"author": "James Ives <iam@jamesiv.es> (https://jamesiv.es)",
5-
"version": "4.6.9",
5+
"version": "4.7.0",
66
"license": "MIT",
77
"main": "lib/lib.js",
88
"types": "lib/lib.d.ts",
@@ -44,18 +44,18 @@
4444
},
4545
"devDependencies": {
4646
"@types/jest": "29.5.14",
47-
"@types/node": "22.9.1",
48-
"@typescript-eslint/eslint-plugin": "8.15.0",
49-
"@typescript-eslint/parser": "8.15.0",
47+
"@types/node": "22.10.1",
48+
"@typescript-eslint/eslint-plugin": "8.16.0",
49+
"@typescript-eslint/parser": "8.16.0",
5050
"eslint": "9.15.0",
5151
"eslint-config-prettier": "9.1.0",
5252
"eslint-plugin-jest": "28.9.0",
5353
"eslint-plugin-prettier": "5.2.1",
5454
"jest": "29.7.0",
5555
"jest-circus": "29.7.0",
56-
"prettier": "3.3.3",
56+
"prettier": "3.4.1",
5757
"rimraf": "6.0.1",
5858
"ts-jest": "29.2.5",
59-
"typescript": "5.6.3"
59+
"typescript": "5.7.2"
6060
}
6161
}

‎src/git.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export async function deploy(action: ActionInterface): Promise<Status> {
166166
Allows the user to specify the root if '.' is provided.
167167
rsync is used to prevent file duplication. */
168168
await execute(
169-
`rsync -q -av --checksum --progress ${action.folderPath}/. ${
169+
`rsync -q -av --checksum --progress ${action.targetFolder ? '--mkpath' : ''} ${action.folderPath}/. ${
170170
action.targetFolder
171171
? `${temporaryDeploymentDirectory}/${action.targetFolder}`
172172
: temporaryDeploymentDirectory

‎yarn.lock

+76-76
Original file line numberDiff line numberDiff line change
@@ -1214,12 +1214,12 @@
12141214
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
12151215
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
12161216

1217-
"@types/node@*", "@types/node@22.9.1":
1218-
version "22.9.1"
1219-
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.1.tgz#bdf91c36e0e7ecfb7257b2d75bf1b206b308ca71"
1220-
integrity sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==
1217+
"@types/node@*", "@types/node@22.10.1":
1218+
version "22.10.1"
1219+
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.1.tgz#41ffeee127b8975a05f8c4f83fb89bcb2987d766"
1220+
integrity sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==
12211221
dependencies:
1222-
undici-types "~6.19.8"
1222+
undici-types "~6.20.0"
12231223

12241224
"@types/stack-utils@^2.0.0":
12251225
version "2.0.0"
@@ -1236,85 +1236,85 @@
12361236
dependencies:
12371237
"@types/yargs-parser" "*"
12381238

1239-
"@typescript-eslint/eslint-plugin@8.15.0":
1240-
version "8.15.0"
1241-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.15.0.tgz#c95c6521e70c8b095a684d884d96c0c1c63747d2"
1242-
integrity sha512-+zkm9AR1Ds9uLWN3fkoeXgFppaQ+uEVtfOV62dDmsy9QCNqlRHWNEck4yarvRNrvRcHQLGfqBNui3cimoz8XAg==
1239+
"@typescript-eslint/eslint-plugin@8.16.0":
1240+
version "8.16.0"
1241+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.16.0.tgz#ac56825bcdf3b392fc76a94b1315d4a162f201a6"
1242+
integrity sha512-5YTHKV8MYlyMI6BaEG7crQ9BhSc8RxzshOReKwZwRWN0+XvvTOm+L/UYLCYxFpfwYuAAqhxiq4yae0CMFwbL7Q==
12431243
dependencies:
12441244
"@eslint-community/regexpp" "^4.10.0"
1245-
"@typescript-eslint/scope-manager" "8.15.0"
1246-
"@typescript-eslint/type-utils" "8.15.0"
1247-
"@typescript-eslint/utils" "8.15.0"
1248-
"@typescript-eslint/visitor-keys" "8.15.0"
1245+
"@typescript-eslint/scope-manager" "8.16.0"
1246+
"@typescript-eslint/type-utils" "8.16.0"
1247+
"@typescript-eslint/utils" "8.16.0"
1248+
"@typescript-eslint/visitor-keys" "8.16.0"
12491249
graphemer "^1.4.0"
12501250
ignore "^5.3.1"
12511251
natural-compare "^1.4.0"
12521252
ts-api-utils "^1.3.0"
12531253

1254-
"@typescript-eslint/parser@8.15.0":
1255-
version "8.15.0"
1256-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.15.0.tgz#92610da2b3af702cfbc02a46e2a2daa6260a9045"
1257-
integrity sha512-7n59qFpghG4uazrF9qtGKBZXn7Oz4sOMm8dwNWDQY96Xlm2oX67eipqcblDj+oY1lLCbf1oltMZFpUso66Kl1A==
1254+
"@typescript-eslint/parser@8.16.0":
1255+
version "8.16.0"
1256+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.16.0.tgz#ee5b2d6241c1ab3e2e53f03fd5a32d8e266d8e06"
1257+
integrity sha512-D7DbgGFtsqIPIFMPJwCad9Gfi/hC0PWErRRHFnaCWoEDYi5tQUDiJCTmGUbBiLzjqAck4KcXt9Ayj0CNlIrF+w==
12581258
dependencies:
1259-
"@typescript-eslint/scope-manager" "8.15.0"
1260-
"@typescript-eslint/types" "8.15.0"
1261-
"@typescript-eslint/typescript-estree" "8.15.0"
1262-
"@typescript-eslint/visitor-keys" "8.15.0"
1259+
"@typescript-eslint/scope-manager" "8.16.0"
1260+
"@typescript-eslint/types" "8.16.0"
1261+
"@typescript-eslint/typescript-estree" "8.16.0"
1262+
"@typescript-eslint/visitor-keys" "8.16.0"
12631263
debug "^4.3.4"
12641264

1265-
"@typescript-eslint/scope-manager@8.15.0":
1266-
version "8.15.0"
1267-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.15.0.tgz#28a1a0f13038f382424f45a988961acaca38f7c6"
1268-
integrity sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==
1265+
"@typescript-eslint/scope-manager@8.16.0":
1266+
version "8.16.0"
1267+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.16.0.tgz#ebc9a3b399a69a6052f3d88174456dd399ef5905"
1268+
integrity sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==
12691269
dependencies:
1270-
"@typescript-eslint/types" "8.15.0"
1271-
"@typescript-eslint/visitor-keys" "8.15.0"
1270+
"@typescript-eslint/types" "8.16.0"
1271+
"@typescript-eslint/visitor-keys" "8.16.0"
12721272

1273-
"@typescript-eslint/type-utils@8.15.0":
1274-
version "8.15.0"
1275-
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.15.0.tgz#a6da0f93aef879a68cc66c73fe42256cb7426c72"
1276-
integrity sha512-UU6uwXDoI3JGSXmcdnP5d8Fffa2KayOhUUqr/AiBnG1Gl7+7ut/oyagVeSkh7bxQ0zSXV9ptRh/4N15nkCqnpw==
1273+
"@typescript-eslint/type-utils@8.16.0":
1274+
version "8.16.0"
1275+
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.16.0.tgz#585388735f7ac390f07c885845c3d185d1b64740"
1276+
integrity sha512-IqZHGG+g1XCWX9NyqnI/0CX5LL8/18awQqmkZSl2ynn8F76j579dByc0jhfVSnSnhf7zv76mKBQv9HQFKvDCgg==
12771277
dependencies:
1278-
"@typescript-eslint/typescript-estree" "8.15.0"
1279-
"@typescript-eslint/utils" "8.15.0"
1278+
"@typescript-eslint/typescript-estree" "8.16.0"
1279+
"@typescript-eslint/utils" "8.16.0"
12801280
debug "^4.3.4"
12811281
ts-api-utils "^1.3.0"
12821282

1283-
"@typescript-eslint/types@8.15.0":
1284-
version "8.15.0"
1285-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.15.0.tgz#4958edf3d83e97f77005f794452e595aaf6430fc"
1286-
integrity sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==
1283+
"@typescript-eslint/types@8.16.0":
1284+
version "8.16.0"
1285+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.16.0.tgz#49c92ae1b57942458ab83d9ec7ccab3005e64737"
1286+
integrity sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==
12871287

1288-
"@typescript-eslint/typescript-estree@8.15.0":
1289-
version "8.15.0"
1290-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.15.0.tgz#915c94e387892b114a2a2cc0df2d7f19412c8ba7"
1291-
integrity sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==
1288+
"@typescript-eslint/typescript-estree@8.16.0":
1289+
version "8.16.0"
1290+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.16.0.tgz#9d741e56e5b13469b5190e763432ce5551a9300c"
1291+
integrity sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==
12921292
dependencies:
1293-
"@typescript-eslint/types" "8.15.0"
1294-
"@typescript-eslint/visitor-keys" "8.15.0"
1293+
"@typescript-eslint/types" "8.16.0"
1294+
"@typescript-eslint/visitor-keys" "8.16.0"
12951295
debug "^4.3.4"
12961296
fast-glob "^3.3.2"
12971297
is-glob "^4.0.3"
12981298
minimatch "^9.0.4"
12991299
semver "^7.6.0"
13001300
ts-api-utils "^1.3.0"
13011301

1302-
"@typescript-eslint/utils@8.15.0", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0":
1303-
version "8.15.0"
1304-
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.15.0.tgz#ac04679ad19252776b38b81954b8e5a65567cef6"
1305-
integrity sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==
1302+
"@typescript-eslint/utils@8.16.0", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0":
1303+
version "8.16.0"
1304+
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.16.0.tgz#c71264c437157feaa97842809836254a6fc833c3"
1305+
integrity sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==
13061306
dependencies:
13071307
"@eslint-community/eslint-utils" "^4.4.0"
1308-
"@typescript-eslint/scope-manager" "8.15.0"
1309-
"@typescript-eslint/types" "8.15.0"
1310-
"@typescript-eslint/typescript-estree" "8.15.0"
1308+
"@typescript-eslint/scope-manager" "8.16.0"
1309+
"@typescript-eslint/types" "8.16.0"
1310+
"@typescript-eslint/typescript-estree" "8.16.0"
13111311

1312-
"@typescript-eslint/visitor-keys@8.15.0":
1313-
version "8.15.0"
1314-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.15.0.tgz#9ea5a85eb25401d2aa74ec8a478af4e97899ea12"
1315-
integrity sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==
1312+
"@typescript-eslint/visitor-keys@8.16.0":
1313+
version "8.16.0"
1314+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.16.0.tgz#d5086afc060b01ff7a4ecab8d49d13d5a7b07705"
1315+
integrity sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==
13161316
dependencies:
1317-
"@typescript-eslint/types" "8.15.0"
1317+
"@typescript-eslint/types" "8.16.0"
13181318
eslint-visitor-keys "^4.2.0"
13191319

13201320
acorn-jsx@^5.3.2:
@@ -2965,10 +2965,10 @@ prettier-linter-helpers@^1.0.0:
29652965
dependencies:
29662966
fast-diff "^1.1.2"
29672967

2968-
prettier@3.3.3:
2969-
version "3.3.3"
2970-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105"
2971-
integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==
2968+
prettier@3.4.1:
2969+
version "3.4.1"
2970+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.4.1.tgz#e211d451d6452db0a291672ca9154bc8c2579f7b"
2971+
integrity sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==
29722972

29732973
pretty-format@^29.0.0, pretty-format@^29.7.0:
29742974
version "29.7.0"
@@ -3290,23 +3290,23 @@ type-fest@^0.8.1:
32903290
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
32913291

32923292
typescript-eslint@^8.13.0:
3293-
version "8.15.0"
3294-
resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.15.0.tgz#c8a2a0d183c3eb48ae176aa078c1b9daa584cf9d"
3295-
integrity sha512-wY4FRGl0ZI+ZU4Jo/yjdBu0lVTSML58pu6PgGtJmCufvzfV565pUF6iACQt092uFOd49iLOTX/sEVmHtbSrS+w==
3296-
dependencies:
3297-
"@typescript-eslint/eslint-plugin" "8.15.0"
3298-
"@typescript-eslint/parser" "8.15.0"
3299-
"@typescript-eslint/utils" "8.15.0"
3300-
3301-
typescript@5.6.3:
3302-
version "5.6.3"
3303-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
3304-
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==
3305-
3306-
undici-types@~6.19.8:
3307-
version "6.19.8"
3308-
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
3309-
integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
3293+
version "8.16.0"
3294+
resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.16.0.tgz#d608c972d6b2461ca10ec30fd3fa62a080baba19"
3295+
integrity sha512-wDkVmlY6O2do4V+lZd0GtRfbtXbeD0q9WygwXXSJnC1xorE8eqyC2L1tJimqpSeFrOzRlYtWnUp/uzgHQOgfBQ==
3296+
dependencies:
3297+
"@typescript-eslint/eslint-plugin" "8.16.0"
3298+
"@typescript-eslint/parser" "8.16.0"
3299+
"@typescript-eslint/utils" "8.16.0"
3300+
3301+
typescript@5.7.2:
3302+
version "5.7.2"
3303+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
3304+
integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
3305+
3306+
undici-types@~6.20.0:
3307+
version "6.20.0"
3308+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
3309+
integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
33103310

33113311
undici@^5.25.4:
33123312
version "5.28.4"

0 commit comments

Comments
 (0)