Kaynağa Gözat

Deprecate Makefile as it seems to cause more confusion than anything else at this point

Kevin van Zonneveld 9 yıl önce
ebeveyn
işleme
21c2d7eeaf
4 değiştirilmiş dosya ile 6 ekleme ve 26 silme
  1. 1 1
      .travis.yml
  2. 0 21
      Makefile
  3. 3 2
      package.json
  4. 2 2
      website/src/guide/contributing.md

+ 1 - 1
.travis.yml

@@ -15,7 +15,7 @@ script:
 after_success:
   - git config --global user.name 'Uppy Bot'
   - git config --global user.email 'uppybot@uppyjs.io'
-  - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && make web-deploy ghpages_url=${GHPAGES_URL}
+  - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && npm run web:deploy
 
 env:
   global:

+ 0 - 21
Makefile

@@ -1,21 +0,0 @@
-SHELL := /usr/bin/env bash
-
-.PHONY: web-install
-web-install:
-	npm run web:install
-
-.PHONY: web-build
-web-build:
-	npm run web:build
-
-.PHONY: web-preview
-web-preview:
-	npm run web:preview
-
-.PHONY: web-deploy
-web-deploy:
-	npm run web:deploy
-
-.PHONY: watch
-watch:
-	npm run watch:examples

+ 3 - 2
package.json

@@ -17,10 +17,11 @@
     "watch:css": "nodemon -e src/scss -x \"npm run build:css\"",
     "watch:examples": "cd website && node watch.js",
     "watch:js": "nodemon --watch src -e js --ignore src/scss -x \"npm run build:lib\"",
+    "web": "npm run web:install && npm run web:build && npm run web:preview",
     "web:build": "cd website && node update.js && ./node_modules/.bin/hexo generate",
     "web:install": "cd website && npm install",
-    "web:deploy": "./bin/web-deploy",
-    "web:preview": "npm run web:build && cd website && ./node_modules/.bin/hexo server --debug"
+    "web:deploy": "npm run web:install && npm run web:build && ./bin/web-deploy",
+    "web:preview": "cd website && ./node_modules/.bin/hexo server --debug"
   },
   "repository": {
     "type": "git",

+ 2 - 2
website/src/guide/contributing.md

@@ -135,11 +135,11 @@ 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
-make web-preview
+npm run web
 ```
 
 This will start Hexo and rebuilds the site as you save. If you also want to work on examples / Uppy itself you then open a second tab in which you type:
 
 ```bash
-make watch
+npm run watch:examples
 ```