Merge pull request #285 from complexdatacollective/next

v2.1.1

Author: jthrilly

.github/workflows/build.yml

@@ -15,6 +15,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Use Latest Corepack
+        run: |
+          echo "Before: corepack version => $(corepack --version || echo 'not installed')"
+          npm install -g corepack@latest
+          echo "After : corepack version => $(corepack --version)"
+          corepack enable
+          pnpm --version
+
       - name: Enable Corepack
         run: corepack enable
 

actions/activityFeed.ts

@@ -1,4 +1,4 @@
-'use sever';
+'use server';
 
 import { safeRevalidateTag } from '~/lib/cache';
 import type { Activity, ActivityType } from '~/lib/data-table/types';

actions/participants.ts

@@ -56,6 +56,8 @@ export async function importParticipants(rawInput: unknown) {
   */
   const participantsWithIdentifiers = participantList.map((participant) => {
     return {
+      // Cannot use nullish coalescing here because of https://github.com/complexdatacollective/Fresco/pull/140/commits/06260b815558030b0605e14e5baf5a6ce238b1ab
+      // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
       identifier: !participant.identifier ? createId() : participant.identifier,
       label: participant.label === '' ? undefined : participant.label,
     };

components/DataTable/DataTable.tsx

@@ -96,7 +96,7 @@ export function DataTable<TData, TValue>({
   if (actions) {
     const actionsColumn = {
       id: 'actions',
-      header: () => (actionsHeader ? actionsHeader : null),
+      header: () => actionsHeader ?? null,
       cell: ({ row }: { row: Row<TData> }) => {
         const cellDeleteHandler = async (item: TData) => {
           await handleDeleteSelected?.([item]);
@@ -148,7 +148,7 @@ export function DataTable<TData, TValue>({
   return (
     <>
       {(filterColumnAccessorKey || headerItems) && (
-        <div className="flex items-center gap-2 pb-4 pt-1">
+        <div className="flex items-center gap-2 pt-1 pb-4">
           {filterColumnAccessorKey && (
             <Input
               name="filter"
@@ -222,7 +222,7 @@ export function DataTable<TData, TValue>({
       </div>
       <div>
         <div className="flex justify-between py-4">
-          <div className="text-sm text-muted-foreground">
+          <div className="text-muted-foreground text-sm">
             {table.getFilteredSelectedRowModel().rows.length} of{' '}
             {table.getFilteredRowModel().rows.length} row(s) selected.
           </div>

lib/network-exporters/formatters/graphml/__tests__/createGraphML.test.js

@@ -1,7 +1,7 @@
 /* eslint-env jest */
 
 import { ncUUIDProperty } from '@codaco/shared-consts';
-import { DOMParser, MIME_TYPE } from '@xmldom/xmldom';
+import { DOMParser } from '@xmldom/xmldom';
 import { beforeEach, describe, expect, it } from 'vitest';
 import {
   mockCodebook,
@@ -23,7 +23,7 @@ const buildXML = (...args) => {
   }
 
   const parser = new DOMParser();
-  const result = parser.parseFromString(xmlString, MIME_TYPE.XML_APPLICATION);
+  const result = parser.parseFromString(xmlString, 'text/xml');
   return result;
 };
 

lib/network-exporters/formatters/graphml/createGraphML.js

@@ -24,7 +24,7 @@ import {
   sessionProperty,
   sessionStartTimeProperty,
 } from '@codaco/shared-consts';
-import dom, { MIME_TYPE } from '@xmldom/xmldom';
+import dom from '@xmldom/xmldom';
 import {
   getAttributePropertyFromCodebook,
   getEntityAttributes,
@@ -110,7 +110,7 @@ const setUpXml = (exportOptions, sessionVariables) => {
   )}${xmlFooter}`;
   return new globalContext.DOMParser().parseFromString(
     graphMLOutline,
-    MIME_TYPE.XML_APPLICATION,
+    'text/xml',
   );
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fresco",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "private": true,
   "type": "module",
   "packageManager": "[email protected]+sha256.9551e803dcb7a1839fdf5416153a844060c7bce013218ce823410532504ac10b",
@@ -29,15 +29,15 @@
     "@hookform/resolvers": "^3.10.0",
     "@lucia-auth/adapter-prisma": "^3.0.2",
     "@paralleldrive/cuid2": "^2.2.2",
-    "@radix-ui/react-alert-dialog": "^1.1.4",
+    "@radix-ui/react-alert-dialog": "^1.1.5",
     "@radix-ui/react-checkbox": "^1.1.3",
     "@radix-ui/react-collapsible": "^1.1.2",
-    "@radix-ui/react-dialog": "^1.1.4",
+    "@radix-ui/react-dialog": "^1.1.5",
     "@radix-ui/react-dropdown-menu": "^2.1.4",
     "@radix-ui/react-label": "^2.1.1",
     "@radix-ui/react-popover": "^1.1.4",
     "@radix-ui/react-progress": "^1.1.1",
-    "@radix-ui/react-select": "^2.1.4",
+    "@radix-ui/react-select": "^2.1.5",
     "@radix-ui/react-separator": "^1.1.1",
     "@radix-ui/react-slot": "^1.1.1",
     "@radix-ui/react-switch": "^1.1.2",
@@ -47,7 +47,7 @@
     "@reduxjs/toolkit": "^1.9.7",
     "@tanstack/react-table": "^8.20.6",
     "@uploadthing/react": "^7.1.5",
-    "@xmldom/xmldom": "^0.9.6",
+    "@xmldom/xmldom": "^0.8.10",
     "animejs": "^2.2.0",
     "archiver": "^7.0.1",
     "async": "^3.2.6",
@@ -67,7 +67,7 @@
     "lucia": "^2.7.7",
     "lucide-react": "^0.471.1",
     "luxon": "^3.5.0",
-    "motion": "^11.13.1",
+    "motion": "^12.0.0",
     "next": "^14.2.23",
     "nuqs": "^1.19.1",
     "ohash": "^1.1.4",
@@ -124,13 +124,13 @@
     "@types/react": "^18.3.7",
     "@types/react-dom": "^18.3.1",
     "@types/redux-form": "^8.3.11",
-    "@types/uuid": "^9.0.8",
+    "@types/uuid": "^10.0.0",
     "@types/validator": "^13.12.2",
     "@typescript-eslint/eslint-plugin": "^8.20.0",
-    "@typescript-eslint/parser": "^8.20.0",
+    "@typescript-eslint/parser": "^8.21.0",
     "@vitejs/plugin-react": "^4.3.4",
     "eslint": "^8.57.1",
-    "eslint-config-next": "^15.1.4",
+    "eslint-config-next": "^15.1.5",
     "eslint-config-prettier": "^10.0.1",
     "jest": "^29.7.0",
     "jsdom": "^26.0.0",
@@ -143,6 +143,6 @@
     "tailwindcss-animate": "^1.0.7",
     "typescript": "5.7.3",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^2.1.8"
+    "vitest": "^2.1.9"
   }
 }