From 01e4e11ef7fd92a5f5afcddb4faf886aa1c72c2f Mon Sep 17 00:00:00 2001 From: Lasse Borly Date: Sun, 18 Sep 2016 03:51:20 +0200 Subject: [PATCH 1/4] got rid of the global dependence on gulp --- README.md | 7 +++---- package.json | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7ce76b9d9..d610f3752 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,8 @@ Create authentic looking D&D homebrews using only markdown. Check it out [here]( 1. Clone down the repo 1. In your terminal, head to the repo 1. Run `npm install` to get all the dependacies -2. Run `npm install -g gulp` to install the gulp build tool -1. Run `gulp fresh`, this will compile and build all the needed libraries (this only has to be done once, unless you add more libs) -1. Run `gulp` to run the project locally. Should be accessible at `localhost:8000` +1. Run `npm run build`, this will compile and build all the needed libraries (this only has to be done once, unless you add more libs) +1. Run `npm run watch` to run the project locally. Should be accessible at `localhost:8000` 2. Any changes to files within the proejct will be detected and the propject will automatically re-build **Notes:** If you'd like to create and edit homebrews, you'll need to have MongoDB installed and running. @@ -34,4 +33,4 @@ You can check out the changelog [here](https://github.com/stolksdorf/homebrewery ### license -This project licensed under [MIT](./license) \ No newline at end of file +This project licensed under [MIT](./license) diff --git a/package.json b/package.json index b00abd3d2..9d45fdc78 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,8 @@ "description": "Create authentic looking D&D homebrews using only markdown", "version": "2.3.0", "scripts": { + "build": "node_modules/.bin/gulp fresh", + "watch": "node_modules/.bin/gulp", "postinstall": "gulp prod", "start": "node server.js" }, From 9e54fe26d92d3ed6586c39a87af637caeb6bfb25 Mon Sep 17 00:00:00 2001 From: Lasse Borly Date: Sun, 18 Sep 2016 03:53:06 +0200 Subject: [PATCH 2/4] corrrecting small readme mistakes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d610f3752..97913774c 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ Create authentic looking D&D homebrews using only markdown. Check it out [here]( 1. Make sure you have [node](https://nodejs.org/en/) 1. Clone down the repo 1. In your terminal, head to the repo -1. Run `npm install` to get all the dependacies +1. Run `npm install` to get all the dependencies 1. Run `npm run build`, this will compile and build all the needed libraries (this only has to be done once, unless you add more libs) 1. Run `npm run watch` to run the project locally. Should be accessible at `localhost:8000` -2. Any changes to files within the proejct will be detected and the propject will automatically re-build +2. Any changes to files within the project will be detected and the project will automatically re-build **Notes:** If you'd like to create and edit homebrews, you'll need to have MongoDB installed and running. From 06902162220ad1e16ee6c5896a9b6273503ad238 Mon Sep 17 00:00:00 2001 From: Lasse Borly Date: Sun, 18 Sep 2016 03:55:51 +0200 Subject: [PATCH 3/4] Corrected the license --- README.md | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 97913774c..6c3180166 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ You can use [Docker](https://docs.docker.com) to get up and running with Natural 1. You may have to use `docker-machine env` to get the IP address of your docker instance -### changelog +### Changelog You can check out the changelog [here](https://github.com/stolksdorf/homebrewery/blob/master/changelog.md) -### license +### License -This project licensed under [MIT](./license) +This project is licensed under [MIT](./license) diff --git a/package.json b/package.json index 9d45fdc78..d74009846 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "start": "node server.js" }, "author": "stolksdorf", - "license": "BSD-2-Clause", + "license": "MIT", "dependencies": { "app-module-path": "^1.0.4", "basic-auth": "^1.0.3", From efddfd31ee3e18a85a07bae0435e06fde764bea7 Mon Sep 17 00:00:00 2001 From: Lasse Borly Date: Mon, 19 Sep 2016 23:10:56 +0200 Subject: [PATCH 4/4] added the required changes before merge --- README.md | 2 +- package.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6c3180166..38e3d9420 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Create authentic looking D&D homebrews using only markdown. Check it out [here]( 1. Clone down the repo 1. In your terminal, head to the repo 1. Run `npm install` to get all the dependencies -1. Run `npm run build`, this will compile and build all the needed libraries (this only has to be done once, unless you add more libs) +1. Run `npm run libs`, this will compile and build all the needed libraries (this only has to be done once, unless you add more libs) 1. Run `npm run watch` to run the project locally. Should be accessible at `localhost:8000` 2. Any changes to files within the project will be detected and the project will automatically re-build diff --git a/package.json b/package.json index d74009846..ce2c4821d 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,10 @@ "description": "Create authentic looking D&D homebrews using only markdown", "version": "2.3.0", "scripts": { - "build": "node_modules/.bin/gulp fresh", + "build": "node_modules/.bin/gulp prod", "watch": "node_modules/.bin/gulp", - "postinstall": "gulp prod", + "libs": "node_modules/.bin/gulp fresh", + "postinstall": "npm run build", "start": "node server.js" }, "author": "stolksdorf",