Migrations merge from dev #14098
Merged
Migrations merge from dev #14098
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [webpack](https://github.com/webpack/webpack) from 5.76.0 to 5.94.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.76.0...v5.94.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…bpack-5.94.0 chore(deps): bump webpack from 5.76.0 to 5.94.0
Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](micromatch/micromatch@4.0.5...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…cromatch-4.0.8 chore(deps): bump micromatch from 4.0.5 to 4.0.8
chore: update codeowners
* chore: bump express version * chore: increase macos binary threshold
Bumps [dset](https://github.com/lukeed/dset) from 3.1.2 to 3.1.4. - [Release notes](https://github.com/lukeed/dset/releases) - [Commits](lukeed/dset@v3.1.2...v3.1.4) --- updated-dependencies: - dependency-name: dset dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…et-3.1.4 chore(deps): bump dset from 3.1.2 to 3.1.4
fix: update message when expecting S3 to throw
* feat: add warning to init * feat: add prompt to init * feat: only prompt on new project * feat: add guide to Gen2 * refactor: change to use process exit * Update packages/amplify-cli/src/init-steps/preInitMigrationWarning.ts Co-authored-by: Amplifiyer <[email protected]> * refactor: rename to gen2Recommendation * refactor: combine gen2Recommendation to preInitSetup * feat: remove goodbye message * test: fix init.test * test: add unit test for preInitSetup * chore: rename to getPreInitSetup * feat: change verbiage * chore: update unit test * feat: add whyContinueWithGen1 to stack metadata * fix: verify verify_versions_match * fix: verify verify_versions_match * feat: bump versions * feat: bump versions * feat: bump versions * chore: rename to recommendGen2 * chore: rename to recommendGen2 in test * revert .sh format * chore: rename and not export preInitSetup * fix: export gen2Recommandation and preInitSetup for test * fix: set inital answer for pick * Revert "fix: set inital answer for pick" This reverts commit 7ecde5c. * Revert "Revert "fix: set inital answer for pick"" This reverts commit d8fa624. * fix: preInitSetup.test * fix: e2e test by adding isCI * chore: upgrade node-pty * Revert "fix: e2e test by adding isCI" This reverts commit 71b204c. * test: add prompt to e2e * fix: set default value for whyContinueWithGen1 * fix: projectConfig undefined and remove default choice * fix: preInitSetup.test.ts * fix: add default choice back * fix: remove prompts from migration test * test: move new prompt from v12 * test: move new prompt from initJSProjectWithProfile * Revert "test: move new prompt from initJSProjectWithProfile" This reverts commit eeb6f71. * test: move new prompts from initJSProjectWithProfile * chore: change recommendGen2 * test: fix preInitSetup unit test * test: add includeGen2RecommendationPrompt * test: add includeGen2RecommendationPrompt to migration-2 * test: remove prompts from initAndroidProjectWithProfileV12 --------- Co-authored-by: 0.618 <[email protected]> Co-authored-by: Amplifiyer <[email protected]>
…-performance-improvement feat: improve performance in storing current cloud backend
Bumps [rollup](https://github.com/rollup/rollup) from 2.70.2 to 2.79.2. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](rollup/rollup@v2.70.2...v2.79.2) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…llup-2.79.2 chore(deps): bump rollup from 2.70.2 to 2.79.2
Bumps [webrick](https://github.com/ruby/webrick) from 1.7.0 to 1.8.2. - [Release notes](https://github.com/ruby/webrick/releases) - [Commits](ruby/webrick@v1.7.0...v1.8.2) --- updated-dependencies: - dependency-name: webrick dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…s/amplify-e2e-tests/resources/example-ios-app/webrick-1.8.2 chore(deps): bump webrick from 1.7.0 to 1.8.2 in /packages/amplify-e2e-tests/resources/example-ios-app
- @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected]
…ee91 chore(release): Merge main into dev
* chore: bump cookie * chore: yarn dedupe
* fix: bump versions * chore: fix tests
Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.4 to 2.0.7. - [Release notes](https://github.com/chimurai/http-proxy-middleware/releases) - [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md) - [Commits](chimurai/http-proxy-middleware@v2.0.4...v2.0.7) --- updated-dependencies: - dependency-name: http-proxy-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…tp-proxy-middleware-2.0.7 chore(deps): bump http-proxy-middleware from 2.0.4 to 2.0.7
* fix: update actions/upload-artifact * fix: make artifact names unique
…1eee chore(release): Merge main into dev
…4085) * chore: bump data package versions to [email protected] * chore: bump pkg size thresholds
- @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected] - [email protected] - @aws-amplify/[email protected] - @aws-amplify/[email protected]
…90b7 chore(release): Merge main into dev
* chore(deps): bump aws-cdk-lib from 2.129.0 to 2.177.0 Bumps [aws-cdk-lib](https://github.com/aws/aws-cdk/tree/HEAD/packages/aws-cdk-lib) from 2.129.0 to 2.177.0. - [Release notes](https://github.com/aws/aws-cdk/releases) - [Changelog](https://github.com/aws/aws-cdk/blob/main/CHANGELOG.v2.md) - [Commits](https://github.com/aws/aws-cdk/commits/v2.177.0/packages/aws-cdk-lib) --- updated-dependencies: - dependency-name: aws-cdk-lib dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * fix build * fix build * fix that --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kamil Sobol <[email protected]>
Updated the TypeScript compilation of overrides so that it doesn't require `node_modules/.bin/tsc`. Instead, it simply relies on the `build` script to execute `tsc`. This is more flexible and can support alternative setups w/ hoisting (e.g. via Yarn workspaces). This is an override corollary fix to #11854, which is for custom resources. #11889
* fix(amplify-cli-core): use build script properly for overrides Updated the TypeScript compilation of overrides so that it doesn't require `node_modules/.bin/tsc`. Instead, it simply relies on the `build` script to execute `tsc`. This is more flexible and can support alternative setups w/ hoisting (e.g. via Yarn workspaces). This is an override corollary fix to #11854, which is for custom resources. This is an improvement over my previous PR in #13858 in that it works with any package manager by ensuring the `--project` and `tsconfig.json` files are passed through to the `tsc` script. The previous implementation didn't work with `npm` because it doesn't pass through additional args like `yarn` does. The fix was easy: simply separate the build run with `--` so that the remaining args are treated as positional for the `tsc` script. I've confirmed the fix works with both `yarn` and `npm` 💪 #11889 * fix(amplify-cli-core): only include -- for npm Tweaked the implementation slightly so that the `--` arg is only passed for `npm` since it doesn't actually work with `yarn`. #11889 * fix(amplify-cli-core): new packageManner runner Added a new `runner` field to the PackageManager interface. The key difference here is npm's runner is actually `npx`, whereas yarn and pnpm just use the same executable as the runner. Updated both the override and custom-resources to use the runner to run tsc now instead of only looking in `node_modules`. #11889 * fix: update api --------- Co-authored-by: Kamil Sobol <[email protected]>
fix: load region from AWS client if the credentials are managed by AWS-SDK
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
abhi7cr
force-pushed
the
migrations-merge-from-dev
branch
from
9907c5c to
6f894d4
Compare
dpilch
approved these changes
Feb 7, 2025
sobolk
approved these changes
Feb 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Merge dev to migrations branch. This will make it easier to merge back from migrations to dev later on.
Description of how you validated changes
yarn buildChecklist
yarn testpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.