-
Notifications
You must be signed in to change notification settings - Fork 456
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3238 from vuestorefront/v2-develop
chore: sync v2-develop with v2
- Loading branch information
Showing
14 changed files
with
3,074 additions
and
6,291 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -144,7 +144,7 @@ jobs: | |
- name: Pre-Cypress (build all dependencies) | ||
run: yarn test:ci-pre:vue | ||
- name: Cypress run | ||
uses: cypress-io/[email protected].2 | ||
uses: cypress-io/[email protected].7 | ||
with: | ||
browser: chrome | ||
working-directory: apps/test/vue | ||
|
@@ -179,7 +179,7 @@ jobs: | |
- name: Pre-Cypress (build all dependencies) | ||
run: yarn test:ci-pre:react | ||
- name: Cypress run | ||
uses: cypress-io/[email protected].2 | ||
uses: cypress-io/[email protected].7 | ||
with: | ||
browser: chrome | ||
working-directory: apps/test/react | ||
|
@@ -314,22 +314,3 @@ jobs: | |
env: | ||
GH_TOKEN: ${{ github.token }} | ||
run: gh pr merge --auto --merge | ||
|
||
gg-scanning: | ||
name: GitGuardian scan | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
- name: GitGuardian scan | ||
uses: GitGuardian/[email protected] | ||
with: | ||
args: -v | ||
env: | ||
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }} | ||
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }} | ||
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }} | ||
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} | ||
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
236 changes: 118 additions & 118 deletions
236
.yarn/releases/yarn-3.8.3.cjs → .yarn/releases/yarn-3.8.6.cjs
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,14 +84,16 @@ | |
"yarn": ">=1.22.19", | ||
"node": ">=16.0.0" | ||
}, | ||
"packageManager": "[email protected].3", | ||
"packageManager": "[email protected].6", | ||
"config": { | ||
"commitizen": { | ||
"path": "cz-conventional-changelog", | ||
"disableScopeLowerCase": true | ||
} | ||
}, | ||
"resolutions": { | ||
"@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch" | ||
"@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch", | ||
"#sf-docs-base": "old vue with version 3.4. causing missing renderer", | ||
"vue": "3.5.12" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
@import 'controls'; | ||
@use 'controls'; | ||
|
||
.e-page { | ||
width: 100%; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.