chore: scoping changes

aws-eddy · aws-eddy · commit 7f5e9e44f33e · 2023-03-30T13:28:30.000-04:00
diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
     "ts-jest": "^27.0.0",
     "ts-node": "^8.10.1",
     "typescript": "4.7.4",
-    "amplify-cli-core":  "^4.0.0",
+    "@aws-amplify/amplify-cli-core":  "^4.0.0",
     "graphql-transformer-core": "^8.0.0",
     "amplify-headless-interface": "^1.13.1"
   },
diff --git a/packages/amplify-codegen-e2e-core/package.json b/packages/amplify-codegen-e2e-core/package.json
@@ -35,7 +35,7 @@
     "uuid": "7.0.1"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^4.0.0",
+    "@aws-amplify/amplify-cli-core": "^4.0.0",
     "amplify-headless-interface": "^1.13.1",
     "graphql-transformer-core": "^8.0.0"
   }
diff --git a/packages/amplify-codegen-e2e-core/src/categories/lambda-layer.ts b/packages/amplify-codegen-e2e-core/src/categories/lambda-layer.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import _ from 'lodash';
-import { JSONUtilities } from 'amplify-cli-core';
+import { JSONUtilities } from '@aws-amplify/amplify-cli-core';
 import { nspawn as spawn, ExecutionContext, getCLIPath, KEY_DOWN_ARROW } from '..';
 import { getLayerVersion, listVersions } from '../utils/sdk-calls';
 import { multiSelect } from '../utils/selectors';
diff --git a/packages/amplify-codegen-e2e-core/src/utils/add-circleci-tags.ts b/packages/amplify-codegen-e2e-core/src/utils/add-circleci-tags.ts
@@ -1,4 +1,4 @@
-import { stateManager } from 'amplify-cli-core';
+import { stateManager } from '@aws-amplify/amplify-cli-core';
 
 declare global {
   namespace NodeJS {
diff --git a/packages/amplify-codegen-e2e-core/src/utils/feature-flags.ts b/packages/amplify-codegen-e2e-core/src/utils/feature-flags.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { pathManager, FeatureFlagsEntry, JSONUtilities } from 'amplify-cli-core';
+import { pathManager, FeatureFlagsEntry, JSONUtilities } from '@aws-amplify/amplify-cli-core';
 
 type FeatureFlagData = { features: FeatureFlagsEntry };
 const getFeatureFlagFilePath = (projectRoot: string) => {
diff --git a/packages/amplify-codegen-e2e-core/src/utils/projectMeta.ts b/packages/amplify-codegen-e2e-core/src/utils/projectMeta.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs-extra';
 import _ from 'lodash';
-import { JSONUtilities } from 'amplify-cli-core';
+import { JSONUtilities } from '@aws-amplify/amplify-cli-core';
 
 function getAWSConfigAndroidPath(projRoot: string): string {
   return path.join(projRoot, 'app', 'src', 'main', 'res', 'raw', 'awsconfiguration.json');
diff --git a/packages/amplify-codegen-e2e-tests/package.json b/packages/amplify-codegen-e2e-tests/package.json
@@ -41,7 +41,7 @@
     "ts-node": "^8.10.1"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^4.0.0",
+    "@aws-amplify/amplify-cli-core": "^4.0.0",
     "graphql-transformer-core": "^8.0.0"
   },
   "jest": {
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/feature-flags.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/feature-flags.test.ts
@@ -1,29 +1,29 @@
 import * as fs from 'fs-extra';
 import { initJSProjectWithProfile, createNewProjectDir, deleteProject, deleteProjectDir } from '@aws-amplify/amplify-codegen-e2e-core';
-import { pathManager } from 'amplify-cli-core';
+import { pathManager } from '@aws-amplify/amplify-cli-core';
 
 const codegenFeatureFlags = {
-    "handlelistnullabilitytransparently": true,
-    "addtimestampfields": true,
-    "useappsyncmodelgenplugin": true,
-    "usedocsgeneratorplugin": true,
-    "usetypesgeneratorplugin": true,
-    "cleangeneratedmodelsdirectory": true,
-    "retaincasestyle": true,
-    "generateindexrules": true,
-    "emitauthprovider": true,
-    "enabledartnullsafety": true,
-    "generatemodelsforlazyloadandcustomselectionset": false,
+  handlelistnullabilitytransparently: true,
+  addtimestampfields: true,
+  useappsyncmodelgenplugin: true,
+  usedocsgeneratorplugin: true,
+  usetypesgeneratorplugin: true,
+  cleangeneratedmodelsdirectory: true,
+  retaincasestyle: true,
+  generateindexrules: true,
+  emitauthprovider: true,
+  enabledartnullsafety: true,
+  generatemodelsforlazyloadandcustomselectionset: false,
 };
 
 describe('codegen related feature flags - new project', () => {
   let projRoot: string;
 
   beforeEach(async () => {
-      // Given: a new project is created
-      // When: amplify is initialized in the new project
-      projRoot = await createNewProjectDir('feature-flags');
-      await initJSProjectWithProfile(projRoot, {});
+    // Given: a new project is created
+    // When: amplify is initialized in the new project
+    projRoot = await createNewProjectDir('feature-flags');
+    await initJSProjectWithProfile(projRoot, {});
   });
 
   afterEach(async () => {
@@ -38,4 +38,3 @@ describe('codegen related feature flags - new project', () => {
     expect(fs.readJSONSync(cliJSONFilePath).features.codegen).toEqual(codegenFeatureFlags);
   });
 });
-  
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/pull-codegen.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/pull-codegen.test.ts
@@ -1,5 +1,5 @@
-import { 
-  createNewProjectDir, 
+import {
+  createNewProjectDir,
   deleteProjectDir,
   deleteProject,
   initJSProjectWithProfile,
@@ -16,24 +16,17 @@ import {
   AmplifyFrontendConfig,
   getAdminApp,
   amplifyPullSandbox,
-  getProjectSchema
-} from "@aws-amplify/amplify-codegen-e2e-core";
-import { existsSync } from "fs";
+  getProjectSchema,
+} from '@aws-amplify/amplify-codegen-e2e-core';
+import { existsSync } from 'fs';
 import path from 'path';
 import { isNotEmptyDir, generateSourceCode } from '../utils';
-import { JSONUtilities } from 'amplify-cli-core';
+import { JSONUtilities } from '@aws-amplify/amplify-cli-core';
 import { SandboxApp } from '../types/SandboxApp';
 
-
-
 const schema = 'simple_model.graphql';
 const envName = 'pulltest';
-const frontendConfigs: AmplifyFrontendConfig[] = [
-  DEFAULT_JS_CONFIG,
-  DEFAULT_ANDROID_CONFIG,
-  DEFAULT_IOS_CONFIG,
-  DEFAULT_FLUTTER_CONFIG
-];
+const frontendConfigs: AmplifyFrontendConfig[] = [DEFAULT_JS_CONFIG, DEFAULT_ANDROID_CONFIG, DEFAULT_IOS_CONFIG, DEFAULT_FLUTTER_CONFIG];
 
 describe('Amplify pull in amplify app with codegen tests', () => {
   let projectRoot: string;
@@ -67,9 +60,9 @@ describe('Amplify pull in amplify app with codegen tests', () => {
   });
 
   describe('amplify pull in a new folder', () => {
-    let emptyProjectRoot: string
+    let emptyProjectRoot: string;
     beforeEach(async () => {
-      emptyProjectRoot= await createNewProjectDir('pullCodegenEmpty');
+      emptyProjectRoot = await createNewProjectDir('pullCodegenEmpty');
     });
     afterEach(async () => {
       deleteProjectDir(emptyProjectRoot);
@@ -80,13 +73,12 @@ describe('Amplify pull in amplify app with codegen tests', () => {
         //generate pre existing user file
         const userSourceCodePath = generateSourceCode(emptyProjectRoot, config.srcDir);
         //amplify pull in a new project
-        await amplifyPull(emptyProjectRoot, {emptyDir: true, appId, frontendConfig: config});
+        await amplifyPull(emptyProjectRoot, { emptyDir: true, appId, frontendConfig: config });
         expect(existsSync(userSourceCodePath)).toBe(true);
         expect(isNotEmptyDir(path.join(emptyProjectRoot, config.modelgenDir))).toBe(true);
-    });
+      });
     });
   });
-
 });
 
 describe('Amplify pull in sandbox app with codegen tests', () => {
@@ -114,7 +106,6 @@ describe('Amplify pull in sandbox app with codegen tests', () => {
     deleteProjectDir(projectRoot);
   });
 
-  
   frontendConfigs.forEach(config => {
     it(`should pull sandbox, download schema and generate models without deleting user files in ${config.frontendType} project`, async () => {
       //generate pre existing user file
@@ -130,7 +121,6 @@ describe('Amplify pull in sandbox app with codegen tests', () => {
       //models should be generated and no user files get deleted
       expect(existsSync(userSourceCodePath)).toBe(true);
       expect(isNotEmptyDir(path.join(projectRoot, config.modelgenDir))).toBe(true);
-
     });
   });
-});
+});
diff --git a/packages/amplify-codegen-e2e-tests/src/amplify-app-helpers/amplify-app-validation.ts b/packages/amplify-codegen-e2e-tests/src/amplify-app-helpers/amplify-app-validation.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import { pathManager } from 'amplify-cli-core';
+import { pathManager } from '@aws-amplify/amplify-cli-core';
 
 function validateProject(projRoot: string, platform: string) {
   expect(fs.existsSync(path.join(projRoot, 'amplify'))).toBe(true);
diff --git a/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/test-setup.ts b/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/test-setup.ts
@@ -1,72 +1,69 @@
 import {
-    deleteProjectDir,
-    deleteProject,
-    AmplifyFrontendConfig,
-    getAdminApp,
-    constructGraphQLConfig
-} from "@aws-amplify/amplify-codegen-e2e-core";
-import { existsSync, readFileSync } from "fs";
+  deleteProjectDir,
+  deleteProject,
+  AmplifyFrontendConfig,
+  getAdminApp,
+  constructGraphQLConfig,
+} from '@aws-amplify/amplify-codegen-e2e-core';
+import { existsSync, readFileSync } from 'fs';
 import path from 'path';
 import { generateSourceCode } from '../utils';
-import { JSONUtilities } from 'amplify-cli-core';
+import { JSONUtilities } from '@aws-amplify/amplify-cli-core';
 import { SandboxApp } from '../types/SandboxApp';
 import { load } from 'js-yaml';
 
 export const REGION = 'us-east-1';
 
 export function getGraphQLConfigFilePath(projectRoot: string): string {
-    return path.join(projectRoot, '.graphqlconfig.yml');
+  return path.join(projectRoot, '.graphqlconfig.yml');
 }
 
 export async function deleteAmplifyProject(projectRoot: string) {
-    const metaFilePath = path.join(projectRoot, 'amplify', '#current-cloud-backend', 'amplify-meta.json');
-    if (existsSync(metaFilePath)) {
+  const metaFilePath = path.join(projectRoot, 'amplify', '#current-cloud-backend', 'amplify-meta.json');
+  if (existsSync(metaFilePath)) {
     await deleteProject(projectRoot);
-    }
-    deleteProjectDir(projectRoot);
+  }
+  deleteProjectDir(projectRoot);
 }
 
 export function testSetupBeforeAddCodegen(projectRoot: string, config: AmplifyFrontendConfig): string {
-    // generate pre-existing user file
-    const userSourceCodePath = generateSourceCode(projectRoot, config.srcDir);
+  // generate pre-existing user file
+  const userSourceCodePath = generateSourceCode(projectRoot, config.srcDir);
 
-    // verify that the pre-existing file exists and codegen output directory is empty
-    expect(existsSync(userSourceCodePath)).toBe(true);
-    expect(existsSync(path.join(projectRoot, config.graphqlCodegenDir))).toBe(false);
+  // verify that the pre-existing file exists and codegen output directory is empty
+  expect(existsSync(userSourceCodePath)).toBe(true);
+  expect(existsSync(path.join(projectRoot, config.graphqlCodegenDir))).toBe(false);
 
-    return userSourceCodePath;
+  return userSourceCodePath;
 }
 
 export async function testValidGraphQLConfig(
-    projectRoot: string,
-    config: AmplifyFrontendConfig,
-    maxDepth?: number,
-    isConfigured: boolean = false,
-    region: string = process.env.CLI_REGION || REGION
+  projectRoot: string,
+  config: AmplifyFrontendConfig,
+  maxDepth?: number,
+  isConfigured: boolean = false,
+  region: string = process.env.CLI_REGION || REGION,
 ) {
-    // graphql codegen configuration should exist
-    expect(existsSync(getGraphQLConfigFilePath(projectRoot))).toBe(true);
+  // graphql codegen configuration should exist
+  expect(existsSync(getGraphQLConfigFilePath(projectRoot))).toBe(true);
 
-    const generatedConfig = load(readFileSync(getGraphQLConfigFilePath(projectRoot)).toString());
-    Object.keys(generatedConfig['projects']).forEach(projectName => {
-        const projectConfig = generatedConfig['projects'][projectName];
-        const expectedProjectConfig = constructGraphQLConfig(projectName, config, maxDepth, region, isConfigured);
-        // check if the graphql codegen configuration is valid
-        expect(projectConfig).toEqual(expectedProjectConfig);
-    });
+  const generatedConfig = load(readFileSync(getGraphQLConfigFilePath(projectRoot)).toString());
+  Object.keys(generatedConfig['projects']).forEach(projectName => {
+    const projectConfig = generatedConfig['projects'][projectName];
+    const expectedProjectConfig = constructGraphQLConfig(projectName, config, maxDepth, region, isConfigured);
+    // check if the graphql codegen configuration is valid
+    expect(projectConfig).toEqual(expectedProjectConfig);
+  });
 }
 
 export async function testSetupAdminApp(schemaBody: any = {}): Promise<string> {
-    const sandBoxAppString = await getAdminApp(schemaBody);
-    expect(sandBoxAppString).toBeDefined();
+  const sandBoxAppString = await getAdminApp(schemaBody);
+  expect(sandBoxAppString).toBeDefined();
 
-    const sandboxApp = JSONUtilities.parse<SandboxApp>(sandBoxAppString);
-    expect(sandboxApp.schema).toEqual(schemaBody.schema);
+  const sandboxApp = JSONUtilities.parse<SandboxApp>(sandBoxAppString);
+  expect(sandboxApp.schema).toEqual(schemaBody.schema);
 
-    const sandboxId = sandboxApp.backendManagerAppId;
-    expect(sandboxId).toBeDefined();
-    return sandboxId;
+  const sandboxId = sandboxApp.backendManagerAppId;
+  expect(sandboxId).toBeDefined();
+  return sandboxId;
 }
-
-
-
diff --git a/packages/amplify-codegen-e2e-tests/src/import-helpers/types.ts b/packages/amplify-codegen-e2e-tests/src/import-helpers/types.ts
@@ -6,7 +6,7 @@ import {
   SupportedIdentityProvidersListType,
 } from 'aws-sdk/clients/cognitoidentityserviceprovider';
 
-import { $TSObject } from 'amplify-cli-core';
+import { $TSObject } from '@aws-amplify/amplify-cli-core';
 
 export type AuthProjectDetails = {
   authResourceName?: string;
diff --git a/packages/amplify-codegen-e2e-tests/src/import-helpers/utilities.ts b/packages/amplify-codegen-e2e-tests/src/import-helpers/utilities.ts
@@ -1,7 +1,7 @@
 import * as aws from 'aws-sdk';
 import * as path from 'path';
 
-import { $TSObject, JSONUtilities } from 'amplify-cli-core';
+import { $TSObject, JSONUtilities } from '@aws-amplify/amplify-cli-core';
 import { AppClientSettings, DynamoDBProjectDetails } from './types';
 import { AuthProjectDetails, StorageProjectDetails } from '.';
 import { getBackendAmplifyMeta, getProjectMeta, getTeamProviderInfo } from '@aws-amplify/amplify-codegen-e2e-core';
diff --git a/packages/amplify-codegen/commands/codegen/codegen.js b/packages/amplify-codegen/commands/codegen/codegen.js
@@ -1,6 +1,6 @@
 const constants = require('../../src/constants');
 const codeGen = require('../../src');
-const { InvalidSubCommandError, exitOnNextTick } = require('amplify-cli-core');
+const { InvalidSubCommandError, exitOnNextTick } = require('@aws-amplify/amplify-cli-core');
 const featureName = 'codegen';
 
 module.exports = {
diff --git a/packages/amplify-codegen/commands/codegen/model-introspection.js b/packages/amplify-codegen/commands/codegen/model-introspection.js
@@ -1,5 +1,5 @@
 const codeGen = require('../../src');
-const { exitOnNextTick } = require('amplify-cli-core');
+const { exitOnNextTick } = require('@aws-amplify/amplify-cli-core');
 const featureName = 'model-introspection';
 
 module.exports = {
@@ -14,4 +14,4 @@ module.exports = {
       exitOnNextTick(1);
     }
   },
-};
+};
diff --git a/packages/amplify-codegen/commands/codegen/models.js b/packages/amplify-codegen/commands/codegen/models.js
@@ -1,5 +1,5 @@
 const codeGen = require('../../src');
-const { exitOnNextTick } = require('amplify-cli-core');
+const { exitOnNextTick } = require('@aws-amplify/amplify-cli-core');
 const getOutputDirParam = require('../../src/utils/getOutputDirParam');
 
 const featureName = 'models';
diff --git a/packages/amplify-codegen/commands/codegen/statements.js b/packages/amplify-codegen/commands/codegen/statements.js
@@ -1,5 +1,5 @@
 const codeGen = require('../../src');
-const { exitOnNextTick } = require('amplify-cli-core');
+const { exitOnNextTick } = require('@aws-amplify/amplify-cli-core');
 const featureName = 'statements';
 
 module.exports = {
diff --git a/packages/amplify-codegen/commands/codegen/types.js b/packages/amplify-codegen/commands/codegen/types.js
@@ -1,5 +1,5 @@
 const codeGen = require('../../src');
-const { exitOnNextTick } = require('amplify-cli-core');
+const { exitOnNextTick } = require('@aws-amplify/amplify-cli-core');
 const featureName = 'types';
 
 module.exports = {
diff --git a/packages/amplify-codegen/package.json b/packages/amplify-codegen/package.json
@@ -37,7 +37,7 @@
     "slash": "^3.0.0"
   },
   "peerDependencies": {
-    "amplify-cli-core": "^4.0.0",
+    "@aws-amplify/amplify-cli-core": "^4.0.0",
     "graphql-transformer-core": "^8.0.0"
   },
   "jest": {
diff --git a/packages/amplify-codegen/src/callbacks/postPushCallback.js b/packages/amplify-codegen/src/callbacks/postPushCallback.js
@@ -1,5 +1,5 @@
 const path = require('path');
-const { pathManager } = require('amplify-cli-core');
+const { pathManager } = require('@aws-amplify/amplify-cli-core');
 
 const loadConfig = require('../codegen-config');
 const generateStatements = require('../commands/statements');
diff --git a/packages/amplify-codegen/src/callbacks/prePushAddCallback.js b/packages/amplify-codegen/src/callbacks/prePushAddCallback.js
diff --git a/packages/amplify-codegen/src/callbacks/prePushUpdateCallback.js b/packages/amplify-codegen/src/callbacks/prePushUpdateCallback.js
diff --git a/packages/amplify-codegen/src/commands/models.js b/packages/amplify-codegen/src/commands/models.js
diff --git a/packages/amplify-codegen/src/utils/getSchemaDownloadLocation.js b/packages/amplify-codegen/src/utils/getSchemaDownloadLocation.js
diff --git a/packages/amplify-codegen/tests/callbacks/postPushCallback.test.js b/packages/amplify-codegen/tests/callbacks/postPushCallback.test.js
diff --git a/packages/amplify-codegen/tests/callbacks/prePushAddCallback.test.js b/packages/amplify-codegen/tests/callbacks/prePushAddCallback.test.js
diff --git a/packages/amplify-codegen/tests/callbacks/prePushUpdateCallback.test.js b/packages/amplify-codegen/tests/callbacks/prePushUpdateCallback.test.js
diff --git a/packages/amplify-codegen/tests/utils/getSchemaDownloadLocation.test.js b/packages/amplify-codegen/tests/utils/getSchemaDownloadLocation.test.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`"uuid": "7.0.1"`
`36`	`36`	`},`
`37`	`37`	`"peerDependencies": {`
`38`		`- "amplify-cli-core": "^4.0.0",`
	`38`	`+ "@aws-amplify/amplify-cli-core": "^4.0.0",`
`39`	`39`	`"amplify-headless-interface": "^1.13.1",`
`40`	`40`	`"graphql-transformer-core": "^8.0.0"`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { stateManager } from 'amplify-cli-core';`
	`1`	`+import { stateManager } from '@aws-amplify/amplify-cli-core';`
`2`	`2`
`3`	`3`	`declare global {`
`4`	`4`	`namespace NodeJS {`