From b318eafdfc0a5cc31fe04234c3b8473e7597e6e5 Mon Sep 17 00:00:00 2001 From: Brian Mann Date: Thu, 1 Nov 2018 15:56:43 -0400 Subject: [PATCH] fix linting and typescript errors in launcher --- cli/lib/tasks/download.js | 1 + packages/launcher/lib/detect.ts | 1 + packages/launcher/lib/windows/index.ts | 1 + packages/launcher/package.json | 4 ++-- packages/ts/tsconfig.json | 4 ++-- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/lib/tasks/download.js b/cli/lib/tasks/download.js index 39b6bd48bc8e..1664d0c703be 100644 --- a/cli/lib/tasks/download.js +++ b/cli/lib/tasks/download.js @@ -18,6 +18,7 @@ const defaultBaseUrl = 'https://download.cypress.io/' const getBaseUrl = () => { if (util.getEnv('CYPRESS_DOWNLOAD_MIRROR')) { let baseUrl = util.getEnv('CYPRESS_DOWNLOAD_MIRROR') + if (!baseUrl.endsWith('/')) { baseUrl += '/' } diff --git a/packages/launcher/lib/detect.ts b/packages/launcher/lib/detect.ts index 11eba1c630bd..94c7151b749a 100644 --- a/packages/launcher/lib/detect.ts +++ b/packages/launcher/lib/detect.ts @@ -76,6 +76,7 @@ function checkOneBrowser(browser: Browser) { function detectBrowsers(): Bluebird { // we can detect same browser under different aliases // tell them apart by the full version property + // @ts-ignore const removeDuplicates = uniqBy(prop('version')) return Bluebird.mapSeries(browsers, checkOneBrowser) .then(_.compact) diff --git a/packages/launcher/lib/windows/index.ts b/packages/launcher/lib/windows/index.ts index 62f55240b99d..332c4edb8cc2 100644 --- a/packages/launcher/lib/windows/index.ts +++ b/packages/launcher/lib/windows/index.ts @@ -83,6 +83,7 @@ function getWindowsBrowser( } // on Windows using "--version" seems to always start the full // browser, no matter what one does. + // @ts-ignore const args: [string] = [ 'datafile', 'where', diff --git a/packages/launcher/package.json b/packages/launcher/package.json index 7e739dc3b74b..ba088b3a9ffd 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -34,6 +34,7 @@ "@types/lodash": "^4.14.64", "@types/mocha": "^2.2.41", "@types/node": "^7.0.18", + "@types/ramda": "^0.25.40", "bin-up": "^1.1.0", "chai": "^3.5.0", "prettier": "^1.7.0", @@ -42,8 +43,7 @@ "sinon-chai": "^2.8.0", "tslint": "5.8.0", "tslint-config-standard": "7.0.0", - "typescript": "2.6.2", - "@types/ramda": "0.24.14" + "typescript": "2.9.2" }, "dependencies": { "bluebird": "^3.5.0", diff --git a/packages/ts/tsconfig.json b/packages/ts/tsconfig.json index 83740bd8ed65..d87cb13adff8 100644 --- a/packages/ts/tsconfig.json +++ b/packages/ts/tsconfig.json @@ -32,13 +32,13 @@ "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ /* Module Resolution Options */ - "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "typeRoots": [], /* List of folders to include type definitions from. */ // "types": [] /* Type declaration files to be included in compilation. */ - // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ /* Source Map Options */ // "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */