From 7a9f4aef55fddba5b9a019d74f2a0fa758598d8b Mon Sep 17 00:00:00 2001 From: Chris Thoburn Date: Wed, 18 Dec 2024 17:11:22 -0800 Subject: [PATCH] updates to match v2 main --- .github/workflows/compat-tests.yml | 1 + .github/workflows/docs-and-blueprint-tests.yml | 1 + .github/workflows/enforce-pr-labels-canary.yml | 1 + .vscode/settings.json | 1 + config/eslint/typescript.js | 1 + package.json | 6 +++--- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compat-tests.yml b/.github/workflows/compat-tests.yml index 5b57a7f2da9..4109f4bb655 100644 --- a/.github/workflows/compat-tests.yml +++ b/.github/workflows/compat-tests.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - main + - v4-main env: TURBO_API: http://127.0.0.1:9080 diff --git a/.github/workflows/docs-and-blueprint-tests.yml b/.github/workflows/docs-and-blueprint-tests.yml index dbc6cf0f154..cccb7c87741 100644 --- a/.github/workflows/docs-and-blueprint-tests.yml +++ b/.github/workflows/docs-and-blueprint-tests.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - main + - v4-main env: TURBO_API: http://127.0.0.1:9080 diff --git a/.github/workflows/enforce-pr-labels-canary.yml b/.github/workflows/enforce-pr-labels-canary.yml index c782bc9efde..f44a43aa157 100644 --- a/.github/workflows/enforce-pr-labels-canary.yml +++ b/.github/workflows/enforce-pr-labels-canary.yml @@ -5,6 +5,7 @@ on: types: [labeled, unlabeled, opened, reopened] branches: - main + - v4-main concurrency: group: pr-labels-canary-${{ github.head_ref || github.ref_name }} diff --git a/.vscode/settings.json b/.vscode/settings.json index 9cc56b34eb7..d43d5af120c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -49,5 +49,6 @@ "typescript.preferences.importModuleSpecifier": "project-relative", "bun.debugTerminal.enabled": true, "eslint.debug": true, + "eslint.runtime": "node", "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/config/eslint/typescript.js b/config/eslint/typescript.js index a3b7fe4725e..6e0f8563697 100644 --- a/config/eslint/typescript.js +++ b/config/eslint/typescript.js @@ -23,6 +23,7 @@ function mergeTsConfigs(configArray) { export function rules(config = {}) { const ourRules = { + '@typescript-eslint/no-base-to-string': 'off', '@typescript-eslint/no-invalid-void-type': 'off', '@typescript-eslint/no-non-null-assertion': 'off', '@typescript-eslint/adjacent-overload-signatures': 'error', diff --git a/package.json b/package.json index a33b19650fe..a9b60c9434d 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,11 @@ "test": "pnpm run _task:sync-hardlinks; pnpm turbo test --concurrency=1", "test:production": "pnpm run _task:sync-hardlinks; pnpm turbo test:production --concurrency=1", "test:try-one": "pnpm --filter main-test-app run test:try-one", - "test:docs": "FORCE_COLOR=2 pnpm build:docs && pnpm run -r --workspace-concurrency=-1 --if-present test:docs", + "test:docs": "FORCE_COLOR=2 pnpm build:docs && pnpm run -r --workspace-concurrency=-1 --reporter=append-only --reporter-hide-prefix --if-present test:docs", "test:blueprints": "pnpm run -r --workspace-concurrency=-1 --if-present test:blueprints", "test:fastboot": "pnpm run -r --workspace-concurrency=-1 --if-present test:fastboot", - "test:vite": "pnpm run -r ---workspace-concurrency=-1 --if-present test:vite", - "test:embroider": "pnpm run -r ---workspace-concurrency=-1 --if-present test:embroider" + "test:embroider": "pnpm run -r ---workspace-concurrency=-1 --if-present test:embroider", + "test:vite": "pnpm run -r ---workspace-concurrency=-1 --if-present test:vite" }, "devDependencies": { "@babel/core": "^7.24.5",