diff --git a/.yarn/patches/gh-pages-npm-6.3.0-d11c533b16.patch b/.yarn/patches/gh-pages-npm-6.3.0-d11c533b16.patch new file mode 100644 index 0000000..fd5642c --- /dev/null +++ b/.yarn/patches/gh-pages-npm-6.3.0-d11c533b16.patch @@ -0,0 +1,92 @@ +diff --git a/lib/git.js b/lib/git.js +index d4c5724272d00bd1f0d76c47dab47d21ccd094d9..3457c7c0fa30ee8294396ce1d3ef723ed838da93 100644 +--- a/lib/git.js ++++ b/lib/git.js +@@ -199,8 +199,7 @@ Git.prototype.push = function (remote, branch, force) { + * @return {Promise} A promise for the remote URL. + */ + Git.prototype.getRemoteUrl = function (remote) { +- return this.exec('config', '--get', 'remote.' + remote + '.url') +- .then((git) => { ++ const cleanOutput = (git) => { + const repo = git.output && git.output.split(/[\n\r]/).shift(); + if (repo) { + return repo; +@@ -209,7 +208,9 @@ Git.prototype.getRemoteUrl = function (remote) { + 'Failed to get repo URL from options or current directory.', + ); + } +- }) ++ }; ++ const pullURL = this.exec('config', '--get', 'remote.' + remote + '.url') ++ .then(cleanOutput) + .catch((err) => { + throw new Error( + 'Failed to get remote.' + +@@ -221,6 +222,7 @@ Git.prototype.getRemoteUrl = function (remote) { + 'or must be configured with the "repo" option).', + ); + }); ++ return Promise.all([pullURL, this.exec('config', '--get', 'remote.' + remote + '.pushurl').then(cleanOutput).catch(() => pullURL)]); + }; + + /** +@@ -235,7 +237,7 @@ Git.prototype.deleteRef = function (branch) { + + /** + * Clone a repo into the given dir if it doesn't already exist. +- * @param {string} repo Repository URL. ++ * @param {[string, string]} repo Repository URL. + * @param {string} dir Target directory. + * @param {string} branch Branch name. + * @param {options} options All options. +@@ -249,7 +251,7 @@ Git.clone = function clone(repo, dir, branch, options) { + return fs.mkdirp(path.dirname(path.resolve(dir))).then(() => { + const args = [ + 'clone', +- repo, ++ repo[0], + dir, + '--branch', + branch, +@@ -264,14 +266,17 @@ Git.clone = function clone(repo, dir, branch, options) { + // try again without branch or depth options + return spawn(options.git, [ + 'clone', +- repo, ++ repo[0], + dir, + '--origin', + options.remote, + ]); + }) + .then(() => new Git(dir, options.git)); +- }); ++ }).then(repo[0] !== repo[1] ? ++ (g) => spawn(options.git, ['remote', 'set-url', '--push', options.remote, repo[1]], dir).then(() => g) : ++ undefined ++ ); + } + }); + }; +diff --git a/lib/index.js b/lib/index.js +index 7b1365b89f96cdb97be12c534215ea390b04ce1a..fbb7a5fc0c6107860e48787294b84884f509732e 100644 +--- a/lib/index.js ++++ b/lib/index.js +@@ -132,13 +132,13 @@ exports.publish = function publish(basePath, config, callback) { + getRepo(options) + .then((repo) => { + repoUrl = repo; +- const clone = getCacheDir(repo); +- log('Cloning %s into %s', repo, clone); ++ const clone = getCacheDir(repo[0]); ++ log('Cloning %s into %s', repo[0], clone); + return Git.clone(repo, clone, options.branch, options); + }) + .then((git) => { + return git.getRemoteUrl(options.remote).then((url) => { +- if (url !== repoUrl) { ++ if (url[0] !== repoUrl[0] || url[1] !== repoUrl[1]) { + const message = + 'Remote url mismatch. Got "' + + url + diff --git a/packages/web-ui/package.json b/packages/web-ui/package.json index 0f4d351..4589d6d 100644 --- a/packages/web-ui/package.json +++ b/packages/web-ui/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@sveltejs/vite-plugin-svelte": "^6.0.1", "@tsconfig/svelte": "^5.0.0", - "gh-pages": "^4.0.0", + "gh-pages": "patch:gh-pages@npm%3A6.3.0#~/.yarn/patches/gh-pages-npm-6.3.0-d11c533b16.patch", "svelte": "^5.0.0", "svelte-check": "^4.0.0", "svelte-preprocess": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index 02cb371..c4adecd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -983,28 +983,17 @@ __metadata: languageName: node linkType: hard -"array-union@npm:^1.0.1": - version: 1.0.2 - resolution: "array-union@npm:1.0.2" - dependencies: - array-uniq: "npm:^1.0.1" - checksum: 10/82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d - languageName: node - linkType: hard - -"array-uniq@npm:^1.0.1": - version: 1.0.3 - resolution: "array-uniq@npm:1.0.3" - checksum: 10/1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e +"array-union@npm:^2.1.0": + version: 2.1.0 + resolution: "array-union@npm:2.1.0" + checksum: 10/5bee12395cba82da674931df6d0fea23c4aa4660cb3b338ced9f828782a65caa232573e6bf3968f23e0c5eb301764a382cef2f128b170a9dc59de0e36c39f98d languageName: node linkType: hard -"async@npm:^2.6.1": - version: 2.6.4 - resolution: "async@npm:2.6.4" - dependencies: - lodash: "npm:^4.17.14" - checksum: 10/df8e52817d74677ab50c438d618633b9450aff26deb274da6dfedb8014130909482acdc7753bce9b72e6171ce9a9f6a92566c4ced34c3cb3714d57421d58ad27 +"async@npm:^3.2.4": + version: 3.2.6 + resolution: "async@npm:3.2.6" + checksum: 10/cb6e0561a3c01c4b56a799cc8bab6ea5fef45f069ab32500b6e19508db270ef2dffa55e5aed5865c5526e9907b1f8be61b27530823b411ffafb5e1538c86c368 languageName: node linkType: hard @@ -1151,10 +1140,10 @@ __metadata: languageName: node linkType: hard -"commander@npm:^2.18.0": - version: 2.20.3 - resolution: "commander@npm:2.20.3" - checksum: 10/90c5b6898610cd075984c58c4f88418a4fb44af08c1b1415e9854c03171bec31b336b7f3e4cefe33de994b3f12b03c5e2d638da4316df83593b9e82554e7e95b +"commander@npm:^13.0.0": + version: 13.1.0 + resolution: "commander@npm:13.1.0" + checksum: 10/d3b4b79e6be8471ddadacbb8cd441fe82154d7da7393b50e76165a9e29ccdb74fa911a186437b9a211d0fc071db6051915c94fb8ef16d77511d898e9dbabc6af languageName: node linkType: hard @@ -1209,6 +1198,15 @@ __metadata: languageName: node linkType: hard +"dir-glob@npm:^3.0.1": + version: 3.0.1 + resolution: "dir-glob@npm:3.0.1" + dependencies: + path-type: "npm:^4.0.0" + checksum: 10/fa05e18324510d7283f55862f3161c6759a3f2f8dbce491a2fc14c8324c498286c54282c1f0e933cb930da8419b30679389499b919122952a4f8592362ef4615 + languageName: node + linkType: hard + "eastasianwidth@npm:^0.2.0": version: 0.2.0 resolution: "eastasianwidth@npm:0.2.0" @@ -1216,10 +1214,10 @@ __metadata: languageName: node linkType: hard -"email-addresses@npm:^3.0.1": - version: 3.1.0 - resolution: "email-addresses@npm:3.1.0" - checksum: 10/b3723f396fcb81e5f4752aa16a4c8bc8eea3905c3e6f14b44ace6e5ba00a29335b5792627989e47614323acfa1ea0fa07fe6eb55103f57db006c668f4937dc3a +"email-addresses@npm:^5.0.0": + version: 5.0.0 + resolution: "email-addresses@npm:5.0.0" + checksum: 10/a7897e3b43893f1e9cc61f0e8c7cbe59c36c6cdd0b5ad7e4061f1976893260f496fd799fb78b2621e483a95fa6c7caec4a035ba320193d9540159dfcdb737004 languageName: node linkType: hard @@ -1517,7 +1515,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.3.2": +"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.2": version: 3.3.3 resolution: "fast-glob@npm:3.3.3" dependencies: @@ -1659,14 +1657,14 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^8.1.0": - version: 8.1.0 - resolution: "fs-extra@npm:8.1.0" +"fs-extra@npm:^11.1.1": + version: 11.3.1 + resolution: "fs-extra@npm:11.3.1" dependencies: graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^4.0.0" - universalify: "npm:^0.1.0" - checksum: 10/6fb12449f5349be724a138b4a7b45fe6a317d2972054517f5971959c26fbd17c0e145731a11c7324460262baa33e0a799b183ceace98f7a372c95fbb6f20f5de + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 10/2b893213411b1da11f9b061ccb0bcff4d6dd66fe90aa8f5b1616219a5e7ca659da869f454ebd8e94aa21c58342730fb43a2e5c98b5c6c5124f0c54a4633f64b0 languageName: node linkType: hard @@ -1679,13 +1677,6 @@ __metadata: languageName: node linkType: hard -"fs.realpath@npm:^1.0.0": - version: 1.0.0 - resolution: "fs.realpath@npm:1.0.0" - checksum: 10/e703107c28e362d8d7b910bbcbfd371e640a3bb45ae157a362b5952c0030c0b6d4981140ec319b347bce7adc025dd7813da1ff908a945ac214d64f5402a51b96 - languageName: node - linkType: hard - "fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -1712,21 +1703,39 @@ __metadata: languageName: node linkType: hard -"gh-pages@npm:^4.0.0": - version: 4.0.0 - resolution: "gh-pages@npm:4.0.0" +"gh-pages@npm:6.3.0": + version: 6.3.0 + resolution: "gh-pages@npm:6.3.0" dependencies: - async: "npm:^2.6.1" - commander: "npm:^2.18.0" - email-addresses: "npm:^3.0.1" + async: "npm:^3.2.4" + commander: "npm:^13.0.0" + email-addresses: "npm:^5.0.0" filenamify: "npm:^4.3.0" find-cache-dir: "npm:^3.3.1" - fs-extra: "npm:^8.1.0" - globby: "npm:^6.1.0" + fs-extra: "npm:^11.1.1" + globby: "npm:^11.1.0" bin: gh-pages: bin/gh-pages.js gh-pages-clean: bin/gh-pages-clean.js - checksum: 10/f5c207b14bd88e2a2e043d1f9a95b6f402be010db9aad054f75f991dfeebaa9840fd9b6575b93804396d86ecc6b617bc5bdc2f9f0dba5fa357b90cc1856e2c39 + checksum: 10/43b0cb353306419e270a7a7e62fa39dc202b63bf01690fb722728e196d6ab73efbead9f639f14d893a6c9d32bc8c5ae806bf0a30c6731a4071f200732403ff08 + languageName: node + linkType: hard + +"gh-pages@patch:gh-pages@npm%3A6.3.0#~/.yarn/patches/gh-pages-npm-6.3.0-d11c533b16.patch": + version: 6.3.0 + resolution: "gh-pages@patch:gh-pages@npm%3A6.3.0#~/.yarn/patches/gh-pages-npm-6.3.0-d11c533b16.patch::version=6.3.0&hash=bf3d05" + dependencies: + async: "npm:^3.2.4" + commander: "npm:^13.0.0" + email-addresses: "npm:^5.0.0" + filenamify: "npm:^4.3.0" + find-cache-dir: "npm:^3.3.1" + fs-extra: "npm:^11.1.1" + globby: "npm:^11.1.0" + bin: + gh-pages: bin/gh-pages.js + gh-pages-clean: bin/gh-pages-clean.js + checksum: 10/e67dfd51135b103ff6a535e56ca3a843fad750ff2f03017ac4af96a8ca2289e979372abdf8afbea7be4b90e52856e09a16bfafd558b8ed5b921c1e3d8ad445aa languageName: node linkType: hard @@ -1764,20 +1773,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.3": - version: 7.2.3 - resolution: "glob@npm:7.2.3" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^3.1.1" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 10/59452a9202c81d4508a43b8af7082ca5c76452b9fcc4a9ab17655822e6ce9b21d4f8fbadabe4fe3faef448294cec249af305e2cd824b7e9aaf689240e5e96a7b - languageName: node - linkType: hard - "globals@npm:^14.0.0": version: 14.0.0 resolution: "globals@npm:14.0.0" @@ -1785,16 +1780,17 @@ __metadata: languageName: node linkType: hard -"globby@npm:^6.1.0": - version: 6.1.0 - resolution: "globby@npm:6.1.0" +"globby@npm:^11.1.0": + version: 11.1.0 + resolution: "globby@npm:11.1.0" dependencies: - array-union: "npm:^1.0.1" - glob: "npm:^7.0.3" - object-assign: "npm:^4.0.1" - pify: "npm:^2.0.0" - pinkie-promise: "npm:^2.0.0" - checksum: 10/18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424 + array-union: "npm:^2.1.0" + dir-glob: "npm:^3.0.1" + fast-glob: "npm:^3.2.9" + ignore: "npm:^5.2.0" + merge2: "npm:^1.4.1" + slash: "npm:^3.0.0" + checksum: 10/288e95e310227bbe037076ea81b7c2598ccbc3122d87abc6dab39e1eec309aa14f0e366a98cdc45237ffcfcbad3db597778c0068217dcb1950fef6249104e1b1 languageName: node linkType: hard @@ -1886,23 +1882,6 @@ __metadata: languageName: node linkType: hard -"inflight@npm:^1.0.4": - version: 1.0.6 - resolution: "inflight@npm:1.0.6" - dependencies: - once: "npm:^1.3.0" - wrappy: "npm:1" - checksum: 10/d2ebd65441a38c8336c223d1b80b921b9fa737e37ea466fd7e253cb000c64ae1f17fa59e68130ef5bda92cfd8d36b83d37dab0eb0a4558bcfec8e8cdfd2dcb67 - languageName: node - linkType: hard - -"inherits@npm:2": - version: 2.0.4 - resolution: "inherits@npm:2.0.4" - checksum: 10/cd45e923bee15186c07fa4c89db0aace24824c482fb887b528304694b2aa6ff8a898da8657046a5dcf3e46cd6db6c61629551f9215f208d7c3f157cf9b290521 - languageName: node - linkType: hard - "ip-address@npm:^9.0.5": version: 9.0.5 resolution: "ip-address@npm:9.0.5" @@ -2018,15 +1997,16 @@ __metadata: languageName: node linkType: hard -"jsonfile@npm:^4.0.0": - version: 4.0.0 - resolution: "jsonfile@npm:4.0.0" +"jsonfile@npm:^6.0.1": + version: 6.1.0 + resolution: "jsonfile@npm:6.1.0" dependencies: graceful-fs: "npm:^4.1.6" + universalify: "npm:^2.0.0" dependenciesMeta: graceful-fs: optional: true - checksum: 10/17796f0ab1be8479827d3683433f97ebe0a1c6932c3360fa40348eac36904d69269aab26f8b16da311882d94b42e9208e8b28e490bf926364f3ac9bff134c226 + checksum: 10/03014769e7dc77d4cf05fa0b534907270b60890085dd5e4d60a382ff09328580651da0b8b4cdf44d91e4c8ae64d91791d965f05707beff000ed494a38b6fec85 languageName: node linkType: hard @@ -2088,13 +2068,6 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.17.14": - version: 4.17.21 - resolution: "lodash@npm:4.17.21" - checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532 - languageName: node - linkType: hard - "lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": version: 10.4.3 resolution: "lru-cache@npm:10.4.3" @@ -2139,7 +2112,7 @@ __metadata: languageName: node linkType: hard -"merge2@npm:^1.3.0": +"merge2@npm:^1.3.0, merge2@npm:^1.4.1": version: 1.4.1 resolution: "merge2@npm:1.4.1" checksum: 10/7268db63ed5169466540b6fb947aec313200bcf6d40c5ab722c22e242f651994619bcd85601602972d3c85bd2cc45a358a4c61937e9f11a061919a1da569b0c2 @@ -2156,7 +2129,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -2327,22 +2300,6 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4.0.1": - version: 4.1.1 - resolution: "object-assign@npm:4.1.1" - checksum: 10/fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f - languageName: node - linkType: hard - -"once@npm:^1.3.0": - version: 1.4.0 - resolution: "once@npm:1.4.0" - dependencies: - wrappy: "npm:1" - checksum: 10/cd0a88501333edd640d95f0d2700fbde6bff20b3d4d9bdc521bdd31af0656b5706570d6c6afe532045a20bb8dc0849f8332d6f2a416e0ba6d3d3b98806c7db68 - languageName: node - linkType: hard - "optionator@npm:^0.9.3": version: 0.9.4 resolution: "optionator@npm:0.9.4" @@ -2430,13 +2387,6 @@ __metadata: languageName: node linkType: hard -"path-is-absolute@npm:^1.0.0": - version: 1.0.1 - resolution: "path-is-absolute@npm:1.0.1" - checksum: 10/060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8 - languageName: node - linkType: hard - "path-key@npm:^3.1.0": version: 3.1.1 resolution: "path-key@npm:3.1.1" @@ -2454,6 +2404,13 @@ __metadata: languageName: node linkType: hard +"path-type@npm:^4.0.0": + version: 4.0.0 + resolution: "path-type@npm:4.0.0" + checksum: 10/5b1e2daa247062061325b8fdbfd1fb56dde0a448fb1455453276ea18c60685bdad23a445dc148cf87bc216be1573357509b7d4060494a6fd768c7efad833ee45 + languageName: node + linkType: hard + "picocolors@npm:^1.0.0, picocolors@npm:^1.1.1": version: 1.1.1 resolution: "picocolors@npm:1.1.1" @@ -2482,29 +2439,6 @@ __metadata: languageName: node linkType: hard -"pify@npm:^2.0.0": - version: 2.3.0 - resolution: "pify@npm:2.3.0" - checksum: 10/9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba - languageName: node - linkType: hard - -"pinkie-promise@npm:^2.0.0": - version: 2.0.1 - resolution: "pinkie-promise@npm:2.0.1" - dependencies: - pinkie: "npm:^2.0.0" - checksum: 10/b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca - languageName: node - linkType: hard - -"pinkie@npm:^2.0.0": - version: 2.0.4 - resolution: "pinkie@npm:2.0.4" - checksum: 10/11d207257a044d1047c3755374d36d84dda883a44d030fe98216bf0ea97da05a5c9d64e82495387edeb9ee4f52c455bca97cdb97629932be65e6f54b29f5aec8 - languageName: node - linkType: hard - "pkg-dir@npm:^4.1.0": version: 4.2.0 resolution: "pkg-dir@npm:4.2.0" @@ -2739,6 +2673,13 @@ __metadata: languageName: node linkType: hard +"slash@npm:^3.0.0": + version: 3.0.0 + resolution: "slash@npm:3.0.0" + checksum: 10/94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c + languageName: node + linkType: hard + "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" @@ -3061,10 +3002,10 @@ __metadata: languageName: node linkType: hard -"universalify@npm:^0.1.0": - version: 0.1.2 - resolution: "universalify@npm:0.1.2" - checksum: 10/40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff +"universalify@npm:^2.0.0": + version: 2.0.1 + resolution: "universalify@npm:2.0.1" + checksum: 10/ecd8469fe0db28e7de9e5289d32bd1b6ba8f7183db34f3bfc4ca53c49891c2d6aa05f3fb3936a81285a905cc509fb641a0c3fc131ec786167eff41236ae32e60 languageName: node linkType: hard @@ -3152,7 +3093,7 @@ __metadata: "@node-core/caritat-crypto": "workspace:*" "@sveltejs/vite-plugin-svelte": "npm:^6.0.1" "@tsconfig/svelte": "npm:^5.0.0" - gh-pages: "npm:^4.0.0" + gh-pages: "patch:gh-pages@npm%3A6.3.0#~/.yarn/patches/gh-pages-npm-6.3.0-d11c533b16.patch" svelte: "npm:^5.0.0" svelte-check: "npm:^4.0.0" svelte-preprocess: "npm:^6.0.0" @@ -3213,13 +3154,6 @@ __metadata: languageName: node linkType: hard -"wrappy@npm:1": - version: 1.0.2 - resolution: "wrappy@npm:1.0.2" - checksum: 10/159da4805f7e84a3d003d8841557196034155008f817172d4e986bd591f74aa82aa7db55929a54222309e01079a65a92a9e6414da5a6aa4b01ee44a511ac3ee5 - languageName: node - linkType: hard - "y18n@npm:^5.0.5": version: 5.0.8 resolution: "y18n@npm:5.0.8"