Skip to content

Commit 945ea5a

Browse files
ServerlessLifeServerlessLife
committed
fix: merge conflicts
2 parents 9435e1f + 3f25265 commit 945ea5a

File tree

62 files changed

+24634
-13611
lines changed

Some content is hidden

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

62 files changed

+24634
-13611
lines changed

‎.github/workflows/update-npm-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
for file in $package_files; do
3131
dir=$(dirname "$file")
3232
echo "Updating packages in $dir"
33-
(cd "$dir" && ncu -u)
33+
(cd "$dir" && ncu -u --reject "serverless,chokidar")
3434
done
3535
3636
- name: Install updated packages in root

‎eslint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export default [
1414
'**/.aws-sam/**',
1515
'src/extension/aws/*.js',
1616
'.vitepress/cache/**',
17+
'**/.terraform/**',
1718
],
1819
},
1920
{

‎package-lock.json

Lines changed: 24496 additions & 13481 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -79,49 +79,48 @@
7979
"docs:preview": "vitepress preview"
8080
},
8181
"devDependencies": {
82-
"@eslint/js": "^9.8.0",
82+
"@eslint/js": "^9.21.0",
8383
"@tsconfig/node20": "^20.1.4",
8484
"@types/aws-iot-device-sdk": "^2.2.8",
85-
"@types/eslint__js": "^8.42.3",
8685
"@types/eslint-config-prettier": "^6.11.3",
8786
"@types/inquirer": "^9.0.7",
88-
"@types/node": "^20.11.16",
89-
"@types/serverless": "^3.12.22",
90-
"aws-cdk": "2.178.0",
91-
"aws-cdk-lib": "2.178.0",
92-
"constructs": "^10.0.0",
93-
"eslint": "^9.8.0",
94-
"eslint-config-prettier": "^9.1.0",
95-
"globals": "^15.9.0",
96-
"husky": "^9.1.4",
97-
"prettier": "^3.3.3",
98-
"semantic-release": "^23.0.8",
87+
"@types/node": "^22.13.9",
88+
"@types/serverless": "^3.12.27",
89+
"aws-cdk": "2.1002.0",
90+
"aws-cdk-lib": "2.181.1",
91+
"constructs": "^10.4.2",
92+
"eslint": "^9.21.0",
93+
"eslint-config-prettier": "^10.0.2",
94+
"globals": "^16.0.0",
95+
"husky": "^9.1.7",
96+
"osls": "^3.47.0",
97+
"prettier": "^3.5.3",
98+
"semantic-release": "^24.2.3",
9999
"serverless": "^3.38.0",
100-
"osls": "^3.46.0",
101-
"serverless-esbuild": "^1.54.6",
102-
"tsx": "^4.7.1",
103-
"typescript-eslint": "^8.0.0",
104-
"vitepress": "^1.3.3"
100+
"serverless-esbuild": "^1.55.0",
101+
"tsx": "^4.19.3",
102+
"typescript-eslint": "^8.26.0",
103+
"vitepress": "^1.6.3"
105104
},
106105
"dependencies": {
107-
"@aws-sdk/client-cloudformation": "^3.577.0",
108-
"@aws-sdk/client-iam": "^3.577.0",
109-
"@aws-sdk/client-iot": "^3.577.0",
110-
"@aws-sdk/client-iot-data-plane": "^3.577.0",
111-
"@aws-sdk/client-lambda": "^3.577.0",
112-
"@aws-sdk/client-s3": "^3.577.0",
113-
"@aws-sdk/credential-providers": "^3.577.0",
114-
"aws-iot-device-sdk": "^2.2.13",
115-
"chalk": "^5.3.0",
106+
"@aws-sdk/client-cloudformation": "^3.758.0",
107+
"@aws-sdk/client-iam": "^3.758.0",
108+
"@aws-sdk/client-iot": "^3.758.0",
109+
"@aws-sdk/client-iot-data-plane": "^3.758.0",
110+
"@aws-sdk/client-lambda": "^3.758.0",
111+
"@aws-sdk/client-s3": "^3.758.0",
112+
"@aws-sdk/credential-providers": "^3.758.0",
113+
"aws-iot-device-sdk": "^2.2.15",
114+
"chalk": "^5.4.1",
116115
"chokidar": "^3.6.0",
117-
"commander": "^12.0.0",
118-
"esbuild": "^0.20.1",
116+
"commander": "^13.1.0",
117+
"esbuild": "^0.25.0",
119118
"inquirer": "^12.4.2",
120-
"jsonc-parser": "^3.2.1",
119+
"jsonc-parser": "^3.3.1",
121120
"node-machine-id": "^1.1.12",
122121
"toml": "^3.0.0",
123-
"typescript": "~5.4.3",
124-
"yaml": "^2.4.2"
122+
"typescript": "~5.8.2",
123+
"yaml": "^2.7.0"
125124
},
126125
"bundleDependencies": [
127126
"@aws-sdk/client-cloudformation",

‎src/configuration/getConfigFromWizard.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ export default {
412412
// Observable mode interval
413413
interval: ${config.interval === defaultObservableInterval ? undefined : config.interval},
414414
// Approval required for AWS infrastructure changes
415-
approvalRequired: ${config.approval},
415+
approval: ${config.approval},
416416
// Verbose logging
417417
verbose: ${config.verbose},
418418
// Modify Lambda function list or support custom framework
@@ -459,7 +459,7 @@ function getConfigFromAnswers(answers: any): LldConfigCliArgs {
459459
answers.interval !== undefined
460460
? answers.interval
461461
: defaultObservableInterval,
462-
approvalRequired: answers.approvalRequired,
462+
approval: answers.approval,
463463
verbose: answers.verbose,
464464
interactive: answers.interactive,
465465
gitignore: answers.gitignore,

‎src/extension/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"author": "",
1111
"license": "ISC",
1212
"devDependencies": {
13-
"@types/aws-lambda": "^8.10.137"
13+
"@types/aws-lambda": "^8.10.147"
1414
},
1515
"dependencies": {
16-
"@aws-sdk/client-iot": "^3.515.0",
17-
"@aws-sdk/client-lambda": "^3.515.0",
18-
"@aws-sdk/client-s3": "^3.515.0",
19-
"aws-iot-device-sdk": "^2.2.13"
16+
"@aws-sdk/client-iot": "^3.758.0",
17+
"@aws-sdk/client-lambda": "^3.758.0",
18+
"@aws-sdk/client-s3": "^3.758.0",
19+
"aws-iot-device-sdk": "^2.2.15"
2020
}
2121
}

‎test/cdk-basic/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
"destroy": "cdk destroy --all -c environment=test --force"
1111
},
1212
"devDependencies": {
13-
"@types/node": "20.11.30",
13+
"@types/node": "22.13.9",
1414
"@tsconfig/node20": "^20.1.4",
15-
"aws-cdk": "2.178.0",
15+
"aws-cdk": "2.1002.0",
1616
"ts-node": "^10.9.2",
17-
"typescript": "~5.4.3",
18-
"@types/aws-lambda": "^8.10.137"
17+
"typescript": "~5.8.2",
18+
"@types/aws-lambda": "^8.10.147"
1919
},
2020
"dependencies": {
21-
"aws-cdk-lib": "2.178.0",
22-
"constructs": "^10.0.0",
21+
"aws-cdk-lib": "2.181.1",
22+
"constructs": "^10.4.2",
2323
"source-map-support": "^0.5.21",
24-
"@aws-sdk/client-sts": "^3.577.0"
24+
"@aws-sdk/client-sts": "^3.758.0"
2525
}
2626
}

‎test/cdk-basic/services/testJsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "commonjs",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-basic/services/testJsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "module",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-basic/services/testTsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/cdk-basic/services/testTsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/cdk-config/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
"destroy": "cdk destroy -c environment=check --force"
1111
},
1212
"devDependencies": {
13-
"@types/node": "20.11.30",
13+
"@types/node": "22.13.9",
1414
"@tsconfig/node20": "^20.1.4",
15-
"aws-cdk": "2.178.0",
15+
"aws-cdk": "2.1002.0",
1616
"ts-node": "^10.9.2",
17-
"typescript": "~5.4.3",
18-
"@types/aws-lambda": "^8.10.137"
17+
"typescript": "~5.8.2",
18+
"@types/aws-lambda": "^8.10.147"
1919
},
2020
"dependencies": {
21-
"aws-cdk-lib": "2.178.0",
22-
"constructs": "^10.0.0",
21+
"aws-cdk-lib": "2.181.1",
22+
"constructs": "^10.4.2",
2323
"source-map-support": "^0.5.21",
24-
"@aws-sdk/client-sts": "^3.577.0"
24+
"@aws-sdk/client-sts": "^3.758.0"
2525
}
2626
}

‎test/cdk-config/services/testJsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "commonjs",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-config/services/testJsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "module",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-config/services/testTsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/cdk-config/services/testTsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/cdk-config/services_alternative/testJsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "commonjs",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-config/services_alternative/testJsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "module",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-config/services_alternative/testTsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/cdk-config/services_alternative/testTsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/cdk-esm/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
},
1313
"devDependencies": {
1414
"@tsconfig/node20": "^20.1.4",
15-
"@types/aws-lambda": "^8.10.137",
16-
"@types/node": "20.11.30",
17-
"aws-cdk": "2.178.0",
15+
"@types/aws-lambda": "^8.10.147",
16+
"@types/node": "22.13.9",
17+
"aws-cdk": "2.1002.0",
1818
"ts-node": "^10.9.2",
19-
"tsx": "^4.19.1",
20-
"typescript": "~5.4.3"
19+
"tsx": "^4.19.3",
20+
"typescript": "~5.8.2"
2121
},
2222
"dependencies": {
23-
"@aws-sdk/client-sts": "^3.577.0",
24-
"aws-cdk-lib": "2.178.0",
25-
"constructs": "^10.0.0",
23+
"@aws-sdk/client-sts": "^3.758.0",
24+
"aws-cdk-lib": "2.181.1",
25+
"constructs": "^10.4.2",
2626
"source-map-support": "^0.5.21"
2727
}
2828
}

‎test/cdk-esm/services/testJsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "commonjs",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-esm/services/testJsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "module",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/cdk-esm/services/testTsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/cdk-esm/services/testTsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/opentofu-basic/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ response.json
3838
dist
3939
builds
4040
.terraform.lock.hcl
41+
.terraform
4142
opentofu-outputs.json

‎test/opentofu-basic/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616
"license": "ISC",
1717
"devDependencies": {
1818
"@types/aws-lambda": "^8.10.137"
19+
},
20+
"dependencies": {
21+
"@aws-sdk/client-sts": "^3.758.0"
1922
}
2023
}

‎test/opentofu-basic/services/testJsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "commonjs",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/opentofu-basic/services/testJsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "1.0.0",
44
"type": "module",
55
"dependencies": {
6-
"@aws-sdk/client-sts": "^3.577.0"
6+
"@aws-sdk/client-sts": "^3.758.0"
77
}
88
}

‎test/opentofu-basic/services/testTsCommonJs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/opentofu-basic/services/testTsEsModule/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"@tsconfig/node20": "^20.1.4"
77
},
88
"dependencies": {
9-
"@aws-sdk/client-sts": "^3.577.0"
9+
"@aws-sdk/client-sts": "^3.758.0"
1010
}
1111
}

‎test/osls-basic/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"author": "",
1212
"license": "ISC",
1313
"devDependencies": {
14-
"osls": "^3.46.0"
14+
"osls": "^3.47.0"
1515
},
1616
"dependencies": {
17-
"@aws-sdk/client-sts": "^3.577.0"
17+
"@aws-sdk/client-sts": "^3.758.0"
1818
}
1919
}

0 commit comments

Comments
 (0)