Merge pull request #126 from thorgate/bump-deps

Bump all dependency versions

.github/release-drafter.yml

@@ -1,31 +1,31 @@
 name-template: 'Version $RESOLVED_VERSION 🌈'
 tag-template: 'v$RESOLVED_VERSION'
 categories:
-  - title: '🚀 Features'
-    labels:
-      - 'feature'
-      - 'enhancement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-  - title: '🧰 Maintenance'
-    labels:
-      - 'chore'
-      - 'dependencies'
+    - title: '🚀 Features'
+      labels:
+          - 'feature'
+          - 'enhancement'
+    - title: '🐛 Bug Fixes'
+      labels:
+          - 'fix'
+          - 'bugfix'
+          - 'bug'
+    - title: '🧰 Maintenance'
+      labels:
+          - 'chore'
+          - 'dependencies'
 version-resolver:
-  major:
-    labels:
-      - 'major'
-  minor:
-    labels:
-      - 'minor'
-  patch:
-    labels:
-      - 'patch'
-  default: patch
+    major:
+        labels:
+            - 'major'
+    minor:
+        labels:
+            - 'minor'
+    patch:
+        labels:
+            - 'patch'
+    default: patch
 template: |
-  ## Changes
+    ## Changes
 
-  $CHANGES
+    $CHANGES

.github/workflows/release-drafter.yml

@@ -1,14 +1,14 @@
 name: Release Drafter
 
 on:
-  push:
-    branches:
-      - master
+    push:
+        branches:
+            - master
 
 jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    update_release_draft:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/run-tests.yml

@@ -1,39 +1,40 @@
 name: Tests
 
 on:
-  - push
-  - pull_request
+    - push
+    - pull_request
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/master')
-    strategy:
-      matrix:
-        node: [12, 14, 16]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-node-${{ matrix.node }}-modules-${{ hashFiles('**/yarn.lock') }}
-      - name: Install deps
-        run: |
-          yarn
-          yarn bootstrap
-      - name: Build package
-        run: yarn build
-      - name: Run type-check
-        run: yarn type-check
-      - name: Run tests
-        run: yarn test:coverage
-      - name: Check examples
-        run: yarn run-examples
-      - name: Coveralls
-        if: matrix.node == '10'
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+    test:
+        runs-on: ubuntu-latest
+        if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/master')
+        strategy:
+            fail-fast: false
+            matrix:
+                node: [14, 16, 18]
+        steps:
+            - uses: actions/checkout@v2
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node }}
+            - uses: actions/cache@v2
+              with:
+                  path: '**/node_modules'
+                  key: ${{ runner.os }}-node-${{ matrix.node }}-modules-${{ hashFiles('**/yarn.lock') }}
+            - name: Install deps
+              run: |
+                  yarn
+                  yarn bootstrap
+            - name: Build package
+              run: yarn build
+            - name: Run type-check
+              run: yarn type-check
+            - name: Run tests
+              run: yarn test:coverage
+            - name: Check examples
+              run: yarn run-examples
+            - name: Coveralls
+              if: matrix.node == '16'
+              uses: coverallsapp/github-action@master
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}

.prettierrc.js

@@ -0,0 +1,14 @@
+const parent = require('@thorgate/prettier-config');
+
+module.exports = {
+    ...parent,
+    overrides: [
+        {
+            files: ['*.json', '**/*.json'],
+            options: {
+                tabWidth: 2,
+            },
+        },
+        ...parent.overrides,
+    ],
+};

.template/jest.config.js

@@ -2,7 +2,7 @@ const pkg = require('./package.json');
 const defaultConfig = require('../../jest.config.base');
 
 module.exports = Object.assign({}, defaultConfig, {
-    name: pkg.name,
+    id: pkg.name,
     displayName: pkg.name,
     rootDir: './',
 });

.template/package.json

@@ -2,7 +2,6 @@
   "name": "<%PACKAGE_NAME%>",
   "version": "<%VERSION%>",
   "private": false,
-  "prettier": "@thorgate/prettier-config",
   "publishConfig": {
     "access": "public"
   },
@@ -26,8 +25,7 @@
     "url": "git+https://github.com/thorgate/tg-resources.git"
   },
   "bugs": "https://github.com/thorgate/tg-resources/issues",
-  "keywords": [
-  ],
+  "keywords": [],
   "files": [
     "dist",
     "src"

.template/tsconfig.eslint.json

@@ -1,9 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "include": [
-    "src/**/*.ts",
-    "test/**/*.ts",
-    "typings/**/*.ts",
-    "src/**/*.js"
-  ]
+  "include": ["src/**/*.ts", "test/**/*.ts", "typings/**/*.ts", "src/**/*.js"]
 }

CONTRIBUTING.md

@@ -1,13 +1,11 @@
-Contributing
-============
+# Contributing
 
 Contributions are welcome, and they are greatly appreciated! Every
 little bit helps, and credit will always be given.
 
 You can contribute in many ways:
 
-Types of Contributions
-----------------------
+## Types of Contributions
 
 ### Report Bugs
 
@@ -49,14 +47,11 @@ If you are proposing a feature:
 -   Remember that this is a volunteer-driven project, and that
     contributions are welcome :)
 
-
 ### Changelog
 
 Changelog is maintained via github releases.
 
-
-Get Started!
-------------
+## Get Started!
 
 Ready to contribute? Here's how to set up tg-resources for local
 development.
@@ -91,8 +86,7 @@ development.
 
 7.  Submit a pull request through the GitHub website.
 
-Pull Request Guidelines
------------------------
+## Pull Request Guidelines
 
 Before you submit a pull request, check that it meets these guidelines: