From d184e4d36f30ec628fd861dc5063cd3da41deec1 Mon Sep 17 00:00:00 2001
From: Michael Bromley <michael@michaelbromley.co.uk>
Date: Thu, 14 Mar 2024 15:01:14 +0100
Subject: [PATCH] chore: Fix issues with build configs

---
 packages/cli/tsconfig.json          | 1 +
 packages/create/tsconfig.json       | 2 ++
 packages/harden-plugin/src/types.ts | 2 +-
 packages/testing/src/test-server.ts | 2 +-
 scripts/check-angular-versions.ts   | 4 ++--
 tsconfig.json                       | 4 ++--
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index b659b70b11..f87a676bbd 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "moduleResolution": "node",
+    "module": "CommonJS",
     "declaration": true,
     "removeComments": true,
     "strictPropertyInitialization": false,
diff --git a/packages/create/tsconfig.json b/packages/create/tsconfig.json
index f343c8c4b3..06c18656dd 100644
--- a/packages/create/tsconfig.json
+++ b/packages/create/tsconfig.json
@@ -1,6 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "module": "CommonJS",
+    "moduleResolution": "node",
     "declaration": true,
     "removeComments": false,
     "noLib": false,
diff --git a/packages/harden-plugin/src/types.ts b/packages/harden-plugin/src/types.ts
index 02fdd6e15b..096f266422 100644
--- a/packages/harden-plugin/src/types.ts
+++ b/packages/harden-plugin/src/types.ts
@@ -1,4 +1,4 @@
-import { ComplexityEstimator } from 'graphql-query-complexity/dist/cjs/QueryComplexity';
+import { ComplexityEstimator } from 'graphql-query-complexity';
 
 /**
  * @description
diff --git a/packages/testing/src/test-server.ts b/packages/testing/src/test-server.ts
index d0035894b1..963132b73b 100644
--- a/packages/testing/src/test-server.ts
+++ b/packages/testing/src/test-server.ts
@@ -109,7 +109,7 @@ export class TestServer {
     ): Promise<INestApplication> {
         const config = await preBootstrapConfig(userConfig);
         Logger.useLogger(config.logger);
-        const appModule = await import('@vendure/core/dist/app.module');
+        const appModule = await import('@vendure/core/dist/app.module.js');
         try {
             DefaultLogger.hideNestBoostrapLogs();
             const app = await NestFactory.create(appModule.AppModule, {
diff --git a/scripts/check-angular-versions.ts b/scripts/check-angular-versions.ts
index 46b0beb062..83c6116aae 100644
--- a/scripts/check-angular-versions.ts
+++ b/scripts/check-angular-versions.ts
@@ -8,8 +8,8 @@ import path from 'path';
  * See https://github.com/vendure-ecommerce/vendure/issues/758 for more on this issue.
  */
 async function checkAngularVersions() {
-    const adminUiPackageJson = await import('../packages/admin-ui/package.json');
-    const uiDevkitPackageJson = await import('../packages/ui-devkit/package.json');
+    const adminUiPackageJson = require('../packages/admin-ui/package.json');
+    const uiDevkitPackageJson = require('../packages/ui-devkit/package.json');
 
     const angularCompilerPackages = ['@angular/cli', '@angular/compiler-cli', '@angular/compiler'];
     const illegalSemverPrefixes = /^[~^]/;
diff --git a/tsconfig.json b/tsconfig.json
index 21bb8beb60..9f2e82700d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "moduleResolution": "Node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "noLib": false,
     "skipLibCheck": true,
     "lib": ["es2019", "esnext.asynciterable"],