Merge pull request #421 from aws-amplify/master

Release several features and fixes

Author: Dane Pilcher

.github/CODEOWNERS

@@ -1 +1 @@
-*   @aws-amplify/amplify-codegen @aws-amplify/amplify-cli
+* @aws-amplify/amplify-data

Readme.md

@@ -1,7 +1,7 @@
 <a href="https://aws-amplify.github.io/" target="_blank">
     <img src="https://s3.amazonaws.com/aws-mobile-hub-images/aws-amplify-logo.png" alt="AWS Amplify" width="550" >
 </a>
-
+ 
 <p>
   <a href="https://discord.gg/jWVbPfC" target="_blank">
     <img src="https://img.shields.io/discord/308323056592486420?logo=discord"" alt="Discord Chat" />  

package.json

@@ -24,9 +24,9 @@
     "verdaccio-disconnect": "source .circleci/local_publish_helpers.sh && unsetNpmRegistryUrl",
     "verdaccio-stop": "kill -9 $(lsof -n -t -iTCP:4873 -sTCP:LISTEN)",
     "setup-dev": "(yarn && lerna run build) && yarn add-cli-no-save && (yarn hoist-cli && yarn rm-dev-link && yarn link-dev)",
-    "add-cli-no-save": "yarn add @aws-amplify/cli -W && git restore package.json",
-    "hoist-cli": "rm -rf node_modules/amplify-cli && mkdir node_modules/amplify-cli && cp -r node_modules/@aws-amplify/cli/ node_modules/amplify-cli",
-    "link-dev": "cd node_modules/amplify-cli && ln -s \"$(pwd)/bin/amplify\" \"$(yarn global bin)/amplify-dev\" && cd -",
+    "add-cli-no-save": "yarn add @aws-amplify/cli-internal -W && git restore package.json",
+    "hoist-cli": "rm -rf node_modules/amplify-cli-internal && mkdir node_modules/amplify-cli-internal && cp -r node_modules/@aws-amplify/cli-internal/ node_modules/amplify-cli-internal",
+    "link-dev": "cd node_modules/amplify-cli-internal && ln -s \"$(pwd)/bin/amplify\" \"$(yarn global bin)/amplify-dev\" && cd -",
     "rm-dev-link": "rm -f \"$(yarn global bin)/amplify-dev\"",
     "commit": "git-cz",
     "coverage": "codecov || exit 0",

packages/amplify-codegen/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
+ 
 ## [2.28.1](https://github.com/aws-amplify/amplify-codegen/compare/[email protected]@2.28.1) (2022-02-24)
 
 **Note:** Version bump only for package amplify-codegen

packages/amplify-codegen/package.json

@@ -24,9 +24,6 @@
     "@aws-amplify/graphql-docs-generator": "2.4.2",
     "@aws-amplify/graphql-types-generator": "2.8.6",
     "@graphql-codegen/core": "1.8.3",
-    "amplify-codegen-appsync-model-plugin": "^1.22.3",
-    "amplify-graphql-docs-generator": "^2.2.1",
-    "amplify-graphql-types-generator": "^2.7.0",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "glob-all": "^3.1.0",

packages/amplify-codegen/src/commands/models.js

@@ -4,7 +4,7 @@ const { parse } = require('graphql');
 const glob = require('glob-all');
 const { FeatureFlags, pathManager } = require('amplify-cli-core');
 const gqlCodeGen = require('@graphql-codegen/core');
-const { getModelgenPackage } = require('../utils/getModelgenPackage');
+const appSyncDataStoreCodeGen = require('@aws-amplify/appsync-modelgen-plugin');
 const { validateDartSDK } = require('../utils/validateDartSDK');
 const { validateAmplifyFlutterCapableZeroThreeFeatures } = require('../utils/validateAmplifyFlutterCapableZeroThreeFeatures');
 const { validateAmplifyFlutterCoreLibraryDependency } = require('../utils/validateAmplifyFlutterCoreLibraryDependency');
@@ -79,9 +79,6 @@ async function generateModels(context) {
   const outputPath = path.join(projectRoot, getModelOutputPath(context));
   const schema = parse(schemaContent);
   const projectConfig = context.amplify.getProjectConfig();
-  //get modelgen package
-  const modelgenPackageMigrationflag = 'codegen.useAppSyncModelgenPlugin';
-  const appSyncDataStoreCodeGen = getModelgenPackage(FeatureFlags.getBoolean(modelgenPackageMigrationflag));
 
   const generateIndexRules = readFeatureFlag('codegen.generateIndexRules');
   const emitAuthProvider = readFeatureFlag('codegen.emitAuthProvider');

packages/amplify-codegen/src/commands/statements.js

@@ -5,9 +5,7 @@ const Ora = require('ora');
 const loadConfig = require('../codegen-config');
 const constants = require('../constants');
 const { ensureIntrospectionSchema, getFrontEndHandler, getAppSyncAPIDetails } = require('../utils');
-const { FeatureFlags } = require('amplify-cli-core');
-const { getDocsgenPackage } = require('../utils/getDocsgenPackage');
-const docsgenPackageMigrationflag = 'codegen.useDocsGeneratorPlugin';
+const { generate } = require('@aws-amplify/graphql-docs-generator')
 
 async function generateStatements(context, forceDownloadSchema, maxDepth, withoutInit = false, decoupleFrontend = '') {
   try {
@@ -36,8 +34,6 @@ async function generateStatements(context, forceDownloadSchema, maxDepth, withou
     return;
   }
 
-  const { generate } = getDocsgenPackage(FeatureFlags.getBoolean(docsgenPackageMigrationflag));
-
   for (const cfg of projects) {
     const includeFiles = path.join(projectPath, cfg.includes[0]);
     const opsGenDirectory = cfg.amplifyExtension.docsFilePath
@@ -63,7 +59,6 @@ async function generateStatements(context, forceDownloadSchema, maxDepth, withou
         separateFiles: true,
         language,
         maxDepth: maxDepth || cfg.amplifyExtension.maxDepth,
-        retainCaseStyle: FeatureFlags.getBoolean('codegen.retainCaseStyle')
       });
       opsGenSpinner.succeed(constants.INFO_MESSAGE_OPS_GEN_SUCCESS + path.relative(path.resolve('.'), opsGenDirectory));
     } finally {

packages/amplify-codegen/src/commands/types.js

@@ -5,9 +5,7 @@ const Ora = require('ora');
 const constants = require('../constants');
 const loadConfig = require('../codegen-config');
 const { ensureIntrospectionSchema, getFrontEndHandler, getAppSyncAPIDetails } = require('../utils');
-const { FeatureFlags } = require('amplify-cli-core');
-const { getTypesgenPackage } = require('../utils/getTypesgenPackage');
-const typesgenPackageMigrationflag = 'codegen.useTypesGeneratorPlugin';
+const { generate } = require('@aws-amplify/graphql-types-generator');
 
 async function generateTypes(context, forceDownloadSchema, withoutInit = false, decoupleFrontend = '') {
   let frontend = decoupleFrontend;
@@ -38,8 +36,6 @@ async function generateTypes(context, forceDownloadSchema, withoutInit = false,
       ({ projectPath } = context.amplify.getEnvInfo());
     }
 
-    const { generate } = getTypesgenPackage(FeatureFlags.getBoolean(typesgenPackageMigrationflag));
-
     try {
       projects.forEach(async cfg => {
         const { generatedFileName } = cfg.amplifyExtension || {};