Merge pull request #563 from evcodes/prepend-scopes

chore: prepend @aws-amplify to amplify-cli-core

Author: sundersc

package.json

@@ -59,13 +59,15 @@
     "packages/*"
   ],
   "devDependencies": {
+    "@aws-amplify/amplify-cli-core": "^4.0.0",
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/config-lerna-scopes": "^17.0.2",
     "@types/jest": "^27.0.0",
     "@types/js-yaml": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^4.0.0",
     "@typescript-eslint/parser": "^4.0.0",
+    "amplify-headless-interface": "^1.13.1",
     "cmd-shim": "^3.0.3",
     "codecov": "^3.7.0",
     "commitizen": "^4.2.4",
@@ -83,6 +85,7 @@
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-spellcheck": "^0.0.17",
     "glob": "^7.1.6",
+    "graphql-transformer-core": "^8.0.0",
     "husky": "^3.0.3",
     "jest": "^27.0.0",
     "jest-circus": "^27.0.0",
@@ -95,10 +98,7 @@
     "rimraf": "^3.0.0",
     "ts-jest": "^27.0.0",
     "ts-node": "^8.10.1",
-    "typescript": "4.7.4",
-    "amplify-cli-core":  "^4.0.0",
-    "graphql-transformer-core": "^8.0.0",
-    "amplify-headless-interface": "^1.13.1"
+    "typescript": "4.7.4"
   },
   "resolutions": {
     "minimist": "^1.2.6",

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"
   }

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';

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 {

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) => {

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');

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": {

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);
   });
 });
-  

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);
-
     });
   });
-});
+});

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);