diff options
| -rw-r--r-- | .ci/template.common.yml | 4 | ||||
| -rw-r--r-- | .ci/template.linux.yml | 2 | ||||
| -rw-r--r-- | .ci/template.mac.yml | 2 | ||||
| -rw-r--r-- | .ci/template.windows.yml | 2 | ||||
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | examples/test.ts | 2 | ||||
| -rwxr-xr-x | format.ts | 6 | ||||
| -rw-r--r-- | http/file_server_test.ts | 2 | ||||
| -rw-r--r-- | http/racing_server_test.ts | 2 | ||||
| -rw-r--r-- | http/server_test.ts | 2 | ||||
| -rw-r--r-- | installer/mod.ts | 2 | ||||
| -rw-r--r-- | installer/test.ts | 2 | ||||
| -rw-r--r-- | prettier/main_test.ts | 6 |
13 files changed, 19 insertions, 17 deletions
diff --git a/.ci/template.common.yml b/.ci/template.common.yml index 76c98c639..37813cd4e 100644 --- a/.ci/template.common.yml +++ b/.ci/template.common.yml @@ -2,5 +2,5 @@ parameters: exe_suffix: "" steps: - - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-write --allow-read format.ts --check - - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-net --allow-write --allow-read --allow-env --config=tsconfig.test.json test.ts
\ No newline at end of file + - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-write --allow-read --allow-env ./format.ts --check + - bash: deno${{ parameters.exe_suffix }} run --allow-run --allow-net --allow-write --allow-read --allow-env --config=tsconfig.test.json ./test.ts
\ No newline at end of file diff --git a/.ci/template.linux.yml b/.ci/template.linux.yml index a6bab1787..7dd12819d 100644 --- a/.ci/template.linux.yml +++ b/.ci/template.linux.yml @@ -1,5 +1,5 @@ steps: - - bash: npm install eslint@5.16.0 typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - bash: npm install eslint@5.16.0 typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin@1.13.0 @typescript-eslint/parser@1.13.0 eslint-config-prettier - template: ./template.unix.yml - bash: npx eslint **/*.ts --max-warnings=0 - template: ./template.common.yml diff --git a/.ci/template.mac.yml b/.ci/template.mac.yml index 45ebc0171..1f0481a9e 100644 --- a/.ci/template.mac.yml +++ b/.ci/template.mac.yml @@ -1,6 +1,6 @@ steps: - bash: npm install -g functional-red-black-tree - - bash: npm -g install eslint@5.16.0 typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - bash: npm -g install eslint@5.16.0 typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin@1.13.0 @typescript-eslint/parser@1.13.0 eslint-config-prettier - template: ./template.unix.yml - bash: eslint **/*.ts --max-warnings=0 - template: ./template.common.yml diff --git a/.ci/template.windows.yml b/.ci/template.windows.yml index 818294e14..fe5cc85a4 100644 --- a/.ci/template.windows.yml +++ b/.ci/template.windows.yml @@ -1,5 +1,5 @@ steps: - - bash: npm install eslint@5.16.0 typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-config-prettier + - bash: npm install eslint@5.16.0 typescript@$(TS_VERSION) @typescript-eslint/eslint-plugin@1.13.0 @typescript-eslint/parser@1.13.0 eslint-config-prettier - powershell: iwr https://deno.land/x/install/install.ps1 -out install.ps1; .\install.ps1 $(DENO_VERSION) - bash: echo "##vso[task.prependpath]C:\Users\VssAdministrator\.deno\\bin" - bash: npx eslint **/*.ts --max-warnings=0 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 206b44379..4cf282863 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - DENO_VERSION: "v0.12.0" + DENO_VERSION: "v0.15.0" TS_VERSION: "3.4.5" # TODO Try to get eslint to run under Deno, like prettier diff --git a/examples/test.ts b/examples/test.ts index 542a191bf..9887b1267 100644 --- a/examples/test.ts +++ b/examples/test.ts @@ -16,7 +16,7 @@ test(function t2(): void { test(async function catSmoke(): Promise<void> { const p = run({ args: [ - Deno.execPath, + Deno.execPath(), "run", "--allow-read", "examples/cat.ts", @@ -1,4 +1,4 @@ -#!/usr/bin/env -S deno run --allow-run --allow-write --allow-read +#!/usr/bin/env -S deno run --allow-run --allow-write --allow-read --allow-env // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. const { exit, args, execPath } = Deno; import { parse } from "./flags/mod.ts"; @@ -6,7 +6,7 @@ import { xrun } from "./prettier/util.ts"; async function main(opts): Promise<void> { const args = [ - execPath, + execPath(), "run", "--allow-write", "--allow-read", @@ -24,6 +24,8 @@ async function main(opts): Promise<void> { args.push("--check"); } + args.push("."); + exit((await xrun({ args }).status()).code); } diff --git a/http/file_server_test.ts b/http/file_server_test.ts index bac82e825..6623406d0 100644 --- a/http/file_server_test.ts +++ b/http/file_server_test.ts @@ -11,7 +11,7 @@ let fileServer: Deno.Process; async function startFileServer(): Promise<void> { fileServer = run({ args: [ - Deno.execPath, + Deno.execPath(), "run", "--allow-read", "--allow-net", diff --git a/http/racing_server_test.ts b/http/racing_server_test.ts index a34f915d5..6d1ed0277 100644 --- a/http/racing_server_test.ts +++ b/http/racing_server_test.ts @@ -8,7 +8,7 @@ import { TextProtoReader } from "../textproto/mod.ts"; let server: Deno.Process; async function startServer(): Promise<void> { server = run({ - args: [Deno.execPath, "run", "-A", "http/racing_server.ts"], + args: [Deno.execPath(), "run", "-A", "http/racing_server.ts"], stdout: "piped" }); // Once racing server is ready it will write to its stdout. diff --git a/http/server_test.ts b/http/server_test.ts index f16293f77..4a904a6f7 100644 --- a/http/server_test.ts +++ b/http/server_test.ts @@ -493,7 +493,7 @@ test({ async fn(): Promise<void> { // Runs a simple server as another process const p = Deno.run({ - args: [Deno.execPath, "http/testdata/simple_server.ts", "--allow-net"], + args: [Deno.execPath(), "http/testdata/simple_server.ts", "--allow-net"], stdout: "piped" }); diff --git a/installer/mod.ts b/installer/mod.ts index c38f1dbd4..d6ebedbd4 100644 --- a/installer/mod.ts +++ b/installer/mod.ts @@ -227,7 +227,7 @@ export async function install( // ensure script that is being installed exists const ps = run({ - args: [Deno.execPath, "fetch", "--reload", moduleUrl], + args: [Deno.execPath(), "fetch", "--reload", moduleUrl], stdout: "inherit", stderr: "inherit" }); diff --git a/installer/test.ts b/installer/test.ts index 2309be443..2fd36e91e 100644 --- a/installer/test.ts +++ b/installer/test.ts @@ -16,7 +16,7 @@ const isWindows = Deno.platform.os === "win"; async function startFileServer(): Promise<void> { fileServer = run({ args: [ - Deno.execPath, + Deno.execPath(), "run", "--allow-read", "--allow-net", diff --git a/prettier/main_test.ts b/prettier/main_test.ts index cb23079d2..c255ed7da 100644 --- a/prettier/main_test.ts +++ b/prettier/main_test.ts @@ -21,7 +21,7 @@ async function run( } const cmd = [ - execPath, + execPath(), "run", "--allow-run", "--allow-write", @@ -254,13 +254,13 @@ test(async function testPrettierReadFromStdin(): Promise<void> { ): Promise<void> { const inputCode = stdin; const p1 = Deno.run({ - args: [execPath, "./prettier/testdata/echox.ts", `${inputCode}`], + args: [execPath(), "./prettier/testdata/echox.ts", `${inputCode}`], stdout: "piped" }); const p2 = Deno.run({ args: [ - execPath, + execPath(), "run", "./prettier/main.ts", "--stdin", |