Skip to content

Commit e47f0ea

Browse files
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents 6c9a107 + 6dd3f87 commit e47f0ea

File tree

539 files changed

+12556
-6119
lines changed

Some content is hidden

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

539 files changed

+12556
-6119
lines changed

.eslintrc.js

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
mocha: true,
1313
es2024: true,
1414
},
15-
plugins: ['@typescript-eslint', 'unicorn', 'header', 'security-node', 'aws-toolkits'],
15+
plugins: ['@typescript-eslint', '@stylistic', 'unicorn', 'header', 'security-node', 'aws-toolkits'],
1616
extends: [
1717
'eslint:recommended',
1818
'plugin:@typescript-eslint/eslint-recommended',
@@ -113,6 +113,20 @@ module.exports = {
113113
'no-constant-condition': ['error', { checkLoops: false }],
114114
'no-empty': 'off',
115115

116+
// https://eslint.style/rules/default/spaced-comment
117+
// Require space after // comment.
118+
'@stylistic/spaced-comment': [
119+
'error',
120+
'always',
121+
{
122+
block: {
123+
markers: ['!'], // Allow the /*!…*/ license header.
124+
// exceptions: ['*'],
125+
// balanced: true
126+
},
127+
},
128+
],
129+
116130
// Rules from https://github.com/sindresorhus/eslint-plugin-unicorn
117131
// TODO: 'unicorn/no-useless-promise-resolve-reject': 'error',
118132
// TODO: 'unicorn/prefer-at': 'error',
@@ -144,6 +158,8 @@ module.exports = {
144158
'unicorn/prefer-reflect-apply': 'error',
145159
'unicorn/prefer-string-trim-start-end': 'error',
146160
'unicorn/prefer-type-error': 'error',
161+
// Discourage `.forEach` because it can lead to accidental, incorrect use of async callbacks.
162+
'unicorn/no-array-for-each': 'error',
147163
'security-node/detect-child-process': 'error',
148164

149165
'header/header': [
@@ -185,8 +201,20 @@ module.exports = {
185201
name: 'fs',
186202
message: 'Avoid node:fs and use shared/fs/fs.ts when possible.',
187203
},
204+
{
205+
name: 'child_process',
206+
message:
207+
'Avoid child_process, use ChildProcess from `shared/utilities/processUtils.ts` instead.',
208+
},
209+
{
210+
name: '..',
211+
message:
212+
'Avoid importing from index.ts files as it can lead to circular dependencies. Import from the module directly instead.',
213+
},
188214
],
189215
},
190216
],
217+
218+
'prettier/prettier': ['error', { endOfLine: 'auto' }],
191219
},
192220
}

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88

99
- Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
1010
- Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
11-
12-
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
11+
- License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/workflows/copyPasteDetection.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)