clean up

Synthetixio · Jun 24, 2024 · e191940 · e191940
1 parent 4a7f4e5
commit e191940
Show file tree

Hide file tree

Showing 67 changed files with 86 additions and 278 deletions.
diff --git a/examples/new-dawn/test/playwright/wallet-setup/basic.setup.ts b/examples/new-dawn/test/playwright/wallet-setup/basic.setup.ts
@@ -1,6 +1,6 @@
 import { BrowserContext, Page } from '@playwright/test'
 import { MetaMask } from '@synthetixio/synpress'
-import { defineWalletSetup } from '@synthetixio/synpress-utils'
+import { defineWalletSetup } from '@synthetixio/synpress'
 
 const SEED_PHRASE = 'test test test test test test test test test test test junk'
 const PASSWORD = 'SynpressIsAwesomeNow!!!'

diff --git a/examples/new-dawn/test/playwright/wallet-setup/connected.setup.ts b/examples/new-dawn/test/playwright/wallet-setup/connected.setup.ts
@@ -1,6 +1,6 @@
 import type { BrowserContext, Page } from '@playwright/test'
 import { MetaMask, getExtensionId } from '@synthetixio/synpress'
-import { defineWalletSetup } from '@synthetixio/synpress-utils'
+import { defineWalletSetup } from '@synthetixio/synpress'
 
 const SEED_PHRASE = process.env.SEED_PHRASE
 const PASSWORD = process.env.WALLET_PASSWORD

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -29,7 +29,6 @@
     "types:check": "tsc --noEmit"
   },
   "dependencies": {
-    "@synthetixio/synpress-utils": "workspace:*",
     "axios": "1.6.7",
     "chalk": "5.3.0",
     "commander": "12.0.0",
@@ -44,7 +43,6 @@
   },
   "devDependencies": {
     "@synthetixio/synpress-tsconfig": "0.0.1-alpha.7",
-    "@synthetixio/synpress-utils": "workspace:*",
     "@types/archiver": "6.0.2",
     "@types/fs-extra": "11.0.4",
     "@types/gradient-string": "1.1.5",

diff --git a/packages/cache/src/cli/cliEntrypoint.ts b/packages/cache/src/cli/cliEntrypoint.ts
@@ -1,7 +1,7 @@
 import os from 'node:os'
 import path from 'node:path'
-import { WALLET_SETUP_DIR_NAME } from '@synthetixio/synpress-utils'
-import { prepareExtension } from '@synthetixio/synpress-utils'
+import { WALLET_SETUP_DIR_NAME } from '../constants'
+import { prepareExtension } from '../prepareExtension'
 import chalk from 'chalk'
 import { Command } from 'commander'
 import { rimraf } from 'rimraf'
@@ -44,13 +44,9 @@ export const cliEntrypoint = async () => {
 
   const flags: CliFlags = program.opts()
 
-  if (flags.headless) {
-    process.env.HEADLESS = true
-  }
-
   if (flags.debug) {
     console.log('[DEBUG] Running with the following options:')
-    console.log({ cacheDir: walletSetupDir, ...flags, headless: Boolean(process.env.HEADLESS) ?? false }, '\n')
+    console.log({ cacheDir: walletSetupDir, ...flags, headless: flags.headless ?? false }, '\n')
   }
 
   const extensionsToSetup = () => {

diff --git a/packages/cache/src/cli/compileWalletSetupFunctions.ts b/packages/cache/src/cli/compileWalletSetupFunctions.ts
@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { ensureCacheDirExists } from '@synthetixio/synpress-utils'
+import { ensureCacheDirExists } from '../ensureCacheDirExists'
 import { glob } from 'glob'
 import { build } from 'tsup'
 import { FIXES_BANNER } from './compilationFixes'

diff --git a/packages/utils/src/constants.ts → packages/cache/src/constants.ts b/packages/utils/src/constants.ts → packages/cache/src/constants.ts
diff --git a/packages/cache/src/createCache.ts b/packages/cache/src/createCache.ts
@@ -1,5 +1,5 @@
-import { getUniqueWalletSetupFunctions } from '@synthetixio/synpress-utils'
-import { triggerCacheCreation } from '@synthetixio/synpress-utils'
+import { getUniqueWalletSetupFunctions } from './utils/getUniqueWalletSetupFunctions'
+import { triggerCacheCreation } from './utils/triggerCacheCreation'
 
 //@TODO: Make it so createCache can handle only one wallet setup function
 export async function createCache(walletSetupDirPath: string, downloadExtension: () => Promise<string>, force = false) {

diff --git a/packages/utils/src/defineWalletSetup.ts → packages/cache/src/defineWalletSetup.ts b/packages/utils/src/defineWalletSetup.ts → packages/cache/src/defineWalletSetup.ts
diff --git a/packages/utils/src/downloadFile.ts → packages/cache/src/downloadFile.ts b/packages/utils/src/downloadFile.ts → packages/cache/src/downloadFile.ts
diff --git a/packages/utils/src/ensureCacheDirExists.ts → packages/cache/src/ensureCacheDirExists.ts b/packages/utils/src/ensureCacheDirExists.ts → packages/cache/src/ensureCacheDirExists.ts
@@ -1,6 +1,6 @@
 import path from 'node:path'
 import fs from 'fs-extra'
-import { CACHE_DIR_NAME } from './constants'
+import { CACHE_DIR_NAME } from '../../cache/src/constants'
 
 export function ensureCacheDirExists() {
   const cacheDirPath = path.join(process.cwd(), CACHE_DIR_NAME)

diff --git a/packages/cache/src/index.ts b/packages/cache/src/index.ts
@@ -1,2 +1,20 @@
 export * from './createCache'
 export * from './cli/cliEntrypoint'
+export * from '../../cache/src/constants'
+export * from './downloadFile'
+export * from '../../cache/src/unzipArchive'
+export * from './ensureCacheDirExists'
+export * from './defineWalletSetup'
+export * from '../../cache/src/prepareExtension'
+export * from './prepareExtension'
+export * from './utils/bytesToMegabytes'
+export * from './utils/createCacheForWalletSetupFunction'
+export * from './utils/createTempContextDir'
+export * from './utils/getUniqueWalletSetupFunctions'
+export * from './utils/getWalletSetupFiles'
+export * from './utils/getWalletSetupFuncHash'
+export * from './utils/importWalletSetupFile'
+export * from './utils/isDirEmpty'
+export * from './utils/onDownloadProgress'
+export * from './utils/triggerCacheCreation'
+export * from './utils/removeTempContextDir'
diff --git a/packages/utils/src/prepareExtension.ts → packages/cache/src/prepareExtension.ts b/packages/utils/src/prepareExtension.ts → packages/cache/src/prepareExtension.ts
diff --git a/packages/cache/src/synpress-utils.d.ts b/packages/cache/src/synpress-utils.d.ts
diff --git a/packages/utils/src/unzipArchive.ts → packages/cache/src/unzipArchive.ts b/packages/utils/src/unzipArchive.ts → packages/cache/src/unzipArchive.ts
diff --git a/packages/utils/src/utils/bytesToMegabytes.ts → packages/cache/src/utils/bytesToMegabytes.ts b/packages/utils/src/utils/bytesToMegabytes.ts → packages/cache/src/utils/bytesToMegabytes.ts
diff --git a/...tils/createCacheForWalletSetupFunction.ts → ...tils/createCacheForWalletSetupFunction.ts b/...tils/createCacheForWalletSetupFunction.ts → ...tils/createCacheForWalletSetupFunction.ts
diff --git a/...s/utils/src/utils/createTempContextDir.ts → ...s/cache/src/utils/createTempContextDir.ts b/...s/utils/src/utils/createTempContextDir.ts → ...s/cache/src/utils/createTempContextDir.ts
diff --git a/...rc/utils/getUniqueWalletSetupFunctions.ts → ...rc/utils/getUniqueWalletSetupFunctions.ts b/...rc/utils/getUniqueWalletSetupFunctions.ts → ...rc/utils/getUniqueWalletSetupFunctions.ts
diff --git a/...es/utils/src/utils/getWalletSetupFiles.ts → ...es/cache/src/utils/getWalletSetupFiles.ts b/...es/utils/src/utils/getWalletSetupFiles.ts → ...es/cache/src/utils/getWalletSetupFiles.ts
diff --git a/...utils/src/utils/getWalletSetupFuncHash.ts → ...cache/src/utils/getWalletSetupFuncHash.ts b/...utils/src/utils/getWalletSetupFuncHash.ts → ...cache/src/utils/getWalletSetupFuncHash.ts
diff --git a/.../utils/src/utils/importWalletSetupFile.ts → .../cache/src/utils/importWalletSetupFile.ts b/.../utils/src/utils/importWalletSetupFile.ts → .../cache/src/utils/importWalletSetupFile.ts
diff --git a/packages/utils/src/utils/isDirEmpty.ts → packages/cache/src/utils/isDirEmpty.ts b/packages/utils/src/utils/isDirEmpty.ts → packages/cache/src/utils/isDirEmpty.ts
diff --git a/...ges/utils/src/utils/onDownloadProgress.ts → ...ges/cache/src/utils/onDownloadProgress.ts b/...ges/utils/src/utils/onDownloadProgress.ts → ...ges/cache/src/utils/onDownloadProgress.ts
diff --git a/...s/utils/src/utils/removeTempContextDir.ts → ...s/cache/src/utils/removeTempContextDir.ts b/...s/utils/src/utils/removeTempContextDir.ts → ...s/cache/src/utils/removeTempContextDir.ts
diff --git a/...s/utils/src/utils/triggerCacheCreation.ts → ...s/cache/src/utils/triggerCacheCreation.ts b/...s/utils/src/utils/triggerCacheCreation.ts → ...s/cache/src/utils/triggerCacheCreation.ts
diff --git a/...s/src/utils/waitForExtensionOnLoadPage.ts → ...e/src/utils/waitForExtensionOnLoadPage.ts b/...s/src/utils/waitForExtensionOnLoadPage.ts → ...e/src/utils/waitForExtensionOnLoadPage.ts
diff --git a/packages/cache/test/createCache.test.ts b/packages/cache/test/createCache.test.ts
@@ -1,8 +1,8 @@
 import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'
 
 import path from 'node:path'
-import * as GetUniqueWalletSetupFunctions from '@synthetixio/synpress-utils'
-import * as TriggerCacheCreation from '@synthetixio/synpress-utils'
+import * as GetUniqueWalletSetupFunctions from '@synthetixio/synpress-cache'
+import * as TriggerCacheCreation from '@synthetixio/synpress-cache'
 import type { BrowserContext, Page } from 'playwright-core'
 import { createCache } from '../src/createCache'
 

diff --git a/packages/cache/test/defineWalletSetup.test.ts b/packages/cache/test/defineWalletSetup.test.ts
@@ -1,4 +1,4 @@
-import { defineWalletSetup } from '@synthetixio/synpress-utils'
+import { defineWalletSetup } from "../src"
 import { describe, expect, it } from 'vitest'
 
 const PASSWORD = 'Quack Quack! 🦆'

diff --git a/packages/cache/test/downloadFile.test.ts b/packages/cache/test/downloadFile.test.ts
@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { downloadFile } from '@synthetixio/synpress-utils'
+import { downloadFile } from '@synthetixio/synpress-cache'
 import axios from 'axios'
 import { fs, vol } from 'memfs'
 import { http, HttpResponse } from 'msw'

diff --git a/packages/cache/test/ensureCacheDirExists.test.ts b/packages/cache/test/ensureCacheDirExists.test.ts
@@ -1,6 +1,6 @@
 import path from 'node:path'
-import { CACHE_DIR_NAME } from '@synthetixio/synpress-utils'
-import { ensureCacheDirExists } from '@synthetixio/synpress-utils'
+import { CACHE_DIR_NAME } from '@synthetixio/synpress-cache'
+import { ensureCacheDirExists } from '@synthetixio/synpress-cache'
 import fs from 'fs-extra'
 import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'
 

diff --git a/packages/cache/test/unzipArchive.test.ts b/packages/cache/test/unzipArchive.test.ts
@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { unzipArchive } from '@synthetixio/synpress-utils'
+import { unzipArchive } from '@synthetixio/synpress-cache'
 import { fs, vol } from 'memfs'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {

diff --git a/packages/cache/test/utils/bytesToMegabytes.test.ts b/packages/cache/test/utils/bytesToMegabytes.test.ts
@@ -1,4 +1,4 @@
-import { bytesToMegabytes } from '@synthetixio/synpress-utils'
+import { bytesToMegabytes } from '@synthetixio/synpress-cache'
 import { describe, expect, it } from 'vitest'
 
 describe('bytesToMegabytes', () => {

diff --git a/packages/cache/test/utils/createCacheForWalletSetupFunction.test.ts b/packages/cache/test/utils/createCacheForWalletSetupFunction.test.ts
@@ -1,5 +1,5 @@
-import { createCacheForWalletSetupFunction } from '@synthetixio/synpress-utils'
-import * as WaitForExtensionOnLoadPage from '@synthetixio/synpress-utils'
+import { createCacheForWalletSetupFunction } from '@synthetixio/synpress-cache'
+import * as WaitForExtensionOnLoadPage from '@synthetixio/synpress-cache'
 import { chromium } from 'playwright-core'
 import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
 

diff --git a/packages/cache/test/utils/createTempContextDir.test.ts b/packages/cache/test/utils/createTempContextDir.test.ts
@@ -1,6 +1,6 @@
 import os from 'node:os'
 import path from 'node:path'
-import { createTempContextDir } from '@synthetixio/synpress-utils'
+import { createTempContextDir } from '@synthetixio/synpress-cache'
 import { fs, vol } from 'memfs'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 

diff --git a/packages/cache/test/utils/getUniqueWalletSetupFunctions.test.ts b/packages/cache/test/utils/getUniqueWalletSetupFunctions.test.ts
@@ -1,4 +1,4 @@
-import { getUniqueWalletSetupFunctions } from '@synthetixio/synpress-utils'
+import { getUniqueWalletSetupFunctions } from '@synthetixio/synpress-cache'
 import { afterAll, describe, expect, it, vi } from 'vitest'
 
 vi.mock('../../src/utils/getWalletSetupFiles', async () => {

diff --git a/packages/cache/test/utils/getWalletSetupFiles.test.ts b/packages/cache/test/utils/getWalletSetupFiles.test.ts
@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { getWalletSetupFiles } from '@synthetixio/synpress-utils'
+import { getWalletSetupFiles } from '@synthetixio/synpress-cache'
 import { fs, vol } from 'memfs'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 

diff --git a/packages/cache/test/utils/getWalletSetupFuncHash.test.ts b/packages/cache/test/utils/getWalletSetupFuncHash.test.ts
@@ -1,4 +1,4 @@
-import { WALLET_SETUP_FUNC_HASH_LENGTH, getWalletSetupFuncHash } from '@synthetixio/synpress-utils'
+import { WALLET_SETUP_FUNC_HASH_LENGTH, getWalletSetupFuncHash } from '@synthetixio/synpress-cache'
 import { describe, expect, it } from 'vitest'
 
 const EXPECTED_HASH = 'b940c886be3c1a041ddd'

diff --git a/packages/cache/test/utils/importWalletSetupFile.test.ts b/packages/cache/test/utils/importWalletSetupFile.test.ts
@@ -1,4 +1,4 @@
-import { importWalletSetupFile } from '@synthetixio/synpress-utils'
+import { importWalletSetupFile } from '@synthetixio/synpress-cache'
 import { afterAll, describe, expect, it, vi } from 'vitest'
 
 vi.mock('../../src/ensureCacheDirExists', async () => {

diff --git a/packages/cache/test/utils/isDirEmpty.test.ts b/packages/cache/test/utils/isDirEmpty.test.ts
@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { isDirEmpty } from '@synthetixio/synpress-utils'
+import { isDirEmpty } from '@synthetixio/synpress-cache'
 import { fs, vol } from 'memfs'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 

diff --git a/packages/cache/test/utils/removeTempContextDir.test.ts b/packages/cache/test/utils/removeTempContextDir.test.ts
@@ -1,4 +1,4 @@
-import { removeTempContextDir } from '@synthetixio/synpress-utils'
+import { removeTempContextDir } from '@synthetixio/synpress-cache'
 import { afterAll, describe, expect, it, vi } from 'vitest'
 
 const PATH = 'Happy Quack Path'

diff --git a/packages/cache/test/utils/waitForExtensionOnLoadPage.test.ts b/packages/cache/test/utils/waitForExtensionOnLoadPage.test.ts
@@ -1,4 +1,4 @@
-import { waitForExtensionOnLoadPage } from '@synthetixio/synpress-utils'
+import { waitForExtensionOnLoadPage } from '@synthetixio/synpress-cache'
 import { errors as playwrightErrors } from 'playwright-core'
 import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'
 

diff --git a/packages/utils/environment.d.ts b/packages/utils/environment.d.ts
diff --git a/packages/utils/package.json b/packages/utils/package.json
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json
diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
diff --git a/packages/utils/tsup.config.ts b/packages/utils/tsup.config.ts