Skip to content

Commit 4769761

Browse files
author
amandaesmith3
committed
Merge branch 'main' into FW-634
2 parents 239bdbf + 8318659 commit 4769761

File tree

840 files changed

+51904
-48161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

840 files changed

+51904
-48161
lines changed

.github/workflows/actions/update-reference-screenshots/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,16 @@ runs:
2525
# Configure user as Ionitron
2626
# and push only the changed .png snapshots
2727
# to the remote branch.
28+
# Screenshots are in .gitignore
29+
# to prevent local screenshots from getting
30+
# pushed to Git. As a result, we need --force
31+
# here so that CI generated screenshots can
32+
# get added to git. Screenshot ground truths
33+
# should only be added via this CI process.
2834
run: |
2935
git config user.name ionitron
3036
git config user.email hi@ionicframework.com
31-
git add src/\*.png
37+
git add src/\*.png --force
3238
git commit -m "chore(): add updated snapshots"
3339
git push
3440
shell: bash

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,6 @@ angular/build/
7070
# playwright
7171
core/test-results/
7272
core/playwright-report/
73+
core/**/*-snapshots
7374

7475
.npmrc

core/.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
src/components/slides/swiper/swiper.bundle.js
2+
src/components.d.ts

core/.eslintrc.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"es2021": true,
5+
"node": true
6+
},
7+
"extends": [
8+
"eslint:recommended",
9+
"plugin:@typescript-eslint/recommended",
10+
"@ionic/eslint-config/recommended",
11+
"prettier"
12+
],
13+
"parser": "@typescript-eslint/parser",
14+
"parserOptions": {
15+
"ecmaVersion": "latest",
16+
"sourceType": "module"
17+
},
18+
"plugins": [
19+
"@typescript-eslint"
20+
],
21+
"rules": {
22+
"@typescript-eslint/explicit-module-boundary-types": "off",
23+
"@typescript-eslint/ban-ts-comment": "off",
24+
"@typescript-eslint/no-unused-vars": [
25+
"warn",
26+
{
27+
"varsIgnorePattern": "^h$"
28+
}
29+
],
30+
"no-useless-catch": "off",
31+
"@typescript-eslint/no-non-null-assertion": "off",
32+
"no-case-declarations": "off"
33+
}
34+
};

core/.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
src/components/slides/swiper/swiper.bundle.js
2+
src/components.d.ts

core/.prettierrc.json

Whitespace-only changes.

0 commit comments

Comments
 (0)