Skip to content

Commit

Permalink
chore: minor deps updates
Browse files Browse the repository at this point in the history
  • Loading branch information
fluid-design-io committed Jun 24, 2024
1 parent 1fc0977 commit 62a0bff
Show file tree
Hide file tree
Showing 11 changed files with 4,340 additions and 3,372 deletions.
8 changes: 8 additions & 0 deletions .hintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": [
"development"
],
"hints": {
"no-inline-styles": "off"
}
}
4 changes: 0 additions & 4 deletions apps/web/.eslintrc.js

This file was deleted.

3 changes: 3 additions & 0 deletions apps/web/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": ["next/core-web-vitals", "plugin:perfectionist/recommended-natural"]
}
16 changes: 11 additions & 5 deletions apps/web/next.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// @ts-check

/** @type {import('next').NextConfig} */
module.exports = {
reactStrictMode: true,
images: {
Expand All @@ -21,10 +24,13 @@ module.exports = {
protocol: 'https',
hostname: 'user-images.githubusercontent.com',
},
]
],
},
transpilePackages: ["ui"],
experimental: {
reactCompiler: true,
},
transpilePackages: ['ui'],
typescript: {
ignoreBuildErrors: true
}
};
ignoreBuildErrors: true,
},
}
52 changes: 29 additions & 23 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,45 @@
"lint": "next lint"
},
"dependencies": {
"@vercel/analytics": "^1.1.1",
"culori": "^3.2.0",
"extract-colors": "^4.0.2",
"framer-motion": "^10.16.4",
"babel-plugin-react-compiler": "0.0.0-experimental-938cd9a-20240601",
"culori": "^4.0.1",
"extract-colors": "^4.0.6",
"framer-motion": "^11.2.11",
"html2canvas": "^1.4.1",
"immer": "^10.0.3",
"immer": "^10.1.1",
"jsonwebtoken": "^9.0.2",
"lucide-react": "^0.284.0",
"next": "^14.0.1",
"next-themes": "^0.2.1",
"react": "^18.2.0",
"lucide-react": "^0.396.0",
"next": "15.0.0-rc.0",
"next-themes": "^0.3.0",
"react": "19.0.0-rc-3563387fe3-20240621",
"react-colorful": "^5.6.1",
"react-dom": "^18.2.0",
"recharts": "^2.9.1",
"react-dom": "19.0.0-rc-3563387fe3-20240621",
"recharts": "^2.12.7",
"sonner": "^1.5.0",
"tinycolor2": "^1.6.0",
"ui": "workspace:*",
"zustand": "^4.4.3"
"zustand": "^4.5.2"
},
"devDependencies": {
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/typography": "^0.5.10",
"@types/culori": "^2.0.1",
"@types/node": "^17.0.12",
"@types/react": "^18.2.25",
"@types/react-dom": "^18.2.11",
"autoprefixer": "^10.4.14",
"eslint-config-custom": "workspace:*",
"@tailwindcss/typography": "^0.5.13",
"@types/culori": "^2.1.0",
"@types/node": "^20.14.7",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/tinycolor2": "^1.4.6",
"autoprefixer": "^10.4.19",
"eslint": "^9.5.0",
"eslint-config-next": "15.0.0-rc.0",
"eslint-plugin-perfectionist": "^2.11.0",
"install": "^0.13.0",
"postcss": "^8.4.24",
"prettier": "^3.0.3",
"tailwindcss": "^3.3.5",
"postcss": "^8.4.38",
"prettier": "^3.3.2",
"prettier-plugin-organize-imports": "^3.2.4",
"prettier-plugin-tailwindcss": "^0.6.0",
"tailwindcss": "^3.4.4",
"tailwindcss-animate": "^1.0.6",
"tsconfig": "workspace:*",
"typescript": "5.2.2"
"typescript": "^5"
}
}
4 changes: 0 additions & 4 deletions apps/web/prettier.config.js

This file was deleted.

11 changes: 11 additions & 0 deletions apps/web/prettier.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/** @type {import("prettier").Config} */
const config = {
semi: false,
singleQuote: true,
printWidth: 120,
trailingComma: 'es5',
tailwindFunctions: ['clsx', 'tw'],
plugins: ['prettier-plugin-organize-imports', 'prettier-plugin-tailwindcss'],
}

export default config
56 changes: 28 additions & 28 deletions apps/web/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
const tailwindConfig = require('ui/tailwind.config');
const tailwindConfig = require('ui/tailwind.config')
const defaultTheme = require('tailwindcss/defaultTheme')
/** @type {import('tailwindcss').Config} */
module.exports = {
...tailwindConfig,
future: {
hoverOnlyWhenSupported: true,
...tailwindConfig,
future: {
hoverOnlyWhenSupported: true,
},
theme: {
extend: {
...tailwindConfig.theme.extend,
fontFamily: {
...tailwindConfig.theme.extend.fontFamily,
inter: ['var(--font-inter)', ...defaultTheme.fontFamily.sans],
comfortaa: ['var(--font-comfortaa)', ...defaultTheme.fontFamily.sans],
},
colors: {
...tailwindConfig.theme.extend.colors,
'background-accent': 'hsl(var(--background-accent))',
},
screens: {
xs: { raw: '(min-width: 24rem)' },
},
},
theme: {
extend: {
...tailwindConfig.theme.extend,
fontFamily: {
...tailwindConfig.theme.extend.fontFamily,
inter: ['var(--font-inter)', ...defaultTheme.fontFamily.sans],
comfortaa: ['var(--font-comfortaa)', ...defaultTheme.fontFamily.sans],
},
colors: {
...tailwindConfig.theme.extend.colors,
'background-accent': 'hsl(var(--background-accent))',
},
screens: {
'xs': { 'raw': '(min-width: 24rem)' }
}
}
},
plugins: [
...tailwindConfig.plugins,
require('@tailwindcss/container-queries'),
require("tailwindcss-animate"),
require('@tailwindcss/typography')
]
}
},
plugins: [
...tailwindConfig.plugins,
require('@tailwindcss/container-queries'),
require('tailwindcss-animate'),
require('@tailwindcss/typography'),
],
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"release": "release-it"
},
"devDependencies": {
"@turbo/gen": "^1.10.15",
"eslint": "^7.32.0",
"@turbo/gen": "^2.0.4",
"eslint": "^9.5.0",
"eslint-config-custom": "workspace:*",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.5",
"release-it": "^16.2.1",
"turbo": "^1.10.15"
"prettier": "^3.3.2",
"prettier-plugin-tailwindcss": "^0.6.5",
"release-it": "^17.4.0",
"turbo": "^2.0.4"
},
"packageManager": "pnpm@7.15.0"
}
Loading

0 comments on commit 62a0bff

Please sign in to comment.