Skip to content

Commit

Permalink
ci: enable renovate automerge, pin actions (#2012)
Browse files Browse the repository at this point in the history
* ci: enable renovate automerge, pin actions

* Remove test:format from Nx

* Use config@main

* Simplify publish.js

* Remove prettier from Nx
  • Loading branch information
lachlancollins authored Jul 23, 2024
1 parent eece47d commit 086af99
Show file tree
Hide file tree
Showing 14 changed files with 335 additions and 228 deletions.
5 changes: 3 additions & 2 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
"schedule:weekly",
":approveMajorUpdates",
":disablePeerDependencies",
":semanticCommits",
":semanticCommitTypeAll(chore)"
],
"ignorePresets": [":ignoreModulesAndTests"],
"labels": ["dependencies"],
"rangeStrategy": "bump",
"postUpdateOptions": ["pnpmDedupe"],
"semanticCommits": "enabled",
"packageRules": [
{
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch",
"matchCurrentVersion": ">=1.0.0",
"matchUpdateTypes": ["minor", "patch"]
"matchUpdateTypes": ["minor", "patch"],
"automerge": true
}
],
"ignoreDeps": [
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.1.7
- name: Setup Tools
uses: tanstack/config/.github/setup@main
- name: Fix formatting
run: pnpm prettier:write
- name: Apply fixes
uses: autofix-ci/action@dd55f44df8f7cdb7a6bf74c78677eb8acd40cd0a
uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
with:
commit-message: 'ci: apply automated fixes'
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ permissions:
jobs:
test-and-publish:
name: Test & Publish
if: github.repository == 'TanStack/router'
if: github.repository_owner == 'TanStack'
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.1.7
with:
fetch-depth: 0
- name: Start Nx Agents
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.1.7
with:
fetch-depth: 0
- name: Start Nx Agents
run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml"
- name: Setup Tools
uses: tanstack/config/.github/setup@main
- name: Get base and head commits for `nx affected`
uses: nrwl/nx-set-shas@v4
uses: nrwl/nx-set-shas@v4.0.6
with:
main-branch-name: main
- name: Run Checks
Expand All @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4.1.7
with:
fetch-depth: 0
- name: Setup Tools
Expand Down
5 changes: 0 additions & 5 deletions .prettierrc

This file was deleted.

2 changes: 1 addition & 1 deletion examples/react/wip-with-bling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@tanstack/bling": "^0.5.0",
"@tanstack/react-router": "^1.45.8",
"@tanstack/start": "^1.45.8",
"@tanstack/react-store": "^0.5.4",
"@tanstack/react-store": "^0.5.5",
"@tanstack/router-devtools": "^1.45.8",
"redaxios": "^0.5.1",
"fastify": "^4.28.1",
Expand Down
4 changes: 0 additions & 4 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
]
},
"targetDefaults": {
"test:format": {
"cache": true,
"inputs": ["{workspaceRoot}/**/*"]
},
"test:eslint": {
"cache": true,
"dependsOn": ["^build"],
Expand Down
13 changes: 4 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"clean": "pnpm --filter \"./packages/**\" run clean",
"preinstall": "node -e \"if(process.env.CI == 'true') {console.info('Skipping preinstall...')} else {process.exit(1)}\" || npx -y only-allow pnpm",
"test": "pnpm run test:ci",
"test:pr": "nx affected --targets=test:format,test:eslint,test:unit,test:e2e,test:types,test:build,build",
"test:ci": "nx run-many --targets=test:format,test:eslint,test:unit,test:e2e,test:types,test:build,build",
"test:pr": "nx affected --targets=test:eslint,test:unit,test:e2e,test:types,test:build,build",
"test:ci": "nx run-many --targets=test:eslint,test:unit,test:e2e,test:types,test:build,build",
"test:eslint": "nx affected --target=test:eslint --exclude=examples/**",
"test:format": "pnpm run prettier --check",
"test:unit": "nx affected --target=test:unit --exclude=examples/**",
Expand All @@ -29,16 +29,11 @@
"cipublish": "node scripts/publish.js",
"gpt-generate": "node gpt/generate.js"
},
"nx": {
"includedScripts": [
"test:format"
]
},
"devDependencies": {
"@eslint-react/eslint-plugin": "^1.5.30",
"@playwright/test": "^1.45.2",
"@rollup/plugin-replace": "^5.0.7",
"@tanstack/config": "^0.9.6",
"@tanstack/config": "^0.10.0",
"@types/node": "^20.14.7",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
Expand All @@ -47,7 +42,7 @@
"glob": "^10.4.5",
"nx": "^19.5.1",
"prettier": "^3.3.3",
"publint": "^0.2.8",
"publint": "^0.2.9",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redaxios": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"dependencies": {
"@tanstack/history": "workspace:*",
"@tanstack/react-store": "^0.5.4",
"@tanstack/react-store": "^0.5.5",
"tiny-invariant": "^1.3.3",
"tiny-warning": "^1.0.3"
},
Expand Down
Loading

0 comments on commit 086af99

Please sign in to comment.