From 9a8de7db803c975e1ec6c80fe01d21a44e007595 Mon Sep 17 00:00:00 2001 From: rejas Date: Sat, 11 Sep 2021 11:16:09 +0200 Subject: [PATCH] Run prettier again --- .github/FUNDING.yml | 2 +- .github/ISSUE_TEMPLATE.md | 1 + .github/PULL_REQUEST_TEMPLATE.md | 23 +++++++-------- .github/workflows/codecov-test-suites.yml | 4 +-- .github/workflows/enforce-changelog.yml | 12 ++++---- .github/workflows/node-ci.js.yml | 34 ++++++++++----------- vendor/css/font-awesome.css | 2 +- vendor/package.json | 36 +++++++++++------------ 8 files changed, 56 insertions(+), 58 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index e31c82eb..933a40f7 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ github: MichMich -custom: ['https://magicmirror.builders/#donate'] \ No newline at end of file +custom: ["https://magicmirror.builders/#donate"] diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d343534a..fd922dad 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -20,6 +20,7 @@ If you are facing an issue or found a bug while trying to install MagicMirror vi ## I found a bug in the MagicMirror Docker image If you are facing an issue or found a bug while running MagicMirror inside a Docker container please create an issue in the corresponding repository: + - karsten13/magicmirror: [https://gitlab.com/khassel/magicmirror](https://gitlab.com/khassel/magicmirror) - (deprecated) bastilimbach/docker-magicmirror: [https://github.com/bastilimbach/docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index bbb09f36..b1d5833f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,23 +2,20 @@ Hello and thank you for wanting to contribute to the MagicMirror project **Please make sure that you have followed these 4 rules before submitting your Pull Request:** -> 1) Base your pull requests against the `develop` branch. +> 1. Base your pull requests against the `develop` branch. > +> 2. Include these infos in the description: > -> 2) Include these infos in the description: -> * Does the pull request solve a **related** issue? -> * If so, can you reference the issue like this `Fixes #`? -> * What does the pull request accomplish? Use a list if needed. -> * If it includes major visual changes please add screenshots. +> - Does the pull request solve a **related** issue? +> - If so, can you reference the issue like this `Fixes #`? +> - What does the pull request accomplish? Use a list if needed. +> - If it includes major visual changes please add screenshots. > +> 3. Please run `npm run lint:prettier` before submitting so that +> style issues are fixed. > -> 3) Please run `npm run lint:prettier` before submitting so that -> style issues are fixed. -> -> -> 4) Don't forget to add an entry about your changes to -> the CHANGELOG.md file. - +> 4. Don't forget to add an entry about your changes to +> the CHANGELOG.md file. **Note**: Sometimes the development moves very fast. It is highly recommended that you update your branch of `develop` before creating a diff --git a/.github/workflows/codecov-test-suites.yml b/.github/workflows/codecov-test-suites.yml index 1a6d4e0e..88b7574d 100644 --- a/.github/workflows/codecov-test-suites.yml +++ b/.github/workflows/codecov-test-suites.yml @@ -4,9 +4,9 @@ name: "Run Codecov Tests" on: push: - branches: [ master, develop ] + branches: [master, develop] pull_request: - branches: [ master, develop ] + branches: [master, develop] jobs: run-and-upload-coverage-report: diff --git a/.github/workflows/enforce-changelog.yml b/.github/workflows/enforce-changelog.yml index d4a5a994..a4f5d246 100644 --- a/.github/workflows/enforce-changelog.yml +++ b/.github/workflows/enforce-changelog.yml @@ -4,15 +4,15 @@ name: "Enforce Changelog" on: pull_request: - types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled] + types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled] jobs: check: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v2 - - uses: dangoslen/changelog-enforcer@v1.6.1 - with: - changeLogPath: 'CHANGELOG.md' - skipLabels: 'Skip Changelog' + - uses: actions/checkout@v2 + - uses: dangoslen/changelog-enforcer@v1.6.1 + with: + changeLogPath: "CHANGELOG.md" + skipLabels: "Skip Changelog" diff --git a/.github/workflows/node-ci.js.yml b/.github/workflows/node-ci.js.yml index 2a8fa086..55767496 100644 --- a/.github/workflows/node-ci.js.yml +++ b/.github/workflows/node-ci.js.yml @@ -5,9 +5,9 @@ name: "Run Automated Tests" on: push: - branches: [ master, develop ] + branches: [master, develop] pull_request: - branches: [ master, develop ] + branches: [master, develop] jobs: test: @@ -17,18 +17,18 @@ jobs: matrix: node-version: [12.x, 14.x, 16.8] steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: | - node -v - Xvfb :99 -screen 0 1024x768x16 & - export DISPLAY=:99 - npm install - npm run test:prettier - npm run test:js - npm run test:css - npm run test:unit - npm run test:e2e + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: | + node -v + Xvfb :99 -screen 0 1024x768x16 & + export DISPLAY=:99 + npm install + npm run test:prettier + npm run test:js + npm run test:css + npm run test:unit + npm run test:e2e diff --git a/vendor/css/font-awesome.css b/vendor/css/font-awesome.css index 2ba4a708..0c52aa67 100644 --- a/vendor/css/font-awesome.css +++ b/vendor/css/font-awesome.css @@ -1,2 +1,2 @@ @import url("../node_modules/@fortawesome/fontawesome-free/css/all.min.css"); -@import url("../node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css"); \ No newline at end of file +@import url("../node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css"); diff --git a/vendor/package.json b/vendor/package.json index 570d33d7..3b0c802b 100755 --- a/vendor/package.json +++ b/vendor/package.json @@ -1,20 +1,20 @@ { - "name": "magicmirror-vendors", - "description": "Package for vendors use by MagicMirror Core.", - "repository": { - "type": "git", - "url": "git+https://github.com/MichMich/MagicMirror.git" - }, - "license": "MIT", - "bugs": { - "url": "https://github.com/MichMich/MagicMirror/issues" - }, - "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.4", - "moment": "^2.29.1", - "moment-timezone": "^0.5.33", - "nunjucks": "^3.2.3", - "suncalc": "^1.8.0", - "weathericons": "^2.1.0" - } + "name": "magicmirror-vendors", + "description": "Package for vendors use by MagicMirror Core.", + "repository": { + "type": "git", + "url": "git+https://github.com/MichMich/MagicMirror.git" + }, + "license": "MIT", + "bugs": { + "url": "https://github.com/MichMich/MagicMirror/issues" + }, + "dependencies": { + "@fortawesome/fontawesome-free": "^5.15.4", + "moment": "^2.29.1", + "moment-timezone": "^0.5.33", + "nunjucks": "^3.2.3", + "suncalc": "^1.8.0", + "weathericons": "^2.1.0" + } }