feat: rewrite package to esmodules (#2)

* feat: rewrite package to esmodules BREAKING CHANGE: The package won't support CJS anymore.
SoftwareBrothers · Apr 18, 2023 · 154c36b · 154c36b
1 parent 3cad87b
commit 154c36b
Show file tree

Hide file tree

Showing 21 changed files with 4,392 additions and 3,259 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
@@ -13,7 +13,7 @@ module.exports = {
     ecmaFeatures: {
       jsx: true,
     },
-    ecmaVersion: 11,
+    ecmaVersion: 20,
     sourceType: 'module',
   },
   plugins: ['react', '@typescript-eslint'],

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -10,8 +10,8 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
-      - uses: actions/cache@v1
+          node-version: '18'
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: node_modules
@@ -32,8 +32,8 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
-      - uses: actions/cache@v1
+          node-version: '18'
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: node_modules
@@ -56,8 +56,8 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
-      - uses: actions/cache@v1
+          node-version: '18'
+      - uses: actions/cache@v2
         id: yarn-cache
         with:
           path: node_modules

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}
diff --git a/commitlint.config.js → commitlint.config.cjs b/commitlint.config.js → commitlint.config.cjs
diff --git a/example-app/package.json b/example-app/package.json
@@ -1,31 +1,31 @@
 {
   "name": "example-app",
   "version": "1.0.0",
-  "main": "index.js",
   "license": "MIT",
+  "type": "module",
   "scripts": {
     "dev": "npx dotenv -c '.env' ts-node src/app.ts",
     "build": "npx tsc -p tsconfig.json",
     "knex": "npx knex --knexpath dist/example-app/src/models/index.js --knexfile dist/example-app/src/knexfile.js",
     "migrate:up": "yarn knex migrate:latest"
   },
   "devDependencies": {
-    "@types/express": "^4.17.13",
-    "@types/node": "^16",
-    "dotenv": "^16.0.1",
+    "@types/express": "^4.17.17",
+    "@types/node": "^18",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.2"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@adminjs/express": "^5.0.0",
-    "adminjs": "^6.1.4",
+    "@adminjs/express": "^5.1.0",
+    "adminjs": "^6.8.7",
     "ajv-formats": "^2.1.1",
-    "express": "^4.18.1",
+    "dotenv": "^16.0.3",
+    "express": "^4.18.2",
     "express-formidable": "^1.2.0",
     "express-session": "^1.17.3",
-    "knex": "^2.2.0",
+    "knex": "^2.4.2",
     "objection": "^3.0.1",
-    "pg": "^8.8.0",
-    "tslib": "^2.4.0"
+    "pg": "^8.10.0",
+    "tslib": "^2.5.0"
   }
 }
diff --git a/example-app/src/app.ts b/example-app/src/app.ts
@@ -2,8 +2,8 @@ import express from 'express';
 import AdminJS from 'adminjs';
 import AdminJSExpress from '@adminjs/express';
 
-import * as AdminJSObjection from '../../src';
-import { ManagerResource, OfficeResource } from './resources';
+import * as AdminJSObjection from '../../src/index.js';
+import { ManagerResource, OfficeResource } from './resources/index.js';
 
 AdminJS.registerAdapter(AdminJSObjection);
 

diff --git a/example-app/src/models/index.ts b/example-app/src/models/index.ts
@@ -1,9 +1,9 @@
-import Knex from 'knex';
+import { knex as Knex } from 'knex';
 
-import knexConfig from '../knexfile';
-import Office from './office.entity';
-import Manager from './manager.entity';
-import { BaseModel } from '../base-model';
+import knexConfig from '../knexfile.js';
+import Office from './office.entity.js';
+import Manager from './manager.entity.js';
+import { BaseModel } from '../base-model.js';
 
 const knex = BaseModel.knex(Knex(knexConfig[process.env.NODE_ENV ?? 'development']));
 

diff --git a/example-app/src/models/manager.entity.ts b/example-app/src/models/manager.entity.ts
@@ -1,6 +1,5 @@
-import { BaseModel } from '../base-model';
-
-import Office from './office.entity';
+import { BaseModel } from '../base-model.js';
+import Office from './office.entity.js';
 
 class Manager extends BaseModel {
   id: number;

diff --git a/example-app/src/models/office.entity.ts b/example-app/src/models/office.entity.ts
@@ -1,6 +1,6 @@
-import { BaseModel } from '../base-model';
+import { BaseModel } from '../base-model.js';
 
-import Manager from './manager.entity';
+import Manager from './manager.entity.js';
 
 export interface OfficeAddress {
   street: string;

diff --git a/example-app/tsconfig.json b/example-app/tsconfig.json
@@ -1,9 +1,10 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es6",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "target": "esnext",
     "lib": [
-      "es2018",
+      "esnext",
       "DOM"
     ],
     "skipLibCheck": true,