Skip to content

Commit

Permalink
chore: Updated deps (#215)
Browse files Browse the repository at this point in the history
  • Loading branch information
TriPSs authored Jan 18, 2024
2 parents 7e62c73 + 470a402 commit f2da9b1
Show file tree
Hide file tree
Showing 10 changed files with 600 additions and 563 deletions.
2 changes: 1 addition & 1 deletion e2e/shadcn-ui-e2e/tests/shadcn-ui.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('shadcn/ui e2e', () => {
await runNxCommandAsync(`generate @nx-extend/shadcn-ui:init ${uiLibName} ${utilsLibName}`)

expect(() => checkFilesExist(
`${utilsLibName}/src/tailwind.config.js`,
`${utilsLibName}/src/tailwind.config.ts`,
`${utilsLibName}/src/global.css`,
`${utilsLibName}/src/cn.ts`,
`${utilsLibName}/src/index.ts`,
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@nx/devkit": "17.2.7",
"@nx/workspace": "17.2.7",
"@types/tar": "^6.1.10",
"axios": "^1.6.2",
"axios": "^1.6.5",
"crypto-js": "^4.2.0",
"deepmerge": "^4.3.1",
"rxjs-for-await": "^1.0.0",
Expand All @@ -57,13 +57,13 @@
"@nx/react": "17.2.7",
"@nx/webpack": "17.2.7",
"@swc-node/register": "1.6.8",
"@swc/core": "1.3.101",
"@swc/core": "1.3.104",
"@types/jest": "29.5.11",
"@types/node": "20.10.5",
"@types/node": "20.11.5",
"@types/shelljs": "^0.8.15",
"@types/yargs": "^17.0.32",
"@typescript-eslint/eslint-plugin": "6.15.0",
"@typescript-eslint/parser": "6.15.0",
"@typescript-eslint/eslint-plugin": "6.19.0",
"@typescript-eslint/parser": "6.19.0",
"dotenv": "16.3.1",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
Expand All @@ -73,7 +73,7 @@
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"nx": "17.2.7",
"prettier": "3.1.1",
"prettier": "3.2.4",
"ts-jest": "29.1.1",
"ts-node": "10.9.2",
"tslint": "~6.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase-hosting/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "MIT",
"main": "src/index.js",
"dependencies": {
"firebase-tools": "^13.0.2"
"firebase-tools": "^13.0.3"
},
"builders": "./executors.json",
"generators": "./generators.json"
Expand Down
4 changes: 2 additions & 2 deletions packages/react-email/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"license": "MIT",
"main": "src/index.js",
"devDependencies": {
"@react-email/components": "^0.0.12",
"react-email": "^1.10.0"
"@react-email/components": "^0.0.13",
"react-email": "^1.10.1"
},
"builders": "./executors.json",
"generators": "./generators.json"
Expand Down
17 changes: 17 additions & 0 deletions packages/shadcn-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,23 @@ npm install -D @nx-extend/shadcn-ui
nx g @nx-extend/shadcn-ui:init
```

After installation update your APPs `tailwind.config.ts` to this:
```ts
import { buildConfig } from '../libs/<lib directory>/src/tailwind.config'

export default buildConfig(__dirname)
```

If you are using Remix you can import `global.css` directly like:

```tsx
import stylesheet from '@<scope>/<utils lib name>/global.css'

export const links: LinksFunction = () => [
{ rel: 'stylesheet', href: stylesheet }
]
```

## Usage

### Add
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import { createGlobPatternsForDependencies } from '@nx/react/tailwind'
import { join } from 'node:path'
import TailwindAnimate from 'tailwindcss-animate'

import type { Config } from 'tailwindcss'

export function buildConfig(
appDir: string
): Config {
return {
content: [
join(
appDir,
'{src,pages,components,app}/**/*!(*.stories|*.spec).{ts,tsx,html}'
),
...createGlobPatternsForDependencies(appDir)
],
theme: {
extend: {
colors: {
border: 'hsl(var(--border))',
input: 'hsl(var(--input))',
ring: 'hsl(var(--ring))',
background: 'hsl(var(--background))',
foreground: 'hsl(var(--foreground))',
primary: {
DEFAULT: 'hsl(var(--primary))',
foreground: 'hsl(var(--primary-foreground))'
},
secondary: {
DEFAULT: 'hsl(var(--secondary))',
foreground: 'hsl(var(--secondary-foreground))'
},
destructive: {
DEFAULT: 'hsl(var(--destructive))',
foreground: 'hsl(var(--destructive-foreground))'
},
muted: {
DEFAULT: 'hsl(var(--muted))',
foreground: 'hsl(var(--muted-foreground))'
},
accent: {
DEFAULT: 'hsl(var(--accent))',
foreground: 'hsl(var(--accent-foreground))'
},
popover: {
DEFAULT: 'hsl(var(--popover))',
foreground: 'hsl(var(--popover-foreground))'
},
card: {
DEFAULT: 'hsl(var(--card))',
foreground: 'hsl(var(--card-foreground))'
}
},
borderRadius: {
lg: `var(--radius)`,
md: `calc(var(--radius) - 2px)`,
sm: 'calc(var(--radius) - 4px)'
},
keyframes: {
'accordion-down': {
from: { height: '0' },
to: { height: 'var(--radix-accordion-content-height)' }
},
'accordion-up': {
from: { height: 'var(--radix-accordion-content-height)' },
to: { height: '0' }
}
},
animation: {
'accordion-down': 'accordion-down 0.2s ease-out',
'accordion-up': 'accordion-up 0.2s ease-out'
}
}
},
plugins: [TailwindAnimate]
}
}
4 changes: 2 additions & 2 deletions packages/strapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"license": "MIT",
"main": "src/index.js",
"dependencies": {
"@strapi/generate-new": "4.16.2",
"@strapi/strapi": "4.16.2"
"@strapi/generate-new": "4.17.1",
"@strapi/strapi": "4.17.1"
},
"builders": "./executors.json",
"generators": "./generators.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/translations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"license": "MIT",
"main": "src/index.js",
"dependencies": {
"@formatjs/cli": "^6.2.4"
"@formatjs/cli": "^6.2.6"
},
"builders": "./executors.json",
"generators": "./generators.json"
Expand Down
Loading

0 comments on commit f2da9b1

Please sign in to comment.