ARCHITECHTURE.md

@@ -2,10 +2,8 @@ git monorepo.
 
 pnpm required for workspaces.
 
+Yarn required for packages/strapi.
+
 Kubernetes for Development using Tiltfile
 
-dokku for Production, deployed with `git push`.
-
-(dokku is slowly being replaced by Kubernetes)
-
 Kubernetes for Production, deployed using Helm/helmfile

LICENSE

@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <https://unlicense.org>

Makefile

@@ -3,14 +3,6 @@ include .env
 
 all: minikube secrets tilt
 
-bootstrap:
-	helm install --create-namespace -n crd-bootstrap crd-bootstrap oci://ghcr.io/skarlso/helm/crd-bootstrap --version v0.6.0
-
-helmsman:
-	helmsman --apply -f ./helmsman.yaml
-
-deploy: bootstrap helmsman secrets
-
 tilt:
 	tilt up
 
@@ -19,30 +11,16 @@ secrets:
 	kubectl create secret generic link2cid \
 	--from-literal=apiKey=${LINK2CID_API_KEY}
 
-	kubectl --namespace cert-manager delete secret vultr-credentials --ignore-not-found
-	kubectl --namespace cert-manager create secret generic vultr-credentials \
-	--from-literal=apiKey=${VULTR_API_KEY}
-
 	kubectl delete secret vultr --ignore-not-found
 	kubectl create secret generic vultr \
-	--from-literal=containerRegistryUsername=${VULTR_CONTAINER_REGISTRY_USERNAME} \
+	--from-literal=vultr=${VULTR_CONTAINER_REGISTRY_USERNAME}
-	--from-literal=apiKey=${VULTR_API_KEY}
-
-	kubectl delete secret postgres --ignore-not-found
-	kubectl create secret generic postgres \
-	--from-literal=password=${POSTGRES_PASSWORD}
-
-	kubectl delete secret pgadmin --ignore-not-found
-	kubectl create secret generic pgadmin \
-	--from-literal=defaultEmail=${PGADMIN_DEFAULT_EMAIL} \
-	--from-literal=defaultPassword=${PGADMIN_DEFAULT_PASSWORD}
 
 	kubectl delete secret strapi --ignore-not-found
 	kubectl create secret generic strapi \
 	--from-literal=adminJwtSecret=${STRAPI_ADMIN_JWT_SECRET} \
 	--from-literal=apiTokenSalt=${STRAPI_API_TOKEN_SALT} \
-	--from-literal=appKeys=${STRAPI_APP_KEYS} \
+	--from-literal=appKeys=${APP_KEYS} \
-	--from-literal=databaseUrl=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} \
+	--from-literal=databaseUrl=postgres://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME} \
 	--from-literal=jwtSecret=${STRAPI_JWT_SECRET} \
 	--from-literal=muxPlaybackRestrictionId=${MUX_PLAYBACK_RESTRICTION_ID} \
 	--from-literal=muxSigningKeyPrivateKey=${MUX_SIGNING_KEY_PRIVATE_KEY} \

README.md

@@ -1,126 +1,25 @@
-[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=v3.17.0&x2=0)](https://github.com/Praqma/helmsman/releases) [![CircleCI](https://circleci.com/gh/Praqma/helmsman/tree/master.svg?style=svg)](https://circleci.com/gh/Praqma/helmsman/tree/master)
+# futureporn-monorepo
 
-![helmsman-logo](docs/images/helmsman.png)
+## development
 
-> Helmsman v3.0.0 works only with Helm versions >=3.0.0. For older Helm versions, use Helmsman v1.x
+[Tilt](https://docs.tilt.dev/) Handles auto-reloading dev containers when making changes to code.
 
-# What is Helmsman?
+### dependencies
 
-Helmsman is a Helm Charts (k8s applications) as Code tool which allows you to automate the deployment/management of your Helm charts from version controlled code.
+docker
+minikube
+ctlptl
+tilt
 
-# How does it work?
+### setup
 
-Helmsman uses a simple declarative [TOML](https://github.com/toml-lang/toml) file to allow you to describe a desired state for your k8s applications as in the [example toml file](https://github.com/Praqma/helmsman/blob/master/examples/example.toml).
+I would love for this to be a single command, `tilt up`, but minikube needs to get started and needs some addons.
-Alternatively YAML declaration is also acceptable [example yaml file](https://github.com/Praqma/helmsman/blob/master/examples/example.yaml).
 
-The desired state file (DSF) follows the [desired state specification](https://github.com/Praqma/helmsman/blob/master/docs/desired_state_specification.md).
+@todo figure out a way to incorporate the minikube setup with `tilt up`
 
-Helmsman sees what you desire, validates that your desire makes sense (e.g. that the charts you desire are available in the repos you defined), compares it with the current state of Helm and figures out what to do to make your desire come true.
+When enabling `csi-hostpath-driver`, it appears like it's locked up, but be sure to be patient and WAIT. It's just slow.
 
-To plan without executing:
 
-```sh
-helmsman -f example.toml
 ```
-
+make cluster
-To plan and execute the plan:
-
-```sh
-helmsman --apply -f example.toml
 ```
-
-To show debugging details:
-
-```sh
-helmsman --debug --apply -f example.toml
-```
-
-To run a dry-run:
-
-```sh
-helmsman --debug --dry-run -f example.toml
-```
-
-To limit execution to specific application:
-
-```sh
-helmsman --debug --dry-run --target artifactory -f example.toml
-```
-
-# Features
-
-- **Built for CD**: Helmsman can be used as a docker image or a binary.
-- **Applications as code**: describe your desired applications and manage them from a single version-controlled declarative file.
-- **Suitable for Multitenant Clusters**: deploy Tiller in different namespaces with service accounts and TLS (versions 1.x).
-- **Easy to use**: deep knowledge of Helm CLI and Kubectl is NOT mandatory to use Helmsman.
-- **Plan, View, apply**: you can run Helmsman to generate and view a plan with/without executing it.
-- **Portable**: Helmsman can be used to manage charts deployments on any k8s cluster.
-- **Protect Namespaces/Releases**: you can define certain namespaces/releases to be protected against accidental human mistakes.
-- **Define the order of managing releases**: you can define the priorities at which releases are managed by helmsman (useful for dependencies).
-- **Parallelise**: Releases with the same priority can be executed in parallel.
-- **Idempotency**: As long your desired state file does not change, you can execute Helmsman several times and get the same result.
-- **Continue from failures**: In the case of partial deployment due to a specific chart deployment failure, fix your helm chart and execute Helmsman again without needing to rollback the partial successes first.
-
-# Install
-
-## From binary
-
-Please make sure the following are installed prior to using `helmsman` as a binary (the docker image contains all of them):
-
-- [kubectl](https://github.com/kubernetes/kubectl)
-- [helm](https://github.com/helm/helm) (helm >=v2.10.0 for `helmsman` >= 1.6.0, helm >=v3.0.0 for `helmsman` >=v3.0.0)
-- [helm-diff](https://github.com/databus23/helm-diff) (`helmsman` >= 1.6.0)
-
-If you use private helm repos, you will need either `helm-gcs` or `helm-s3` plugin or you can use basic auth to authenticate to your repos. See the [docs](https://github.com/Praqma/helmsman/blob/master/docs/how_to/helm_repos) for details.
-
-Check the [releases page](https://github.com/Praqma/Helmsman/releases) for the different versions.
-
-```sh
-# on Linux
-curl -L https://github.com/Praqma/helmsman/releases/download/v3.11.0/helmsman_3.11.0_linux_amd64.tar.gz | tar zx
-# on MacOS
-curl -L https://github.com/Praqma/helmsman/releases/download/v3.11.0/helmsman_3.11.0_darwin_amd64.tar.gz | tar zx
-
-mv helmsman /usr/local/bin/helmsman
-```
-
-## As a docker image
-
-Check the images on [dockerhub](https://hub.docker.com/r/praqma/helmsman/tags/)
-
-## As a package
-
-Helmsman has been packaged in Archlinux under `helmsman-bin` for the latest binary release, and `helmsman-git` for master.
-
-You can also install Helmsman using [Homebrew](https://brew.sh)
-
-```sh
-brew install helmsman
-```
-
-## As an [asdf-vm](https://asdf-vm.com/) plugin
-
-```sh
-asdf plugin-add helmsman
-asdf install helmsman latest
-```
-
-# Documentation
-
-> Documentation for Helmsman v1.x can be found at: [docs v1.x](https://github.com/Praqma/helmsman/tree/1.x/docs)
-
-- [How-Tos](https://github.com/Praqma/helmsman/blob/master/docs/how_to/).
-- [Desired state specification](https://github.com/Praqma/helmsman/blob/master/docs/desired_state_specification.md).
-- [CMD reference](https://github.com/Praqma/helmsman/blob/master/docs/cmd_reference.md)
-
-## Usage
-
-Helmsman can be used in three different settings:
-
-- [As a binary with a hosted cluster](https://github.com/Praqma/helmsman/blob/master/docs/how_to/settings).
-- [As a docker image in a CI system or local machine](https://github.com/Praqma/helmsman/blob/master/docs/how_to/deployments/ci.md) Always use a tagged docker image from [dockerhub](https://hub.docker.com/r/praqma/helmsman/) as the `latest` image can (at times) be unstable.
-- [As a docker image inside a k8s cluster](https://github.com/Praqma/helmsman/blob/master/docs/how_to/deployments/inside_k8s.md)
-
-# Contributing
-
-Pull requests, feedback/feature requests are welcome. Please check our [contribution guide](CONTRIBUTION.md).

Tiltfile

@@ -1,5 +1,5 @@
-# start Tilt with no enabled resources
+# load('ext://dotenv', 'dotenv')
-config.clear_enabled_resources()
+# dotenv()
 
 k8s_yaml(helm(
     './charts/fp',
@@ -11,20 +11,12 @@ docker_build(
     'fp/strapi',
     '.',
     dockerfile='strapi.dockerfile',
-    target='release',
+    target='dev',
     live_update=[
         sync('./packages/strapi', '/app')
     ]
 )
 
-load('ext://uibutton', 'cmd_button')
-cmd_button('postgres:restore',
-        argv=['sh', '-c', 'cd letters && yarn install'],
-        resource='postgres',
-        icon_name='cloud_download',
-        text='restore db from backup',
-)
-
 
 ## Uncomment the following for fp/next in dev mode
 ## this is useful for changing the UI and seeing results
@@ -45,7 +37,7 @@ docker_build(
 
 
 k8s_resource(
-    workload='link2cid', 
+    workload='link2cid-pod', 
     port_forwards=3939,
     links=[
         link('http://localhost:3939/health', 'link2cid Health')
@@ -64,6 +56,12 @@ k8s_resource(
     workload='next-pod',
     port_forwards=['3000'],
 )
+
+# k8s_resource(
+#     workload='pgadmin-pod',
+#     port_forwards=['5050']
+# )
+
 k8s_resource(
     workload='strapi-pod',
     port_forwards=['1337'],
@@ -72,26 +70,9 @@ k8s_resource(
     ]
 )
 
-k8s_resource(
-    workload='postgres-pod',
-)
-k8s_resource(
-    workload='pgadmin-pod',
-    port_forwards=['5050']
-)
-
 
 # v1alpha1.extension_repo(name='default', url='https://github.com/tilt-dev/tilt-extensions')
 # v1alpha1.extension(name='ngrok', repo_name='default', repo_path='ngrok')
 
 # settings = read_json('tilt_option.json', default={})
 # default_registry(settings.get('default_registry', 'sjc.vultrcr.com/fpcontainers'))
-
-config.set_enabled_resources([
-    'pgadmin-pod',
-    'postgres-pod',
-    'strapi-pod', 
-    'next-pod',
-    'ipfs-pod',
-    'link2cid',
-])

charts/cert-manager/values-prod.yaml

@@ -1 +0,0 @@
-installCRDs: true

charts/fp/templates-old/bar.yaml

@@ -1,26 +0,0 @@
-kind: Pod
-apiVersion: v1
-metadata:
-  name: bar-app
-  labels:
-    app: bar
-spec:
-  containers:
-    - name: bar-app
-      image: 'kicbase/echo-server:1.0'
-      resources:
-        limits:
-          cpu: 200m
-          memory: 512Mi
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: bar-service
-  annotations:
-    external-dns.alpha.kubernetes.io/hostname: foo.disaster.futureporn.net
-spec:
-  selector:
-    app: bar
-  ports:
-    - port: 8080

charts/fp/templates-old/foo-bar-ingress.yaml

@@ -1,26 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: foo-bar-ingress
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: disaster.futureporn.com
-      http:
-        paths:
-        - pathType: Prefix
-          path: /foo
-          backend:
-            service:
-              name: foo-service
-              port:
-                number: 8080
-        - pathType: Prefix
-          path: /bar
-          backend:
-            service:
-              name: bar-service
-              port:
-                number: 8080

charts/fp/templates-old/foo.yaml

@@ -1,26 +0,0 @@
-kind: Pod
-apiVersion: v1
-metadata:
-  name: foo-app
-  labels:
-    app: foo
-spec:
-  containers:
-    - name: foo-app
-      image: 'kicbase/echo-server:1.0'
-      resources:
-        limits:
-          cpu: 200m
-          memory: 512Mi
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: foo-service
-  annotations:
-    external-dns.alpha.kubernetes.io/hostname: foo.disaster.futureporn.net
-spec:
-  selector:
-    app: foo
-  ports:
-    - port: 8080

charts/fp/templates-old/link2cid-pod.yaml

@@ -1,29 +1,41 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: link2cid-pod
+  annotations:
+    kompose.cmd: kompose convert --file compose.yml -c --out ./charts
+    kompose.version: 1.26.0 (40646f47)
   labels:
-    app.kubernetes.io/name: link2cid
+    io.kompose.service: link2cid
+  name: link2cid
 spec:
   containers:
-    - name: link2cid-pod
+    - env:
-      image: {{ .Values.link2cid.containerName }}
-      ports:
-        - containerPort: 3939
-      env:
-        - name: IPFS_URL
-          value: http://ipfs-service:5001
-        - name: PORT
-          value: '3939'
         - name: API_KEY
           valueFrom:
             secretKeyRef:
               name: link2cid
               key: apiKey
+        - name: IPFS_URL
+          value: http://ipfs0:5001
+        - name: PORT
+          value: "3939"
+      image: link2cid
+      name: fp-link2cid
+      ports:
+        - containerPort: 3939
       resources:
         limits:
-          cpu: 500m
+          cpu: 100m
-          memory: 1024Mi   
+          memory: 2048Gi
-      imagePullSecrets:
+        requests:
-        - name: regcred       
+          cpu: 100m
+          memory: 2048Gi
+      volumeMounts:
+        - mountPath: /app/index.js
+          name: link2cid-claim0
   restartPolicy: OnFailure
+  volumes:
+    - name: link2cid-claim0
+      persistentVolumeClaim:
+        claimName: link2cid-claim0
+status: {}

charts/fp/templates-old/next-pod.yaml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    io.kompose.service: next
+  name: next
+spec:
+  containers:
+    - env:
+        - name: NEXT_PUBLIC_SITE_URL
+        - name: NEXT_PUBLIC_STRAPI_URL
+        - name: NEXT_PUBLIC_UPPY_COMPANION_URL
+        - name: NODE_ENV
+          value: development
+        - name: REVALIDATION_TOKEN
+      image: next
+      name: fp-next
+      ports:
+        - containerPort: 3000
+      resources: {}
+      volumeMounts:
+        - mountPath: /app/app
+          name: next-claim0
+  restartPolicy: OnFailure
+  volumes:
+    - name: next-claim0
+      persistentVolumeClaim:
+        claimName: next-claim0
+status: {}

charts/fp/templates-old/next-service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: kompose convert --file compose.yml -c --out ./charts
+    kompose.version: 1.26.0 (40646f47)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: next
+  name: next
+spec:
+  ports:
+    - name: "3000"
+      port: 3000
+      targetPort: 3000
+  selector:
+    io.kompose.service: next
+status:
+  loadBalancer: {}

charts/fp/templates-old/strapi-ingress.yaml

@@ -1,20 +0,0 @@
- apiVersion: networking.k8s.io/v1
- kind: Ingress
- metadata:
-     name: strapi-ingress
-     namespace: fp
-     annotations:
-         nginx.ingress.kubernetes.io/rewrite-target: /
- spec:
-     ingressClassName: nginx
-     rules:
-         - host: disaster.futureporn.net
-         http:
-             paths:
-                 - path: /
-                     pathType: Prefix
-                     backend:
-                         service:
-                             name: strapi-service
-                             port:
-                                 number: 80

charts/fp/templates-staging/pgadmin-pod.yaml

@@ -1,3 +1,5 @@
+
+
 apiVersion: v1
 kind: Pod
 metadata:

charts/fp/templates-staging/postgres-pod.yaml

@@ -16,10 +16,7 @@ spec:
               key: password
       ports:
         - containerPort: 5432
-      resources:
+      resources: {}
-        limits:
-          cpu: 500m
-          memory: 1Gi   
       volumeMounts:
         - name: postgres-pvc
           mountPath: /data/postgres

charts/fp/templates-staging/postgres-pvc.yaml

@@ -2,16 +2,12 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: postgres-pvc
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 40Gi
+  allowVolumeExpansion: true
   storageClassName: {{ .Values.storageClassName }}
 

charts/fp/templates-staging/vultr-load-balancer.yaml

@@ -10,7 +10,7 @@ metadata:
 spec:
   type: LoadBalancer
   selector:
-    app: link2cid-service
+    app: next-service
   ports:
     - port: 80
       name: "http"

charts/fp/templates/crds.yaml

@@ -1,13 +0,0 @@
-apiVersion: delivery.crd-bootstrap/v1alpha1
-kind: Bootstrap
-metadata:
-  namespace: cert-manager
-  name: cert-manager-crd-bootstrap
-spec:
-  interval: 10s
-  source:
-    helm:
-      chartReference: https://charts.jetstack.io
-      chartName: cert-manager
-  version:
-    semver: 1.14.4

charts/fp/templates/external-dns.yaml

@@ -1,62 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: external-dns
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: external-dns
-rules:
-- apiGroups: [""]
-  resources: ["services","endpoints","pods"]
-  verbs: ["get","watch","list"]
-- apiGroups: ["extensions","networking.k8s.io"]
-  resources: ["ingresses"]
-  verbs: ["get","watch","list"]
-- apiGroups: [""]
-  resources: ["nodes"]
-  verbs: ["list"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: external-dns-viewer
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: external-dns
-subjects:
-- kind: ServiceAccount
-  name: external-dns
-  namespace: default
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: external-dns
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: external-dns
-  template:
-    metadata:
-      labels:
-        app: external-dns
-    spec:
-      serviceAccountName: external-dns
-      containers:
-      - name: external-dns
-        image: registry.k8s.io/external-dns/external-dns:v0.14.1
-        args:
-        - --source=service
-        - --domain-filter=sbtp.xyz
-        - --provider=vultr
-        env:
-        - name: VULTR_API_KEY
-          valueFrom:
-            secretKeyRef:
-              name: vultr
-              key: apiKey

charts/fp/templates/ipfs-pod.yaml

@@ -11,6 +11,7 @@ spec:
       ports:
         - containerPort: 5001
         - containerPort: 8080
+      resources: {}
       volumeMounts:
         - name: ipfs-pvc
           mountPath: /data/ipfs

charts/fp/templates/ipfs-pvc.yaml

@@ -2,16 +2,12 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: ipfs-pvc
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 40Gi
+  allowVolumeExpansion: true
   storageClassName: {{ .Values.storageClassName }}
 

charts/fp/templates/ipfs-service.yaml

@@ -2,11 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: ipfs-service
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
 spec:
   selector:
     app.kubernetes.io/name: ipfs

charts/fp/templates/letsencrypt-staging.yaml

@@ -1,50 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: letsencrypt-staging
-spec:
-  acme:
-    # You must replace this email address with your own.
-    # Let's Encrypt will use this to contact you about expiring
-    # certificates, and issues related to your account.
-    email: {{ .Values.adminEmail }}
-    server: https://acme-staging-v02.api.letsencrypt.org/directory
-    privateKeySecretRef:
-      # Secret resource that will be used to store the account's private key.
-      name: letsencrypt-staging
-    solvers:
-    - dns01:
-        webhook:
-          groupName: acme.vultr.com
-          solverName: vultr
-          config:
-            apiKeySecretRef:
-              key: apiKey
-              name: vultr-credentials
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: cert-manager-webhook-vultr:secret-reader
-  namespace: cert-manager
-rules:
-- apiGroups: [""]
-  resources: ["secrets"]
-  resourceNames: ["vultr-credentials"]
-  verbs: ["get", "watch"]
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: cert-manager-webhook-vultr:secret-reader
-  namespace: cert-manager
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: cert-manager-webhook-vultr:secret-reader
-subjects:
-  - apiGroup: ""
-    kind: ServiceAccount
-    name: cert-manager-webhook-vultr

charts/fp/templates/link2cid-pod.yaml

@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: link2cid-pod
+spec:
+  containers:
+    - name: link2cid-pod
+      image: {{ .Values.link2cid.containerName }}
+      ports:
+        - containerPort: 3939
+      env:
+        - name: IPFS_URL
+          value: http://ipfs-service:5001
+        - name: PORT
+          value: '3939'
+        - name: API_KEY
+          valueFrom:
+            secretKeyRef:
+              name: link2cid
+              key: apiKey
+      resources:
+        limits:
+          cpu: 500m
+          memory: 1024Mi   
+      imagePullSecrets:
+        - name: regcred       
+  restartPolicy: OnFailure

charts/fp/templates/link2cid-pvc.yaml

@@ -2,12 +2,11 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: link2cid-pvc
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
 spec:
   accessModes:
     - ReadWriteOnce
+  resources:
+    requests:
+      storage: 40Gi
+  allowVolumeExpansion: true
   storageClassName: {{ .Values.storageClassName }}

charts/fp/templates/link2cid-service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: link2cid-service
+spec:
+  ports:
+    - name: "3939"
+      port: 3939
+      targetPort: 3939
+status:
+  loadBalancer: {}

charts/fp/templates/link2cid.yaml

@@ -1,142 +0,0 @@
-# apiVersion: v1
-# kind: Service
-# metadata:
-#   name: link2cid
-#   annotations:
-#     external-dns.alpha.kubernetes.io/hostname: link2cid.sbtp.xyz
-#     service.beta.kubernetes.io/vultr-loadbalancer-label: "link2cid"
-#     service.beta.kubernetes.io/vultr-loadbalancer-ssl: "cert-manager-webhook-vultr-webhook-tls"
-#     service.beta.kubernetes.io/vultr-loadbalancer-protocol: "https"
-#     service.beta.kubernetes.io/vultr-loadbalancer-https-ports: "443"
-#     service.beta.kubernetes.io/vultr-loadbalancer-backend-protocol: "http"
-#     service.beta.kubernetes.io/vultr-loadbalancer-algorithm: "least_connections"
-#     service.beta.kubernetes.io/vultr-loadbalancer-healthcheck-protocol: "http"
-#     service.beta.kubernetes.io/vultr-loadbalancer-healthcheck-path: "/health"
-# spec:
-#   selector:
-#     app: link2cid
-#   type: LoadBalancer
-#   ports:
-#     - name: http
-#       protocol: TCP
-#       port: 80
-#       targetPort: 3939
-#     - name: https
-#       protocol: TCP
-#       port: 443
-#       targetPort: 3939
-
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: link2cid-ingress
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-spec:
-  ingressClassName: link2cid-ingress
-  rules:
-    - host: link2cid.sbtp.xyz
-      http:
-        paths:
-          - path: /demo-path
-            pathType: Prefix
-            backend:
-              service:
-                name: link2cid
-                port:
-                  number: 3939
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: link2cid
-spec:
-  selector:
-    matchLabels:
-      app: link2cid
-  template:
-    metadata:
-      labels:
-        app: link2cid
-    spec:
-      containers:
-      - image: {{ .Values.link2cid.containerName }}
-        name: link2cid
-        ports:
-        - containerPort: 3939
-
-# ---
-# apiVersion: apps/v1
-# kind: Deployment
-# metadata:
-#   name: link2cid
-# spec:
-#   selector:
-#     matchLabels:
-#       app: link2cid
-#   template:
-#     metadata:
-#       labels:
-#         app: link2cid
-#     spec:
-#       containers:
-#         - name: link2cid
-#           image: {{ .Values.link2cid.containerName }}
-#           ports:
-#             - containerPort: 3333
-#           env:
-#             - name: IPFS_URL
-#               value: http://ipfs-service:5001
-#             - name: PORT
-#               value: "3333"
-#             - name: API_KEY
-#               valueFrom:
-#                 secretKeyRef:
-#                   name: link2cid
-#                   key: apiKey
-#           resources:
-#             limits:
-#               cpu: 500m
-#               memory: 1024Mi
-#       restartPolicy: Always
-
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: link2cid
-  annotations:
-    meta.helm.sh/release-name: fp
-    meta.helm.sh/release-namespace: default
-  labels:
-    app.kubernetes.io/managed-by: {{ .Values.managedBy }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 40Gi
-  storageClassName: {{ .Values.storageClassName }}
-
-
-{{ if eq .Values.managedBy "Helm" }} 
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: staging-cert-sbtp-xyz
-spec:
-  commonName: link2cid.sbtp.xyz
-  dnsNames:
-  - link2cid.sbtp.xyz
-  issuerRef:
-    name: letsencrypt-staging
-    kind: ClusterIssuer
-  secretName: sbtp-xyz-tls
-  secretTemplate:
-    annotations:
-      reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
-      reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: "default"
-{{ end }}

charts/fp/templates/next-pod.yaml

@@ -15,7 +15,3 @@ spec:
         - containerPort: 3000
       resources: {}
   restartPolicy: OnFailure
-  resources:
-    limits:
-      cpu: 500m
-      memory: 1Gi

charts/fp/templates/nginx.yaml

@@ -1,33 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-spec:
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        ports:
-        - containerPort: 80
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: nginx
-  annotations:
-    external-dns.alpha.kubernetes.io/hostname: nginx.sbtp.xyz
-spec:
-  selector:
-    app: nginx
-  type: LoadBalancer
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 80

charts/fp/templates/strapi-service.yaml

@@ -8,7 +8,7 @@ spec:
   ports:
     - name: web
       protocol: TCP
-      port: 80
+      port: 1337
       targetPort: 1337
 status:
   loadBalancer: {}

charts/fp/values-dev.yaml

@@ -7,5 +7,3 @@ strapi:
   containerName: fp/strapi
   port: 1337
   url: http://localhost:1337
-managedBy: Dildo
-adminEmail: cj@futureporn.net

charts/fp/values-prod.yaml

@@ -1,4 +1,5 @@
 storageClassName: vultr-block-storage-hdd
+#storageClassName: civo-volume
 link2cid:
   containerName: gitea.futureporn.net/cj_clippy/link2cid:latest
 next:
@@ -7,8 +8,3 @@ strapi:
   containerName: sjc.vultrcr.com/fpcontainers/strapi
   port: 1337
   url: https://portal.futureporn.net
-managedBy: Helm
-adminEmail: cj@futureporn.net
-extraArgs: 
-  - --dns01-recursive-nameservers-only
-  - --dns01-recursive-nameservers=8.8.8.8:53,1.1.1.1:53

helmfile.yaml

@@ -1,16 +1,16 @@
-# repositories:
+repositories:
-  # - name: jetstack
+  - name: jetstack
-  #   url: https://charts.jetstack.io
+    url: https://charts.jetstack.io
 
-  # - name: vultr
+  - name: vultr
-  #   url: https://vultr.github.io/helm-charts
+    url: https://vultr.github.io/helm-charts
 
 
 releases:
   
-  # - name: cert-manager
+  - name: cert-manager
-  #   namespace: cert-manager
+    namespace: cert-manager
-  #   chart: jetstack/cert-manager
+    chart: jetstack/cert-manager
 
 
   - name: fp

helmsman.yaml

@@ -1,43 +0,0 @@
-namespaces:
-  default:
-  cert-manager:
-  crd-bootstrap:
-  ingress-nginx:
-
-helmRepos:
-  jetstack: https://charts.jetstack.io
-  emberstack: https://emberstack.github.io/helm-charts
-  vultr: https://vultr.github.io/helm-charts
-  ingress-nginx: https://kubernetes.github.io/ingress-nginx
-
-apps:
-  ingress-nginx:
-    namespace: ingress-nginx
-    chart: "ingress-nginx/ingress-nginx"
-    enabled: true
-    version: "4.10.0"
-  fp:
-    namespace: "default"
-    chart: "charts/fp"
-    enabled: true
-    version: "0.0.1"
-    valuesFile: "./charts/fp/values-prod.yaml"
-  cert-manager-webhook-vultr:
-    namespace: cert-manager
-    chart: vultr/cert-manager-webhook-vultr
-    enabled: true
-    version: "1.0.0"
-  cert-manager:
-    namespace: "cert-manager"
-    chart: "jetstack/cert-manager"
-    enabled: true
-    version: "1.14.4"
-    set:
-      installCRDs: true
-  reflector:
-    namespace: "default"
-    chart: "emberstack/reflector"
-    enabled: true
-    version: "7.1.262"
-  
-

package.json

@@ -5,9 +5,9 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "make minikube && tilt up"
+    "dev": "make cluster && tilt up"
   },
   "keywords": [],
   "author": "",
-  "license": "Unlicense"
+  "license": "CC0-1.0"
 }

packages/bot/package.json

@@ -15,13 +15,13 @@
     "npm": ">=6.x.x"
   },
   "devDependencies": {
-    "tsx": "^4.7.2"
+    "tsx": "^4.7.0"
   },
   "dependencies": {
     "@types/express": "^4.17.21",
-    "@types/node": "^20.12.6",
+    "@types/node": "^20.11.0",
     "discordeno": "^18.0.1",
-    "express": "^4.19.2",
+    "express": "^4.18.2",
-    "oceanic.js": "^1.10.0"
+    "oceanic.js": "^1.9.0"
   }
 }

packages/bot/pnpm-lock.yaml

@@ -9,22 +9,22 @@ dependencies:
     specifier: ^4.17.21
     version: 4.17.21
   '@types/node':
-    specifier: ^20.12.6
+    specifier: ^20.11.0
-    version: 20.12.6
+    version: 20.11.29
   discordeno:
     specifier: ^18.0.1
     version: 18.0.1
   express:
-    specifier: ^4.19.2
+    specifier: ^4.18.2
-    version: 4.19.2
+    version: 4.18.3
   oceanic.js:
-    specifier: ^1.10.0
+    specifier: ^1.9.0
-    version: 1.10.0
+    version: 1.9.0
 
 devDependencies:
   tsx:
-    specifier: ^4.7.2
+    specifier: ^4.7.0
-    version: 4.7.2
+    version: 4.7.1
 
 packages:
 
@@ -279,20 +279,20 @@ packages:
     resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
     dependencies:
       '@types/connect': 3.4.38
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
     dev: false
 
   /@types/connect@3.4.38:
     resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
     dependencies:
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
     dev: false
 
-  /@types/express-serve-static-core@4.19.0:
+  /@types/express-serve-static-core@4.17.43:
-    resolution: {integrity: sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==}
+    resolution: {integrity: sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==}
     dependencies:
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
-      '@types/qs': 6.9.14
+      '@types/qs': 6.9.13
       '@types/range-parser': 1.2.7
       '@types/send': 0.17.4
     dev: false
@@ -301,9 +301,9 @@ packages:
     resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==}
     dependencies:
       '@types/body-parser': 1.19.5
-      '@types/express-serve-static-core': 4.19.0
+      '@types/express-serve-static-core': 4.17.43
-      '@types/qs': 6.9.14
+      '@types/qs': 6.9.13
-      '@types/serve-static': 1.15.7
+      '@types/serve-static': 1.15.5
     dev: false
 
   /@types/http-errors@2.0.4:
@@ -314,14 +314,18 @@ packages:
     resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
     dev: false
 
-  /@types/node@20.12.6:
+  /@types/mime@3.0.4:
-    resolution: {integrity: sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==}
+    resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==}
+    dev: false
+
+  /@types/node@20.11.29:
+    resolution: {integrity: sha512-P99thMkD/1YkCvAtOd6/zGedKNA0p2fj4ZpjCzcNiSCBWgm3cNRTBfa/qjFnsKkkojxu4vVLtWpesnZ9+ap+gA==}
     dependencies:
       undici-types: 5.26.5
     dev: false
 
-  /@types/qs@6.9.14:
+  /@types/qs@6.9.13:
-    resolution: {integrity: sha512-5khscbd3SwWMhFqylJBLQ0zIu7c1K6Vz0uBIt915BI3zV0q1nfjRQD3RqSBcPaO6PHEF4ov/t9y89fSiyThlPA==}
+    resolution: {integrity: sha512-iLR+1vTTJ3p0QaOUq6ACbY1mzKTODFDT/XedZI8BksOotFmL4ForwDfRQ/DZeuTHR7/2i4lI1D203gdfxuqTlA==}
     dev: false
 
   /@types/range-parser@1.2.7:
@@ -332,22 +336,22 @@ packages:
     resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==}
     dependencies:
       '@types/mime': 1.3.5
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
     dev: false
 
-  /@types/serve-static@1.15.7:
+  /@types/serve-static@1.15.5:
-    resolution: {integrity: sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==}
+    resolution: {integrity: sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==}
     dependencies:
       '@types/http-errors': 2.0.4
-      '@types/node': 20.12.6
+      '@types/mime': 3.0.4
-      '@types/send': 0.17.4
+      '@types/node': 20.11.29
     dev: false
 
   /@types/ws@8.5.10:
     resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
     requiresBuild: true
     dependencies:
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
     dev: false
     optional: true
 
@@ -415,8 +419,8 @@ packages:
     resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
     dev: false
 
-  /cookie@0.6.0:
+  /cookie@0.5.0:
-    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
+    resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
     dev: false
 
@@ -461,7 +465,7 @@ packages:
     dependencies:
       '@deno/shim-deno': 0.9.0
       '@deno/shim-timers': 0.1.0
-      undici: 5.28.4
+      undici: 5.28.3
       ws: 8.16.0
     transitivePeerDependencies:
       - bufferutil
@@ -529,8 +533,8 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
-  /express@4.19.2:
+  /express@4.18.3:
-    resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}
+    resolution: {integrity: sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==}
     engines: {node: '>= 0.10.0'}
     dependencies:
       accepts: 1.3.8
@@ -538,7 +542,7 @@ packages:
       body-parser: 1.20.2
       content-disposition: 0.5.4
       content-type: 1.0.5
-      cookie: 0.6.0
+      cookie: 0.5.0
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
@@ -731,8 +735,8 @@ packages:
     resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
     dev: false
 
-  /oceanic.js@1.10.0:
+  /oceanic.js@1.9.0:
-    resolution: {integrity: sha512-WYgtdBHBSVX/2kCycU64WA0c2b4BOsAREXek06dOz1cqfX8464HFRamSJir6pOiTQvnW/nk/WN8r3Bq6Yt9lrQ==}
+    resolution: {integrity: sha512-zBHxBnJDkhYiHvQnTWcLsdRa/0v7+S2BYHWS3TLZpmMDXJU/+KOB9oL17YqSK8xvfpA0ykIsZTPKTgwxQUfLxA==}
     engines: {node: '>=18.13.0'}
     dependencies:
       tslib: 2.6.2
@@ -899,8 +903,8 @@ packages:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
     dev: false
 
-  /tsx@4.7.2:
+  /tsx@4.7.1:
-    resolution: {integrity: sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==}
+    resolution: {integrity: sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==}
     engines: {node: '>=18.0.0'}
     hasBin: true
     dependencies:
@@ -922,8 +926,8 @@ packages:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
     dev: false
 
-  /undici@5.28.4:
+  /undici@5.28.3:
-    resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==}
+    resolution: {integrity: sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==}
     engines: {node: '>=14.0'}
     dependencies:
       '@fastify/busboy': 2.1.1

packages/next/app/components/video-interactive.tsx

@@ -97,7 +97,6 @@ export function VideoInteractive({ vod }: IVideoInteractiveProps): React.JSX.Ele
             tvrs,
             setTvrs
         }}>
-            
             <VideoPlayer
                 vod={vod}
                 ref={ref}

packages/next/app/components/video-player.tsx

@@ -110,7 +110,6 @@ export const VideoPlayer = forwardRef(function VideoPlayer( props: IPlayerProps,
 
     return (
         <>
-            <p className='notification'>CDN1 (for Patrons only)</p>
             <MuxPlayer
                 onCanPlay={() => {
                     setIsPlayerReady(true)}
@@ -136,15 +135,6 @@ export const VideoPlayer = forwardRef(function VideoPlayer( props: IPlayerProps,
                 muted
             ></MuxPlayer>
 
-            {/* {vod?.attributes?.videoSrcB2?.data?.attributes?.cdnUrl && (<>
-            <p className='notification'>CDN2</p>
-            <video id="player" playsinline controls data-poster="/path/to/poster.jpg">
-                <source src={vod?.attributes.videoSrcB2?.data?.attributes?.cdnUrl} type="video/mp4" />
-                <track kind="captions" label="English captions" src="/path/to/captions.vtt" srclang="en" default />
-            </video>
-            </>)} */}
-
-
             <VideoSourceSelector
                 isMux={!!vod?.attributes.muxAsset?.data?.attributes?.playbackId}
                 isB2={!!vod?.attributes.videoSrcB2?.data?.attributes?.cdnUrl}

packages/next/package.json

@@ -10,23 +10,23 @@
     "preinstall": "npx only-allow pnpm"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.5.2",
+    "@fortawesome/fontawesome-free": "^6.5.1",
-    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/fontawesome-svg-core": "^6.5.1",
-    "@fortawesome/free-brands-svg-icons": "^6.5.2",
+    "@fortawesome/free-brands-svg-icons": "^6.5.1",
-    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@hookform/error-message": "^2.0.1",
     "@hookform/resolvers": "^3.3.4",
     "@mux/blurhash": "^0.1.2",
-    "@mux/mux-player": "^2.4.1",
+    "@mux/mux-player": "^2.4.0",
-    "@mux/mux-player-react": "^2.4.1",
+    "@mux/mux-player-react": "^2.4.0",
     "@paralleldrive/cuid2": "^2.2.2",
     "@react-hookz/web": "^24.0.4",
-    "@tanstack/react-table": "^8.15.3",
+    "@tanstack/react-table": "^8.15.0",
     "@types/lodash": "^4.17.0",
     "@types/qs": "^6.9.14",
-    "@types/react": "^18.2.75",
+    "@types/react": "^18.2.73",
-    "@types/react-dom": "^18.2.24",
+    "@types/react-dom": "^18.2.22",
     "@uppy/aws-s3": "^3.6.2",
     "@uppy/aws-s3-multipart": "^3.11.0",
     "@uppy/core": "^3.10.0",
@@ -49,7 +49,6 @@
     "next": "14.0.4",
     "next-goatcounter": "^1.0.5",
     "nextjs-toploader": "^1.6.11",
-    "plyr": "^3.7.8",
     "prism-react-renderer": "^2.3.1",
     "qs": "^6.12.0",
     "react": "^18.2.0",
@@ -62,7 +61,7 @@
     "yup": "^1.4.0"
   },
   "devDependencies": {
-    "@types/node": "^20.12.6",
+    "@types/node": "^20.11.30",
     "eslint": "^8.57.0",
     "eslint-config-next": "14.0.4",
     "tsc": "^2.0.4",

packages/next/pnpm-lock.yaml

@@ -6,20 +6,20 @@ settings:
 
 dependencies:
   '@fortawesome/fontawesome-free':
-    specifier: ^6.5.2
+    specifier: ^6.5.1
-    version: 6.5.2
+    version: 6.5.1
   '@fortawesome/fontawesome-svg-core':
-    specifier: ^6.5.2
+    specifier: ^6.5.1
-    version: 6.5.2
+    version: 6.5.1
   '@fortawesome/free-brands-svg-icons':
-    specifier: ^6.5.2
+    specifier: ^6.5.1
-    version: 6.5.2
+    version: 6.5.1
   '@fortawesome/free-solid-svg-icons':
-    specifier: ^6.5.2
+    specifier: ^6.5.1
-    version: 6.5.2
+    version: 6.5.1
   '@fortawesome/react-fontawesome':
     specifier: ^0.2.0
-    version: 0.2.0(@fortawesome/fontawesome-svg-core@6.5.2)(react@18.2.0)
+    version: 0.2.0(@fortawesome/fontawesome-svg-core@6.5.1)(react@18.2.0)
   '@hookform/error-message':
     specifier: ^2.0.1
     version: 2.0.1(react-dom@18.2.0)(react-hook-form@7.51.2)(react@18.2.0)
@@ -30,11 +30,11 @@ dependencies:
     specifier: ^0.1.2
     version: 0.1.2
   '@mux/mux-player':
-    specifier: ^2.4.1
+    specifier: ^2.4.0
-    version: 2.4.1
+    version: 2.4.0
   '@mux/mux-player-react':
-    specifier: ^2.4.1
+    specifier: ^2.4.0
-    version: 2.4.1(@types/react-dom@18.2.24)(@types/react@18.2.75)(react-dom@18.2.0)(react@18.2.0)
+    version: 2.4.0(@types/react-dom@18.2.22)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0)
   '@paralleldrive/cuid2':
     specifier: ^2.2.2
     version: 2.2.2
@@ -42,8 +42,8 @@ dependencies:
     specifier: ^24.0.4
     version: 24.0.4(react-dom@18.2.0)(react@18.2.0)
   '@tanstack/react-table':
-    specifier: ^8.15.3
+    specifier: ^8.15.0
-    version: 8.15.3(react-dom@18.2.0)(react@18.2.0)
+    version: 8.15.0(react-dom@18.2.0)(react@18.2.0)
   '@types/lodash':
     specifier: ^4.17.0
     version: 4.17.0
@@ -51,11 +51,11 @@ dependencies:
     specifier: ^6.9.14
     version: 6.9.14
   '@types/react':
-    specifier: ^18.2.75
+    specifier: ^18.2.73
-    version: 18.2.75
+    version: 18.2.73
   '@types/react-dom':
-    specifier: ^18.2.24
+    specifier: ^18.2.22
-    version: 18.2.24
+    version: 18.2.22
   '@uppy/aws-s3':
     specifier: ^3.6.2
     version: 3.6.2(@uppy/core@3.10.0)
@@ -122,9 +122,6 @@ dependencies:
   nextjs-toploader:
     specifier: ^1.6.11
     version: 1.6.11(next@14.0.4)(react-dom@18.2.0)(react@18.2.0)
-  plyr:
-    specifier: ^3.7.8
-    version: 3.7.8
   prism-react-renderer:
     specifier: ^2.3.1
     version: 2.3.1(react@18.2.0)
@@ -158,8 +155,8 @@ dependencies:
 
 devDependencies:
   '@types/node':
-    specifier: ^20.12.6
+    specifier: ^20.11.30
-    version: 20.12.6
+    version: 20.11.30
   eslint:
     specifier: ^8.57.0
     version: 8.57.0
@@ -180,14 +177,14 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /@babel/runtime@7.24.4:
+  /@babel/runtime@7.24.1:
-    resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==}
+    resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.14.1
 
-  /@emnapi/runtime@1.1.1:
+  /@emnapi/runtime@1.1.0:
-    resolution: {integrity: sha512-3bfqkzuR1KLx57nZfjr2NLnFOobvyS0aTszaEGCGqmYMVDRaGvgIZbjGSV/MHSSmLgQ/b9JFHQ5xm5WRZYd+XQ==}
+    resolution: {integrity: sha512-gCGlE0fJGWalfy+wbFApjhKn6uoSVvopru77IPyxNKkjkaiSx2HxDS7eOYSmo9dcMIhmmIvoxiC3N9TM1c3EaA==}
     requiresBuild: true
     dependencies:
       tslib: 2.6.2
@@ -231,49 +228,49 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@fortawesome/fontawesome-common-types@6.5.2:
+  /@fortawesome/fontawesome-common-types@6.5.1:
-    resolution: {integrity: sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==}
+    resolution: {integrity: sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==}
     engines: {node: '>=6'}
     requiresBuild: true
     dev: false
 
-  /@fortawesome/fontawesome-free@6.5.2:
+  /@fortawesome/fontawesome-free@6.5.1:
-    resolution: {integrity: sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==}
+    resolution: {integrity: sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==}
     engines: {node: '>=6'}
     requiresBuild: true
     dev: false
 
-  /@fortawesome/fontawesome-svg-core@6.5.2:
+  /@fortawesome/fontawesome-svg-core@6.5.1:
-    resolution: {integrity: sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==}
+    resolution: {integrity: sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==}
     engines: {node: '>=6'}
     requiresBuild: true
     dependencies:
-      '@fortawesome/fontawesome-common-types': 6.5.2
+      '@fortawesome/fontawesome-common-types': 6.5.1
     dev: false
 
-  /@fortawesome/free-brands-svg-icons@6.5.2:
+  /@fortawesome/free-brands-svg-icons@6.5.1:
-    resolution: {integrity: sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==}
+    resolution: {integrity: sha512-093l7DAkx0aEtBq66Sf19MgoZewv1zeY9/4C7vSKPO4qMwEsW/2VYTUTpBtLwfb9T2R73tXaRDPmE4UqLCYHfg==}
     engines: {node: '>=6'}
     requiresBuild: true
     dependencies:
-      '@fortawesome/fontawesome-common-types': 6.5.2
+      '@fortawesome/fontawesome-common-types': 6.5.1
     dev: false
 
-  /@fortawesome/free-solid-svg-icons@6.5.2:
+  /@fortawesome/free-solid-svg-icons@6.5.1:
-    resolution: {integrity: sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==}
+    resolution: {integrity: sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ==}
     engines: {node: '>=6'}
     requiresBuild: true
     dependencies:
-      '@fortawesome/fontawesome-common-types': 6.5.2
+      '@fortawesome/fontawesome-common-types': 6.5.1
     dev: false
 
-  /@fortawesome/react-fontawesome@0.2.0(@fortawesome/fontawesome-svg-core@6.5.2)(react@18.2.0):
+  /@fortawesome/react-fontawesome@0.2.0(@fortawesome/fontawesome-svg-core@6.5.1)(react@18.2.0):
     resolution: {integrity: sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==}
     peerDependencies:
       '@fortawesome/fontawesome-svg-core': ~1 || ~6
       react: '>=16.3'
     dependencies:
-      '@fortawesome/fontawesome-svg-core': 6.5.2
+      '@fortawesome/fontawesome-svg-core': 6.5.1
       prop-types: 15.8.1
       react: 18.2.0
     dev: false
@@ -302,7 +299,7 @@ packages:
     resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
     engines: {node: '>=10.10.0'}
     dependencies:
-      '@humanwhocodes/object-schema': 2.0.3
+      '@humanwhocodes/object-schema': 2.0.2
       debug: 4.3.4
       minimatch: 3.1.2
     transitivePeerDependencies:
@@ -314,8 +311,8 @@ packages:
     engines: {node: '>=12.22'}
     dev: true
 
-  /@humanwhocodes/object-schema@2.0.3:
+  /@humanwhocodes/object-schema@2.0.2:
-    resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==}
+    resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
     dev: true
 
   /@img/sharp-darwin-arm64@0.33.3:
@@ -484,7 +481,7 @@ packages:
     cpu: [wasm32]
     requiresBuild: true
     dependencies:
-      '@emnapi/runtime': 1.1.1
+      '@emnapi/runtime': 1.1.0
     dev: false
     optional: true
 
@@ -513,8 +510,8 @@ packages:
       sharp: 0.30.7
     dev: false
 
-  /@mux/mux-player-react@2.4.1(@types/react-dom@18.2.24)(@types/react@18.2.75)(react-dom@18.2.0)(react@18.2.0):
+  /@mux/mux-player-react@2.4.0(@types/react-dom@18.2.22)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-grM6T847fKnzlK786NG1AxhNS+6A78pEPc5zG4yYvKe3ayGNTOpq/Hnm9pDVkOx5/uMI/yCdSsfiNyytYaw8qA==}
+    resolution: {integrity: sha512-N0zHfNYXo9eNHLlYcHydLDFHk8TQpt4Psi2MyjIn7o8IR2dDsTHNxF5nxVTAMtCx7owohePgXa8g5nvXMixORQ==}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18
       '@types/react-dom': '*'
@@ -526,34 +523,34 @@ packages:
       '@types/react-dom':
         optional: true
     dependencies:
-      '@mux/mux-player': 2.4.1
+      '@mux/mux-player': 2.4.0
-      '@mux/playback-core': 0.22.4
+      '@mux/playback-core': 0.22.3
-      '@types/react': 18.2.75
+      '@types/react': 18.2.73
-      '@types/react-dom': 18.2.24
+      '@types/react-dom': 18.2.22
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@mux/mux-player@2.4.1:
+  /@mux/mux-player@2.4.0:
-    resolution: {integrity: sha512-Lm7KkG/lD1tqqqtL1nacZsCll9JY4gVNGxUw/MPYmgIevYACYtQ/76iaEtaN67DmHYYxep1QUpYEDZPXallkEg==}
+    resolution: {integrity: sha512-6F6RvXyIWwYtwh29+bmoqa5Nd1z31wGafeKtIds0BYP+PdVYRSRhQ16B8tajUb0+yeCVbqyvBnITEUoAZ0zuIQ==}
     dependencies:
-      '@mux/mux-video': 0.17.5
+      '@mux/mux-video': 0.17.4
-      '@mux/playback-core': 0.22.4
+      '@mux/playback-core': 0.22.3
       media-chrome: 3.1.1
     dev: false
 
-  /@mux/mux-video@0.17.5:
+  /@mux/mux-video@0.17.4:
-    resolution: {integrity: sha512-EMLflDnr/o7XQiWKfwnq9BJmj30kpSszzXwpXE4hmBIgc9JAuF3Hl94qv1kyWQAUhrO5hnnOxwGHgv0FvkJ1GQ==}
+    resolution: {integrity: sha512-ePTL+Kxtw03OmCQ6y34A8tTdK4ctsHPzuOY7etCFldhdAMTomwxSacdNwa8BpZ23umkXHp+FQXPyJQIfv4G++Q==}
     dependencies:
-      '@mux/playback-core': 0.22.4
+      '@mux/playback-core': 0.22.3
       castable-video: 1.0.6
       custom-media-element: 1.2.3
       media-tracks: 0.3.0
     dev: false
 
-  /@mux/playback-core@0.22.4:
+  /@mux/playback-core@0.22.3:
-    resolution: {integrity: sha512-f/jWcYbFRjXjdFRNq3MK79D1YHTqvwcfchRLYukE384P3cb027dru+bSxMKESrfkhAhnWFy7fdq/llawl7SU9g==}
+    resolution: {integrity: sha512-IZBMMhUKsEtSrxb8XyhfJVzI9g6Ca0poCDrJQy9hCV3+DmgfFPDLSxZZvtSglH5CsmFPHL+hOFD/qn9ewCmAOA==}
     dependencies:
       hls.js: 1.4.14
       mux-embed: 4.30.0
@@ -702,8 +699,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@rushstack/eslint-patch@1.10.1:
+  /@rushstack/eslint-patch@1.9.0:
-    resolution: {integrity: sha512-S3Kq8e7LqxkA9s7HKLqXGTGck1uwis5vAXan3FnU5yw1Ec5hsSGnq4s/UCaSqABPOnOTg7zASLyst7+ohgWexg==}
+    resolution: {integrity: sha512-AAWymnpvHbGty1BmgbdfbqQDboXs6xN6h2yAacO4yKVyyUUBnpYkp+P9jjPrV9zrAGw7JVVriRtGOHPInnfjZQ==}
     dev: true
 
   /@swc/helpers@0.5.2:
@@ -712,20 +709,20 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@tanstack/react-table@8.15.3(react-dom@18.2.0)(react@18.2.0):
+  /@tanstack/react-table@8.15.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-aocQ4WpWiAh7R+yxNp+DGQYXeVACh5lv2kk96DjYgFiHDCB0cOFoYMT/pM6eDOzeMXR9AvPoLeumTgq8/0qX+w==}
+    resolution: {integrity: sha512-8K4RSROUtXUtfiezV6Ehl8z99axFrkQnxXi0vjWBJv3Tsm5x4EyrgXI7d2tOOMoANykKZLB6S1sGZGemoMRt7Q==}
     engines: {node: '>=12'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      '@tanstack/table-core': 8.15.3
+      '@tanstack/table-core': 8.14.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /@tanstack/table-core@8.15.3:
+  /@tanstack/table-core@8.14.0:
-    resolution: {integrity: sha512-wOgV0HfEvuMOv8RlqdR9MdNNqq0uyvQtP39QOvGlggHvIObOE4exS+D5LGO8LZ3LUXxId2IlUKcHDHaGujWhUg==}
+    resolution: {integrity: sha512-wDhpKJahGHWhmRt4RxtV3pES63CoeadljGWS/xeS9OJr1HBl2NB+OO44ht3sxDH5j5TRDAbQzC0NvSlsUfn7lQ==}
     engines: {node: '>=12'}
     dev: false
 
@@ -741,8 +738,8 @@ packages:
     resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==}
     dev: false
 
-  /@types/node@20.12.6:
+  /@types/node@20.11.30:
-    resolution: {integrity: sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==}
+    resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==}
     dependencies:
       undici-types: 5.26.5
     dev: true
@@ -763,14 +760,14 @@ packages:
     resolution: {integrity: sha512-5khscbd3SwWMhFqylJBLQ0zIu7c1K6Vz0uBIt915BI3zV0q1nfjRQD3RqSBcPaO6PHEF4ov/t9y89fSiyThlPA==}
     dev: false
 
-  /@types/react-dom@18.2.24:
+  /@types/react-dom@18.2.22:
-    resolution: {integrity: sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==}
+    resolution: {integrity: sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==}
     dependencies:
-      '@types/react': 18.2.75
+      '@types/react': 18.2.73
     dev: false
 
-  /@types/react@18.2.75:
+  /@types/react@18.2.73:
-    resolution: {integrity: sha512-+DNnF7yc5y0bHkBTiLKqXFe+L4B3nvOphiMY3tuA5X10esmjqk7smyBZzbGTy2vsiy/Bnzj8yFIBL8xhRacoOg==}
+    resolution: {integrity: sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==}
     dependencies:
       '@types/prop-types': 15.7.12
       csstype: 3.1.3
@@ -880,7 +877,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/companion-client@3.8.0(@uppy/core@3.10.0):
@@ -904,7 +901,7 @@ packages:
       mime-match: 1.0.2
       namespace-emitter: 2.0.1
       nanoid: 4.0.2
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/dashboard@3.8.0(@uppy/core@3.10.0):
@@ -924,7 +921,7 @@ packages:
       lodash: 4.17.21
       memoize-one: 6.0.0
       nanoid: 4.0.2
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/drag-drop@3.1.0(@uppy/core@3.10.0):
@@ -934,7 +931,7 @@ packages:
     dependencies:
       '@uppy/core': 3.10.0
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/dropbox@3.3.0(@uppy/core@3.10.0):
@@ -946,7 +943,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/facebook@3.3.0(@uppy/core@3.10.0):
@@ -958,7 +955,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/file-input@3.1.0(@uppy/core@3.10.0):
@@ -968,7 +965,7 @@ packages:
     dependencies:
       '@uppy/core': 3.10.0
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/google-drive@3.5.0(@uppy/core@3.10.0):
@@ -980,7 +977,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/informer@3.1.0(@uppy/core@3.10.0):
@@ -990,7 +987,7 @@ packages:
     dependencies:
       '@uppy/core': 3.10.0
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/instagram@3.3.0(@uppy/core@3.10.0):
@@ -1002,7 +999,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/onedrive@3.3.0(@uppy/core@3.10.0):
@@ -1014,7 +1011,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/progress-bar@3.1.1(@uppy/core@3.10.0):
@@ -1024,7 +1021,7 @@ packages:
     dependencies:
       '@uppy/core': 3.10.0
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/provider-views@3.11.0(@uppy/core@3.10.0):
@@ -1037,7 +1034,7 @@ packages:
       classnames: 2.5.1
       nanoid: 4.0.2
       p-queue: 7.4.1
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/react@3.3.0(@uppy/core@3.10.0)(@uppy/dashboard@3.8.0)(@uppy/drag-drop@3.1.0)(@uppy/file-input@3.1.0)(@uppy/progress-bar@3.1.1)(react@18.2.0):
@@ -1099,7 +1096,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/utils': 5.7.5
       classnames: 2.5.1
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/store-default@3.2.2:
@@ -1125,7 +1122,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/url@3.6.0(@uppy/core@3.10.0):
@@ -1137,14 +1134,14 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/utils': 5.7.5
       nanoid: 4.0.2
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/utils@5.7.5:
     resolution: {integrity: sha512-DBRmC26/ezllmJDkbkPZXhVVGwkY/gS9gOhhbVtOT1HZVqc5YY6Q9YFaecXUpsit8XxqNost7k7KKqQ5zV7Pcg==}
     dependencies:
       lodash: 4.17.21
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /@uppy/xhr-upload@3.6.4(@uppy/core@3.10.0):
@@ -1167,7 +1164,7 @@ packages:
       '@uppy/core': 3.10.0
       '@uppy/provider-views': 3.11.0(@uppy/core@3.10.0)
       '@uppy/utils': 5.7.5
-      preact: 10.20.2
+      preact: 10.20.1
     dev: false
 
   /acorn-jsx@5.3.2(acorn@8.11.3):
@@ -1243,7 +1240,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-object-atoms: 1.0.0
       get-intrinsic: 1.2.4
       is-string: 1.0.7
@@ -1260,7 +1257,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       es-shim-unscopables: 1.0.2
@@ -1272,7 +1269,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       es-shim-unscopables: 1.0.2
@@ -1284,7 +1281,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-shim-unscopables: 1.0.2
     dev: true
 
@@ -1294,7 +1291,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-shim-unscopables: 1.0.2
     dev: true
 
@@ -1303,7 +1300,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-shim-unscopables: 1.0.2
     dev: true
 
@@ -1312,7 +1309,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-errors: 1.3.0
       es-shim-unscopables: 1.0.2
     dev: true
@@ -1324,7 +1321,7 @@ packages:
       array-buffer-byte-length: 1.0.1
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
       is-array-buffer: 3.0.4
@@ -1407,7 +1404,7 @@ packages:
   /bulma@1.0.0:
     resolution: {integrity: sha512-7n49v/gdHXaHcU9fVobqGXO2OguiCoMh6CLbeX7jq00XrZ5vOSE4LNS0S/0Q6rlBbckY6kk6W7LwqxS0nu4bug==}
     dependencies:
-      sass: 1.74.1
+      sass: 1.72.0
     dev: false
 
   /busboy@1.6.0:
@@ -1432,8 +1429,8 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /caniuse-lite@1.0.30001607:
+  /caniuse-lite@1.0.30001600:
-    resolution: {integrity: sha512-WcvhVRjXLKFB/kmOFVwELtMxyhq3iM/MvmXcyCe2PNf166c39mptscOc/45TTS96n2gpNV2z7+NakArTWZCQ3w==}
+    resolution: {integrity: sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==}
     dev: false
 
   /castable-video@1.0.6:
@@ -1515,11 +1512,6 @@ packages:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
     dev: true
 
-  /core-js@3.36.1:
-    resolution: {integrity: sha512-BTvUrwxVBezj5SZ3f10ImnX2oRByMxql3EimVqMysepbC9EeMUOpLwdy6Eoili2x6E4kf+ZUB5k/+Jv55alPfA==}
-    requiresBuild: true
-    dev: false
-
   /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
@@ -1533,10 +1525,6 @@ packages:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
     dev: false
 
-  /custom-event-polyfill@1.0.7:
-    resolution: {integrity: sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==}
-    dev: false
-
   /custom-media-element@1.2.3:
     resolution: {integrity: sha512-xr9Hbrslkjm1fapJP5hL98pySeZmNepBSefQS/XTxynamqPTfRBK5MnhReMOiAj8xvJApVPrVnlYxIrknay8jg==}
     dev: false
@@ -1584,7 +1572,7 @@ packages:
     resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
     engines: {node: '>=0.11'}
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.1
     dev: false
 
   /dayjs@1.11.10:
@@ -1696,8 +1684,8 @@ packages:
       tapable: 2.2.1
     dev: true
 
-  /es-abstract@1.23.3:
+  /es-abstract@1.23.2:
-    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+    resolution: {integrity: sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==}
     engines: {node: '>= 0.4'}
     dependencies:
       array-buffer-byte-length: 1.0.1
@@ -1764,7 +1752,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-errors: 1.3.0
       es-set-tostringtag: 2.0.3
       function-bind: 1.1.2
@@ -1824,7 +1812,7 @@ packages:
         optional: true
     dependencies:
       '@next/eslint-plugin-next': 14.0.4
-      '@rushstack/eslint-patch': 1.10.1
+      '@rushstack/eslint-patch': 1.9.0
       '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
@@ -1943,7 +1931,7 @@ packages:
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
-      '@babel/runtime': 7.24.4
+      '@babel/runtime': 7.24.1
       aria-query: 5.3.0
       array-includes: 3.1.8
       array.prototype.flatmap: 1.3.2
@@ -2218,7 +2206,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       functions-have-names: 1.2.3
     dev: true
 
@@ -2717,10 +2705,6 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /loadjs@4.2.0:
-    resolution: {integrity: sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA==}
-    dev: false
-
   /locate-path@6.0.0:
     resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
     engines: {node: '>=10'}
@@ -2878,7 +2862,7 @@ packages:
       '@next/env': 14.0.4
       '@swc/helpers': 0.5.2
       busboy: 1.6.0
-      caniuse-lite: 1.0.30001607
+      caniuse-lite: 1.0.30001600
       graceful-fs: 4.2.11
       postcss: 8.4.31
       react: 18.2.0
@@ -2915,8 +2899,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: false
 
-  /node-abi@3.57.0:
+  /node-abi@3.56.0:
-    resolution: {integrity: sha512-Dp+A9JWxRaKuHP35H77I4kCKesDy5HUDEmScia2FyncMTOXASMyg251F5PhFoDA5uqBrDDffiLpbqnrZmNXW+g==}
+    resolution: {integrity: sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==}
     engines: {node: '>=10'}
     dependencies:
       semver: 7.6.0
@@ -2972,7 +2956,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-object-atoms: 1.0.0
     dev: true
 
@@ -2982,7 +2966,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
     dev: true
 
   /object.hasown@1.1.4:
@@ -2990,7 +2974,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-object-atoms: 1.0.0
     dev: true
 
@@ -3095,16 +3079,6 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
-  /plyr@3.7.8:
-    resolution: {integrity: sha512-yG/EHDobwbB/uP+4Bm6eUpJ93f8xxHjjk2dYcD1Oqpe1EcuQl5tzzw9Oq+uVAzd2lkM11qZfydSiyIpiB8pgdA==}
-    dependencies:
-      core-js: 3.36.1
-      custom-event-polyfill: 1.0.7
-      loadjs: 4.2.0
-      rangetouch: 2.0.1
-      url-polyfill: 1.1.12
-    dev: false
-
   /possible-typed-array-names@1.0.0:
     resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
     engines: {node: '>= 0.4'}
@@ -3119,8 +3093,8 @@ packages:
       source-map-js: 1.2.0
     dev: false
 
-  /preact@10.20.2:
+  /preact@10.20.1:
-    resolution: {integrity: sha512-S1d1ernz3KQ+Y2awUxKakpfOg2CEmJmwOP+6igPx6dgr6pgDvenqYviyokWso2rhHvGtTlWWnJDa7RaPbQerTg==}
+    resolution: {integrity: sha512-JIFjgFg9B2qnOoGiYMVBtrcFxHqn+dNXbq76bVmcaHYJFYR4lW67AOcXgAYQQTDYXDOg/kTZrKPNCdRgJ2UJmw==}
     dev: false
 
   /prebuild-install@7.1.2:
@@ -3134,7 +3108,7 @@ packages:
       minimist: 1.2.8
       mkdirp-classic: 0.5.3
       napi-build-utils: 1.0.2
-      node-abi: 3.57.0
+      node-abi: 3.56.0
       pump: 3.0.0
       rc: 1.2.8
       simple-get: 4.0.1
@@ -3191,10 +3165,6 @@ packages:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
-  /rangetouch@2.0.1:
-    resolution: {integrity: sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==}
-    dev: false
-
   /rc@1.2.8:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
@@ -3275,7 +3245,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
       globalthis: 1.0.3
@@ -3368,8 +3338,8 @@ packages:
       is-regex: 1.1.4
     dev: true
 
-  /sass@1.74.1:
+  /sass@1.72.0:
-    resolution: {integrity: sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==}
+    resolution: {integrity: sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -3543,7 +3513,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       get-intrinsic: 1.2.4
@@ -3561,7 +3531,7 @@ packages:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
-      es-abstract: 1.23.3
+      es-abstract: 1.23.2
       es-object-atoms: 1.0.0
     dev: true
 
@@ -3806,10 +3776,6 @@ packages:
       punycode: 2.3.1
     dev: true
 
-  /url-polyfill@1.1.12:
-    resolution: {integrity: sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A==}
-    dev: false
-
   /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: false

packages/strapi/.dockerignore

@@ -6,4 +6,4 @@ build/
 node_modules/
 # Ignoring folders that might be used in starter templates
 data/
-backup
+backup/

packages/strapi/.nvmrc

@@ -1 +1 @@
-lts/iron
+lts/hydrogen

packages/strapi/config/middlewares.js

@@ -1,5 +1,4 @@
 module.exports = [
-  'strapi::logger',
   'strapi::errors',
   {
     name: 'strapi::security',
@@ -18,6 +17,7 @@ module.exports = [
   
   'strapi::cors',
   'strapi::poweredBy',
+  'strapi::logger',
   'strapi::query',
   'strapi::body',
   'strapi::session',

packages/strapi/database/migrations/2023-08-01-relate-vods-to-vtubers-part2.js

@@ -21,5 +21,5 @@ module.exports = {
         });
       }
     }
-  }
+  },
 };

packages/strapi/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@futureporn/strapi",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.1.0",
   "description": "A Strapi application",
   "scripts": {
-    "dev": "pnpm strapi develop",
+    "dev": "yarn strapi develop",
     "dev:c": "concurrently \"npm:tunnel\" \"npm:dev:strapi\"",
     "tunnel": "ngrok start futureporn-strapi",
     "chisel": "bash ./chisel.sh",
@@ -14,30 +14,30 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@11ty/eleventy-fetch": "^4.0.1",
+    "@11ty/eleventy-fetch": "^4.0.0",
-    "@aws-sdk/client-s3": "^3.550.0",
+    "@aws-sdk/client-s3": "^3.485.0",
     "@esm2cjs/execa": "6.1.1-cjs.1",
-    "@mux/mux-node": "^7.3.5",
+    "@mux/mux-node": "^7.3.3",
     "@paralleldrive/cuid2": "^2.2.2",
     "@radix-ui/react-use-callback-ref": "^1.0.1",
-    "@strapi/plugin-i18n": "4.23.0",
+    "@strapi/plugin-i18n": "4.17.0",
-    "@strapi/plugin-users-permissions": "4.23.0",
+    "@strapi/plugin-users-permissions": "4.17.0",
-    "@strapi/provider-email-sendgrid": "4.23.0",
+    "@strapi/provider-email-sendgrid": "4.17.0",
-    "@strapi/provider-upload-cloudinary": "4.23.0",
+    "@strapi/provider-upload-cloudinary": "4.17.0",
-    "@strapi/strapi": "4.23.0",
+    "@strapi/strapi": "4.17.0",
-    "@strapi/utils": "4.23.0",
+    "@strapi/utils": "4.17.0",
     "@testing-library/dom": "8.19.0",
     "@testing-library/react": "12.1.4",
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.4.3",
-    "aws-sdk": "^2.1595.0",
+    "aws-sdk": "^2.1539.0",
     "bcryptjs": "2.4.3",
     "better-sqlite3": "8.0.1",
     "canvas": "^2.11.2",
     "codemirror": "^6.0.1",
-    "css-loader": "^6.11.0",
+    "css-loader": "^6.8.1",
     "cuid": "^3.0.0",
-    "date-fns": "^3.6.0",
+    "date-fns": "^3.1.0",
     "formik": "2.2.9",
     "fuzzy-search": "^3.2.1",
     "grant-koa": "5.4.8",
@@ -45,14 +45,14 @@
     "immer": "9.0.19",
     "jsonwebtoken": "9.0.0",
     "jwk-to-pem": "2.0.5",
-    "koa": "^2.15.2",
+    "koa": "^2.15.0",
     "koa2-ratelimit": "^1.1.3",
     "lodash": "4.17.21",
     "match-sorter": "^4.2.1",
     "msw": "1.0.1",
     "node-abort-controller": "^3.1.1",
     "object-assign": "^4.1.1",
-    "pg": "^8.11.5",
+    "pg": "^8.11.3",
     "prop-types": "^15.8.1",
     "purest": "4.0.2",
     "react": "^18.2.0",
@@ -62,11 +62,11 @@
     "react-redux": "8.0.5",
     "react-router-dom": "5.3.4",
     "react-test-renderer": "^17.0.2",
-    "semver": "^7.6.0",
+    "semver": "^7.5.4",
-    "sharp": "0.33.3",
+    "sharp": "0.32.6",
-    "strapi-plugin-fuzzy-search": "^2.2.1",
+    "strapi-plugin-fuzzy-search": "^2.2.0",
     "styled-components": "5.3.3",
-    "typescript": "^5.4.4",
+    "typescript": "^5.3.3",
     "url-join": "4.0.1",
     "yallist": "^4.0.0",
     "yup": "^0.32.11"
@@ -81,18 +81,8 @@
     "uuid": false
   },
   "engines": {
-    "node": "20.x.x",
+    "node": ">=14.19.1 <=19.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "MIT",
+  "license": "MIT"
-  "pnpm": {
-    "supportedArchitectures": {
-      "libc": [
-        "musl"
-      ]
-    },
-    "overrides": {
-      "sharp": "0.33.3"
-    }
-  }
 }

packages/uppy/package.json

@@ -13,19 +13,19 @@
   "author": "",
   "license": "Unlicense",
   "devDependencies": {
-    "nodemon": "^3.1.0"
+    "nodemon": "^3.0.3"
   },
   "dependencies": {
-    "@uppy/aws-s3-multipart": "^2.4.3",
+    "@uppy/aws-s3-multipart": "^2.0.0",
     "@uppy/companion": "4.12.0",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.3.1",
-    "express": "^4.19.2",
+    "express": "^4.18.2",
-    "express-session": "^1.18.0",
+    "express-session": "^1.17.3",
     "jsonwebtoken": "^9.0.2",
     "memorystore": "^1.6.7",
-    "react-hook-form": "^7.51.2",
+    "react-hook-form": "^7.49.3",
     "yup": "link:@hookform/resolvers/yup"
   }
 }

packages/uppy/pnpm-lock.yaml

@@ -6,11 +6,11 @@ settings:
 
 dependencies:
   '@uppy/aws-s3-multipart':
-    specifier: ^2.4.3
+    specifier: ^2.0.0
     version: 2.4.3(@uppy/core@2.3.4)
   '@uppy/companion':
     specifier: 4.12.0
-    version: 4.12.0(@aws-sdk/credential-provider-node@3.549.0)
+    version: 4.12.0(@aws-sdk/credential-provider-node@3.535.0)
   body-parser:
     specifier: ^1.20.2
     version: 1.20.2
@@ -18,13 +18,13 @@ dependencies:
     specifier: ^2.8.5
     version: 2.8.5
   dotenv:
-    specifier: ^16.4.5
+    specifier: ^16.3.1
     version: 16.4.5
   express:
-    specifier: ^4.19.2
+    specifier: ^4.18.2
-    version: 4.19.2
+    version: 4.18.3
   express-session:
-    specifier: ^1.18.0
+    specifier: ^1.17.3
     version: 1.18.0
   jsonwebtoken:
     specifier: ^9.0.2
@@ -33,15 +33,15 @@ dependencies:
     specifier: ^1.6.7
     version: 1.6.7
   react-hook-form:
-    specifier: ^7.51.2
+    specifier: ^7.49.3
-    version: 7.51.2(react@18.2.0)
+    version: 7.51.1(react@18.2.0)
   yup:
     specifier: link:@hookform/resolvers/yup
     version: link:@hookform/resolvers/yup
 
 devDependencies:
   nodemon:
-    specifier: ^3.1.0
+    specifier: ^3.0.3
     version: 3.1.0
 
 packages:
@@ -115,16 +115,16 @@ packages:
       tslib: 1.14.1
     dev: false
 
-  /@aws-sdk/client-s3@3.550.0:
+  /@aws-sdk/client-s3@3.536.0:
-    resolution: {integrity: sha512-45jjDQI0Q37PIteWhywhlExxYaiUeOsTsbE62b+U/FOjYV8tirC8uBY9eHeHaP4IPVGHeQWvEYrFJHNU+qsQLQ==}
+    resolution: {integrity: sha512-UM5txJxq8qKzLDVuW9c904bpb7+u1jOeyJITLz79WpyHSOP6ERHoTx/ltEuGJ4zQVazfkgthqR0lIn09sXEEuw==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-crypto/sha1-browser': 3.0.0
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/client-sts': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
-      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/core': 3.535.0
-      '@aws-sdk/credential-provider-node': 3.549.0
+      '@aws-sdk/credential-provider-node': 3.535.0
       '@aws-sdk/middleware-bucket-endpoint': 3.535.0
       '@aws-sdk/middleware-expect-continue': 3.535.0
       '@aws-sdk/middleware-flexible-checksums': 3.535.0
@@ -134,17 +134,17 @@ packages:
       '@aws-sdk/middleware-recursion-detection': 3.535.0
       '@aws-sdk/middleware-sdk-s3': 3.535.0
       '@aws-sdk/middleware-signing': 3.535.0
-      '@aws-sdk/middleware-ssec': 3.537.0
+      '@aws-sdk/middleware-ssec': 3.535.0
-      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/middleware-user-agent': 3.535.0
       '@aws-sdk/region-config-resolver': 3.535.0
       '@aws-sdk/signature-v4-multi-region': 3.535.0
       '@aws-sdk/types': 3.535.0
-      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-endpoints': 3.535.0
       '@aws-sdk/util-user-agent-browser': 3.535.0
       '@aws-sdk/util-user-agent-node': 3.535.0
       '@aws-sdk/xml-builder': 3.535.0
       '@smithy/config-resolver': 2.2.0
-      '@smithy/core': 1.4.2
+      '@smithy/core': 1.4.0
       '@smithy/eventstream-serde-browser': 2.2.0
       '@smithy/eventstream-serde-config-resolver': 2.2.0
       '@smithy/eventstream-serde-node': 2.2.0
@@ -155,21 +155,21 @@ packages:
       '@smithy/invalid-dependency': 2.2.0
       '@smithy/md5-js': 2.2.0
       '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
-      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-retry': 2.2.0
       '@smithy/middleware-serde': 2.3.0
       '@smithy/middleware-stack': 2.2.0
       '@smithy/node-config-provider': 2.3.0
       '@smithy/node-http-handler': 2.5.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/url-parser': 2.2.0
       '@smithy/util-base64': 2.3.0
       '@smithy/util-body-length-browser': 2.2.0
       '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.2.0
-      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-defaults-mode-node': 2.3.0
       '@smithy/util-endpoints': 1.2.0
       '@smithy/util-retry': 2.2.0
       '@smithy/util-stream': 2.2.0
@@ -180,47 +180,47 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sso-oidc@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+  /@aws-sdk/client-sso-oidc@3.535.0(@aws-sdk/credential-provider-node@3.535.0):
-    resolution: {integrity: sha512-FbB4A78ILAb8sM4TfBd+3CrQcfZIhe0gtVZNbaxpq5cJZh1K7oZ8vPfKw4do9JWkDUXPLsD9Bwz12f8/JpAb6Q==}
+    resolution: {integrity: sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
-      '@aws-sdk/credential-provider-node': ^3.549.0
+      '@aws-sdk/credential-provider-node': ^3.535.0
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/client-sts': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
-      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/core': 3.535.0
-      '@aws-sdk/credential-provider-node': 3.549.0
+      '@aws-sdk/credential-provider-node': 3.535.0
       '@aws-sdk/middleware-host-header': 3.535.0
       '@aws-sdk/middleware-logger': 3.535.0
       '@aws-sdk/middleware-recursion-detection': 3.535.0
-      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/middleware-user-agent': 3.535.0
       '@aws-sdk/region-config-resolver': 3.535.0
       '@aws-sdk/types': 3.535.0
-      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-endpoints': 3.535.0
       '@aws-sdk/util-user-agent-browser': 3.535.0
       '@aws-sdk/util-user-agent-node': 3.535.0
       '@smithy/config-resolver': 2.2.0
-      '@smithy/core': 1.4.2
+      '@smithy/core': 1.4.0
       '@smithy/fetch-http-handler': 2.5.0
       '@smithy/hash-node': 2.2.0
       '@smithy/invalid-dependency': 2.2.0
       '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
-      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-retry': 2.2.0
       '@smithy/middleware-serde': 2.3.0
       '@smithy/middleware-stack': 2.2.0
       '@smithy/node-config-provider': 2.3.0
       '@smithy/node-http-handler': 2.5.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/url-parser': 2.2.0
       '@smithy/util-base64': 2.3.0
       '@smithy/util-body-length-browser': 2.2.0
       '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.2.0
-      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-defaults-mode-node': 2.3.0
       '@smithy/util-endpoints': 1.2.0
       '@smithy/util-middleware': 2.2.0
       '@smithy/util-retry': 2.2.0
@@ -230,43 +230,43 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sso@3.549.0:
+  /@aws-sdk/client-sso@3.535.0:
-    resolution: {integrity: sha512-lz+yflOAj5Q263FlCsKpNqttaCb2NPh8jC76gVCqCt7TPxRDBYVaqg0OZYluDaETIDNJi4DwN2Azcck7ilwuPw==}
+    resolution: {integrity: sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/core': 3.535.0
       '@aws-sdk/middleware-host-header': 3.535.0
       '@aws-sdk/middleware-logger': 3.535.0
       '@aws-sdk/middleware-recursion-detection': 3.535.0
-      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/middleware-user-agent': 3.535.0
       '@aws-sdk/region-config-resolver': 3.535.0
       '@aws-sdk/types': 3.535.0
-      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-endpoints': 3.535.0
       '@aws-sdk/util-user-agent-browser': 3.535.0
       '@aws-sdk/util-user-agent-node': 3.535.0
       '@smithy/config-resolver': 2.2.0
-      '@smithy/core': 1.4.2
+      '@smithy/core': 1.4.0
       '@smithy/fetch-http-handler': 2.5.0
       '@smithy/hash-node': 2.2.0
       '@smithy/invalid-dependency': 2.2.0
       '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
-      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-retry': 2.2.0
       '@smithy/middleware-serde': 2.3.0
       '@smithy/middleware-stack': 2.2.0
       '@smithy/node-config-provider': 2.3.0
       '@smithy/node-http-handler': 2.5.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/url-parser': 2.2.0
       '@smithy/util-base64': 2.3.0
       '@smithy/util-body-length-browser': 2.2.0
       '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.2.0
-      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-defaults-mode-node': 2.3.0
       '@smithy/util-endpoints': 1.2.0
       '@smithy/util-middleware': 2.2.0
       '@smithy/util-retry': 2.2.0
@@ -276,46 +276,46 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/client-sts@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+  /@aws-sdk/client-sts@3.535.0(@aws-sdk/credential-provider-node@3.535.0):
-    resolution: {integrity: sha512-63IreJ598Dzvpb+6sy81KfIX5iQxnrWSEtlyeCdC2GO6gmSQVwJzc9kr5pAC83lHmlZcm/Q3KZr3XBhRQqP0og==}
+    resolution: {integrity: sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
-      '@aws-sdk/credential-provider-node': ^3.549.0
+      '@aws-sdk/credential-provider-node': ^3.535.0
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/core': 3.549.0
+      '@aws-sdk/core': 3.535.0
-      '@aws-sdk/credential-provider-node': 3.549.0
+      '@aws-sdk/credential-provider-node': 3.535.0
       '@aws-sdk/middleware-host-header': 3.535.0
       '@aws-sdk/middleware-logger': 3.535.0
       '@aws-sdk/middleware-recursion-detection': 3.535.0
-      '@aws-sdk/middleware-user-agent': 3.540.0
+      '@aws-sdk/middleware-user-agent': 3.535.0
       '@aws-sdk/region-config-resolver': 3.535.0
       '@aws-sdk/types': 3.535.0
-      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-endpoints': 3.535.0
       '@aws-sdk/util-user-agent-browser': 3.535.0
       '@aws-sdk/util-user-agent-node': 3.535.0
       '@smithy/config-resolver': 2.2.0
-      '@smithy/core': 1.4.2
+      '@smithy/core': 1.4.0
       '@smithy/fetch-http-handler': 2.5.0
       '@smithy/hash-node': 2.2.0
       '@smithy/invalid-dependency': 2.2.0
       '@smithy/middleware-content-length': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
-      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-retry': 2.2.0
       '@smithy/middleware-serde': 2.3.0
       '@smithy/middleware-stack': 2.2.0
       '@smithy/node-config-provider': 2.3.0
       '@smithy/node-http-handler': 2.5.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/url-parser': 2.2.0
       '@smithy/util-base64': 2.3.0
       '@smithy/util-body-length-browser': 2.2.0
       '@smithy/util-body-length-node': 2.3.0
-      '@smithy/util-defaults-mode-browser': 2.2.1
+      '@smithy/util-defaults-mode-browser': 2.2.0
-      '@smithy/util-defaults-mode-node': 2.3.1
+      '@smithy/util-defaults-mode-node': 2.3.0
       '@smithy/util-endpoints': 1.2.0
       '@smithy/util-middleware': 2.2.0
       '@smithy/util-retry': 2.2.0
@@ -325,14 +325,14 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/core@3.549.0:
+  /@aws-sdk/core@3.535.0:
-    resolution: {integrity: sha512-jC61OxJn72r/BbuDRCcluiw05Xw9eVLG0CwxQpF3RocxfxyZqlrGYaGecZ8Wy+7g/3sqGRC/Ar5eUhU1YcLx7w==}
+    resolution: {integrity: sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/core': 1.4.2
+      '@smithy/core': 1.4.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
+      '@smithy/signature-v4': 2.2.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       fast-xml-parser: 4.2.5
       tslib: 2.6.2
@@ -357,21 +357,21 @@ packages:
       '@smithy/node-http-handler': 2.5.0
       '@smithy/property-provider': 2.2.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/util-stream': 2.2.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-ini@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+  /@aws-sdk/credential-provider-ini@3.535.0(@aws-sdk/credential-provider-node@3.535.0):
-    resolution: {integrity: sha512-k6IIrluZjQpzui5Din8fW3bFFhHaJ64XrsfYx0Ks1mb7xan84dJxmYP3tdDDmLzUeJv5h95ag88taHfjY9rakA==}
+    resolution: {integrity: sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/client-sts': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
       '@aws-sdk/credential-provider-env': 3.535.0
       '@aws-sdk/credential-provider-process': 3.535.0
-      '@aws-sdk/credential-provider-sso': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-sso': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
-      '@aws-sdk/credential-provider-web-identity': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-web-identity': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
       '@aws-sdk/types': 3.535.0
       '@smithy/credential-provider-imds': 2.3.0
       '@smithy/property-provider': 2.2.0
@@ -383,16 +383,16 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-node@3.549.0:
+  /@aws-sdk/credential-provider-node@3.535.0:
-    resolution: {integrity: sha512-f3YgalsMuywEAVX4AUm9tojqrBdfpAac0+D320ePzas0Ntbp7ItYu9ceKIhgfzXO3No7P3QK0rCrOxL+ABTn8Q==}
+    resolution: {integrity: sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/credential-provider-env': 3.535.0
       '@aws-sdk/credential-provider-http': 3.535.0
-      '@aws-sdk/credential-provider-ini': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-ini': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
       '@aws-sdk/credential-provider-process': 3.535.0
-      '@aws-sdk/credential-provider-sso': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-sso': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
-      '@aws-sdk/credential-provider-web-identity': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/credential-provider-web-identity': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
       '@aws-sdk/types': 3.535.0
       '@smithy/credential-provider-imds': 2.3.0
       '@smithy/property-provider': 2.2.0
@@ -414,12 +414,12 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/credential-provider-sso@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+  /@aws-sdk/credential-provider-sso@3.535.0(@aws-sdk/credential-provider-node@3.535.0):
-    resolution: {integrity: sha512-BGopRKHs7W8zkoH8qmSHrjudj263kXbhVkAUPxVUz0I28+CZNBgJC/RfVCbOpzmysIQEpwSqvOv1y0k+DQzIJQ==}
+    resolution: {integrity: sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/client-sso': 3.549.0
+      '@aws-sdk/client-sso': 3.535.0
-      '@aws-sdk/token-providers': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/token-providers': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
       '@aws-sdk/types': 3.535.0
       '@smithy/property-provider': 2.2.0
       '@smithy/shared-ini-file-loader': 2.4.0
@@ -430,11 +430,11 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/credential-provider-web-identity@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+  /@aws-sdk/credential-provider-web-identity@3.535.0(@aws-sdk/credential-provider-node@3.535.0):
-    resolution: {integrity: sha512-QzclVXPxuwSI7515l34sdvliVq5leroO8P7RQFKRgfyQKO45o1psghierwG3PgV6jlMiv78FIAGJBr/n4qZ7YA==}
+    resolution: {integrity: sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/client-sts': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
       '@aws-sdk/types': 3.535.0
       '@smithy/property-provider': 2.2.0
       '@smithy/types': 2.12.0
@@ -444,16 +444,16 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/lib-storage@3.550.0(@aws-sdk/client-s3@3.550.0):
+  /@aws-sdk/lib-storage@3.536.0(@aws-sdk/client-s3@3.536.0):
-    resolution: {integrity: sha512-zDUM4hV/t148DCXschwDusH9tzg7U1MpuUaUPJlklx9Va+NnjrjtWHwL/JeZ5sfGR/1wTZIg3sKho/4P2oAYrQ==}
+    resolution: {integrity: sha512-jeHnxHy02n2oEaXZx0fwNbZwnA1LZvSC6mEQZYlz3trhhqE3Ryn8HnODGR+cUKb8i+iyVCWdKRa4mfz1Xu+sQw==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       '@aws-sdk/client-s3': ^3.0.0
     dependencies:
-      '@aws-sdk/client-s3': 3.550.0
+      '@aws-sdk/client-s3': 3.536.0
       '@smithy/abort-controller': 2.2.0
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       buffer: 5.6.0
       events: 3.3.0
       stream-browserify: 3.0.0
@@ -543,8 +543,8 @@ packages:
       '@aws-sdk/util-arn-parser': 3.535.0
       '@smithy/node-config-provider': 2.3.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
+      '@smithy/signature-v4': 2.2.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/util-config-provider': 2.3.0
       tslib: 2.6.2
@@ -557,14 +557,14 @@ packages:
       '@aws-sdk/types': 3.535.0
       '@smithy/property-provider': 2.2.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
+      '@smithy/signature-v4': 2.2.0
       '@smithy/types': 2.12.0
       '@smithy/util-middleware': 2.2.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-ssec@3.537.0:
+  /@aws-sdk/middleware-ssec@3.535.0:
-    resolution: {integrity: sha512-2QWMrbwd5eBy5KCYn9a15JEWBgrK2qFEKQN2lqb/6z0bhtevIOxIRfC99tzvRuPt6nixFQ+ynKuBjcfT4ZFrdQ==}
+    resolution: {integrity: sha512-QAQ++9my7VZzusUPOFcUMdhTnjpGRyy/OvPC+jg9usdfcaSZeQbfzbdaVBalcm2Wt+1qxh3LZSTS+LxKikm02Q==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.535.0
@@ -572,12 +572,12 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/middleware-user-agent@3.540.0:
+  /@aws-sdk/middleware-user-agent@3.535.0:
-    resolution: {integrity: sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ==}
+    resolution: {integrity: sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.535.0
-      '@aws-sdk/util-endpoints': 3.540.0
+      '@aws-sdk/util-endpoints': 3.535.0
       '@smithy/protocol-http': 3.3.0
       '@smithy/types': 2.12.0
       tslib: 2.6.2
@@ -595,15 +595,15 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/s3-presigned-post@3.550.0:
+  /@aws-sdk/s3-presigned-post@3.536.0:
-    resolution: {integrity: sha512-lA40/vBM8YiQErlkeljk4ubjGorw/4VCTMT+buMqJBkb0FeiX5kxJFXlX5SmbgUsSMddM4hvzFpriY8IGVWwYg==}
+    resolution: {integrity: sha512-6CRDpD5GZkHmxBD5UB7NdOmOd2v2By8Mw/kqSGmxgHPsQwrYWnuR3FdxAX4j/QDv81KUiCgak2w/SacDaiPN3g==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/client-s3': 3.550.0
+      '@aws-sdk/client-s3': 3.536.0
       '@aws-sdk/types': 3.535.0
       '@aws-sdk/util-format-url': 3.535.0
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
-      '@smithy/signature-v4': 2.2.1
+      '@smithy/signature-v4': 2.2.0
       '@smithy/types': 2.12.0
       '@smithy/util-hex-encoding': 2.2.0
       '@smithy/util-utf8': 2.3.0
@@ -612,16 +612,16 @@ packages:
       - aws-crt
     dev: false
 
-  /@aws-sdk/s3-request-presigner@3.550.0:
+  /@aws-sdk/s3-request-presigner@3.536.0:
-    resolution: {integrity: sha512-aH+5bwOQrUphcyIFDmePU/pB9pfK5leG5hus1awVJE09+zrmKnQQWyt1nkcJOWFFh/89Ukb6/xop+YWK5xZpSw==}
+    resolution: {integrity: sha512-bMz7nxYfSjCkw72Hah40o0c9scwU2LQWoT3CkTcWs9OCrG4MCzMTBJNlzRUpxOpfGTZqVzrCaUGINIjh3jP/tQ==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/signature-v4-multi-region': 3.535.0
       '@aws-sdk/types': 3.535.0
       '@aws-sdk/util-format-url': 3.535.0
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       tslib: 2.6.2
     dev: false
@@ -633,16 +633,16 @@ packages:
       '@aws-sdk/middleware-sdk-s3': 3.535.0
       '@aws-sdk/types': 3.535.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/signature-v4': 2.2.1
+      '@smithy/signature-v4': 2.2.0
       '@smithy/types': 2.12.0
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/token-providers@3.549.0(@aws-sdk/credential-provider-node@3.549.0):
+  /@aws-sdk/token-providers@3.535.0(@aws-sdk/credential-provider-node@3.535.0):
-    resolution: {integrity: sha512-rJyeXkXknLukRFGuMQOgKnPBa+kLODJtOqEBf929SpQ96f1I6ytdndmWbB5B/OQN5Fu5DOOQUQqJypDQVl5ibQ==}
+    resolution: {integrity: sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@aws-sdk/client-sso-oidc': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/client-sso-oidc': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
       '@aws-sdk/types': 3.535.0
       '@smithy/property-provider': 2.2.0
       '@smithy/shared-ini-file-loader': 2.4.0
@@ -668,8 +668,8 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@aws-sdk/util-endpoints@3.540.0:
+  /@aws-sdk/util-endpoints@3.535.0:
-    resolution: {integrity: sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw==}
+    resolution: {integrity: sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@aws-sdk/types': 3.535.0
@@ -819,15 +819,15 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/core@1.4.2:
+  /@smithy/core@1.4.0:
-    resolution: {integrity: sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==}
+    resolution: {integrity: sha512-uu9ZDI95Uij4qk+L6kyFjdk11zqBkcJ3Lv0sc6jZrqHvLyr0+oeekD3CnqMafBn/5PRI6uv6ulW3kNLRBUHeVw==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
-      '@smithy/middleware-retry': 2.3.1
+      '@smithy/middleware-retry': 2.2.0
       '@smithy/middleware-serde': 2.3.0
       '@smithy/protocol-http': 3.3.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/util-middleware': 2.2.0
       tslib: 2.6.2
@@ -957,8 +957,8 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-endpoint@2.5.1:
+  /@smithy/middleware-endpoint@2.5.0:
-    resolution: {integrity: sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==}
+    resolution: {integrity: sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@smithy/middleware-serde': 2.3.0
@@ -970,19 +970,19 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/middleware-retry@2.3.1:
+  /@smithy/middleware-retry@2.2.0:
-    resolution: {integrity: sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==}
+    resolution: {integrity: sha512-PsjDOLpbevgn37yJbawmfVoanru40qVA8UEf2+YA1lvOefmhuhL6ZbKtGsLAWDRnE1OlAmedsbA/htH6iSZjNA==}
     engines: {node: '>=14.0.0'}
     dependencies:
       '@smithy/node-config-provider': 2.3.0
       '@smithy/protocol-http': 3.3.0
       '@smithy/service-error-classification': 2.1.5
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       '@smithy/util-middleware': 2.2.0
       '@smithy/util-retry': 2.2.0
       tslib: 2.6.2
-      uuid: 9.0.1
+      uuid: 8.3.2
     dev: false
 
   /@smithy/middleware-serde@2.3.0:
@@ -1070,10 +1070,11 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/signature-v4@2.2.1:
+  /@smithy/signature-v4@2.2.0:
-    resolution: {integrity: sha512-j5fHgL1iqKTsKJ1mTcw88p0RUcidDu95AWSeZTgiYJb+QcfwWU/UpBnaqiB59FNH5MiAZuSbOBnZlwzeeY2tIw==}
+    resolution: {integrity: sha512-+B5TNzj/fRZzVW3z8UUJOkNx15+4E0CLuvJmJUA1JUIZFp3rdJ/M2H5r2SqltaVPXL0oIxv/6YK92T9TsFGbFg==}
     engines: {node: '>=14.0.0'}
     dependencies:
+      '@smithy/eventstream-codec': 2.2.0
       '@smithy/is-array-buffer': 2.2.0
       '@smithy/types': 2.12.0
       '@smithy/util-hex-encoding': 2.2.0
@@ -1083,11 +1084,11 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/smithy-client@2.5.1:
+  /@smithy/smithy-client@2.5.0:
-    resolution: {integrity: sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==}
+    resolution: {integrity: sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g==}
     engines: {node: '>=14.0.0'}
     dependencies:
-      '@smithy/middleware-endpoint': 2.5.1
+      '@smithy/middleware-endpoint': 2.5.0
       '@smithy/middleware-stack': 2.2.0
       '@smithy/protocol-http': 3.3.0
       '@smithy/types': 2.12.0
@@ -1147,26 +1148,26 @@ packages:
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-browser@2.2.1:
+  /@smithy/util-defaults-mode-browser@2.2.0:
-    resolution: {integrity: sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw==}
+    resolution: {integrity: sha512-2okTdZaCBvOJszAPU/KSvlimMe35zLOKbQpHhamFJmR7t95HSe0K3C92jQPjKY3PmDBD+7iMkOnuW05F5OlF4g==}
     engines: {node: '>= 10.0.0'}
     dependencies:
       '@smithy/property-provider': 2.2.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       bowser: 2.11.0
       tslib: 2.6.2
     dev: false
 
-  /@smithy/util-defaults-mode-node@2.3.1:
+  /@smithy/util-defaults-mode-node@2.3.0:
-    resolution: {integrity: sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA==}
+    resolution: {integrity: sha512-hfKXnNLmsW9cmLb/JXKIvtuO6Cf4SuqN5PN1C2Ru/TBIws+m1wSgb+A53vo0r66xzB6E82inKG2J7qtwdi+Kkw==}
     engines: {node: '>= 10.0.0'}
     dependencies:
       '@smithy/config-resolver': 2.2.0
       '@smithy/credential-provider-imds': 2.3.0
       '@smithy/node-config-provider': 2.3.0
       '@smithy/property-provider': 2.2.0
-      '@smithy/smithy-client': 2.5.1
+      '@smithy/smithy-client': 2.5.0
       '@smithy/types': 2.12.0
       tslib: 2.6.2
     dev: false
@@ -1258,7 +1259,7 @@ packages:
     dependencies:
       '@types/http-cache-semantics': 4.0.4
       '@types/keyv': 3.1.4
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
       '@types/responselike': 1.0.3
     dev: false
 
@@ -1269,11 +1270,11 @@ packages:
   /@types/keyv@3.1.4:
     resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
     dependencies:
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
     dev: false
 
-  /@types/node@20.12.6:
+  /@types/node@20.11.29:
-    resolution: {integrity: sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==}
+    resolution: {integrity: sha512-P99thMkD/1YkCvAtOd6/zGedKNA0p2fj4ZpjCzcNiSCBWgm3cNRTBfa/qjFnsKkkojxu4vVLtWpesnZ9+ap+gA==}
     dependencies:
       undici-types: 5.26.5
     dev: false
@@ -1281,7 +1282,7 @@ packages:
   /@types/responselike@1.0.3:
     resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==}
     dependencies:
-      '@types/node': 20.12.6
+      '@types/node': 20.11.29
     dev: false
 
   /@uppy/aws-s3-multipart@2.4.3(@uppy/core@2.3.4):
@@ -1301,16 +1302,16 @@ packages:
       namespace-emitter: 2.0.1
     dev: false
 
-  /@uppy/companion@4.12.0(@aws-sdk/credential-provider-node@3.549.0):
+  /@uppy/companion@4.12.0(@aws-sdk/credential-provider-node@3.535.0):
     resolution: {integrity: sha512-Q/1c7HZ/XwMiy0vY978fgFsfOumW8M2AHSIDnAceFKrLkBVQVL+SXj8DnkUTgsxzI/TLShCmuj0kU4oTeC+4rg==}
     engines: {node: ^14.19.0 || ^16.15.0 || >=18.0.0}
     hasBin: true
     dependencies:
-      '@aws-sdk/client-s3': 3.550.0
+      '@aws-sdk/client-s3': 3.536.0
-      '@aws-sdk/client-sts': 3.549.0(@aws-sdk/credential-provider-node@3.549.0)
+      '@aws-sdk/client-sts': 3.535.0(@aws-sdk/credential-provider-node@3.535.0)
-      '@aws-sdk/lib-storage': 3.550.0(@aws-sdk/client-s3@3.550.0)
+      '@aws-sdk/lib-storage': 3.536.0(@aws-sdk/client-s3@3.536.0)
-      '@aws-sdk/s3-presigned-post': 3.550.0
+      '@aws-sdk/s3-presigned-post': 3.536.0
-      '@aws-sdk/s3-request-presigner': 3.550.0
+      '@aws-sdk/s3-request-presigner': 3.536.0
       atob: 2.1.2
       body-parser: 1.20.0
       chalk: 4.1.2
@@ -1364,7 +1365,7 @@ packages:
       mime-match: 1.0.2
       namespace-emitter: 2.0.1
       nanoid: 3.3.7
-      preact: 10.20.2
+      preact: 10.19.7
     dev: false
 
   /@uppy/store-default@2.1.1:
@@ -1964,8 +1965,8 @@ packages:
       - supports-color
     dev: false
 
-  /express@4.19.2:
+  /express@4.18.3:
-    resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}
+    resolution: {integrity: sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==}
     engines: {node: '>= 0.10.0'}
     dependencies:
       accepts: 1.3.8
@@ -1973,7 +1974,7 @@ packages:
       body-parser: 1.20.2
       content-disposition: 0.5.4
       content-type: 1.0.5
-      cookie: 0.6.0
+      cookie: 0.5.0
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
@@ -2704,8 +2705,8 @@ packages:
     engines: {node: '>=8.6'}
     dev: true
 
-  /preact@10.20.2:
+  /preact@10.19.7:
-    resolution: {integrity: sha512-S1d1ernz3KQ+Y2awUxKakpfOg2CEmJmwOP+6igPx6dgr6pgDvenqYviyokWso2rhHvGtTlWWnJDa7RaPbQerTg==}
+    resolution: {integrity: sha512-IJOW6cQN1fwfC17HfNOqUtAGyB8wAYshuC+jG1JiL/1+sC4yVyuA3IcF0N9vdodMJjW/lbuEF5qFsJqGNcbHbw==}
     dev: false
 
   /prom-client@14.0.1:
@@ -2812,8 +2813,8 @@ packages:
       unpipe: 1.0.0
     dev: false
 
-  /react-hook-form@7.51.2(react@18.2.0):
+  /react-hook-form@7.51.1(react@18.2.0):
-    resolution: {integrity: sha512-y++lwaWjtzDt/XNnyGDQy6goHskFualmDlf+jzEZvjvz6KWDf7EboL7pUvRCzPTJd0EOPpdekYaQLEvvG6m6HA==}
+    resolution: {integrity: sha512-ifnBjl+kW0ksINHd+8C/Gp6a4eZOdWyvRv0UBaByShwU8JbVx5hTcTWEcd5VdybvmPTATkVVXk9npXArHmo56w==}
     engines: {node: '>=12.22.0'}
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18
@@ -3132,11 +3133,6 @@ packages:
     hasBin: true
     dev: false
 
-  /uuid@9.0.1:
-    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
-    hasBin: true
-    dev: false
-
   /validator@13.11.0:
     resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==}
     engines: {node: '>= 0.10'}

strapi.dockerfile

@@ -1,34 +1,51 @@
-FROM node:20-alpine as base
+# FROM node:18-alpine
-WORKDIR /app
+# # Installing libvips-dev for sharp Compatibility
-ENV PNPM_HOME="/pnpm"
+# RUN apk update && apk add --no-cache build-base gcc autoconf automake zlib-dev libpng-dev nasm bash vips-dev git
-ENV PATH="$PNPM_HOME:$PATH"
+# ARG NODE_ENV=development
-RUN corepack enable
+# ENV NODE_ENV=${NODE_ENV}
-RUN apk update && apk add --no-cache build-base gcc autoconf automake zlib-dev libpng-dev vips-dev libc6-compat git nasm bash gcompat
 
-FROM base AS install
+# WORKDIR /opt/
-COPY ./packages/strapi/pnpm-lock.yaml ./packages/strapi/package.json ./
+# COPY ./packages/strapi/package.json ./packages/strapi/yarn.lock ./
-RUN pnpm install --prod --shamefully-hoist && pnpm run build
+# RUN yarn global add node-gyp
+# RUN yarn config set network-timeout 600000 -g && yarn install
+# ENV PATH /opt/node_modules/.bin:$PATH
+
+# WORKDIR /opt/app
+# COPY ./packages/strapi .
+# RUN chown -R node:node /opt/app
+# USER node
+# RUN ["yarn", "build"]
+# EXPOSE 1337
+# CMD ["yarn", "dev"]
+
+FROM node:18.16-alpine as base
+RUN corepack enable
+# Installing libvips-dev for sharp Compatibility
+RUN apk update && apk add --no-cache build-base gcc autoconf automake zlib-dev libpng-dev nasm bash vips-dev
+ARG NODE_ENV=development
+ENV NODE_ENV=${NODE_ENV}
+WORKDIR /app
+
+
+FROM base AS build
+# COPY package.json pnpm-lock.yaml ./
+COPY pnpm-lock.yaml ./
+# RUN yarn config set network-timeout 600000 -g && yarn install
+# RUN pnpm install --frozen-lockfile
+
+RUN pnpm fetch
 COPY ./packages/strapi .
+RUN pnpm install --offline
+# ENV PATH=/app/node_modules/.bin:$PATH
 RUN chown -R node:node /app
 USER node
+# RUN pnpm run build
+# EXPOSE 1337
 
 
-# FROM base AS install
+FROM build AS dev
-# COPY ./packages/strapi/pnpm-lock.yaml ./
+CMD ["pnpm", "run", "dev"]
-# RUN pnpm fetch --prod
-# COPY ./packages/strapi .
-# RUN pnpm i --offline --prod --shamefully-hoist && pnpm run build
-# RUN chown -R node:node /app
-# USER node
 
-
+FROM build AS release
-
+CMD ["pnpm"]
-FROM install AS dev
+ENTRYPOINT ["run", "start"]
-ENV NODE_ENV=development
-ENTRYPOINT ["pnpm"]
-CMD ["run", "dev"]
-
-FROM install AS release
-ENV NODE_ENV=production
-ENTRYPOINT ["pnpm"]
-CMD ["run", "start"]