@torch2424 work on the new deployment workflow

avivace · avivace · commit df0953115368 · 2018-12-02T13:13:50.000+01:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# front
+# Gbdev Landing Page
 
-Source repository of the gbdev landing website. GitHub pages hosts the contents of the folder `docs/` (where we put the webpack build) on `gbdev.github.io/front`. `gbdev.github.io` redirects to `gbdev.github.io/front`.
+Source repository of the gbdev landing website. GitHub pages hosts the contents of the `master` branch which is then hoster on `gbdev.github.io`. Development is done on the `dev` branch due to Github's resctrition on branches for user pages.
 
 Tools:
 
@@ -18,13 +18,25 @@ npm install
 npm run dev
 ```
 
-To build:
+To build production:
 
 ```bash
 # Run the webpack production build
 npm run build-prod
-# Move the result into the docs folder, so GitHub pages will see it
-mv dist/ docs/
 ```
 
+To serve a production copy:
+
+```bash
+# Run the webpack production build, then serve on a local http-server with gzip on http://localhost:8080
+npm run serve-prod
+```
+
+To deploy onto the master branch:
+```bash
+# Run the webpack production build, then place dist/ folder on the master branch
+npm run deploy
+```
+
+
 Webpack config was written from zero, so it still misses a lot of things.
diff --git a/package.json b/package.json
@@ -7,20 +7,33 @@
   "author": "Antonio Vivace <avivace4@gmail.com>",
   "license": "ISC",
   "scripts": {
-    "clean": "rm dist/bundle.js",
-    "build-dev": "webpack -d --mode development",
-    "build-prod": "webpack -p --mode production",
-    "dev": "webpack-dev-server"
+    "start": "npm run dev",
+    "dev": "webpack-dev-server",
+    "clean": "npx rimraf dist/*",
+    "build-dev": "npx run-s clean build-copy-index build-dev-webpack",
+    "build-prod": "npx run-s clean build-copy-index build-prod-webpack",
+    "build-dev-webpack": "webpack -d --mode development",
+    "build-prod-webpack": "webpack -p --mode production",
+    "build-copy-index": "npx copyfiles index.html dist/",
+    "serve-prod": "npx run-s build-prod serve-prod-server",
+    "serve-prod-server": "npx ws -p 8080 -d dist -z",
+    "deploy": "npx run-s build-prod deploy-gh-pages",
+    "deploy-gh-pages": "npx gh-pages -d dist -b master"
   },
   "dependencies": {
     "typeface-cabin": "0.0.54"
   },
   "devDependencies": {
     "bulma": "^0.7.2",
+    "copyfiles": "^2.1.0",
     "css-loader": "^1.0.1",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^2.0.0",
+    "gh-pages": "^2.0.1",
+    "local-web-server": "^2.6.0",
     "node-sass": "^4.10.0",
+    "npm-run-all": "^4.1.5",
+    "rimraf": "^2.6.2",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
     "stylus": "^0.54.5",
