Skip to content

Commit

Permalink
Merge branch 'develop' into renovate/major-nextjs-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeKarow committed Oct 26, 2022
2 parents c6a6472 + 2532441 commit f651dd0
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codesee-arch-diagram.yml
Expand Up @@ -50,7 +50,7 @@ jobs:
architecture: 'x64'

- name: Configure Ruby '3.x'
uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@v1.120.0
if: ${{ fromJSON(steps.detect-languages.outputs.languages).ruby }}
with:
ruby-version: '3.0'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress-steps.yml
Expand Up @@ -5,11 +5,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install PNPM
run: npm i -g pnpm
- name: Cypress run
uses: cypress-io/github-action@v4
uses: cypress-io/github-action@v4.2.0
with:
command: npm run cypress:run:steps
record: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-scan.yml
Expand Up @@ -10,7 +10,7 @@ jobs:
name: SonarCloud
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: SonarCloud Scan
Expand Down
88 changes: 44 additions & 44 deletions package.json
@@ -1,46 +1,46 @@
{
"name": "inreach",
"version": "0.0.0",
"private": true,
"workspaces": [
"apps/*",
"packages/*"
],
"scripts": {
"build": "turbo run build",
"dev": "turbo run dev --parallel",
"lint": "turbo run lint",
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
"cypress:open": "npx cypress open --project test",
"cypress:run": "npx cypress run --project test",
"cypress:run:tagged": "npx cypress run --project test --env TAGS=${TAGS}",
"cypress:run:steps": "npx cypress run --project test --env TAGS=@stepsTesting --record false"
},
"devDependencies": {
"cypress": "^10.8.0",
"cypress-cucumber-preprocessor": "^4.3.1",
"eslint-config-custom": "*",
"prettier": "latest",
"turbo": "^1.4.6",
"typescript": "^4.8.3"
},
"engines": {
"pnpm": ">=7.11",
"node": ">=16"
},
"dependencies": {
"@changesets/cli": "^2.24.4"
},
"cypress-cucumber-preprocessor": {
"nonGlobalStepDefinitions": false,
"nonGlobalStepBaseDir": "support"
},
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {
"react": "^18",
"react-dom": "^18"
}
}
}
"name": "inreach",
"version": "0.0.0",
"private": true,
"workspaces": [
"apps/*",
"packages/*"
],
"scripts": {
"build": "turbo run build",
"dev": "turbo run dev --parallel",
"lint": "turbo run lint",
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
"cypress:open": "npx cypress open --project test",
"cypress:run": "npx cypress run --project test",
"cypress:run:tagged": "npx cypress run --project test --env TAGS=${TAGS}",
"cypress:run:steps": "npx cypress run --project test --env TAGS=@stepsTesting --record false"
},
"devDependencies": {
"cypress": "^10.8.0",
"cypress-cucumber-preprocessor": "^4.3.1",
"eslint-config-custom": "*",
"prettier": "latest",
"turbo": "^1.4.6",
"typescript": "^4.8.3"
},
"engines": {
"pnpm": ">=7",
"node": ">=16"
},
"dependencies": {
"@changesets/cli": "^2.24.4"
},
"cypress-cucumber-preprocessor": {
"nonGlobalStepDefinitions": false,
"nonGlobalStepBaseDir": "support"
},
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {
"react": "^18",
"react-dom": "^18"
}
}
}
}

0 comments on commit f651dd0

Please sign in to comment.