Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: test on Node.js v16.x #3205

Merged
merged 2 commits into from Sep 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cdn.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: Install npm 7
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Expand Up @@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x, 14.x]
node-version: [12.x, 14.x, 16.x]
steps:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: ${{matrix.node-version}}
- name: Install npm 7
Expand All @@ -29,7 +29,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: Install npm 7
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: Install npm 7
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: Install npm 7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/companion.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: ${{matrix.node-version}}
- name: Install npm 7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/end-to-end.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: Install npm 7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Node.js
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: Install npm 7
Expand Down
40 changes: 19 additions & 21 deletions packages/@uppy/dashboard/src/components/FileList.js
Expand Up @@ -68,27 +68,25 @@ module.exports = (props) => {
if (props.recoveredState) files.sort(sortByGhostComesFirst)
const rows = chunks(files, props.itemsPerRow)

function renderRow (row) {
return (
// The `role="presentation` attribute ensures that the list items are properly
// associated with the `VirtualList` element.
// We use the first file ID as the key—this should not change across scroll rerenders
<div role="presentation" key={row[0]}>
{row.map((fileID) => (
<FileItem
key={fileID}
uppy={props.uppy}
{...fileProps}
role="listitem"
openFileEditor={props.openFileEditor}
canEditFile={props.canEditFile}
toggleAddFilesPanel={props.toggleAddFilesPanel}
file={props.files[fileID]}
/>
))}
</div>
)
}
const renderRow = (row) => (
// The `role="presentation` attribute ensures that the list items are properly
// associated with the `VirtualList` element.
// We use the first file ID as the key—this should not change across scroll rerenders
<div role="presentation" key={row[0]}>
{row.map((fileID) => (
<FileItem
key={fileID}
uppy={props.uppy}
{...fileProps}
role="listitem"
openFileEditor={props.openFileEditor}
canEditFile={props.canEditFile}
toggleAddFilesPanel={props.toggleAddFilesPanel}
file={props.files[fileID]}
/>
))}
</div>
)

return (
<VirtualList
Expand Down