Merge branch 'develop' into isolated-runner-fixes

cypress-io · Jun 11, 2020 · 774249e · 774249e
2 parents f5bc2ed + b578032
commit 774249e
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 53 deletions.
diff --git a/cli/package.json b/cli/package.json
@@ -25,7 +25,7 @@
     "@cypress/xvfb": "1.2.4",
     "@types/sinonjs__fake-timers": "6.0.1",
     "@types/sizzle": "2.3.2",
-    "arch": "2.1.1",
+    "arch": "2.1.2",
     "bluebird": "3.7.2",
     "cachedir": "2.3.0",
     "chalk": "2.4.2",

diff --git a/packages/driver/cypress/integration/e2e/focus_blur_spec.js b/packages/driver/cypress/integration/e2e/focus_blur_spec.js
@@ -1,4 +1,3 @@
-/// <reference path="../../../../../cli/types/index.d.ts" />
 /* eslint arrow-body-style:'off' */
 
 /**

diff --git a/packages/driver/index.d.ts b/packages/driver/index.d.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../cli/types/cypress.d.ts" />
+/// <reference path="../../cli/types/index.d.ts" />
 /// <reference path="../ts/index.d.ts" />
 export const $Cypress: Cypress.Cypress
 

diff --git a/packages/driver/src/config/lodash.d.ts b/packages/driver/src/config/lodash.d.ts
diff --git a/packages/driver/tsconfig.json b/packages/driver/tsconfig.json
@@ -18,6 +18,10 @@
     "allowSyntheticDefaultImports": true,
     "outDir": "dist",
     "esModuleInterop": true,
-    "noErrorTruncation": true
-  }
+    "noErrorTruncation": true,
+    "types": []
+  },
+  "exclude": [
+    "dist"
+  ]
 }
diff --git a/packages/driver/ts/internal-types.d.ts → packages/driver/types/internal-types.d.ts b/packages/driver/ts/internal-types.d.ts → packages/driver/types/internal-types.d.ts
diff --git a/packages/runner/jsconfig.json b/packages/runner/jsconfig.json
diff --git a/packages/runner/tsconfig.json b/packages/runner/tsconfig.json
@@ -46,14 +46,15 @@
     // "baseUrl": "../",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": ["../driver/src"],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
+    "types": [],                           /* Type declaration files to be included in compilation. */
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "noErrorTruncation": true,
     "experimentalDecorators": true
     // "noResolve": true
   },
   "exclude": [
-    "dist"
+    "dist",
+    "test"
   ]
 }
diff --git a/packages/server/test/e2e/8_error_ui_spec.ts b/packages/server/test/e2e/8_error_ui_spec.ts
@@ -34,7 +34,7 @@ describe('e2e error ui', function () {
   e2e.it('displays correct UI for errors', {
     spec: 'various_failures_spec.js',
     expectedExitCode: VARIOUS_FAILURES_EXPECTED_FAILURES,
-    timeout: 180000, // 3 minutes
+    timeout: 240000, // 4 minutes
     noTypeScript: true,
     onRun (exec) {
       return exec().then(verifyPassedAndFailedAreSame(VARIOUS_FAILURES_EXPECTED_FAILURES))
@@ -44,7 +44,7 @@ describe('e2e error ui', function () {
   e2e.it('displays correct UI for errors in custom commands', {
     spec: 'various_failures_custom_commands_spec.js',
     expectedExitCode: VARIOUS_FAILURES_EXPECTED_FAILURES,
-    timeout: 180000, // 3 minutes
+    timeout: 240000, // 4 minutes
     noTypeScript: true,
     onRun (exec) {
       return exec().then(verifyPassedAndFailedAreSame(VARIOUS_FAILURES_EXPECTED_FAILURES))

diff --git a/yarn.lock b/yarn.lock
@@ -5093,12 +5093,7 @@ aproba@^2.0.0:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-arch@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
-  integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
-
-arch@^2.1.0:
+arch@2.1.2, arch@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.2.tgz#0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf"
   integrity sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==