From 61f07e9ec3110dda83655b7e89e9ea3278522f80 Mon Sep 17 00:00:00 2001
From: Adam T Carpenter <atc@53hor.net>
Date: Fri, 28 Feb 2020 16:52:55 -0500
Subject: updated npm scripts

---
 package.json | 43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 1120c0b..82dca4a 100644
--- a/package.json
+++ b/package.json
@@ -1,50 +1,35 @@
 {
 	"name": "carpentertutoring-com",
 	"version": "1.0.0",
-	"description": "Carpenter Tutoring Site",
+	"description": "Carpenter Tutoring Web Site",
 	"main": "src/index.html",
 	"author": "Adam Carpenter",
-	"license": "MIT",
+	"license": "BSD-3-Clause",
 	"dependencies": {},
 	"devDependencies": {
+		"browser-sync": "^2.26.7",
 		"bulma": "^0.8.0",
 		"node-sass": "^4.13.1",
-		"parallelshell": "^3.0.2",
-		"onchange": "^6.1.0",
-		"browser-sync": "^2.26.7"
+		"npm-run-all": "^4.1.5",
+		"onchange": "^6.1.0"
 	},
 	"scripts": {
-		"//": "Lifted from https://gist.github.com/adamreisnz/9edf1f48e19c104b81f8102a27de0940",
-		"//": "General",
-		"start": "parallelshell 'npm run serve' 'npm run watch'",
-
-		"//": "CSS",
-		"css:dev": "node-sass src/scss/index.scss dist/index.css",
-
-		"//": "JS",
+		"start": "run-p serve watch",
+		"css:dev": "node-sass src/scss/index.scss dist/css/index.css",
 		"js:dev": "cp -r src/js dist/js",
-
-		"//": "Build (Generic)",
 		"clean": "rm -rf dist/",
 		"mkdirs": "mkdir -p dist/js && mkdir -p dist/css",
 		"copy:assets": "cp -r src/assets/* dist/",
 		"copy:html": "cp -r src/html/* dist/",
 		"copy": "npm run copy:assets && npm run copy:html",
-
-		"//": "Build (Development)",
 		"prebuild:dev": "npm run clean && npm run mkdirs && npm run copy",
 		"build:dev": "npm run css:dev && npm run js:dev",
-
-		"//": "Serve",
-		"kill": "lsof -n -i:8080 | grep LISTEN | awk '{print $2}' | xargs kill -9",
-		"preserve": "npm run build:dev && npm run kill",
-		"serve": "browser-sync start -s --files 'dist/**/*.(js|css|html)' --ss 'dist' --port 8080 --reload-debounce 500",
-
-		"//": "Watch",
-		"watch:assets": "onchange 'src/assets/**/*' -- npm run copy:assets",
-		"watch:html": "onchange 'src/**/*.html' -- npm run copy:html",
-		"watch:css": "onchange 'src/**/*.scss' -- npm run css:dev",
-		"watch:js": "onchange 'src/**/*.js' -- npm run js:dev",
-		"watch": "parallelshell 'npm run watch:css' 'npm run watch:js' 'npm run watch:html' 'npm run watch:assets'"
+		"preserve": "npm run build:dev",
+		"serve": "browser-sync start -s --no-open --files 'dist/**/*' --ss 'dist' --port 8080 --reload-debounce 500",
+		"watch:assets": "onchange -p 100 'src/assets/**/*' -- npm run copy:assets",
+		"watch:html": "onchange -p 100 'src/html/**/*' -- npm run copy:html",
+		"watch:css": "onchange -p 100 'src/scss/**/*' -- npm run css:dev",
+		"watch:js": "onchange -p 100 'src/js/**/*' -- npm run js:dev",
+		"watch": "run-p watch:css watch:js watch:html watch:assets"
 	}
 }
-- 
cgit v1.2.3