diff --git a/.dockerignore b/.dockerignore index 3afb46f5e..15d28256c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ -node_modules +node_modules/ .env packages/app/.env diff --git a/.editorconfig b/.editorconfig index 94b2b75e9..b603b5c36 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,19 +1,10 @@ # EditorConfig is awesome: http://EditorConfig.org -# top-most EditorConfig file root = true -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true - -# Matches multiple files with brace expansion notation -# Set default charset [*] charset = utf-8 - -# Indentation override for all JS under lib directory -[*.{js,ts,json}] +end_of_line = lf +insert_final_newline = true indent_style = space indent_size = 2 diff --git a/.eslintrc b/.eslintrc index 27846dfbe..3f30d0680 100644 --- a/.eslintrc +++ b/.eslintrc @@ -10,8 +10,5 @@ "parserOptions": { "ecmaVersion": 2018, "sourceType": "module" - }, - "rules": { - // "quotes": ["error", "single"] } } \ No newline at end of file diff --git a/lerna.json b/lerna.json index 0c4b9e089..79dfc4aad 100644 --- a/lerna.json +++ b/lerna.json @@ -10,7 +10,7 @@ ] }, "publish": { - "allowBranch": ["master", "develop"], + "allowBranch": "master", "ignoreChanges": [ "*.md" ] diff --git a/nodemon.json b/nodemon.json deleted file mode 100644 index 5b0d1b9a8..000000000 --- a/nodemon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "watch": ["packages", ".env"], - "ext": "ts", - "exec": "ts-node ./packages/server/example/index.ts" -} \ No newline at end of file diff --git a/package.json b/package.json index 414129944..633548794 100644 --- a/package.json +++ b/package.json @@ -3,12 +3,11 @@ "private": true, "scripts": { "start": "cd packages/app && npm start", - "db-migrate": "cd packages/app && npm run db-migrate", - "start:app:server": "cd packages/app && nodemon", - "start-server": "yarn nodemon", + "start-server": "cd packages/app && nodemon", "bootstrap": "lerna bootstrap --no-ci", "build": "father-build", "clean": "lerna clean", + "db-migrate": "cd packages/app && npm run db-migrate", "db:start": "docker-compose up -d", "lint": "eslint --ext .ts,.tsx,.js \"packages/*/src/**.@(ts|tsx|js)\" --fix", "test": "npm run lint && jest", diff --git a/tsconfig.json b/tsconfig.json index 27c79c11e..0f9d501d4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,6 +10,7 @@ "resolveJsonModule": true, "esModuleInterop": true, "sourceMap": true, + "removeComments": false, "baseUrl": "./", "paths": { }