Skip to content

Commit e12c83d

Browse files
authored
Merge branch 'main' into john-docs
2 parents 0094071 + 59e9952 commit e12c83d

File tree

912 files changed

+38543
-3727
lines changed

Some content is hidden

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

912 files changed

+38543
-3727
lines changed

.changeset/short-dodos-cover.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@smithy/core": minor
3+
---
4+
5+
separate error schema objects from error ctor

.eslintrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,19 @@ module.exports = {
2121
"prefer-rest-params": "off",
2222
"@typescript-eslint/no-non-null-assertion": "off",
2323

24+
// intentional usage
25+
"@typescript-eslint/no-empty-object-type": "off",
26+
"@typescript-eslint/no-unsafe-function-type": "off",
27+
28+
// temporary until upgrading ESLint
29+
"@typescript-eslint/no-unused-vars": "off",
30+
"@typescript-eslint/no-require-imports": "off",
31+
2432
/** Warnings */
2533
"@typescript-eslint/no-namespace": "warn",
2634

2735
/** Errors */
2836
"simple-import-sort/imports": "error",
37+
"@typescript-eslint/consistent-type-imports": "error",
2938
},
3039
};

.github/dependabot.yml

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

.github/workflows/ci.yml

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ jobs:
1616
os: [macos-latest, ubuntu-latest, windows-latest]
1717

1818
steps:
19-
- uses: actions/checkout@v4
20-
- uses: gradle/wrapper-validation-action@v2
19+
- uses: actions/checkout@v5
20+
- uses: gradle/actions/wrapper-validation@v4
2121

2222
- name: Set up JDK ${{ matrix.java }}
23-
uses: actions/setup-java@v4
23+
uses: actions/setup-java@v5
2424
with:
2525
java-version: ${{ matrix.java }}
2626
distribution: 'corretto'
27+
cache: gradle
2728

2829
- name: clean and build
2930
run: ./gradlew clean build -Plog-tests
@@ -37,18 +38,19 @@ jobs:
3738
os: [ubuntu-latest]
3839

3940
steps:
40-
- uses: actions/checkout@v4
41-
- uses: gradle/wrapper-validation-action@v2
42-
- uses: actions/setup-node@v4
41+
- uses: actions/checkout@v5
42+
- uses: gradle/actions/wrapper-validation@v4
43+
- uses: actions/setup-node@v5
4344
with:
4445
node-version: 18
4546
cache: "yarn"
4647

4748
- name: Set up JDK ${{ matrix.java }}
48-
uses: actions/setup-java@v4
49+
uses: actions/setup-java@v5
4950
with:
5051
java-version: ${{ matrix.java }}
5152
distribution: 'corretto'
53+
cache: gradle
5254

5355
- name: clean and build
5456
run: ./gradlew clean build -Plog-tests
@@ -65,8 +67,8 @@ jobs:
6567
runs-on: ubuntu-latest
6668
name: TypeScript Lint
6769
steps:
68-
- uses: actions/checkout@v4
69-
- uses: actions/setup-node@v4
70+
- uses: actions/checkout@v5
71+
- uses: actions/setup-node@v5
7072
with:
7173
node-version: 18
7274
cache: "yarn"
@@ -85,17 +87,18 @@ jobs:
8587
node: [18, 20, 22]
8688

8789
steps:
88-
- uses: actions/checkout@v4
89-
- uses: actions/setup-node@v4
90+
- uses: actions/checkout@v5
91+
- uses: actions/setup-node@v5
9092
with:
9193
node-version: ${{ matrix.node }}
9294
cache: "yarn"
93-
- uses: gradle/wrapper-validation-action@v2
95+
- uses: gradle/actions/wrapper-validation@v4
9496
- name: Set up JDK 17
95-
uses: actions/setup-java@v4
97+
uses: actions/setup-java@v5
9698
with:
9799
java-version: '17'
98100
distribution: 'corretto'
101+
cache: gradle
99102
- name: Install dependencies
100103
run: |
101104
yarn
@@ -109,12 +112,30 @@ jobs:
109112
yarn config set enableImmutableInstalls false
110113
node ./scripts/retry -- yarn test:integration
111114
115+
extract-docs:
116+
runs-on: smithy-typescript_ubuntu-latest_8-core
117+
name: Extract Docs
118+
steps:
119+
- uses: actions/checkout@v5
120+
- uses: actions/setup-node@v5
121+
with:
122+
node-version: 18
123+
cache: "yarn"
124+
- name: Install dependencies
125+
run: |
126+
yarn
127+
yarn turbo telemetry disable
128+
- name: Build packages
129+
run: node ./scripts/retry -- yarn build
130+
- name: Run API Extractor
131+
run: yarn extract:docs
132+
112133
ensure-typescript-formatted:
113134
runs-on: ubuntu-latest
114135
name: Ensure TypeScript is formatted
115136
steps:
116-
- uses: actions/checkout@v4
117-
- uses: actions/setup-node@v4
137+
- uses: actions/checkout@v5
138+
- uses: actions/setup-node@v5
118139
with:
119140
node-version: 18
120141
cache: "yarn"
@@ -133,12 +154,12 @@ jobs:
133154
runs-on: ubuntu-latest
134155
name: Ensure TypeScript packages have changesets
135156
steps:
136-
- uses: actions/checkout@v4
157+
- uses: actions/checkout@v5
137158
# Include full git history needed for `yarn changeset status`
138159
with:
139160
ref: ${{github.event.pull_request.head.sha}}
140161
fetch-depth: 0
141-
- uses: actions/setup-node@v4
162+
- uses: actions/setup-node@v5
142163
with:
143164
node-version: 18
144165
cache: "yarn"

.github/workflows/release-npm-packages.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
id-token: write
1212
contents: write
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
16-
token: ${{secrets.PUSH_TOKEN}}
17-
- uses: actions/setup-node@v4
16+
token: ${{secrets.PR_TOKEN}}
17+
- uses: actions/setup-node@v5
1818
with:
1919
node-version: 18
2020
cache: "yarn"

.github/workflows/release-npm-ssdk-libs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
id-token: write
1212
contents: write
1313
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-node@v4
14+
- uses: actions/checkout@v5
15+
- uses: actions/setup-node@v5
1616
with:
1717
node-version: 18
1818
cache: "yarn"

.github/workflows/update-smithy-gradle-plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
get-version:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
- name: Fetch latest smithy-gradle-plugin version
1616
id: fetch-latest

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ smithy-typescript-integ-tests/dist
3434
smithy-typescript-integ-tests/node_modules
3535
smithy-typescript-integ-tests/yarn.lock
3636

37-
# Issue https://github.com/awslabs/smithy-typescript/issues/425
37+
# Issue https://github.com/smithy-lang/smithy-typescript/issues/425
3838
smithy-typescript-codegen/bin/
3939
smithy-typescript-codegen-test/bin/
4040
smithy-typescript-ssdk-codegen-test-utils/bin/
4141
smithy-typescript-codegen-test/example-weather-customizations/bin/
4242

43+
testbed/bundlers/dist
44+
testbed/bundlers/dist-min
4345
**/node_modules/
4446
**/*.tsbuildinfo
4547
**/*.d.ts

0 commit comments

Comments
 (0)