Skip to content

Commit ab2520d

Browse files
authored
Merge AmazonQ #4088
2 parents d18a295 + 72e645f commit ab2520d

File tree

256 files changed

+37007
-21795
lines changed

Some content is hidden

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

256 files changed

+37007
-21795
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "CodeWhisperer status bar showing even when not in use"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "Auth: Delete SSO connections from quickpick with button on hover"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "Support for Amazon Q, your generative AI–powered assistant designed for work that can be tailored to your business, code, data, and operations."
4+
}

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ node_modules/**
33
src/shared/telemetry/clienttelemetry.d.ts
44
src/codewhisperer/client/codewhispererclient.d.ts
55
src/codewhisperer/client/codewhispereruserclient.d.ts
6+
src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
67
**/*.gen.ts
78
src/testFixtures/**
89
dist/**
910
types/*.d.ts
11+
src.gen/**

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
* @aws/aws-ides-team
22
src/codewhisperer/ @aws/codewhisperer-team
3+
src/amazonqFeatureDev/ @aws/earlybird
4+
src/codewhispererChat/ @aws/aws-mynah
5+
src/amazonq/ @aws/aws-mynah

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
push:
88
branches: [master]
99
pull_request:
10-
branches: [master, feature/*]
10+
branches: [master, feature/*, mynah-dev]
1111

1212
jobs:
1313
macos:

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ resources/debugger/__pycache__
1717

1818
# Auto generated definitions
1919
src/**/*.gen.ts
20+
src.gen/*
2021
# Telemetry definition for testing adding telemetry
2122
src/shared/telemetry/vscodeTelemetry.json
2223

@@ -27,6 +28,7 @@ src/shared/telemetry/vscodeTelemetry.json
2728
src/shared/telemetry/clienttelemetry.d.ts
2829
src/codewhisperer/client/codewhispererclient.d.ts
2930
src/codewhisperer/client/codewhispereruserclient.d.ts
31+
src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
3032

3133
# Generated by tests
3234
src/testFixtures/**/bin
@@ -37,5 +39,9 @@ resources/icons/cloud9/generated/**
3739
resources/fonts/aws-toolkit-icons.woff
3840
resources/css/icons.css
3941

42+
# local configuration
43+
.local.env
44+
*.config.local.json
45+
4046
# Created by `npm run runInBrowser` when testing extension in the browser
4147
.vscode-test-web

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
# ensure that the project uses the public npm registry see: https://docs.npmjs.com/cli/v8/configuring-npm/npmrc
2+
registry = "https://registry.npmjs.org/"
13
engine-strict=true

.prettierignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@ CHANGELOG.md
44
src/shared/telemetry/service-2.json
55
.changes
66
src/testFixtures/**
7+
*.d.ts
8+
*.gen.ts
9+
dist/**
10+
types/*.d.ts
11+
src.gen/**

.vscode/launch.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
2121
"WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
2222
},
23+
"envFile": "${workspaceFolder}/.local.env",
2324
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
2425
"preLaunchTask": "watch"
2526
},

0 commit comments

Comments
 (0)