Merge 4197c26a36 into a11eaff97e

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-on: [push, pull_request]
+on: [pull_request]
 
 name: CI
 
@@ -30,19 +30,43 @@ jobs:
         --volume="${{ github.workspace }}:/srv/jekyll" \
         jekyll/builder:3.8.5 /bin/bash -c "gem install bundler && chmod -R 777 /srv/jekyll && jekyll build && bundle exec just-the-docs rake search:init"
 
-  css:
+  assets:
-    name: Stylelint
+    name: Format and test CSS and JS
     runs-on: ubuntu-latest
+
     steps:
-    
+    - uses: actions/checkout@v2
-    - uses: actions/checkout@master
+      # Using this so the this instead of GITHUB_TOKEN so that this workflow can trigger another
-
+      with:
-    - name: Use Node.js 10.x
+        token: ${{ secrets.PAT }} 
+    - name: Use Node.js 12.x
       uses: actions/setup-node@v1
       with:
-        version: 10.x
+        node-version: '12.x'
+    - name: Extract branch name
+      shell: bash
+      run: echo "##[set-output name=branch;]$(echo ${GITHUB_HEAD_REF#refs/heads/})"
+      id: extract_branch
 
-    - name: npm install, build, and test
+    - run: npm install
+    - run: npm run format
+    - name: Add changed files
       run: |
-        npm install
+        echo "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git"
-        npm test
+        git config --global user.email $GITHUB_ACTOR@users.noreply.github.com
+        git config --global user.name $GITHUB_ACTOR
+        echo "extracted branch is ${{ steps.extract_branch.outputs.branch }}"
+        git checkout -b ${{ steps.extract_branch.outputs.branch }}
+        git status
+        git add .
+    - name: Are there any updates?
+      shell: bash
+      run: echo "##[set-output name=status]$(git status -s)"
+      id: is_dirty
+    - name: Commit files
+      if: steps.is_dirty.outputs.status
+      run: |
+        echo ${{ steps.is_dirty.outputs.status }}
+        git commit -m "🎨 Prettier"
+        git push --force --set-upstream "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" ${{ steps.extract_branch.outputs.branch }}
+    - run: npm test

.prettierignore

@@ -0,0 +1,8 @@
+package.json
+package-lock.json
+_site
+assets/css/dark-mode-preview.scss
+assets/css/just-the-docs.scss
+assets/js/vendor/lunr.min.js
+assets/js/search-data.json
+assets/js/just-the-docs.js

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "endOfLine": "lf",
+  "semi": false,
+  "singleQuote": false,
+  "tabWidth": 2,
+  "trailingComma": "es5"
+}

.stylelintrc.json

@@ -5,6 +5,11 @@
     "_sass/vendor/**/*.scss"
   ],
   "extends": [
+    "stylelint-prettier/recommended",
     "stylelint-config-primer"
-  ]
+  ],
+  "plugins": ["stylelint-prettier"],
+  "rules": {
+    "prettier/prettier": true
+  }
 }

package.json

@@ -6,14 +6,17 @@
   "license": "MIT",
   "bugs": "https://github.com/pmarsceill/just-the-docs/issues",
   "devDependencies": {
-    "stylelint": "^10.0.1",
+    "@primer/css": "^14.3.0",
+    "prettier": "^2.0.5",
+    "stylelint": "^13.3.3",
+    "stylelint-config-prettier": "^8.0.1",
     "stylelint-config-primer": "^9.0.0",
+    "stylelint-prettier": "^1.1.2",
     "stylelint-selector-no-utility": "^4.0.0"
   },
-  "dependencies": {
-    "@primer/css": "^14.3.0"
-  },
   "scripts": {
-    "test": "stylelint '**/*.scss'"
+    "test": "stylelint '**/*.scss'",
-  }
+    "format": "prettier --write '**/*.{scss,js,json}'"
+  },
+  "dependencies": {}
 }