Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorporate classnames package and do some general cleanup #40

Merged
merged 9 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
{
"extends": ["next/core-web-vitals", "next/typescript"]
"extends": [
"next/core-web-vitals",
"next/typescript",
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"plugins": ["react", "@typescript-eslint"],
"rules": {
"react/react-in-jsx-scope": "off"
}
}
4 changes: 2 additions & 2 deletions .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "18"
node-version: '18'
cache: ${{ steps.detect-package-manager.outputs.manager }}
- name: Setup Pages
uses: actions/configure-pages@v2
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Audit URLs using Lighthouse
uses: treosh/lighthouse-ci-action@v9
with:
configPath: "./lighthouserc.yml"
configPath: './lighthouserc.yml'
uploadArtifacts: false # save results as an action artifacts
temporaryPublicStorage: false # upload lighthouse report to the temporary storage

6 changes: 3 additions & 3 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Deploy Next.js site to Pages
on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]
branches: ['main']

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -20,7 +20,7 @@ permissions:

# Allow one concurrent deployment
concurrency:
group: "pages"
group: 'pages'
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "18"
node-version: '18'
cache: ${{ steps.detect-package-manager.outputs.manager }}
- name: Setup Pages
uses: actions/configure-pages@v2
Expand Down
9 changes: 8 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
{}
{
"semi": true,
"trailingComma": "all",
"singleQuote": true,
"printWidth": 80,
"tabWidth": 2,
"plugins": ["prettier-plugin-tailwindcss"]
}
4 changes: 2 additions & 2 deletions akamai-loader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const normalizeSrc = (src) => (src[0] === "/" ? src.slice(1) : src);
const normalizeSrc = (src) => (src[0] === '/' ? src.slice(1) : src);
export default function akamaiLoader({ src, width, quality }) {
return "/" + normalizeSrc(src) + "?imwidth=" + width;
return '/' + normalizeSrc(src) + '?imwidth=' + width;
}
2 changes: 1 addition & 1 deletion lighthouserc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ci:
collect:
staticDistDir: "./out"
staticDistDir: './out'
assert:
assertions:
categories:accessibility: [error, { minScore: 1 }]
Expand Down
14 changes: 7 additions & 7 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
const path = require("path");
const path = require('path');

/**
* @type {import('next').NextConfig}
*/
const nextConfig = {
output: "export",
output: 'export',
reactStrictMode: true,
swcMinify: true,
images: {
loader: "custom",
loaderFile: "./akamai-loader.js",
loader: 'custom',
loaderFile: './akamai-loader.js',
},
basePath: "/dibbs-site",
assetPrefix: "/dibbs-site",
basePath: '/dibbs-site',
assetPrefix: '/dibbs-site',
sassOptions: {
includePaths: [path.join(__dirname, "styles")],
includePaths: [path.join(__dirname, 'styles')],
},
};

Expand Down
Loading
Loading