Merge pull request #564 from aws-amplify/main

chore(codegen): trigger release pipeline

Author: sundersc

.circleci/config.base.yml

@@ -58,7 +58,7 @@ install_cli_with_local_codegen: &install_cli
     startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
     setNpmRegistryUrlToLocal
     changeNpmGlobalPath
-    npm install -g @aws-amplify/cli-internal@11.0.0-rc.e5f00c392.0
+    npm install -g @aws-amplify/cli-internal
     amplify -v
     npm list --global --depth=1
     unsetNpmRegistryUrl

.circleci/config.yml

@@ -54,7 +54,7 @@ install_cli_with_local_codegen: &ref_3
     startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
     setNpmRegistryUrlToLocal
     changeNpmGlobalPath
-    npm install -g @aws-amplify/cli-internal@11.0.0-rc.e5f00c392.0
+    npm install -g @aws-amplify/cli-internal
     amplify -v
     npm list --global --depth=1
     unsetNpmRegistryUrl

CONTRIBUTING.md

@@ -36,6 +36,14 @@ $ yarn setup-dev
 
 > NOTE: The `amplify-dev` binary is built based on the latest amplify cli from npm registry and your local codegen packages. All your local changes from codegen can be reflected (typescript files need to be build by `tsc`). In addition, if you are a developer of cli repo, you can run the same command to override the `amplify-dev` binary.
 
+5. Ensure `amplify-dev` exists on your path.
+
+```sh
+$ yarn global bin # retrieve yarn path
+```
+
+Update your `$PATH` to include this directory.
+
 ### Architecture of the codebase
 
 Amplify Codegen is a monorepo built with [Yarn Workspaces](https://yarnpkg.com/features/workspaces) and [Lerna](https://github.com/lerna/lerna). All packages live within the `packages/` directory in the root. Each category inside packages has its own `src/` and `package.json`.

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-rc.e5f00c392.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-rc.e5f00c392.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-rc.e5f00c392.0",
+    "@aws-amplify/amplify-cli-core": "^4.0.0",
     "graphql-transformer-core": "^8.0.0"
   },
   "jest": {