Skip to content

Commit

Permalink
Merge pull request #460 from jpbnetley/feature/nextjs
Browse files Browse the repository at this point in the history
Feature/nextjs
  • Loading branch information
jpbnetley authored Jun 13, 2023
2 parents 77cc658 + 075bccc commit d6c0209
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 10 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,18 @@ jobs:
- name: Build
run: pnpm run build

- name: Deploy
- name: Deploy prod
if: github.ref == 'refs/heads/master'
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages
branch: gh-pages-prod
folder: dist

- name: Deploy dev
if: github.ref == 'refs/heads/dev'
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages-dev
folder: dist

github-release:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts

dist
25 changes: 17 additions & 8 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
Expand All @@ -20,14 +24,19 @@
}
],
"paths": {
"*": ["./src/*"],
},
"*": [
"./src/*"
]
}
},
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
".next/types/**/*.ts"
],
"exclude": ["node_modules"]
"**/*.ts",
"**/*.tsx",
".next/types/**/*.ts",
"dist/types/**/*.ts"
],
"exclude": [
"node_modules"
]
}

0 comments on commit d6c0209

Please sign in to comment.