cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: merge conflict

Browse source
This commit is contained in:
Cory Dransfeldt 2023-04-18 13:45:23 -07:00
parent 25987e430b
commit c95317a2df
No known key found for this signature in database
12 changed files with 94 additions and 8549 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -4,7 +4,7 @@
"description": "The source for my personal site, blog and portfolio. Build using 11ty and hosted on Vercel.",
"main": "index.html",
"scripts": {
"start": "tinacms dev -c 'eleventy --serve & npx tailwindcss -i ./tailwind.css -o _site/assets/styles/tailwind.css --watch'",
"start": "eleventy --serve & npx tailwindcss -i ./tailwind.css -o _site/assets/styles/tailwind.css --watch",
"debug": "DEBUG=Eleventy* npx @11ty/eleventy --serve & npx tailwindcss -i ./tailwind.css -o _site/assets/styles/tailwind.css --watch",
"lint": "eslint .",
"lint:fix": "eslint . --fix",
@ -37,7 +37,6 @@
"@sherby/eleventy-plugin-files-minifier": "^1.1.1",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/typography": "^0.5.1",
"@tinacms/cli": "^1.5.6",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"autoprefixer": "^10.4.2",
@ -53,8 +52,7 @@
"markdownlint-cli": "^0.33.0",
"marked": "^4.3.0",
"tailwind-dracula": "^1.1.0",
"tailwindcss": "^3.3.1",
"tinacms": "^1.4.6"
"tailwindcss": "^3.3.1"
},
"lint-staged": {
"**/*.{js,ts,json}": [