feat(amplify-codegen): Migrate codegen (#6730)

* chore(amplify-codegen): change codegen dependency to the migrate one
aws-amplify · Mar 2, 2021 · 9c7a69a · 9c7a69a
1 parent 78bb42d
commit 9c7a69a
Show file tree

Hide file tree

Showing 114 changed files with 45 additions and 5,896 deletions.
diff --git a/package.json b/package.json
@@ -67,9 +67,10 @@
   "dependencies": {
     "lerna": "^3.16.4"
   },
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": {
+    "packages": ["packages/*"],
+    "nohoist": ["@aws-amplify/cli/amplify-codegen"]
+  },
   "devDependencies": {
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.10.5",

diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
@@ -46,7 +46,7 @@
     "amplify-category-xr": "2.7.3",
     "amplify-cli-core": "1.17.2",
     "amplify-cli-logger": "1.1.0",
-    "amplify-codegen": "2.21.4",
+    "amplify-codegen": "^2.22.3",
     "amplify-console-hosting": "1.7.3",
     "amplify-container-hosting": "1.2.3",
     "amplify-dotnet-function-runtime-provider": "1.5.2",

diff --git a/packages/amplify-cli/src/plugin-helpers/platform-health-check.ts b/packages/amplify-cli/src/plugin-helpers/platform-health-check.ts
@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import { PluginInfo } from '../domain/plugin-info';
 import { PluginPlatform } from '../domain/plugin-platform';
 import { JSONUtilities, $TSAny } from 'amplify-cli-core';
+import { satisfies } from 'semver';
 
 export type PluginDescription = {
   name: string;
@@ -84,7 +85,7 @@ function isMatching(pluginDescription: PluginDescription, pluginInfo: PluginInfo
   let result = pluginDescription.packageName === pluginInfo.packageName && pluginDescription.type === pluginInfo.manifest.type;
 
   if (result && pluginDescription.packageVersion) {
-    result = pluginDescription.packageVersion === pluginInfo.packageVersion;
+    result = satisfies(pluginInfo.packageVersion, pluginDescription.packageVersion);
   }
 
   return result;

diff --git a/packages/amplify-codegen/.npmignore b/packages/amplify-codegen/.npmignore
diff --git a/packages/amplify-codegen/CHANGELOG.md b/packages/amplify-codegen/CHANGELOG.md
diff --git a/packages/amplify-codegen/amplify-plugin.json b/packages/amplify-codegen/amplify-plugin.json
diff --git a/packages/amplify-codegen/awsAppSyncDirectives.graphql b/packages/amplify-codegen/awsAppSyncDirectives.graphql
diff --git a/packages/amplify-codegen/commands/codegen/add.js b/packages/amplify-codegen/commands/codegen/add.js
diff --git a/packages/amplify-codegen/commands/codegen/codegen.js b/packages/amplify-codegen/commands/codegen/codegen.js
diff --git a/packages/amplify-codegen/commands/codegen/configure.js b/packages/amplify-codegen/commands/codegen/configure.js
diff --git a/packages/amplify-codegen/commands/codegen/models.js b/packages/amplify-codegen/commands/codegen/models.js
diff --git a/packages/amplify-codegen/commands/codegen/remove.js b/packages/amplify-codegen/commands/codegen/remove.js
diff --git a/packages/amplify-codegen/commands/codegen/statements.js b/packages/amplify-codegen/commands/codegen/statements.js
diff --git a/packages/amplify-codegen/commands/codegen/types.js b/packages/amplify-codegen/commands/codegen/types.js
diff --git a/packages/amplify-codegen/package.json b/packages/amplify-codegen/package.json
diff --git a/packages/amplify-codegen/src/amplify-plugin-index.js b/packages/amplify-codegen/src/amplify-plugin-index.js
diff --git a/packages/amplify-codegen/src/callbacks/postPushCallback.js b/packages/amplify-codegen/src/callbacks/postPushCallback.js