From 4ebe66c3f483e83c75addd5ae491aea8f9515552 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 14 Jul 2020 13:48:58 -0400 Subject: [PATCH 01/27] make tests preprocessor agnostic --- ...bel_es201_spec.js => 1_es_modules_spec.js} | 36 +++--- .../1_typescript_support_spec.ts.js | 32 ++--- packages/server/package.json | 13 -- ...bel_es201_spec.js => 1_es_modules_spec.js} | 6 +- .../test/e2e/1_typescript_support_spec.ts | 4 +- .../test/integration/http_requests_spec.js | 86 +----------- ...ec.js => es_module_import_failing_spec.js} | 0 ...offee => es_modules_in_coffee_spec.coffee} | 0 ...ing_spec.ts => typescript_failing_spec.ts} | 2 +- ...ing_spec.ts => typescript_passing_spec.ts} | 0 .../ids/cypress/integration/foo.coffee | 3 +- .../projects/no-server/helpers/includes.js | 2 +- .../projects/no-server/my-tests/test1.js | 2 +- .../test/support/helpers/simple_tsify.js | 45 ------- yarn.lock | 122 ++++++++---------- 15 files changed, 98 insertions(+), 255 deletions(-) rename packages/server/__snapshots__/{1_browserify_babel_es201_spec.js => 1_es_modules_spec.js} (85%) rename packages/server/test/e2e/{1_browserify_babel_es201_spec.js => 1_es_modules_spec.js} (67%) rename packages/server/test/support/fixtures/projects/e2e/cypress/integration/{browserify_babel_es2015_failing_spec.js => es_module_import_failing_spec.js} (100%) rename packages/server/test/support/fixtures/projects/e2e/cypress/integration/{browserify_babel_es2015_passing_spec.coffee => es_modules_in_coffee_spec.coffee} (100%) rename packages/server/test/support/fixtures/projects/e2e/cypress/integration/{browserify_typescript_failing_spec.ts => typescript_failing_spec.ts} (76%) rename packages/server/test/support/fixtures/projects/e2e/cypress/integration/{browserify_typescript_passing_spec.ts => typescript_passing_spec.ts} (100%) delete mode 100644 packages/server/test/support/helpers/simple_tsify.js diff --git a/packages/server/__snapshots__/1_browserify_babel_es201_spec.js b/packages/server/__snapshots__/1_es_modules_spec.js similarity index 85% rename from packages/server/__snapshots__/1_browserify_babel_es201_spec.js rename to packages/server/__snapshots__/1_es_modules_spec.js index aa760b12e4a9..c42491f8aa0d 100644 --- a/packages/server/__snapshots__/1_browserify_babel_es201_spec.js +++ b/packages/server/__snapshots__/1_es_modules_spec.js @@ -1,4 +1,4 @@ -exports['e2e browserify, babel, es2015 passes 1'] = ` +exports['e2e es modules passes 1'] = ` ==================================================================================================== @@ -7,14 +7,14 @@ exports['e2e browserify, babel, es2015 passes 1'] = ` ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ │ Cypress: 1.2.3 │ │ Browser: FooBrowser 88 │ - │ Specs: 1 found (browserify_babel_es2015_passing_spec.coffee) │ - │ Searched: cypress/integration/browserify_babel_es2015_passing_spec.coffee │ + │ Specs: 1 found (es_modules_in_coffee_spec.coffee) │ + │ Searched: cypress/integration/es_modules_in_coffee_spec.coffee │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ──────────────────────────────────────────────────────────────────────────────────────────────────── - Running: browserify_babel_es2015_passing_spec.coffee (1 of 1) + Running: es_modules_in_coffee_spec.coffee (1 of 1) imports work @@ -37,15 +37,15 @@ exports['e2e browserify, babel, es2015 passes 1'] = ` │ Screenshots: 0 │ │ Video: true │ │ Duration: X seconds │ - │ Spec Ran: browserify_babel_es2015_passing_spec.coffee │ + │ Spec Ran: es_modules_in_coffee_spec.coffee │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ (Video) - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/browserify_babel_es2015_passing (X second) - _spec.coffee.mp4 + - Finished processing: /XXX/XXX/XXX/cypress/videos/es_modules_in_coffee_spec.coffe (X second) + e.mp4 ==================================================================================================== @@ -55,15 +55,14 @@ exports['e2e browserify, babel, es2015 passes 1'] = ` Spec Tests Passing Failing Pending Skipped ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ browserify_babel_es2015_passing_spe XX:XX 3 3 - - - │ - │ c.coffee │ + │ ✔ es_modules_in_coffee_spec.coffee XX:XX 3 3 - - - │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ✔ All specs passed! XX:XX 3 3 - - - ` -exports['e2e browserify, babel, es2015 fails 1'] = ` +exports['e2e es modules fails 1'] = ` ==================================================================================================== @@ -72,18 +71,18 @@ exports['e2e browserify, babel, es2015 fails 1'] = ` ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ │ Cypress: 1.2.3 │ │ Browser: FooBrowser 88 │ - │ Specs: 1 found (browserify_babel_es2015_failing_spec.js) │ - │ Searched: cypress/integration/browserify_babel_es2015_failing_spec.js │ + │ Specs: 1 found (es_module_import_failing_spec.js) │ + │ Searched: cypress/integration/es_module_import_failing_spec.js │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ──────────────────────────────────────────────────────────────────────────────────────────────────── - Running: browserify_babel_es2015_failing_spec.js (1 of 1) + Running: es_module_import_failing_spec.js (1 of 1) Oops...we found an error preparing this test file: - /foo/bar/.projects/e2e/cypress/integration/browserify_babel_es2015_failing_spec.js + /foo/bar/.projects/e2e/cypress/integration/es_module_import_failing_spec.js The error was: @@ -111,15 +110,15 @@ Fix the error in your code and re-run your tests. │ Screenshots: 0 │ │ Video: true │ │ Duration: X seconds │ - │ Spec Ran: browserify_babel_es2015_failing_spec.js │ + │ Spec Ran: es_module_import_failing_spec.js │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ (Video) - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/browserify_babel_es2015_failing (X second) - _spec.js.mp4 + - Finished processing: /XXX/XXX/XXX/cypress/videos/es_module_import_failing_spec.j (X second) + s.mp4 ==================================================================================================== @@ -129,8 +128,7 @@ Fix the error in your code and re-run your tests. Spec Tests Passing Failing Pending Skipped ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✖ browserify_babel_es2015_failing_spe XX:XX - - 1 - - │ - │ c.js │ + │ ✖ es_module_import_failing_spec.js XX:XX - - 1 - - │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ✖ 1 of 1 failed (100%) XX:XX - - 1 - - diff --git a/packages/server/__snapshots__/1_typescript_support_spec.ts.js b/packages/server/__snapshots__/1_typescript_support_spec.ts.js index 3363bf4d83ca..2847eaacf282 100644 --- a/packages/server/__snapshots__/1_typescript_support_spec.ts.js +++ b/packages/server/__snapshots__/1_typescript_support_spec.ts.js @@ -7,14 +7,14 @@ exports['e2e typescript spec passes 1'] = ` ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ │ Cypress: 1.2.3 │ │ Browser: FooBrowser 88 │ - │ Specs: 1 found (browserify_typescript_passing_spec.ts) │ - │ Searched: cypress/integration/browserify_typescript_passing_spec.ts │ + │ Specs: 1 found (typescript_passing_spec.ts) │ + │ Searched: cypress/integration/typescript_passing_spec.ts │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ──────────────────────────────────────────────────────────────────────────────────────────────────── - Running: browserify_typescript_passing_spec.ts (1 of 1) + Running: typescript_passing_spec.ts (1 of 1) imports work @@ -38,15 +38,14 @@ exports['e2e typescript spec passes 1'] = ` │ Screenshots: 0 │ │ Video: true │ │ Duration: X seconds │ - │ Spec Ran: browserify_typescript_passing_spec.ts │ + │ Spec Ran: typescript_passing_spec.ts │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ (Video) - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/browserify_typescript_passing_s (X second) - pec.ts.mp4 + - Finished processing: /XXX/XXX/XXX/cypress/videos/typescript_passing_spec.ts.mp4 (X second) ==================================================================================================== @@ -56,8 +55,7 @@ exports['e2e typescript spec passes 1'] = ` Spec Tests Passing Failing Pending Skipped ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ browserify_typescript_passing_spec. XX:XX 4 4 - - - │ - │ ts │ + │ ✔ typescript_passing_spec.ts XX:XX 4 4 - - - │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ✔ All specs passed! XX:XX 4 4 - - - @@ -73,22 +71,22 @@ exports['e2e typescript spec fails 1'] = ` ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ │ Cypress: 1.2.3 │ │ Browser: FooBrowser 88 │ - │ Specs: 1 found (browserify_typescript_failing_spec.ts) │ - │ Searched: cypress/integration/browserify_typescript_failing_spec.ts │ + │ Specs: 1 found (typescript_failing_spec.ts) │ + │ Searched: cypress/integration/typescript_failing_spec.ts │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ──────────────────────────────────────────────────────────────────────────────────────────────────── - Running: browserify_typescript_failing_spec.ts (1 of 1) + Running: typescript_failing_spec.ts (1 of 1) Oops...we found an error preparing this test file: - /foo/bar/.projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts + /foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts The error was: -/foo/bar/.projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts:3 +/foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts:3 describe('fail', - > ); ^ ParseError: Unexpected token @@ -111,15 +109,14 @@ Fix the error in your code and re-run your tests. │ Screenshots: 0 │ │ Video: true │ │ Duration: X seconds │ - │ Spec Ran: browserify_typescript_failing_spec.ts │ + │ Spec Ran: typescript_failing_spec.ts │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ (Video) - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/browserify_typescript_failing_s (X second) - pec.ts.mp4 + - Finished processing: /XXX/XXX/XXX/cypress/videos/typescript_failing_spec.ts.mp4 (X second) ==================================================================================================== @@ -129,8 +126,7 @@ Fix the error in your code and re-run your tests. Spec Tests Passing Failing Pending Skipped ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✖ browserify_typescript_failing_spec. XX:XX - - 1 - - │ - │ ts │ + │ ✖ typescript_failing_spec.ts XX:XX - - 1 - - │ └────────────────────────────────────────────────────────────────────────────────────────────────┘ ✖ 1 of 1 failed (100%) XX:XX - - 1 - - diff --git a/packages/server/package.json b/packages/server/package.json index 5c4ed446c525..5e5e1d4a53e6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -32,7 +32,6 @@ "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", "bluebird": "3.7.0", - "browserify": "16.3.0", "chai": "1.10.0", "chalk": "2.4.2", "check-more-types": "2.24.0", @@ -120,13 +119,6 @@ "winston": "2.4.4" }, "devDependencies": { - "@babel/core": "7.9.0", - "@babel/plugin-proposal-class-properties": "7.8.3", - "@babel/plugin-proposal-object-rest-spread": "7.9.0", - "@babel/plugin-transform-runtime": "7.9.0", - "@babel/preset-env": "7.9.0", - "@babel/preset-react": "7.9.4", - "@babel/runtime": "7.9.2", "@cypress/debugging-proxy": "2.0.1", "@cypress/json-schemas": "5.34.2", "@cypress/sinon-chai": "1.1.0", @@ -146,16 +138,12 @@ "@types/chrome": "0.0.101", "@types/node": "8.10.55", "awesome-typescript-loader": "5.2.1", - "babel-loader": "8.1.0", - "babel-plugin-add-module-exports": "1.0.2", - "babelify": "10.0.0", "body-parser": "1.19.0", "chai-as-promised": "7.1.1", "chai-subset": "1.6.0", "chai-uuid": "1.0.6", "chokidar-cli": "1.2.2", "chrome-har-capturer": "0.13.4", - "coffeeify": "3.0.1", "cors": "2.8.5", "cross-env": "6.0.3", "devtools-protocol": "0.0.734984", @@ -181,7 +169,6 @@ "sinon": "5.1.1", "snap-shot-it": "7.9.3", "ssestream": "1.0.1", - "stream-to-promise": "1.1.1", "supertest": "4.0.2", "supertest-session": "4.0.0", "through2": "2.0.5", diff --git a/packages/server/test/e2e/1_browserify_babel_es201_spec.js b/packages/server/test/e2e/1_es_modules_spec.js similarity index 67% rename from packages/server/test/e2e/1_browserify_babel_es201_spec.js rename to packages/server/test/e2e/1_es_modules_spec.js index 02d963be937e..76d6fa50ef4c 100644 --- a/packages/server/test/e2e/1_browserify_babel_es201_spec.js +++ b/packages/server/test/e2e/1_es_modules_spec.js @@ -1,11 +1,11 @@ const e2e = require('../support/helpers/e2e').default -describe('e2e browserify, babel, es2015', () => { +describe('e2e es modules', () => { e2e.setup() it('passes', function () { return e2e.exec(this, { - spec: 'browserify_babel_es2015_passing_spec.coffee', + spec: 'es_modules_in_coffee_spec.coffee', snapshot: true, noTypeScript: true, }) @@ -13,7 +13,7 @@ describe('e2e browserify, babel, es2015', () => { it('fails', function () { return e2e.exec(this, { - spec: 'browserify_babel_es2015_failing_spec.js', + spec: 'es_module_import_failing_spec.js', snapshot: true, expectedExitCode: 1, noTypeScript: true, diff --git a/packages/server/test/e2e/1_typescript_support_spec.ts b/packages/server/test/e2e/1_typescript_support_spec.ts index 3252ac68ba94..d0388556da16 100644 --- a/packages/server/test/e2e/1_typescript_support_spec.ts +++ b/packages/server/test/e2e/1_typescript_support_spec.ts @@ -8,14 +8,14 @@ describe('e2e typescript', function () { it('spec passes', function () { return e2e.exec(this, { - spec: 'browserify_typescript_passing_spec.ts', + spec: 'typescript_passing_spec.ts', snapshot: true, }) }) it('spec fails', function () { return e2e.exec(this, { - spec: 'browserify_typescript_failing_spec.ts', + spec: 'typescript_failing_spec.ts', snapshot: true, expectedExitCode: 1, }) diff --git a/packages/server/test/integration/http_requests_spec.js b/packages/server/test/integration/http_requests_spec.js index 30b44bea47e6..425137b62802 100644 --- a/packages/server/test/integration/http_requests_spec.js +++ b/packages/server/test/integration/http_requests_spec.js @@ -11,10 +11,6 @@ const path = require('path') const url = require('url') let zlib = require('zlib') const str = require('underscore.string') -const browserify = require('browserify') -const babelify = require('babelify') -const coffeeify = require('coffeeify') -const streamToPromise = require('stream-to-promise') const evilDns = require('evil-dns') const Promise = require('bluebird') const httpsServer = require(`${root}../https-proxy/test/helpers/https_server`) @@ -32,7 +28,6 @@ const fs = require(`${root}lib/util/fs`) const glob = require(`${root}lib/util/glob`) const CacheBuster = require(`${root}lib/util/cache_buster`) const Fixtures = require(`${root}test/support/helpers/fixtures`) -const simple_tsify = require(`${root}test/support/helpers/simple_tsify`) zlib = Promise.promisifyAll(zlib) @@ -46,10 +41,6 @@ const replaceAbsolutePaths = (content) => { return content.replace(absolutePathRegex, '"/') } -const removeSourceMap = (content) => { - return content.replace(sourceMapRegex, ';') -} - const removeWhitespace = function (c) { c = str.clean(c) c = str.lines(c).join(' ') @@ -61,36 +52,6 @@ const cleanResponseBody = (body) => { return replaceAbsolutePaths(removeWhitespace(body)) } -const browserifyFile = (filePath) => { - return streamToPromise( - browserify({ - entries: [filePath], - extensions: ['.js', '.jsx', '.coffee'], - cache: {}, - packageCache: {}, - transform: [ - [coffeeify, {}], - [babelify, { - plugins: ['add-module-exports', '@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-object-rest-spread', '@babel/plugin-transform-runtime'], - presets: ['@babel/preset-env', '@babel/preset-react'], - }], - ], - }) - .bundle(), - ) -} - -const browserifyFileTs = (filePath) => { - return streamToPromise( - browserify(filePath) - .transform(coffeeify) - .transform(simple_tsify, { - typescript: require('typescript'), - }) - .bundle(), - ) -} - describe('Routes', () => { require('mocha-banner').register() @@ -604,22 +565,11 @@ describe('Routes', () => { }) }) - const checkTranspilation = function (body, file) { - const b = removeSourceMap(body).replace(/\n/g, '') - const f = file.toString().replace(/\n/g, '') - - expect(b).to.equal(f) - } - it('processes foo.coffee spec', function () { return this.rp('http://localhost:2020/__cypress/tests?p=cypress/integration/foo.coffee') .then((res) => { expect(res.statusCode).to.eq(200) - - return browserifyFileTs(Fixtures.path('projects/ids/cypress/integration/foo.coffee')) - .then((file) => { - return checkTranspilation(res.body, file) - }) + expect(res.body).to.include('expect("foo.coffee")') }) }) @@ -627,13 +577,7 @@ describe('Routes', () => { return this.rp('http://localhost:2020/__cypress/tests?p=cypress/integration/baz.js') .then((res) => { expect(res.statusCode).to.eq(200) - - return browserifyFileTs(Fixtures.path('projects/ids/cypress/integration/baz.js')) - .then((file) => { - checkTranspilation(res.body, file) - - expect(res.body).to.include('React.createElement(') - }) + expect(res.body).to.include('React.createElement(') }) }) @@ -668,11 +612,7 @@ describe('Routes', () => { .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.match(sourceMapRegex) - - return browserifyFile(Fixtures.path('projects/ids/cypress/integration/foo.coffee')) - .then((file) => { - expect(removeSourceMap(res.body)).to.equal(file.toString()) - }) + expect(res.body).to.include('expect("foo.coffee")') }) }) @@ -681,13 +621,7 @@ describe('Routes', () => { .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.match(sourceMapRegex) - - return browserifyFile(Fixtures.path('projects/ids/cypress/integration/baz.js')) - .then((file) => { - expect(removeSourceMap(res.body)).to.equal(file.toString()) - - expect(res.body).to.include('React.createElement(') - }) + expect(res.body).to.include('React.createElement(') }) }) @@ -740,11 +674,7 @@ describe('Routes', () => { .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.match(sourceMapRegex) - - return browserifyFileTs(Fixtures.path('projects/no-server/my-tests/test1.js')) - .then((file) => { - expect(removeSourceMap(res.body)).to.equal(file.toString()) - }) + expect(res.body).to.include(`expect('no-server')`) }) }) @@ -753,11 +683,7 @@ describe('Routes', () => { .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.match(sourceMapRegex) - - return browserifyFileTs(Fixtures.path('projects/no-server/helpers/includes.js')) - .then((file) => { - expect(removeSourceMap(res.body)).to.equal(file.toString()) - }) + expect(res.body).to.include(`console.log('includes')`) }) }) }) diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_babel_es2015_failing_spec.js b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/es_module_import_failing_spec.js similarity index 100% rename from packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_babel_es2015_failing_spec.js rename to packages/server/test/support/fixtures/projects/e2e/cypress/integration/es_module_import_failing_spec.js diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_babel_es2015_passing_spec.coffee b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/es_modules_in_coffee_spec.coffee similarity index 100% rename from packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_babel_es2015_passing_spec.coffee rename to packages/server/test/support/fixtures/projects/e2e/cypress/integration/es_modules_in_coffee_spec.coffee diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/typescript_failing_spec.ts similarity index 76% rename from packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts rename to packages/server/test/support/fixtures/projects/e2e/cypress/integration/typescript_failing_spec.ts index 09a8d2b75070..c476d7946782 100644 --- a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts +++ b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/typescript_failing_spec.ts @@ -1,3 +1,3 @@ // The code below is ignored by eslint // because it tests failing spec. -describe('fail', -> ) \ No newline at end of file +describe('fail', -> ) diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_typescript_passing_spec.ts b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/typescript_passing_spec.ts similarity index 100% rename from packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_typescript_passing_spec.ts rename to packages/server/test/support/fixtures/projects/e2e/cypress/integration/typescript_passing_spec.ts diff --git a/packages/server/test/support/fixtures/projects/ids/cypress/integration/foo.coffee b/packages/server/test/support/fixtures/projects/ids/cypress/integration/foo.coffee index 74a9e8deb45e..f8e373a2222c 100644 --- a/packages/server/test/support/fixtures/projects/ids/cypress/integration/foo.coffee +++ b/packages/server/test/support/fixtures/projects/ids/cypress/integration/foo.coffee @@ -1,4 +1,5 @@ describe "foo [000]", -> it "bars [001]", -> + expect("foo.coffee").to.equal("foo.coffee") - it 'quux [002]' \ No newline at end of file + it 'quux [002]' diff --git a/packages/server/test/support/fixtures/projects/no-server/helpers/includes.js b/packages/server/test/support/fixtures/projects/no-server/helpers/includes.js index 81969706f702..610c29484b78 100644 --- a/packages/server/test/support/fixtures/projects/no-server/helpers/includes.js +++ b/packages/server/test/support/fixtures/projects/no-server/helpers/includes.js @@ -1,3 +1,3 @@ beforeEach(function () { - + console.log('includes') }) diff --git a/packages/server/test/support/fixtures/projects/no-server/my-tests/test1.js b/packages/server/test/support/fixtures/projects/no-server/my-tests/test1.js index e3a5395eee36..1ff93d7bd5e4 100644 --- a/packages/server/test/support/fixtures/projects/no-server/my-tests/test1.js +++ b/packages/server/test/support/fixtures/projects/no-server/my-tests/test1.js @@ -1,4 +1,4 @@ /* eslint-disable mocha/no-global-tests */ it('tests without a server', function () { - + expect('no-server').to.equal('no-server') }) diff --git a/packages/server/test/support/helpers/simple_tsify.js b/packages/server/test/support/helpers/simple_tsify.js deleted file mode 100644 index 450c3dee010c..000000000000 --- a/packages/server/test/support/helpers/simple_tsify.js +++ /dev/null @@ -1,45 +0,0 @@ -// Copied from cypress-browserify-preprocessor for unit tests. - -let through = require('through2') - -const isJson = (code) => { - try { - JSON.parse(code) - } catch (e) { - return false - } - - return true -} - -// tsify doesn't have transpile-only option like ts-node or ts-loader. -// It means it should check types whenever spec file is changed -// and it slows down the test speed a lot. -// We skip this slow type-checking process by using transpileModule() api. -module.exports = function (b, opts) { - const chunks = [] - - return through( - (buf, enc, next) => { - chunks.push(buf.toString()) - next() - }, - function (next) { - const ts = opts.typescript - const text = chunks.join('') - - if (isJson(text)) { - this.push(text) - } else { - this.push(ts.transpileModule(text, { - compilerOptions: { - esModuleInterop: true, - jsx: 'react', - }, - }).outputText) - } - - next() - }, - ) -} diff --git a/yarn.lock b/yarn.lock index 6240dcd6175e..c71140defb6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -928,16 +928,6 @@ resolve "^1.8.1" semver "^5.5.1" -"@babel/plugin-transform-runtime@7.9.0": - version "7.9.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b" - integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw== - dependencies: - "@babel/helper-module-imports" "^7.8.3" - "@babel/helper-plugin-utils" "^7.8.3" - resolve "^1.8.1" - semver "^5.5.1" - "@babel/plugin-transform-shorthand-properties@^7.2.0", "@babel/plugin-transform-shorthand-properties@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8" @@ -1320,13 +1310,6 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@7.9.2": - version "7.9.2" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06" - integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q== - dependencies: - regenerator-runtime "^0.13.4" - "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" @@ -1485,30 +1468,6 @@ resolved "https://registry.yarnpkg.com/@cypress/bower-kendo-ui/-/bower-kendo-ui-0.0.2.tgz#62ea93d7f0653c0b91a7a4e5e9ede9d26d5990ea" integrity sha1-YuqT1/BlPAuRp6Tl6e3p0m1ZkOo= -"@cypress/browserify-preprocessor@2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-2.2.4.tgz#a2ff5a6a06938f7f1e78eb6de0e492641cf8561c" - integrity sha512-kMjkIFe6qka8Tkm9N3BrMB+Nn7WEAHIzEd3gfVoDL17Tr40xyOnKGuMhEkff1scd3RV3bjQxwQ9BQ6kI2nToAQ== - dependencies: - "@babel/core" "7.4.5" - "@babel/plugin-proposal-class-properties" "7.3.0" - "@babel/plugin-proposal-object-rest-spread" "7.3.2" - "@babel/plugin-transform-runtime" "7.2.0" - "@babel/preset-env" "7.4.5" - "@babel/preset-react" "7.0.0" - "@babel/runtime" "7.3.1" - babel-plugin-add-module-exports "1.0.2" - babelify "10.0.0" - bluebird "3.5.3" - browserify "16.2.3" - coffeeify "3.0.1" - coffeescript "1.12.7" - debug "4.1.1" - fs-extra "7.0.1" - lodash.clonedeep "4.5.0" - through2 "^2.0.0" - watchify "3.11.1" - "@cypress/browserify-preprocessor@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-3.0.0.tgz#2d1fa6a96ed7130a1b172c540448a5955cbc1264" @@ -4092,6 +4051,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== +"@types/json-schema@^7.0.4": + version "7.0.5" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" + integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== + "@types/linkify-it@*": version "2.1.0" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806" @@ -4980,6 +4944,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.2: + version "6.12.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" + integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -5154,7 +5128,7 @@ any-observable@^0.3.0: resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== -any-promise@^1.0.0, any-promise@^1.1.0: +any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= @@ -7062,11 +7036,6 @@ bluebird@^2.9.30, bluebird@^2.9.33: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE= -bluebird@~3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.0.6.tgz#f2488f325782f66d174842f481992e2faba56f38" - integrity sha1-8kiPMleC9m0XSEL0gZkuL6ulbzg= - blueimp-md5@^2.3.0: version "2.16.0" resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.16.0.tgz#9018bb805e4ee05512e0e8cbdb9305eeecbdc87c" @@ -8529,6 +8498,14 @@ coffee-lex@^9.1.5: resolved "https://registry.yarnpkg.com/coffee-lex/-/coffee-lex-9.1.5.tgz#6f46f33df539de3c00831d47bbe115991336aa4e" integrity sha512-94lUMjs1vhlV86vnbCCnnIYzR4oszuO4qJzKUuKOLidiksh/UyQFOzPusjmLJt6vy5CNB0d/KtaceqV84zr46g== +coffee-loader@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-1.0.0.tgz#b8cedc8c81eb2a435af59e4b369ece439261fcb4" + integrity sha512-/fjJBA842cpoN2upABQFO45ALS0clTHM8WsAbvDrArn6y4TaZikKgSPyMZxwqAkkz6zTV7MgS4RuxU3wS4XUvw== + dependencies: + loader-utils "^2.0.0" + schema-utils "^2.6.6" + coffee-script@1.12.5: version "1.12.5" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346" @@ -12461,15 +12438,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@7.0.1, fs-extra@^7.0.0, fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@8.1.0, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -12525,6 +12493,15 @@ fs-extra@^6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^7.0.0, fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" @@ -16565,6 +16542,15 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2 emojis-list "^3.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -22252,6 +22238,15 @@ schema-utils@^2.5.0, schema-utils@^2.6.5: ajv "^6.12.0" ajv-keywords "^3.4.1" +schema-utils@^2.6.6: + version "2.7.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== + dependencies: + "@types/json-schema" "^7.0.4" + ajv "^6.12.2" + ajv-keywords "^3.4.1" + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -23479,21 +23474,6 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" -stream-to-array@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/stream-to-array/-/stream-to-array-2.3.0.tgz#bbf6b39f5f43ec30bc71babcb37557acecf34353" - integrity sha1-u/azn19D7DC8cbq8s3VXrOzzQ1M= - dependencies: - any-promise "^1.1.0" - -stream-to-promise@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stream-to-promise/-/stream-to-promise-1.1.1.tgz#838f5df7c92b8c9ba8fb95d7aa3ac312eec7527f" - integrity sha1-g49d98krjJuo+5XXqjrDEu7HUn8= - dependencies: - bluebird "~3.0.6" - stream-to-array "~2.3.0" - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" From 26e6c8730e6d94ef326cd4bec1c8531b851decc3 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 14 Jul 2020 14:04:50 -0400 Subject: [PATCH 02/27] update eslintignore --- .eslintignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index f89d1d0f27ff..086b6069fa73 100644 --- a/.eslintignore +++ b/.eslintignore @@ -26,7 +26,7 @@ packages/server/lib/scaffold/plugins/index.js packages/server/lib/scaffold/support/index.js packages/server/lib/scaffold/support/commands.js packages/server/test/support/fixtures/projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js -packages/server/test/support/fixtures/projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts +packages/server/test/support/fixtures/projects/e2e/cypress/integration/typescript_failing_spec.ts **/.projects **/*.d.ts From a23488164925fd7402377bfdf3fc0dd1fad75b16 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 14 Jul 2020 15:05:36 -0400 Subject: [PATCH 03/27] put back deps needed for e2e test --- packages/server/package.json | 3 ++ yarn.lock | 83 ++++++++++++++---------------------- 2 files changed, 36 insertions(+), 50 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5e5e1d4a53e6..aed4fa442a1b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -119,6 +119,8 @@ "winston": "2.4.4" }, "devDependencies": { + "@babel/core": "7.9.0", + "@babel/preset-env": "7.9.0", "@cypress/debugging-proxy": "2.0.1", "@cypress/json-schemas": "5.34.2", "@cypress/sinon-chai": "1.1.0", @@ -138,6 +140,7 @@ "@types/chrome": "0.0.101", "@types/node": "8.10.55", "awesome-typescript-loader": "5.2.1", + "babel-loader": "8.1.0", "body-parser": "1.19.0", "chai-as-promised": "7.1.1", "chai-subset": "1.6.0", diff --git a/yarn.lock b/yarn.lock index c71140defb6b..ca03e1df4c9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1468,6 +1468,30 @@ resolved "https://registry.yarnpkg.com/@cypress/bower-kendo-ui/-/bower-kendo-ui-0.0.2.tgz#62ea93d7f0653c0b91a7a4e5e9ede9d26d5990ea" integrity sha1-YuqT1/BlPAuRp6Tl6e3p0m1ZkOo= +"@cypress/browserify-preprocessor@2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-2.2.4.tgz#a2ff5a6a06938f7f1e78eb6de0e492641cf8561c" + integrity sha512-kMjkIFe6qka8Tkm9N3BrMB+Nn7WEAHIzEd3gfVoDL17Tr40xyOnKGuMhEkff1scd3RV3bjQxwQ9BQ6kI2nToAQ== + dependencies: + "@babel/core" "7.4.5" + "@babel/plugin-proposal-class-properties" "7.3.0" + "@babel/plugin-proposal-object-rest-spread" "7.3.2" + "@babel/plugin-transform-runtime" "7.2.0" + "@babel/preset-env" "7.4.5" + "@babel/preset-react" "7.0.0" + "@babel/runtime" "7.3.1" + babel-plugin-add-module-exports "1.0.2" + babelify "10.0.0" + bluebird "3.5.3" + browserify "16.2.3" + coffeeify "3.0.1" + coffeescript "1.12.7" + debug "4.1.1" + fs-extra "7.0.1" + lodash.clonedeep "4.5.0" + through2 "^2.0.0" + watchify "3.11.1" + "@cypress/browserify-preprocessor@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-3.0.0.tgz#2d1fa6a96ed7130a1b172c540448a5955cbc1264" @@ -4051,11 +4075,6 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== -"@types/json-schema@^7.0.4": - version "7.0.5" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" - integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== - "@types/linkify-it@*": version "2.1.0" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806" @@ -4944,16 +4963,6 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.12.2: - version "6.12.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706" - integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -8498,14 +8507,6 @@ coffee-lex@^9.1.5: resolved "https://registry.yarnpkg.com/coffee-lex/-/coffee-lex-9.1.5.tgz#6f46f33df539de3c00831d47bbe115991336aa4e" integrity sha512-94lUMjs1vhlV86vnbCCnnIYzR4oszuO4qJzKUuKOLidiksh/UyQFOzPusjmLJt6vy5CNB0d/KtaceqV84zr46g== -coffee-loader@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-1.0.0.tgz#b8cedc8c81eb2a435af59e4b369ece439261fcb4" - integrity sha512-/fjJBA842cpoN2upABQFO45ALS0clTHM8WsAbvDrArn6y4TaZikKgSPyMZxwqAkkz6zTV7MgS4RuxU3wS4XUvw== - dependencies: - loader-utils "^2.0.0" - schema-utils "^2.6.6" - coffee-script@1.12.5: version "1.12.5" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346" @@ -12438,6 +12439,15 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-extra@7.0.1, fs-extra@^7.0.0, fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@8.1.0, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -12493,15 +12503,6 @@ fs-extra@^6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^7.0.0, fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-minipass@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" @@ -16542,15 +16543,6 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2 emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -22238,15 +22230,6 @@ schema-utils@^2.5.0, schema-utils@^2.6.5: ajv "^6.12.0" ajv-keywords "^3.4.1" -schema-utils@^2.6.6: - version "2.7.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" - integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== - dependencies: - "@types/json-schema" "^7.0.4" - ajv "^6.12.2" - ajv-keywords "^3.4.1" - scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" From 3c1e99f9764763bef1c92269a53ae71764b811a8 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Wed, 15 Jul 2020 11:20:49 -0400 Subject: [PATCH 04/27] remove obselete snapshot it was replaced by 1_typescript_support_spec.ts.js --- .../1_typescript_support_spec.js | 226 ------------------ 1 file changed, 226 deletions(-) delete mode 100644 packages/server/__snapshots__/1_typescript_support_spec.js diff --git a/packages/server/__snapshots__/1_typescript_support_spec.js b/packages/server/__snapshots__/1_typescript_support_spec.js deleted file mode 100644 index fe53ebdc7c7f..000000000000 --- a/packages/server/__snapshots__/1_typescript_support_spec.js +++ /dev/null @@ -1,226 +0,0 @@ -exports['e2e typescript spec passes 1'] = ` - -==================================================================================================== - - (Run Starting) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Cypress: 1.2.3 │ - │ Browser: FooBrowser 88 │ - │ Specs: 1 found (browserify_typescript_passing_spec.ts) │ - │ Searched: cypress/integration/browserify_typescript_passing_spec.ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: browserify_typescript_passing_spec.ts (1 of 1) - - - imports work - ✓ foo coffee - ✓ bar babel - ✓ dom jsx - - - 3 passing - - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 3 │ - │ Passing: 3 │ - │ Failing: 0 │ - │ Pending: 0 │ - │ Skipped: 0 │ - │ Screenshots: 0 │ - │ Video: true │ - │ Duration: X seconds │ - │ Spec Ran: browserify_typescript_passing_spec.ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Video) - - - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/browserify_typescript_passing_s (X second) - pec.ts.mp4 - - -==================================================================================================== - - (Run Finished) - - - Spec Tests Passing Failing Pending Skipped - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ browserify_typescript_passing_spec. XX:XX 3 3 - - - │ - │ ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - ✔ All specs passed! XX:XX 3 3 - - - - - -` - -exports['e2e typescript spec fails 1'] = ` - -==================================================================================================== - - (Run Starting) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Cypress: 1.2.3 │ - │ Browser: FooBrowser 88 │ - │ Specs: 1 found (browserify_typescript_failing_spec.ts) │ - │ Searched: cypress/integration/browserify_typescript_failing_spec.ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: browserify_typescript_failing_spec.ts (1 of 1) - -Oops...we found an error preparing this test file: - - /foo/bar/.projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts - -The error was: - -/foo/bar/.projects/e2e/cypress/integration/browserify_typescript_failing_spec.ts:3 -describe('fail', - > ); - ^ -ParseError: Unexpected token - -This occurred while Cypress was compiling and bundling your test code. This is usually caused by: - -- A missing file or dependency -- A syntax error in the file or one of its dependencies - -Fix the error in your code and re-run your tests. - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 0 │ - │ Passing: 0 │ - │ Failing: 1 │ - │ Pending: 0 │ - │ Skipped: 0 │ - │ Screenshots: 0 │ - │ Video: true │ - │ Duration: X seconds │ - │ Spec Ran: browserify_typescript_failing_spec.ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Video) - - - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/browserify_typescript_failing_s (X second) - pec.ts.mp4 - - -==================================================================================================== - - (Run Finished) - - - Spec Tests Passing Failing Pending Skipped - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✖ browserify_typescript_failing_spec. XX:XX - - 1 - - │ - │ ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - ✖ 1 of 1 failed (100%) XX:XX - - 1 - - - - -` - -exports['e2e typescript project passes 1'] = ` - -==================================================================================================== - - (Run Starting) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Cypress: 1.2.3 │ - │ Browser: FooBrowser 88 │ - │ Specs: 2 found (app_spec.ts, math.ts) │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: app_spec.ts (1 of 2) - - - ✓ is true - - 1 passing - - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 1 │ - │ Passing: 1 │ - │ Failing: 0 │ - │ Pending: 0 │ - │ Skipped: 0 │ - │ Screenshots: 0 │ - │ Video: true │ - │ Duration: X seconds │ - │ Spec Ran: app_spec.ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Video) - - - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/app_spec.ts.mp4 (X second) - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: math.ts (2 of 2) - - - 0 passing - - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 0 │ - │ Passing: 0 │ - │ Failing: 0 │ - │ Pending: 0 │ - │ Skipped: 0 │ - │ Screenshots: 0 │ - │ Video: true │ - │ Duration: X seconds │ - │ Spec Ran: math.ts │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Video) - - - Started processing: Compressing to 32 CRF - - Finished processing: /XXX/XXX/XXX/cypress/videos/math.ts.mp4 (X second) - - -==================================================================================================== - - (Run Finished) - - - Spec Tests Passing Failing Pending Skipped - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ app_spec.ts XX:XX 1 1 - - - │ - ├────────────────────────────────────────────────────────────────────────────────────────────────┤ - │ ✔ math.ts XX:XX - - - - - │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - ✔ All specs passed! XX:XX 1 1 - - - - - -` From a2b0356b58b48842a30e82fa90b10a70071c7ffb Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Wed, 15 Jul 2020 11:21:18 -0400 Subject: [PATCH 05/27] switch from browserify to webpack preprocessor --- packages/server/lib/plugins/preprocessor.js | 13 +- packages/server/package.json | 2 +- .../test/integration/http_requests_spec.js | 11 +- .../test/unit/plugins/preprocessor_spec.js | 36 +-- yarn.lock | 265 +++++++++++++----- 5 files changed, 225 insertions(+), 102 deletions(-) diff --git a/packages/server/lib/plugins/preprocessor.js b/packages/server/lib/plugins/preprocessor.js index 1007830688e5..5ea1ba77cca3 100644 --- a/packages/server/lib/plugins/preprocessor.js +++ b/packages/server/lib/plugins/preprocessor.js @@ -35,11 +35,12 @@ const baseEmitter = new EE() let fileObjects = {} let fileProcessors = {} -const createBrowserifyPreprocessor = function (options) { - debug('creating browserify preprocessor with options %o', options) - const browserify = require('@cypress/browserify-preprocessor') +const createPreprocessor = function (options) { + debug('creating webpack preprocessor with options %o', options) - return browserify(options) + const webpackPreprocessor = require('@cypress/webpack-batteries-included-preprocessor') + + return webpackPreprocessor(options) } const setDefaultPreprocessor = function (config) { @@ -51,7 +52,7 @@ const setDefaultPreprocessor = function (config) { typescript: tsPath, } - return plugins.register('file:preprocessor', API.createBrowserifyPreprocessor(options)) + return plugins.register('file:preprocessor', API.createPreprocessor(options)) } plugins.registerHandler((ipc) => { @@ -76,7 +77,7 @@ const API = { setDefaultPreprocessor, - createBrowserifyPreprocessor, + createPreprocessor, emitter: baseEmitter, diff --git a/packages/server/package.json b/packages/server/package.json index 87a0fb373989..db46b636df18 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -21,13 +21,13 @@ }, "dependencies": { "@benmalka/foxdriver": "0.4.0", - "@cypress/browserify-preprocessor": "2.2.4", "@cypress/commit-info": "2.2.0", "@cypress/get-windows-proxy": "1.6.1", "@cypress/icons": "0.7.0", "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", + "@cypress/webpack-batteries-included-preprocessor": "1.0.2", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/packages/server/test/integration/http_requests_spec.js b/packages/server/test/integration/http_requests_spec.js index 425137b62802..fcf07f89cbfb 100644 --- a/packages/server/test/integration/http_requests_spec.js +++ b/packages/server/test/integration/http_requests_spec.js @@ -586,8 +586,7 @@ describe('Routes', () => { .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.include('Cypress.action("spec:script:error", {') - - expect(res.body).to.include('Cannot find module') + expect(res.body).to.include('Module not found') }) }) }) @@ -596,8 +595,6 @@ describe('Routes', () => { beforeEach(function () { Fixtures.scaffold('ids') - // remove cached options - delete require.cache[require.resolve('@cypress/browserify-preprocessor')] sinon.stub(resolve, 'typescript').callsFake(() => { return null }) @@ -630,8 +627,7 @@ describe('Routes', () => { .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.include('Cypress.action("spec:script:error", {') - - expect(res.body).to.include('Cannot find module') + expect(res.body).to.include('Module not found') }) }) }) @@ -650,8 +646,7 @@ describe('Routes', () => { .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.include('Cypress.action("spec:script:error", {') - - expect(res.body).to.include('ParseError') + expect(res.body).to.include('Unexpected token') }) }) }) diff --git a/packages/server/test/unit/plugins/preprocessor_spec.js b/packages/server/test/unit/plugins/preprocessor_spec.js index fd1b923c8d47..cb40b5487d47 100644 --- a/packages/server/test/unit/plugins/preprocessor_spec.js +++ b/packages/server/test/unit/plugins/preprocessor_spec.js @@ -89,28 +89,18 @@ describe('lib/plugins/preprocessor', () => { plugins._reset() sinon.stub(plugins, 'register') sinon.stub(plugins, 'execute').returns(() => {}) - const browserifyFn = function () {} - const browserify = sinon.stub().returns(browserifyFn) - - // mock default options - browserify.defaultOptions = { - browserifyOptions: { - extensions: [], - transform: [ - [], - ['babelify', { - presets: [], - extensions: [], - }], - ], - }, - } - mockery.registerMock('@cypress/browserify-preprocessor', browserify) + const preprocessorFn = function () {} + const preprocessor = sinon.stub().returns(preprocessorFn) + + preprocessor.defaultOptions = {} + + mockery.registerMock('@cypress/webpack-batteries-included-preprocessor', preprocessor) + preprocessor.getFile(this.filePath, this.config) - expect(plugins.register).to.be.calledWith('file:preprocessor', browserifyFn) - expect(browserify).to.be.called + expect(plugins.register).to.be.calledWith('file:preprocessor', preprocessorFn) + expect(preprocessor).to.be.called }) }) @@ -224,7 +214,7 @@ describe('lib/plugins/preprocessor', () => { const mockPlugin = {} sinon.stub(plugins, 'register') - sinon.stub(preprocessor, 'createBrowserifyPreprocessor').returns(mockPlugin) + sinon.stub(preprocessor, 'createPreprocessor').returns(mockPlugin) preprocessor.setDefaultPreprocessor(this.config) @@ -236,14 +226,14 @@ describe('lib/plugins/preprocessor', () => { basedir: monorepoRoot, }) - expect(preprocessor.createBrowserifyPreprocessor).to.be.calledWith({ typescript }) + expect(preprocessor.createPreprocessor).to.be.calledWith({ typescript }) }) it('does not have typescript if not found', function () { const mockPlugin = {} sinon.stub(plugins, 'register') - sinon.stub(preprocessor, 'createBrowserifyPreprocessor').returns(mockPlugin) + sinon.stub(preprocessor, 'createPreprocessor').returns(mockPlugin) sinon.stub(resolve, 'sync') .withArgs('typescript', { basedir: this.todosPath }) .throws(new Error('TypeScript not found')) @@ -252,7 +242,7 @@ describe('lib/plugins/preprocessor', () => { expect(plugins.register).to.be.calledWithExactly('file:preprocessor', mockPlugin) - expect(preprocessor.createBrowserifyPreprocessor).to.be.calledWith({ typescript: null }) + expect(preprocessor.createPreprocessor).to.be.calledWith({ typescript: null }) }) }) }) diff --git a/yarn.lock b/yarn.lock index 143485b26851..cfbc96c7490a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -110,6 +110,28 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/core@^7.10.4": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330" + integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.10.5" + "@babel/helper-module-transforms" "^7.10.5" + "@babel/helpers" "^7.10.4" + "@babel/parser" "^7.10.5" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.10.5" + "@babel/types" "^7.10.5" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + "@babel/generator@^7.10.4", "@babel/generator@^7.4.0", "@babel/generator@^7.4.4", "@babel/generator@^7.9.0", "@babel/generator@^7.9.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.4.tgz#e49eeed9fe114b62fa5b181856a43a5e32f5f243" @@ -120,6 +142,15 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/generator@^7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz#1b903554bc8c583ee8d25f1e8969732e6b829a69" + integrity sha512-3vXxr3FEW7E7lJZiWQ3bM4+v/Vyr9C+hpolQ8BGFr9Y8Ri2tFLWTixmwKBafDujO1WVah4fhZBeU1bieKdghig== + dependencies: + "@babel/types" "^7.10.5" + jsesc "^2.5.1" + source-map "^0.5.0" + "@babel/helper-annotate-as-pure@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3" @@ -251,6 +282,19 @@ "@babel/types" "^7.10.4" lodash "^4.17.13" +"@babel/helper-module-transforms@^7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.5.tgz#120c271c0b3353673fcdfd8c053db3c544a260d6" + integrity sha512-4P+CWMJ6/j1W915ITJaUkadLObmCRRSC234uctJfn/vHrsLNxsR8dwlcXv9ZhJWzl77awf+mWXSZEKt5t0OnlA== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-replace-supers" "^7.10.4" + "@babel/helper-simple-access" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.5" + lodash "^4.17.19" + "@babel/helper-optimise-call-expression@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673" @@ -344,6 +388,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.4.tgz#9eedf27e1998d87739fb5028a5120557c06a1a64" integrity sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA== +"@babel/parser@^7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz#e7c6bf5a7deff957cec9f04b551e2762909d826b" + integrity sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ== + "@babel/plugin-proposal-async-generator-functions@^7.10.4", "@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.4.tgz#4b65abb3d9bacc6c657aaa413e56696f9f170fc6" @@ -353,6 +402,14 @@ "@babel/helper-remap-async-to-generator" "^7.10.4" "@babel/plugin-syntax-async-generators" "^7.8.0" +"@babel/plugin-proposal-class-properties@7.10.4", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807" + integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-proposal-class-properties@7.3.0": version "7.3.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd" @@ -369,14 +426,6 @@ "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807" - integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-proposal-decorators@7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e" @@ -402,7 +451,7 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": +"@babel/plugin-proposal-nullish-coalescing-operator@7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a" integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw== @@ -418,6 +467,15 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" +"@babel/plugin-proposal-object-rest-spread@7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" + integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread@7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1" @@ -434,15 +492,6 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" -"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" - integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.10.4" - "@babel/plugin-proposal-optional-catch-binding@^7.10.4", "@babel/plugin-proposal-optional-catch-binding@^7.2.0", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd" @@ -711,7 +760,7 @@ "@babel/helper-simple-access" "^7.10.1" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.10.4", "@babel/plugin-transform-modules-commonjs@^7.4.4", "@babel/plugin-transform-modules-commonjs@^7.9.0": +"@babel/plugin-transform-modules-commonjs@7.10.4", "@babel/plugin-transform-modules-commonjs@^7.10.4", "@babel/plugin-transform-modules-commonjs@^7.4.4", "@babel/plugin-transform-modules-commonjs@^7.9.0": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0" integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w== @@ -776,14 +825,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.8.3": +"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.10.4", "@babel/plugin-transform-react-display-name@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz#b5795f4e3e3140419c3611b7a2a3832b9aef328d" integrity sha512-Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-jsx-development@^7.9.0": +"@babel/plugin-transform-react-jsx-development@^7.10.4", "@babel/plugin-transform-react-jsx-development@^7.9.0": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz#6ec90f244394604623880e15ebc3c34c356258ba" integrity sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ== @@ -792,7 +841,7 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.10.4" -"@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.9.0": +"@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.10.4", "@babel/plugin-transform-react-jsx-self@^7.9.0": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz#cd301a5fed8988c182ed0b9d55e9bd6db0bd9369" integrity sha512-yOvxY2pDiVJi0axdTWHSMi5T0DILN+H+SaeJeACHKjQLezEzhLx9nEF9xgpBLPtkZsks9cnb5P9iBEi21En3gg== @@ -808,7 +857,15 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.10.4" -"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.9.4": +"@babel/plugin-transform-react-jsx-source@^7.10.4": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz#34f1779117520a779c054f2cdd9680435b9222b4" + integrity sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-jsx" "^7.10.4" + +"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.10.4", "@babel/plugin-transform-react-jsx@^7.9.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz#673c9f913948764a4421683b2bef2936968fddf2" integrity sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A== @@ -818,6 +875,14 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-jsx" "^7.10.4" +"@babel/plugin-transform-react-pure-annotations@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz#3eefbb73db94afbc075f097523e445354a1c6501" + integrity sha512-+njZkqcOuS8RaPakrnR9KvxjoG1ASJWpoIv/doyWngId88JoFlPlISenGXjrVacZUIALGUr6eodRs1vmPnF23A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-regenerator@^7.10.4", "@babel/plugin-transform-regenerator@^7.4.5", "@babel/plugin-transform-regenerator@^7.8.7": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63" @@ -832,6 +897,16 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-transform-runtime@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz#594fb53453ea1b6f0779cceb48ce0718a447feb7" + integrity sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-runtime@7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea" @@ -1104,7 +1179,7 @@ levenary "^1.1.1" semver "^5.5.0" -"@babel/preset-env@^7.1.6": +"@babel/preset-env@^7.1.6", "@babel/preset-env@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f" integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw== @@ -1204,6 +1279,19 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" +"@babel/preset-react@7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf" + integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-react-display-name" "^7.10.4" + "@babel/plugin-transform-react-jsx" "^7.10.4" + "@babel/plugin-transform-react-jsx-development" "^7.10.4" + "@babel/plugin-transform-react-jsx-self" "^7.10.4" + "@babel/plugin-transform-react-jsx-source" "^7.10.4" + "@babel/plugin-transform-react-pure-annotations" "^7.10.4" + "@babel/preset-react@7.9.4": version "7.9.4" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d" @@ -1299,6 +1387,21 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/traverse@^7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz#77ce464f5b258be265af618d8fddf0536f20b564" + integrity sha512-yc/fyv2gUjPqzTz0WHeRJH2pv7jA9kA7mBX2tXl/x5iOE81uaVPuGPtaYk7wmkx4b67mQ7NqI8rmT2pF47KYKQ== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.10.5" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.10.4" + "@babel/parser" "^7.10.5" + "@babel/types" "^7.10.5" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.7.0", "@babel/types@^7.9.0", "@babel/types@^7.9.5": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.4.tgz#369517188352e18219981efd156bfdb199fff1ee" @@ -1308,6 +1411,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz#d88ae7e2fde86bfbfe851d4d81afa70a997b5d15" + integrity sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + lodash "^4.17.19" + to-fast-properties "^2.0.0" + "@bahmutov/all-paths@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@bahmutov/all-paths/-/all-paths-1.0.2.tgz#9ae0dcdf9022dd6e5e14d7fda3479e6a330d035b" @@ -1393,30 +1505,6 @@ resolved "https://registry.yarnpkg.com/@cypress/bower-kendo-ui/-/bower-kendo-ui-0.0.2.tgz#62ea93d7f0653c0b91a7a4e5e9ede9d26d5990ea" integrity sha1-YuqT1/BlPAuRp6Tl6e3p0m1ZkOo= -"@cypress/browserify-preprocessor@2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-2.2.4.tgz#a2ff5a6a06938f7f1e78eb6de0e492641cf8561c" - integrity sha512-kMjkIFe6qka8Tkm9N3BrMB+Nn7WEAHIzEd3gfVoDL17Tr40xyOnKGuMhEkff1scd3RV3bjQxwQ9BQ6kI2nToAQ== - dependencies: - "@babel/core" "7.4.5" - "@babel/plugin-proposal-class-properties" "7.3.0" - "@babel/plugin-proposal-object-rest-spread" "7.3.2" - "@babel/plugin-transform-runtime" "7.2.0" - "@babel/preset-env" "7.4.5" - "@babel/preset-react" "7.0.0" - "@babel/runtime" "7.3.1" - babel-plugin-add-module-exports "1.0.2" - babelify "10.0.0" - bluebird "3.5.3" - browserify "16.2.3" - coffeeify "3.0.1" - coffeescript "1.12.7" - debug "4.1.1" - fs-extra "7.0.1" - lodash.clonedeep "4.5.0" - through2 "^2.0.0" - watchify "3.11.1" - "@cypress/browserify-preprocessor@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-3.0.0.tgz#2d1fa6a96ed7130a1b172c540448a5955cbc1264" @@ -1691,7 +1779,28 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-preprocessor@5.4.1": +"@cypress/webpack-batteries-included-preprocessor@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.0.2.tgz#3585f3c07478ad461cd19de4cedcf945920e59cd" + integrity sha512-PsRUbhNm4mFiyoeunu6OXBA0+5nAqWH4cQvU2QbKPlgcCQzB0fOQSkb+9thlgYdEhqNnkPvoqd3pPYDt8Y2paA== + dependencies: + "@babel/core" "^7.10.4" + "@babel/plugin-proposal-class-properties" "7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator" "7.10.4" + "@babel/plugin-proposal-object-rest-spread" "7.10.4" + "@babel/plugin-transform-modules-commonjs" "7.10.4" + "@babel/plugin-transform-runtime" "7.10.4" + "@babel/preset-env" "^7.10.4" + "@babel/preset-react" "7.10.4" + "@cypress/webpack-preprocessor" "^5.4.1" + babel-loader "^8.1.0" + coffee-loader "1.0.0" + coffeescript "2.5.1" + ts-loader "8.0.0" + typescript "3.9.6" + webpack "^4.43.0" + +"@cypress/webpack-preprocessor@5.4.1", "@cypress/webpack-preprocessor@^5.4.1": version "5.4.1" resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.1.tgz#eb58f6cd02932a95653c1a674cfd769da2409806" integrity sha512-1E2BdVVXQ4wDQ7f3mXCvS9xmfTVwEoT3oqKhjAr1iNlTJpBq10Z0VNBZd3VZ3nmCTFwTuUvs735QGnRE1gQ1BA== @@ -6089,7 +6198,7 @@ babel-jest@^24.9.0: chalk "^2.4.2" slash "^2.0.0" -babel-loader@8.1.0: +babel-loader@8.1.0, babel-loader@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== @@ -8485,6 +8594,14 @@ coffee-lex@^9.1.5: resolved "https://registry.yarnpkg.com/coffee-lex/-/coffee-lex-9.1.5.tgz#6f46f33df539de3c00831d47bbe115991336aa4e" integrity sha512-94lUMjs1vhlV86vnbCCnnIYzR4oszuO4qJzKUuKOLidiksh/UyQFOzPusjmLJt6vy5CNB0d/KtaceqV84zr46g== +coffee-loader@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-1.0.0.tgz#b8cedc8c81eb2a435af59e4b369ece439261fcb4" + integrity sha512-/fjJBA842cpoN2upABQFO45ALS0clTHM8WsAbvDrArn6y4TaZikKgSPyMZxwqAkkz6zTV7MgS4RuxU3wS4XUvw== + dependencies: + loader-utils "^2.0.0" + schema-utils "^2.6.6" + coffee-script@1.12.5: version "1.12.5" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346" @@ -8513,7 +8630,7 @@ coffeescript@1.12.7: resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27" integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA== -coffeescript@^2.1.2: +coffeescript@2.5.1, coffeescript@^2.1.2: version "2.5.1" resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.5.1.tgz#b2442a1f2c806139669534a54adc35010559d16a" integrity sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ== @@ -12410,15 +12527,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@7.0.1, fs-extra@^7.0.0, fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@8.1.0, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -12474,6 +12582,15 @@ fs-extra@^6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^7.0.0, fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" @@ -16574,6 +16691,15 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2 emojis-list "^3.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -16885,7 +17011,7 @@ lodash@4.17.15: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -lodash@4.17.19, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.10, lodash@~4.17.2: +lodash@4.17.19, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.10, lodash@~4.17.2: version "4.17.19" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== @@ -22242,7 +22368,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.5.0, schema-utils@^2.6.5: +schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6: version "2.7.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== @@ -24485,6 +24611,17 @@ ts-loader@7.0.4: micromatch "^4.0.0" semver "^6.0.0" +ts-loader@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.0.tgz#faf4b1617dcc4a24c2925d92c5b19e9c6621064d" + integrity sha512-giEW167rtK1V6eX/DnXEtOgcawwoIp6hqznqYNNSmraUZOq36zMhwBq12JMlYhxf50BC58bscsTSKKtE42zAuw== + dependencies: + chalk "^2.3.0" + enhanced-resolve "^4.0.0" + loader-utils "^1.0.2" + micromatch "^4.0.0" + semver "^6.0.0" + ts-node@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81" @@ -24678,7 +24815,7 @@ typescript@3.7.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19" integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw== -typescript@^3.0.3, typescript@^3.8.3: +typescript@3.9.6, typescript@^3.0.3, typescript@^3.8.3: version "3.9.6" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a" integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw== @@ -25633,7 +25770,7 @@ webpack@4.41.6: watchpack "^1.6.0" webpack-sources "^1.4.1" -webpack@4.43.0: +webpack@4.43.0, webpack@^4.43.0: version "4.43.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g== From 00f58bf4361d63da8d1067f1b5254e8562fecb6d Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Wed, 15 Jul 2020 11:44:58 -0400 Subject: [PATCH 06/27] cmon github From 99e32b8525af3d855a0aa6c1307f50f0ad83fb9a Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Wed, 15 Jul 2020 16:21:37 -0400 Subject: [PATCH 07/27] fix/update tests --- packages/server/__snapshots__/1_es_modules_spec.js | 8 +++++++- packages/server/package.json | 2 +- .../server/test/unit/plugins/preprocessor_spec.js | 12 ++++++------ yarn.lock | 14 +++++++------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/server/__snapshots__/1_es_modules_spec.js b/packages/server/__snapshots__/1_es_modules_spec.js index c42491f8aa0d..fec257eb4ffe 100644 --- a/packages/server/__snapshots__/1_es_modules_spec.js +++ b/packages/server/__snapshots__/1_es_modules_spec.js @@ -86,11 +86,17 @@ Oops...we found an error preparing this test file: The error was: +Error: Webpack Compilation Error +./lib/fail.js +Module build failed (from /Users/chrisbreiding/Dev/cypress/cypress-webpack-batteries-included-preprocessor/node_modules/babel-loader/lib/index.js): SyntaxError: /foo/bar/.projects/e2e/lib/fail.js: Unexpected token (2:0) 1 | export default { > 2 | - | ^ while parsing file: /foo/bar/.projects/e2e/lib/fail.js + | ^ + + @ ./cypress/integration/es_module_import_failing_spec.js 3:0-25 + @ multi ./cypress/integration/es_module_import_failing_spec.js This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/packages/server/package.json b/packages/server/package.json index db46b636df18..b042488e2805 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.0.2", + "@cypress/webpack-batteries-included-preprocessor": "1.0.4", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/packages/server/test/unit/plugins/preprocessor_spec.js b/packages/server/test/unit/plugins/preprocessor_spec.js index cb40b5487d47..6f2da7c9b47d 100644 --- a/packages/server/test/unit/plugins/preprocessor_spec.js +++ b/packages/server/test/unit/plugins/preprocessor_spec.js @@ -90,17 +90,17 @@ describe('lib/plugins/preprocessor', () => { sinon.stub(plugins, 'register') sinon.stub(plugins, 'execute').returns(() => {}) - const preprocessorFn = function () {} - const preprocessor = sinon.stub().returns(preprocessorFn) + const userPreprocessorFn = function () {} + const userPreprocessor = sinon.stub().returns(userPreprocessorFn) - preprocessor.defaultOptions = {} + userPreprocessor.defaultOptions = {} - mockery.registerMock('@cypress/webpack-batteries-included-preprocessor', preprocessor) + mockery.registerMock('@cypress/webpack-batteries-included-preprocessor', userPreprocessor) preprocessor.getFile(this.filePath, this.config) - expect(plugins.register).to.be.calledWith('file:preprocessor', preprocessorFn) - expect(preprocessor).to.be.called + expect(plugins.register).to.be.calledWith('file:preprocessor', userPreprocessorFn) + expect(userPreprocessor).to.be.called }) }) diff --git a/yarn.lock b/yarn.lock index cfbc96c7490a..caa100e99d65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -451,7 +451,7 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.0" -"@babel/plugin-proposal-nullish-coalescing-operator@7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": +"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a" integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw== @@ -1356,7 +1356,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.10.2": +"@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5": version "7.10.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c" integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg== @@ -1779,19 +1779,19 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.0.2.tgz#3585f3c07478ad461cd19de4cedcf945920e59cd" - integrity sha512-PsRUbhNm4mFiyoeunu6OXBA0+5nAqWH4cQvU2QbKPlgcCQzB0fOQSkb+9thlgYdEhqNnkPvoqd3pPYDt8Y2paA== +"@cypress/webpack-batteries-included-preprocessor@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.0.4.tgz#c6263548f2fa4c8dfc321c6abcbd95f921c1f2a3" + integrity sha512-FI+/CAh++3MGWEB/UKjZJwd67C128kiybIxfHuT660WTOoSbjS5brigHAU+GO9xplNS59XwiZZOZZoz5NTfxaw== dependencies: "@babel/core" "^7.10.4" "@babel/plugin-proposal-class-properties" "7.10.4" - "@babel/plugin-proposal-nullish-coalescing-operator" "7.10.4" "@babel/plugin-proposal-object-rest-spread" "7.10.4" "@babel/plugin-transform-modules-commonjs" "7.10.4" "@babel/plugin-transform-runtime" "7.10.4" "@babel/preset-env" "^7.10.4" "@babel/preset-react" "7.10.4" + "@babel/runtime" "^7.10.5" "@cypress/webpack-preprocessor" "^5.4.1" babel-loader "^8.1.0" coffee-loader "1.0.0" From 5475b2db8575552dc6adf50832c513042da45e4d Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Thu, 16 Jul 2020 14:29:29 -0400 Subject: [PATCH 08/27] bump preprocessor and update snapshots --- .../1_typescript_support_spec.ts.js | 27 +++++- .../__snapshots__/5_spec_isolation_spec.js | 46 +++++----- .../server/__snapshots__/7_record_spec.js | 92 ++++++++++++++----- packages/server/package.json | 2 +- yarn.lock | 60 +++++------- 5 files changed, 142 insertions(+), 85 deletions(-) diff --git a/packages/server/__snapshots__/1_typescript_support_spec.ts.js b/packages/server/__snapshots__/1_typescript_support_spec.ts.js index 2847eaacf282..1b4a35a885ff 100644 --- a/packages/server/__snapshots__/1_typescript_support_spec.ts.js +++ b/packages/server/__snapshots__/1_typescript_support_spec.ts.js @@ -86,10 +86,29 @@ Oops...we found an error preparing this test file: The error was: -/foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts:3 -describe('fail', - > ); - ^ -ParseError: Unexpected token +Error: Webpack Compilation Error +./cypress/integration/typescript_failing_spec.tsXX:XX +Module parse failed: Unexpected token (4:19) +File was processed with these loaders: + * ../../../../../cypress-webpack-batteries-included-preprocessor/node_modules/ts-loader/index.js +You may need an additional loader to handle the result of these loaders. +| // The code below is ignored by eslint +| // because it tests failing spec. +> describe('fail', - > ); +| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXNjcmlwdF9mYWlsaW5nX3NwZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlc2NyaXB0X2ZhaWxpbmdfc3BlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsc0NBQXNDO0FBQ3RDLGlDQUFpQztBQUNqQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRSxBQUFELENBQUUsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbIi8vIFRoZSBjb2RlIGJlbG93IGlzIGlnbm9yZWQgYnkgZXNsaW50XG4vLyBiZWNhdXNlIGl0IHRlc3RzIGZhaWxpbmcgc3BlYy5cbmRlc2NyaWJlKCdmYWlsJywgLT4gKVxuIl19 + @ multi ./cypress/integration/typescript_failing_spec.ts main[0] + +/foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts +./cypress/integration/typescript_failing_spec.ts +[tsl] ERROR in /foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts(3,19) + TS1109: Expression expected. + @ multi ./cypress/integration/typescript_failing_spec.ts main[0] + +/foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts +./cypress/integration/typescript_failing_spec.ts +[tsl] ERROR in /foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts(3,21) + TS1109: Expression expected. + @ multi ./cypress/integration/typescript_failing_spec.ts main[0] This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/packages/server/__snapshots__/5_spec_isolation_spec.js b/packages/server/__snapshots__/5_spec_isolation_spec.js index a756c1dbb073..93dd31c25ea3 100644 --- a/packages/server/__snapshots__/5_spec_isolation_spec.js +++ b/packages/server/__snapshots__/5_spec_isolation_spec.js @@ -39,7 +39,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before all\" hook" ], - "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720,\n },\n })\n .then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" + "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720\n }\n }).then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" }, { "hookId": "h2", @@ -47,7 +47,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before each\" hook" ], - "body": "function () {\n throw new Error(\"fail1\");\n }" + "body": "function() {\n throw new Error(\"fail1\");\n }" }, { "hookId": "h3", @@ -55,7 +55,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"after each\" hook" ], - "body": "function () {\n throw new Error(\"fail2\");\n }" + "body": "function() {\n throw new Error(\"fail2\");\n }" }, { "hookId": "h4", @@ -63,7 +63,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"after all\" hook" ], - "body": "function () {\n throw new Error(\"fail3\");\n }" + "body": "function() {\n throw new Error(\"fail3\");\n }" } ], "tests": [ @@ -75,7 +75,7 @@ exports['e2e spec isolation fails'] = { "never gets here" ], "state": "failed", - "body": "function () { }", + "body": "function() {}", "stack": "Error: fail1\n\nBecause this error occurred during a `before each` hook we are skipping the remaining tests in the current suite: `beforeEach hooks`\n [stack trace lines]", "error": "fail1\n\nBecause this error occurred during a `before each` hook we are skipping the remaining tests in the current suite: `beforeEach hooks`", "timings": { @@ -125,7 +125,7 @@ exports['e2e spec isolation fails'] = { "runs this" ], "state": "failed", - "body": "function () { }", + "body": "function() {}", "stack": "Error: fail2\n\nBecause this error occurred during a `after each` hook we are skipping the remaining tests in the current suite: `afterEach hooks`\n [stack trace lines]", "error": "fail2\n\nBecause this error occurred during a `after each` hook we are skipping the remaining tests in the current suite: `afterEach hooks`", "timings": { @@ -155,7 +155,7 @@ exports['e2e spec isolation fails'] = { "does not run this" ], "state": "skipped", - "body": "function () { }", + "body": "function() {}", "stack": null, "error": null, "timings": null, @@ -172,7 +172,7 @@ exports['e2e spec isolation fails'] = { "runs this" ], "state": "passed", - "body": "function () { }", + "body": "function() {}", "stack": null, "error": null, "timings": { @@ -195,7 +195,7 @@ exports['e2e spec isolation fails'] = { "fails on this" ], "state": "failed", - "body": "function () { }", + "body": "function() {}", "stack": "Error: fail3\n\nBecause this error occurred during a `after all` hook we are skipping the remaining tests in the current suite: `after hooks`\n [stack trace lines]", "error": "fail3\n\nBecause this error occurred during a `after all` hook we are skipping the remaining tests in the current suite: `after hooks`", "timings": { @@ -287,7 +287,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before all\" hook" ], - "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720,\n },\n })\n .then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" + "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720\n }\n }).then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" } ], "tests": [ @@ -298,7 +298,7 @@ exports['e2e spec isolation fails'] = { "fails1" ], "state": "failed", - "body": "function () {\n return cy.wrap(true, {\n timeout: 100\n }).should(\"be.false\");\n }", + "body": "function() {\n return cy.wrap(true, {\n timeout: 100\n }).should(\"be.false\");\n }", "stack": "AssertionError: Timed out retrying: expected true to be false\n [stack trace lines]", "error": "Timed out retrying: expected true to be false", "timings": { @@ -327,7 +327,7 @@ exports['e2e spec isolation fails'] = { "fails2" ], "state": "failed", - "body": "function () {\n throw new Error(\"fails2\");\n }", + "body": "function() {\n throw new Error(\"fails2\");\n }", "stack": "Error: fails2\n [stack trace lines]", "error": "fails2", "timings": { @@ -403,7 +403,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before all\" hook" ], - "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720,\n },\n })\n .then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" + "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720\n }\n }).then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" }, { "hookId": "h2", @@ -411,7 +411,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before all\" hook" ], - "body": "function () {\n return cy.wait(100);\n }" + "body": "function() {\n return cy.wait(100);\n }" }, { "hookId": "h3", @@ -419,7 +419,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before each\" hook" ], - "body": "function () {\n return cy.wait(200);\n }" + "body": "function() {\n return cy.wait(200);\n }" }, { "hookId": "h5", @@ -427,7 +427,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"after each\" hook" ], - "body": "function () {\n return cy.wait(200);\n }" + "body": "function() {\n return cy.wait(200);\n }" }, { "hookId": "h4", @@ -435,7 +435,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"after all\" hook" ], - "body": "function () {\n return cy.wait(100);\n }" + "body": "function() {\n return cy.wait(100);\n }" } ], "tests": [ @@ -446,7 +446,7 @@ exports['e2e spec isolation fails'] = { "t1" ], "state": "passed", - "body": "function () {\n return cy.wrap(\"t1\").should(\"eq\", \"t1\");\n }", + "body": "function() {\n return cy.wrap(\"t1\").should(\"eq\", \"t1\");\n }", "stack": null, "error": null, "timings": { @@ -494,7 +494,7 @@ exports['e2e spec isolation fails'] = { "t2" ], "state": "passed", - "body": "function () {\n return cy.wrap(\"t2\").should(\"eq\", \"t2\");\n }", + "body": "function() {\n return cy.wrap(\"t2\").should(\"eq\", \"t2\");\n }", "stack": null, "error": null, "timings": { @@ -530,7 +530,7 @@ exports['e2e spec isolation fails'] = { "t3" ], "state": "passed", - "body": "function () {\n return cy.wrap(\"t3\").should(\"eq\", \"t3\");\n }", + "body": "function() {\n return cy.wrap(\"t3\").should(\"eq\", \"t3\");\n }", "stack": null, "error": null, "timings": { @@ -608,7 +608,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before all\" hook" ], - "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720,\n },\n })\n .then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" + "body": "function () {\n if (Cypress.browser.family === 'chromium' && Cypress.browser.name !== 'electron') {\n return Cypress.automation('remote:debugger:protocol', {\n command: 'Emulation.setDeviceMetricsOverride',\n params: {\n width: 1280,\n height: 720,\n deviceScaleFactor: 1,\n mobile: false,\n screenWidth: 1280,\n screenHeight: 720\n }\n }).then(function () {\n // can't tell expect() not to log, so manually throwing here\n if (window.devicePixelRatio !== 1) {\n throw new Error('Setting devicePixelRatio to 1 failed');\n }\n });\n }\n}" }, { "hookId": "h2", @@ -616,7 +616,7 @@ exports['e2e spec isolation fails'] = { "title": [ "\"before each\" hook" ], - "body": "function () {\n return cy.wait(1000);\n }" + "body": "function() {\n return cy.wait(1000);\n }" } ], "tests": [ @@ -627,7 +627,7 @@ exports['e2e spec isolation fails'] = { "passes" ], "state": "passed", - "body": "function () {\n return cy.wrap(true).should(\"be.true\");\n }", + "body": "function() {\n return cy.wrap(true).should(\"be.true\");\n }", "stack": null, "error": null, "timings": { diff --git a/packages/server/__snapshots__/7_record_spec.js b/packages/server/__snapshots__/7_record_spec.js index 1421c521401b..7d0971262c18 100644 --- a/packages/server/__snapshots__/7_record_spec.js +++ b/packages/server/__snapshots__/7_record_spec.js @@ -26,7 +26,41 @@ Oops...we found an error preparing this test file: The error was: -Error: Cannot find module '../it/does/not/exist' from '/foo/bar/.projects/e2e/cypress/integration' +Error: Webpack Compilation Error +./cypress/integration/record_error_spec.coffee +Module not found: Error: Can't resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' +resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' + using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/integration) + Field 'browser' doesn't contain a valid alias configuration + using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/it/does/not/exist) + no extension + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist + .js + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.js doesn't exist + .jsx + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist + .ts + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.ts doesn't exist + .tsx + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx doesn't exist + .coffee + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist + as directory + /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist +[/foo/bar/.projects/e2e/cypress/it/does/not/exist] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee] + @ ./cypress/integration/record_error_spec.coffee 1:0-31 + @ multi ./cypress/integration/record_error_spec.coffee This occurred while Cypress was compiling and bundling your test code. This is usually caused by: @@ -760,26 +794,6 @@ exports['e2e record api interaction errors uploading assets warns but proceeds 1 ` -exports['e2e record misconfiguration errors and exits when no browser found 1'] = ` -Can't run because you've entered an invalid browser name. - -Browser: 'browserDoesNotExist' was not found on your system or is not supported by Cypress. - -Cypress supports the following browsers: -- chrome -- chromium -- edge -- electron -- firefox (Cypress support in beta) - -You can also use a custom browser: https://on.cypress.io/customize-browsers - -Available browsers found on your system are: -- browser1 -- browser2 -- browser3 -` - exports['e2e record misconfiguration errors and exits when no specs found 1'] = ` Can't run because no spec files were found. @@ -962,7 +976,41 @@ Oops...we found an error preparing this test file: The error was: -Error: Cannot find module '../it/does/not/exist' from '/foo/bar/.projects/e2e/cypress/integration' +Error: Webpack Compilation Error +./cypress/integration/record_error_spec.coffee +Module not found: Error: Can't resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' +resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' + using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/integration) + Field 'browser' doesn't contain a valid alias configuration + using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/it/does/not/exist) + no extension + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist + .js + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.js doesn't exist + .jsx + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist + .ts + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.ts doesn't exist + .tsx + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx doesn't exist + .coffee + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist + as directory + /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist +[/foo/bar/.projects/e2e/cypress/it/does/not/exist] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee] + @ ./cypress/integration/record_error_spec.coffee 1:0-31 + @ multi ./cypress/integration/record_error_spec.coffee This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/packages/server/package.json b/packages/server/package.json index b042488e2805..962b2a115d86 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.0.4", + "@cypress/webpack-batteries-included-preprocessor": "1.0.5", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index caa100e99d65..adeb36d8d2ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -760,7 +760,7 @@ "@babel/helper-simple-access" "^7.10.1" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@7.10.4", "@babel/plugin-transform-modules-commonjs@^7.10.4", "@babel/plugin-transform-modules-commonjs@^7.4.4", "@babel/plugin-transform-modules-commonjs@^7.9.0": +"@babel/plugin-transform-modules-commonjs@^7.10.4", "@babel/plugin-transform-modules-commonjs@^7.4.4", "@babel/plugin-transform-modules-commonjs@^7.9.0": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0" integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w== @@ -897,10 +897,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-runtime@7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.4.tgz#594fb53453ea1b6f0779cceb48ce0718a447feb7" - integrity sha512-8ULlGv8p+Vuxu+kz2Y1dk6MYS2b/Dki+NO6/0ZlfSj5tMalfDL7jI/o/2a+rrWLqSXvnadEqc2WguB4gdQIxZw== +"@babel/plugin-transform-runtime@7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86" + integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w== dependencies: "@babel/helper-module-imports" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" @@ -1779,24 +1779,24 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.0.4.tgz#c6263548f2fa4c8dfc321c6abcbd95f921c1f2a3" - integrity sha512-FI+/CAh++3MGWEB/UKjZJwd67C128kiybIxfHuT660WTOoSbjS5brigHAU+GO9xplNS59XwiZZOZZoz5NTfxaw== +"@cypress/webpack-batteries-included-preprocessor@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.0.5.tgz#8a87d473352e6845401530a56cc92665c8e947d6" + integrity sha512-JR4N5z0MWFfhHrw019UWjsYFFK2UcEiGfYGn6ba/LcvPmtDLH4BQtyxqcs9YXUIfGgYb0U+TUGZ6ShGdRFYo9Q== dependencies: "@babel/core" "^7.10.4" "@babel/plugin-proposal-class-properties" "7.10.4" "@babel/plugin-proposal-object-rest-spread" "7.10.4" - "@babel/plugin-transform-modules-commonjs" "7.10.4" - "@babel/plugin-transform-runtime" "7.10.4" + "@babel/plugin-transform-runtime" "7.10.5" "@babel/preset-env" "^7.10.4" "@babel/preset-react" "7.10.4" "@babel/runtime" "^7.10.5" "@cypress/webpack-preprocessor" "^5.4.1" babel-loader "^8.1.0" - coffee-loader "1.0.0" - coffeescript "2.5.1" - ts-loader "8.0.0" + babel-plugin-add-module-exports "1.0.2" + coffee-loader "0.9.0" + coffeescript "1.12.7" + ts-loader "8.0.1" typescript "3.9.6" webpack "^4.43.0" @@ -8594,13 +8594,12 @@ coffee-lex@^9.1.5: resolved "https://registry.yarnpkg.com/coffee-lex/-/coffee-lex-9.1.5.tgz#6f46f33df539de3c00831d47bbe115991336aa4e" integrity sha512-94lUMjs1vhlV86vnbCCnnIYzR4oszuO4qJzKUuKOLidiksh/UyQFOzPusjmLJt6vy5CNB0d/KtaceqV84zr46g== -coffee-loader@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-1.0.0.tgz#b8cedc8c81eb2a435af59e4b369ece439261fcb4" - integrity sha512-/fjJBA842cpoN2upABQFO45ALS0clTHM8WsAbvDrArn6y4TaZikKgSPyMZxwqAkkz6zTV7MgS4RuxU3wS4XUvw== +coffee-loader@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.9.0.tgz#6deabd336062ddc6d773da4dfd16367fc7107bd6" + integrity sha512-VSoQ5kWr6Yfjn4RDpVbba2XMs3XG1ZXtLakPRt8dNfUcNU9h+1pocpdUUEd7NK9rLDwrju4yonhxrL8aMr5tww== dependencies: - loader-utils "^2.0.0" - schema-utils "^2.6.6" + loader-utils "^1.0.2" coffee-script@1.12.5: version "1.12.5" @@ -8630,7 +8629,7 @@ coffeescript@1.12.7: resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27" integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA== -coffeescript@2.5.1, coffeescript@^2.1.2: +coffeescript@^2.1.2: version "2.5.1" resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.5.1.tgz#b2442a1f2c806139669534a54adc35010559d16a" integrity sha512-J2jRPX0eeFh5VKyVnoLrfVFgLZtnnmp96WQSLAS8OrLm2wtQLcnikYKe1gViJKDH7vucjuhHvBKKBP3rKcD1tQ== @@ -16691,15 +16690,6 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2 emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -22368,7 +22358,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6: +schema-utils@^2.5.0, schema-utils@^2.6.5: version "2.7.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A== @@ -24611,10 +24601,10 @@ ts-loader@7.0.4: micromatch "^4.0.0" semver "^6.0.0" -ts-loader@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.0.tgz#faf4b1617dcc4a24c2925d92c5b19e9c6621064d" - integrity sha512-giEW167rtK1V6eX/DnXEtOgcawwoIp6hqznqYNNSmraUZOq36zMhwBq12JMlYhxf50BC58bscsTSKKtE42zAuw== +ts-loader@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.1.tgz#9670dcbce2a8c8506d01a37fee042350d02c8c21" + integrity sha512-I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ== dependencies: chalk "^2.3.0" enhanced-resolve "^4.0.0" From facc6ef94c5fef84fa76e87e12c4f89411daf532 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Thu, 16 Jul 2020 15:10:24 -0400 Subject: [PATCH 09/27] update snapshots --- .../1_busted_support_file_spec.js | 40 ++++++++++++++++++- .../server/__snapshots__/5_stdout_spec.js | 14 +++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/packages/server/__snapshots__/1_busted_support_file_spec.js b/packages/server/__snapshots__/1_busted_support_file_spec.js index 5e07b4965537..54d785d26af2 100644 --- a/packages/server/__snapshots__/1_busted_support_file_spec.js +++ b/packages/server/__snapshots__/1_busted_support_file_spec.js @@ -21,7 +21,45 @@ Oops...we found an error preparing this test file: The error was: -Error: Cannot find module './does/not/exist' from '/foo/bar/.projects/busted-support-file/cypress/support' +Error: Webpack Compilation Error +./cypress/support/index.js +Module not found: Error: Can't resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/support' +resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/support' + using description file: /Users/chrisbreiding/Dev/cypress/cypress/packages/server/package.json (relative path: ./.projects/busted-support-file/cypress/support) + Field 'browser' doesn't contain a valid alias configuration + using description file: /Users/chrisbreiding/Dev/cypress/cypress/packages/server/package.json (relative path: ./.projects/busted-support-file/cypress/support/does/not/exist) + no extension + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist doesn't exist + .js + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.js doesn't exist + .json + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.json doesn't exist + .jsx + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.jsx doesn't exist + .ts + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.ts doesn't exist + .tsx + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.tsx doesn't exist + .coffee + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee doesn't exist + as directory + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist doesn't exist +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist] +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.js] +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.json] +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.jsx] +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.ts] +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.tsx] +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee] + @ ./cypress/support/index.js 3:0-27 + @ multi ./cypress/support/index.js This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/packages/server/__snapshots__/5_stdout_spec.js b/packages/server/__snapshots__/5_stdout_spec.js index bc8aa9edb69e..eaf804ff42d7 100644 --- a/packages/server/__snapshots__/5_stdout_spec.js +++ b/packages/server/__snapshots__/5_stdout_spec.js @@ -141,10 +141,16 @@ Oops...we found an error preparing this test file: The error was: -/foo/bar/.projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js:1 -+ > - ^ -ParseError: Unexpected token +Error: Webpack Compilation Error +./cypress/integration/stdout_exit_early_failing_spec.js +Module build failed (from /Users/chrisbreiding/Dev/cypress/cypress-webpack-batteries-included-preprocessor/node_modules/babel-loader/lib/index.js): +SyntaxError: /foo/bar/.projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js: Unexpected token (1:1) + +> 1 | +> + | ^ + 2 | + + @ multi ./cypress/integration/stdout_exit_early_failing_spec.js main[0] This occurred while Cypress was compiling and bundling your test code. This is usually caused by: From 73db7c5c855fddcfd8430d334ab087d08a0aaf89 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Thu, 16 Jul 2020 15:12:16 -0400 Subject: [PATCH 10/27] bump preprocessor to gain json support --- packages/server/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 962b2a115d86..b1afafd2edf2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.0.5", + "@cypress/webpack-batteries-included-preprocessor": "1.1.0", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index adeb36d8d2ce..3d712256547d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1779,10 +1779,10 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.0.5.tgz#8a87d473352e6845401530a56cc92665c8e947d6" - integrity sha512-JR4N5z0MWFfhHrw019UWjsYFFK2UcEiGfYGn6ba/LcvPmtDLH4BQtyxqcs9YXUIfGgYb0U+TUGZ6ShGdRFYo9Q== +"@cypress/webpack-batteries-included-preprocessor@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.0.tgz#7fda176ad62259818fe9642dfef64daaef0621fb" + integrity sha512-Ni/kZw8P8VFFOKX7ENQeGu+CETKOkw6fXD978wMMbOE+I8PAsDrzYZuXt4nB5BEd4yYExN7PnmA0OqeTq6MzHQ== dependencies: "@babel/core" "^7.10.4" "@babel/plugin-proposal-class-properties" "7.10.4" From 205b7ecbf4216c2ca26793b8e69c89da95a81ccb Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Fri, 17 Jul 2020 09:44:34 -0400 Subject: [PATCH 11/27] fix e2e tests with webpack-originated errors --- packages/server/__snapshots__/1_busted_support_file_spec.js | 4 ++-- packages/server/__snapshots__/1_es_modules_spec.js | 2 +- .../server/__snapshots__/1_typescript_support_spec.ts.js | 4 ++-- packages/server/__snapshots__/5_stdout_spec.js | 2 +- packages/server/test/e2e/1_busted_support_file_spec.js | 1 + packages/server/test/e2e/1_es_modules_spec.js | 1 + packages/server/test/e2e/1_typescript_support_spec.ts | 1 + packages/server/test/e2e/5_screenshots_spec.js | 1 + packages/server/test/e2e/5_stdout_spec.js | 1 + packages/server/test/support/helpers/e2e.ts | 6 ++++++ 10 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/server/__snapshots__/1_busted_support_file_spec.js b/packages/server/__snapshots__/1_busted_support_file_spec.js index 54d785d26af2..2ce782c9ee20 100644 --- a/packages/server/__snapshots__/1_busted_support_file_spec.js +++ b/packages/server/__snapshots__/1_busted_support_file_spec.js @@ -25,9 +25,9 @@ Error: Webpack Compilation Error ./cypress/support/index.js Module not found: Error: Can't resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/support' resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/support' - using description file: /Users/chrisbreiding/Dev/cypress/cypress/packages/server/package.json (relative path: ./.projects/busted-support-file/cypress/support) + using description file: [..] (relative path: ./.projects/busted-support-file/cypress/support) Field 'browser' doesn't contain a valid alias configuration - using description file: /Users/chrisbreiding/Dev/cypress/cypress/packages/server/package.json (relative path: ./.projects/busted-support-file/cypress/support/does/not/exist) + using description file: [..] (relative path: ./.projects/busted-support-file/cypress/support/does/not/exist) no extension Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist doesn't exist diff --git a/packages/server/__snapshots__/1_es_modules_spec.js b/packages/server/__snapshots__/1_es_modules_spec.js index fec257eb4ffe..f0f300c23bc6 100644 --- a/packages/server/__snapshots__/1_es_modules_spec.js +++ b/packages/server/__snapshots__/1_es_modules_spec.js @@ -88,7 +88,7 @@ The error was: Error: Webpack Compilation Error ./lib/fail.js -Module build failed (from /Users/chrisbreiding/Dev/cypress/cypress-webpack-batteries-included-preprocessor/node_modules/babel-loader/lib/index.js): +Module build failed (from [..]): SyntaxError: /foo/bar/.projects/e2e/lib/fail.js: Unexpected token (2:0) 1 | export default { diff --git a/packages/server/__snapshots__/1_typescript_support_spec.ts.js b/packages/server/__snapshots__/1_typescript_support_spec.ts.js index 1b4a35a885ff..ca30a3c3a0d7 100644 --- a/packages/server/__snapshots__/1_typescript_support_spec.ts.js +++ b/packages/server/__snapshots__/1_typescript_support_spec.ts.js @@ -90,12 +90,12 @@ Error: Webpack Compilation Error ./cypress/integration/typescript_failing_spec.tsXX:XX Module parse failed: Unexpected token (4:19) File was processed with these loaders: - * ../../../../../cypress-webpack-batteries-included-preprocessor/node_modules/ts-loader/index.js + * ../../../../node_modules/@cypress/webpack-batteries-included-preprocessor/node_modules/ts-loader/index.js You may need an additional loader to handle the result of these loaders. | // The code below is ignored by eslint | // because it tests failing spec. > describe('fail', - > ); -| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXNjcmlwdF9mYWlsaW5nX3NwZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0eXBlc2NyaXB0X2ZhaWxpbmdfc3BlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsc0NBQXNDO0FBQ3RDLGlDQUFpQztBQUNqQyxRQUFRLENBQUMsTUFBTSxFQUFFLENBQUMsR0FBRSxBQUFELENBQUUsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbIi8vIFRoZSBjb2RlIGJlbG93IGlzIGlnbm9yZWQgYnkgZXNsaW50XG4vLyBiZWNhdXNlIGl0IHRlc3RzIGZhaWxpbmcgc3BlYy5cbmRlc2NyaWJlKCdmYWlsJywgLT4gKVxuIl19 +| @ multi ./cypress/integration/typescript_failing_spec.ts main[0] /foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts diff --git a/packages/server/__snapshots__/5_stdout_spec.js b/packages/server/__snapshots__/5_stdout_spec.js index eaf804ff42d7..046db7096894 100644 --- a/packages/server/__snapshots__/5_stdout_spec.js +++ b/packages/server/__snapshots__/5_stdout_spec.js @@ -143,7 +143,7 @@ The error was: Error: Webpack Compilation Error ./cypress/integration/stdout_exit_early_failing_spec.js -Module build failed (from /Users/chrisbreiding/Dev/cypress/cypress-webpack-batteries-included-preprocessor/node_modules/babel-loader/lib/index.js): +Module build failed (from [..]): SyntaxError: /foo/bar/.projects/e2e/cypress/integration/stdout_exit_early_failing_spec.js: Unexpected token (1:1) > 1 | +> diff --git a/packages/server/test/e2e/1_busted_support_file_spec.js b/packages/server/test/e2e/1_busted_support_file_spec.js index 039a0a1fe24e..1a54dbbbe7c9 100644 --- a/packages/server/test/e2e/1_busted_support_file_spec.js +++ b/packages/server/test/e2e/1_busted_support_file_spec.js @@ -12,6 +12,7 @@ describe('e2e busted support file', () => { sanitizeScreenshotDimensions: true, snapshot: true, expectedExitCode: 1, + onStdout: e2e.normalizeWebpackErrors, }) }) }) diff --git a/packages/server/test/e2e/1_es_modules_spec.js b/packages/server/test/e2e/1_es_modules_spec.js index 76d6fa50ef4c..cf5df3230e60 100644 --- a/packages/server/test/e2e/1_es_modules_spec.js +++ b/packages/server/test/e2e/1_es_modules_spec.js @@ -17,6 +17,7 @@ describe('e2e es modules', () => { snapshot: true, expectedExitCode: 1, noTypeScript: true, + onStdout: e2e.normalizeWebpackErrors, }) }) }) diff --git a/packages/server/test/e2e/1_typescript_support_spec.ts b/packages/server/test/e2e/1_typescript_support_spec.ts index d0388556da16..41ef030217d8 100644 --- a/packages/server/test/e2e/1_typescript_support_spec.ts +++ b/packages/server/test/e2e/1_typescript_support_spec.ts @@ -18,6 +18,7 @@ describe('e2e typescript', function () { spec: 'typescript_failing_spec.ts', snapshot: true, expectedExitCode: 1, + onStdout: e2e.normalizeWebpackErrors, }) }) diff --git a/packages/server/test/e2e/5_screenshots_spec.js b/packages/server/test/e2e/5_screenshots_spec.js index a5934ec1b605..3862dd90ddba 100644 --- a/packages/server/test/e2e/5_screenshots_spec.js +++ b/packages/server/test/e2e/5_screenshots_spec.js @@ -66,6 +66,7 @@ describe('e2e screenshots', () => { expectedExitCode: 4, snapshot: true, timeout: 180000, + onStdout: e2e.normalizeWebpackErrors, onRun (exec, browser) { return exec() .then(() => { diff --git a/packages/server/test/e2e/5_stdout_spec.js b/packages/server/test/e2e/5_stdout_spec.js index 969521025711..7e0f71e0f707 100644 --- a/packages/server/test/e2e/5_stdout_spec.js +++ b/packages/server/test/e2e/5_stdout_spec.js @@ -17,6 +17,7 @@ describe('e2e stdout', () => { spec: 'stdout_exit_early_failing_spec.js', snapshot: true, expectedExitCode: 1, + onStdout: e2e.normalizeWebpackErrors, }) }) diff --git a/packages/server/test/support/helpers/e2e.ts b/packages/server/test/support/helpers/e2e.ts index 2630569b8dc2..7ceb190cd7b3 100644 --- a/packages/server/test/support/helpers/e2e.ts +++ b/packages/server/test/support/helpers/e2e.ts @@ -753,6 +753,12 @@ const e2e = { `) } }, + + normalizeWebpackErrors (stdout) { + return stdout + .replace(/using description file: .* \(relative/g, 'using description file: [..] (relative') + .replace(/Module build failed \(from .*\)/g, 'Module build failed (from [..])') + }, } export { From eefd82c6ff3b55c2e963de4b54fcdad4a040bf8d Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Fri, 17 Jul 2020 12:16:57 -0400 Subject: [PATCH 12/27] bump preprocessor version, fix node globals --- packages/server/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b1afafd2edf2..67df8df0ceca 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.1.0", + "@cypress/webpack-batteries-included-preprocessor": "1.1.1", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index 3d712256547d..dc28cc4ca12e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1779,10 +1779,10 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.0.tgz#7fda176ad62259818fe9642dfef64daaef0621fb" - integrity sha512-Ni/kZw8P8VFFOKX7ENQeGu+CETKOkw6fXD978wMMbOE+I8PAsDrzYZuXt4nB5BEd4yYExN7PnmA0OqeTq6MzHQ== +"@cypress/webpack-batteries-included-preprocessor@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.1.tgz#0e866a5c77c9445d361b96589de9645da105e1d0" + integrity sha512-PiqY2CeXENsi9zyHwVL6CodjZlzEf86RsZXfyRHNdqZJD1M8nfR1YMIWujyGJGdKAGeqC0wYz5iEaWjHNaGvgA== dependencies: "@babel/core" "^7.10.4" "@babel/plugin-proposal-class-properties" "7.10.4" From ee5c144255d62b24744d41b325766dd8302b60fc Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Fri, 17 Jul 2020 14:09:03 -0400 Subject: [PATCH 13/27] update snapshot --- packages/server/__snapshots__/7_record_spec.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/server/__snapshots__/7_record_spec.js b/packages/server/__snapshots__/7_record_spec.js index 7d0971262c18..747de47aae0d 100644 --- a/packages/server/__snapshots__/7_record_spec.js +++ b/packages/server/__snapshots__/7_record_spec.js @@ -39,6 +39,9 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' .js Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.js doesn't exist + .json + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.json doesn't exist .jsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist @@ -55,6 +58,7 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist [/foo/bar/.projects/e2e/cypress/it/does/not/exist] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.json] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] @@ -989,6 +993,9 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' .js Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.js doesn't exist + .json + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.json doesn't exist .jsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist @@ -1005,6 +1012,7 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist [/foo/bar/.projects/e2e/cypress/it/does/not/exist] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.json] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] From 265d305f4fd8b6cca03b61c0b258efbbe46afa0e Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Fri, 17 Jul 2020 14:09:19 -0400 Subject: [PATCH 14/27] remove support for ? in file path --- packages/server/test/e2e/4_controllers_spec.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/server/test/e2e/4_controllers_spec.js b/packages/server/test/e2e/4_controllers_spec.js index 9d1c83ff4f84..6dc7801252cb 100644 --- a/packages/server/test/e2e/4_controllers_spec.js +++ b/packages/server/test/e2e/4_controllers_spec.js @@ -20,14 +20,8 @@ describe('e2e plugins', () => { }) }) - it('handles specs with $, &, ? in file name', function () { - let relativeSpecPath = path.join('d?ir&1%', '%di?r2&', 's%pec&?.js') - - // windows doesn't support ? in file names - if (process.platform === 'win32') { - relativeSpecPath = specPath.replace(/\?/, '') - } - + it('handles specs with $ and & in file name', function () { + const relativeSpecPath = path.join('dir&1%', '%dir2&', 's%pec&.js') const specPath = path.join(e2eProject, 'cypress', 'integration', relativeSpecPath) return fs.outputFile(specPath, 'it(\'passes\', () => {})') From 6f1863b0085368dc78cce10a0b6abfbb961d2ce0 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 20 Jul 2020 09:40:58 -0400 Subject: [PATCH 15/27] bump preprocessor version --- packages/server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8dd3af21480e..efcd8f7973cf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.1.1", + "@cypress/webpack-batteries-included-preprocessor": "1.1.2", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", From 9d8a8c3355839d6fa0a738b75b14533e56110d8b Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 20 Jul 2020 09:58:07 -0400 Subject: [PATCH 16/27] bump preprocessor again --- packages/server/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index efcd8f7973cf..cfbbcfd53115 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.1.2", + "@cypress/webpack-batteries-included-preprocessor": "1.1.3", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index 104f6513323d..0bc4a61061c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1779,10 +1779,10 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.1.tgz#0e866a5c77c9445d361b96589de9645da105e1d0" - integrity sha512-PiqY2CeXENsi9zyHwVL6CodjZlzEf86RsZXfyRHNdqZJD1M8nfR1YMIWujyGJGdKAGeqC0wYz5iEaWjHNaGvgA== +"@cypress/webpack-batteries-included-preprocessor@1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.3.tgz#84a4ce5a64d0f8726214792489ec06058b216d64" + integrity sha512-kGK8BKOlljNJ1EZQG5XGR7+rWOs90ft/0Fr9sS7M6OfDHH31oBCBKQ4UYNuXHQZrWSoySOXK74OWzpjvfggs8g== dependencies: "@babel/core" "^7.10.4" "@babel/plugin-proposal-class-properties" "7.10.4" From ec71582b6416e845c0dd06e571a69a1e9d042d67 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 20 Jul 2020 10:58:00 -0400 Subject: [PATCH 17/27] bump preprocessor --- packages/server/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index cfbbcfd53115..1ee9f0cf49aa 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.1.3", + "@cypress/webpack-batteries-included-preprocessor": "1.1.4", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index 0bc4a61061c1..224acc464fdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1779,10 +1779,10 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.3.tgz#84a4ce5a64d0f8726214792489ec06058b216d64" - integrity sha512-kGK8BKOlljNJ1EZQG5XGR7+rWOs90ft/0Fr9sS7M6OfDHH31oBCBKQ4UYNuXHQZrWSoySOXK74OWzpjvfggs8g== +"@cypress/webpack-batteries-included-preprocessor@1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.4.tgz#18cc18175c057bef77627a979a3a20701f255df8" + integrity sha512-nXD+Qg8Kln4DiQGQyNozVD9pqMX/MRX/euqrIgUkemvhXi6qYWh5cvp++0jjeMTnlm5qc970OYQVwt1B28VaXA== dependencies: "@babel/core" "^7.10.4" "@babel/plugin-proposal-class-properties" "7.10.4" From 4e7840fa612e2fa169f2a6d77ffcaf90a6586e7d Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 21 Jul 2020 10:29:17 -0400 Subject: [PATCH 18/27] bump preprocessor --- packages/server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/package.json b/packages/server/package.json index b923013b42e3..fed163cb41c7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.1.4", + "@cypress/webpack-batteries-included-preprocessor": "1.2.0", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", From a0bc387da7602e481c44f114f9749bda5fe01d7b Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Tue, 21 Jul 2020 11:06:42 -0400 Subject: [PATCH 19/27] update snapshots --- .../__snapshots__/1_busted_support_file_spec.js | 8 ++++---- packages/server/__snapshots__/7_record_spec.js | 16 ++++++++-------- yarn.lock | 11 +++++------ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/packages/server/__snapshots__/1_busted_support_file_spec.js b/packages/server/__snapshots__/1_busted_support_file_spec.js index 2ce782c9ee20..df70ca0ad9f1 100644 --- a/packages/server/__snapshots__/1_busted_support_file_spec.js +++ b/packages/server/__snapshots__/1_busted_support_file_spec.js @@ -40,24 +40,24 @@ resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/su .jsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.jsx doesn't exist + .coffee + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee doesn't exist .ts Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.ts doesn't exist .tsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.tsx doesn't exist - .coffee - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee doesn't exist as directory /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist doesn't exist [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.js] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.json] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.jsx] +[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.ts] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.tsx] -[/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee] @ ./cypress/support/index.js 3:0-27 @ multi ./cypress/support/index.js diff --git a/packages/server/__snapshots__/7_record_spec.js b/packages/server/__snapshots__/7_record_spec.js index 747de47aae0d..a2c9c862c703 100644 --- a/packages/server/__snapshots__/7_record_spec.js +++ b/packages/server/__snapshots__/7_record_spec.js @@ -45,24 +45,24 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' .jsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist + .coffee + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist .ts Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.ts doesn't exist .tsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx doesn't exist - .coffee - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist as directory /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist [/foo/bar/.projects/e2e/cypress/it/does/not/exist] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.json] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee] @ ./cypress/integration/record_error_spec.coffee 1:0-31 @ multi ./cypress/integration/record_error_spec.coffee @@ -999,24 +999,24 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' .jsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist + .coffee + Field 'browser' doesn't contain a valid alias configuration + /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist .ts Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.ts doesn't exist .tsx Field 'browser' doesn't contain a valid alias configuration /foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx doesn't exist - .coffee - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist as directory /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist [/foo/bar/.projects/e2e/cypress/it/does/not/exist] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.json] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx] +[/foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] -[/foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee] @ ./cypress/integration/record_error_spec.coffee 1:0-31 @ multi ./cypress/integration/record_error_spec.coffee diff --git a/yarn.lock b/yarn.lock index 3a3a72ee45da..6a1127af70ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1784,10 +1784,10 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.1.4.tgz#18cc18175c057bef77627a979a3a20701f255df8" - integrity sha512-nXD+Qg8Kln4DiQGQyNozVD9pqMX/MRX/euqrIgUkemvhXi6qYWh5cvp++0jjeMTnlm5qc970OYQVwt1B28VaXA== +"@cypress/webpack-batteries-included-preprocessor@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.2.0.tgz#0b9aff0f532090d769a7a60a703215c71f05365f" + integrity sha512-jan/fjY0L+NwuS/1e10GsS6wesRSszrnc/xquvUaG3VSZk5ARpuQV9nxC3ed0a/l7DtMSZjf9UlApJR/rxx8ng== dependencies: "@babel/core" "^7.10.4" "@babel/plugin-proposal-class-properties" "7.10.4" @@ -1802,7 +1802,6 @@ coffee-loader "0.9.0" coffeescript "1.12.7" ts-loader "8.0.1" - typescript "3.9.6" webpack "^4.43.0" "@cypress/webpack-preprocessor@5.4.1", "@cypress/webpack-preprocessor@^5.4.1": @@ -24604,7 +24603,7 @@ typescript@3.7.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19" integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw== -typescript@3.9.6, typescript@^3.0.3, typescript@^3.8.3: +typescript@^3.0.3, typescript@^3.8.3: version "3.9.6" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a" integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw== From b9431766beda739523b55e4b1ca338a42fa241fe Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Thu, 23 Jul 2020 10:58:34 -0400 Subject: [PATCH 20/27] bump preprocessor version --- packages/server/package.json | 2 +- yarn.lock | 177 +++++++++++++++++++++++------------ 2 files changed, 117 insertions(+), 62 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index fed163cb41c7..9d8021418674 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.2.0", + "@cypress/webpack-batteries-included-preprocessor": "1.3.0", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index 6a1127af70ab..a77a4d60c022 100644 --- a/yarn.lock +++ b/yarn.lock @@ -115,7 +115,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.10.4": +"@babel/core@^7.10.5": version "7.10.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330" integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w== @@ -407,14 +407,6 @@ "@babel/helper-remap-async-to-generator" "^7.10.4" "@babel/plugin-syntax-async-generators" "^7.8.0" -"@babel/plugin-proposal-class-properties@7.10.4", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807" - integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-proposal-class-properties@7.3.0": version "7.3.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd" @@ -431,6 +423,14 @@ "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807" + integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-proposal-decorators@7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e" @@ -472,15 +472,6 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" - integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.10.4" - "@babel/plugin-proposal-object-rest-spread@7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1" @@ -497,6 +488,15 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" +"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" + integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.10.4" + "@babel/plugin-proposal-optional-catch-binding@^7.10.4", "@babel/plugin-proposal-optional-catch-binding@^7.2.0", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd" @@ -902,16 +902,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-runtime@7.10.5": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86" - integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w== - dependencies: - "@babel/helper-module-imports" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - resolve "^1.8.1" - semver "^5.5.1" - "@babel/plugin-transform-runtime@7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea" @@ -922,6 +912,16 @@ resolve "^1.8.1" semver "^5.5.1" +"@babel/plugin-transform-runtime@^7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86" + integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-shorthand-properties@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6" @@ -1284,19 +1284,6 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" -"@babel/preset-react@7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf" - integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-transform-react-display-name" "^7.10.4" - "@babel/plugin-transform-react-jsx" "^7.10.4" - "@babel/plugin-transform-react-jsx-development" "^7.10.4" - "@babel/plugin-transform-react-jsx-self" "^7.10.4" - "@babel/plugin-transform-react-jsx-source" "^7.10.4" - "@babel/plugin-transform-react-pure-annotations" "^7.10.4" - "@babel/preset-react@7.9.4": version "7.9.4" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d" @@ -1309,6 +1296,19 @@ "@babel/plugin-transform-react-jsx-self" "^7.9.0" "@babel/plugin-transform-react-jsx-source" "^7.9.0" +"@babel/preset-react@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf" + integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-react-display-name" "^7.10.4" + "@babel/plugin-transform-react-jsx" "^7.10.4" + "@babel/plugin-transform-react-jsx-development" "^7.10.4" + "@babel/plugin-transform-react-jsx-self" "^7.10.4" + "@babel/plugin-transform-react-jsx-source" "^7.10.4" + "@babel/plugin-transform-react-pure-annotations" "^7.10.4" + "@babel/preset-typescript@7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192" @@ -1784,27 +1784,29 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.2.0.tgz#0b9aff0f532090d769a7a60a703215c71f05365f" - integrity sha512-jan/fjY0L+NwuS/1e10GsS6wesRSszrnc/xquvUaG3VSZk5ARpuQV9nxC3ed0a/l7DtMSZjf9UlApJR/rxx8ng== +"@cypress/webpack-batteries-included-preprocessor@1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.3.0.tgz#6116f68dd39b69820f6c4739c774a986fb1a6a61" + integrity sha512-H3i3ztdUlioQGzSC+SluX6TMRffCPx5eSjEcDTBTX+8pdCQVKf7Ft9J11oZ11SWPB2y2Fqo7EcdBqnU+EnasbA== dependencies: - "@babel/core" "^7.10.4" - "@babel/plugin-proposal-class-properties" "7.10.4" - "@babel/plugin-proposal-object-rest-spread" "7.10.4" - "@babel/plugin-transform-runtime" "7.10.5" + "@babel/core" "^7.10.5" + "@babel/plugin-proposal-class-properties" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread" "^7.10.4" + "@babel/plugin-transform-runtime" "^7.10.5" "@babel/preset-env" "^7.10.4" - "@babel/preset-react" "7.10.4" + "@babel/preset-react" "^7.10.4" "@babel/runtime" "^7.10.5" - "@cypress/webpack-preprocessor" "^5.4.1" + "@cypress/webpack-preprocessor" "^5.4.2" babel-loader "^8.1.0" - babel-plugin-add-module-exports "1.0.2" - coffee-loader "0.9.0" - coffeescript "1.12.7" - ts-loader "8.0.1" + babel-plugin-add-module-exports "^1.0.2" + coffee-loader "^0.9.0" + coffeescript "^1.12.7" + ts-loader "^8.0.1" + tsconfig "^7.0.0" + tsconfig-paths-webpack-plugin "^3.2.0" webpack "^4.43.0" -"@cypress/webpack-preprocessor@5.4.1", "@cypress/webpack-preprocessor@^5.4.1": +"@cypress/webpack-preprocessor@5.4.1": version "5.4.1" resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.1.tgz#eb58f6cd02932a95653c1a674cfd769da2409806" integrity sha512-1E2BdVVXQ4wDQ7f3mXCvS9xmfTVwEoT3oqKhjAr1iNlTJpBq10Z0VNBZd3VZ3nmCTFwTuUvs735QGnRE1gQ1BA== @@ -1813,6 +1815,15 @@ debug "4.1.1" lodash "4.17.15" +"@cypress/webpack-preprocessor@^5.4.2": + version "5.4.2" + resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.2.tgz#d40fed6375b09dd16b266a045f4577e9c7a0299a" + integrity sha512-ffydnj6mTVm83qc1p63dE2qxRkiIQNXxiHp2xyuVelwmksX+l0VSBxawYd/9Z99rInmqa583yUDPKk8IkCtmDg== + dependencies: + bluebird "3.7.1" + debug "4.1.1" + lodash "4.17.19" + "@cypress/what-is-circular@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@cypress/what-is-circular/-/what-is-circular-1.0.1.tgz#c88adb7106a4e1624e403512fc87c18e9700c877" @@ -4140,6 +4151,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/linkify-it@*": version "2.1.0" resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-2.1.0.tgz#ea3dd64c4805597311790b61e872cbd1ed2cd806" @@ -4357,6 +4373,16 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/strip-bom@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2" + integrity sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I= + +"@types/strip-json-comments@0.0.30": + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1" + integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== + "@types/tapable@*": version "1.0.6" resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" @@ -6208,7 +6234,7 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-add-module-exports@1.0.2: +babel-plugin-add-module-exports@1.0.2, babel-plugin-add-module-exports@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.2.tgz#96cd610d089af664f016467fc4567c099cce2d9c" integrity sha512-4paN7RivvU3Rzju1vGSHWPjO8Y0rI6droWvSFKI6dvEQ4mvoV0zGojnlzVRfI6N8zISo6VERXt3coIuVmzuvNg== @@ -8571,7 +8597,7 @@ coffee-lex@^9.1.5: resolved "https://registry.yarnpkg.com/coffee-lex/-/coffee-lex-9.1.5.tgz#6f46f33df539de3c00831d47bbe115991336aa4e" integrity sha512-94lUMjs1vhlV86vnbCCnnIYzR4oszuO4qJzKUuKOLidiksh/UyQFOzPusjmLJt6vy5CNB0d/KtaceqV84zr46g== -coffee-loader@0.9.0: +coffee-loader@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.9.0.tgz#6deabd336062ddc6d773da4dfd16367fc7107bd6" integrity sha512-VSoQ5kWr6Yfjn4RDpVbba2XMs3XG1ZXtLakPRt8dNfUcNU9h+1pocpdUUEd7NK9rLDwrju4yonhxrL8aMr5tww== @@ -8601,7 +8627,7 @@ coffeeify@3.0.1: convert-source-map "^1.3.0" through2 "^2.0.0" -coffeescript@1.12.7: +coffeescript@1.12.7, coffeescript@^1.12.7: version "1.12.7" resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27" integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA== @@ -23634,7 +23660,7 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: +strip-json-comments@2.0.1, strip-json-comments@^2.0.0, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= @@ -24399,7 +24425,7 @@ ts-loader@7.0.4: micromatch "^4.0.0" semver "^6.0.0" -ts-loader@8.0.1: +ts-loader@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.1.tgz#9670dcbce2a8c8506d01a37fee042350d02c8c21" integrity sha512-I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ== @@ -24446,6 +24472,35 @@ ts-node@8.5.4: source-map-support "^0.5.6" yn "^3.0.0" +tsconfig-paths-webpack-plugin@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz#6e70bd42915ad0efb64d3385163f0c1270f3e04d" + integrity sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g== + dependencies: + chalk "^2.3.0" + enhanced-resolve "^4.0.0" + tsconfig-paths "^3.4.0" + +tsconfig-paths@^3.4.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + +tsconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7" + integrity sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw== + dependencies: + "@types/strip-bom" "^3.0.0" + "@types/strip-json-comments" "0.0.30" + strip-bom "^3.0.0" + strip-json-comments "^2.0.0" + tslib@^1, tslib@^1.0.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" From 86530afbedb42470d0adb1cb04f134698dce3f66 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Thu, 23 Jul 2020 11:50:24 -0400 Subject: [PATCH 21/27] bump preprocessor, quiet the paths plugin --- packages/server/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 9d8021418674..99d468b9e598 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,7 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.3.0", + "@cypress/webpack-batteries-included-preprocessor": "1.3.1", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index a77a4d60c022..3ee3b369e13c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1784,10 +1784,10 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.3.0.tgz#6116f68dd39b69820f6c4739c774a986fb1a6a61" - integrity sha512-H3i3ztdUlioQGzSC+SluX6TMRffCPx5eSjEcDTBTX+8pdCQVKf7Ft9J11oZ11SWPB2y2Fqo7EcdBqnU+EnasbA== +"@cypress/webpack-batteries-included-preprocessor@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.3.1.tgz#fa2dbb01009b60db317f7575147e3cabf0c15760" + integrity sha512-GWTQhxu36s/UNifkpygmAG47RMapmdKhJ1j/ZP1flm/fGPna2Aa32wXWKD6eN3ZjbJPXz2WW3Pn0ei1E9hhEkg== dependencies: "@babel/core" "^7.10.5" "@babel/plugin-proposal-class-properties" "^7.10.4" From d212b0ad54bd2c9894b5431402dd7f3a8d67caf0 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Thu, 23 Jul 2020 14:34:17 -0400 Subject: [PATCH 22/27] add test verifying tsconfig paths work --- packages/server/test/e2e/1_typescript_support_spec.ts | 6 ++++++ .../fixtures/projects/ts-proj-with-paths/cypress.json | 4 ++++ .../ts-proj-with-paths/cypress/integration/app_spec.ts | 6 ++++++ .../fixtures/projects/ts-proj-with-paths/src/main.ts | 1 + .../fixtures/projects/ts-proj-with-paths/tsconfig.json | 8 ++++++++ 5 files changed, 25 insertions(+) create mode 100644 packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress.json create mode 100644 packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress/integration/app_spec.ts create mode 100644 packages/server/test/support/fixtures/projects/ts-proj-with-paths/src/main.ts create mode 100644 packages/server/test/support/fixtures/projects/ts-proj-with-paths/tsconfig.json diff --git a/packages/server/test/e2e/1_typescript_support_spec.ts b/packages/server/test/e2e/1_typescript_support_spec.ts index 41ef030217d8..5007b65cfa41 100644 --- a/packages/server/test/e2e/1_typescript_support_spec.ts +++ b/packages/server/test/e2e/1_typescript_support_spec.ts @@ -31,6 +31,12 @@ describe('e2e typescript', function () { }) }) + it('respects tsconfig paths', function () { + return e2e.exec(this, { + project: Fixtures.projectPath('ts-proj-with-paths'), + }) + }) + it('handles tsconfig with module other than commonjs', function () { const projPath = Fixtures.projectPath('ts-proj-with-own-tsconfig') diff --git a/packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress.json b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress.json new file mode 100644 index 000000000000..be9e6bf4576b --- /dev/null +++ b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress.json @@ -0,0 +1,4 @@ +{ + "supportFile": false, + "pluginsFile": false +} diff --git a/packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress/integration/app_spec.ts b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress/integration/app_spec.ts new file mode 100644 index 000000000000..af091afe0536 --- /dev/null +++ b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/cypress/integration/app_spec.ts @@ -0,0 +1,6 @@ +import { expect } from 'chai' +import { appName } from '@app/main' + +it('verifies path mapping', () => { + expect(appName).to.equal('Best App Ever') +}) diff --git a/packages/server/test/support/fixtures/projects/ts-proj-with-paths/src/main.ts b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/src/main.ts new file mode 100644 index 000000000000..8e774ef932a0 --- /dev/null +++ b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/src/main.ts @@ -0,0 +1 @@ +export const appName = 'Best App Ever' diff --git a/packages/server/test/support/fixtures/projects/ts-proj-with-paths/tsconfig.json b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/tsconfig.json new file mode 100644 index 000000000000..9da0a51cf8c5 --- /dev/null +++ b/packages/server/test/support/fixtures/projects/ts-proj-with-paths/tsconfig.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@app/*": ["src/*"] + }, + } +} From c54eaac6625694567ba6a69b7fa39821f23bdcda Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 10 Aug 2020 10:01:30 -0400 Subject: [PATCH 23/27] bump batteries-included preprocessor and install latest webpack preprocessor beside it --- packages/server/package.json | 3 +- yarn.lock | 346 ++++++++++++++++++----------------- 2 files changed, 179 insertions(+), 170 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4678460a4e8a..dd1141e14a65 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -27,7 +27,8 @@ "@cypress/mocha-teamcity-reporter": "1.0.0", "@cypress/request": "2.88.5", "@cypress/request-promise": "4.2.6", - "@cypress/webpack-batteries-included-preprocessor": "1.3.1", + "@cypress/webpack-batteries-included-preprocessor": "2.0.0", + "@cypress/webpack-preprocessor": "5.4.3", "@ffmpeg-installer/ffmpeg": "1.0.20", "ansi_up": "4.0.4", "black-hole-stream": "0.0.1", diff --git a/yarn.lock b/yarn.lock index a626cedcb759..26f574cb157e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -51,6 +51,28 @@ invariant "^2.2.4" semver "^5.5.0" +"@babel/core@7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330" + integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.10.5" + "@babel/helper-module-transforms" "^7.10.5" + "@babel/helpers" "^7.10.4" + "@babel/parser" "^7.10.5" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.10.5" + "@babel/types" "^7.10.5" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + "@babel/core@7.4.5": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a" @@ -115,28 +137,6 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.10.5": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.5.tgz#1f15e2cca8ad9a1d78a38ddba612f5e7cdbbd330" - integrity sha512-O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.10.5" - "@babel/helper-module-transforms" "^7.10.5" - "@babel/helpers" "^7.10.4" - "@babel/parser" "^7.10.5" - "@babel/template" "^7.10.4" - "@babel/traverse" "^7.10.5" - "@babel/types" "^7.10.5" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.19" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - "@babel/generator@^7.10.4", "@babel/generator@^7.4.0", "@babel/generator@^7.4.4", "@babel/generator@^7.9.0", "@babel/generator@^7.9.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.4.tgz#e49eeed9fe114b62fa5b181856a43a5e32f5f243" @@ -407,6 +407,14 @@ "@babel/helper-remap-async-to-generator" "^7.10.4" "@babel/plugin-syntax-async-generators" "^7.8.0" +"@babel/plugin-proposal-class-properties@7.10.4", "@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807" + integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-proposal-class-properties@7.3.0": version "7.3.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd" @@ -423,14 +431,6 @@ "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807" - integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-proposal-decorators@7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e" @@ -472,6 +472,15 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" +"@babel/plugin-proposal-object-rest-spread@7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" + integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-transform-parameters" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread@7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1" @@ -488,15 +497,6 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-object-rest-spread" "^7.8.0" -"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.10.4", "@babel/plugin-proposal-object-rest-spread@^7.4.4", "@babel/plugin-proposal-object-rest-spread@^7.9.0", "@babel/plugin-proposal-object-rest-spread@^7.9.5": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.4.tgz#50129ac216b9a6a55b3853fdd923e74bf553a4c0" - integrity sha512-6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-transform-parameters" "^7.10.4" - "@babel/plugin-proposal-optional-catch-binding@^7.10.4", "@babel/plugin-proposal-optional-catch-binding@^7.2.0", "@babel/plugin-proposal-optional-catch-binding@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd" @@ -902,6 +902,16 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-transform-runtime@7.10.5": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86" + integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w== + dependencies: + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-runtime@7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea" @@ -912,16 +922,6 @@ resolve "^1.8.1" semver "^5.5.1" -"@babel/plugin-transform-runtime@^7.10.5": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.5.tgz#3b39b7b24830e0c2d8ff7a4489fe5cf99fbace86" - integrity sha512-tV4V/FjElJ9lQtyjr5xD2IFFbgY46r7EeVu5a8CpEKT5laheHKSlFeHjpkPppW3PqzGLAuv5k2qZX5LgVZIX5w== - dependencies: - "@babel/helper-module-imports" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - resolve "^1.8.1" - semver "^5.5.1" - "@babel/plugin-transform-shorthand-properties@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6" @@ -998,6 +998,76 @@ core-js "^2.6.5" regenerator-runtime "^0.13.4" +"@babel/preset-env@7.10.4", "@babel/preset-env@^7.1.6": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f" + integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw== + dependencies: + "@babel/compat-data" "^7.10.4" + "@babel/helper-compilation-targets" "^7.10.4" + "@babel/helper-module-imports" "^7.10.4" + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-proposal-async-generator-functions" "^7.10.4" + "@babel/plugin-proposal-class-properties" "^7.10.4" + "@babel/plugin-proposal-dynamic-import" "^7.10.4" + "@babel/plugin-proposal-json-strings" "^7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4" + "@babel/plugin-proposal-numeric-separator" "^7.10.4" + "@babel/plugin-proposal-object-rest-spread" "^7.10.4" + "@babel/plugin-proposal-optional-catch-binding" "^7.10.4" + "@babel/plugin-proposal-optional-chaining" "^7.10.4" + "@babel/plugin-proposal-private-methods" "^7.10.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.10.4" + "@babel/plugin-syntax-async-generators" "^7.8.0" + "@babel/plugin-syntax-class-properties" "^7.10.4" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-json-strings" "^7.8.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + "@babel/plugin-syntax-top-level-await" "^7.10.4" + "@babel/plugin-transform-arrow-functions" "^7.10.4" + "@babel/plugin-transform-async-to-generator" "^7.10.4" + "@babel/plugin-transform-block-scoped-functions" "^7.10.4" + "@babel/plugin-transform-block-scoping" "^7.10.4" + "@babel/plugin-transform-classes" "^7.10.4" + "@babel/plugin-transform-computed-properties" "^7.10.4" + "@babel/plugin-transform-destructuring" "^7.10.4" + "@babel/plugin-transform-dotall-regex" "^7.10.4" + "@babel/plugin-transform-duplicate-keys" "^7.10.4" + "@babel/plugin-transform-exponentiation-operator" "^7.10.4" + "@babel/plugin-transform-for-of" "^7.10.4" + "@babel/plugin-transform-function-name" "^7.10.4" + "@babel/plugin-transform-literals" "^7.10.4" + "@babel/plugin-transform-member-expression-literals" "^7.10.4" + "@babel/plugin-transform-modules-amd" "^7.10.4" + "@babel/plugin-transform-modules-commonjs" "^7.10.4" + "@babel/plugin-transform-modules-systemjs" "^7.10.4" + "@babel/plugin-transform-modules-umd" "^7.10.4" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4" + "@babel/plugin-transform-new-target" "^7.10.4" + "@babel/plugin-transform-object-super" "^7.10.4" + "@babel/plugin-transform-parameters" "^7.10.4" + "@babel/plugin-transform-property-literals" "^7.10.4" + "@babel/plugin-transform-regenerator" "^7.10.4" + "@babel/plugin-transform-reserved-words" "^7.10.4" + "@babel/plugin-transform-shorthand-properties" "^7.10.4" + "@babel/plugin-transform-spread" "^7.10.4" + "@babel/plugin-transform-sticky-regex" "^7.10.4" + "@babel/plugin-transform-template-literals" "^7.10.4" + "@babel/plugin-transform-typeof-symbol" "^7.10.4" + "@babel/plugin-transform-unicode-escapes" "^7.10.4" + "@babel/plugin-transform-unicode-regex" "^7.10.4" + "@babel/preset-modules" "^0.1.3" + "@babel/types" "^7.10.4" + browserslist "^4.12.0" + core-js-compat "^3.6.2" + invariant "^2.2.2" + levenary "^1.1.1" + semver "^5.5.0" + "@babel/preset-env@7.4.5": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58" @@ -1184,76 +1254,6 @@ levenary "^1.1.1" semver "^5.5.0" -"@babel/preset-env@^7.1.6", "@babel/preset-env@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.4.tgz#fbf57f9a803afd97f4f32e4f798bb62e4b2bef5f" - integrity sha512-tcmuQ6vupfMZPrLrc38d0sF2OjLT3/bZ0dry5HchNCQbrokoQi4reXqclvkkAT5b+gWc23meVWpve5P/7+w/zw== - dependencies: - "@babel/compat-data" "^7.10.4" - "@babel/helper-compilation-targets" "^7.10.4" - "@babel/helper-module-imports" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" - "@babel/plugin-proposal-async-generator-functions" "^7.10.4" - "@babel/plugin-proposal-class-properties" "^7.10.4" - "@babel/plugin-proposal-dynamic-import" "^7.10.4" - "@babel/plugin-proposal-json-strings" "^7.10.4" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4" - "@babel/plugin-proposal-numeric-separator" "^7.10.4" - "@babel/plugin-proposal-object-rest-spread" "^7.10.4" - "@babel/plugin-proposal-optional-catch-binding" "^7.10.4" - "@babel/plugin-proposal-optional-chaining" "^7.10.4" - "@babel/plugin-proposal-private-methods" "^7.10.4" - "@babel/plugin-proposal-unicode-property-regex" "^7.10.4" - "@babel/plugin-syntax-async-generators" "^7.8.0" - "@babel/plugin-syntax-class-properties" "^7.10.4" - "@babel/plugin-syntax-dynamic-import" "^7.8.0" - "@babel/plugin-syntax-json-strings" "^7.8.0" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.0" - "@babel/plugin-syntax-top-level-await" "^7.10.4" - "@babel/plugin-transform-arrow-functions" "^7.10.4" - "@babel/plugin-transform-async-to-generator" "^7.10.4" - "@babel/plugin-transform-block-scoped-functions" "^7.10.4" - "@babel/plugin-transform-block-scoping" "^7.10.4" - "@babel/plugin-transform-classes" "^7.10.4" - "@babel/plugin-transform-computed-properties" "^7.10.4" - "@babel/plugin-transform-destructuring" "^7.10.4" - "@babel/plugin-transform-dotall-regex" "^7.10.4" - "@babel/plugin-transform-duplicate-keys" "^7.10.4" - "@babel/plugin-transform-exponentiation-operator" "^7.10.4" - "@babel/plugin-transform-for-of" "^7.10.4" - "@babel/plugin-transform-function-name" "^7.10.4" - "@babel/plugin-transform-literals" "^7.10.4" - "@babel/plugin-transform-member-expression-literals" "^7.10.4" - "@babel/plugin-transform-modules-amd" "^7.10.4" - "@babel/plugin-transform-modules-commonjs" "^7.10.4" - "@babel/plugin-transform-modules-systemjs" "^7.10.4" - "@babel/plugin-transform-modules-umd" "^7.10.4" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4" - "@babel/plugin-transform-new-target" "^7.10.4" - "@babel/plugin-transform-object-super" "^7.10.4" - "@babel/plugin-transform-parameters" "^7.10.4" - "@babel/plugin-transform-property-literals" "^7.10.4" - "@babel/plugin-transform-regenerator" "^7.10.4" - "@babel/plugin-transform-reserved-words" "^7.10.4" - "@babel/plugin-transform-shorthand-properties" "^7.10.4" - "@babel/plugin-transform-spread" "^7.10.4" - "@babel/plugin-transform-sticky-regex" "^7.10.4" - "@babel/plugin-transform-template-literals" "^7.10.4" - "@babel/plugin-transform-typeof-symbol" "^7.10.4" - "@babel/plugin-transform-unicode-escapes" "^7.10.4" - "@babel/plugin-transform-unicode-regex" "^7.10.4" - "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.10.4" - browserslist "^4.12.0" - core-js-compat "^3.6.2" - invariant "^2.2.2" - levenary "^1.1.1" - semver "^5.5.0" - "@babel/preset-flow@^7.0.0": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.10.4.tgz#e0d9c72f8cb02d1633f6a5b7b16763aa2edf659f" @@ -1284,19 +1284,7 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" -"@babel/preset-react@7.9.4": - version "7.9.4" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d" - integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - "@babel/plugin-transform-react-display-name" "^7.8.3" - "@babel/plugin-transform-react-jsx" "^7.9.4" - "@babel/plugin-transform-react-jsx-development" "^7.9.0" - "@babel/plugin-transform-react-jsx-self" "^7.9.0" - "@babel/plugin-transform-react-jsx-source" "^7.9.0" - -"@babel/preset-react@^7.10.4": +"@babel/preset-react@7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz#92e8a66d816f9911d11d4cc935be67adfc82dbcf" integrity sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw== @@ -1309,6 +1297,18 @@ "@babel/plugin-transform-react-jsx-source" "^7.10.4" "@babel/plugin-transform-react-pure-annotations" "^7.10.4" +"@babel/preset-react@7.9.4": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz#c6c97693ac65b6b9c0b4f25b948a8f665463014d" + integrity sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.3" + "@babel/plugin-transform-react-display-name" "^7.8.3" + "@babel/plugin-transform-react-jsx" "^7.9.4" + "@babel/plugin-transform-react-jsx-development" "^7.9.0" + "@babel/plugin-transform-react-jsx-self" "^7.9.0" + "@babel/plugin-transform-react-jsx-source" "^7.9.0" + "@babel/preset-typescript@7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz#87705a72b1f0d59df21c179f7c3d2ef4b16ce192" @@ -1347,6 +1347,13 @@ pirates "^4.0.0" source-map-support "^0.5.16" +"@babel/runtime@7.10.5", "@babel/runtime@^7.10.2": + version "7.10.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c" + integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@7.3.1": version "7.3.1" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a" @@ -1361,13 +1368,6 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5": - version "7.10.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.5.tgz#303d8bd440ecd5a491eae6117fd3367698674c5c" - integrity sha512-otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg== - dependencies: - regenerator-runtime "^0.13.4" - "@babel/template@^7.10.4", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.8.6": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278" @@ -1774,27 +1774,26 @@ dependencies: css.escape "^1.5.1" -"@cypress/webpack-batteries-included-preprocessor@1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-1.3.1.tgz#fa2dbb01009b60db317f7575147e3cabf0c15760" - integrity sha512-GWTQhxu36s/UNifkpygmAG47RMapmdKhJ1j/ZP1flm/fGPna2Aa32wXWKD6eN3ZjbJPXz2WW3Pn0ei1E9hhEkg== - dependencies: - "@babel/core" "^7.10.5" - "@babel/plugin-proposal-class-properties" "^7.10.4" - "@babel/plugin-proposal-object-rest-spread" "^7.10.4" - "@babel/plugin-transform-runtime" "^7.10.5" - "@babel/preset-env" "^7.10.4" - "@babel/preset-react" "^7.10.4" - "@babel/runtime" "^7.10.5" - "@cypress/webpack-preprocessor" "^5.4.2" - babel-loader "^8.1.0" - babel-plugin-add-module-exports "^1.0.2" - coffee-loader "^0.9.0" - coffeescript "^1.12.7" - ts-loader "^8.0.1" - tsconfig "^7.0.0" - tsconfig-paths-webpack-plugin "^3.2.0" - webpack "^4.43.0" +"@cypress/webpack-batteries-included-preprocessor@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@cypress/webpack-batteries-included-preprocessor/-/webpack-batteries-included-preprocessor-2.0.0.tgz#b64883e0bd6fcb5433211a547179a76581e45cb3" + integrity sha512-0LNQ7bhKVDDTF/P5FIP7FQrEbiRSwcWv4Qur7fEQoSHs+06pu0HYtNhIT83nG1X2BCIRmIqGvZGiuJ4ABZrT0w== + dependencies: + "@babel/core" "7.10.5" + "@babel/plugin-proposal-class-properties" "7.10.4" + "@babel/plugin-proposal-object-rest-spread" "7.10.4" + "@babel/plugin-transform-runtime" "7.10.5" + "@babel/preset-env" "7.10.4" + "@babel/preset-react" "7.10.4" + "@babel/runtime" "7.10.5" + babel-loader "8.1.0" + babel-plugin-add-module-exports "1.0.2" + coffee-loader "0.9.0" + coffeescript "1.12.7" + ts-loader "8.0.1" + tsconfig "7.0.0" + tsconfig-paths-webpack-plugin "3.2.0" + webpack "4.43.0" "@cypress/webpack-preprocessor@5.4.1": version "5.4.1" @@ -1805,7 +1804,7 @@ debug "4.1.1" lodash "4.17.15" -"@cypress/webpack-preprocessor@5.4.2", "@cypress/webpack-preprocessor@^5.4.2": +"@cypress/webpack-preprocessor@5.4.2": version "5.4.2" resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.2.tgz#d40fed6375b09dd16b266a045f4577e9c7a0299a" integrity sha512-ffydnj6mTVm83qc1p63dE2qxRkiIQNXxiHp2xyuVelwmksX+l0VSBxawYd/9Z99rInmqa583yUDPKk8IkCtmDg== @@ -1814,6 +1813,15 @@ debug "4.1.1" lodash "4.17.19" +"@cypress/webpack-preprocessor@5.4.3": + version "5.4.3" + resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.3.tgz#16cd450f15a7e95523a4e4e48b7ced3e318c4957" + integrity sha512-WomyLH7mtCkRpN6unHUfZcX/tl8lfL3MqSniSvlg6wTtQLmlYM3VPDUQjZ4mywQ+TOE9TkSEQyVeJT7SRksxUg== + dependencies: + bluebird "3.7.1" + debug "4.1.1" + lodash "4.17.19" + "@cypress/what-is-circular@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@cypress/what-is-circular/-/what-is-circular-1.0.1.tgz#c88adb7106a4e1624e403512fc87c18e9700c877" @@ -6194,7 +6202,7 @@ babel-jest@^24.9.0: chalk "^2.4.2" slash "^2.0.0" -babel-loader@8.1.0, babel-loader@^8.1.0: +babel-loader@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== @@ -6212,7 +6220,7 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-add-module-exports@1.0.2, babel-plugin-add-module-exports@^1.0.2: +babel-plugin-add-module-exports@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.2.tgz#96cd610d089af664f016467fc4567c099cce2d9c" integrity sha512-4paN7RivvU3Rzju1vGSHWPjO8Y0rI6droWvSFKI6dvEQ4mvoV0zGojnlzVRfI6N8zISo6VERXt3coIuVmzuvNg== @@ -8551,7 +8559,7 @@ coffee-lex@^9.1.5: resolved "https://registry.yarnpkg.com/coffee-lex/-/coffee-lex-9.1.5.tgz#6f46f33df539de3c00831d47bbe115991336aa4e" integrity sha512-94lUMjs1vhlV86vnbCCnnIYzR4oszuO4qJzKUuKOLidiksh/UyQFOzPusjmLJt6vy5CNB0d/KtaceqV84zr46g== -coffee-loader@^0.9.0: +coffee-loader@0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.9.0.tgz#6deabd336062ddc6d773da4dfd16367fc7107bd6" integrity sha512-VSoQ5kWr6Yfjn4RDpVbba2XMs3XG1ZXtLakPRt8dNfUcNU9h+1pocpdUUEd7NK9rLDwrju4yonhxrL8aMr5tww== @@ -8581,7 +8589,7 @@ coffeeify@3.0.1: convert-source-map "^1.3.0" through2 "^2.0.0" -coffeescript@1.12.7, coffeescript@^1.12.7: +coffeescript@1.12.7: version "1.12.7" resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27" integrity sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA== @@ -24024,7 +24032,7 @@ ts-loader@7.0.4: micromatch "^4.0.0" semver "^6.0.0" -ts-loader@^8.0.1: +ts-loader@8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.1.tgz#9670dcbce2a8c8506d01a37fee042350d02c8c21" integrity sha512-I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ== @@ -24071,7 +24079,7 @@ ts-node@8.5.4: source-map-support "^0.5.6" yn "^3.0.0" -tsconfig-paths-webpack-plugin@^3.2.0: +tsconfig-paths-webpack-plugin@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz#6e70bd42915ad0efb64d3385163f0c1270f3e04d" integrity sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g== @@ -24090,7 +24098,7 @@ tsconfig-paths@^3.4.0: minimist "^1.2.0" strip-bom "^3.0.0" -tsconfig@^7.0.0: +tsconfig@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7" integrity sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw== @@ -25173,7 +25181,7 @@ webpack@4.41.6: watchpack "^1.6.0" webpack-sources "^1.4.1" -webpack@4.43.0, webpack@^4.43.0: +webpack@4.43.0: version "4.43.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g== From f1bcfb9fce824685e52707f5419991552179fbfd Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 10 Aug 2020 10:17:07 -0400 Subject: [PATCH 24/27] update snapshots --- .../1_typescript_support_spec.ts.js | 15 +---- .../server/__snapshots__/5_stdout_spec.js | 4 +- .../server/__snapshots__/7_record_spec.js | 58 +------------------ 3 files changed, 4 insertions(+), 73 deletions(-) diff --git a/packages/server/__snapshots__/1_typescript_support_spec.ts.js b/packages/server/__snapshots__/1_typescript_support_spec.ts.js index ca30a3c3a0d7..4911a6df2557 100644 --- a/packages/server/__snapshots__/1_typescript_support_spec.ts.js +++ b/packages/server/__snapshots__/1_typescript_support_spec.ts.js @@ -95,20 +95,7 @@ You may need an additional loader to handle the result of these loaders. | // The code below is ignored by eslint | // because it tests failing spec. > describe('fail', - > ); -| - @ multi ./cypress/integration/typescript_failing_spec.ts main[0] - -/foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts -./cypress/integration/typescript_failing_spec.ts -[tsl] ERROR in /foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts(3,19) - TS1109: Expression expected. - @ multi ./cypress/integration/typescript_failing_spec.ts main[0] - -/foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts -./cypress/integration/typescript_failing_spec.ts -[tsl] ERROR in /foo/bar/.projects/e2e/cypress/integration/typescript_failing_spec.ts(3,21) - TS1109: Expression expected. - @ multi ./cypress/integration/typescript_failing_spec.ts main[0] +| This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/packages/server/__snapshots__/5_stdout_spec.js b/packages/server/__snapshots__/5_stdout_spec.js index 046db7096894..8b8abed0ca38 100644 --- a/packages/server/__snapshots__/5_stdout_spec.js +++ b/packages/server/__snapshots__/5_stdout_spec.js @@ -148,9 +148,7 @@ SyntaxError: /foo/bar/.projects/e2e/cypress/integration/stdout_exit_early_failin > 1 | +> | ^ - 2 | - - @ multi ./cypress/integration/stdout_exit_early_failing_spec.js main[0] + 2 | This occurred while Cypress was compiling and bundling your test code. This is usually caused by: diff --git a/packages/server/__snapshots__/7_record_spec.js b/packages/server/__snapshots__/7_record_spec.js index a2c9c862c703..e2bd5bc4030d 100644 --- a/packages/server/__snapshots__/7_record_spec.js +++ b/packages/server/__snapshots__/7_record_spec.js @@ -29,33 +29,7 @@ The error was: Error: Webpack Compilation Error ./cypress/integration/record_error_spec.coffee Module not found: Error: Can't resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' -resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' - using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/integration) - Field 'browser' doesn't contain a valid alias configuration - using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/it/does/not/exist) - no extension - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist - .js - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.js doesn't exist - .json - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.json doesn't exist - .jsx - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist - .coffee - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist - .ts - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.ts doesn't exist - .tsx - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx doesn't exist - as directory - /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist +Looked for and couldn't find the file at the following paths: [/foo/bar/.projects/e2e/cypress/it/does/not/exist] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.json] @@ -64,7 +38,6 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' [/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] @ ./cypress/integration/record_error_spec.coffee 1:0-31 - @ multi ./cypress/integration/record_error_spec.coffee This occurred while Cypress was compiling and bundling your test code. This is usually caused by: @@ -983,33 +956,7 @@ The error was: Error: Webpack Compilation Error ./cypress/integration/record_error_spec.coffee Module not found: Error: Can't resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' -resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' - using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/integration) - Field 'browser' doesn't contain a valid alias configuration - using description file: /foo/bar/.projects/e2e/package.json (relative path: ./cypress/it/does/not/exist) - no extension - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist - .js - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.js doesn't exist - .json - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.json doesn't exist - .jsx - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.jsx doesn't exist - .coffee - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.coffee doesn't exist - .ts - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.ts doesn't exist - .tsx - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx doesn't exist - as directory - /foo/bar/.projects/e2e/cypress/it/does/not/exist doesn't exist +Looked for and couldn't find the file at the following paths: [/foo/bar/.projects/e2e/cypress/it/does/not/exist] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.js] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.json] @@ -1018,7 +965,6 @@ resolve '../it/does/not/exist' in '/foo/bar/.projects/e2e/cypress/integration' [/foo/bar/.projects/e2e/cypress/it/does/not/exist.ts] [/foo/bar/.projects/e2e/cypress/it/does/not/exist.tsx] @ ./cypress/integration/record_error_spec.coffee 1:0-31 - @ multi ./cypress/integration/record_error_spec.coffee This occurred while Cypress was compiling and bundling your test code. This is usually caused by: From 1ff11506bc913ad151e7950f213fb2a9130d3fd3 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 10 Aug 2020 10:33:22 -0400 Subject: [PATCH 25/27] put back snapshot --- .../server/__snapshots__/7_record_spec.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/server/__snapshots__/7_record_spec.js b/packages/server/__snapshots__/7_record_spec.js index e2bd5bc4030d..c4c3303effa1 100644 --- a/packages/server/__snapshots__/7_record_spec.js +++ b/packages/server/__snapshots__/7_record_spec.js @@ -771,6 +771,26 @@ exports['e2e record api interaction errors uploading assets warns but proceeds 1 ` +exports['e2e record misconfiguration errors and exits when no browser found 1'] = ` +Can't run because you've entered an invalid browser name. + +Browser: 'browserDoesNotExist' was not found on your system or is not supported by Cypress. + +Cypress supports the following browsers: +- chrome +- chromium +- edge +- electron +- firefox (Cypress support in beta) + +You can also use a custom browser: https://on.cypress.io/customize-browsers + +Available browsers found on your system are: +- browser1 +- browser2 +- browser3 +` + exports['e2e record misconfiguration errors and exits when no specs found 1'] = ` Can't run because no spec files were found. From d6248a7422604c3c820204c9bcaa7cec08477efa Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 10 Aug 2020 10:33:56 -0400 Subject: [PATCH 26/27] update snapshot --- .../1_busted_support_file_spec.js | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/packages/server/__snapshots__/1_busted_support_file_spec.js b/packages/server/__snapshots__/1_busted_support_file_spec.js index df70ca0ad9f1..13f96bdac038 100644 --- a/packages/server/__snapshots__/1_busted_support_file_spec.js +++ b/packages/server/__snapshots__/1_busted_support_file_spec.js @@ -24,33 +24,7 @@ The error was: Error: Webpack Compilation Error ./cypress/support/index.js Module not found: Error: Can't resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/support' -resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/support' - using description file: [..] (relative path: ./.projects/busted-support-file/cypress/support) - Field 'browser' doesn't contain a valid alias configuration - using description file: [..] (relative path: ./.projects/busted-support-file/cypress/support/does/not/exist) - no extension - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist doesn't exist - .js - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.js doesn't exist - .json - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.json doesn't exist - .jsx - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.jsx doesn't exist - .coffee - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.coffee doesn't exist - .ts - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.ts doesn't exist - .tsx - Field 'browser' doesn't contain a valid alias configuration - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.tsx doesn't exist - as directory - /foo/bar/.projects/busted-support-file/cypress/support/does/not/exist doesn't exist +Looked for and couldn't find the file at the following paths: [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.js] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.json] @@ -59,7 +33,6 @@ resolve './does/not/exist' in '/foo/bar/.projects/busted-support-file/cypress/su [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.ts] [/foo/bar/.projects/busted-support-file/cypress/support/does/not/exist.tsx] @ ./cypress/support/index.js 3:0-27 - @ multi ./cypress/support/index.js This occurred while Cypress was compiling and bundling your test code. This is usually caused by: From cfe53952bed538a53fb7653de42a2d644c2ef374 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Mon, 10 Aug 2020 11:37:11 -0400 Subject: [PATCH 27/27] update snapshot --- packages/server/__snapshots__/1_es_modules_spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/server/__snapshots__/1_es_modules_spec.js b/packages/server/__snapshots__/1_es_modules_spec.js index f0f300c23bc6..07b9c4ae4b8a 100644 --- a/packages/server/__snapshots__/1_es_modules_spec.js +++ b/packages/server/__snapshots__/1_es_modules_spec.js @@ -96,7 +96,6 @@ SyntaxError: /foo/bar/.projects/e2e/lib/fail.js: Unexpected token (2:0) | ^ @ ./cypress/integration/es_module_import_failing_spec.js 3:0-25 - @ multi ./cypress/integration/es_module_import_failing_spec.js This occurred while Cypress was compiling and bundling your test code. This is usually caused by: