Revert "chore: prepend headless scopes (#12415)" (#12439)

aws-eddy · web-flow · commit 88b250877742 · 2023-04-11T16:42:08.000-04:00
This reverts commit 60d2bb2.
diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -31,10 +31,10 @@
     "@aws-amplify/amplify-cli-core": "4.0.2",
     "@aws-amplify/amplify-environment-parameters": "1.4.2",
     "@aws-amplify/amplify-function-plugin-interface": "1.10.0",
-    "@aws-amplify/amplify-headless-interface": "1.17.1",
-    "@aws-amplify/amplify-prompts": "2.6.6",
+    "@aws-amplify/amplify-prompts": "2.6.7",
     "@aws-amplify/amplify-util-import": "2.4.0",
-    "@aws-amplify/cli-extensibility-helper": "3.0.1",
+    "@aws-amplify/cli-extensibility-helper": "3.0.2",
+    "amplify-headless-interface": "1.17.1",
     "amplify-util-headless-input": "1.9.10",
     "aws-cdk-lib": "~2.68.0",
     "aws-sdk": "^2.1350.0",
diff --git a/packages/amplify-category-auth/src/__tests__/commands/import.headless.test.ts b/packages/amplify-category-auth/src/__tests__/commands/import.headless.test.ts
@@ -1,5 +1,5 @@
 import { executeAmplifyHeadlessCommand } from '../../../src';
-import { ImportAuthRequest } from '@aws-amplify/amplify-headless-interface';
+import { ImportAuthRequest } from 'amplify-headless-interface';
 import { messages } from '../../provider-utils/awscloudformation/assets/string-maps';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { stateManager } from '@aws-amplify/amplify-cli-core';
diff --git a/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-request-adaptor.test.ts b/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-request-adaptor.test.ts
@@ -4,7 +4,7 @@ import {
   CognitoUserPoolSigninMethod,
   CognitoUserProperty,
   UpdateAuthRequest,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 import {
   getAddAuthRequestAdaptor,
   getUpdateAuthRequestAdaptor,
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/auth-request-adaptors.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/auth-request-adaptors.ts
@@ -14,7 +14,7 @@ import {
   CognitoUserPoolModification,
   CognitoIdentityPoolModification,
   CognitoAutoVerifiedAttributesConfiguration,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 import { isEmpty, merge } from 'lodash';
 import { pascalCase } from 'change-case';
 import { AmplifyFrontend, FeatureFlags } from '@aws-amplify/amplify-cli-core';
diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
@@ -26,10 +26,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.0.1",
-    "@aws-amplify/amplify-headless-interface": "1.17.1",
-    "@aws-amplify/amplify-prompts": "2.6.6",
+    "@aws-amplify/amplify-cli-core": "4.0.2",
+    "@aws-amplify/amplify-prompts": "2.6.7",
     "ajv": "^6.12.6",
+    "amplify-headless-interface": "1.17.1",
     "amplify-util-headless-input": "1.9.10",
     "aws-cdk-lib": "~2.68.0",
     "aws-sdk": "^2.1350.0",
diff --git a/packages/amplify-category-geo/src/provider-controllers/map.ts b/packages/amplify-category-geo/src/provider-controllers/map.ts
@@ -1,6 +1,6 @@
 import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
-import { GeoServiceConfiguration, GeoServiceModification } from '@aws-amplify/amplify-headless-interface';
+import { GeoServiceConfiguration, GeoServiceModification } from 'amplify-headless-interface';
 import { createMapResource, modifyMapResource, getCurrentMapParameters } from '../service-utils/mapUtils';
 import { removeWalkthrough } from '../service-walkthroughs/removeWalkthrough';
 import { category } from '../constants';
diff --git a/packages/amplify-category-storage/package.json b/packages/amplify-category-storage/package.json
@@ -27,12 +27,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.0.1",
-    "@aws-amplify/amplify-environment-parameters": "1.4.1",
-    "@aws-amplify/amplify-headless-interface": "1.17.1",
-    "@aws-amplify/amplify-prompts": "2.6.6",
+    "@aws-amplify/amplify-cli-core": "4.0.2",
+    "@aws-amplify/amplify-environment-parameters": "1.4.2",
+    "@aws-amplify/amplify-prompts": "2.6.7",
     "@aws-amplify/amplify-util-import": "2.4.0",
-    "@aws-amplify/cli-extensibility-helper": "3.0.1",
+    "@aws-amplify/cli-extensibility-helper": "3.0.2",
+    "amplify-headless-interface": "1.17.1",
     "amplify-util-headless-input": "1.9.10",
     "aws-cdk-lib": "~2.68.0",
     "aws-sdk": "^2.1350.0",
diff --git a/packages/amplify-category-storage/src/provider-utils/awscloudformation/s3-headless-adapter.ts b/packages/amplify-category-storage/src/provider-utils/awscloudformation/s3-headless-adapter.ts
@@ -6,7 +6,7 @@ import {
   PermissionGroups,
   S3Permissions,
   UpdateStorageRequest,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 import { s3GetUserInput, S3UserInputs } from '../..';
 import { getAllDefaults as getDefaultS3UserInput } from './default-values/s3-defaults';
 import {
diff --git a/packages/amplify-category-storage/src/provider-utils/awscloudformation/storage-configuration-helpers.ts b/packages/amplify-category-storage/src/provider-utils/awscloudformation/storage-configuration-helpers.ts
@@ -7,12 +7,7 @@ import {
   ResourceDoesNotExistError,
   stateManager,
 } from '@aws-amplify/amplify-cli-core';
-import {
-  AddStorageRequest,
-  ImportStorageRequest,
-  RemoveStorageRequest,
-  UpdateStorageRequest,
-} from '@aws-amplify/amplify-headless-interface';
+import { AddStorageRequest, ImportStorageRequest, RemoveStorageRequest, UpdateStorageRequest } from 'amplify-headless-interface';
 import { printer } from '@aws-amplify/amplify-prompts';
 import { v4 as uuid } from 'uuid';
 import { S3UserInputTriggerFunctionParams } from '../..';
diff --git a/packages/amplify-cli/src/__tests__/flow-report.test.ts b/packages/amplify-cli/src/__tests__/flow-report.test.ts
@@ -11,7 +11,7 @@ import {
   AppSyncServiceConfiguration,
   AppSyncAPIKeyAuthType,
   AddApiRequest,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 import { v4 as uuid } from 'uuid';
 import { Redactor } from '@aws-amplify/amplify-cli-logger';
 import crypto from 'crypto';
diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json
@@ -22,8 +22,8 @@
     "clean": "rimraf ./lib tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.0.1",
-    "@aws-amplify/amplify-headless-interface": "1.17.1",
+    "@aws-amplify/amplify-cli-core": "4.0.2",
+    "amplify-headless-interface": "1.17.1",
     "aws-sdk": "^2.1350.0",
     "chalk": "^4.1.1",
     "dotenv": "^8.2.0",
diff --git a/packages/amplify-e2e-core/src/utils/headless.ts b/packages/amplify-e2e-core/src/utils/headless.ts
@@ -10,7 +10,7 @@ import {
   UpdateAuthRequest,
   UpdateStorageRequest,
   UpdateGeoRequest,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 import execa, { ExecaChildProcess } from 'execa';
 import { getCLIPath } from '..';
 
diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
@@ -24,16 +24,16 @@
     "clean-e2e-resources": "ts-node ./src/cleanup-e2e-resources.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-auth": "3.0.1",
-    "@aws-amplify/amplify-cli-core": "4.0.1",
-    "@aws-amplify/amplify-e2e-core": "4.8.1",
-    "@aws-amplify/amplify-headless-interface": "1.17.1",
-    "@aws-amplify/amplify-opensearch-simulator": "1.2.3",
-    "@aws-amplify/graphql-transformer-core": "^1.2.0",
+    "@aws-amplify/amplify-category-auth": "3.0.2",
+    "@aws-amplify/amplify-cli-core": "4.0.2",
+    "@aws-amplify/amplify-e2e-core": "4.8.2",
+    "@aws-amplify/amplify-opensearch-simulator": "1.2.4",
+    "@aws-amplify/graphql-transformer-core": "^1.2.1-ownerfield-pk-fix.0",
     "@aws-sdk/client-appsync": "^3.303.0",
     "@aws-sdk/client-dynamodb": "^3.303.0",
     "@aws-sdk/client-ssm": "^3.303.0",
-    "amplify-dynamodb-simulator": "2.5.10",
+    "amplify-dynamodb-simulator": "2.5.11",
+    "amplify-headless-interface": "1.17.1",
     "amplify-storage-simulator": "1.7.4",
     "aws-amplify": "^4.2.8",
     "aws-appsync": "^4.1.1",
diff --git a/packages/amplify-e2e-tests/src/__tests__/api_3.test.ts b/packages/amplify-e2e-tests/src/__tests__/api_3.test.ts
@@ -17,7 +17,7 @@ import {
   updateApiSchema,
   updateHeadlessApi,
 } from '@aws-amplify/amplify-e2e-core';
-import { AddApiRequest, UpdateApiRequest } from '@aws-amplify/amplify-headless-interface';
+import { AddApiRequest, UpdateApiRequest } from 'amplify-headless-interface';
 import { existsSync } from 'fs';
 import { readFileSync } from 'fs-extra';
 import { TRANSFORM_BASE_VERSION, TRANSFORM_CURRENT_VERSION, writeTransformerConfiguration } from 'graphql-transformer-core';
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_12.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_12.test.ts
@@ -9,7 +9,7 @@ import {
   headlessAuthImport,
   initJSProjectWithProfile,
 } from '@aws-amplify/amplify-e2e-core';
-import { ImportAuthRequest } from '@aws-amplify/amplify-headless-interface';
+import { ImportAuthRequest } from 'amplify-headless-interface';
 import {
   expectAuthProjectDetailsMatch,
   expectLocalAndCloudMetaFilesMatching,
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_5a.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_5a.test.ts
@@ -14,7 +14,7 @@ import {
   AddAuthRequest,
   CognitoUserPoolSigninMethod,
   CognitoUserProperty,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 
 const PROJECT_NAME = 'authTest';
 const defaultsSettings = {
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_5b.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_5b.test.ts
@@ -15,7 +15,7 @@ import {
   AddAuthRequest,
   CognitoUserPoolSigninMethod,
   CognitoUserProperty,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 
 const PROJECT_NAME = 'authTest';
 const defaultsSettings = {
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_5c.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_5c.test.ts
@@ -15,7 +15,7 @@ import {
   AddAuthRequest,
   CognitoUserPoolSigninMethod,
   CognitoUserProperty,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 
 const PROJECT_NAME = 'authTest';
 const defaultsSettings = {
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_5d.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_5d.test.ts
@@ -14,7 +14,7 @@ import {
   // eslint-disable-next-line spellcheck/spell-checker
   CognitoUserPoolSigninMethod,
   CognitoUserProperty,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 
 const PROJECT_NAME = 'authTest';
 const defaultsSettings = {
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_5e.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_5e.test.ts
@@ -10,7 +10,7 @@ import {
   getProjectMeta,
   getUserPool,
 } from '@aws-amplify/amplify-e2e-core';
-import { UpdateAuthRequest } from '@aws-amplify/amplify-headless-interface';
+import { UpdateAuthRequest } from 'amplify-headless-interface';
 import _ from 'lodash';
 
 const PROJECT_NAME = 'authTest';
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_7a.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_7a.test.ts
@@ -7,7 +7,7 @@ import {
   createNewProjectDir,
   deleteProjectDir,
 } from '@aws-amplify/amplify-e2e-core';
-import { ImportAuthRequest } from '@aws-amplify/amplify-headless-interface';
+import { ImportAuthRequest } from 'amplify-headless-interface';
 import {
   expectAuthProjectDetailsMatch,
   expectLocalAndCloudMetaFilesMatching,
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_7b.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_7b.test.ts
@@ -7,7 +7,7 @@ import {
   createNewProjectDir,
   deleteProjectDir,
 } from '@aws-amplify/amplify-e2e-core';
-import { ImportAuthRequest } from '@aws-amplify/amplify-headless-interface';
+import { ImportAuthRequest } from 'amplify-headless-interface';
 import {
   expectAuthProjectDetailsMatch,
   expectLocalAndCloudMetaFilesMatching,
diff --git a/packages/amplify-e2e-tests/src/__tests__/geo-headless.test.ts b/packages/amplify-e2e-tests/src/__tests__/geo-headless.test.ts
@@ -12,7 +12,7 @@ import {
   initJSProjectWithProfile,
   updateHeadlessGeo,
 } from '@aws-amplify/amplify-e2e-core';
-import { AccessType, AddGeoRequest, MapStyle, UpdateGeoRequest } from '@aws-amplify/amplify-headless-interface';
+import { AccessType, AddGeoRequest, MapStyle, UpdateGeoRequest } from 'amplify-headless-interface';
 import { v4 as uuid } from 'uuid';
 
 describe('Geo headless tests', () => {
diff --git a/packages/amplify-e2e-tests/src/__tests__/storage-4.test.ts b/packages/amplify-e2e-tests/src/__tests__/storage-4.test.ts
@@ -12,7 +12,7 @@ import {
   removeHeadlessStorage,
   updateHeadlessStorage,
 } from '@aws-amplify/amplify-e2e-core';
-import { AddStorageRequest, CrudOperation, RemoveStorageRequest, UpdateStorageRequest } from '@aws-amplify/amplify-headless-interface';
+import { AddStorageRequest, CrudOperation, RemoveStorageRequest, UpdateStorageRequest } from 'amplify-headless-interface';
 import { v4 as uuid } from 'uuid';
 
 async function validateS3Bucket(projRoot: string) {
diff --git a/packages/amplify-headless-interface/API.md b/packages/amplify-headless-interface/API.md
@@ -1,4 +1,4 @@
-## API Report File for "@aws-amplify/amplify-headless-interface"
+## API Report File for "amplify-headless-interface"
 
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
diff --git a/packages/amplify-headless-interface/package.json b/packages/amplify-headless-interface/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@aws-amplify/amplify-headless-interface",
+  "name": "amplify-headless-interface",
   "version": "1.17.1",
   "description": "interfaces for amplify headless mode payloads",
   "main": "lib/index.js",
@@ -9,9 +9,6 @@
     "generateSchemas": "ts-node ./scripts/generateSchemas.ts",
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "keywords": [
     "amplify",
     "headless"
diff --git a/packages/amplify-migration-tests/src/__tests__/migration_tests/overrides/api-migration-d.test.ts b/packages/amplify-migration-tests/src/__tests__/migration_tests/overrides/api-migration-d.test.ts
@@ -16,7 +16,7 @@ import {
   getTransformConfig,
   updateHeadlessApi,
 } from '@aws-amplify/amplify-e2e-core';
-import { AddApiRequest, UpdateApiRequest } from '@aws-amplify/amplify-headless-interface';
+import { AddApiRequest, UpdateApiRequest } from 'amplify-headless-interface';
 import * as fs from 'fs-extra';
 import { join } from 'path';
 import { initJSProjectWithProfileV4_52_0 } from '../../../migration-helpers';
diff --git a/packages/amplify-migration-tests/src/__tests__/migration_tests/overrides/auth-migration-e.test.ts b/packages/amplify-migration-tests/src/__tests__/migration_tests/overrides/auth-migration-e.test.ts
@@ -12,7 +12,7 @@ import {
   getUserPool,
   updateHeadlessAuth,
 } from '@aws-amplify/amplify-e2e-core';
-import { UpdateAuthRequest } from '@aws-amplify/amplify-headless-interface';
+import { UpdateAuthRequest } from 'amplify-headless-interface';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as _ from 'lodash';
diff --git a/packages/amplify-util-headless-input/API.md b/packages/amplify-util-headless-input/API.md
@@ -3,18 +3,17 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-
-import { AddApiRequest } from '@aws-amplify/amplify-headless-interface';
-import { AddAuthRequest } from '@aws-amplify/amplify-headless-interface';
-import { AddGeoRequest } from '@aws-amplify/amplify-headless-interface';
-import { AddStorageRequest } from '@aws-amplify/amplify-headless-interface';
-import { ImportAuthRequest } from '@aws-amplify/amplify-headless-interface';
-import { ImportStorageRequest } from '@aws-amplify/amplify-headless-interface';
-import { RemoveStorageRequest } from '@aws-amplify/amplify-headless-interface';
-import { UpdateApiRequest } from '@aws-amplify/amplify-headless-interface';
-import { UpdateAuthRequest } from '@aws-amplify/amplify-headless-interface';
-import { UpdateGeoRequest } from '@aws-amplify/amplify-headless-interface';
-import { UpdateStorageRequest } from '@aws-amplify/amplify-headless-interface';
+import { AddApiRequest } from 'amplify-headless-interface';
+import { AddAuthRequest } from 'amplify-headless-interface';
+import { AddGeoRequest } from 'amplify-headless-interface';
+import { AddStorageRequest } from 'amplify-headless-interface';
+import { ImportAuthRequest } from 'amplify-headless-interface';
+import { ImportStorageRequest } from 'amplify-headless-interface';
+import { RemoveStorageRequest } from 'amplify-headless-interface';
+import { UpdateApiRequest } from 'amplify-headless-interface';
+import { UpdateAuthRequest } from 'amplify-headless-interface';
+import { UpdateGeoRequest } from 'amplify-headless-interface';
+import { UpdateStorageRequest } from 'amplify-headless-interface';
 
 // @public (undocumented)
 export const validateAddApiRequest: (raw: string) => Promise<AddApiRequest>;
@@ -50,5 +49,4 @@ export const validateUpdateGeoRequest: (raw: string) => Promise<UpdateGeoRequest
 export const validateUpdateStorageRequest: (raw: string) => Promise<UpdateStorageRequest>;
 
 // (No @packageDocumentation comment for this package)
-
 ```
diff --git a/packages/amplify-util-headless-input/package.json b/packages/amplify-util-headless-input/package.json
@@ -9,18 +9,15 @@
     "test": "jest --logHeapUsage",
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "keywords": [
     "amplify",
     "headless"
   ],
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-amplify/amplify-headless-interface": "1.17.1",
-    "ajv": "^6.12.6"
+    "ajv": "^6.12.6",
+    "amplify-headless-interface": "1.17.1"
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.5",
diff --git a/packages/amplify-util-headless-input/src/index.ts b/packages/amplify-util-headless-input/src/index.ts
@@ -10,7 +10,7 @@ import {
   UpdateStorageRequest,
   AddGeoRequest,
   UpdateGeoRequest,
-} from '@aws-amplify/amplify-headless-interface';
+} from 'amplify-headless-interface';
 import { HeadlessInputValidator } from './HeadlessInputValidator';
 import {
   addApiRequestSchemaSupplier,
diff --git a/packages/amplify-util-headless-input/src/schemaSuppliers.ts b/packages/amplify-util-headless-input/src/schemaSuppliers.ts
@@ -47,7 +47,7 @@ export const updateGeoRequestSchemaSupplier: VersionedSchemaSupplier = (version)
 const getSchema = async (type: string, category: string, version: number) => {
   try {
     return {
-      rootSchema: await import(`@aws-amplify/amplify-headless-interface/schemas/${category}/${version}/${type}.schema.json`),
+      rootSchema: await import(`amplify-headless-interface/schemas/${category}/${version}/${type}.schema.json`),
     };
   } catch (ex) {
     return undefined; // resolve the promise with void if the schema does not exist
