Merge pull request #89 from SoftwareBrothers/fix/fix-packagejson-main

fix: fix main entry in package.json and move beta -> master

Author: dziraf

.eslintrc.js

@@ -1,20 +1,12 @@
 module.exports = {
   env: {
-    browser: true,
     es2020: true,
   },
   extends: [
     'airbnb',
     'plugin:react/recommended',
     'plugin:@typescript-eslint/recommended',
   ],
-  ignorePatterns: [
-    '*/build/**/*',
-    '*.json',
-    '*.txt',
-    'yarn.lock',
-    '*.yaml',
-  ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     ecmaFeatures: {
@@ -23,38 +15,35 @@ module.exports = {
     ecmaVersion: 11,
     sourceType: 'module',
   },
-  plugins: [
-    'react',
-    '@typescript-eslint',
-  ],
+  plugins: ['react', '@typescript-eslint'],
   rules: {
-    semi: ['error', 'never'],
+    semi: ['error', 'always'],
     'no-unused-vars': 'off',
     'import/extensions': 'off',
     'import/no-unresolved': 'off',
     'react/jsx-filename-extension': 'off',
-    indent: [
-      'error',
-      2,
-    ],
+    indent: ['error', 2],
     'linebreak-style': ['error', 'unix'],
     'object-curly-newline': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
   },
-  overrides: [{
-    files: ['*.tsx'],
-    rules: {
-      'react/prop-types': 'off',
-      'react/jsx-props-no-spreading': 'off',
-      'import/no-extraneous-dependencies': 'off',
+  overrides: [
+    {
+      files: ['*.tsx'],
+      rules: {
+        'react/prop-types': 'off',
+        'react/jsx-props-no-spreading': 'off',
+        'import/no-extraneous-dependencies': 'off',
+      },
     },
-  }, {
-    files: ['./src/**/*.spec.ts', 'spec/*.ts'],
-    rules: {
-      'no-unused-expressions': 'off',
-      'prefer-arrow-callback': 'off',
-      'func-names': 'off',
-      'import/no-extraneous-dependencies': 'off',
+    {
+      files: ['./src/**/*.spec.ts', 'spec/*.ts'],
+      rules: {
+        'no-unused-expressions': 'off',
+        'prefer-arrow-callback': 'off',
+        'func-names': 'off',
+        'import/no-extraneous-dependencies': 'off',
+      },
     },
-  }],
-}
+  ],
+};

.github/workflows/push.yml

@@ -12,9 +12,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: '10.x'
+          node-version: '16.x'
       - uses: actions/cache@v1
         id: yarn-cache
         with:
@@ -45,9 +45,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: '10.x'
+          node-version: '16.x'
       - uses: actions/cache@v1
         id: yarn-cache
         with:

.gitignore

@@ -115,6 +115,5 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
-build
-types
+lib
 .vscode

.npmignore

@@ -2,4 +2,4 @@ example-app
 migrations
 models
 .github
-src
+./src/

index.d.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 /**
  * @module @adminjs/sequelize
  * @subcategory Adapters
@@ -79,7 +78,7 @@
  * @type {typeof BaseDatabase}
  * @static
  */
-const Database = require('./build/database').default
+import Database from './src/database';
 
 /**
  * Implementation of {@link BaseResource} for Sequelize Adapter
@@ -88,6 +87,11 @@ const Database = require('./build/database').default
  * @type {typeof BaseResource}
  * @static
  */
-const Resource = require('./build/resource').default
+import Resource from './src/resource';
 
-module.exports = { Database, Resource }
+export { default as Resource } from './src/resource';
+export { default as Database } from './src/database';
+
+module.exports = { Database, Resource };
+
+export default { Database, Resource };

index.js renamed to index.ts

@@ -2,8 +2,8 @@
   "name": "@adminjs/sequelize",
   "version": "2.0.0",
   "description": "Sequelize adapter for AdminJS",
-  "main": "build/index.js",
-  "types": "index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
@@ -35,28 +35,29 @@
     "@semantic-release/git": "^9.0.0",
     "@types/chai": "^4.2.12",
     "@types/mocha": "^8.0.3",
+    "@types/node": "^14.14.37",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
     "@typescript-eslint/eslint-plugin": "^3.7.0",
     "@typescript-eslint/parser": "^3.7.0",
     "adminjs": "^5.0.0",
-    "chai": "^4.2.0",
+    "chai": "^4.3.4",
     "eslint": "^7.5.0",
     "eslint-config-airbnb": "^18.2.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.20.3",
     "eslint-plugin-react-hooks": "^4.0.8",
     "husky": "^4.2.5",
-    "mocha": "^5.2.0",
+    "mocha": "^9.1.3",
     "nyc": "^12.0.2",
     "pg": "^7.7.1",
     "semantic-release": "^17.0.7",
     "semantic-release-slack-bot": "^1.6.2",
     "sequelize": ">4.42.0",
     "sequelize-cli": "^6.2.0",
-    "sinon": "^7.1.1",
-    "sinon-chai": "^3.3.0",
+    "sinon": "^12.0.1",
+    "sinon-chai": "^3.7.0",
     "ts-node": "^9.0.0",
     "typescript": "^4.0.2"
   },

package.json

@@ -1,48 +1,48 @@
-import Sequelize from 'sequelize'
+import Sequelize from 'sequelize';
 
-import chai, { expect } from 'chai'
-import sinonChai from 'sinon-chai'
+import chai, { expect } from 'chai';
+import sinonChai from 'sinon-chai';
 
-import Database from './database'
-import Resource from './resource'
-import db from '../models/index.js'
+import Database from './database';
+import Resource from './resource';
+import db from '../models/index.js';
 
-chai.use(sinonChai)
+chai.use(sinonChai);
 
-const config = require('../config/config')
+const config = require('../config/config');
 
 describe('Database', () => {
   before(function () {
-    this.sequelize = new (Sequelize as any)(config[process.env.NODE_ENV as string]) as any
+    this.sequelize = new (Sequelize as any)(config[process.env.NODE_ENV as string]) as any;
     this.sequelize.define('User', {
       firstName: Sequelize.STRING,
       lastName: Sequelize.STRING,
       email: Sequelize.STRING,
       arrayed: Sequelize.ARRAY(Sequelize.STRING),
-    }, {})
-  })
+    }, {});
+  });
 
   describe('.isAdapterFor', () => {
     it('returns true when user gives entire db object generated by cli', () => {
-      expect(Database.isAdapterFor(db)).to.equal(true)
-    })
+      expect(Database.isAdapterFor(db)).to.equal(true);
+    });
 
     it('returns true when user gives sequelize', function () {
-      expect(Database.isAdapterFor(this.sequelize)).to.equal(true)
-    })
-  })
+      expect(Database.isAdapterFor(this.sequelize)).to.equal(true);
+    });
+  });
 
   describe('#resources', () => {
     it('fetches all resources when entire db is given', () => {
-      const database = new Database(db)
-      expect(database.resources()).to.have.lengthOf(Object.keys(db.sequelize.models).length)
-      expect(database.resources()[0]).to.be.an.instanceof(Resource)
-    })
+      const database = new Database(db);
+      expect(database.resources()).to.have.lengthOf(Object.keys(db.sequelize.models).length);
+      expect(database.resources()[0]).to.be.an.instanceof(Resource);
+    });
 
     it('fetches all resources when user gives sequelize', function () {
-      const database = new Database(this.sequelize)
-      expect(database.resources()).to.have.lengthOf(1)
-      expect(database.resources()[0]).to.be.an.instanceof(Resource)
-    })
-  })
-})
+      const database = new Database(this.sequelize);
+      expect(database.resources()).to.have.lengthOf(1);
+      expect(database.resources()[0]).to.be.an.instanceof(Resource);
+    });
+  });
+});

src/database.spec.ts

@@ -1,27 +1,27 @@
-import { BaseDatabase, BaseResource } from 'adminjs'
-import { Sequelize } from 'sequelize'
+import { BaseDatabase, BaseResource } from 'adminjs';
+import { Sequelize } from 'sequelize';
 
-import Resource from './resource'
+import Resource from './resource';
 
 class Database extends BaseDatabase {
   private sequelize: Sequelize
 
   static isAdapterFor(database: any): boolean {
     return (database.sequelize
             && database.sequelize.constructor.name === 'Sequelize')
-           || database.constructor.name === 'Sequelize'
+           || database.constructor.name === 'Sequelize';
   }
 
   constructor(database: any) {
-    super(database)
-    this.sequelize = database.sequelize || database
+    super(database);
+    this.sequelize = database.sequelize || database;
   }
 
   resources(): Array<BaseResource> {
     return Object.keys(this.sequelize.models).map((key) => (
       new Resource(this.sequelize.models[key])
-    ))
+    ));
   }
 }
 
-export default Database
+export default Database;