Merge branch 'main' into dependabot/npm_and_yarn/lint-2f422cb30f

.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.

.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.

.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

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)