From 88c84ad8d68832fc338f2317b2826067b30ca0a0 Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Fri, 6 Oct 2023 17:38:33 -0400
Subject: [PATCH] chore: move test deps to root package.json

---
 package.json                  |  3 +++
 packages/payload/package.json |  4 ----
 pnpm-lock.yaml                | 21 +++++++++------------
 test/helpers/configHelpers.ts |  5 +++--
 test/runE2E.ts                |  1 -
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 0b3518fdc..828249d37 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "@types/node": "20.5.7",
     "@types/qs": "6.9.7",
     "@types/react": "18.2.15",
+    "@types/shelljs": "0.8.12",
     "@types/testing-library__jest-dom": "5.14.8",
     "copyfiles": "2.4.1",
     "cross-env": "7.0.3",
@@ -51,6 +52,7 @@
     "express": "4.18.2",
     "form-data": "3.0.1",
     "get-port": "5.1.1",
+    "glob": "8.1.0",
     "graphql-request": "6.1.0",
     "husky": "^8.0.3",
     "isomorphic-fetch": "3.0.0",
@@ -66,6 +68,7 @@
     "react-image-crop": "10.1.8",
     "rimraf": "3.0.2",
     "shelljs": "0.8.5",
+    "slash": "3.0.0",
     "slate": "0.91.4",
     "ts-node": "10.9.1",
     "turbo": "^1.10.15",
diff --git a/packages/payload/package.json b/packages/payload/package.json
index 0366a9ba0..7d42d7873 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -177,7 +177,6 @@
     "@types/react-helmet": "6.1.6",
     "@types/react-router-dom": "5.3.3",
     "@types/sharp": "0.31.1",
-    "@types/shelljs": "0.8.12",
     "@types/uuid": "8.3.4",
     "confusing-browser-globals": "1.0.11",
     "copyfiles": "2.4.1",
@@ -187,7 +186,6 @@
     "file-loader": "6.2.0",
     "form-data": "3.0.1",
     "get-port": "5.1.1",
-    "glob": "8.1.0",
     "graphql-request": "3.7.0",
     "mini-css-extract-plugin": "1.6.2",
     "node-fetch": "2.6.12",
@@ -201,8 +199,6 @@
     "rimraf": "3.0.2",
     "sass-loader": "12.6.0",
     "serve-static": "1.15.0",
-    "shelljs": "0.8.5",
-    "slash": "3.0.0",
     "swc-loader": "^0.2.3",
     "terser": "5.19.2",
     "terser-webpack-plugin": "^5.3.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5dc0241b6..c670139cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -51,6 +51,9 @@ importers:
       '@types/react':
         specifier: 18.2.15
         version: 18.2.15
+      '@types/shelljs':
+        specifier: 0.8.12
+        version: 0.8.12
       '@types/testing-library__jest-dom':
         specifier: 5.14.8
         version: 5.14.8
@@ -72,6 +75,9 @@ importers:
       get-port:
         specifier: 5.1.1
         version: 5.1.1
+      glob:
+        specifier: 8.1.0
+        version: 8.1.0
       graphql-request:
         specifier: 6.1.0
         version: 6.1.0(graphql@16.7.1)
@@ -117,6 +123,9 @@ importers:
       shelljs:
         specifier: 0.8.5
         version: 0.8.5
+      slash:
+        specifier: 3.0.0
+        version: 3.0.0
       slate:
         specifier: 0.91.4
         version: 0.91.4
@@ -826,9 +835,6 @@ importers:
       '@types/sharp':
         specifier: 0.31.1
         version: 0.31.1
-      '@types/shelljs':
-        specifier: 0.8.12
-        version: 0.8.12
       '@types/uuid':
         specifier: 8.3.4
         version: 8.3.4
@@ -856,9 +862,6 @@ importers:
       get-port:
         specifier: 5.1.1
         version: 5.1.1
-      glob:
-        specifier: 8.1.0
-        version: 8.1.0
       graphql-request:
         specifier: 3.7.0
         version: 3.7.0(graphql@16.7.1)
@@ -898,12 +901,6 @@ importers:
       serve-static:
         specifier: 1.15.0
         version: 1.15.0
-      shelljs:
-        specifier: 0.8.5
-        version: 0.8.5
-      slash:
-        specifier: 3.0.0
-        version: 3.0.0
       terser:
         specifier: 5.19.2
         version: 5.19.2
diff --git a/test/helpers/configHelpers.ts b/test/helpers/configHelpers.ts
index 587daa49b..13d36081f 100644
--- a/test/helpers/configHelpers.ts
+++ b/test/helpers/configHelpers.ts
@@ -5,17 +5,18 @@ import path from 'path'
 import shelljs from 'shelljs'
 import { v4 as uuid } from 'uuid'
 
+import type { Payload } from '../../packages/payload/src'
 import type { CollectionConfig } from '../../packages/payload/src/collections/config/types'
 import type { InitOptions } from '../../packages/payload/src/config/types'
 
-import payload, { Payload } from '../../packages/payload/src'
+import payload from '../../packages/payload/src'
 
 type Options = {
   __dirname: string
   init?: Partial<InitOptions>
 }
 
-type InitializedPayload = { serverURL: string; payload: Payload }
+type InitializedPayload = { payload: Payload; serverURL: string }
 
 export async function initPayloadE2E(__dirname: string): Promise<InitializedPayload> {
   const webpackCachePath = path.resolve(__dirname, '../../node_modules/.cache/webpack')
diff --git a/test/runE2E.ts b/test/runE2E.ts
index a816896e1..f20f81463 100644
--- a/test/runE2E.ts
+++ b/test/runE2E.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies, no-console */
 import glob from 'glob'
 import path from 'path'
 import shelljs from 'shelljs'