fix: fix issues after migrating to ESM

SoftwareBrothers · Mar 29, 2024 · 42b385f · 42b385f
1 parent 93339ea
commit 42b385f
Show file tree

Hide file tree

Showing 13 changed files with 2,280 additions and 1,437 deletions.
diff --git a/example-app/docker-compose.yml b/example-app/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - POSTGRES_USER=adminjs
       - POSTGRES_PASSWORD=adminjs
     ports:
-      - "5432:5432"
+      - "5433:5432"
     volumes:
       - adminjs_leaflet_db:/var/lib/postgresql/data
 

diff --git a/example-app/package.json b/example-app/package.json
@@ -1,16 +1,17 @@
 {
   "name": "example-app",
   "version": "1.0.0",
-  "main": "index.js",
+  "type": "module",
   "license": "MIT",
   "scripts": {
-    "start": "ts-node src/app"
+    "build": "tsc",
+    "start": "dotenv -c '.env' -- node ./dist/app.js"
   },
   "dependencies": {
-    "@adminjs/express": "^5.1.0",
-    "@adminjs/leaflet": "^1.0.0",
-    "@adminjs/typeorm": "^4.0.0",
-    "adminjs": "^6.8.1",
+    "@adminjs/express": "^6.1.0",
+    "@adminjs/leaflet": "^2.0.0",
+    "@adminjs/typeorm": "^5.0.1",
+    "adminjs": "^7.8.1",
     "cors": "^2.8.5",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
@@ -26,7 +27,8 @@
     "@types/express": "^4.17.15",
     "@types/geojson": "^7946.0.10",
     "@types/node": "^18.11.18",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
+    "dotenv-cli": "^7.4.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^4.9.5"
   }
 }
diff --git a/example-app/src/app.ts b/example-app/src/app.ts
@@ -5,18 +5,15 @@
 import 'reflect-metadata';
 import leafletFeatures, { getLeafletDist } from '@adminjs/leaflet';
 
-import dotenv from 'dotenv';
-dotenv.config({ path: `${process.cwd()}/.env` });
-
 import AdminJS, { ComponentLoader } from 'adminjs';
 import Plugin from '@adminjs/express';
 import * as Adapter from '@adminjs/typeorm';
 import express from 'express';
 import cors from 'cors';
 
-import datasource from './db/datasource';
-import { Marker } from './db/marker.entity';
-import { Map as MapEntity } from './db/map.entity';
+import datasource from './db/datasource.js';
+import { Marker } from './db/marker.entity.js';
+import { Map as MapEntity } from './db/map.entity.js';
 
 const PORT = process.env.PORT ?? 8080;
 
@@ -25,13 +22,14 @@ AdminJS.registerAdapter({
   Resource: Adapter.Resource,
 });
 
+const componentLoader = new ComponentLoader();
+
 const start = async () => {
   await datasource.initialize();
 
-  const componentLoader = new ComponentLoader();
-
   const app = express();
   app.use(cors({ origin: '*' }));
+  app.use(express.static('public'));
   app.use(express.static(getLeafletDist()));
 
   const markerPaths = {
@@ -42,6 +40,7 @@ const start = async () => {
   };
 
   const admin = new AdminJS({
+    componentLoader,
     assets: {
       styles: ['/leaflet.css'],
     },
@@ -74,7 +73,6 @@ const start = async () => {
         }),
       ],
     }],
-    componentLoader,
     rootPath: '/',
   });
 

diff --git a/example-app/src/db/datasource.ts b/example-app/src/db/datasource.ts
@@ -1,7 +1,7 @@
 import { DataSource, DataSourceOptions } from 'typeorm';
 
-import { Map as MapEntity } from './map.entity';
-import { Marker } from './marker.entity';
+import { Map as MapEntity } from './map.entity.js';
+import { Marker } from './marker.entity.js';
 
 const config: DataSourceOptions = {
   type: 'postgres' as const,

diff --git a/example-app/src/db/map.entity.ts b/example-app/src/db/map.entity.ts
@@ -1,6 +1,6 @@
 import { BaseEntity, Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
 
-import type { Marker } from './marker.entity';
+import type { Marker } from './marker.entity.js';
 
 @Entity({ name: 'maps' })
 export class Map extends BaseEntity {

diff --git a/example-app/src/db/marker.entity.ts b/example-app/src/db/marker.entity.ts
@@ -1,7 +1,7 @@
 import { BaseEntity, Column, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { Point } from 'geojson';
 
-import type { Map as MapEntity } from './map.entity';
+import type { Map as MapEntity } from './map.entity.js';
 
 @Entity({ name: 'markers' })
 export class Marker extends BaseEntity {

diff --git a/example-app/tsconfig.json b/example-app/tsconfig.json
@@ -3,18 +3,17 @@
     "target": "esnext",
     "esModuleInterop": true,
     "jsx": "react",
-    "declaration": true,
+    "declaration": false,
     "importHelpers": true,
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
     "strictFunctionTypes": true,
     "strictBindCallApply": true,
     "noImplicitThis": true,
-    "moduleResolution": "node",
-    "module": "commonjs",
+    "moduleResolution": "nodenext",
+    "module": "nodenext",
     "baseUrl": "./",
-    "outDir": "lib",
-    "declarationDir": "types",
+    "outDir": "dist",
     "allowSyntheticDefaultImports": true,
     "skipLibCheck": true,
     "experimentalDecorators": true