From 8a4134761f09d0d97fb15f297705fd8644fef920 Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Fri, 27 Dec 2019 19:42:30 -0500 Subject: [PATCH] Update to latest typescript version (#274) --- package-lock.json | 12 ++++++------ package.json | 4 ++-- packages/exec/__tests__/exec.test.ts | 8 ++------ packages/exec/src/toolrunner.ts | 14 +++----------- packages/io/__tests__/io.test.ts | 12 ++++++------ packages/tool-cache/src/tool-cache.ts | 8 ++------ 6 files changed, 21 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90a0da8a..63913c62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11563,9 +11563,9 @@ "dev": true }, "prettier": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.17.0.tgz", - "integrity": "sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", + "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "dev": true }, "prettier-linter-helpers": { @@ -13134,9 +13134,9 @@ "dev": true }, "typescript": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz", - "integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", + "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 563eab1e..c50ab127 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ "jest": "^24.9.0", "jest-circus": "^24.7.1", "lerna": "^3.18.4", - "prettier": "^1.17.0", + "prettier": "^1.19.1", "ts-jest": "^24.0.2", - "typescript": "^3.6.2" + "typescript": "^3.7.4" } } diff --git a/packages/exec/__tests__/exec.test.ts b/packages/exec/__tests__/exec.test.ts index 4cf322f5..387c83f5 100644 --- a/packages/exec/__tests__/exec.test.ts +++ b/packages/exec/__tests__/exec.test.ts @@ -748,9 +748,7 @@ describe('@actions/exec', () => { const exitCode = await exec.exec(`"${cmdPath}"`, args, options) expect(exitCode).toBe(0) expect(outStream.getContents().split(os.EOL)[0]).toBe( - `[command]${ - process.env.ComSpec - } /D /S /C ""${cmdPath}" "my arg 1" "my arg 2""` + `[command]${process.env.ComSpec} /D /S /C ""${cmdPath}" "my arg 1" "my arg 2""` ) expect(output.trim()).toBe( 'args[0]: "my arg 1"\r\n' + @@ -780,9 +778,7 @@ describe('@actions/exec', () => { const exitCode = await exec.exec(`${cmd}`, args, options) expect(exitCode).toBe(0) expect(outStream.getContents().split(os.EOL)[0]).toBe( - `[command]${ - process.env.ComSpec - } /D /S /C "${cmdPath} "my arg 1" "my arg 2""` + `[command]${process.env.ComSpec} /D /S /C "${cmdPath} "my arg 1" "my arg 2""` ) expect(output.trim()).toBe( 'args[0]: "my arg 1"\r\n' + diff --git a/packages/exec/src/toolrunner.ts b/packages/exec/src/toolrunner.ts index 2182fedd..c578b258 100644 --- a/packages/exec/src/toolrunner.ts +++ b/packages/exec/src/toolrunner.ts @@ -639,23 +639,15 @@ class ExecState extends events.EventEmitter { if (this.processExited) { if (this.processError) { error = new Error( - `There was an error when attempting to execute the process '${ - this.toolPath - }'. This may indicate the process failed to start. Error: ${ - this.processError - }` + `There was an error when attempting to execute the process '${this.toolPath}'. This may indicate the process failed to start. Error: ${this.processError}` ) } else if (this.processExitCode !== 0 && !this.options.ignoreReturnCode) { error = new Error( - `The process '${this.toolPath}' failed with exit code ${ - this.processExitCode - }` + `The process '${this.toolPath}' failed with exit code ${this.processExitCode}` ) } else if (this.processStderr && this.options.failOnStdErr) { error = new Error( - `The process '${ - this.toolPath - }' failed because one or more lines were written to the STDERR stream` + `The process '${this.toolPath}' failed because one or more lines were written to the STDERR stream` ) } } diff --git a/packages/io/__tests__/io.test.ts b/packages/io/__tests__/io.test.ts index 3fd12ea7..80438959 100644 --- a/packages/io/__tests__/io.test.ts +++ b/packages/io/__tests__/io.test.ts @@ -1171,9 +1171,9 @@ describe('which', () => { const originalPath = process.env['PATH'] try { // modify PATH - process.env['PATH'] = `${process.env['PATH']}${ - path.delimiter - }${testPath}` + process.env[ + 'PATH' + ] = `${process.env['PATH']}${path.delimiter}${testPath}` // find each file for (const fileName of Object.keys(files)) { @@ -1244,9 +1244,9 @@ describe('which', () => { await fs.writeFile(notExpectedFilePath, '') const originalPath = process.env['PATH'] try { - process.env['PATH'] = `${process.env['PATH']}${ - path.delimiter - }${testPath}` + process.env[ + 'PATH' + ] = `${process.env['PATH']}${path.delimiter}${testPath}` expect(await io.which(fileName)).toBe(expectedFilePath) } finally { process.env['PATH'] = originalPath diff --git a/packages/tool-cache/src/tool-cache.ts b/packages/tool-cache/src/tool-cache.ts index 87265ff9..78cd5541 100644 --- a/packages/tool-cache/src/tool-cache.ts +++ b/packages/tool-cache/src/tool-cache.ts @@ -76,9 +76,7 @@ export async function downloadTool( if (response.message.statusCode !== 200) { const err = new HTTPError(response.message.statusCode) core.debug( - `Failed to download from "${url}". Code(${ - response.message.statusCode - }) Message(${response.message.statusMessage})` + `Failed to download from "${url}". Code(${response.message.statusCode}) Message(${response.message.statusMessage})` ) throw err } @@ -93,9 +91,7 @@ export async function downloadTool( }) } catch (err) { core.debug( - `Failed to download from "${url}". Code(${ - response.message.statusCode - }) Message(${response.message.statusMessage})` + `Failed to download from "${url}". Code(${response.message.statusCode}) Message(${response.message.statusMessage})` ) reject(err) }