Skip to content

Commit

Permalink
Merge branch 'master' into map-preview-draw
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Adams authored and Ben Adams committed Oct 23, 2023
2 parents f62a638 + 1bc5c90 commit dc4aca9
Show file tree
Hide file tree
Showing 70 changed files with 71,958 additions and 257,224 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
### TODO: FIX ME! ###
## TODO: Add SYNK Token to Github Env Variables! I don't have permissions
# name: Security

# on: [push, pull_request]

# jobs:
# scan:
# security:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v1
# - name: Gitleaks
# uses: zricethezav/gitleaks-action@master
# - uses: actions/checkout@master
# - name: Run Snyk to check for vulnerabilities
# uses: snyk/actions/nodemaster
# env:
# SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
# with:
# args: --severity-threshold=high
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Uses Node.js 16
- name: Uses Node.js 18
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18
- run: npm install --legacy-peer-deps
- run: npm run build
- run: npm run jest -- -u
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
16 changes: 11 additions & 5 deletions config/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ module.exports = {

coverageThreshold: {
global: {
branches: 41.5,
functions: 38.5,
lines: 48.5,
statements: 47.5
branches: 35.36,
functions: 32.11,
lines: 41.35,
statements: 40.09
}
},

Expand Down Expand Up @@ -50,6 +50,12 @@ module.exports = {
moduleNameMapper: {
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
'<rootDir>/tests/__mocks__/fileMock.js',
'.+\\.(css|styl|less|sass|scss)$': 'identity-obj-proxy'
'.+\\.(css|styl|less|sass|scss)$': 'identity-obj-proxy',
'^gatsby-page-utils/(.*)$': 'gatsby-page-utils/dist/$1', // Workaround for https://github.com/facebook/jest/issues/9771
'^gatsby-core-utils/(.*)$': 'gatsby-core-utils/dist/$1', // Workaround for https://github.com/facebook/jest/issues/9771
'^gatsby-plugin-utils/(.*)$': [
'gatsby-plugin-utils/dist/$1',
'gatsby-plugin-utils/$1'
] // Workaround for https://github.com/facebook/jest/issues/9771
}
};
3 changes: 0 additions & 3 deletions example/gatsby-config.js

This file was deleted.

11 changes: 0 additions & 11 deletions example/gatsby-node.js

This file was deleted.

Loading

0 comments on commit dc4aca9

Please sign in to comment.