diff --git a/dev-tools.sh b/dev-tools.sh index 29e57c1..714bca9 100755 --- a/dev-tools.sh +++ b/dev-tools.sh @@ -45,8 +45,7 @@ buildDandelion() npm install echo "Running Build" - npm run build:css - npm run build:js + npm run build echo "Removing dev directories" DEV_ITEMS=( diff --git a/package-lock.json b/package-lock.json index 684f879..e4b9736 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "Dandelion-Log", + "name": "dandelion-log", "version": "6.2.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 43a732b..2de7be4 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,10 @@ "uglify-js": "^3.2.2" }, "scripts": { + "build": "npm run build:js && npm run build:css", "build:js": "npm run build:tsc && npm run build:uglify", "build:tsc": "mkdir -p public/build/js && tsc --outDir public/build/js --sourceMap public/source/ts/*.ts public/source/ts/*.ts public/source/dts/*.ts", - "build:uglify": "for file in public/build/js/*.js; do uglifyjs -m -o public/dist/js/$(basename $file .js).min.js $file; done", + "build:uglify": "mkdir -p public/dist/js && for file in public/build/js/*.js; do uglifyjs -m -o public/dist/js/$(basename $file .js).min.js $file; done", "build:css": "npm run build:modern && npm run build:legacy", "build:modern": "for file in public/source/themes/modern/*.less; do lessc --clean-css $file public/dist/assets/themes/modern/$(basename $file .less).css; done", "build:legacy": "for file in public/source/themes/legacy/*.less; do lessc --clean-css $file public/dist/assets/themes/legacy/$(basename $file .less).css; done"