From 7e83aeffd88901d7017a1bee6aa9fff49f6f9fdf Mon Sep 17 00:00:00 2001
From: Mischa Spiegelmock <me@mish.dev>
Date: Mon, 1 Jul 2024 17:24:43 -0700
Subject: [PATCH] bundler, gql

---
 .github/workflows/test.yml        | 4 ++--
 common/graphql/codegen-config.cjs | 2 +-
 common/src/gql.ts                 | 2 +-
 common/src/index.ts               | 9 ---------
 common/src/util/index.ts          | 1 -
 tsconfig.json                     | 1 +
 6 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 common/src/util/index.ts

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dfecf31..710c641 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,8 +1,8 @@
 name: Build and test
 
 on:
-  workflow_dispatch:
-  workflow_call:
+  push:
+    - '*'
 
 env:
   NODE_OPTIONS: "--max-old-space-size=4096"
diff --git a/common/graphql/codegen-config.cjs b/common/graphql/codegen-config.cjs
index a202c86..3f0f743 100644
--- a/common/graphql/codegen-config.cjs
+++ b/common/graphql/codegen-config.cjs
@@ -26,7 +26,7 @@ const config = {
   },
   generates: {
     // output combined graphql schema
-    'schema/generated/platform.graphql': {
+    'common/graphql/generated/schema.graphql': {
       config: {
         // include AppSync directives in the generated schema
         includeDirectives: true,
diff --git a/common/src/gql.ts b/common/src/gql.ts
index 1a7132b..46097ad 100644
--- a/common/src/gql.ts
+++ b/common/src/gql.ts
@@ -1,2 +1,2 @@
 // import this for all graphql types
-export * as GQL from '../graphql/generated/gql.js';
+export * as GQL from '../graphql/generated/index';
diff --git a/common/src/index.ts b/common/src/index.ts
index f79cdbe..d9dbf4b 100644
--- a/common/src/index.ts
+++ b/common/src/index.ts
@@ -1,11 +1,2 @@
-// TODO: I don't want to export any of these from index.ts
-// I want package subpath exports in package.json to work properly with TypeScript
-// so that users can say `import { sleep } from 'common/util/sleep'`
-// this is still quite experimental though
-// https://devblogs.microsoft.com/typescript/announcing-typescript-4-7-beta/#package-json-exports-imports-and-self-referencing
-export * from './env.js';
-export * from './gql.js';
-export * from './util/index.js';
-
 // change this
 export const APP_NAME = 'myapp';
diff --git a/common/src/util/index.ts b/common/src/util/index.ts
deleted file mode 100644
index ba3874d..0000000
--- a/common/src/util/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './sleep.js';
diff --git a/tsconfig.json b/tsconfig.json
index 7d2142b..8781529 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "strictNullChecks": true,
     "noEmit": true,
+    "moduleResolution": "Bundler",
     "paths": {
       "@common/*": ["./common/src/*"],
       "@backend/*": ["./backend/src/*"]