mirror of
https://github.com/transloadit/uppy.git
synced 2026-07-18 00:55:35 +00:00
Merge branch 'main' of https://github.com/transloadit/uppy
This commit is contained in:
commit
4298dd67ab
3 changed files with 9 additions and 15 deletions
|
|
@ -87,7 +87,7 @@ URL of the HTTP server (`string`, default: `null`).
|
|||
#### `method`
|
||||
|
||||
Configures which HTTP method to use for the upload (`string`, default:
|
||||
`'post'`).
|
||||
`'POST'`).
|
||||
|
||||
#### `formData`
|
||||
|
||||
|
|
|
|||
|
|
@ -457,19 +457,12 @@ export default class Transloadit<
|
|||
} else if (fileRemoved.id in updatedFiles) {
|
||||
delete updatedFiles[fileRemoved.id]
|
||||
const nbOfRemainingFiles = Object.keys(updatedFiles).length
|
||||
if (nbOfRemainingFiles === 0) {
|
||||
assembly.close()
|
||||
this.#cancelAssembly(newAssembly).catch(() => {
|
||||
|
||||
this.client
|
||||
.updateNumberOfFilesInAssembly(newAssembly, nbOfRemainingFiles)
|
||||
.catch(() => {
|
||||
/* ignore potential errors */
|
||||
})
|
||||
this.uppy.off('file-removed', fileRemovedHandler)
|
||||
} else {
|
||||
this.client
|
||||
.updateNumberOfFilesInAssembly(newAssembly, nbOfRemainingFiles)
|
||||
.catch(() => {
|
||||
/* ignore potential errors */
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
this.uppy.on('file-removed', fileRemovedHandler)
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ import { spawn } from 'node:child_process'
|
|||
|
||||
import prompts from 'prompts'
|
||||
|
||||
const atUppyPackagePath = /^packages\/(@uppy\/[a-z0-9-]+)\//
|
||||
const subsystem = /((?<=^packages\/)@uppy\/[a-z0-9-]+|(?<=^)(?:docs|e2e|examples))\//
|
||||
async function inferPackageForCommit (sha, spawnOptions) {
|
||||
const cp = spawn('git', ['--no-pager', 'log', '-1', '--name-only', sha], spawnOptions)
|
||||
const candidates = {}
|
||||
for await (const path of createInterface({ input: cp.stdout })) {
|
||||
const match = atUppyPackagePath.exec(path)
|
||||
const match = subsystem.exec(path)
|
||||
if (match != null) {
|
||||
candidates[match[1]] ??= 0
|
||||
candidates[match[1]]++
|
||||
|
|
@ -39,7 +39,7 @@ export default async function formatChangeLog (
|
|||
'--format="%H::%s::%an"',
|
||||
`${LAST_RELEASE_COMMIT}..HEAD`,
|
||||
], spawnOptions)
|
||||
const expectedFormat = /^"([a-f0-9]+)::(?:((?:@uppy\/[a-z0-9-]+(?:,@uppy\/[a-z0-9-]+)*)|meta|website):\s?)?(.+?)(\s\(#\d+\))?::(.+)"$/ // eslint-disable-line max-len
|
||||
const expectedFormat = /^"([a-f0-9]+)::(?:((?:@uppy\/[a-z0-9-]+(?:,@uppy\/[a-z0-9-]+)*)|meta|docs|e2e|examples):\s?)?(.+?)(\s\(#\d+\))?::(.+)"$/ // eslint-disable-line max-len
|
||||
for await (const log of createInterface({ input: gitLog.stdout })) {
|
||||
const [, sha, packageName, title, PR, authorName] = expectedFormat.exec(log)
|
||||
|
||||
|
|
@ -71,6 +71,7 @@ export default async function formatChangeLog (
|
|||
message: 'Which package(s) does this commit belong to?',
|
||||
min: 1,
|
||||
choices: [
|
||||
{ title: 'Docs', value: 'docs' },
|
||||
{ title: 'Meta', value: 'meta' },
|
||||
...Object.entries(candidates)
|
||||
.sort((a, b) => a[1] > b[1])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue