Skip to content

Commit a4b8d68

Browse files
committed
Merge branch 'main' into dependabot/npm_and_yarn/aws-cdk/toolkit-lib-0.3.2
2 parents f0c4dd9 + ea23113 commit a4b8d68

File tree

73 files changed

+8952
-3425
lines changed

Some content is hidden

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

73 files changed

+8952
-3425
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/sandbox': patch
3+
---
4+
5+
Bumps [glob](https://github.com/isaacs/node-glob) from 10.4.5 to 11.0.2.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/form-generator': patch
3+
---
4+
5+
Bumps [@aws-amplify/graphql-directives](https://github.com/aws-amplify/amplify-category-api/tree/HEAD/packages/amplify-graphql-directives) from 1.1.0 to 2.7.0.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/famous-cities-appear.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@aws-amplify/platform-core': minor
3+
'@aws-amplify/cli-core': patch
4+
'@aws-amplify/sandbox': patch
5+
'@aws-amplify/backend-cli': patch
6+
'@aws-amplify/backend-deployer': patch
7+
---
8+
9+
switch to new version of telemetry

.changeset/six-masks-sit.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/solid-laws-roll.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
'@aws-amplify/backend-platform-test-stubs': patch
3+
'@aws-amplify/backend-output-storage': patch
4+
'@aws-amplify/integration-tests': patch
5+
'@aws-amplify/backend-deployer': patch
6+
'@aws-amplify/backend-function': patch
7+
'@aws-amplify/backend-storage': patch
8+
'@aws-amplify/auth-construct': patch
9+
'@aws-amplify/ai-constructs': patch
10+
'@aws-amplify/platform-core': patch
11+
'@aws-amplify/backend-auth': patch
12+
'@aws-amplify/backend-data': patch
13+
'@aws-amplify/plugin-types': patch
14+
'@aws-amplify/backend-ai': patch
15+
'@aws-amplify/backend': patch
16+
'@aws-amplify/backend-cli': patch
17+
---
18+
19+
Update aws-cdk-lib to ^2.189.1

.eslint_dictionary.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"filepath",
7171
"filesystem",
7272
"formatter",
73+
"freemem",
7374
"frontend",
7475
"frontends",
7576
"frontmatter",
@@ -189,6 +190,7 @@
189190
"todos",
190191
"toggleable",
191192
"tokenized",
193+
"totalmem",
192194
"totp",
193195
"tsbuildinfo",
194196
"tsc",
@@ -200,6 +202,9 @@
200202
"typeof",
201203
"ubuntu",
202204
"unauth",
205+
"unflatten",
206+
"unflattens",
207+
"unflattened",
203208
"unix",
204209
"unlink",
205210
"unshallow",

.github/dependabot.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,52 @@ version: 2
55
updates:
66
# Maintain dependencies for npm ecosystem
77
- package-ecosystem: 'npm'
8-
# Checks all directories from the current layer and below recursively for package.json files
8+
# Checks root and top level package directories.
99
directories:
10-
- '**/*'
10+
- '/'
11+
- '/packages/*'
1112
schedule:
1213
# Runs every Monday at 09:00 Pacific Time
1314
interval: 'weekly'
1415
time: '09:00'
1516
timezone: 'America/Los_Angeles'
1617
# Update package.json files if new version is outside of version range specified there. Otherwise lock file only.
1718
versioning-strategy: increase-if-necessary
18-
open-pull-requests-limit: 20
19+
allow:
20+
- dependency-type: 'production'
21+
open-pull-requests-limit: 10
1922
# Groups dependencies into one PR, dependencies that don't match any group will be in their own individual PR
2023
# see https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#groups--.
2124
groups:
25+
apollo:
26+
patterns:
27+
- '@apollo/*'
2228
aws-sdk:
2329
patterns:
2430
- '@aws-sdk/*'
25-
smithy:
31+
- '@types/aws-*'
32+
changesets:
2633
patterns:
27-
- '@smithy/*'
34+
- '@changesets/*'
2835
eslint:
2936
patterns:
3037
- '@shopify/eslint-plugin'
3138
- '@typescript-eslint/*'
3239
- 'eslint'
3340
- 'eslint-*'
41+
inquirer:
42+
patterns:
43+
- '@inquirer/*'
44+
opentelemetry:
45+
patterns:
46+
- '@opentelemetry/*'
47+
smithy:
48+
patterns:
49+
- '@smithy/*'
3450
# Ignore updates to certain dependencies.
3551
# See: https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#ignore--
3652
ignore:
3753
# newer versions of api-extractor introduce breaking behavior to us see: https://github.com/microsoft/rushstack/issues/4842
3854
- dependency-name: '@microsoft/api-extractor'
55+
# typings for node should match the lowest Node version we currently support. Do not upgrade this eagerly.
56+
- dependency-name: '@types/node'

.github/workflows/canary_checks.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ jobs:
4444
contents: read
4545
steps:
4646
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
47-
with:
48-
# TODO temporarily pin to pre-pretty sandbox until we ship that
49-
# Branch contains repo at 0cc2de3ae15f09a9eec5b9e0d54f0bae474c7aa9 plus changes to build step caching
50-
ref: pre-pretty-sandbox-branch
5147
- name: Run live dependency health checks
5248
uses: ./.github/actions/run_with_e2e_account
5349
with:

0 commit comments

Comments
 (0)