diff --git a/package.json b/package.json index 99c4d4d82..0e98567a7 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "test:phantom": "zuul test/spec/upload.js --phantom", "test": "bin/test", "watch": "nodemon --watch src --ext scss,js -x \"npm run build && node website/update.js\"", + "watch:all": "parallelshell \"npm run watch\" \"npm run web\"", "watch:css": "nodemon --watch src --ext scss -x \"npm run build && node website/update.js\"", "watch:examples": "cd website && node build-examples.js watch", "watch:js": "nodemon --watch src --ext js -x \"npm run build && node website/update.js\"", @@ -57,6 +58,7 @@ "zuul": "^3.7.2" }, "dependencies": { + "parallelshell": "^2.0.0", "superagent": "^1.5.0", "tus-js-client": "^1.1.3" } diff --git a/website/_config.yml b/website/_config.yml index ab23323df..18982624f 100644 --- a/website/_config.yml +++ b/website/_config.yml @@ -5,9 +5,9 @@ # Uppy versions, auto updated by update.js uppy_version: 0.0.1 -uppy_dev_size: "78.96" -uppy_min_size: "78.96" -uppy_gz_size: "78.96" +uppy_dev_size: "80.27" +uppy_min_size: "80.27" +uppy_gz_size: "80.27" # Theme google_analytics: UA-63083-12 diff --git a/website/src/guide/contributing.md b/website/src/guide/contributing.md index 10411c919..0712b3d1b 100644 --- a/website/src/guide/contributing.md +++ b/website/src/guide/contributing.md @@ -31,23 +31,12 @@ It's recommended to exclude `./website/public/` from your editor if you want eff For local previews on http://127.0.0.1:4000 type: ```bash -npm run web +npm run watch:all ``` -If you want to work on Uppy itself, and see its changes reflected in the website, open a new tab and type: +This will watch the website, as well as Uppy, as the examples, and rebuild everything and refresh your browser as files change. -```bash -npm run watch -# Or if you're only interested in one of these: -npm run watch:js -npm run watch:css -``` - -For example, if you'd like to work on the Multipart Form example, - -Run: `npm run watch` and in new tab: `npm run web` - -Then: +Then, to work on e.g. the Multipart example, you'd edit the following files: ```bash atom src/core/Core.js \ @@ -57,7 +46,7 @@ atom src/core/Core.js \ website/src/examples/multipart/app.es6 ``` -And open +And open in your webbrowser. ## CSS Guidelines