Skip to content

Commit fc880de

Browse files
committed
Bumps node modules
1 parent 0016606 commit fc880de

123 files changed

Lines changed: 4772 additions & 6512 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
- main
1010

1111
workflow_dispatch: null
12+
1213
jobs:
1314
lint-build:
1415
runs-on: ubuntu-latest
@@ -17,13 +18,6 @@ jobs:
1718
with:
1819
persist-credentials: false
1920

20-
- name: Use Node.js
21-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
22-
with:
23-
node-version: 'lts/*'
24-
check-latest: true
25-
package-manager-cache: false
26-
2721
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
2822
name: Install pnpm
2923
with:

.github/workflows/deploy.yml

Lines changed: 49 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ jobs:
3030
with:
3131
persist-credentials: false
3232

33-
- name: Use Node.js
34-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
35-
with:
36-
node-version: 'lts/*'
37-
check-latest: true
38-
package-manager-cache: false
39-
4033
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
4134
name: Install pnpm
4235
with:
@@ -64,9 +57,9 @@ jobs:
6457
aws-region: ${{ env.AWS_REGION }}
6558

6659
- name: deploy
67-
working-directory: ./basic/cdk
60+
working-directory: basic/cdk
6861
run: |
69-
pnpm dlx aws-cdk@latest deploy \
62+
pnx aws-cdk@latest deploy \
7063
-c oai-instance-name=${{ secrets.AZURE_OPENAI_API_INSTANCE_NAME }} \
7164
-c oai-api-key=${{ secrets.AZURE_OPENAI_API_KEY }} \
7265
-c oai-api-version=${{ vars.AZURE_OPENAI_API_VERSION }} \
@@ -101,13 +94,6 @@ jobs:
10194
with:
10295
persist-credentials: false
10396

104-
- name: Use Node.js
105-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
106-
with:
107-
node-version: 'lts/*'
108-
check-latest: true
109-
package-manager-cache: false
110-
11197
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
11298
name: Install pnpm
11399
with:
@@ -117,9 +103,9 @@ jobs:
117103
- args: [--global, aws-cdk, esbuild]
118104
119105
- name: deploy
120-
working-directory: ./rag/cdk
106+
working-directory: rag/cdk
121107
run: |
122-
pnpm dlx aws-cdk@latest deploy \
108+
pnx aws-cdk@latest deploy \
123109
-c oai-instance-name=${{ secrets.AZURE_OPENAI_API_INSTANCE_NAME }} \
124110
-c oai-api-key=${{ secrets.AZURE_OPENAI_API_KEY }} \
125111
-c oai-api-version=${{ vars.AZURE_OPENAI_API_VERSION }} \
@@ -150,12 +136,50 @@ jobs:
150136
with:
151137
persist-credentials: false
152138

153-
- name: Use Node.js
154-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
139+
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
140+
name: Install pnpm
155141
with:
156-
node-version: 'lts/*'
157-
check-latest: true
158-
package-manager-cache: false
142+
run_install: |
143+
- recursive: true
144+
args: [--no-frozen-lockfile]
145+
- args: [--global, aws-cdk, esbuild]
146+
147+
- name: Build (common)
148+
run: |
149+
pnpm --filter @llm-ts-example/common-core build
150+
pnpm --filter @llm-ts-example/common-backend-core build
151+
pnpm --filter @llm-ts-example/common-backend-langchain build
152+
153+
- name: Debug workspace links
154+
run: |
155+
pnpm list -r --depth 0
156+
pnpm why @llm-ts-example/common-backend-core
157+
pnpm why @llm-ts-example/common-backend-langchain
158+
159+
- name: deploy
160+
working-directory: agents/agent-ai-sdk
161+
run: |
162+
pnx aws-cdk@latest deploy \
163+
--require-approval=never
164+
165+
deploy-strands-agent-api:
166+
# 同時実行すると CREATE_IN_PROGRESS や UPDATE_IN_PROGRESS 状態で cdk deploy を行う可能性があるため抑止する
167+
concurrency:
168+
group: "strands-agent-cloudformation"
169+
cancel-in-progress: false
170+
171+
runs-on: ubuntu-latest
172+
steps:
173+
- name: Configure AWS Credentials
174+
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
175+
with:
176+
role-to-assume: ${{ env.OIDC_IAM_ROLE_ARN }}
177+
role-session-name: GitHubActions
178+
aws-region: ${{ env.AWS_REGION }}
179+
180+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
181+
with:
182+
persist-credentials: false
159183

160184
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
161185
name: Install pnpm
@@ -178,7 +202,7 @@ jobs:
178202
pnpm why @llm-ts-example/common-backend-langchain
179203
180204
- name: deploy
181-
working-directory: ./agents/agent-ai-sdk
205+
working-directory: agents/agent-strands
182206
run: |
183-
pnpm dlx aws-cdk@latest deploy \
207+
pnx aws-cdk@latest deploy \
184208
--require-approval=never
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env node
2-
import * as cdk from 'aws-cdk-lib/core';
32
import { AgentAiSdkStack } from '../lib/agent-ai-sdk-stack.js';
3+
import * as cdk from 'aws-cdk-lib/core';
44

55
const app = new cdk.App();
6-
const stack = new AgentAiSdkStack(app, 'agent-ai-sdk-stack', {
6+
const stack = new AgentAiSdkStack(app, 'AgentAiSdk', {
77
});
88
cdk.RemovalPolicies.of(stack).apply(cdk.RemovalPolicy.DESTROY);
Lines changed: 47 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,61 @@
1-
import { defineConfig } from 'eslint/config';
1+
import path from 'node:path';
2+
import { fileURLToPath } from 'node:url';
3+
import { defineConfig, includeIgnoreFile } from 'eslint/config';
24
import eslint from '@eslint/js';
3-
import { configs, parser } from 'typescript-eslint';
45
import stylistic from '@stylistic/eslint-plugin';
6+
import {configs, parser} from 'typescript-eslint';
57
import { importX, createNodeResolver } from 'eslint-plugin-import-x';
68
import { createTypeScriptImportResolver } from 'eslint-import-resolver-typescript';
7-
// @ts-expect-error ignore type errors
8-
import pluginPromise from 'eslint-plugin-promise';
9-
import { configs as awscdkConfigs } from 'eslint-plugin-awscdk';
10-
11-
import { includeIgnoreFile } from '@eslint/compat';
12-
import path from 'node:path';
13-
import { fileURLToPath } from 'node:url';
9+
import { configs as cdkPluginConfigs } from 'eslint-plugin-awscdk';
1410

1511
const __filename = fileURLToPath(import.meta.url);
1612
const __dirname = path.dirname(__filename);
17-
const gitignorePath = path.resolve(__dirname, '.gitignore');
13+
const gitignorePath = path.resolve(__dirname, './.gitignore');
1814

1915
export default defineConfig(
16+
includeIgnoreFile(gitignorePath),
2017
{
2118
ignores: [
22-
...(includeIgnoreFile(gitignorePath).ignores || []),
2319
'**/*.d.ts',
20+
'*.{js,jsx}',
2421
'src/tsconfig.json',
2522
'src/stories',
2623
'**/*.css',
2724
'node_modules/**/*',
25+
'./.next/*',
2826
'out',
29-
'cdk.out',
27+
'.storybook',
3028
'dist',
29+
'.vinxi',
30+
'.output',
3131
],
3232
},
3333
eslint.configs.recommended,
34-
configs.strict,
35-
configs.stylistic,
36-
pluginPromise.configs['flat/recommended'],
34+
...configs.strict,
35+
...configs.stylistic,
36+
importX.flatConfigs.recommended,
37+
importX.flatConfigs.typescript,
3738
{
38-
files: ['**/*.ts', '*.js'],
39-
plugins: {
40-
'import-x': importX,
41-
'@stylistic': stylistic,
42-
},
39+
files: [
40+
'bin/**/*.ts',
41+
'lib/**/*.ts',
42+
'lambda/**/*.ts',
43+
'eslint.config.ts',
44+
],
4345
languageOptions: {
46+
parser,
4447
ecmaVersion: 'latest',
4548
sourceType: 'module',
46-
parser,
4749
parserOptions: {
50+
tsconfigRootDir: __dirname,
4851
projectService: {
4952
allowDefaultProject: ['eslint.config.ts'],
5053
},
51-
tsconfigRootDir: __dirname,
5254
},
5355
},
54-
extends: [
55-
'import-x/flat/recommended',
56-
awscdkConfigs.recommended,
57-
],
56+
plugins: {
57+
'@stylistic': stylistic,
58+
},
5859
settings: {
5960
'import-x/resolver-next': [
6061
createTypeScriptImportResolver({
@@ -63,14 +64,31 @@ export default defineConfig(
6364
createNodeResolver(),
6465
],
6566
},
67+
extends: [
68+
cdkPluginConfigs.recommended,
69+
],
6670
rules: {
6771
'@stylistic/semi': ['error', 'always'],
6872
'@stylistic/indent': ['error', 2],
6973
'@stylistic/comma-dangle': ['error', 'always-multiline'],
70-
'@stylistic/arrow-parens': ['error', 'always'],
7174
'@stylistic/quotes': ['error', 'single'],
72-
'awscdk/no-construct-stack-suffix': 'off',
73-
'awscdk/pascal-case-construct-id': 'off',
75+
76+
'import-x/order': [
77+
'error',
78+
{
79+
'groups': [
80+
// Imports of builtins are first
81+
'builtin',
82+
// Then sibling and parent imports. They can be mingled together
83+
['sibling', 'parent'],
84+
// Then index file imports
85+
'index',
86+
// Then any arcane TypeScript imports
87+
'object',
88+
// Then the omitted imports: internal, external, type, unknown
89+
],
90+
},
91+
],
7492
},
7593
},
7694
);

agents/agent-ai-sdk/lambda/handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { Readable, PassThrough } from 'node:stream';
12
import { bedrock } from '@ai-sdk/amazon-bedrock';
23
import { azure } from '@ai-sdk/azure';
34
import { logger } from '@llm-ts-example/common-backend-core';
45
import { models } from '@llm-ts-example/common-core';
56
import { ToolLoopAgent, smoothStream, ModelMessage } from 'ai';
6-
import { Readable, PassThrough } from 'node:stream';
77

88
const createModel = (id?: string) => {
99
const modelInfo = models.find((m) => m.id === id);

agents/agent-ai-sdk/lambda/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { handle } from './handler.js';
12
import { APIGatewayProxyEvent, APIGatewayProxyEventV2 } from 'aws-lambda';
23
import { logger } from '@llm-ts-example/common-backend-core';
3-
import { handle } from './handler.js';
44

55
export const handler = awslambda.streamifyResponse(
66
async (

agents/agent-ai-sdk/package.json

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,33 @@
1212
"lint-fix": "eslint --fix"
1313
},
1414
"devDependencies": {
15-
"@eslint/compat": "^2.1.0",
16-
"@eslint/core": "^1.2.1",
1715
"@eslint/js": "^10.0.1",
1816
"@stylistic/eslint-plugin": "^5.10.0",
1917
"@types/aws-lambda": "^8.10.161",
20-
"@types/node": "^24.12.4",
21-
"@vitest/eslint-plugin": "^1.6.18",
22-
"aws-cdk": "^2.1125.0",
23-
"esbuild": "^0.27.7",
18+
"@types/node": "^24.13.1",
19+
"@vitest/eslint-plugin": "^1.6.19",
20+
"aws-cdk": "^2.1126.0",
21+
"esbuild": "^0.28.1",
2422
"eslint": "^10.4.1",
25-
"eslint-import-resolver-typescript": "^4.4.4",
23+
"eslint-import-resolver-typescript": "^4.4.5",
2624
"eslint-plugin-awscdk": "^4.3.3",
2725
"eslint-plugin-import-x": "^4.16.2",
2826
"eslint-plugin-promise": "^7.3.0",
2927
"jiti": "^2.7.0",
3028
"tsx": "^4.22.4",
31-
"typescript": "^5.9.3",
32-
"typescript-eslint": "^8.60.0",
33-
"vite": "^8.0.14",
34-
"vitest": "^4.1.7"
29+
"typescript": "^6.0.3",
30+
"typescript-eslint": "^8.60.1",
31+
"vite": "^8.0.16",
32+
"vitest": "^4.1.8"
3533
},
3634
"dependencies": {
37-
"@ai-sdk/amazon-bedrock": "^4.0.111",
38-
"@ai-sdk/azure": "^3.0.68",
35+
"@ai-sdk/amazon-bedrock": "^4.0.113",
36+
"@ai-sdk/azure": "^3.0.70",
3937
"@llm-ts-example/common-backend-core": "workspace:*",
4038
"@llm-ts-example/common-core": "workspace:*",
41-
"@smithy/eventstream-codec": "^4.3.5",
42-
"ai": "^6.0.193",
43-
"aws-cdk-lib": "^2.257.0",
39+
"@smithy/eventstream-codec": "^4.3.6",
40+
"ai": "^6.0.197",
41+
"aws-cdk-lib": "^2.258.0",
4442
"constructs": "^10.6.0",
4543
"dotenv": "^17.4.2",
4644
"zod": "^4.4.3"

0 commit comments

Comments
 (0)