chore: cleanup dead code (#21340)

* chore: cleanup dead code * fix * fix * fix tests
cypress-io · May 6, 2022 · 1ed93ff · 1ed93ff · cypress-bot · May 6, 2022
1 parent de2e99d
commit 1ed93ff
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 69 deletions.
diff --git a/packages/data-context/src/DataContext.ts b/packages/data-context/src/DataContext.ts
@@ -366,10 +366,6 @@ export class DataContext {
     ])
   }
 
-  get loader () {
-    return this.util.loader
-  }
-
   /**
    * Resets all of the state for the data context,
    * so we can initialize fresh for each E2E test
@@ -392,7 +388,6 @@ export class DataContext {
     return Promise.all([
       this.lifecycleManager.destroy(),
       this.cloud.reset(),
-      this.util.disposeLoaders(),
       this.actions.project.clearCurrentProject(),
       this.actions.dev.dispose(),
     ])

diff --git a/packages/data-context/src/sources/HtmlDataSource.ts b/packages/data-context/src/sources/HtmlDataSource.ts
@@ -35,7 +35,7 @@ export class HtmlDataSource {
         )
       } catch (e) {
         err = e
-        await this.ctx.util.delayMs(1000)
+        await new Promise((resolve) => setTimeout(resolve, 1000))
       }
     }
 

diff --git a/packages/data-context/src/sources/ProjectDataSource.ts b/packages/data-context/src/sources/ProjectDataSource.ts
@@ -357,10 +357,6 @@ export class ProjectDataSource {
     return preferences[projectTitle] ?? null
   }
 
-  frameworkLoader = this.ctx.loader<string, typeof WIZARD_FRAMEWORKS[number] | null>((projectRoots) => {
-    return Promise.all(projectRoots.map((projectRoot) => Promise.resolve(this.guessFramework(projectRoot))))
-  })
-
   private guessFramework (projectRoot: string) {
     const guess = WIZARD_FRAMEWORKS.find((framework) => {
       const lookingForDeps = framework.detectors.map((x) => x.package).reduce(
@@ -379,7 +375,7 @@ export class ProjectDataSource {
 
     const looseComponentGlob = '*.{js,jsx,ts,tsx,.vue}'
 
-    const framework = await this.frameworkLoader.load(this.ctx.currentProject)
+    const framework = this.guessFramework(this.ctx.currentProject)
 
     return {
       component: framework?.glob ?? looseComponentGlob,

diff --git a/packages/data-context/src/sources/SettingsDataSource.ts b/packages/data-context/src/sources/SettingsDataSource.ts
diff --git a/packages/data-context/src/sources/UtilDataSource.ts b/packages/data-context/src/sources/UtilDataSource.ts
@@ -1,5 +1,3 @@
-import DataLoader from 'dataloader'
-import crypto from 'crypto'
 import fetch from 'cross-fetch'
 import type { DataContext } from '../DataContext'
 
@@ -15,49 +13,6 @@ const { agent } = require('@packages/network')
 export class UtilDataSource {
   constructor (private ctx: DataContext) {}
 
-  private _allLoaders: DataLoader<any, any>[] = []
-
-  async settleAll<T> (promises: Promise<T>[]) {
-    const vals = await Promise.allSettled(promises)
-
-    return vals.map((v) => v.status === 'fulfilled' ? v.value : this.ensureError(v.reason))
-  }
-
-  /**
-   * Utility for a promise delay, in milliseconds
-   */
-  async delayMs (ms: number) {
-    await new Promise((resolve) => setTimeout(resolve, ms))
-  }
-
-  assertAbsolute (val: string) {
-    if (!this.ctx.path.isAbsolute(val)) {
-      throw new Error(`Expected ${val} to be an absolute path`)
-    }
-  }
-
-  ensureError (val: any): Error {
-    return val instanceof Error ? val : new Error(val)
-  }
-
-  loader = <K, V, C = K>(batchLoadFn: DataLoader.BatchLoadFn<K, V>) => {
-    const loader = new DataLoader<K, V, C>(batchLoadFn, { cache: false })
-
-    this._allLoaders.push(loader)
-
-    return loader
-  }
-
-  disposeLoaders () {
-    for (const loader of this._allLoaders) {
-      loader.clearAll()
-    }
-  }
-
-  sha1 (value: string) {
-    return crypto.createHash('sha1').update(value).digest('hex')
-  }
-
   fetch (input: RequestInfo | URL, init?: RequestInit) {
     // @ts-ignore agent isn't a part of cross-fetch's API since it's not a part of the browser's fetch but it is a part of node-fetch
     // which is what will be used here

diff --git a/packages/data-context/src/sources/index.ts b/packages/data-context/src/sources/index.ts
@@ -10,7 +10,6 @@ export * from './GitDataSource'
 export * from './HtmlDataSource'
 export * from './MigrationDataSource'
 export * from './ProjectDataSource'
-export * from './SettingsDataSource'
 export * from './UtilDataSource'
 export * from './VersionsDataSource'
 export * from './WizardDataSource'

diff --git a/packages/data-context/test/unit/codegen/code-generator.spec.ts b/packages/data-context/test/unit/codegen/code-generator.spec.ts
@@ -221,7 +221,8 @@ describe('code-generator', () => {
       target,
     }
 
-    sinon.stub(ctx.project.frameworkLoader, 'load').resolves(WIZARD_FRAMEWORKS[0])
+    // @ts-ignore
+    sinon.stub(ctx.project, 'guessFramework').returns(WIZARD_FRAMEWORKS[0])
 
     const newSpecCodeGenOptions = new SpecOptions(ctx, {
       codeGenPath: path.join(__dirname, 'files', 'react', 'Button.jsx'),
@@ -243,7 +244,8 @@ describe('code-generator', () => {
       target,
     }
 
-    sinon.stub(ctx.project.frameworkLoader, 'load').resolves(WIZARD_FRAMEWORKS[1])
+    // @ts-ignore
+    sinon.stub(ctx.project, 'guessFramework').returns(WIZARD_FRAMEWORKS[1])
 
     const newSpecCodeGenOptions = new SpecOptions(ctx, {
       codeGenPath: path.join(__dirname, 'files', 'vue', 'Button.vue'),

diff --git a/packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts b/packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts
@@ -341,7 +341,7 @@ async function makeE2ETasks () {
           return { value }
         } catch (e: any) {
           if (i <= retries) {
-            await ctx.util.delayMs(obj.options.retryDelay ?? 1000)
+            await new Promise((resolve) => setTimeout(resolve, obj.options.retryDelay ?? 1000))
           }
 
           lastErr = e