@antora/content-aggregator 3.1.1 → 3.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/aggregate-content.js +7 -5
- package/package.json +4 -4
package/lib/aggregate-content.js
CHANGED
|
@@ -303,6 +303,8 @@ async function selectReferences (source, repo, remote) {
|
|
|
303
303
|
? worktreePatterns.map((pattern) => String(pattern))
|
|
304
304
|
: splitRefPatterns(String(worktreePatterns))
|
|
305
305
|
}
|
|
306
|
+
} else {
|
|
307
|
+
worktreePatterns = []
|
|
306
308
|
}
|
|
307
309
|
const branchPatternsString = String(branchPatterns)
|
|
308
310
|
if (branchPatternsString === 'HEAD' || branchPatternsString === '.') {
|
|
@@ -823,11 +825,11 @@ function onGitComplete (err) {
|
|
|
823
825
|
}
|
|
824
826
|
|
|
825
827
|
function resolveCredentials (credentialsFromUrlHolder, url, auth) {
|
|
826
|
-
const credentialsFromUrl = credentialsFromUrlHolder.get()
|
|
828
|
+
const credentialsFromUrl = credentialsFromUrlHolder.get() || {}
|
|
829
|
+
credentialsFromUrlHolder.clear()
|
|
827
830
|
if ('Authorization' in auth.headers) {
|
|
828
|
-
if (!credentialsFromUrl) return this.rejected({ url, auth })
|
|
829
|
-
|
|
830
|
-
} else if (credentialsFromUrl) {
|
|
831
|
+
if (!('username' in credentialsFromUrl)) return this.rejected({ url, auth })
|
|
832
|
+
} else if ('username' in credentialsFromUrl) {
|
|
831
833
|
return credentialsFromUrl
|
|
832
834
|
} else {
|
|
833
835
|
auth = undefined
|
|
@@ -883,7 +885,7 @@ function resolveRemoteUrl (repo, remoteName) {
|
|
|
883
885
|
* Checks whether the specified URL matches a directory on the local filesystem.
|
|
884
886
|
*
|
|
885
887
|
* @param {String} url - The URL to check.
|
|
886
|
-
* @
|
|
888
|
+
* @returns {Boolean} A flag indicating whether the URL matches a directory on the local filesystem.
|
|
887
889
|
*/
|
|
888
890
|
function isDirectory (url) {
|
|
889
891
|
return fsp.stat(url).then((stat) => stat.isDirectory(), invariably.false)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antora/content-aggregator",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.2",
|
|
4
4
|
"description": "Fetches and aggregates content from distributed sources for use in an Antora documentation pipeline.",
|
|
5
5
|
"license": "MPL-2.0",
|
|
6
6
|
"author": "OpenDevise Inc. (https://opendevise.com)",
|
|
@@ -29,13 +29,13 @@
|
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@antora/expand-path-helper": "~2.0",
|
|
32
|
-
"@antora/logger": "3.1.
|
|
32
|
+
"@antora/logger": "3.1.2",
|
|
33
33
|
"@antora/user-require-helper": "~2.0",
|
|
34
34
|
"braces": "~3.0",
|
|
35
35
|
"cache-directory": "~2.0",
|
|
36
36
|
"glob-stream": "~7.0",
|
|
37
|
-
"hpagent": "~1.
|
|
38
|
-
"isomorphic-git": "~1.
|
|
37
|
+
"hpagent": "~1.1",
|
|
38
|
+
"isomorphic-git": "~1.21",
|
|
39
39
|
"js-yaml": "~4.1",
|
|
40
40
|
"multi-progress": "~4.0",
|
|
41
41
|
"picomatch": "~2.3",
|