v5 (#18)

* chore: rewrite package to esmodules (#16)

BREAKING CHANGE: The package won't support CJS anymore.

* chore: use componentLoader instead of AdminJS.bundle

BREAKING CHANGE: Configuration changed due to AdminJS.bundle being removed, use componentLoader instead

Author: dziraf

.eslintrc.js renamed to .eslintrc.cjs

@@ -8,7 +8,7 @@ module.exports = {
     'plugin:react/recommended',
   ],
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 20,
     sourceType: 'module',
     ecmaFeatures: {
       jsx: true,
@@ -17,8 +17,8 @@ module.exports = {
   rules: {
     'prettier/prettier': 'error',
     'react/prop-types': 'off',
-    'semi': ['error', 'always'],
-    'quotes': ['error', 'single'],
+    semi: ['error', 'always'],
+    quotes: ['error', 'single'],
   },
   ignorePatterns: ['node_modules', 'lib'],
 };

.github/workflows/push.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Setup
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '18'
       - uses: actions/cache@v2
         id: yarn-cache
         with:

.gitignore

@@ -122,3 +122,4 @@ dist
 /lib
 /types
 example/.adminjs
+.nova

commitlint.config.js renamed to commitlint.config.cjs

@@ -0,0 +1,26 @@
+{
+  "moduleFileExtensions": ["js", "json", "ts", "tsx"],
+  "rootDir": "./test",
+  "testEnvironment": "node",
+  "testRegex": ".test.ts$",
+  "extensionsToTreatAsEsm": [".ts"],
+  "transformIgnorePatterns": ["node_modules"],
+  "transform": {
+    "^.+\\.(t|j)sx?$": [
+      "ts-jest",
+      { 
+        "useESM": true,
+        "tsconfig": "./tsconfig.test.json",
+        "isolatedModules": true
+      }
+    ]
+  },
+  "moduleNameMapper": {
+    "^(\\.{1,2}/.*)\\.js$": "$1"
+  },
+  "testTimeout": 10000,
+  "preset": "ts-jest/presets/default-esm",
+  "verbose": true,
+  "silent": true,
+  "forceExit": true
+}

jest.config.js

@@ -1,8 +1,13 @@
 {
   "name": "@adminjs/logger",
   "version": "4.0.1",
-  "main": "lib/index.js",
-  "types": "types/index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": "./lib/index.js",
+      "types": "./types/index.d.ts"
+    }
+  },
   "private": false,
   "repository": "[email protected]:SoftwareBrothers/adminjs-logger.git",
   "license": "MIT",
@@ -11,8 +16,8 @@
     "clean": "rimraf lib types",
     "build": "tsc",
     "dev": "tsc --watch",
-    "test": "jest",
-    "lint": "eslint -c '.eslintrc.js' './src/**/*'",
+    "test": "NODE_OPTIONS=--experimental-vm-modules dotenv -e .env -- jest --config ./jest.json --runInBand --detectOpenHandles",
+    "lint": "eslint -c '.eslintrc.cjs' './src/**/*'",
     "check:all": "yarn lint && yarn build && yarn test"
   },
   "husky": {
@@ -21,35 +26,34 @@
     }
   },
   "peerDependencies": {
-    "@adminjs/design-system": "^3.0.4",
-    "adminjs": "^6.4.1"
+    "adminjs": "^7.0.0"
   },
   "devDependencies": {
-    "@adminjs/design-system": "^3.0.4",
-    "@commitlint/cli": "^8.3.5",
-    "@commitlint/config-conventional": "^8.3.4",
-    "@semantic-release/git": "^9.0.0",
-    "@types/jest": "^26.0.14",
-    "@types/lodash": "^4.14.186",
-    "@typescript-eslint/eslint-plugin": "^5.16.0",
-    "@typescript-eslint/parser": "^5.16.0",
-    "adminjs": "^6.4.1",
-    "eslint": "^8.11.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.29.4",
+    "@commitlint/cli": "^17.4.4",
+    "@commitlint/config-conventional": "^17.4.4",
+    "@semantic-release/git": "^10.0.1",
+    "@types/jest": "^29.5.0",
+    "@types/lodash": "^4.14.191",
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
+    "@typescript-eslint/parser": "^5.56.0",
+    "adminjs": "^7.0.0",
+    "dotenv-cli": "^7.1.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.32.2",
     "husky": "^4.3.0",
-    "jest": "^26.5.3",
-    "prettier": "^2.0.5",
-    "rimraf": "^3.0.2",
-    "semantic-release": "^17.0.7",
-    "semantic-release-slack-bot": "^1.6.2",
-    "ts-jest": "^26.4.1",
+    "jest": "^29.5.0",
+    "prettier": "^2.8.6",
+    "rimraf": "^4.4.0",
+    "semantic-release": "^20.1.3",
+    "semantic-release-slack-bot": "^4.0.0",
+    "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
-    "lodash": "^4.17.20"
+    "lodash": "^4.17.21"
   }
 }

jest.json

@@ -1,15 +1,15 @@
-import React, { FC } from 'react';
-import { BasePropertyProps, flat } from 'adminjs';
 import {
   FormGroup,
   Label,
   Table as AdminTable,
-  TableCell,
   TableBody,
+  TableCell,
   TableHead,
   TableRow,
 } from '@adminjs/design-system';
-import styled from 'styled-components';
+import { BasePropertyProps, flat } from 'adminjs';
+import React, { FC } from 'react';
+import { styled } from 'styled-components';
 
 const Cell = styled(TableCell)`
   width: 100%;
@@ -44,9 +44,11 @@ const RecordDifference: FC<BasePropertyProps> = ({ record, property }) => {
       <Label>{property.label}</Label>
       <Table>
         <Head>
-          <Cell>Property name</Cell>
-          <Cell>Before</Cell>
-          <Cell>After</Cell>
+          <Row>
+            <Cell>Property name</Cell>
+            <Cell>Before</Cell>
+            <Cell>After</Cell>
+          </Row>
         </Head>
         <TableBody>
           {Object.entries(

package.json

@@ -1,8 +1,8 @@
-import React, { FC } from 'react';
-import { BasePropertyProps, ViewHelpers } from 'adminjs';
 import { FormGroup, Link } from '@adminjs/design-system';
+import { BasePropertyProps, ViewHelpers } from 'adminjs';
+import React, { FC } from 'react';
 
-import { getLogPropertyName } from '../utils/get-log-property-name';
+import { getLogPropertyName } from '../utils/get-log-property-name.js';
 
 const viewHelpers = new ViewHelpers();
 const RecordLink: FC<BasePropertyProps> = ({ record, property }) => {