Fix for cli-core so it is no longer unresolvable (#2003)

ShadowCat567 · Vieltojarvi · web-flow · commit 8dd7286bf1a8 · 2024-09-16T11:30:11.000-07:00
* fixed cli-core and plugin-types violations

* added changeset

* plugin-types cannot have a main field because it cannot export functional code

* cli-core removed from excluded packages

* comment for plugin-types exclusion from check for main

---------

Co-authored-by: Vieltojarvi &lt;lvielto@amazon.com&gt;
diff --git a/.changeset/strange-jobs-refuse.md b/.changeset/strange-jobs-refuse.md
@@ -0,0 +1,14 @@
+---
+'@aws-amplify/backend-platform-test-stubs': patch
+'@aws-amplify/deployed-backend-client': patch
+'@aws-amplify/backend-output-storage': patch
+'@aws-amplify/integration-tests': patch
+'@aws-amplify/model-generator': patch
+'@aws-amplify/client-config': patch
+'@aws-amplify/plugin-types': patch
+'@aws-amplify/cli-core': patch
+'@aws-amplify/sandbox': patch
+'@aws-amplify/backend-cli': patch
+---
+
+fixed errors in plugin-types and cli-core along with any extraneous dependencies in other packages
diff --git a/packages/backend-output-storage/package.json b/packages/backend-output-storage/package.json
@@ -20,7 +20,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^1.2.0",
-    "@aws-amplify/platform-core": "^1.0.6"
+    "@aws-amplify/platform-core": "^1.0.6",
+    "@aws-amplify/plugin-types": "^1.2.1"
   },
   "peerDependencies": {
     "aws-cdk-lib": "^2.152.0"
diff --git a/packages/backend-output-storage/tsconfig.json b/packages/backend-output-storage/tsconfig.json
@@ -3,6 +3,7 @@
   "compilerOptions": { "rootDir": "src", "outDir": "lib" },
   "references": [
     { "path": "../backend-output-schemas" },
-    { "path": "../platform-core" }
+    { "path": "../platform-core" },
+    { "path": "../plugin-types" }
   ]
 }
diff --git a/packages/backend-platform-test-stubs/package.json b/packages/backend-platform-test-stubs/package.json
@@ -16,6 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
+    "@aws-amplify/plugin-types": "^1.2.1",
     "aws-cdk-lib": "^2.152.0",
     "constructs": "^10.0.0"
   }
diff --git a/packages/backend-platform-test-stubs/tsconfig.json b/packages/backend-platform-test-stubs/tsconfig.json
@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": { "rootDir": "src", "outDir": "lib" },
-  "references": []
+  "references": [{ "path": "../plugin-types" }]
 }
diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json
@@ -12,6 +12,7 @@
       "require": "./lib/index.js"
     }
   },
+  "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "update:api": "api-extractor run --local"
diff --git a/packages/cli-core/src/package-manager-controller/execute_with_debugger_logger.ts b/packages/cli-core/src/package-manager-controller/execute_with_debugger_logger.ts
@@ -1,4 +1,4 @@
-import { LogLevel } from '@aws-amplify/cli-core';
+import { LogLevel } from '../printer/printer.js';
 import { type Options, execa as _execa } from 'execa';
 import { printer } from '../printer.js';
 
diff --git a/packages/cli-core/src/package-manager-controller/yarn_modern_package_manager_controller.test.ts b/packages/cli-core/src/package-manager-controller/yarn_modern_package_manager_controller.test.ts
@@ -3,7 +3,7 @@ import path from 'path';
 import { beforeEach, describe, it, mock } from 'node:test';
 import assert from 'assert';
 import { execa } from 'execa';
-import { Printer } from '@aws-amplify/cli-core';
+import { Printer } from '../printer/printer.js';
 import { YarnModernPackageManagerController } from './yarn_modern_package_manager_controller.js';
 import { executeWithDebugLogger } from './execute_with_debugger_logger.js';
 
diff --git a/packages/cli-core/src/package-manager-controller/yarn_modern_package_manager_controller.ts b/packages/cli-core/src/package-manager-controller/yarn_modern_package_manager_controller.ts
@@ -2,7 +2,8 @@ import { existsSync as _existsSync } from 'fs';
 import _fsp from 'fs/promises';
 import { execa as _execa } from 'execa';
 import * as _path from 'path';
-import { LogLevel, Printer, format } from '@aws-amplify/cli-core';
+import { LogLevel, Printer } from '../printer/printer.js';
+import { format } from '../format/format.js';
 import { executeWithDebugLogger as _executeWithDebugLogger } from './execute_with_debugger_logger.js';
 import { PackageManagerControllerBase } from './package_manager_controller_base.js';
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -40,6 +40,7 @@
     "@aws-amplify/form-generator": "^1.0.1",
     "@aws-amplify/model-generator": "^1.0.5",
     "@aws-amplify/platform-core": "^1.0.5",
+    "@aws-amplify/plugin-types": "^1.2.1",
     "@aws-amplify/sandbox": "^1.2.0",
     "@aws-amplify/schema-generator": "^1.2.1",
     "@aws-sdk/client-amplify": "^3.624.0",
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
@@ -11,6 +11,7 @@
     { "path": "../form-generator" },
     { "path": "../model-generator" },
     { "path": "../platform-core" },
+    { "path": "../plugin-types" },
     { "path": "../sandbox" },
     { "path": "../schema-generator" }
   ]
diff --git a/packages/client-config/package.json b/packages/client-config/package.json
@@ -28,6 +28,7 @@
     "@aws-amplify/deployed-backend-client": "^1.4.0",
     "@aws-amplify/model-generator": "^1.0.5",
     "@aws-amplify/platform-core": "^1.0.7",
+    "@aws-amplify/plugin-types": "^1.2.1",
     "zod": "^3.22.2"
   },
   "devDependencies": {
diff --git a/packages/client-config/tsconfig.json b/packages/client-config/tsconfig.json
@@ -5,6 +5,7 @@
     { "path": "../backend-output-schemas" },
     { "path": "../deployed-backend-client" },
     { "path": "../model-generator" },
-    { "path": "../platform-core" }
+    { "path": "../platform-core" },
+    { "path": "../plugin-types" }
   ]
 }
diff --git a/packages/deployed-backend-client/package.json b/packages/deployed-backend-client/package.json
@@ -21,6 +21,7 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^1.2.0",
     "@aws-amplify/platform-core": "^1.0.5",
+    "@aws-amplify/plugin-types": "^1.2.1",
     "zod": "^3.22.2"
   },
   "peerDependencies": {
diff --git a/packages/deployed-backend-client/tsconfig.json b/packages/deployed-backend-client/tsconfig.json
@@ -3,6 +3,7 @@
   "compilerOptions": { "rootDir": "src", "outDir": "lib" },
   "references": [
     { "path": "../backend-output-schemas" },
-    { "path": "../platform-core" }
+    { "path": "../platform-core" },
+    { "path": "../plugin-types" }
   ]
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -14,6 +14,7 @@
     "@aws-amplify/data-schema": "^1.0.0",
     "@aws-amplify/deployed-backend-client": "^1.3.0",
     "@aws-amplify/platform-core": "^1.1.0",
+    "@aws-amplify/plugin-types": "^1.2.1",
     "@aws-sdk/client-accessanalyzer": "^3.624.0",
     "@aws-sdk/client-amplify": "^3.624.0",
     "@aws-sdk/client-bedrock-runtime": "^3.622.0",
diff --git a/packages/integration-tests/tsconfig.json b/packages/integration-tests/tsconfig.json
@@ -10,6 +10,7 @@
     { "path": "../client-config" },
     { "path": "../deployed-backend-client" },
     { "path": "../platform-core" },
+    { "path": "../plugin-types" },
     { "path": "./src/test-projects/data-storage-auth-with-triggers-ts" }
   ],
   "exclude": ["**/node_modules", "**/lib", "src/e2e-tests"]
diff --git a/packages/model-generator/package.json b/packages/model-generator/package.json
@@ -24,6 +24,7 @@
     "@aws-amplify/graphql-generator": "^0.4.0",
     "@aws-amplify/graphql-types-generator": "^3.6.0",
     "@aws-amplify/platform-core": "^1.0.5",
+    "@aws-amplify/plugin-types": "^1.2.1",
     "@aws-sdk/client-appsync": "^3.624.0",
     "@aws-sdk/client-s3": "^3.624.0",
     "@aws-sdk/credential-providers": "^3.624.0",
diff --git a/packages/model-generator/tsconfig.json b/packages/model-generator/tsconfig.json
@@ -8,6 +8,7 @@
   "references": [
     { "path": "../backend-output-schemas" },
     { "path": "../deployed-backend-client" },
-    { "path": "../platform-core" }
+    { "path": "../platform-core" },
+    { "path": "../plugin-types" }
   ]
 }
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -25,6 +25,7 @@
     "@aws-amplify/client-config": "^1.1.3",
     "@aws-amplify/deployed-backend-client": "^1.3.0",
     "@aws-amplify/platform-core": "^1.0.6",
+    "@aws-amplify/plugin-types": "^1.2.1",
     "@aws-sdk/client-cloudformation": "^3.624.0",
     "@aws-sdk/client-cloudwatch-logs": "^3.624.0",
     "@aws-sdk/client-lambda": "^3.624.0",
diff --git a/packages/sandbox/tsconfig.json b/packages/sandbox/tsconfig.json
@@ -7,6 +7,7 @@
     { "path": "../cli-core" },
     { "path": "../client-config" },
     { "path": "../deployed-backend-client" },
-    { "path": "../platform-core" }
+    { "path": "../platform-core" },
+    { "path": "../plugin-types" }
   ]
 }
diff --git a/scripts/check_package_json.ts b/scripts/check_package_json.ts
@@ -3,19 +3,16 @@ import { readPackageJson } from './components/package-json/package_json.js';
 
 const packagePaths = await glob('./packages/*');
 
-// Excluding packages that violate 'import/no-extraneous-dependencies' rule until they're fixed.
-const tempExclude: string[] = [
-  '@aws-amplify/plugin-types',
-  '@aws-amplify/cli-core',
-];
+// Excluding packages that cannot have a main field due to status as a types only package
+const excludedPackages: string[] = ['@aws-amplify/plugin-types'];
 const errors: string[] = [];
 for (const packagePath of packagePaths) {
   const {
     main,
     name,
     private: privatePackage,
   } = await readPackageJson(packagePath);
-  if (privatePackage || tempExclude.includes(name)) {
+  if (privatePackage || excludedPackages.includes(name)) {
     continue;
   }
   if (!main) {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"compilerOptions": { "rootDir": "src", "outDir": "lib" },`
`4`	`4`	`"references": [`
`5`	`5`	`{ "path": "../backend-output-schemas" },`
`6`		`- { "path": "../platform-core" }`
	`6`	`+ { "path": "../platform-core" },`
	`7`	`+ { "path": "../plugin-types" }`
`7`	`8`	`]`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`},`
`17`	`17`	`"license": "Apache-2.0",`
`18`	`18`	`"dependencies": {`
	`19`	`+ "@aws-amplify/plugin-types": "^1.2.1",`
`19`	`20`	`"aws-cdk-lib": "^2.152.0",`
`20`	`21`	`"constructs": "^10.0.0"`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "../../tsconfig.base.json",`
`3`	`3`	`"compilerOptions": { "rootDir": "src", "outDir": "lib" },`
`4`		`- "references": []`
	`4`	`+ "references": [{ "path": "../plugin-types" }]`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`"require": "./lib/index.js"`
`13`	`13`	`}`
`14`	`14`	`},`
	`15`	`+ "main": "lib/index.js",`
`15`	`16`	`"types": "lib/index.d.ts",`
`16`	`17`	`"scripts": {`
`17`	`18`	`"update:api": "api-extractor run --local"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { LogLevel } from '@aws-amplify/cli-core';`
	`1`	`+import { LogLevel } from '../printer/printer.js';`
`2`	`2`	`import { type Options, execa as _execa } from 'execa';`
`3`	`3`	`import { printer } from '../printer.js';`
`4`	`4`