Skip to content

Commit bb89e03

Browse files
committedNov 2, 2023
Merge branch 'main' into @chrispader/theme-switching-ts-types
2 parents bbdb468 + b049999 commit bb89e03

File tree

1,188 files changed

+49378
-55472
lines changed

Some content is hidden

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

1,188 files changed

+49378
-55472
lines changed
 

‎.eslintrc.js

+24-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const restrictedImportPatterns = [
2424
];
2525

2626
module.exports = {
27-
extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'plugin:react-native-a11y/basic', 'prettier'],
27+
extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'plugin:react-native-a11y/basic', 'plugin:@dword-design/import-alias/recommended', 'prettier'],
2828
plugins: ['react-hooks', 'react-native-a11y'],
2929
parser: 'babel-eslint',
3030
ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
@@ -49,8 +49,31 @@ module.exports = {
4949
touchables: ['PressableWithoutFeedback', 'PressableWithFeedback'],
5050
},
5151
],
52+
'@dword-design/import-alias/prefer-alias': [
53+
'warn',
54+
{
55+
alias: {
56+
'@assets': './assets',
57+
'@components': './src/components',
58+
'@hooks': './src/hooks',
59+
// This is needed up here, if not @libs/actions would take the priority
60+
'@userActions': './src/libs/actions',
61+
'@libs': './src/libs',
62+
'@navigation': './src/libs/Navigation',
63+
'@pages': './src/pages',
64+
'@styles': './src/styles',
65+
// This path is provide alias for files like `ONYXKEYS` and `CONST`.
66+
'@src': './src',
67+
},
68+
},
69+
],
5270
},
5371
},
72+
// This helps disable the `prefer-alias` rule to be enabled for specific directories
73+
{
74+
files: ['tests/**/*.js', 'tests/**/*.ts', 'tests/**/*.jsx', 'assets/**/*.js', '.storybook/**/*.js'],
75+
rules: {'@dword-design/import-alias/prefer-alias': ['off']},
76+
},
5477
{
5578
files: ['*.js', '*.jsx'],
5679
settings: {

‎.github/ISSUE_TEMPLATE/Standard.md

+1-38
Original file line numberDiff line numberDiff line change
@@ -42,45 +42,8 @@ Which of our officially supported platforms is this issue occurring on?
4242
- [ ] MacOS: Desktop
4343

4444
## Screenshots/Videos
45-
<details>
46-
<summary>Android: Native</summary>
4745

48-
<!-- add screenshots or videos here -->
49-
50-
</details>
51-
52-
<details>
53-
<summary>Android: mWeb Chrome</summary>
54-
55-
<!-- add screenshots or videos here -->
56-
57-
</details>
58-
59-
<details>
60-
<summary>iOS: Native</summary>
61-
62-
<!-- add screenshots or videos here -->
63-
64-
</details>
65-
66-
<details>
67-
<summary>iOS: mWeb Safari</summary>
68-
69-
<!-- add screenshots or videos here -->
70-
71-
</details>
72-
73-
<details>
74-
<summary>MacOS: Chrome / Safari</summary>
75-
76-
<!-- add screenshots or videos here -->
77-
78-
</details>
79-
80-
<details>
81-
<summary>MacOS: Desktop</summary>
82-
83-
<!-- add screenshots or videos here -->
46+
Add any screenshot/video evidence
8447

8548
</details>
8649

0 commit comments

Comments
 (0)