Skip to content

Commit

Permalink
Merge pull request #26 from jaspermayone/v2
Browse files Browse the repository at this point in the history
Site V2
  • Loading branch information
jaspermayone authored Sep 20, 2024
2 parents 9db7c32 + 84bab0b commit df99663
Show file tree
Hide file tree
Showing 98 changed files with 2,086 additions and 941 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "next/core-web-vitals"
"extends": ["next/core-web-vitals", "next/typescript"]
}
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ yarn-error.log*

# local env files
.env*.local
.env

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
.env

yarn.lock
pnpm-lock.yaml
package-lock.json
17 changes: 0 additions & 17 deletions components.json

This file was deleted.

43 changes: 43 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/** @type {import('next').NextConfig} */
const pkg = require("./package.json");

// starts a command line process to get the git hash
const commitHash = require("child_process")
.execSync('git log --pretty=format:"%h" -n1')
.toString()
.trim();

const fullcommitHash = require("child_process")
.execSync('git log --pretty=format:"%H" -n1')
.toString()
.trim();

const commitDate = require("child_process")
.execSync("git log -1 --format=%cd")
.toString()
.trim();

const nextConfig = {
// images: {
// remotePatterns: [
// {
// protocol: "https",
// hostname: "**.scdn.co",
// },
// {
// protocol: "https",
// hostname: "live.staticflickr.com",
// },
// ],
// },
env: {
// add the package.json version and git hash to the environment
APP_VERSION: pkg.version,
COMMIT_HASH: commitHash,
FULL_COMMIT_HASH: fullcommitHash,
COMMIT_DATE: commitDate,
},
reactStrictMode: true,
};

module.exports = nextConfig;
4 changes: 0 additions & 4 deletions next.config.mjs

This file was deleted.

31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jaspermayone",
"version": "0.1.0",
"name": "website",
"version": "2.0.0",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -9,33 +9,34 @@
"lint": "next lint"
},
"dependencies": {
"@arcjet/next": "1.0.0-alpha.24",
"@arcjet/next": "1.0.0-alpha.25",
"@material-tailwind/react": "^2.1.10",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@tailwindcss/forms": "^0.5.9",
"@tailwindcss/typography": "^0.5.15",
"@vercel/speed-insights": "^1.0.12",
"bootstrap": "5.3.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"framer-motion": "^11.3.21",
"loops": "^3.2.0",
"date-fns": "^4.1.0",
"framer-motion": "^11.5.6",
"loops": "^3.3.0",
"next": "14.2.9",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.2.1",
"tailwind-merge": "^2.3.0",
"tailwindcss-animate": "^1.0.7"
"react-icons": "^5.3.0",
"tailwind-merge": "^2.5.2"
},
"devDependencies": {
"@types/node": "^20.14.2",
"@types/react": "^18.3.5",
"@types/node": "^20.16.5",
"@types/react": "^18.3.8",
"@types/react-dom": "^18.3.0",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-next": "14.2.4",
"postcss": "^8.4.40",
"tailwindcss": "^3.4.7",
"typescript": "^5.5.4"
"postcss": "^8.4.47",
"tailwindcss": "^3.4.12",
"typescript": "^5.6.2"
}
}
Loading

1 comment on commit df99663

@vercel
Copy link

@vercel vercel bot commented on df99663 Sep 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.