Skip to content

Commit 99e5dcb

Browse files
chungjacaws-toolkit-automationctlai95
authored
Auto merge/feature/v2 to v3 migration (#2400)
* feat: migrate codewhisperer token service to aws-sdk-v3 (#2235) * feat: migrate codewhisperer token service to aws-sdk-v3 * fix captureHeaders middleware * feat: migrate codewhisperer iam service to aws-sdk-v3 (#2284) * refactor: remove aws-sdk v2 imports (#2290) * fix: compile errors from merge conflicts (#2331) * chore: bump runtimes to 0.3.0 (#2340) * chore: bump runtimes to 0.3.0 * fix antlr4ng version conflict * fix missing url polyfill * chore: remove old ignore entries (#2350) --------- Co-authored-by: aws-toolkit-automation <[email protected]> Co-authored-by: Tai Lai <[email protected]> Co-authored-by: Tai Lai <[email protected]>
1 parent 4ce9d8f commit 99e5dcb

File tree

83 files changed

+3760
-18075
lines changed

Some content is hidden

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

83 files changed

+3760
-18075
lines changed

.eslintignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
**/node_modules/**
2-
**/out/**
3-
server/aws-lsp-codewhisperer/src/client/sigv4/codewhisperersigv4client.d.ts
4-
server/aws-lsp-codewhisperer/src/client/token/codewhispererbearertokenclient.d.ts
2+
**/out/**

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ build
55
**/*.tgz
66
!core/codewhisperer-streaming/amzn-codewhisperer-streaming-*.tgz
77
!core/q-developer-streaming-client/amzn-amazon-q-developer-streaming-client-*.tgz
8+
!core/codewhisperer-runtime/amzn-codewhisperer-runtime-*.tgz
9+
!core/codewhisperer/amzn-codewhisperer-*.tgz
810
!server/aws-lsp-codewhisperer/types/types-local-indexing-*.tgz
911

1012
.testresults/**

.prettierignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ node_modules/
44
out/
55
**/bin/
66
**/obj/
7-
server/aws-lsp-codewhisperer/src/client/sigv4/codewhisperersigv4client.d.ts
8-
server/aws-lsp-codewhisperer/src/client/token/codewhispererbearertokenclient.d.ts
97
**/*.md
108
**/antlr-generated/

app/aws-lsp-antlr4-runtimes/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"webpack": "webpack"
1313
},
1414
"dependencies": {
15-
"@aws/language-server-runtimes": "^0.2.129",
15+
"@aws/language-server-runtimes": "^0.3.0",
1616
"@aws/lsp-antlr4": "*",
17-
"antlr4-c3": "^3.4.1",
18-
"antlr4ng": "^3.0.4"
17+
"antlr4-c3": "^3.4.2",
18+
"antlr4ng": "^3.0.14"
1919
},
2020
"devDependencies": {
2121
"@types/chai": "^4.3.5",

app/aws-lsp-buildspec-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.129",
10+
"@aws/language-server-runtimes": "^0.3.0",
1111
"@aws/lsp-buildspec": "^0.0.1"
1212
}
1313
}

app/aws-lsp-cloudformation-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.129",
10+
"@aws/language-server-runtimes": "^0.3.0",
1111
"@aws/lsp-cloudformation": "^0.0.1"
1212
}
1313
}

app/aws-lsp-codewhisperer-runtimes/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"local-build": "node scripts/local-build.js"
2424
},
2525
"dependencies": {
26-
"@aws/language-server-runtimes": "^0.2.129",
26+
"@aws/language-server-runtimes": "^0.3.0",
2727
"@aws/lsp-codewhisperer": "*",
2828
"copyfiles": "^2.4.1",
2929
"cross-env": "^7.0.3",
@@ -35,6 +35,7 @@
3535
"process": "^0.11.10",
3636
"stream-browserify": "^3.0.0",
3737
"stream-http": "^3.2.0",
38+
"url": "^0.11.4",
3839
"vscode-languageserver": "^9.0.1",
3940
"wdio": "^6.0.1",
4041
"webpack-dev-server": "^5.2.0"

app/aws-lsp-codewhisperer-runtimes/webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ const webworkerConfig = {
8080
http: 'stream-http',
8181
crypto: 'crypto-browserify',
8282
stream: 'stream-browserify',
83+
url: require.resolve('url/'),
8384
fs: path.resolve(__dirname, 'src/mock-fs.js'),
8485
child_process: false,
8586
vm: false,

app/aws-lsp-identity-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"compile": "tsc --build"
88
},
99
"dependencies": {
10-
"@aws/language-server-runtimes": "^0.2.129",
10+
"@aws/language-server-runtimes": "^0.3.0",
1111
"@aws/lsp-identity": "^0.0.1"
1212
}
1313
}

app/aws-lsp-json-runtimes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"webpack": "webpack"
1212
},
1313
"dependencies": {
14-
"@aws/language-server-runtimes": "^0.2.129",
14+
"@aws/language-server-runtimes": "^0.3.0",
1515
"@aws/lsp-json": "*"
1616
},
1717
"devDependencies": {

0 commit comments

Comments
 (0)