From 5500e64c4b8c3e1353eeffdb5113f6cba9fda704 Mon Sep 17 00:00:00 2001
From: Bram Borggreve <borggreve@gmail.com>
Date: Fri, 9 Apr 2021 20:34:20 -0500
Subject: [PATCH 1/2] fix: make workspace-setup generator compatible with Nx12

---
 .../generators/workspace-setup/lib/helpers.ts__tmpl__           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stack/src/schematics/generators/generators/workspace-setup/lib/helpers.ts__tmpl__ b/packages/stack/src/schematics/generators/generators/workspace-setup/lib/helpers.ts__tmpl__
index 38c459cf..59cb5b27 100644
--- a/packages/stack/src/schematics/generators/generators/workspace-setup/lib/helpers.ts__tmpl__
+++ b/packages/stack/src/schematics/generators/generators/workspace-setup/lib/helpers.ts__tmpl__
@@ -106,7 +106,7 @@ export function runPrismaSeed() {
 
 export const sleep = (ms = 1000) => new Promise((resolve) => setTimeout(resolve, ms))
 
-async function waitForConnection(): Promise<any> {
+async function waitForConnection(): Promise<void> {
   log(yellow('Waiting for Postgres to connect'))
   return new Promise(async (resolve, reject) => {
     let count = 0

From 898de4e5c0bcc6fda670e1272c17dda220a2b57a Mon Sep 17 00:00:00 2001
From: Bram Borggreve <borggreve@gmail.com>
Date: Fri, 9 Apr 2021 21:35:41 -0500
Subject: [PATCH 2/2] test: don't test existence of project definitions in
 nx.json

---
 e2e/stack-e2e/tests/structure/api-structure.ts | 5 ++++-
 e2e/stack-e2e/tests/structure/web-structure.ts | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/e2e/stack-e2e/tests/structure/api-structure.ts b/e2e/stack-e2e/tests/structure/api-structure.ts
index 5ef9a0e7..e0472495 100644
--- a/e2e/stack-e2e/tests/structure/api-structure.ts
+++ b/e2e/stack-e2e/tests/structure/api-structure.ts
@@ -83,7 +83,10 @@ export function apiFileTests(project: string): FileTests {
         `yarn nxpm-stack lint`,
       ],
       [`tsconfig.base.json`]: [`"apps/${project}/src/app/app.module.ts"`],
-      [`nx.json`]: [`"defaultBase": "main"`, `"project": "${project}"`],
+      [`nx.json`]: [
+        `"defaultBase": "main"`,
+        // `"project": "${project}"`
+      ],
       [`apps/${project}/src/main.ts`]: [`Logger.log('Listening at http://localhost:' + port + '/graphql')`],
       [`libs/${project}/core/data-access/src/lib/${project}-core-data-access.service.ts`]: [
         `extends PrismaClient`,
diff --git a/e2e/stack-e2e/tests/structure/web-structure.ts b/e2e/stack-e2e/tests/structure/web-structure.ts
index 7f4ae8b2..dbea1459 100644
--- a/e2e/stack-e2e/tests/structure/web-structure.ts
+++ b/e2e/stack-e2e/tests/structure/web-structure.ts
@@ -162,7 +162,7 @@ export function webFileTests(project: string): FileTests {
         `@import 'tailwindcss/components';`,
         `@import 'tailwindcss/utilities';`,
       ],
-      [`nx.json`]: [`"project": "${project}"`],
+      // [`nx.json`]: [`"project": "${project}"`],
     },
   }
 }