chore: fixes e2e tests

2023-09-18 10:42:30 -04:00
parent 6abe7f2569
commit 128fe0119e
6 changed files with 90 additions and 72 deletions
--- a/package.json
+++ b/package.json
@@ -59,18 +59,18 @@
    "node-fetch": "2.6.12",
    "prettier": "^3.0.3",
    "qs": "6.11.2",
-    "react": "18.2.0",
-    "react-i18next": "11.18.6",
-    "react-router-dom": "5.3.4",
    "rimraf": "3.0.2",
-    "react-i18next": "11.18.6",
-    "react-router-dom": "5.3.4",
    "shelljs": "0.8.5",
    "ts-node": "10.9.1",
    "turbo": "^1.10.13",
    "typescript": "5.2.2",
    "uuid": "^9.0.0"
  },
+  "peerDependencies": {
+    "react": "18.2.0",
+    "react-i18next": "11.18.6",
+    "react-router-dom": "5.3.4"
+  },
  "engines": {
    "node": ">=14",
    "pnpm": ">=8"
--- a/packages/bundler-webpack/package.json
+++ b/packages/bundler-webpack/package.json
@@ -19,6 +19,7 @@
  "dependencies": {
    "compression": "1.7.4",
    "connect-history-api-fallback": "1.6.0",
+    "css-loader": "5.2.7",
    "css-minimizer-webpack-plugin": "^5.0.0",
    "file-loader": "6.2.0",
    "html-webpack-plugin": "^5.5.0",
@@ -28,6 +29,8 @@
    "postcss": "8.4.27",
    "postcss-loader": "6.2.1",
    "postcss-preset-env": "9.0.0",
+    "process": "0.11.10",
+    "sass-loader": "12.6.0",
    "style-loader": "^2.0.0",
    "swc-loader": "^0.2.3",
    "swc-minify-webpack-plugin": "^2.1.0",
--- a/packages/bundler-webpack/src/configs/base.ts
+++ b/packages/bundler-webpack/src/configs/base.ts
@@ -14,9 +14,6 @@ export const getBaseConfig = (payloadConfig: SanitizedConfig): Configuration =>
  entry: {
    main: [adminFolderPath],
  },
-  resolveLoader: {
-    modules: ['node_modules', nodeModulesPath],
-  },
  module: {
    rules: [
      {
@@ -52,7 +49,7 @@ export const getBaseConfig = (payloadConfig: SanitizedConfig): Configuration =>
      https: false,
      http: false,
    },
-    modules: ['node_modules', path.resolve(__dirname, nodeModulesPath)],
+    modules: ['node_modules', nodeModulesPath],
    alias: {
      path: require.resolve('path-browserify'),
      'payload-config': payloadConfig.paths.rawConfig,
--- a/packages/payload/src/admin/Root.tsx
+++ b/packages/payload/src/admin/Root.tsx
@@ -23,46 +23,48 @@ import { ThemeProvider } from './components/utilities/Theme'
 import { Routes } from './components/views/Routes'
 import './scss/app.scss'

-const Root = () => (
-  <React.Fragment>
-    <ConfigProvider config={config}>
-      <I18n />
-      <WindowInfoProvider
-        breakpoints={{
-          l: '(max-width: 1440px)',
-          m: '(max-width: 1024px)',
-          s: '(max-width: 768px)',
-          xs: '(max-width: 400px)',
-        }}
-      >
-        <ScrollInfoProvider>
-          <Router>
-            <ModalProvider classPrefix="payload" transTime={0} zIndex="var(--z-modal)">
-              <AuthProvider>
-                <PreferencesProvider>
-                  <ThemeProvider>
-                    <SearchParamsProvider>
-                      <LocaleProvider>
-                        <StepNavProvider>
-                          <LoadingOverlayProvider>
-                            <CustomProvider>
-                              <Routes />
-                            </CustomProvider>
-                          </LoadingOverlayProvider>
-                        </StepNavProvider>
-                      </LocaleProvider>
-                    </SearchParamsProvider>
-                  </ThemeProvider>
-                  <ModalContainer />
-                </PreferencesProvider>
-              </AuthProvider>
-            </ModalProvider>
-          </Router>
-        </ScrollInfoProvider>
-      </WindowInfoProvider>
-    </ConfigProvider>
-    <ToastContainer icon={false} position="bottom-center" transition={Slide} />
-  </React.Fragment>
-)
+const Root = () => {
+  return (
+    <React.Fragment>
+      <ConfigProvider config={config}>
+        <I18n />
+        <WindowInfoProvider
+          breakpoints={{
+            l: '(max-width: 1440px)',
+            m: '(max-width: 1024px)',
+            s: '(max-width: 768px)',
+            xs: '(max-width: 400px)',
+          }}
+        >
+          <ScrollInfoProvider>
+            <Router>
+              <ModalProvider classPrefix="payload" transTime={0} zIndex="var(--z-modal)">
+                <AuthProvider>
+                  <PreferencesProvider>
+                    <ThemeProvider>
+                      <SearchParamsProvider>
+                        <LocaleProvider>
+                          <StepNavProvider>
+                            <LoadingOverlayProvider>
+                              <CustomProvider>
+                                <Routes />
+                              </CustomProvider>
+                            </LoadingOverlayProvider>
+                          </StepNavProvider>
+                        </LocaleProvider>
+                      </SearchParamsProvider>
+                    </ThemeProvider>
+                    <ModalContainer />
+                  </PreferencesProvider>
+                </AuthProvider>
+              </ModalProvider>
+            </Router>
+          </ScrollInfoProvider>
+        </WindowInfoProvider>
+      </ConfigProvider>
+      <ToastContainer icon={false} position="bottom-center" transition={Slide} />
+    </React.Fragment>
+  )
+}

 export default Root
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,6 +7,16 @@ settings:
 importers:

  .:
+    dependencies:
+      react:
+        specifier: 18.2.0
+        version: 18.2.0
+      react-i18next:
+        specifier: 11.18.6
+        version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0)
+      react-router-dom:
+        specifier: 5.3.4
+        version: 5.3.4(react@18.2.0)
    devDependencies:
      '@payloadcms/eslint-config':
        specifier: workspace:*
@@ -83,15 +93,6 @@ importers:
      qs:
        specifier: 6.11.2
        version: 6.11.2
-      react:
-        specifier: 18.2.0
-        version: 18.2.0
-      react-i18next:
-        specifier: 11.18.6
-        version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0)
-      react-router-dom:
-        specifier: 5.3.4
-        version: 5.3.4(react@18.2.0)
      rimraf:
        specifier: 3.0.2
        version: 3.0.2
@@ -162,6 +163,9 @@ importers:
      connect-history-api-fallback:
        specifier: 1.6.0
        version: 1.6.0
+      css-loader:
+        specifier: 5.2.7
+        version: 5.2.7(webpack@5.88.2)
      css-minimizer-webpack-plugin:
        specifier: ^5.0.0
        version: 5.0.1(webpack@5.88.2)
@@ -189,6 +193,12 @@ importers:
      postcss-preset-env:
        specifier: 9.0.0
        version: 9.0.0(postcss@8.4.27)
+      process:
+        specifier: 0.11.10
+        version: 0.11.10
+      sass-loader:
+        specifier: 12.6.0
+        version: 12.6.0(sass@1.64.0)(webpack@5.88.2)
      style-loader:
        specifier: ^2.0.0
        version: 2.0.0(webpack@5.88.2)
@@ -6294,7 +6304,6 @@ packages:
      schema-utils: 3.3.0
      semver: 7.5.4
      webpack: 5.88.2(@swc/core@1.3.76)(webpack-cli@4.10.0)
-    dev: true

  /css-minimizer-webpack-plugin@5.0.1(webpack@5.88.2):
    resolution: {integrity: sha512-3caImjKFQkS+ws1TGcFn0V1HyDJFq1Euy589JlD6/3rV2kj+w7r5G9WDMgSHvpvXHNZ2calVypZWuEDQd9wfLg==}
@@ -8615,11 +8624,13 @@ packages:
      tiny-invariant: 1.3.1
      tiny-warning: 1.0.3
      value-equal: 1.0.1
+    dev: false

  /hoist-non-react-statics@3.3.2:
    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
    dependencies:
      react-is: 16.13.1
+    dev: false

  /hosted-git-info@2.8.9:
    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
@@ -8664,6 +8675,7 @@ packages:
    resolution: {integrity: sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==}
    dependencies:
      void-elements: 3.1.0
+    dev: false

  /html-webpack-plugin@5.5.3(webpack@5.88.2):
    resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==}
@@ -8787,6 +8799,7 @@ packages:
    resolution: {integrity: sha512-8TGPgM3pAD+VRsMtUMNknRz3kzqwp/gPALrWMsDnmC1mKqJwpWyooQRLMcbTwq8z8YwSmuj+ZYvc+xCuEpkssA==}
    dependencies:
      '@babel/runtime': 7.22.11
+    dev: false

  /iconv-lite@0.4.24:
    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
@@ -8808,7 +8821,6 @@ packages:
      postcss: ^8.1.0
    dependencies:
      postcss: 8.4.27
-    dev: true

  /ieee754@1.2.1:
    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
@@ -10858,6 +10870,7 @@ packages:
  /object-assign@4.1.1:
    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
    engines: {node: '>=0.10.0'}
+    dev: false

  /object-inspect@1.12.3:
    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
@@ -11289,6 +11302,7 @@ packages:
    resolution: {integrity: sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==}
    dependencies:
      isarray: 0.0.1
+    dev: false

  /path-type@3.0.0:
    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
@@ -11807,7 +11821,6 @@ packages:
      postcss: ^8.1.0
    dependencies:
      postcss: 8.4.27
-    dev: true

  /postcss-modules-local-by-default@4.0.3(postcss@8.4.27):
    resolution: {integrity: sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==}
@@ -11819,7 +11832,6 @@ packages:
      postcss: 8.4.27
      postcss-selector-parser: 6.0.13
      postcss-value-parser: 4.2.0
-    dev: true

  /postcss-modules-scope@3.0.0(postcss@8.4.27):
    resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
@@ -11829,7 +11841,6 @@ packages:
    dependencies:
      postcss: 8.4.27
      postcss-selector-parser: 6.0.13
-    dev: true

  /postcss-modules-values@4.0.0(postcss@8.4.27):
    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
@@ -11839,7 +11850,6 @@ packages:
    dependencies:
      icss-utils: 5.1.0(postcss@8.4.27)
      postcss: 8.4.27
-    dev: true

  /postcss-nesting@12.0.1(postcss@8.4.27):
    resolution: {integrity: sha512-6LCqCWP9pqwXw/njMvNK0hGY44Fxc4B2EsGbn6xDcxbNRzP8GYoxT7yabVVMLrX3quqOJ9hg2jYMsnkedOf8pA==}
@@ -12270,6 +12280,7 @@ packages:
      loose-envify: 1.4.0
      object-assign: 4.1.1
      react-is: 16.13.1
+    dev: false

  /proto-list@1.2.4:
    resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
@@ -12507,9 +12518,11 @@ packages:
      i18next: 22.5.1
      react: 18.2.0
      react-dom: 18.2.0(react@18.2.0)
+    dev: false

  /react-is@16.13.1:
    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+    dev: false

  /react-is@17.0.2:
    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
@@ -12559,6 +12572,7 @@ packages:
      react-router: 5.3.4(react@18.2.0)
      tiny-invariant: 1.3.1
      tiny-warning: 1.0.3
+    dev: false

  /react-router-navigation-prompt@1.9.6(react-router-dom@5.3.4)(react@18.2.0):
    resolution: {integrity: sha512-l0sAtbroHK8i1/Eyy29XcrMpBEt0R08BaScgMUt8r5vWWbLz7G0ChOikayTCQm7QgDFsHw8gVnxDJb7TBZCAKg==}
@@ -12585,6 +12599,7 @@ packages:
      react-is: 16.13.1
      tiny-invariant: 1.3.1
      tiny-warning: 1.0.3
+    dev: false

  /react-select@5.7.4(@types/react@18.2.15)(react-dom@18.2.0)(react@18.2.0):
    resolution: {integrity: sha512-NhuE56X+p9QDFh4BgeygHFIvJJszO1i1KSkg/JPcIJrbovyRtI+GuOEa4XzFCEpZRAEoEI8u/cAHK+jG/PgUzQ==}
@@ -12906,6 +12921,7 @@ packages:

  /resolve-pathname@3.0.0:
    resolution: {integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==}
+    dev: false

  /resolve-pkg-maps@1.0.0:
    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
@@ -13086,7 +13102,6 @@ packages:
      neo-async: 2.6.2
      sass: 1.64.0
      webpack: 5.88.2(@swc/core@1.3.76)(webpack-cli@4.10.0)
-    dev: true

  /sass@1.64.0:
    resolution: {integrity: sha512-m7YtAGmQta9uANIUJwXesAJMSncqH+3INc8kdVXs6eV6GUC8Qu2IYKQSN8PRLgiQfpca697G94klm2leYMxSHw==}
@@ -13910,9 +13925,11 @@ packages:

  /tiny-invariant@1.3.1:
    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
+    dev: false

  /tiny-warning@1.0.3:
    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+    dev: false

  /titleize@3.0.0:
    resolution: {integrity: sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==}
@@ -14462,6 +14479,7 @@ packages:

  /value-equal@1.0.1:
    resolution: {integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==}
+    dev: false

  /vary@1.1.2:
    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
@@ -14532,6 +14550,7 @@ packages:
  /void-elements@3.1.0:
    resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
    engines: {node: '>=0.10.0'}
+    dev: false

  /w3c-xmlserializer@4.0.0:
    resolution: {integrity: sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==}
--- a/test/buildConfigWithDefaults.ts
+++ b/test/buildConfigWithDefaults.ts
@@ -50,12 +50,8 @@ export function buildConfigWithDefaults(testConfig?: Partial<Config>): Promise<S
          : webpackConfig
      return {
        ...existingConfig,
-        resolveLoader: {
-          ...(existingConfig.resolveLoader || {}),
-          modules: [
-            ...(existingConfig?.resolveLoader?.modules || []),
-            path.resolve(__dirname, '../packages/payload/node_modules'),
-          ],
+        entry: {
+          main: [path.resolve(__dirname, '../packages/payload/src/admin')],
        },
        name,
        cache: process.env.NODE_ENV === 'test' ? { type: 'memory' } : existingConfig.cache,
@@ -73,6 +69,7 @@ export function buildConfigWithDefaults(testConfig?: Partial<Config>): Promise<S
            ),
            '@payloadcms/db-mongodb': path.resolve(__dirname, '../packages/db-mongodb/src/mock'),
            '@payloadcms/db-postgres': path.resolve(__dirname, '../packages/db-postgres/src/mock'),
+            react: path.resolve(__dirname, '../packages/payload/node_modules/react'),
          },
        },
      }