diff --git a/.nvmrc b/.nvmrc index 4e32c7b..dc3829f 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -5.10.1 +6.9.1 diff --git a/package.json b/package.json index 5aa5996..4d08fcf 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,9 @@ "version": "5.0.0", "description": " Source code for TheOrangeOne.net", "scripts": { - "create-build-dirs": "mkdir -p static/build/js/lib static/build/fonts static/build/css static/build/img", "build-js": "./scripts/build-js.sh", "build-scss": "./scripts/build-scss.sh", - "build": "npm run create-build-dirs && npm run build-scss && npm run build-js" + "build": "npm run build-scss && npm run build-js" }, "repository": { "type": "git", diff --git a/scripts/build b/scripts/build index 65113f4..e9fd4f5 100755 --- a/scripts/build +++ b/scripts/build @@ -26,6 +26,10 @@ export PATH=env/bin:${PATH} pip install -r requirements.txt npm install + +mkdir -p static/build/js/lib static/build/fonts static/build/css static/build/img +cp -R node_modules/font-awesome/fonts static/build/ + npm run build -honcho --app-root environment --env env run env/bin/python manage.py collectstatic --noinput +honcho --app-root environment --env env run env/bin/python3 manage.py collectstatic --noinput