From fe5cf1f267c0103226dedcf55e48ad39cd8b78a5 Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Fri, 30 Aug 2024 13:56:56 +0200 Subject: [PATCH] Shorter task names Signed-off-by: Timo Stamm --- .github/workflows/conformance-web.yaml | 4 ++-- packages/connect-web/conformance/README.md | 4 ++-- packages/connect-web/package.json | 18 +++++++------- packages/connect-web/turbo.json | 28 +++++++++++----------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/conformance-web.yaml b/.github/workflows/conformance-web.yaml index 20d826cc6..807e89f63 100644 --- a/.github/workflows/conformance-web.yaml +++ b/.github/workflows/conformance-web.yaml @@ -40,7 +40,7 @@ jobs: key: ${{ runner.os }}/web-conformance/${{ github.sha }} restore-keys: ${{ runner.os }}/web-conformance - run: npm ci - - run: npx turbo run conformance:client:${{matrix.browser}}:${{matrix.client}} --output-logs new-only --log-order stream + - run: npx turbo run conformance:${{matrix.browser}}:${{matrix.client}} --filter '@connectrpc/connect-web' --output-logs new-only --log-order stream node: runs-on: ubuntu-22.04 strategy: @@ -61,4 +61,4 @@ jobs: key: ${{ runner.os }}/web-conformance/${{ github.sha }} restore-keys: ${{ runner.os }}/web-conformance - run: npm ci - - run: npx turbo run conformance:client:node:${{matrix.client}} --output-logs new-only --log-order stream + - run: npx turbo run conformance:node:${{matrix.client}} --filter '@connectrpc/connect-web' --output-logs new-only --log-order stream diff --git a/packages/connect-web/conformance/README.md b/packages/connect-web/conformance/README.md index 4d9ed5681..4997b59f9 100644 --- a/packages/connect-web/conformance/README.md +++ b/packages/connect-web/conformance/README.md @@ -20,12 +20,12 @@ For every environment, two client flavors are available: For every combination, a task is available: -`npx turbo run conformance:client::` +`npx turbo run conformance::` ## Using a local browser To launch a browser window with access to the browser's network inspector, append the `--openBrowser` flag to the npm script: ``` -npx turbo run conformance:client:chrome:promise -- --openBrowser +npx turbo run conformance:chrome:promise -- --openBrowser ``` diff --git a/packages/connect-web/package.json b/packages/connect-web/package.json index cbf1572eb..d73677f80 100644 --- a/packages/connect-web/package.json +++ b/packages/connect-web/package.json @@ -12,15 +12,15 @@ "build": "npm run build:cjs && npm run build:esm", "build:cjs": "tsc --project tsconfig.build.json --module commonjs --verbatimModuleSyntax false --moduleResolution node10 --outDir ./dist/cjs --declaration --declarationDir ./dist/cjs && echo >./dist/cjs/package.json '{\"type\":\"commonjs\"}'", "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm --declaration --declarationDir ./dist/esm", - "conformance:client:safari": "npm run conformance:client:safari:promise && npm run conformance:client:safari:callback", - "conformance:client:safari:promise": "connectconformance --mode client --conf ./conformance/conformance-web.yaml -- tsx ./conformance/client.ts --browser safari", - "conformance:client:safari:callback": "connectconformance --mode client --conf ./conformance/conformance-web.yaml --known-failing @./conformance/known-failing-callback-client.txt -- tsx ./conformance/client.ts --browser safari --useCallbackClient", - "conformance:client:chrome:promise": "connectconformance --mode client --conf ./conformance/conformance-web.yaml -- tsx ./conformance/client.ts --browser chrome", - "conformance:client:chrome:callback": "connectconformance --mode client --conf ./conformance/conformance-web.yaml --known-failing @./conformance/known-failing-callback-client.txt -- tsx ./conformance/client.ts --browser chrome --useCallbackClient", - "conformance:client:firefox:promise": "connectconformance --mode client --conf ./conformance/conformance-web.yaml -- tsx ./conformance/client.ts --browser firefox", - "conformance:client:firefox:callback": "connectconformance --mode client --conf ./conformance/conformance-web.yaml --known-failing @./conformance/known-failing-callback-client.txt -- tsx ./conformance/client.ts --browser firefox --useCallbackClient", - "conformance:client:node:promise": "connectconformance --mode client --conf ./conformance/conformance-web-node.yaml -- tsx ./conformance/client.ts --browser node", - "conformance:client:node:callback": "connectconformance --mode client --conf ./conformance/conformance-web-node.yaml --known-failing @./conformance/known-failing-callback-client.txt -- tsx ./conformance/client.ts --browser node --useCallbackClient", + "conformance:client:safari": "npm run conformance:safari:promise && npm run conformance:client:safari:callback", + "conformance:safari:promise": "connectconformance --mode client --conf conformance/conformance-web.yaml -- tsx conformance/client.ts --browser safari", + "conformance:client:safari:callback": "connectconformance --mode client --conf conformance/conformance-web.yaml --known-failing @conformance/known-failing-callback-client.txt -- tsx conformance/client.ts --browser safari --useCallbackClient", + "conformance:chrome:promise": "connectconformance --mode client --conf conformance/conformance-web.yaml -- tsx conformance/client.ts --browser chrome", + "conformance:chrome:callback": "connectconformance --mode client --conf conformance/conformance-web.yaml --known-failing @conformance/known-failing-callback-client.txt -- tsx conformance/client.ts --browser chrome --useCallbackClient", + "conformance:firefox:promise": "connectconformance --mode client --conf conformance/conformance-web.yaml -- tsx conformance/client.ts --browser firefox", + "conformance:firefox:callback": "connectconformance --mode client --conf conformance/conformance-web.yaml --known-failing @conformance/known-failing-callback-client.txt -- tsx conformance/client.ts --browser firefox --useCallbackClient", + "conformance:node:promise": "connectconformance --mode client --conf conformance/conformance-web-node.yaml -- tsx conformance/client.ts --browser node", + "conformance:node:callback": "connectconformance --mode client --conf conformance/conformance-web-node.yaml --known-failing @conformance/known-failing-callback-client.txt -- tsx conformance/client.ts --browser node --useCallbackClient", "test": "jasmine --config=jasmine.json", "generate": "buf generate --template browserstack/buf.gen.yaml", "postgenerate": "license-header browserstack/gen", diff --git a/packages/connect-web/turbo.json b/packages/connect-web/turbo.json index d7d3aa060..53701772e 100644 --- a/packages/connect-web/turbo.json +++ b/packages/connect-web/turbo.json @@ -12,20 +12,20 @@ }, "conformance": { "dependsOn": [ - "conformance:client:safari", - "conformance:client:chrome:promise", - "conformance:client:chrome:callback", - "conformance:client:firefox:promise", - "conformance:client:firefox:callback", - "conformance:client:node:promise", - "conformance:client:node:callback" + "conformance:safari", + "conformance:chrome:promise", + "conformance:chrome:callback", + "conformance:firefox:promise", + "conformance:firefox:callback", + "conformance:node:promise", + "conformance:node:callback" ] }, "conformance:client:safari": { "cache": false, "dependsOn": ["^build"] }, - "conformance:client:safari:promise": { + "conformance:safari:promise": { "cache": false, "dependsOn": ["^build"] }, @@ -33,27 +33,27 @@ "cache": false, "dependsOn": ["^build"] }, - "conformance:client:chrome:promise": { + "conformance:chrome:promise": { "cache": false, "dependsOn": ["^build"] }, - "conformance:client:chrome:callback": { + "conformance:chrome:callback": { "cache": false, "dependsOn": ["^build"] }, - "conformance:client:firefox:promise": { + "conformance:firefox:promise": { "cache": false, "dependsOn": ["^build"] }, - "conformance:client:firefox:callback": { + "conformance:firefox:callback": { "cache": false, "dependsOn": ["^build"] }, - "conformance:client:node:promise": { + "conformance:node:promise": { "cache": false, "dependsOn": ["^build"] }, - "conformance:client:node:callback": { + "conformance:node:callback": { "cache": false, "dependsOn": ["^build"] }