chore: begins fixing esm bin script

2024-03-07 20:21:35 -05:00
parent 95acf71dbf
commit 6b28e72686
9 changed files with 206 additions and 165 deletions
--- a/packages/payload/.swc/plugins/v7_macos_aarch64_0.106.4/f0c7355adbfff9123c3843ebfe75ee37cca77eed7410468c63b40b61d3cedb1a
+++ b/packages/payload/.swc/plugins/v7_macos_aarch64_0.106.4/f0c7355adbfff9123c3843ebfe75ee37cca77eed7410468c63b40b61d3cedb1a
--- a/packages/payload/bin.cjs
+++ b/packages/payload/bin.cjs
@@ -1,15 +1,20 @@
 #!/usr/bin/env node
+/* eslint-disable @typescript-eslint/no-var-requires */

-const { getTsconfig } = require('get-tsconfig')
-const path = require('path')
-const swcRegister = require('@swc/register')
+import swcRegister from '@swc/register'
+import { getTsconfig } from 'get-tsconfig'
+import path from 'path'
+
+import bin from './dist/bin/index.js'
+import { loadEnv } from './dist/bin/loadEnv.js'
+import findConfig from './dist/config/find.js'

 const tsConfig = getTsconfig()

 const swcOptions = {
  ignore: [/.*[\\/]node_modules[\\/].*/],
  jsc: {
-    baseUrl: path.resolve(),
+    baseUrl: path.resolve('../../'),
    parser: {
      syntax: 'typescript',
      tsx: true,
@@ -21,6 +26,7 @@ const swcOptions = {
  },
  sourceMaps: 'inline',
 }
+
 if (tsConfig?.config?.compilerOptions?.paths) {
  swcOptions.jsc.paths = tsConfig.config.compilerOptions.paths
  if (tsConfig?.config?.compilerOptions?.baseUrl) {
@@ -34,8 +40,15 @@ if (process.env.DISABLE_SWC !== 'true') {
  swcRegister(swcOptions)
 }

-const bin = async () => {
-  await import('./dist/bin/index.js')
+loadEnv()
+const configPath = findConfig()
+
+const start = async () => {
+  const sanitized = configPath.replace('.ts', '.js')
+  const configPromise = await import(sanitized)
+  const config = await configPromise
+
+  bin(config)
 }

-bin()
+start()
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -7,7 +7,7 @@
  "types": "./src/index.ts",
  "type": "module",
  "bin": {
-    "payload": "bin.cjs"
+    "payload": "bin.js"
  },
  "exports": {
    ".": {
@@ -39,7 +39,8 @@
    "release:major": "release-it major",
    "release:minor": "release-it minor",
    "release:patch": "release-it patch",
-    "translateNewKeys": "ts-node -T ./scripts/translateNewKeys.ts"
+    "translateNewKeys": "ts-node -T ./scripts/translateNewKeys.ts",
+    "generate:types": "PAYLOAD_CONFIG_PATH=../../test/_community/config.ts node ./bin.js"
  },
  "dependencies": {
    "@payloadcms/translations": "workspace:*",
@@ -48,6 +49,7 @@
    "console-table-printer": "2.11.2",
    "dataloader": "2.2.2",
    "deepmerge": "4.3.1",
+    "dotenv": "8.6.0",
    "file-type": "16.5.4",
    "find-up": "4.1.0",
    "get-tsconfig": "^4.7.2",
--- a/packages/payload/src/bin/generateTypes.ts
+++ b/packages/payload/src/bin/generateTypes.ts
@@ -4,7 +4,6 @@ import { compile } from 'json-schema-to-typescript'

 import type { SanitizedConfig } from '../config/types.js'

-import loadConfig from '../config/load.js'
 import { configToJSONSchema } from '../utilities/configToJSONSchema.js'
 import Logger from '../utilities/logger.js'

@@ -36,13 +35,3 @@ export function generateTypes(config: SanitizedConfig): void {
    logger.info(`Types written to ${outputFile}`)
  })
 }
-
-// when generateTypes.js is launched directly
-if (module.id === require.main.id) {
-  const loadConfigAndGenerateTypes = async () => {
-    const config = await loadConfig()
-    generateTypes(config)
-  }
-
-  loadConfigAndGenerateTypes()
-}
--- a/packages/payload/src/bin/index.ts
+++ b/packages/payload/src/bin/index.ts
@@ -1,24 +1,21 @@
+/* eslint-disable no-console */
 import minimist from 'minimist'

-import type { BinScript } from '../config/types.js'
+import type { BinScript, SanitizedConfig } from '../config/types.js'

-import loadConfig from '../config/load.js'
 import { generateTypes } from './generateTypes.js'
-import { loadEnv } from './loadEnv.js'
 import { migrate } from './migrate.js'

-loadEnv()
-
-const executeBin = async () => {
+// eslint-disable-next-line no-restricted-exports
+export default async (config: SanitizedConfig) => {
  const args = minimist(process.argv.slice(2))
  const scriptIndex = args._.findIndex((x) => x === 'build')
  const script = scriptIndex === -1 ? args._[0] : args._[scriptIndex]
-  const config = await loadConfig()
  const userBinScript = config.bin.find(({ key }) => key === script)

  if (userBinScript) {
    try {
-      const script: BinScript = require(userBinScript.scriptPath)
+      const script: BinScript = await import(userBinScript.scriptPath)
      await script(config)
    } catch (err) {
      console.log(`Could not find associated bin script for the ${userBinScript.key} command`)
@@ -29,7 +26,7 @@ const executeBin = async () => {
  }

  if (script.startsWith('migrate')) {
-    migrate(args).then(() => process.exit(0))
+    void migrate({ config, parsedArgs: args }).then(() => process.exit(0))
  } else {
    switch (script.toLowerCase()) {
      case 'generate:types': {
@@ -43,5 +40,3 @@ const executeBin = async () => {
    }
  }
 }
-
-executeBin()
--- a/packages/payload/src/bin/migrate.ts
+++ b/packages/payload/src/bin/migrate.ts
@@ -1,8 +1,7 @@
 import type { ParsedArgs } from 'minimist'

-import minimist from 'minimist'
+import type { SanitizedConfig } from '../exports/types.js'

-import loadConfig from '../config/load.js'
 import payload from '../index.js'
 import { prettySyncLoggerDestination } from '../utilities/logger.js'

@@ -27,7 +26,12 @@ const availableCommands = [

 const availableCommandsMsg = `Available commands: ${availableCommands.join(', ')}`

-export const migrate = async (parsedArgs: ParsedArgs): Promise<void> => {
+type Args = {
+  config: SanitizedConfig
+  parsedArgs: ParsedArgs
+}
+
+export const migrate = async ({ config, parsedArgs }: Args): Promise<void> => {
  const { _: args, file, forceAcceptWarning, help } = parsedArgs
  if (help) {
    // eslint-disable-next-line no-console
@@ -39,7 +43,7 @@ export const migrate = async (parsedArgs: ParsedArgs): Promise<void> => {

  // Barebones instance to access database adapter
  await payload.init({
-    config: loadConfig(),
+    config,
    disableOnInit: true,
    ...prettySyncLogger,
  })
@@ -98,12 +102,3 @@ export const migrate = async (parsedArgs: ParsedArgs): Promise<void> => {

  payload.logger.info('Done.')
 }
-
-// When launched directly call migrate
-if (module.id === require.main.id) {
-  const args = minimist(process.argv.slice(2))
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  migrate(args).then(() => {
-    process.exit(0)
-  })
-}
--- a/packages/payload/src/config/load.ts
+++ b/packages/payload/src/config/load.ts
@@ -1,26 +0,0 @@
-/* eslint-disable import/no-dynamic-require */
-/* eslint-disable global-require */
-
-import type { SanitizedConfig } from './types.js'
-
-import { clientFiles } from './clientFiles.js'
-import findConfig from './find.js'
-
-const loadConfig = async (): Promise<SanitizedConfig> => {
-  const configPath = findConfig()
-
-  clientFiles.forEach((ext) => {
-    require.extensions[ext] = () => null
-  })
-
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const configPromise = require(configPath)
-
-  let config = await configPromise
-
-  if (config.default) config = await config.default
-
-  return config
-}
-
-export default loadConfig
--- a/packages/ui/src/exports/forms.ts
+++ b/packages/ui/src/exports/forms.ts
@@ -1,7 +1,6 @@
 export { default as Error } from '../forms/Error/index.js'
 export { default as FieldDescription } from '../forms/FieldDescription/index.js'
-export { useFieldPath, FieldPathProvider } from '../forms/FieldPathProvider/index.js'
-export { default as Form } from '../forms/Form/index.js'
+export { FieldPathProvider, useFieldPath } from '../forms/FieldPathProvider/index.js'
 export {
  useAllFormFields,
  useForm,
@@ -11,16 +10,16 @@ export {
 } from '../forms/Form/context.js'
 export { useFormModified } from '../forms/Form/context.js'
 export { createNestedFieldPath } from '../forms/Form/createNestedFieldPath.js'
+export { default as Form } from '../forms/Form/index.js'
 export { default as reduceFieldsToValues } from '../forms/Form/reduceFieldsToValues.js'
 export type { Props as FormProps } from '../forms/Form/types.js'
 export { default as Label } from '../forms/Label/index.js'
 export { default as RenderFields } from '../forms/RenderFields/index.js'
 export { default as FormSubmit } from '../forms/Submit/index.js'
 export { default as Submit } from '../forms/Submit/index.js'
-export { fieldTypes } from '../forms/fields/index.js'
 export { default as SectionTitle } from '../forms/fields/Blocks/SectionTitle/index.js'
-export { default as Checkbox } from '../forms/fields/Checkbox/index.js'
 export { CheckboxInput } from '../forms/fields/Checkbox/Input.js'
+export { default as Checkbox } from '../forms/fields/Checkbox/index.js'
 export { default as ConfirmPassword } from '../forms/fields/ConfirmPassword/index.js'
 export { default as Email } from '../forms/fields/Email/index.js'
 export { default as HiddenInput } from '../forms/fields/HiddenInput/index.js'
@@ -30,14 +29,15 @@ export { default as RadioGroupInput } from '../forms/fields/RadioGroup/index.js'
 export type { OnChange } from '../forms/fields/RadioGroup/types.js'
 export { default as Select } from '../forms/fields/Select/index.js'
 export { default as SelectInput } from '../forms/fields/Select/index.js'
-export { default as Text } from '../forms/fields/Text/index.js'
 export { TextInput, type TextInputProps } from '../forms/fields/Text/Input.js'
+export { default as Text } from '../forms/fields/Text/index.js'
 export type { Props as TextFieldProps } from '../forms/fields/Text/types.js'
-export { default as Textarea } from '../forms/fields/Textarea/index.js'
 export { type TextAreaInputProps, TextareaInput } from '../forms/fields/Textarea/Input.js'
+export { default as Textarea } from '../forms/fields/Textarea/index.js'
+export { UploadInput, type UploadInputProps } from '../forms/fields/Upload/Input.js'
 export { default as UploadField } from '../forms/fields/Upload/index.js'

-export { UploadInput, type UploadInputProps } from '../forms/fields/Upload/Input.js'
+export { fieldTypes } from '../forms/fields/index.js'

 export { fieldBaseClass } from '../forms/fields/shared.js'
 export { default as useField } from '../forms/useField/index.js'
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -559,8 +559,8 @@ importers:
        specifier: 1.6.2
        version: 1.6.2
      next:
-        specifier: 14.1.1-canary.26
-        version: 14.1.1-canary.26(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)
+        specifier: 14.2.0-canary.7
+        version: 14.2.0-canary.7(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)
      path-to-regexp:
        specifier: ^6.2.1
        version: 6.2.1
@@ -619,6 +619,9 @@ importers:
      deepmerge:
        specifier: 4.3.1
        version: 4.3.1
+      dotenv:
+        specifier: 8.6.0
+        version: 8.6.0
      file-type:
        specifier: 16.5.4
        version: 16.5.4
@@ -1280,8 +1283,8 @@ importers:
        specifier: 2.3.0
        version: 2.3.0
      next:
-        specifier: 14.1.1-canary.26
-        version: 14.1.1-canary.26(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)
+        specifier: 14.2.0-canary.7
+        version: 14.2.0-canary.7(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)
      object-to-formdata:
        specifier: 4.5.1
        version: 4.5.1
@@ -4326,29 +4329,20 @@ packages:
      - utf-8-validate
    dev: true

-  /@next/env@14.1.1-canary.26:
-    resolution: {integrity: sha512-NpwQaDqrJSREns70aTeh6vC44GPr2qHgoZdk2SPEJmuq1rD+n21FJVn5LtueUbHSZ0RcyPfATYfvdLGnsnZybw==}
-    dev: false
-
  /@next/env@14.1.2:
    resolution: {integrity: sha512-U0iEG+JF86j6qyu330sfPgsMmDVH8vWVmzZadl+an5EU3o5HqdNytOpM+HsFpl58PmhGBTKx3UmM9c+eoLK0mA==}
    dev: true

+  /@next/env@14.2.0-canary.7:
+    resolution: {integrity: sha512-QcPbQ50DobQKvI4/Gkc1+sFkmqf+Y8LWUrExk5EsILJ2fH0GSKefmTdiGIqU/YztBWFIMbSOZaJNJuJpwd9MjA==}
+    dev: false
+
  /@next/eslint-plugin-next@14.1.0:
    resolution: {integrity: sha512-x4FavbNEeXx/baD/zC/SdrvkjSby8nBn8KcCREqk6UuwvwoAPZmaV8TFCAuo/cpovBRTIY67mHhe86MQQm/68Q==}
    dependencies:
      glob: 10.3.10
    dev: true

-  /@next/swc-darwin-arm64@14.1.1-canary.26:
-    resolution: {integrity: sha512-me7bG+MrBI1awUn6bqFaKYWSp3Kw1A0mSLvMKwpFdjJYut4Alw5edUZF9pzDDoYAPYunvKqn55RuSMcIwEhqgw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
  /@next/swc-darwin-arm64@14.1.2:
    resolution: {integrity: sha512-E4/clgk0ZrYMo9eMRwP/4IO/cvXF1yEYSnGcdGfH+NYTR8bNFy76TSlc1Vb2rK3oaQY4BVHRpx8f/sMN/D5gNw==}
    engines: {node: '>= 10'}
@@ -4358,10 +4352,10 @@ packages:
    dev: true
    optional: true

-  /@next/swc-darwin-x64@14.1.1-canary.26:
-    resolution: {integrity: sha512-ObPe53eJNan5TOIRWZmTpr3Dt9fvb9fph8VncwLnL1joNfgsfFCNq/UYZEE0eWjF1HsL/sfKP7ke8hn8qke+iA==}
+  /@next/swc-darwin-arm64@14.2.0-canary.7:
+    resolution: {integrity: sha512-SvQcda3Lf594XlpGQs/j+MB9yMn4mos0xwb3/VDU3zCuaqTa5U3eHvvOwdz+S1z+GfmSa8zAP5bHDBUBH9N61w==}
    engines: {node: '>= 10'}
-    cpu: [x64]
+    cpu: [arm64]
    os: [darwin]
    requiresBuild: true
    dev: false
@@ -4376,11 +4370,11 @@ packages:
    dev: true
    optional: true

-  /@next/swc-linux-arm64-gnu@14.1.1-canary.26:
-    resolution: {integrity: sha512-cXgFZZXYXbXeWmZaxv47LcOEFScqSauYOh5QFhdCn5oqhxqrmlO2TwKDvFY+zGRRUMAAmGSjlYugI74gsZZlrg==}
+  /@next/swc-darwin-x64@14.2.0-canary.7:
+    resolution: {integrity: sha512-ri14yaZ3z2nQSPgDS5pCdrTFtWBWLJOGKZ/isMuimyYmB7BJXUsgatSBp5gMBHKayByNLeD7s3LFOsKI3aWabw==}
    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
+    cpu: [x64]
+    os: [darwin]
    requiresBuild: true
    dev: false
    optional: true
@@ -4394,8 +4388,8 @@ packages:
    dev: true
    optional: true

-  /@next/swc-linux-arm64-musl@14.1.1-canary.26:
-    resolution: {integrity: sha512-+GVq76ysbkifRfBP2APheQv4aI7O39QKUApjTKhcRJQD1ZMBTifAYxxWpRqjFH7fvHwNMXHJ39kQ9VeRHzeOhg==}
+  /@next/swc-linux-arm64-gnu@14.2.0-canary.7:
+    resolution: {integrity: sha512-YgS41AfC/iFg9Uefqftkofh44fwR3ZEhWQz4CJvgeJkiVEHg/OtWMcAnAPtjlUQ+q0T/ZeQOPsYHoJvCPFixWQ==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]
@@ -4412,10 +4406,10 @@ packages:
    dev: true
    optional: true

-  /@next/swc-linux-x64-gnu@14.1.1-canary.26:
-    resolution: {integrity: sha512-3j57txb3IUeVBmYK7Tcr5NFmz/kt41D91YE20oD0rcB1sOf5fyKdCY82NbfE01QqIMV9gZMFbhlgMfIxUfUSUA==}
+  /@next/swc-linux-arm64-musl@14.2.0-canary.7:
+    resolution: {integrity: sha512-b0sRhvxiUo+GSom24tdL1s/ff7nvLa4gmVz3o4hWsNeVaZNJKKQDoZKKctFpCo1RaKqLWrSVaS/Mo8OVqfayEQ==}
    engines: {node: '>= 10'}
-    cpu: [x64]
+    cpu: [arm64]
    os: [linux]
    requiresBuild: true
    dev: false
@@ -4430,8 +4424,8 @@ packages:
    dev: true
    optional: true

-  /@next/swc-linux-x64-musl@14.1.1-canary.26:
-    resolution: {integrity: sha512-BxBTBhgtyZoJONo10wrfXXZsrkgH+Q44E3C4yBxpJE8NPObV2IUkLKD++dvkLPHDhWwf6pEroLq/KKmTDSNEOw==}
+  /@next/swc-linux-x64-gnu@14.2.0-canary.7:
+    resolution: {integrity: sha512-EnGP9/jXb/Vr7YdApb8FIS4V4Uj47axfRL/V01R10wB9YeFzXH4Yxr9GlSphx2zPmPWnDVuvgsN8+IhBRBySDQ==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]
@@ -4448,11 +4442,11 @@ packages:
    dev: true
    optional: true

-  /@next/swc-win32-arm64-msvc@14.1.1-canary.26:
-    resolution: {integrity: sha512-eHarkYpJYruf6y0kpGhw4HMeQ+RI/sh06VgGavCG6kH3kZHhQ58ofAbA/U6uomMcpb3NuzjqnCvjYAa7vXpaFw==}
+  /@next/swc-linux-x64-musl@14.2.0-canary.7:
+    resolution: {integrity: sha512-7FpnVZqZ5D5ERopsecF9K8ifQ6HBshhJOq1RavA72WGN/LWu1PGeU+QqgHnLyNHU6zUxwC25Ol9mXG3E6jWxlg==}
    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
+    cpu: [x64]
+    os: [linux]
    requiresBuild: true
    dev: false
    optional: true
@@ -4466,10 +4460,10 @@ packages:
    dev: true
    optional: true

-  /@next/swc-win32-ia32-msvc@14.1.1-canary.26:
-    resolution: {integrity: sha512-Dl9Cvfen0mPOC9wjfMYfme6ewv6pfMkOgLlnWCj7+MIX2Mwbyqxa4WFCvvNtX9bF+D7IZojHWtJByo31eVqq0Q==}
+  /@next/swc-win32-arm64-msvc@14.2.0-canary.7:
+    resolution: {integrity: sha512-EQJ88Idk7gy/8BMmMjgO5My3huNrEsKBMEWSpzmYSVUWpp0e1CnwEk1Vk3RO8tidYbrje73ENw+95mnPG4lD0g==}
    engines: {node: '>= 10'}
-    cpu: [ia32]
+    cpu: [arm64]
    os: [win32]
    requiresBuild: true
    dev: false
@@ -4484,10 +4478,10 @@ packages:
    dev: true
    optional: true

-  /@next/swc-win32-x64-msvc@14.1.1-canary.26:
-    resolution: {integrity: sha512-Tgs1SJNYHP5xcRLkZa81Pn2mT9IgfSxPAaYjrWEQjcOgFOJ5/gN+Mwr93z40L3o6G/vjo31IfRNVwXpqg+Jq1A==}
+  /@next/swc-win32-ia32-msvc@14.2.0-canary.7:
+    resolution: {integrity: sha512-9HodSqkaMWBRDEAeXlyLYrUFa7lHvkhzL6GUHP3NQXobGfi41tAeTr7VqBgdrqwh+voo9RvC/3p4KHfSghXdAA==}
    engines: {node: '>= 10'}
-    cpu: [x64]
+    cpu: [ia32]
    os: [win32]
    requiresBuild: true
    dev: false
@@ -4502,6 +4496,15 @@ packages:
    dev: true
    optional: true

+  /@next/swc-win32-x64-msvc@14.2.0-canary.7:
+    resolution: {integrity: sha512-V93BHB+gIHLT/ibH+v2sjkXmXBtAEKktqDXN+LyY5ggjcLpAn3Y37RuJK7CFC82yLafOaK/rzF9lzOQaOPxAag==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
  /@nodelib/fs.scandir@2.1.5:
    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
    engines: {node: '>= 8'}
@@ -5440,12 +5443,19 @@ packages:

  /@swc/counter@0.1.3:
    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
-    dev: true

  /@swc/helpers@0.5.2:
    resolution: {integrity: sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==}
    dependencies:
      tslib: 2.6.2
+    dev: true
+
+  /@swc/helpers@0.5.5:
+    resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
+    dependencies:
+      '@swc/counter': 0.1.3
+      tslib: 2.6.2
+    dev: false

  /@swc/jest@0.2.36(@swc/core@1.4.2):
    resolution: {integrity: sha512-8X80dp81ugxs4a11z1ka43FPhP+/e+mJNXJSxiNYk8gIX/jPBtY4gQTrKu/KIoco8bzKuPI5lUxjfLiGsfvnlw==}
@@ -5731,7 +5741,7 @@ packages:
    resolution: {integrity: sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==}
    dependencies:
      '@types/estree': 1.0.5
-      '@types/json-schema': 7.0.15
+      '@types/json-schema': 7.0.12

  /@types/estree@1.0.5:
    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
@@ -5880,7 +5890,6 @@ packages:

  /@types/json-schema@7.0.12:
    resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
-    dev: true

  /@types/json-schema@7.0.15:
    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
@@ -8430,7 +8439,6 @@ packages:
  /dotenv@8.6.0:
    resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
    engines: {node: '>=10'}
-    dev: true

  /dreamopt@0.8.0:
    resolution: {integrity: sha512-vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg==}
@@ -9578,7 +9586,7 @@ packages:
    dependencies:
      loader-utils: 2.0.4
      schema-utils: 3.3.0
-      webpack: 5.90.3(@swc/core@1.4.2)
+      webpack: 5.90.3
    dev: true

  /file-type@16.5.4:
@@ -11659,7 +11667,7 @@ packages:
    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
    engines: {node: '>= 10.13.0'}
    dependencies:
-      '@types/node': 16.18.85
+      '@types/node': 20.11.22
      merge-stream: 2.0.0
      supports-color: 8.1.1
    dev: true
@@ -12454,7 +12462,7 @@ packages:
    dependencies:
      loader-utils: 2.0.4
      schema-utils: 3.3.0
-      webpack: 5.90.3(@swc/core@1.4.2)
+      webpack: 5.90.3
      webpack-sources: 1.4.3
    dev: true

@@ -12708,46 +12716,6 @@ packages:
    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
    dev: false

-  /next@14.1.1-canary.26(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1):
-    resolution: {integrity: sha512-vHj7hCL9qn8AhRXNEC1ujTO55w3IjckEE1tkmxwyqA3ypTH9PtxSnU6eFfC9C67Xf/Q2C5Btug7Yqvw7pxGkhg==}
-    engines: {node: '>=18.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      react: ^18.2.0
-      react-dom: ^18.2.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      sass:
-        optional: true
-    dependencies:
-      '@next/env': 14.1.1-canary.26
-      '@swc/helpers': 0.5.2
-      busboy: 1.6.0
-      caniuse-lite: 1.0.30001591
-      graceful-fs: 4.2.11
-      postcss: 8.4.31
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      sass: 1.71.1
-      styled-jsx: 5.1.1(@babel/core@7.24.0)(react@18.2.0)
-    optionalDependencies:
-      '@next/swc-darwin-arm64': 14.1.1-canary.26
-      '@next/swc-darwin-x64': 14.1.1-canary.26
-      '@next/swc-linux-arm64-gnu': 14.1.1-canary.26
-      '@next/swc-linux-arm64-musl': 14.1.1-canary.26
-      '@next/swc-linux-x64-gnu': 14.1.1-canary.26
-      '@next/swc-linux-x64-musl': 14.1.1-canary.26
-      '@next/swc-win32-arm64-msvc': 14.1.1-canary.26
-      '@next/swc-win32-ia32-msvc': 14.1.1-canary.26
-      '@next/swc-win32-x64-msvc': 14.1.1-canary.26
-    transitivePeerDependencies:
-      - '@babel/core'
-      - babel-plugin-macros
-    dev: false
-
  /next@14.1.2(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0):
    resolution: {integrity: sha512-p4RfNmopqkzRP1uUyBJnHii+qMg71f2udWhTTZopBB8b3T5QXNzn7yO+LCYHPWZG2kAvEn4l4neyJHqkXvo2wg==}
    engines: {node: '>=18.17.0'}
@@ -12787,6 +12755,46 @@ packages:
      - babel-plugin-macros
    dev: true

+  /next@14.2.0-canary.7(@babel/core@7.24.0)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1):
+    resolution: {integrity: sha512-X9wrHOzj25uzuECqpaO7SJ34gxZziaJZXdfRQJmEJC5tQ1FmxUm0eZ/SXIw3fPkjX2/04JmavkLJPtD3BA6UyA==}
+    engines: {node: '>=18.17.0'}
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      react: ^18.2.0
+      react-dom: ^18.2.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      sass:
+        optional: true
+    dependencies:
+      '@next/env': 14.2.0-canary.7
+      '@swc/helpers': 0.5.5
+      busboy: 1.6.0
+      caniuse-lite: 1.0.30001591
+      graceful-fs: 4.2.11
+      postcss: 8.4.31
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      sass: 1.71.1
+      styled-jsx: 5.1.1(@babel/core@7.24.0)(react@18.2.0)
+    optionalDependencies:
+      '@next/swc-darwin-arm64': 14.2.0-canary.7
+      '@next/swc-darwin-x64': 14.2.0-canary.7
+      '@next/swc-linux-arm64-gnu': 14.2.0-canary.7
+      '@next/swc-linux-arm64-musl': 14.2.0-canary.7
+      '@next/swc-linux-x64-gnu': 14.2.0-canary.7
+      '@next/swc-linux-x64-musl': 14.2.0-canary.7
+      '@next/swc-win32-arm64-msvc': 14.2.0-canary.7
+      '@next/swc-win32-ia32-msvc': 14.2.0-canary.7
+      '@next/swc-win32-x64-msvc': 14.2.0-canary.7
+    transitivePeerDependencies:
+      - '@babel/core'
+      - babel-plugin-macros
+    dev: false
+
  /node-abi@3.56.0:
    resolution: {integrity: sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==}
    engines: {node: '>=10'}
@@ -13804,6 +13812,7 @@ packages:

  /queue-tick@1.0.1:
    resolution: {integrity: sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==}
+    requiresBuild: true
    dev: true

  /queue@6.0.2:
@@ -15302,6 +15311,30 @@ packages:
      webpack: 5.90.3(@swc/core@1.4.2)
    dev: true

+  /terser-webpack-plugin@5.3.10(webpack@5.90.3):
+    resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.23
+      jest-worker: 27.5.1
+      schema-utils: 3.3.0
+      serialize-javascript: 6.0.2
+      terser: 5.28.1
+      webpack: 5.90.3
+    dev: true
+
  /terser@5.28.1:
    resolution: {integrity: sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==}
    engines: {node: '>=10'}
@@ -16060,6 +16093,46 @@ packages:
    engines: {node: '>=10.13.0'}
    dev: true

+  /webpack@5.90.3:
+    resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
+    dependencies:
+      '@types/eslint-scope': 3.7.7
+      '@types/estree': 1.0.5
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/wasm-edit': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
+      acorn: 8.11.3
+      acorn-import-assertions: 1.9.0(acorn@8.11.3)
+      browserslist: 4.23.0
+      chrome-trace-event: 1.0.3
+      enhanced-resolve: 5.15.1
+      es-module-lexer: 1.4.1
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.11
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
+      neo-async: 2.6.2
+      schema-utils: 3.3.0
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.10(webpack@5.90.3)
+      watchpack: 2.4.0
+      webpack-sources: 3.2.3
+    transitivePeerDependencies:
+      - '@swc/core'
+      - esbuild
+      - uglify-js
+    dev: true
+
  /webpack@5.90.3(@swc/core@1.4.2):
    resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
    engines: {node: '>=10.13.0'}