From 0e632635cd37ea23fa6da4af28a31fb9091ca773 Mon Sep 17 00:00:00 2001 From: Zach Bloomquist Date: Fri, 5 Jun 2020 14:45:40 -0400 Subject: [PATCH] chore: rm non-test-related coffeescript references --- CONTRIBUTING.md | 1 - coffeelint.json | 135 ------------------ package.json | 18 ++- packages/coffee/index.js | 1 - packages/coffee/package.json | 15 -- packages/coffee/register.js | 20 --- packages/driver/package.json | 1 - packages/driver/ts/import-coffee.d.ts | 5 - packages/extension/gulpfile.js | 2 - packages/extension/index.js | 2 - packages/extension/package.json | 2 - packages/extension/test/mocha.opts | 1 - .../test/helpers/certs/regenerate-certs.sh | 2 +- packages/launcher/package.json | 1 - packages/launcher/test/mocha.opts | 2 +- packages/proxy/test/mocha.opts | 2 +- packages/reporter/test/mocha.opts | 2 +- packages/runner/test/.mocharc.json | 2 +- packages/runner/ts/import-coffee.d.ts | 5 - packages/server/README.md | 12 +- .../server/__snapshots__/3_plugins_spec.js | 6 +- .../server/__snapshots__/run_plugins_spec.js | 9 +- packages/server/index.js | 4 - packages/server/lib/fixture.js | 2 +- packages/server/lib/gui/menu.js | 4 +- packages/server/lib/plugins/child/index.js | 3 - packages/server/package.json | 7 +- packages/server/repl.js | 1 - .../test/integration/http_requests_spec.js | 2 +- packages/server/test/scripts/run.js | 5 +- .../support/fixtures/projects/.eslintrc.json | 5 +- .../{syntax_error.coffee => syntax_error.js} | 0 .../{syntax_error.coffee => syntax_error.js} | 0 .../{throws_error.coffee => throws_error.js} | 0 .../server/test/support/helpers/coverage.js | 34 ----- packages/server/test/support/helpers/e2e.ts | 2 +- .../unit/plugins/child/run_plugins_spec.js | 6 +- packages/server/ts/import-coffee.d.ts | 5 - packages/ts/register.js | 1 - packages/web-config/node-register.js | 2 - packages/web-config/package.json | 3 - packages/web-config/webpack.config.base.ts | 9 +- scripts/add-install-comment.js | 2 - scripts/binary.js | 1 - scripts/binary/build.js | 29 ---- scripts/rename_snapshots.js | 15 -- scripts/test-other-projects.js | 2 - yarn.lock | 63 +------- 48 files changed, 49 insertions(+), 404 deletions(-) delete mode 100644 coffeelint.json delete mode 100644 packages/coffee/index.js delete mode 100644 packages/coffee/package.json delete mode 100644 packages/coffee/register.js delete mode 100644 packages/driver/ts/import-coffee.d.ts delete mode 100644 packages/runner/ts/import-coffee.d.ts rename packages/server/test/support/fixtures/projects/failures/cypress/integration/{syntax_error.coffee => syntax_error.js} (100%) rename packages/server/test/support/fixtures/server/{syntax_error.coffee => syntax_error.js} (100%) rename packages/server/test/support/fixtures/server/{throws_error.coffee => throws_error.js} (100%) delete mode 100644 packages/server/test/support/helpers/coverage.js delete mode 100644 packages/server/ts/import-coffee.d.ts delete mode 100644 scripts/rename_snapshots.js diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6f49b0618b..3e27132ea9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -250,7 +250,6 @@ Here is a list of the core packages in this repository with a short description, | Folder Name | Package Name | Purpose | | :------------------------------------ | :---------------------- | :--------------------------------------------------------------------------- | | [cli](./cli) | `cypress` | The command-line tool that is packaged as an `npm` module. | - | [coffee](./packages/coffee) | `@packages/coffee` | A centralized version of CoffeeScript used for other packages. | | [desktop-gui](./packages/desktop-gui) | `@packages/desktop-gui` | The front-end code for the Cypress Desktop GUI. | | [driver](./packages/driver) | `@packages/driver` | The code that is used to drive the behavior of the API commands. | | [electron](./packages/electron) | `@packages/electron` | The Cypress implementation of Electron. | diff --git a/coffeelint.json b/coffeelint.json deleted file mode 100644 index 05bd191208..0000000000 --- a/coffeelint.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "arrow_spacing": { - "level": "ignore" - }, - "braces_spacing": { - "level": "ignore", - "spaces": 0, - "empty_object_spaces": 0 - }, - "camel_case_classes": { - "level": "error" - }, - "coffeescript_error": { - "level": "error" - }, - "colon_assignment_spacing": { - "level": "ignore", - "spacing": { - "left": 0, - "right": 1 - } - }, - "cyclomatic_complexity": { - "level": "ignore", - "value": 10 - }, - "duplicate_key": { - "level": "error" - }, - "empty_constructor_needs_parens": { - "level": "error" - }, - "ensure_comprehensions": { - "level": "warn" - }, - "eol_last": { - "level": "error" - }, - "indentation": { - "value": 2, - "level": "error" - }, - "line_endings": { - "level": "ignore", - "value": "unix" - }, - "max_line_length": { - "value": 100, - "level": "ignore", - "limitComments": true - }, - "missing_fat_arrows": { - "level": "ignore", - "is_strict": false - }, - "newlines_after_classes": { - "value": 3, - "level": "ignore" - }, - "no_backticks": { - "level": "error" - }, - "no_debugger": { - "level": "warn", - "console": false - }, - "no_empty_functions": { - "level": "ignore" - }, - "no_empty_param_list": { - "level": "ignore" - }, - "no_implicit_braces": { - "level": "error", - "strict": true - }, - "no_implicit_parens": { - "level": "ignore", - "strict": true - }, - "no_interpolation_in_single_quotes": { - "level": "error" - }, - "no_nested_string_interpolation": { - "level": "warn" - }, - "no_plusplus": { - "level": "ignore" - }, - "no_private_function_fat_arrows": { - "level": "ignore" - }, - "no_stand_alone_at": { - "level": "ignore" - }, - "no_tabs": { - "level": "error" - }, - "no_this": { - "level": "error" - }, - "no_throwing_strings": { - "level": "error" - }, - "no_trailing_semicolons": { - "level": "error" - }, - "no_trailing_whitespace": { - "level": "error", - "allowed_in_comments": false, - "allowed_in_empty_lines": true - }, - "no_unnecessary_double_quotes": { - "level": "ignore" - }, - "no_unnecessary_fat_arrows": { - "level": "ignore" - }, - "non_empty_constructor_needs_parens": { - "level": "ignore" - }, - "prefer_english_operator": { - "level": "ignore", - "doubleNotLevel": "ignore" - }, - "space_operators": { - "level": "warn" - }, - "spacing_after_comma": { - "level": "ignore" - }, - "transform_messes_up_line_numbers": { - "level": "warn" - } -} diff --git a/package.json b/package.json index adcb2d979e..4ccf46c045 100644 --- a/package.json +++ b/package.json @@ -48,20 +48,20 @@ "stop-only-all": "yarn stop-only --folder packages", "pretest": "yarn ensure-deps", "test": "yarn lerna exec yarn test --scope cypress --scope \"'@packages/{electron,extension,https-proxy,launcher,network,proxy,rewriter,reporter,runner,socket}'\"", - "test-debug": "lerna exec yarn test-debug --ignore \"'@packages/{coffee,desktop-gui,driver,root,static,web-config}'\"", + "test-debug": "lerna exec yarn test-debug --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"", "pretest-e2e": "yarn ensure-deps", - "test-e2e": "lerna exec yarn test-e2e --ignore \"'@packages/{coffee,desktop-gui,driver,root,static,web-config}'\"", - "test-integration": "lerna exec yarn test-integration --ignore \"'@packages/{coffee,desktop-gui,driver,root,static,web-config}'\"", + "test-e2e": "lerna exec yarn test-e2e --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"", + "test-integration": "lerna exec yarn test-integration --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"", "test-jscodeshift": "jest ./scripts/decaff", "test-mocha": "mocha --reporter spec scripts/spec.js", "test-mocha-snapshot": "mocha scripts/mocha-snapshot-spec.js", - "test-s3-api": "node -r ./packages/coffee/register -r ./packages/ts/register scripts/binary/s3-api-demo.ts", - "test-scripts": "mocha -r packages/coffee/register -r packages/ts/register --reporter spec 'scripts/unit/**/*spec.js'", - "test-scripts-watch": "yarn test-scripts --watch --watch-extensions 'ts,js,coffee'", + "test-s3-api": "node -r ./packages/ts/register scripts/binary/s3-api-demo.ts", + "test-scripts": "mocha -r packages/ts/register --reporter spec 'scripts/unit/**/*spec.js'", + "test-scripts-watch": "yarn test-scripts --watch --watch-extensions 'ts,js'", "pretest-unit": "yarn ensure-deps", - "test-unit": "lerna exec yarn test-unit --ignore \"'@packages/{coffee,desktop-gui,driver,root,static,web-config}'\"", + "test-unit": "lerna exec yarn test-unit --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"", "pretest-watch": "yarn ensure-deps", - "test-watch": "lerna exec yarn test-watch --ignore \"'@packages/{coffee,desktop-gui,driver,root,static,web-config}'\"", + "test-watch": "lerna exec yarn test-watch --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"", "type-check": "node scripts/type_check", "verify:mocha:results": "node ./scripts/verify_mocha_results", "prewatch": "yarn ensure-deps", @@ -138,7 +138,6 @@ "globby": "10.0.1", "gulp": "4.0.2", "gulp-awspublish": "4.0.0", - "gulp-coffee": "3.0.3", "gulp-debug": "4.0.0", "gulp-rename": "1.4.0", "hasha": "5.0.0", @@ -186,7 +185,6 @@ "through": "2.3.8", "ts-node": "8.3.0", "typescript": "3.7.4", - "vinyl-paths": "2.1.0", "wait-on": "3.3.0" }, "engines": { diff --git a/packages/coffee/index.js b/packages/coffee/index.js deleted file mode 100644 index 5525738529..0000000000 --- a/packages/coffee/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('coffeescript') diff --git a/packages/coffee/package.json b/packages/coffee/package.json deleted file mode 100644 index 703d11a34f..0000000000 --- a/packages/coffee/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@packages/coffee", - "version": "0.0.0", - "private": true, - "main": "index.js", - "scripts": { - "clean-deps": "rm -rf node_modules" - }, - "dependencies": { - "coffeescript": "1.12.7" - }, - "files": [ - "register.js" - ] -} diff --git a/packages/coffee/register.js b/packages/coffee/register.js deleted file mode 100644 index 2577e2cbf9..0000000000 --- a/packages/coffee/register.js +++ /dev/null @@ -1,20 +0,0 @@ -if (process.env.CYPRESS_INTERNAL_ENV !== 'production') { - require('coffeescript/register') - - // using hack found here to prevent problems with - // cypress coffee script being replaced by modules which - // use coffeescript/register - // https://github.com/abresas/register-coffee-coverage/blob/master/index.js - // remove when https://github.com/benbria/coffee-coverage/issues/69 is resolved - const loader = require.extensions['.coffee'] - - Object.defineProperty(require.extensions, '.coffee', { - get () { - return loader - }, - - set () { - return loader - }, - }) -} diff --git a/packages/driver/package.json b/packages/driver/package.json index adf4b57930..ba357bad6a 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -16,7 +16,6 @@ "@cypress/sinon-chai": "1.1.0", "@cypress/unique-selector": "0.4.2", "@cypress/what-is-circular": "1.0.1", - "@packages/coffee": "*", "@packages/network": "*", "@packages/runner": "*", "@packages/ts": "*", diff --git a/packages/driver/ts/import-coffee.d.ts b/packages/driver/ts/import-coffee.d.ts deleted file mode 100644 index afd1157db4..0000000000 --- a/packages/driver/ts/import-coffee.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -// allows Typescript to import .coffee files -declare module '*.coffee' { - const content: any - export default content -} diff --git a/packages/extension/gulpfile.js b/packages/extension/gulpfile.js index a48c97f0b9..6e1ac10a98 100644 --- a/packages/extension/gulpfile.js +++ b/packages/extension/gulpfile.js @@ -3,7 +3,6 @@ const pkg = require('./package.json') const gulp = require('gulp') const rimraf = require('rimraf') const source = require('vinyl-source-stream') -const coffeeify = require('coffeeify') const browserify = require('browserify') const cypressIcons = require('@cypress/icons') @@ -33,7 +32,6 @@ const manifest = (done) => { const background = () => { return browserify({ entries: 'app/init.js', - transform: coffeeify, }) .bundle() .pipe(source('background.js')) diff --git a/packages/extension/index.js b/packages/extension/index.js index 212c4a8623..35ee4527ed 100644 --- a/packages/extension/index.js +++ b/packages/extension/index.js @@ -1,3 +1 @@ -require('@packages/coffee/register') - module.exports = require('./lib/extension') diff --git a/packages/extension/package.json b/packages/extension/package.json index d7632b88a3..5a922e6742 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -21,11 +21,9 @@ }, "devDependencies": { "@cypress/icons": "0.7.0", - "@packages/coffee": "*", "@packages/socket": "*", "browserify": "16.3.0", "chai": "3.5.0", - "coffeeify": "3.0.1", "coffeescript": "1.12.7", "cross-env": "6.0.3", "eol": "0.9.1", diff --git a/packages/extension/test/mocha.opts b/packages/extension/test/mocha.opts index 6cf813fc8a..831ae85fda 100644 --- a/packages/extension/test/mocha.opts +++ b/packages/extension/test/mocha.opts @@ -1,5 +1,4 @@ test/unit test/integration --reporter spec ---compilers coffee:@packages/coffee/register --recursive diff --git a/packages/https-proxy/test/helpers/certs/regenerate-certs.sh b/packages/https-proxy/test/helpers/certs/regenerate-certs.sh index f5c25800d8..316364d39b 100755 --- a/packages/https-proxy/test/helpers/certs/regenerate-certs.sh +++ b/packages/https-proxy/test/helpers/certs/regenerate-certs.sh @@ -15,7 +15,7 @@ CA_PATH=../../../ca rm -rf $CA_PATH # ensure regular root CA exists -node -r "@packages/coffee/register" -e "require('@packages/https-proxy/lib/ca').create('$CA_PATH')" +node -e "require('@packages/https-proxy/lib/ca').create('$CA_PATH')" echo "remove and relink test CA pems" for f in ca client server diff --git a/packages/launcher/package.json b/packages/launcher/package.json index 76ba6abcb2..7387f2c685 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -22,7 +22,6 @@ "ramda": "0.24.1" }, "devDependencies": { - "@packages/coffee": "*", "@packages/ts": "*", "chai": "3.5.0", "chai-as-promised": "7.1.1", diff --git a/packages/launcher/test/mocha.opts b/packages/launcher/test/mocha.opts index 0e4853daae..3622a28170 100644 --- a/packages/launcher/test/mocha.opts +++ b/packages/launcher/test/mocha.opts @@ -1,4 +1,4 @@ test/unit ---compilers ts:@packages/ts/register,coffee:@packages/coffee/register +--compilers ts:@packages/ts/register --timeout 10000 --recursive diff --git a/packages/proxy/test/mocha.opts b/packages/proxy/test/mocha.opts index 7a20898f8d..49a6697b5f 100644 --- a/packages/proxy/test/mocha.opts +++ b/packages/proxy/test/mocha.opts @@ -1,5 +1,5 @@ test/unit ---compilers ts:@packages/ts/register,coffee:@packages/coffee/register +--compilers ts:@packages/ts/register --timeout 10000 --recursive --require test/pretest.ts diff --git a/packages/reporter/test/mocha.opts b/packages/reporter/test/mocha.opts index 307f1a0556..bdc4fc3bfb 100644 --- a/packages/reporter/test/mocha.opts +++ b/packages/reporter/test/mocha.opts @@ -1,3 +1,3 @@ --require @packages/web-config/node-register ---watch-extensions ts,jsx,tsx,coffee,js +--watch-extensions ts,jsx,tsx,js --file test/helper diff --git a/packages/runner/test/.mocharc.json b/packages/runner/test/.mocharc.json index 10adafe206..741f9e0f78 100644 --- a/packages/runner/test/.mocharc.json +++ b/packages/runner/test/.mocharc.json @@ -1,5 +1,5 @@ { "file": "test/helper.js", "require": "../web-config/node-register", - "extension": "ts,jsx,tsx,coffee,js" + "extension": "ts,jsx,tsx,js" } diff --git a/packages/runner/ts/import-coffee.d.ts b/packages/runner/ts/import-coffee.d.ts deleted file mode 100644 index afd1157db4..0000000000 --- a/packages/runner/ts/import-coffee.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -// allows Typescript to import .coffee files -declare module '*.coffee' { - const content: any - export default content -} diff --git a/packages/server/README.md b/packages/server/README.md index 6171618841..b1146b13f0 100644 --- a/packages/server/README.md +++ b/packages/server/README.md @@ -53,7 +53,7 @@ When running e2e tests, some test projects output verbose logs. To see them run ```bashtest-kitchensink yarn test -yarn test test/unit/api_spec.coffee +yarn test test/unit/api_spec.js ## or yarn test-unit api_spec ## shorthand, uses globbing to find spec ``` @@ -62,7 +62,7 @@ yarn test-unit api_spec ## shorthand, uses globbing to find spec ```bash yarn test -yarn test test/integration/cli_spec.coffee +yarn test test/integration/cli_spec.js ## or yarn test-integration cli_spec ## shorthand, uses globbing to find spec ``` @@ -71,14 +71,14 @@ yarn test-integration cli_spec ## shorthand, uses globbing to find spec ```bash yarn test -yarn test test/e2e/1_async_timeouts_spec.coffee +yarn test test/e2e/1_async_timeouts_spec.js ## or yarn test-e2e 1_async ## shorthand, uses globbing to find spec ``` To keep the browser open after a spec run (for easier debugging and iterating on specs), you can pass the `--no-exit` flag to the e2e test command. Live reloading due to spec changes should also work: ```sh -yarn test test/e2e/2_go_spec.coffee --browser chrome --no-exit +yarn test test/e2e/2_go_spec.js --browser chrome --no-exit ``` ### Updating snaphots @@ -86,7 +86,7 @@ yarn test test/e2e/2_go_spec.coffee --browser chrome --no-exit Prepend `SNAPSHOT_UPDATE=1` to any test command. See [`snap-shot-it` instructions](https://github.com/bahmutov/snap-shot-it#advanced-use) for more info. ```bash -SNAPSHOT_UPDATE=1 yarn test test/unit/api_spec.coffee -SNAPSHOT_UPDATE=1 yarn test test/integration/cli_spec.coffee +SNAPSHOT_UPDATE=1 yarn test test/unit/api_spec.js +SNAPSHOT_UPDATE=1 yarn test test/integration/cli_spec.js SNAPSHOT_UPDATE=1 yarn test-e2e 1_async ``` diff --git a/packages/server/__snapshots__/3_plugins_spec.js b/packages/server/__snapshots__/3_plugins_spec.js index 40b043f8ef..6f8fd40476 100644 --- a/packages/server/__snapshots__/3_plugins_spec.js +++ b/packages/server/__snapshots__/3_plugins_spec.js @@ -119,14 +119,14 @@ exports['e2e plugins can modify config from plugins 1'] = ` ` exports['e2e plugins catches invalid browsers list returned from plugins 1'] = ` -An invalid configuration value returned from the plugins file: \`cypress/plugins/index.coffee\` +An invalid configuration value returned from the plugins file: \`cypress/plugins/index.js\` Expected at least one browser ` exports['e2e plugins catches invalid browser returned from plugins 1'] = ` -An invalid configuration value returned from the plugins file: \`cypress/plugins/index.coffee\` +An invalid configuration value returned from the plugins file: \`cypress/plugins/index.js\` Found an error while validating the \`browsers\` list. Expected \`displayName\` to be a non-empty string. Instead the value was: \`{"name":"browser name","family":"chromium"}\` @@ -348,7 +348,7 @@ exports['e2e plugins calls after:screenshot for cy.screenshot() and failure scre ` exports['e2e plugins catches invalid viewportWidth returned from plugins 1'] = ` -An invalid configuration value returned from the plugins file: \`cypress/plugins/index.coffee\` +An invalid configuration value returned from the plugins file: \`cypress/plugins/index.js\` Expected \`viewportWidth\` to be a number. Instead the value was: \`"foo"\` diff --git a/packages/server/__snapshots__/run_plugins_spec.js b/packages/server/__snapshots__/run_plugins_spec.js index 1e473b41d3..cf0913892b 100644 --- a/packages/server/__snapshots__/run_plugins_spec.js +++ b/packages/server/__snapshots__/run_plugins_spec.js @@ -7,9 +7,12 @@ Error: error thrown by pluginsFile ` exports['lib/plugins/child/run_plugins sends error message if pluginsFile has syntax error 1'] = ` -syntax_error.coffee) error: missing } -{ -^ +syntax_error.js) + + + +SyntaxError: Unexpected end of input +[stack trace] ` exports['lib/plugins/child/run_plugins sends error message if pluginsFile does not export a function 1'] = ` diff --git a/packages/server/index.js b/packages/server/index.js index b6d7fee192..96f51f467a 100644 --- a/packages/server/index.js +++ b/packages/server/index.js @@ -19,15 +19,11 @@ require('graceful-fs').gracefulify(require('fs')) // all transpile should have been done already // and these calls should do nothing require('@packages/ts/register') -require('@packages/coffee/register') if (isRunningElectron) { require('./lib/util/process_profiler').start() } -require && require.extensions && delete require.extensions['.litcoffee'] -require && require.extensions && delete require.extensions['.coffee.md'] - // warn when deprecated callback apis are used in electron // https://github.com/electron/electron/blob/master/docs/api/process.md#processenablepromiseapis process.enablePromiseAPIs = process.env.CYPRESS_INTERNAL_ENV !== 'production' diff --git a/packages/server/lib/fixture.js b/packages/server/lib/fixture.js index 6a2216fa34..543f0acb3b 100644 --- a/packages/server/lib/fixture.js +++ b/packages/server/lib/fixture.js @@ -1,7 +1,7 @@ const path = require('path') const check = require('syntax-error') const debug = require('debug')('cypress:server:fixture') -const coffee = require('../../../packages/coffee') +const coffee = require('coffeescript') const Promise = require('bluebird') const jsonlint = require('jsonlint') const errors = require('./errors') diff --git a/packages/server/lib/gui/menu.js b/packages/server/lib/gui/menu.js index c7d819be85..fb7e899138 100644 --- a/packages/server/lib/gui/menu.js +++ b/packages/server/lib/gui/menu.js @@ -14,8 +14,8 @@ module.exports = { withDevTools: false, }) - // this set by modes/interactive.coffee and needs to be preserved if the menu - // is set again by launcher.coffee when the Electron browser is run + // this set by modes/interactive and needs to be preserved if the menu + // is set again by launcher when the Electron browser is run if (options.onLogOutClicked) { ({ onLogOutClicked } = options) } diff --git a/packages/server/lib/plugins/child/index.js b/packages/server/lib/plugins/child/index.js index 4258e1829b..c8bd4d47cd 100644 --- a/packages/server/lib/plugins/child/index.js +++ b/packages/server/lib/plugins/child/index.js @@ -1,7 +1,4 @@ require('graceful-fs').gracefulify(require('fs')) -require('@packages/coffee/register') -require && require.extensions && delete require.extensions['.litcoffee'] -require && require.extensions && delete require.extensions['.coffee.md'] const ipc = require('../util').wrapIpc(process) const { file: pluginsFile, projectRoot } = require('minimist')(process.argv.slice(2)) diff --git a/packages/server/package.json b/packages/server/package.json index 38273d63ca..727db45548 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -11,8 +11,6 @@ "repl": "node repl.js", "start": "node ../../scripts/cypress open --dev --global", "test": "node ./test/scripts/run.js", - "test-cov": "cross-env NODE_COVERAGE=true NODE_ENV=test CYPRESS_INTERNAL_ENV=test BLUEBIRD_DEBUG=1 xvfb-maybe istanbul cover node_modules/.bin/_mocha -- --opts ./test/support/mocha.opts", - "test-cov-process": "cross-env NODE_COVERAGE=true NODE_ENV=test CYPRESS_INTERNAL_ENV=test BLUEBIRD_DEBUG=1 istanbul cover --include-pid", "test-e2e": "node ./test/scripts/run.js --glob-in-dir=test/e2e", "test-integration": "node ./test/scripts/run.js --glob-in-dir=test/integration", "test-performance": "node ./test/scripts/run.js --glob-in-dir=test/performance", @@ -39,7 +37,7 @@ "chokidar": "3.2.2", "chrome-remote-interface": "0.28.2", "cli-table3": "0.5.1", - "coffeeify": "3.0.1", + "coffeescript": "1.12.7", "color-string": "1.5.3", "command-exists": "1.2.8", "common-tags": "1.8.0", @@ -130,7 +128,6 @@ "@cypress/debugging-proxy": "2.0.1", "@cypress/json-schemas": "5.34.2", "@cypress/sinon-chai": "1.1.0", - "@packages/coffee": "*", "@packages/desktop-gui": "*", "@packages/electron": "*", "@packages/example": "*", @@ -156,9 +153,7 @@ "chai-uuid": "1.0.6", "chokidar-cli": "1.2.2", "chrome-har-capturer": "0.13.4", - "coffee-coverage": "3.0.1", "coffeeify": "3.0.1", - "coffeescript": "1.12.7", "cors": "2.8.5", "cross-env": "6.0.3", "devtools-protocol": "0.0.734984", diff --git a/packages/server/repl.js b/packages/server/repl.js index 44c0ca610f..b7233d76d8 100644 --- a/packages/server/repl.js +++ b/packages/server/repl.js @@ -1,3 +1,2 @@ require('@packages/ts/register') -require('@packages/coffee/register') require('./lib/repl') diff --git a/packages/server/test/integration/http_requests_spec.js b/packages/server/test/integration/http_requests_spec.js index de88edfe63..30b44bea47 100644 --- a/packages/server/test/integration/http_requests_spec.js +++ b/packages/server/test/integration/http_requests_spec.js @@ -712,7 +712,7 @@ describe('Routes', () => { }) it('serves error javascript file when there\'s a syntax error', function () { - return this.rp('http://localhost:2020/__cypress/tests?p=cypress/integration/syntax_error.coffee') + return this.rp('http://localhost:2020/__cypress/tests?p=cypress/integration/syntax_error.js') .then((res) => { expect(res.statusCode).to.eq(200) expect(res.body).to.include('Cypress.action("spec:script:error", {') diff --git a/packages/server/test/scripts/run.js b/packages/server/test/scripts/run.js index 2d5e0d4c67..f30e816605 100644 --- a/packages/server/test/scripts/run.js +++ b/packages/server/test/scripts/run.js @@ -46,7 +46,7 @@ if (!run || !run.length) { It should look something like this: - $ yarn test ./test/unit/api_spec.coffee + $ yarn test ./test/unit/api_spec.js If you want to run all a specific group of tests: @@ -110,12 +110,11 @@ commandAndArguments.args.push( options['inspect-brk'] ? '40000000' : '10000', '--recursive', '-r @packages/ts/register', - '-r @packages/coffee/register', '--reporter', 'mocha-multi-reporters', '--reporter-options', 'configFile=../../mocha-reporter-config.json', - '--extension=js,coffee,ts', + '--extension=js,ts', // restore mocha 2.x behavior to force end process after spec run '--exit', ) diff --git a/packages/server/test/support/fixtures/projects/.eslintrc.json b/packages/server/test/support/fixtures/projects/.eslintrc.json index 03c9a6df3e..719b7041a7 100644 --- a/packages/server/test/support/fixtures/projects/.eslintrc.json +++ b/packages/server/test/support/fixtures/projects/.eslintrc.json @@ -7,5 +7,8 @@ }, "rules": { "mocha/no-global-tests": "off" - } + }, + "ignorePatterns": [ + "failures/cypress/integration/syntax_error.js" + ] } diff --git a/packages/server/test/support/fixtures/projects/failures/cypress/integration/syntax_error.coffee b/packages/server/test/support/fixtures/projects/failures/cypress/integration/syntax_error.js similarity index 100% rename from packages/server/test/support/fixtures/projects/failures/cypress/integration/syntax_error.coffee rename to packages/server/test/support/fixtures/projects/failures/cypress/integration/syntax_error.js diff --git a/packages/server/test/support/fixtures/server/syntax_error.coffee b/packages/server/test/support/fixtures/server/syntax_error.js similarity index 100% rename from packages/server/test/support/fixtures/server/syntax_error.coffee rename to packages/server/test/support/fixtures/server/syntax_error.js diff --git a/packages/server/test/support/fixtures/server/throws_error.coffee b/packages/server/test/support/fixtures/server/throws_error.js similarity index 100% rename from packages/server/test/support/fixtures/server/throws_error.coffee rename to packages/server/test/support/fixtures/server/throws_error.js diff --git a/packages/server/test/support/helpers/coverage.js b/packages/server/test/support/helpers/coverage.js deleted file mode 100644 index 3dbdff6c75..0000000000 --- a/packages/server/test/support/helpers/coverage.js +++ /dev/null @@ -1,34 +0,0 @@ -const path = require('path') -const coffeeCoverage = require('coffee-coverage') - -if (process.env['NODE_COVERAGE']) { - const projectRoot = path.resolve(__dirname, '../../..') - const coverageVar = coffeeCoverage.findIstanbulVariable() - - // Only write a coverage report if we"re not running inside of Istanbul. - const writeOnExit = coverageVar ? null : `${projectRoot}/coverage/coverage-coffee.json` - - coffeeCoverage.register({ - instrumentor: 'istanbul', - basePath: projectRoot, - exclude: ['/gulpfile.coffee', '/deploy', '/build', '/dist', '/tmp', '/test', '/spec', '/app', '/bower_components', '/cache', '/support', '/node_modules', '/.git', '/.cy', '/.projects'], - coverageVar, - writeOnExit, - initAll: true, - }) - - // using hack found here to prevent problems with - // coffee-coverage being replaced by modules which - // use coffeescript/register - // https://github.com/abresas/register-coffee-coverage/blob/master/index.js - const loader = require.extensions['.coffee'] - - Object.defineProperty(require.extensions, '.coffee', { - get () { - return loader - }, - set () { - return loader - }, - }) -} diff --git a/packages/server/test/support/helpers/e2e.ts b/packages/server/test/support/helpers/e2e.ts index 33ce55cebe..1ed61d76b4 100644 --- a/packages/server/test/support/helpers/e2e.ts +++ b/packages/server/test/support/helpers/e2e.ts @@ -453,7 +453,7 @@ const e2e = { throw new Error(` passing { exit: false } to e2e options is no longer supported Please pass the --no-exit flag to the test command instead - e.g. "yarn test test/e2e/1_async_timeouts_spec.coffee --no-exit" + e.g. "yarn test test/e2e/1_async_timeouts_spec.js --no-exit" `) } diff --git a/packages/server/test/unit/plugins/child/run_plugins_spec.js b/packages/server/test/unit/plugins/child/run_plugins_spec.js index 26d79f526e..8f27aa715c 100644 --- a/packages/server/test/unit/plugins/child/run_plugins_spec.js +++ b/packages/server/test/unit/plugins/child/run_plugins_spec.js @@ -47,7 +47,7 @@ describe('lib/plugins/child/run_plugins', () => { // path for substitute is relative to lib/plugins/child/plugins_child.js mockery.registerSubstitute( 'plugins-file', - Fixtures.path('server/throws_error.coffee'), + Fixtures.path('server/throws_error.js'), ) runPlugins(this.ipc, 'plugins-file', 'proj-root') @@ -60,13 +60,13 @@ describe('lib/plugins/child/run_plugins', () => { // path for substitute is relative to lib/plugins/child/plugins_child.js mockery.registerSubstitute( 'plugins-file', - Fixtures.path('server/syntax_error.coffee'), + Fixtures.path('server/syntax_error.js'), ) runPlugins(this.ipc, 'plugins-file', 'proj-root') expect(this.ipc.send).to.be.calledWith('load:error', 'PLUGINS_FILE_ERROR', 'plugins-file') - return snapshot(withoutColorCodes(withoutPath(this.ipc.send.lastCall.args[3]))) + return snapshot(withoutColorCodes(withoutPath(this.ipc.send.lastCall.args[3].replace(/( +at[^$]+$)+/g, '[stack trace]')))) }) it('sends error message if pluginsFile does not export a function', function () { diff --git a/packages/server/ts/import-coffee.d.ts b/packages/server/ts/import-coffee.d.ts deleted file mode 100644 index afd1157db4..0000000000 --- a/packages/server/ts/import-coffee.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -// allows Typescript to import .coffee files -declare module '*.coffee' { - const content: any - export default content -} diff --git a/packages/ts/register.js b/packages/ts/register.js index f5b34829c8..0b5b67a0bb 100644 --- a/packages/ts/register.js +++ b/packages/ts/register.js @@ -25,7 +25,6 @@ try { }) // do we need to prevent any other TypeScript hooks? - // like @packages/coffee/register.js does? } catch (e) { // continue running without TypeScript require hook log('Running without ts-node hook in environment "%s"', process.env.CYPRESS_INTERNAL_ENV) diff --git a/packages/web-config/node-register.js b/packages/web-config/node-register.js index 09b1cf5df7..7fe66473f7 100644 --- a/packages/web-config/node-register.js +++ b/packages/web-config/node-register.js @@ -1,5 +1,3 @@ -require('@packages/coffee/register') - require('@babel/register')({ 'plugins': [ // "istanbul", diff --git a/packages/web-config/package.json b/packages/web-config/package.json index 41f357502e..626f1aa545 100644 --- a/packages/web-config/package.json +++ b/packages/web-config/package.json @@ -10,7 +10,6 @@ "@babel/preset-react": "7.9.4", "@babel/preset-typescript": "7.9.0", "@babel/register": "7.9.0", - "@packages/coffee": "*", "@types/copy-webpack-plugin": "5.0.0", "@types/html-webpack-plugin": "3.2.1", "@types/jsdom": "12.2.4", @@ -24,8 +23,6 @@ "chai": "4.2.0", "chalk": "2.4.2", "clean-webpack-plugin": "2.0.2", - "coffee-loader": "0.9.0", - "coffeescript": "2.4.1", "css-loader": "2.1.1", "extract-text-webpack-plugin": "4.0.0-beta.0", "file-loader": "4.3.0", diff --git a/packages/web-config/webpack.config.base.ts b/packages/web-config/webpack.config.base.ts index a9e54fcf3e..289ce33f21 100644 --- a/packages/web-config/webpack.config.base.ts +++ b/packages/web-config/webpack.config.base.ts @@ -44,7 +44,7 @@ const getCommonConfig = () => { module: 'empty', }, resolve: { - extensions: ['.ts', '.js', '.jsx', '.tsx', '.coffee', '.scss', '.json'], + extensions: ['.ts', '.js', '.jsx', '.tsx', '.scss', '.json'], }, stats: { @@ -62,13 +62,6 @@ const getCommonConfig = () => { module: { rules: [ - { - test: /\.coffee/, - exclude: /node_modules/, - use: { - loader: require.resolve('coffee-loader'), - }, - }, { test: /\.(ts|js|jsx|tsx)$/, exclude: /node_modules/, diff --git a/scripts/add-install-comment.js b/scripts/add-install-comment.js index 2bfa32dbf6..18d50548d0 100644 --- a/scripts/add-install-comment.js +++ b/scripts/add-install-comment.js @@ -1,8 +1,6 @@ // this build utility script posts on the commit in the default branch "develop" // telling the user how they can install pre-release build of the Test Runner -require('@packages/coffee/register') - const la = require('lazy-ass') const is = require('check-more-types') const os = require('os') diff --git a/scripts/binary.js b/scripts/binary.js index 51582c9c35..6c83caca8c 100644 --- a/scripts/binary.js +++ b/scripts/binary.js @@ -1,5 +1,4 @@ /* eslint-disable no-console */ -require('@packages/coffee/register') require('@packages/ts/register') const command = process.argv[2] diff --git a/scripts/binary/build.js b/scripts/binary/build.js index 89034c78a8..3adebf23f0 100644 --- a/scripts/binary/build.js +++ b/scripts/binary/build.js @@ -4,14 +4,9 @@ const os = require('os') const del = require('del') const path = require('path') const cp = require('child_process') -const gulp = require('gulp') const chalk = require('chalk') const Promise = require('bluebird') -const gulpDebug = require('gulp-debug') -const gulpCoffee = require('gulp-coffee') const pluralize = require('pluralize') -const vinylPaths = require('vinyl-paths') -const coffee = require('@packages/coffee') const execa = require('execa') const electron = require('@packages/electron') const debug = require('debug')('cypress:binary') @@ -242,29 +237,6 @@ require('./packages/server')\ return packages.runAllCleanJs() } - const convertCoffeeToJs = function () { - log('#convertCoffeeToJs') - - // grab everything in src - // convert to js - return new Promise((resolve, reject) => { - return gulp.src([ - // include coffee files of packages - distDir('**', '*.coffee'), - - // except those in node_modules - `!${distDir('**', 'node_modules', '**', '*.coffee')}`, - ], { sourcemaps: true }) - .pipe(vinylPaths(del)) - .pipe(gulpDebug()) - .pipe(gulpCoffee({ - coffee, - })).pipe(gulp.dest(distDir())) - .on('end', resolve) - .on('error', reject) - }) - } - const getIconFilename = function (platform) { const filenames = { darwin: 'cypress.icns', @@ -451,7 +423,6 @@ require('./packages/server')\ .then(copyPackages) .then(npmInstallPackages) .then(createRootPackage) - .then(convertCoffeeToJs) .then(removeTypeScript) .then(cleanJs) .then(transformSymlinkRequires) diff --git a/scripts/rename_snapshots.js b/scripts/rename_snapshots.js deleted file mode 100644 index e774e8bf5f..0000000000 --- a/scripts/rename_snapshots.js +++ /dev/null @@ -1,15 +0,0 @@ -const fs = require('fs-extra') -const glob = require('glob') -const Promise = require('bluebird') - -const globAsync = Promise.promisify(glob) - -globAsync('packages/*/__snapshots__/*.coffee') -.map((file) => { - const renamed = `${file}.js` - - /* eslint-disable no-console */ - console.log('renaming', file, '->', renamed) - - return fs.rename(file, renamed) -}) diff --git a/scripts/test-other-projects.js b/scripts/test-other-projects.js index 34f9dd5207..d2e1676dc4 100644 --- a/scripts/test-other-projects.js +++ b/scripts/test-other-projects.js @@ -1,5 +1,3 @@ -require('@packages/coffee/register') - const la = require('lazy-ass') const is = require('check-more-types') const { getNameAndBinary, getJustVersion, getShortCommit } = require('./utils') diff --git a/yarn.lock b/yarn.lock index 8696c6a800..9fa903bd02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5184,7 +5184,7 @@ arg@4.1.3, arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.2, argparse@^1.0.7, "argparse@~ 1.0.0": +argparse@^1.0.7, "argparse@~ 1.0.0": version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -8414,29 +8414,11 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -coffee-coverage@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/coffee-coverage/-/coffee-coverage-3.0.1.tgz#4f6b1acf14a0125bbbaa17612e4b2f407f90c4e7" - integrity sha512-wY7ZYhxhQoG27XbJgWx2QUCi9xHrJO91+4RA7hjAWV2VVugZv3ULPXGGetI04SmFZeQ3rnZ1eFTdksi9LdEKqg== - dependencies: - argparse "^1.0.2" - coffeescript "^2.0.2" - lodash "^4.14.0" - minimatch "^3.0.2" - pkginfo ">=0.2.3" - coffee-lex@^9.1.5: version "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: - 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 "^1.0.2" - coffee-script@1.12.5: version "1.12.5" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346" @@ -8465,12 +8447,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.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.4.1.tgz#815fd337df0a34d49e74a98a6ebea9c3e7930f70" - integrity sha512-34GV1aHrsMpTaO3KfMJL40ZNuvKDR/g98THHnE9bQj8HjMaZvSrLik99WWqyMhRtbe8V5hpx5iLgdcSvM/S2wg== - -coffeescript@^2.0.2, coffeescript@^2.1.0, 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== @@ -13328,17 +13305,6 @@ gulp-cli@^2.2.0: v8flags "^3.0.1" yargs "^7.1.0" -gulp-coffee@3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/gulp-coffee/-/gulp-coffee-3.0.3.tgz#a44d749e323ef9f81d9ec494b2043377a422d71a" - integrity sha512-6z5IUo5VFRavi7YWY9Z5RoKgWL72iHnwSMjIVdewFSAT90XuCkK6bkp3WyTYRe+uBanD/0gKq27/W9Q00mXphw== - dependencies: - coffeescript "^2.1.0" - plugin-error "^1.0.0" - replace-ext "^1.0.0" - through2 "^2.0.1" - vinyl-sourcemaps-apply "^0.2.1" - gulp-debug@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/gulp-debug/-/gulp-debug-4.0.0.tgz#036f9539c3fb6af720e01a9ea5c195fc73f29d5b" @@ -19819,11 +19785,6 @@ pkg-up@^2.0.0: dependencies: find-up "^2.1.0" -pkginfo@>=0.2.3: - version "0.4.1" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff" - integrity sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8= - please-upgrade-node@^3.1.1: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -19860,7 +19821,7 @@ plugin-error@^0.1.2: arr-union "^2.0.1" extend-shallow "^1.1.2" -plugin-error@^1.0.0, plugin-error@^1.0.1: +plugin-error@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c" integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA== @@ -23022,7 +22983,7 @@ source-map@^0.4.2: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: +source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -24059,7 +24020,7 @@ through2-filter@^3.0.0: through2 "~2.0.0" xtend "~4.0.0" -through2@2.0.5, through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3: +through2@2.0.5, through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0, through2@~2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -25230,13 +25191,6 @@ vinyl-fs@^3.0.0, vinyl-fs@^3.0.3: vinyl "^2.0.0" vinyl-sourcemap "^1.1.0" -vinyl-paths@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/vinyl-paths/-/vinyl-paths-2.1.0.tgz#00820437cba38262cef8802d840f93e3392ee44b" - integrity sha1-AIIEN8ujgmLO+IAthA+T4zku5Es= - dependencies: - through2 "^2.0.0" - vinyl-source-stream@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-2.0.0.tgz#f38a5afb9dd1e93b65d550469ac6182ac4f54b8e" @@ -25258,13 +25212,6 @@ vinyl-sourcemap@^1.1.0: remove-bom-buffer "^3.0.0" vinyl "^2.0.0" -vinyl-sourcemaps-apply@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" - integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU= - dependencies: - source-map "^0.5.1" - vinyl@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"