chore: bump admin version and unify scripts

package.json scripts are now the same as in other packages
- yarn dev, yarn clean

Author: wojtek-krysiak

.env-example

@@ -0,0 +1,5 @@
+POSTGRES_USER="adminbro"
+POSTGRES_PASSWORD="adminbro"
+POSTGRES_DATABASE="adminbro-typeorm-app"
+POSTGRES_PORT=5432
+POSTGRES_HOST="localhost"

README.md

@@ -129,14 +129,14 @@ Optionally you might want to link your local version of `admin-bro` package
 (in the root folder)
 
 ```
-yarn watch
+yarn dev
 ```
 
 6. run the app in the dev mode
 
 ```
 cd example-app
-yarn start:dev
+yarn dev
 ```
 
 ### Pull request

example-app/.env-example

@@ -0,0 +1,5 @@
+POSTGRES_USER="adminbro"
+POSTGRES_PASSWORD="adminbro"
+POSTGRES_DATABASE="adminbro-typeorm-app"
+POSTGRES_PORT=5432
+POSTGRES_HOST="localhost"

example-app/ormconfig.js

@@ -14,7 +14,7 @@ module.exports = {
   migrations: [path.join(rootDir, '/migration/**/*.js')],
   subscribers: [path.join(rootDir, '/subscriber/**/*.js')],
   synchronize: true,
-  logging: false,
+  logging: true,
   cli: {
     migrationsDir: path.join(rootDir, '/migration'),
     entitiesDir: path.join(rootDir, '/entity'),

example-app/package.json

@@ -6,7 +6,7 @@
    "scripts": {
       "build": "tsc",
       "start": "node build/src/index.js",
-      "start:dev": "yarn build && concurrently \"yarn build --watch\" \"nodemon --ext '.js' --watch ../lib --watch ./build --ignore 'cypress/**/*.js' node build/src/index.js\"",
+      "dev": "yarn build && concurrently \"yarn build --watch\" \"nodemon --ext '.js' --watch ../lib --watch ./build --ignore 'cypress/**/*.js' node build/src/index.js\"",
       "cypress:open": "cypress open",
       "cypress:run": "cypress run"
    },
@@ -20,14 +20,15 @@
       "typescript": "3.9.7"
    },
    "dependencies": {
-      "admin-bro": "^3.1.1",
+      "@admin-bro/design-system": "^1.7.0-beta.17",
+      "admin-bro": "^3.3.0-beta.16",
       "@admin-bro/express": "^3.0.0",
       "@admin-bro/typeorm": "^1.0.1",
       "express": "^4.17.1",
       "express-formidable": "^1.2.0",
       "express-session": "^1.17.1",
       "pg": "^8.3.0",
       "reflect-metadata": "^0.1.10",
-      "typeorm": "0.2.25"
+      "typeorm": "0.2.28"
    }
 }

example-app/yarn.lock

@@ -13,8 +13,9 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
+    "clean": "rm -fR lib",
     "build": "tsc",
-    "watch": "tsc -w",
+    "dev": "yarn clean && tsc -w",
     "test": "mocha -r ts-node/register ./spec/**/*.spec.ts",
     "ts-node": "ts-node",
     "lint": "eslint './src/**/*.{ts,js}' './spec/**/*.{ts,js}' './example-app/**/*.{ts,js}' --ignore-pattern 'build' --ignore-pattern 'yarn.lock'",
@@ -35,14 +36,14 @@
   "license": "MIT",
   "peerDependencies": {
     "admin-bro": "^3.1.1",
-    "typeorm": ">=0.2.1"
+    "typeorm": ">=0.2.28"
   },
   "optionalDependencies": {},
   "devDependencies": {
     "@types/chai": "^4.2.4",
     "@types/mocha": "^5.2.7",
     "@types/node": "12.0.10",
-    "admin-bro": "^3.1.1",
+    "admin-bro": "^3.3.0-beta.16",
     "chai": "^4.2.0",
     "class-validator": "^0.11.0",
     "mocha": "^6.2.2",
@@ -57,8 +58,8 @@
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.20.3",
     "eslint-plugin-react-hooks": "^4.0.8",
-    "typeorm": "^0.2.1",
-    "typescript": "^3.6.3",
+    "typeorm": "^0.2.28",
+    "typescript": "^4.0.3",
     "semantic-release": "^17.0.7",
     "@semantic-release/git": "^9.0.0",
     "semantic-release-slack-bot": "^1.6.2",

package.json

@@ -14,7 +14,12 @@
     "declarationDir": "./lib",
     "outDir": "./lib",
     "emitDecoratorMetadata": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "baseUrl": ".",
+    "paths": {
+      "react": ["node_modules/@types/react"],
+      "styled-components": ["node_modules/@types/styled-components"]
+    }
   },
   "include": [
     "./src/**/*.ts"