From 676d039e97a5976fc2813254aeea38898fee2487 Mon Sep 17 00:00:00 2001 From: rikhall1515 <30295873+rikhall1515@users.noreply.github.com> Date: Sat, 13 Apr 2024 12:40:04 +0200 Subject: [PATCH 1/3] chore: fix prettier formatting issues on certain files --- .github/PULL_REQUEST_TEMPLATE.md | 6 +++--- CHANGELOG.md | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ef29ef0..ec062a4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -60,7 +60,7 @@ You can check the items by adding an `x` between the brackets, like this: `[x]` --> - [ ] I have read the [Contributing Guidelines](/CONTRIBUTING.md) and made commit messages that follow the guideline. -- [ ] I have run `pnpm i` before staging any files, and not bypassed `husky` when committing changes. -- [ ] I have successfully passed local tests. -- [ ] I have successfully run `npm run build` without any website errors. +- [ ] I have run `npx turbo format` to ensure the code follows the style guide. +- [ ] I have run `npx turbo test` to check if all tests are passing. +- [ ] I have run `npx turbo build` to check if the website builds without errors. - [ ] I've covered new added functionality with unit tests if necessary. diff --git a/CHANGELOG.md b/CHANGELOG.md index a782036..1fcaf0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,18 @@ # [2.0.0](https://github.com/rikhall1515/nextjs-project-template/compare/v1.0.0...v2.0.0) (2024-04-12) - ### Bug Fixes -* fix error with react types not being installed during production build ([e6447f6](https://github.com/rikhall1515/nextjs-project-template/commit/e6447f6e8c09ffcaca8f61a2bdbbcd195002c806)) -* **pnpm:** fix package.json and lockfile mismatch ([d18e722](https://github.com/rikhall1515/nextjs-project-template/commit/d18e7225b964d6fc6ea36f8200286e7b07afe453)) - +- fix error with react types not being installed during production build ([e6447f6](https://github.com/rikhall1515/nextjs-project-template/commit/e6447f6e8c09ffcaca8f61a2bdbbcd195002c806)) +- **pnpm:** fix package.json and lockfile mismatch ([d18e722](https://github.com/rikhall1515/nextjs-project-template/commit/d18e7225b964d6fc6ea36f8200286e7b07afe453)) ### Features -* **repo:** converted the repo into a turborepo ([2b07e62](https://github.com/rikhall1515/nextjs-project-template/commit/2b07e6244a0e95d4d8494231fa3914d90d340974)) - +- **repo:** converted the repo into a turborepo ([2b07e62](https://github.com/rikhall1515/nextjs-project-template/commit/2b07e6244a0e95d4d8494231fa3914d90d340974)) ### BREAKING CHANGES -* **repo:** CI scripts will not work. CI and Vercel need to be configured to run with the new -code. +- **repo:** CI scripts will not work. CI and Vercel need to be configured to run with the new + code. # 1.0.0 (2024-04-09) From b57d63d7b58ccd9763addbbdc35bac913f0aff5b Mon Sep 17 00:00:00 2001 From: rikhall1515 <30295873+rikhall1515@users.noreply.github.com> Date: Sat, 13 Apr 2024 12:41:48 +0200 Subject: [PATCH 2/3] ci(build): remove CI=true so that the windows build works Issue #28 Windows build not working fix #28 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26fc60d..da2fe0e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: # We want to avoid npm from running the Audit Step and Funding messages on a CI environment # We also use `npm i` instead of `npm ci` so that the node_modules/.cache folder doesn't get deleted # We also use `--omit=dev` to avoid installing devDependencies as we don't need them during the build step - run: CI=true pnpm i -P + run: pnpm i -P - name: Build Next.js (ISR) # We want a ISR build on CI to ensure that regular Next.js builds work as expected. From 2a64ba1eadd1be476bfcadb39f1bf2fa9979a39d Mon Sep 17 00:00:00 2001 From: rikhall1515 <30295873+rikhall1515@users.noreply.github.com> Date: Sat, 13 Apr 2024 13:20:41 +0200 Subject: [PATCH 3/3] ci(lighthouse): fix import path so it searches lib folder --- .github/workflows/lighthouse.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml index 6c44e80..56c9428 100644 --- a/.github/workflows/lighthouse.yml +++ b/.github/workflows/lighthouse.yml @@ -102,7 +102,7 @@ jobs: # Run as a separate file so we do not have to inline all of our formatting logic. # See https://github.com/actions/github-script#run-a-separate-file for more info. script: | - const { formatLighthouseResults } = await import('${{github.workspace}}/scripts/lighthouse/index.mjs') + const { formatLighthouseResults } = await import('${{github.workspace}}/lib/lighthouse/index.mjs') await formatLighthouseResults({core}) - name: Add Comment to PR