From 7ff4c1207d06c3835e5a78c6c131c163b0642cf6 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Mon, 6 Feb 2023 16:19:00 -0500 Subject: [PATCH 01/10] chore: adding scoping for amplify-app --- packages/amplify-app/package.json | 2 +- .../amplify-cli/src/pre-deployment-pull.ts | 2 +- yarn.lock | 21 +++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json index 5fb5f7e8291..f8a2b294418 100644 --- a/packages/amplify-app/package.json +++ b/packages/amplify-app/package.json @@ -1,5 +1,5 @@ { - "name": "amplify-app", + "name": "@aws-amplify/amplify-app", "version": "4.3.9", "description": "Amplify CLI", "repository": { diff --git a/packages/amplify-cli/src/pre-deployment-pull.ts b/packages/amplify-cli/src/pre-deployment-pull.ts index 68d74c0ee8a..d73b523bea5 100644 --- a/packages/amplify-cli/src/pre-deployment-pull.ts +++ b/packages/amplify-cli/src/pre-deployment-pull.ts @@ -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'; diff --git a/yarn.lock b/yarn.lock index 423c9b80656..96cbf5f4be0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9970,6 +9970,27 @@ amdefine@>=0.0.4: resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= +amplify-app@4.3.9: + version "4.3.9" + resolved "https://registry.npmjs.org/amplify-app/-/amplify-app-4.3.9.tgz#cb3d089f82c06eba78145056bce4b4d53161bf5b" + integrity sha512-eRSjmuagzU5qdrdwPycyvR3ENxKZ+D92KjQxhZ1BZpMzeUgBm+MXbAzFLXyLjRwQ+ODUx0Clb+6A3RaXaSsisg== + dependencies: + amplify-frontend-android "3.4.1" + amplify-frontend-flutter "1.3.5" + amplify-frontend-ios "3.5.9" + amplify-frontend-javascript "3.7.5" + chalk "^4.1.1" + execa "^5.1.1" + fs-extra "^8.1.0" + ini "^1.3.5" + inquirer "^7.3.3" + node-emoji "^1.10.0" + ora "^4.0.3" + rimraf "^3.0.0" + semver "^7.3.5" + xcode "^2.1.0" + yargs "^15.1.0" + amplify-codegen@^3.3.6: version "3.3.6" resolved "https://registry.npmjs.org/amplify-codegen/-/amplify-codegen-3.3.6.tgz#3edcbf229b4023b1dd9b5fd4813587b2819f884a" From 205376f688d521e08297a64412710194daa271d0 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Mon, 6 Feb 2023 17:24:13 -0500 Subject: [PATCH 02/10] adding dependency withing package.json --- packages/amplify-cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index 8554fbe0275..04e8aa48cf6 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -42,7 +42,7 @@ "@aws-amplify/amplify-environment-parameters": "1.3.3", "@aws-amplify/amplify-util-uibuilder": "1.6.7", "@aws-cdk/cloudformation-diff": "~1.172.0", - "amplify-app": "4.3.9", + "@aws-amplify/amplify-app": "4.3.9", "amplify-category-analytics": "4.4.1", "amplify-category-function": "4.3.1", "amplify-category-geo": "2.11.1", From 91d62dad269be01cbedeedd49a805cad90aed7ed Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Wed, 8 Feb 2023 11:14:46 -0500 Subject: [PATCH 03/10] 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 Co-authored-by: lazpavel <85319655+lazpavel@users.noreply.github.com> Co-authored-by: Zachary Goldberg <117126550+goldbez@users.noreply.github.com> Co-authored-by: Spencer Stolworthy Co-authored-by: John Hockett * 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 Co-authored-by: lazpavel <85319655+lazpavel@users.noreply.github.com> Co-authored-by: Zachary Goldberg <117126550+goldbez@users.noreply.github.com> Co-authored-by: Spencer Stolworthy Co-authored-by: John Hockett * chore: prepend @aws-amplify to amplify-category-function * chore: yarn extract-api --------- Co-authored-by: Pavel Lazar Co-authored-by: lazpavel <85319655+lazpavel@users.noreply.github.com> Co-authored-by: Zachary Goldberg <117126550+goldbez@users.noreply.github.com> Co-authored-by: Spencer Stolworthy Co-authored-by: John Hockett --- packages/amplify-category-function/API.md | 2 +- packages/amplify-category-function/package.json | 5 ++++- packages/amplify-cli/package.json | 4 ++-- .../extensions/amplify-helpers/resource-status.test.ts | 8 ++++---- .../extensions/amplify-helpers/resource-status-data.ts | 2 +- .../src/extensions/amplify-helpers/update-amplify-meta.ts | 2 +- .../tests/amplify-helpers/trigger-flow.test.js | 2 +- packages/amplify-util-mock/package.json | 2 +- .../src/__tests__/api/lambda-invoke.test.ts | 4 ++-- .../src/__tests__/api/lambda-trigger-handler.test.ts | 4 ++-- .../amplify-util-mock/src/__tests__/func/index.test.ts | 4 ++-- packages/amplify-util-mock/src/api/api.ts | 2 +- .../amplify-util-mock/src/api/lambda-arn-to-config.ts | 2 +- packages/amplify-util-mock/src/api/lambda-invoke.ts | 2 +- .../amplify-util-mock/src/api/lambda-trigger-handler.ts | 2 +- packages/amplify-util-mock/src/func/index.ts | 2 +- packages/amplify-util-mock/src/mockAll.ts | 2 +- packages/amplify-util-mock/src/storage/storage.ts | 2 +- .../src/utils/lambda/find-lambda-triggers.ts | 2 +- 19 files changed, 29 insertions(+), 26 deletions(-) diff --git a/packages/amplify-category-function/API.md b/packages/amplify-category-function/API.md index b37f65c9fb9..5858e0062ad 100644 --- a/packages/amplify-category-function/API.md +++ b/packages/amplify-category-function/API.md @@ -1,4 +1,4 @@ -## API Report File for "amplify-category-function" +## API Report File for "@aws-amplify/amplify-category-function" > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json index 4f462bda8c8..acb0e1c38e5 100644 --- a/packages/amplify-category-function/package.json +++ b/packages/amplify-category-function/package.json @@ -1,5 +1,5 @@ { - "name": "amplify-category-function", + "name": "@aws-amplify/amplify-category-function", "version": "4.3.1", "description": "amplify-cli function plugin", "repository": { @@ -22,6 +22,9 @@ "amplify", "aws" ], + "publishConfig": { + "access": "public" + }, "dependencies": { "@aws-amplify/amplify-environment-parameters": "1.3.3", "amplify-cli-core": "3.6.1", diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index 8554fbe0275..ed7c550814e 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -44,7 +44,7 @@ "@aws-cdk/cloudformation-diff": "~1.172.0", "amplify-app": "4.3.9", "amplify-category-analytics": "4.4.1", - "amplify-category-function": "4.3.1", + "@aws-amplify/amplify-category-function": "4.3.1", "amplify-category-geo": "2.11.1", "amplify-category-hosting": "3.4.9", "amplify-category-interactions": "4.3.1", @@ -187,7 +187,7 @@ "function": { "name": "function", "type": "category", - "packageName": "amplify-category-function" + "packageName": "@aws-amplify/amplify-category-function" }, "geo": { "name": "geo", diff --git a/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/resource-status.test.ts b/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/resource-status.test.ts index f74a2244b13..243e305f07c 100644 --- a/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/resource-status.test.ts +++ b/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/resource-status.test.ts @@ -1,8 +1,8 @@ -import { hashLayerResource } from 'amplify-category-function'; +import { hashLayerResource } from '@aws-amplify/amplify-category-function'; import { AmplifyException, stateManager } from 'amplify-cli-core'; import { hashElement } from 'folder-hash'; import * as fs from 'fs-extra'; -import { +import { CLOUD_INITIALIZED, CLOUD_NOT_INITIALIZED, getCloudInitStatus, NON_AMPLIFY_PROJECT, } from '../../../extensions/amplify-helpers/get-cloud-init-status'; import { getEnvInfo } from '../../../extensions/amplify-helpers/get-env-info'; @@ -77,8 +77,8 @@ jest.mock('amplify-cli-core', () => ({ }, })); -jest.mock('amplify-category-function', () => ({ - ...(jest.requireActual('amplify-category-function') as Record), +jest.mock('@aws-amplify/amplify-category-function', () => ({ + ...(jest.requireActual('@aws-amplify/amplify-category-function') as Record), hashLayerResource: jest.fn(), })); diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-data.ts b/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-data.ts index 9f33e1fa20e..92ae6eea9c8 100644 --- a/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-data.ts +++ b/packages/amplify-cli/src/extensions/amplify-helpers/resource-status-data.ts @@ -2,7 +2,7 @@ /* eslint-disable spellcheck/spell-checker */ /* eslint-disable no-param-reassign */ /* eslint-disable import/no-cycle */ -import { hashLayerResource, ServiceName as FunctionServiceName } from 'amplify-category-function'; +import { hashLayerResource, ServiceName as FunctionServiceName } from '@aws-amplify/amplify-category-function'; import { $TSAny, pathManager, projectNotInitializedError, stateManager, ViewResourceTableParams, diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts b/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts index e70448b3b89..9fd5f3f9116 100644 --- a/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts +++ b/packages/amplify-cli/src/extensions/amplify-helpers/update-amplify-meta.ts @@ -1,7 +1,7 @@ /* eslint-disable spellcheck/spell-checker */ /* eslint-disable import/no-extraneous-dependencies */ import { saveAll as saveAllEnvParams } from '@aws-amplify/amplify-environment-parameters'; -import { buildTypeKeyMap, ServiceName } from 'amplify-category-function'; +import { buildTypeKeyMap, ServiceName } from '@aws-amplify/amplify-category-function'; import { $TSAny, $TSMeta, $TSObject, JSONUtilities, pathManager, ResourceTuple, stateManager } from 'amplify-cli-core'; import { BuildType } from 'amplify-function-plugin-interface'; import * as fs from 'fs-extra'; diff --git a/packages/amplify-cli/tests/amplify-helpers/trigger-flow.test.js b/packages/amplify-cli/tests/amplify-helpers/trigger-flow.test.js index d12132b4a6b..2f07978cc47 100644 --- a/packages/amplify-cli/tests/amplify-helpers/trigger-flow.test.js +++ b/packages/amplify-cli/tests/amplify-helpers/trigger-flow.test.js @@ -1,7 +1,7 @@ /* eslint-disable arrow-body-style */ /* eslint-disable no-unused-vars */ const triggerFlow = require('../../lib/extensions/amplify-helpers/trigger-flow'); -const func = require('amplify-category-function'); +const func = require('@aws-amplify/amplify-category-function'); const inquirer = require('inquirer'); const fs = require('fs'); const fsExtra = require('fs-extra'); diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json index 2a4e31af98c..de7160ff5bf 100644 --- a/packages/amplify-util-mock/package.json +++ b/packages/amplify-util-mock/package.json @@ -33,7 +33,7 @@ "@aws-amplify/amplify-opensearch-simulator": "1.1.4", "@hapi/topo": "^5.0.0", "amplify-codegen": "^3.3.6", - "amplify-category-function": "4.3.1", + "@aws-amplify/amplify-category-function": "4.3.1", "amplify-cli-core": "3.6.1", "amplify-dynamodb-simulator": "2.5.5", "amplify-prompts": "2.6.3", diff --git a/packages/amplify-util-mock/src/__tests__/api/lambda-invoke.test.ts b/packages/amplify-util-mock/src/__tests__/api/lambda-invoke.test.ts index f7fa661c4b7..c929e4d57f1 100644 --- a/packages/amplify-util-mock/src/__tests__/api/lambda-invoke.test.ts +++ b/packages/amplify-util-mock/src/__tests__/api/lambda-invoke.test.ts @@ -2,7 +2,7 @@ import { $TSAny, $TSContext } from 'amplify-cli-core'; import { invokeTrigger } from '../../api/lambda-invoke'; import { ProcessedLambdaFunction } from '../../CFNParser/stack/types'; import { loadLambdaConfig } from '../../utils/lambda/load-lambda-config'; -import { getInvoker, getBuilder } from 'amplify-category-function'; +import { getInvoker, getBuilder } from '@aws-amplify/amplify-category-function'; import { timeConstrainedInvoker } from '../../func'; import { printer } from 'amplify-prompts'; @@ -13,7 +13,7 @@ jest.mock('../../utils/lambda/load-lambda-config', () => ({ })); const loadLambdaConfigMock = loadLambdaConfig as jest.MockedFunction; -jest.mock('amplify-category-function', () => ({ +jest.mock('@aws-amplify/amplify-category-function', () => ({ getInvoker: jest.fn().mockResolvedValue(() => new Promise(resolve => setTimeout(() => resolve('lambda value'), 10))), getBuilder: jest.fn().mockReturnValue(() => {}), isMockable: jest.fn().mockReturnValue({ isMockable: true }), diff --git a/packages/amplify-util-mock/src/__tests__/api/lambda-trigger-handler.test.ts b/packages/amplify-util-mock/src/__tests__/api/lambda-trigger-handler.test.ts index dcd07ad9a13..9089f22f1fd 100644 --- a/packages/amplify-util-mock/src/__tests__/api/lambda-trigger-handler.test.ts +++ b/packages/amplify-util-mock/src/__tests__/api/lambda-trigger-handler.test.ts @@ -1,6 +1,6 @@ import { $TSAny, $TSContext } from 'amplify-cli-core'; import { invokeTrigger } from '../../api/lambda-invoke'; -import { isMockable } from 'amplify-category-function'; +import { isMockable } from '@aws-amplify/amplify-category-function'; import * as lambdaTriggerHandlers from '../../api/lambda-trigger-handler'; import { DynamoDBStreams, Endpoint } from 'aws-sdk'; @@ -9,7 +9,7 @@ jest.mock('../../api/lambda-invoke', () => ({ })); const invokeLambdaMock = invokeTrigger as jest.MockedFunction; -jest.mock('amplify-category-function', () => ({ +jest.mock('@aws-amplify/amplify-category-function', () => ({ isMockable: jest.fn().mockReturnValue({ isMockable: true }) })); const isMockableMock = isMockable as jest.MockedFunction; diff --git a/packages/amplify-util-mock/src/__tests__/func/index.test.ts b/packages/amplify-util-mock/src/__tests__/func/index.test.ts index 3aae35d9f9f..a3989e1710a 100644 --- a/packages/amplify-util-mock/src/__tests__/func/index.test.ts +++ b/packages/amplify-util-mock/src/__tests__/func/index.test.ts @@ -1,6 +1,6 @@ import { $TSAny } from 'amplify-cli-core'; import { start } from '../../func'; -import { getInvoker, getBuilder } from 'amplify-category-function'; +import { getInvoker, getBuilder } from '@aws-amplify/amplify-category-function'; import { stateManager } from 'amplify-cli-core'; import _ from 'lodash'; import * as inquirer from 'inquirer'; @@ -19,7 +19,7 @@ jest.mock('amplify-cli-core', () => ({ getMeta: jest.fn().mockReturnValue({}), }, })); -jest.mock('amplify-category-function', () => ({ +jest.mock('@aws-amplify/amplify-category-function', () => ({ getInvoker: jest.fn().mockResolvedValue(() => new Promise(resolve => setTimeout(() => resolve('lambda value'), 10))), getBuilder: jest.fn().mockReturnValue(() => {}), isMockable: jest.fn().mockReturnValue({ isMockable: true }), diff --git a/packages/amplify-util-mock/src/api/api.ts b/packages/amplify-util-mock/src/api/api.ts index f73143d8126..482aef7584e 100644 --- a/packages/amplify-util-mock/src/api/api.ts +++ b/packages/amplify-util-mock/src/api/api.ts @@ -24,7 +24,7 @@ import { LambdaTrigger, } from '../utils/lambda/find-lambda-triggers'; import { getMockConfig } from '../utils/mock-config-file'; -import { getInvoker } from 'amplify-category-function'; +import { getInvoker } from '@aws-amplify/amplify-category-function'; import { lambdaArnToConfig } from './lambda-arn-to-config'; import { timeConstrainedInvoker } from '../func'; import { ddbLambdaTriggerHandler } from './lambda-trigger-handler'; diff --git a/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts b/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts index 08e0e6df157..490ad6a4dee 100644 --- a/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts +++ b/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts @@ -1,7 +1,7 @@ import { keys } from 'lodash'; import { $TSAny, $TSContext, stateManager, ApiCategoryFacade, getGraphQLTransformerFunctionDocLink } from 'amplify-cli-core'; import _ = require('lodash'); -import { ServiceName } from 'amplify-category-function'; +import { ServiceName } from '@aws-amplify/amplify-category-function'; import { loadLambdaConfig } from '../utils/lambda/load-lambda-config'; import { ProcessedLambdaFunction } from '../CFNParser/stack/types'; diff --git a/packages/amplify-util-mock/src/api/lambda-invoke.ts b/packages/amplify-util-mock/src/api/lambda-invoke.ts index 2891347b339..00f0f7db478 100644 --- a/packages/amplify-util-mock/src/api/lambda-invoke.ts +++ b/packages/amplify-util-mock/src/api/lambda-invoke.ts @@ -1,7 +1,7 @@ import { $TSAny, $TSContext, AmplifyFault, AMPLIFY_SUPPORT_DOCS } from 'amplify-cli-core'; import { loadLambdaConfig } from '../utils/lambda/load-lambda-config'; import { BuildType, FunctionRuntimeLifecycleManager, BuildRequest } from 'amplify-function-plugin-interface'; -import { getInvoker, getBuilder } from 'amplify-category-function'; +import { getInvoker, getBuilder } from '@aws-amplify/amplify-category-function'; import { timeConstrainedInvoker } from '../func'; import { printer } from 'amplify-prompts'; import { LambdaTrigger, LambdaTriggerConfig } from '../utils/lambda/find-lambda-triggers'; diff --git a/packages/amplify-util-mock/src/api/lambda-trigger-handler.ts b/packages/amplify-util-mock/src/api/lambda-trigger-handler.ts index 4cb5b6e9423..dbbe1c182ba 100644 --- a/packages/amplify-util-mock/src/api/lambda-trigger-handler.ts +++ b/packages/amplify-util-mock/src/api/lambda-trigger-handler.ts @@ -1,7 +1,7 @@ import { $TSContext, AmplifyFault, AMPLIFY_SUPPORT_DOCS } from 'amplify-cli-core'; import { DynamoDBStreams, Endpoint } from 'aws-sdk'; import { invokeTrigger } from './lambda-invoke'; -import { isMockable } from 'amplify-category-function'; +import { isMockable } from '@aws-amplify/amplify-category-function'; import { printer } from 'amplify-prompts'; import { LambdaTrigger } from '../utils/lambda/find-lambda-triggers'; diff --git a/packages/amplify-util-mock/src/func/index.ts b/packages/amplify-util-mock/src/func/index.ts index 408dc20b5fd..6a0915f3d4f 100644 --- a/packages/amplify-util-mock/src/func/index.ts +++ b/packages/amplify-util-mock/src/func/index.ts @@ -1,4 +1,4 @@ -import { getInvoker, category, isMockable, getBuilder } from 'amplify-category-function'; +import { getInvoker, category, isMockable, getBuilder } from '@aws-amplify/amplify-category-function'; import * as path from 'path'; import * as inquirer from 'inquirer'; import { $TSContext, JSONUtilities, pathManager, stateManager } from 'amplify-cli-core'; diff --git a/packages/amplify-util-mock/src/mockAll.ts b/packages/amplify-util-mock/src/mockAll.ts index 43a4380f416..92a9dfd7552 100644 --- a/packages/amplify-util-mock/src/mockAll.ts +++ b/packages/amplify-util-mock/src/mockAll.ts @@ -1,6 +1,6 @@ import { start as startAppSyncServer } from './api'; import { start as startS3Server } from './storage'; -import { ServiceName as FunctionServiceName } from 'amplify-category-function'; +import { ServiceName as FunctionServiceName } from '@aws-amplify/amplify-category-function'; const MOCK_SUPPORTED_CATEGORY = ['AppSync', 'S3', FunctionServiceName.LambdaFunction]; export async function mockAllCategories(context: any) { diff --git a/packages/amplify-util-mock/src/storage/storage.ts b/packages/amplify-util-mock/src/storage/storage.ts index 67a038239cd..bf8e1768d9a 100644 --- a/packages/amplify-util-mock/src/storage/storage.ts +++ b/packages/amplify-util-mock/src/storage/storage.ts @@ -3,7 +3,7 @@ import * as path from 'path'; import * as fs from 'fs-extra'; import { getAmplifyMeta, getMockDataDirectory } from '../utils'; import { ConfigOverrideManager } from '../utils/config-override'; -import { getInvoker } from 'amplify-category-function'; +import { getInvoker } from '@aws-amplify/amplify-category-function'; import { loadLambdaConfig } from '../utils/lambda/load-lambda-config'; import { $TSAny, $TSContext, JSONUtilities } from 'amplify-cli-core'; diff --git a/packages/amplify-util-mock/src/utils/lambda/find-lambda-triggers.ts b/packages/amplify-util-mock/src/utils/lambda/find-lambda-triggers.ts index a74ec745050..d164cf671b2 100644 --- a/packages/amplify-util-mock/src/utils/lambda/find-lambda-triggers.ts +++ b/packages/amplify-util-mock/src/utils/lambda/find-lambda-triggers.ts @@ -1,7 +1,7 @@ import { $TSContext, pathManager, stateManager, JSONUtilities, $TSObject } from 'amplify-cli-core'; import * as path from 'path'; import _ = require('lodash'); -import { ServiceName } from 'amplify-category-function'; +import { ServiceName } from '@aws-amplify/amplify-category-function'; import { getMockSearchableTriggerDirectory } from '../mock-directory'; type LambdaTriggersMap = { [index: string] : LambdaTrigger[]}; From b250281826022ec98441c2196530bfa7f762d79b Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Wed, 8 Feb 2023 12:40:23 -0500 Subject: [PATCH 04/10] chore: prepend @aws-amplify to amplify-category-interactions (#11930) * prepend @aws-amplify to amplify-categor-interactions * chore: fixing yarn extract-api --- packages/amplify-category-interactions/API.md | 2 +- packages/amplify-category-interactions/package.json | 5 ++++- packages/amplify-cli/package.json | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/amplify-category-interactions/API.md b/packages/amplify-category-interactions/API.md index 87b2e802fc3..e47e27ef5c2 100644 --- a/packages/amplify-category-interactions/API.md +++ b/packages/amplify-category-interactions/API.md @@ -1,4 +1,4 @@ -## API Report File for "amplify-category-interactions" +## API Report File for "@aws-amplify/amplify-category-interactions" > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). diff --git a/packages/amplify-category-interactions/package.json b/packages/amplify-category-interactions/package.json index 7bb86d790bc..dca80d1d5e3 100644 --- a/packages/amplify-category-interactions/package.json +++ b/packages/amplify-category-interactions/package.json @@ -1,5 +1,5 @@ { - "name": "amplify-category-interactions", + "name": "@aws-amplify/amplify-category-interactions", "version": "4.3.1", "description": "amplify-cli interactions plugin", "repository": { @@ -14,6 +14,9 @@ "amplify", "aws" ], + "publishConfig": { + "access": "public" + }, "scripts": { "build": "tsc && yarn copy-templates", "clean": "rimraf lib tsconfig.tsbuildinfo node_modules", diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index ed7c550814e..a8642d534b2 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -47,7 +47,7 @@ "@aws-amplify/amplify-category-function": "4.3.1", "amplify-category-geo": "2.11.1", "amplify-category-hosting": "3.4.9", - "amplify-category-interactions": "4.3.1", + "@aws-amplify/amplify-category-interactions": "4.3.1", "amplify-category-notifications": "2.23.1", "amplify-category-predictions": "4.3.1", "amplify-category-xr": "3.4.1", @@ -214,7 +214,7 @@ "interactions": { "name": "interactions", "type": "category", - "packageName": "amplify-category-interactions" + "packageName": "@aws-amplify/amplify-category-interactions" }, "notifications": { "name": "notifications", From 4e62ac681546adc91130c39bce15777281a1ec58 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Wed, 8 Feb 2023 12:40:39 -0500 Subject: [PATCH 05/10] 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 --- packages/amplify-category-geo/API.md | 2 +- packages/amplify-category-geo/package.json | 5 ++++- .../src/service-utils/validateGeoJSONObj.ts | 2 +- packages/amplify-cli/package.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/amplify-category-geo/API.md b/packages/amplify-category-geo/API.md index ba15d9820b4..e147d127c1b 100644 --- a/packages/amplify-category-geo/API.md +++ b/packages/amplify-category-geo/API.md @@ -1,4 +1,4 @@ -## API Report File for "amplify-category-geo" +## API Report File for "@aws-amplify/amplify-category-geo" > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json index e3ee60a7634..c870fd516ea 100644 --- a/packages/amplify-category-geo/package.json +++ b/packages/amplify-category-geo/package.json @@ -1,5 +1,5 @@ { - "name": "amplify-category-geo", + "name": "@aws-amplify/amplify-category-geo", "version": "2.11.1", "description": "Amplify CLI plugin to manage the Geo resources for the project", "repository": { @@ -22,6 +22,9 @@ "amplify", "aws" ], + "publishConfig": { + "access": "public" + }, "dependencies": { "@aws-cdk/aws-iam": "~1.172.0", "@aws-cdk/aws-lambda": "~1.172.0", diff --git a/packages/amplify-category-geo/src/service-utils/validateGeoJSONObj.ts b/packages/amplify-category-geo/src/service-utils/validateGeoJSONObj.ts index dbc621365b0..e15cdb3745c 100644 --- a/packages/amplify-category-geo/src/service-utils/validateGeoJSONObj.ts +++ b/packages/amplify-category-geo/src/service-utils/validateGeoJSONObj.ts @@ -1,5 +1,5 @@ import Ajv from 'ajv'; -import GeoJSONSchema from 'amplify-category-geo/schema/GeoJSONSchema.json'; +import GeoJSONSchema from '@aws-amplify/amplify-category-geo/schema/GeoJSONSchema.json'; import { v4 as uuid } from 'uuid'; import { printer } from 'amplify-prompts'; import { FeatureCollection, IdentifierOption } from './importParams'; diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index a8642d534b2..d0a6266c05d 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -44,8 +44,8 @@ "@aws-cdk/cloudformation-diff": "~1.172.0", "amplify-app": "4.3.9", "amplify-category-analytics": "4.4.1", + "@aws-amplify/amplify-category-geo": "2.11.1", "@aws-amplify/amplify-category-function": "4.3.1", - "amplify-category-geo": "2.11.1", "amplify-category-hosting": "3.4.9", "@aws-amplify/amplify-category-interactions": "4.3.1", "amplify-category-notifications": "2.23.1", From 87f35b672099204e577ae626dc2c43ed19ad01be Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Wed, 8 Feb 2023 12:41:35 -0500 Subject: [PATCH 06/10] 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 --- packages/amplify-category-analytics/API.md | 2 +- packages/amplify-category-analytics/package.json | 5 ++++- packages/amplify-cli/package.json | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/amplify-category-analytics/API.md b/packages/amplify-category-analytics/API.md index 2f83ea1925d..808eac28e05 100644 --- a/packages/amplify-category-analytics/API.md +++ b/packages/amplify-category-analytics/API.md @@ -1,4 +1,4 @@ -## API Report File for "amplify-category-analytics" +## API Report File for "@aws-amplify/amplify-category-analytics" > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json index 3d44227175e..fed32953459 100644 --- a/packages/amplify-category-analytics/package.json +++ b/packages/amplify-category-analytics/package.json @@ -1,5 +1,5 @@ { - "name": "amplify-category-analytics", + "name": "@aws-amplify/amplify-category-analytics", "version": "4.4.1", "description": "amplify-cli analytics plugin", "repository": { @@ -14,6 +14,9 @@ "amplify", "aws" ], + "publishConfig": { + "access": "public" + }, "scripts": { "build": "tsc", "clean": "rimraf lib tsconfig.tsbuildinfo node_modules", diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index d0a6266c05d..447d6ef4381 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -43,7 +43,7 @@ "@aws-amplify/amplify-util-uibuilder": "1.6.7", "@aws-cdk/cloudformation-diff": "~1.172.0", "amplify-app": "4.3.9", - "amplify-category-analytics": "4.4.1", + "@aws-amplify/amplify-category-analytics": "4.4.1", "@aws-amplify/amplify-category-geo": "2.11.1", "@aws-amplify/amplify-category-function": "4.3.1", "amplify-category-hosting": "3.4.9", @@ -165,7 +165,7 @@ "analytics": { "name": "analytics", "type": "category", - "packageName": "amplify-category-analytics" + "packageName": "@aws-amplify/amplify-category-analytics" }, "api": { "name": "api", From c1d821c6d30ed702186cfa1373a528dc3958ee61 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Wed, 8 Feb 2023 12:42:25 -0500 Subject: [PATCH 07/10] 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 --- packages/amplify-category-hosting/package.json | 5 ++++- packages/amplify-cli/package.json | 4 ++-- .../src/__tests__/commands/status.test.ts | 2 +- .../amplify-helpers/mock-plugin-platform.ts | 2 +- .../plugin-helpers/platform-health-check.test.ts | 12 ++++++------ 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/amplify-category-hosting/package.json b/packages/amplify-category-hosting/package.json index 12371ad64e6..e7f2fe3e65d 100644 --- a/packages/amplify-category-hosting/package.json +++ b/packages/amplify-category-hosting/package.json @@ -1,5 +1,5 @@ { - "name": "amplify-category-hosting", + "name": "@aws-amplify/amplify-category-hosting", "version": "3.4.9", "description": "amplify-cli hosting plugin", "repository": { @@ -14,6 +14,9 @@ "amplify", "aws" ], + "publishConfig": { + "access": "public" + }, "scripts": { "test": "jest --logHeapUsage --coverage" }, diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index 447d6ef4381..32ec2765cd2 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -43,10 +43,10 @@ "@aws-amplify/amplify-util-uibuilder": "1.6.7", "@aws-cdk/cloudformation-diff": "~1.172.0", "amplify-app": "4.3.9", + "@aws-amplify/amplify-category-hosting": "3.4.9", "@aws-amplify/amplify-category-analytics": "4.4.1", "@aws-amplify/amplify-category-geo": "2.11.1", "@aws-amplify/amplify-category-function": "4.3.1", - "amplify-category-hosting": "3.4.9", "@aws-amplify/amplify-category-interactions": "4.3.1", "amplify-category-notifications": "2.23.1", "amplify-category-predictions": "4.3.1", @@ -198,7 +198,7 @@ { "name": "hosting", "type": "category", - "packageName": "amplify-category-hosting" + "packageName": "@aws-amplify/amplify-category-hosting" }, { "name": "hosting", diff --git a/packages/amplify-cli/src/__tests__/commands/status.test.ts b/packages/amplify-cli/src/__tests__/commands/status.test.ts index c3a19c1c66d..ebe769edcff 100644 --- a/packages/amplify-cli/src/__tests__/commands/status.test.ts +++ b/packages/amplify-cli/src/__tests__/commands/status.test.ts @@ -1,7 +1,7 @@ import { stateManager, pathManager } from 'amplify-cli-core'; import { readProjectSchema } from 'graphql-transformer-core'; -jest.mock('amplify-category-hosting'); +jest.mock('@aws-amplify/amplify-category-hosting'); jest.mock('amplify-cli-core'); jest.mock('graphql-transformer-core', () => ({ readProjectSchema: jest.fn(async (__: string) => ''), diff --git a/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/mock-plugin-platform.ts b/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/mock-plugin-platform.ts index 0072cda46cc..1d83ed318e4 100644 --- a/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/mock-plugin-platform.ts +++ b/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/mock-plugin-platform.ts @@ -35,7 +35,7 @@ export function constructMockPluginPlatform(): PluginPlatform { }, }; const categoryHostingPluginInfo: PluginInfo = { - packageName: 'amplify-category-hosting', + packageName: '@aws-amplify/amplify-category-hosting', packageVersion: '2.1.11', packageLocation: '/root/amplify-cli/packages/amplify-category-hosting', manifest: { diff --git a/packages/amplify-cli/src/__tests__/plugin-helpers/platform-health-check.test.ts b/packages/amplify-cli/src/__tests__/plugin-helpers/platform-health-check.test.ts index a7b88024f8e..97295d6fcd9 100644 --- a/packages/amplify-cli/src/__tests__/plugin-helpers/platform-health-check.test.ts +++ b/packages/amplify-cli/src/__tests__/plugin-helpers/platform-health-check.test.ts @@ -27,7 +27,7 @@ const corePackageJson = { { name: 'hosting', type: 'category', - packageName: 'amplify-category-hosting', + packageName: '@aws-amplify/amplify-category-hosting', }, { name: 'hosting', @@ -44,7 +44,7 @@ const corePackageJson = { }, dependencies: { 'amplify-category-api': '2.31.20', - 'amplify-category-hosting': '2.7.18', + '@aws-amplify/amplify-category-hosting': '2.7.18', 'amplify-codegen': '^2.23.1', 'amplify-console-hosting': '1.9.9', 'amplify-container-hosting': '1.3.20', @@ -87,7 +87,7 @@ describe('platform-health-check', () => { hosting: [ { name: 'hosting', - packageName: 'amplify-category-hosting', + packageName: '@aws-amplify/amplify-category-hosting', packageVersion: '2.7.18', type: 'category', }, @@ -116,7 +116,7 @@ describe('platform-health-check', () => { pluginPlatform.plugins = { core: [new PluginInfo('@aws-amplify/cli', '5.4.0', '', new PluginManifest('core', 'core'))], hosting: [ - new PluginInfo('amplify-category-hosting', '2.7.18', '', new PluginManifest('hosting', 'category')), + new PluginInfo('@aws-amplify/amplify-category-hosting', '2.7.18', '', new PluginManifest('hosting', 'category')), new PluginInfo('amplify-console-hosting', '1.9.9', '', new PluginManifest('hosting', 'category')), ], codegen: [new PluginInfo('amplify-codegen', '2.27.0', '', new PluginManifest('codegen', 'util'))], @@ -130,7 +130,7 @@ describe('platform-health-check', () => { pluginPlatform.plugins = { core: [new PluginInfo('@aws-amplify/cli', '5.4.0', '', new PluginManifest('core', 'core'))], hosting: [ - new PluginInfo('amplify-category-hosting', '2.7.18', '', new PluginManifest('hosting', 'category')), + new PluginInfo('@aws-amplify/amplify-category-hosting', '2.7.18', '', new PluginManifest('hosting', 'category')), new PluginInfo('amplify-console-hosting', '1.9.9', '', new PluginManifest('hosting', 'category')), ], codegen: [ @@ -151,7 +151,7 @@ describe('platform-health-check', () => { pluginPlatform.plugins = { core: [new PluginInfo('@aws-amplify/cli', '5.4.0', '', new PluginManifest('core', 'core'))], hosting: [ - new PluginInfo('amplify-category-hosting', '2.7.18', '', new PluginManifest('hosting', 'category')), + new PluginInfo('@aws-amplify/amplify-category-hosting', '2.7.18', '', new PluginManifest('hosting', 'category')), // missing 'amplify-console-hosting' ], codegen: [new PluginInfo('amplify-codegen', '2.27.0', '', new PluginManifest('codegen', 'util'))], From 06449c89e8c04f9f1aeab60a326f3e040866f8c3 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Thu, 9 Feb 2023 10:40:43 -0500 Subject: [PATCH 08/10] chore: regenerate yarn.lockfile --- yarn.lock | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/yarn.lock b/yarn.lock index a82573ec314..3a830e0599c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9975,27 +9975,6 @@ amdefine@>=0.0.4: resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= -amplify-app@4.3.9: - version "4.3.9" - resolved "https://registry.npmjs.org/amplify-app/-/amplify-app-4.3.9.tgz#cb3d089f82c06eba78145056bce4b4d53161bf5b" - integrity sha512-eRSjmuagzU5qdrdwPycyvR3ENxKZ+D92KjQxhZ1BZpMzeUgBm+MXbAzFLXyLjRwQ+ODUx0Clb+6A3RaXaSsisg== - dependencies: - amplify-frontend-android "3.4.1" - amplify-frontend-flutter "1.3.5" - amplify-frontend-ios "3.5.9" - amplify-frontend-javascript "3.7.5" - chalk "^4.1.1" - execa "^5.1.1" - fs-extra "^8.1.0" - ini "^1.3.5" - inquirer "^7.3.3" - node-emoji "^1.10.0" - ora "^4.0.3" - rimraf "^3.0.0" - semver "^7.3.5" - xcode "^2.1.0" - yargs "^15.1.0" - amplify-codegen@^3.3.6: version "3.3.6" resolved "https://registry.npmjs.org/amplify-codegen/-/amplify-codegen-3.3.6.tgz#3edcbf229b4023b1dd9b5fd4813587b2819f884a" From 9d2305942cce1fdabd5be2db642ee475ea511a9f Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Fri, 17 Feb 2023 13:40:48 -0500 Subject: [PATCH 09/10] chore: running prettier --- packages/amplify-cli/src/pre-deployment-pull.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/amplify-cli/src/pre-deployment-pull.ts b/packages/amplify-cli/src/pre-deployment-pull.ts index d73b523bea5..46efdf4cc78 100644 --- a/packages/amplify-cli/src/pre-deployment-pull.ts +++ b/packages/amplify-cli/src/pre-deployment-pull.ts @@ -1,7 +1,5 @@ -import { run } from '@aws-amplify/amplify-app' -import { - $TSContext, AmplifyError, AMPLIFY_SUPPORT_DOCS, pathManager, -} from 'amplify-cli-core'; +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'; import * as path from 'path'; From b74d8c277601f33b00b8759d17dc9d79ef08d693 Mon Sep 17 00:00:00 2001 From: Eddy Varela Date: Fri, 17 Feb 2023 23:27:24 -0500 Subject: [PATCH 10/10] chore: sorting package.json --- packages/amplify-cli/package.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index 8fea3428ee4..d306018498f 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -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", @@ -60,14 +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", - "@aws-amplify/amplify-app": "4.3.10", - "@aws-amplify/amplify-category-hosting": "3.4.10", - "@aws-amplify/amplify-category-analytics": "4.4.2", - "@aws-amplify/amplify-category-geo": "2.11.2", - "@aws-amplify/amplify-category-function": "4.3.2", - "@aws-amplify/amplify-category-interactions": "4.3.2", - "@aws-amplify/amplify-category-notifications": "2.23.2", - "@aws-amplify/amplify-category-predictions": "4.3.2", "amplify-category-xr": "3.4.2", "amplify-cli-core": "3.6.2", "amplify-cli-shared-interfaces": "1.1.1",