From dbd5a02617a19f501a6494e6f5179a73bee3f069 Mon Sep 17 00:00:00 2001
From: Vivianne Langdon <puttabutta@gmail.com>
Date: Wed, 16 Mar 2022 23:56:19 -0700
Subject: [PATCH] specify npm prefix and stylelint configs and adjust ignores

---
 bw-dev                     | 18 ++++++++++--------
 dev-tools/.stylelintignore |  1 +
 dev-tools/.stylelintrc.js  |  2 +-
 dev-tools/Dockerfile       |  7 ++++---
 dev-tools/package.json     |  1 +
 docker-compose.yml         |  1 +
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/bw-dev b/bw-dev
index b610758fe..6b1d52255 100755
--- a/bw-dev
+++ b/bw-dev
@@ -139,19 +139,21 @@ case "$CMD" in
         docker-compose run --rm dev-tools black celerywyrm bookwyrm
         ;;
     prettier)
-        docker-compose run --rm dev-tools npx prettier --write bookwyrm/static/js/*.js
+        docker-compose run --rm dev-tools npm exec --prefix=dev-tools/ -- prettier \
+            --write bookwyrm/static/js/*.js
         ;;
     stylelint)
-        docker-compose run --rm dev-tools npx stylelint \
-            bookwyrm/static/css/bookwyrm.scss bookwyrm/static/css/bookwyrm/**/*.scss --fix \
-            --config dev-tools/.stylelintrc.js
+        docker-compose run --rm dev-tools npm exec --prefix=dev-tools/ -- stylelint \
+            --fix --config=dev-tools/.stylelintrc.js --ignore-path=dev-tools/.stylelintignore \
+            bookwyrm/static/css
         ;;
     formatters)
         docker-compose run --rm dev-tools black celerywyrm bookwyrm
-        docker-compose run --rm dev-tools npx prettier --write bookwyrm/static/js/*.js
-        docker-compose run --rm dev-tools npx stylelint \
-            bookwyrm/static/css/bookwyrm.scss bookwyrm/static/css/bookwyrm/**/*.scss --fix \
-            --config dev-tools/.stylelintrc.js
+        docker-compose run --rm dev-tools npm exec --prefix=dev-tools/ -- prettier \
+            --write bookwyrm/static/js/*.js
+        docker-compose run --rm dev-tools npm exec --prefix=dev-tools/ -- stylelint \
+            --fix --config=dev-tools/.stylelintrc.js --ignore-path=dev-tools/.stylelintignore \
+            bookwyrm/static/css
         ;;
     compilescss)
         runweb python manage.py compilescss
diff --git a/dev-tools/.stylelintignore b/dev-tools/.stylelintignore
index b2cd33f89..441f5eb72 100644
--- a/dev-tools/.stylelintignore
+++ b/dev-tools/.stylelintignore
@@ -1 +1,2 @@
 **/vendor/**
+**/fonts/**
diff --git a/dev-tools/.stylelintrc.js b/dev-tools/.stylelintrc.js
index 7ab51b9b3..ba9c50e96 100644
--- a/dev-tools/.stylelintrc.js
+++ b/dev-tools/.stylelintrc.js
@@ -1,7 +1,7 @@
 /* global module */
 
 module.exports = {
-    "extends": "stylelint-config-standard",
+    "extends": "stylelint-config-standard-scss",
 
     "plugins": [
         "stylelint-order"
diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile
index c207a60d0..9e3ddc324 100644
--- a/dev-tools/Dockerfile
+++ b/dev-tools/Dockerfile
@@ -2,13 +2,14 @@ FROM python:3.9
 
 ENV PYTHONUNBUFFERED 1
 
-RUN mkdir /app
-WORKDIR /app
+WORKDIR /app/dev-tools
 
-COPY package.json requirements.txt .stylelintrc.js .stylelintignore /app/
+COPY package.json requirements.txt .stylelintrc.js .stylelintignore /app/dev-tools/
 RUN pip install -r requirements.txt
 
 RUN apt-get update && apt-get install -y curl
 RUN curl -sL https://deb.nodesource.com/setup_17.x | bash -
 RUN apt-get install -y nodejs && apt-get clean
 RUN npm install .
+
+WORKDIR /app
diff --git a/dev-tools/package.json b/dev-tools/package.json
index 3fbc940cb..f7b996b77 100644
--- a/dev-tools/package.json
+++ b/dev-tools/package.json
@@ -11,6 +11,7 @@
     "stylelint-config-recommended": "^7.0.0",
     "stylelint-config-standard": "^25.0.0",
     "stylelint-order": "^5.0.0",
+    "stylelint-config-standard-scss": "^3.0.0",
     "watch": "^0.13.0"
   },
   "dependencies": {
diff --git a/docker-compose.yml b/docker-compose.yml
index e45cae0d1..f8e0e3ad7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,6 +101,7 @@ services:
     build: dev-tools
     env_file: .env
     volumes:
+      - /app/dev-tools/
       - .:/app
 volumes:
   pgdata: