Skip to content

Commit

Permalink
Merge branch 'master' into ignore-middleware-paths
Browse files Browse the repository at this point in the history
  • Loading branch information
johnsardine committed Jan 12, 2022
2 parents c70726f + 3e38c0e commit b499669
Show file tree
Hide file tree
Showing 12 changed files with 3,493 additions and 3,777 deletions.
16 changes: 9 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: 2
updates:
- package-ecosystem: npm
# Maintain dependencies for GitHub Actions
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: weekly
open-pull-requests-limit: 10
ignore:
- dependency-name: '@types/react'
versions:
- 17.0.3
interval: 'weekly'

# Maintain dependencies for npm
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'weekly'
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,25 @@ on:
pull_request:
branches:
- master
- development

jobs:
test:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]
node: ['17', '16', '14', '13', '12']
node: ['17', '16', '14']
runs-on: ${{ matrix.platform }}
steps:
- name: Github Checkout
uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v2.5.1
with:
node-version: ${{ matrix.node }}

- name: Install
run: yarn install --ignore-engines
run: yarn install --ci

- name: Lint
run: yarn lint
Expand Down
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"semi": false
}
1 change: 0 additions & 1 deletion .prettierrc.js

This file was deleted.

1 change: 0 additions & 1 deletion .stylelintrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion azure-pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 1.8$(rev:.r)
name: 1.9$(rev:.r)
trigger:
branches:
include:
Expand Down
3 changes: 2 additions & 1 deletion example-i18n/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve"
"jsx": "preserve",
"incremental": true
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js"],
"exclude": ["node_modules"]
Expand Down
3 changes: 2 additions & 1 deletion example/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve"
"jsx": "preserve",
"incremental": true
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
Expand Down
6 changes: 4 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module.exports = {
...require('@corex/jest/reporter'),
import reporter from '@corex/jest/reporter.js'

export default {
...reporter,
verbose: true,
preset: 'ts-jest',
projects: ['packages/*'],
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"author": "Vishnu Sankar",
"license": "MIT",
"private": true,
"type": "module",
"workspaces": {
"packages": [
"packages/*",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-sitemap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"types": "dist/@types/index.d.ts",
"repository": "https://github.com/iamvishnusankar/next-sitemap.git",
"engines": {
"node": ">=12"
"node": ">=14"
},
"keywords": [
"nextjs",
Expand Down

0 comments on commit b499669

Please sign in to comment.