Skip to content

Commit

Permalink
Revert "Merge branch 'main' into main"
Browse files Browse the repository at this point in the history
This reverts commit 8d14529, reversing
changes made to b844d53.

# Conflicts:
#	pnpm-lock.yaml
#	tina/tina-lock.json
  • Loading branch information
Dylan Burkey committed Oct 22, 2024
1 parent 6cb0a48 commit b4319ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,20 @@
"scripts": {
"dev": "tinacms dev -c \"next dev\"",
"build": "tinacms build && next build",
"build-local": "tinacms build --local --skip-indexing --skip-cloud-checks && next build",
"start": "tinacms build && next start",
"export": "npm run build && next export",
"lint": "next lint",
"dev:build": "next build"
},
"devDependencies": {
"@svgr/webpack": "^8.1.0",
"@tinacms/cli": "^1.6.9",
"@tinacms/cli": "^1.6.1",
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.5.1",
"@types/react": "^18.3.4",
"@types/styled-components": "^5.1.34",
"autoprefixer": "^10.4.20",
"eslint": "^8.0.0",
"eslint": "^9.9.1",
"eslint-config-next": "14.2.4",
"postcss": "^8.4.41",
"postcss-import": "^16.1.0",
Expand All @@ -40,7 +39,7 @@
"styled-jsx": "^5.1.6",
"tailwind-merge": "^2.5.2",
"tailwindcss": "^3.4.10",
"tinacms": "^2.2.9",
"tinacms": "^2.2.1",
"typescript": "^5.5.4"
},
"packageManager": "pnpm@9.12.2+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228"
Expand Down
2 changes: 1 addition & 1 deletion tina/tina-lock.json

Large diffs are not rendered by default.

0 comments on commit b4319ac

Please sign in to comment.