Skip to content

Commit 381cd58

Browse files
author
hirsch88
committed
Merge branch 'develop' into feature/deps-upgrade
* develop: As nps isn't available before yarn install we can't yarn install in nps
2 parents 3aa3b20 + e43f940 commit 381cd58

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Create a new database with the name you have in your `.env`-file.
9696
Then setup your application environment.
9797

9898
```bash
99-
npm start setup
99+
npm run setup
100100
```
101101

102102
> This installs all dependencies with yarn. After that it migrates the database and seeds some test data into it. So after that your development environment is ready to use.

package-scripts.js

+7-11
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,16 @@ module.exports = {
2525
description: 'Serves the current app and watches for changes to restart it'
2626
},
2727
/**
28-
* Setup's the development environment and the database
28+
* Setup's stuff
2929
*/
3030
setup: {
31-
script: series(
32-
'yarn install',
33-
copy(
34-
'.env.example',
35-
'.env'
31+
db: {
32+
script: series(
33+
'nps db.migrate',
34+
'nps db.seed'
3635
),
37-
'nps config',
38-
'nps db.migrate',
39-
'nps db.seed'
40-
),
41-
description: 'Setup`s the development environment and the database'
36+
description: 'Setup`s the database by migrating and seeding'
37+
}
4238
},
4339
/**
4440
* Creates the needed configuration files

package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
"scripts": {
77
"start": "nps",
88
"test": "npm start test",
9-
"build": "npm start build"
9+
"build": "npm start build",
10+
"presetup": "yarn install",
11+
"setup": "npm start setup.db"
1012
},
1113
"engines": {
1214
"node": ">=8.0.0"

0 commit comments

Comments
 (0)