Skip to content

Commit

Permalink
chore: prepend @aws-amplify to amplify-app dependency (#12031)
Browse files Browse the repository at this point in the history
* chore: adding scoping for amplify-app

* adding dependency withing package.json

* chore: prepend @aws-amplify to amplify-category-function (#11923)

* chore: merging dev into feature branch (#11920)

* chore: migrate predictions category from inquirer to prompter

* fix: amplify-prompts import

* feat: revamp help command (#11667)

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command (resolving merge conflicts)

* feat: revamp help command (remove non-null assertions)

* feat: revamp help command (remove non-null assertions)

* feat: revamp help command (revisions)

* feat: revamp help command (revisions)

* feat: revamp help command (revisions)

* feat: revamp help command (update to use array find)

* feat: revamp help command (switch to single quotes)

* feat: revamp help command (switch to single quotes)

* feat: revamp help command (put imports on same line)

* feat: revamp help command (extract api)

* feat: revamp help command (prettier on help-helpers)

* feat: revamp help command (fix tag line)

* feat: revamp help command (changing test names)

* feat: revamp help command (refactoring preserveHelpInformation)

* chore: fix unit test for predictions prompter migration

* chore: fix delete project unit test for predictions prompter migration

* chore: added prompterAdapter class to handle prompt objects by type

* chore: updated migration tests to use a different version of push as prompter interaction changed in this PR

* chore: fix predictions e2e test as the new prompt will auto-select the single option

* chore: removed unused import

* chore: fixed codeQL warnings

* chore: fix migration tests using inquirer prompts

* chore: e2e tests affected by inquirer to prompts change

* chore: e2e tests affected by inquirer to prompts change

* chore: split log running tests

* chore: addressing PR feedback

* test: fix e2e test runAsync error validation

* chore: replaced static string literal as dynamic key with field name

* fix: modal windows test for opensearch simulator (#11911)

* fix: modal windows test for opensearch simulator

* fix: don't run opensearch-simulator test on windows

* feat: force version bump (#11913)

* chore: fix dependency versions and update clean command (#11915)

---------

Co-authored-by: Pavel Lazar <[email protected]>
Co-authored-by: lazpavel <[email protected]>
Co-authored-by: Zachary Goldberg <[email protected]>
Co-authored-by: Spencer Stolworthy <[email protected]>
Co-authored-by: John Hockett <[email protected]>

* merging dev into @aws-amplify-scoping (#11921)

* chore: migrate predictions category from inquirer to prompter

* fix: amplify-prompts import

* feat: revamp help command (#11667)

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command

* feat: revamp help command (resolving merge conflicts)

* feat: revamp help command (remove non-null assertions)

* feat: revamp help command (remove non-null assertions)

* feat: revamp help command (revisions)

* feat: revamp help command (revisions)

* feat: revamp help command (revisions)

* feat: revamp help command (update to use array find)

* feat: revamp help command (switch to single quotes)

* feat: revamp help command (switch to single quotes)

* feat: revamp help command (put imports on same line)

* feat: revamp help command (extract api)

* feat: revamp help command (prettier on help-helpers)

* feat: revamp help command (fix tag line)

* feat: revamp help command (changing test names)

* feat: revamp help command (refactoring preserveHelpInformation)

* chore: fix unit test for predictions prompter migration

* chore: fix delete project unit test for predictions prompter migration

* chore: added prompterAdapter class to handle prompt objects by type

* chore: updated migration tests to use a different version of push as prompter interaction changed in this PR

* chore: fix predictions e2e test as the new prompt will auto-select the single option

* chore: removed unused import

* chore: fixed codeQL warnings

* chore: fix migration tests using inquirer prompts

* chore: e2e tests affected by inquirer to prompts change

* chore: e2e tests affected by inquirer to prompts change

* chore: split log running tests

* chore: addressing PR feedback

* test: fix e2e test runAsync error validation

* chore: replaced static string literal as dynamic key with field name

* fix: modal windows test for opensearch simulator (#11911)

* fix: modal windows test for opensearch simulator

* fix: don't run opensearch-simulator test on windows

* feat: force version bump (#11913)

* chore: fix dependency versions and update clean command (#11915)

---------

Co-authored-by: Pavel Lazar <[email protected]>
Co-authored-by: lazpavel <[email protected]>
Co-authored-by: Zachary Goldberg <[email protected]>
Co-authored-by: Spencer Stolworthy <[email protected]>
Co-authored-by: John Hockett <[email protected]>

* chore: prepend @aws-amplify to amplify-category-function

* chore: yarn extract-api

---------

Co-authored-by: Pavel Lazar <[email protected]>
Co-authored-by: lazpavel <[email protected]>
Co-authored-by: Zachary Goldberg <[email protected]>
Co-authored-by: Spencer Stolworthy <[email protected]>
Co-authored-by: John Hockett <[email protected]>

* chore: prepend @aws-amplify to amplify-category-interactions (#11930)

* prepend @aws-amplify to amplify-categor-interactions

* chore: fixing yarn extract-api

* chore: prepend @aws-amplify to amplify-category-geo (#11926)

* chore: prepend @aws-amplify to amplify-category-geo

* chore: running yarn extract

* chore: fixing yarn extract-api

* chore: prepend @aws-amplify to amplify-category-analytics (#11922)

* adding aws-amplify to category analytics package

* chore: syncing with dev

* chore: fixing yarn.lock

* chore: yarn extract-api

* chore: fixing extract-api

* chore: prepend aws/amplify to amplify-category-hosting (#11929)

* chore: adding @aws-amplify to hosting category dep

* prepend aws-amplify for amplify hosting dependency

* chore: running yarn extract

* chore: fixing yarn extract-api

* chore: regenerate yarn.lockfile

* chore: running prettier

* chore: sorting package.json

---------

Co-authored-by: Pavel Lazar <[email protected]>
Co-authored-by: lazpavel <[email protected]>
Co-authored-by: Zachary Goldberg <[email protected]>
Co-authored-by: Spencer Stolworthy <[email protected]>
Co-authored-by: John Hockett <[email protected]>
  • Loading branch information
6 people authored Feb 20, 2023
1 parent 69f5987 commit 0e12dff
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/amplify-app/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "amplify-app",
"name": "@aws-amplify/amplify-app",
"version": "4.3.10",
"description": "Amplify CLI",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"node": ">=12.0.0"
},
"dependencies": {
"@aws-amplify/amplify-app": "4.3.10",
"@aws-amplify/amplify-category-analytics": "4.4.2",
"@aws-amplify/amplify-category-api": "^4.1.8",
"@aws-amplify/amplify-category-auth": "2.15.2",
Expand All @@ -60,7 +61,6 @@
"@aws-amplify/amplify-util-uibuilder": "1.6.8",
"@aws-amplify/graphql-auth-transformer": "^1.2.7",
"@aws-cdk/cloudformation-diff": "~1.172.0",
"amplify-app": "4.3.10",
"amplify-category-xr": "3.4.2",
"amplify-cli-core": "3.6.2",
"amplify-cli-shared-interfaces": "1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli/src/pre-deployment-pull.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { run } from 'amplify-app';
import { run } from '@aws-amplify/amplify-app';
import { $TSContext, AmplifyError, AMPLIFY_SUPPORT_DOCS, pathManager } from 'amplify-cli-core';
import * as fs from 'fs-extra';
import fetch from 'node-fetch';
Expand Down

0 comments on commit 0e12dff

Please sign in to comment.