{children}
+} + +export { Paragraph } diff --git a/packages/design-system/src/ui/blocks/Quote.tsx b/packages/design-system/src/ui/blocks/Quote.tsx new file mode 100644 index 000000000..8eb3b8141 --- /dev/null +++ b/packages/design-system/src/ui/blocks/Quote.tsx @@ -0,0 +1,5 @@ +function Quote({ children }) { + return{children}+} + +export { Quote } diff --git a/packages/design-system/src/ui/blocks/index.ts b/packages/design-system/src/ui/blocks/index.ts new file mode 100644 index 000000000..582a81bbb --- /dev/null +++ b/packages/design-system/src/ui/blocks/index.ts @@ -0,0 +1,12 @@ +export { Callout } from './Callout' +export { Column } from './Column' +export { ColumnList } from './ColumnList' +export { Divider } from './Divider' +export { Heading1 } from './Heading1' +export { Heading2 } from './Heading2' +export { Heading3 } from './Heading3' +export { ListBulleted } from './ListBulleted' +export { ListItem } from './ListItem' +export { ListNumbered } from './ListNumbered' +export { Paragraph } from './Paragraph' +export { Quote } from './Quote' diff --git a/packages/design-system/src/utils/.gitkeep b/packages/design-system/src/utils/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/packages/next-notion/package.json b/packages/next-notion/package.json index 3f50d8267..f08f051e6 100644 --- a/packages/next-notion/package.json +++ b/packages/next-notion/package.json @@ -41,6 +41,7 @@ "react-dom": "^18.2.0" }, "dependencies": { + "@jeromefitz/shared": "workspace:*", "@jeromefitz/utils": "2.2.2", "clsx": "1.2.1", "fast-json-stable-stringify": "2.1.0", diff --git a/packages/next-notion/src/app/components/code.tsx b/packages/next-notion/src/app/components/code.tsx index 003806447..4348c3433 100644 --- a/packages/next-notion/src/app/components/code.tsx +++ b/packages/next-notion/src/app/components/code.tsx @@ -1,4 +1,5 @@ -import { cx } from '../../utils' +import { cx } from '@jeromefitz/shared/src/utils' + import getContentTypeDetail from '../utils/getContentTypeDetail' const code = ({ content, id }) => { diff --git a/packages/next-notion/src/app/components/link.tsx b/packages/next-notion/src/app/components/link.tsx index 8b5b0f381..95392fae3 100644 --- a/packages/next-notion/src/app/components/link.tsx +++ b/packages/next-notion/src/app/components/link.tsx @@ -1,6 +1,7 @@ +import { cx } from '@jeromefitz/shared/src/utils' import NextLink from 'next/link' -import { cx, getNextLink } from '../../utils' +import { getNextLink } from '../../utils' const nextSeo = { url: `https://${process.env.NEXT_PUBLIC__SITE}` } const domain = new URL(nextSeo.url) diff --git a/packages/next-notion/src/app/utils/TextAnnotations.tsx b/packages/next-notion/src/app/utils/TextAnnotations.tsx index 93ccbd0c3..7528c2dc0 100644 --- a/packages/next-notion/src/app/utils/TextAnnotations.tsx +++ b/packages/next-notion/src/app/utils/TextAnnotations.tsx @@ -1,6 +1,5 @@ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -import { cx } from '../../../../../sites/jeromefitzgerald.com/src/utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' + import { CONTENT_NODE_TYPES, getContentNode } from '../index' // const EmojiParser = dynamic( diff --git a/packages/next-notion/src/utils/cx.ts b/packages/next-notion/src/utils/cx.ts deleted file mode 100644 index a503eae8c..000000000 --- a/packages/next-notion/src/utils/cx.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ClassValue, clsx } from 'clsx' -import { twMerge } from 'tailwind-merge' - -function cx(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)) -} - -export { cx } diff --git a/packages/next-notion/src/utils/index.ts b/packages/next-notion/src/utils/index.ts index 77ce2fa90..487ac8973 100644 --- a/packages/next-notion/src/utils/index.ts +++ b/packages/next-notion/src/utils/index.ts @@ -1,4 +1,3 @@ -import { cx } from './cx' import { getKeysByJoin, getKeysBySlugger } from './getKey' import getNextLink from './getNextLink' import getNextPageStatus from './getNextPageStatus' @@ -7,7 +6,6 @@ import isActiveLink from './isActiveLink' import { isElementOfType } from './isElementOfType' export { - cx, getKeysByJoin, getKeysBySlugger, getNextLink, diff --git a/packages/shared/package.json b/packages/shared/package.json index d5dba3d21..3f320731e 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -30,6 +30,7 @@ "dependencies": { "@jeromefitz/design-system": "4.2.1", "@tanem/react-nprogress": "5.0.37", + "clsx": "1.2.1", "fathom-client": "3.5.0", "lodash": "4.17.21", "next": "13.4.1", @@ -37,13 +38,13 @@ "plaiceholder": "2.5.0", "react": "18.2.0", "react-dom": "18.2.0", - "swr": "2.1.5" + "swr": "2.1.5", + "tailwind-merge": "1.12.0" }, "devDependencies": { "@types/lodash": "4.14.194", "@types/react": "18.2.6", - "@types/react-dom": "18.2.4", - "next-notion": "workspace:*" + "@types/react-dom": "18.2.4" }, "publishConfig": { "access": "public" diff --git a/packages/design-system/src/utils/cx.ts b/packages/shared/src/utils/cx.ts similarity index 100% rename from packages/design-system/src/utils/cx.ts rename to packages/shared/src/utils/cx.ts diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts new file mode 100644 index 000000000..664d9fd83 --- /dev/null +++ b/packages/shared/src/utils/index.ts @@ -0,0 +1 @@ +export { cx } from './cx' diff --git a/packages/tailwind-config/radix.plugin.js b/packages/tailwind-config/radix.plugin.js index 9dea20139..0286318b4 100644 --- a/packages/tailwind-config/radix.plugin.js +++ b/packages/tailwind-config/radix.plugin.js @@ -1,8 +1,17 @@ const radixColors = require('@radix-ui/colors') const plugin = require('tailwindcss/plugin') -const { backgrounds, buttons } = require('./src/index') +const { backgrounds, buttons, notion, notionColors } = require('./src/index') +/** + * @debug + */ +// console.dir(`> backgrounds`) +// console.dir(backgrounds) +// console.dir(`> buttons`) +// console.dir(buttons) +// console.dir(`> notion`) +// console.dir(notion) /** * @note(tailwind) radix-colors-for-tailwind * @@ -53,7 +62,7 @@ const radixPlugin = plugin.withOptions( ) darkColors = { ...darkColors, ...dark, ...darkA } lightColors = { ...lightColors, ...light, ...lightA } - radixStyles = { ...radixStyles, ...backgrounds, ...buttons } + radixStyles = { ...radixStyles, ...backgrounds, ...buttons, ...notion } }) addBase({ ':root': { @@ -63,6 +72,8 @@ const radixPlugin = plugin.withOptions( ...darkColors, }, }) + // console.dir(`>> radixStyles > notions`) + // console.dir(notion) addComponents(radixStyles) } }, @@ -90,14 +101,25 @@ const radixPlugin = plugin.withOptions( ) return obj }, {}) + // const filteredNotion = {} + // notionColors.map((n) => { + // filteredNotion[n] = n.includes('_background') + // ? `var(--${n.split('_')[0]}6)` + // : `var(--${n}11)` + // }) + + const radix = { + ...filtered, + ...filteredA, + // ...filteredNotion, + } + // console.dir(`>> radix > filteredNotion`) + // console.dir(filteredNotion) return { theme: { extend: { colors: { - radix: { - ...filtered, - ...filteredA, - }, + radix, }, }, }, diff --git a/packages/tailwind-config/src/backgrounds.js b/packages/tailwind-config/src/backgrounds.js index e66e3a70e..2f609f241 100644 --- a/packages/tailwind-config/src/backgrounds.js +++ b/packages/tailwind-config/src/backgrounds.js @@ -3,11 +3,11 @@ * https://www.radix-ui.com/docs/colors/palette-composition/understanding-the-scale * */ -const { colors, excludes } = require('./lib/const') +const { excludes, radixColors } = require('./lib/const') const backgrounds = {} -colors.map((_color) => { +radixColors.map((_color) => { let color = _color if (excludes.includes(color)) { color = `${color}A` diff --git a/packages/tailwind-config/src/buttons.js b/packages/tailwind-config/src/buttons.js index fda8b555f..700fc00f0 100644 --- a/packages/tailwind-config/src/buttons.js +++ b/packages/tailwind-config/src/buttons.js @@ -3,13 +3,13 @@ * https://www.radix-ui.com/docs/colors/palette-composition/understanding-the-scale * */ -const { colors, excludes, foregroundTextBlack } = require('./lib/const') +const { excludes, foregroundTextBlack, radixColors } = require('./lib/const') const buttons = {} const types = ['', '-cta', '-outline', '-solid', '-transparent'] const buttonTypes = [] -colors.map((color) => { +radixColors.map((color) => { if (excludes.includes(color)) { return } diff --git a/packages/tailwind-config/src/index.js b/packages/tailwind-config/src/index.js index 1cbab44f0..0b2b78e1d 100644 --- a/packages/tailwind-config/src/index.js +++ b/packages/tailwind-config/src/index.js @@ -1,5 +1,13 @@ const { backgrounds } = require('./backgrounds') const { buttons, buttonTypes } = require('./buttons') -const { colors } = require('./lib/const') +const { radixColors } = require('./lib/const') +const { notion, notionColors } = require('./notion') -module.exports = { backgrounds, buttons, buttonTypes, colors } +module.exports = { + backgrounds, + buttons, + buttonTypes, + notion, + notionColors, + radixColors, +} diff --git a/packages/tailwind-config/src/lib/const.js b/packages/tailwind-config/src/lib/const.js index 01cf01278..259400764 100644 --- a/packages/tailwind-config/src/lib/const.js +++ b/packages/tailwind-config/src/lib/const.js @@ -1,4 +1,4 @@ -const colors = [ +const radixColors = [ 'tomato', 'red', 'crimson', @@ -42,4 +42,4 @@ const colors = [ const foregroundTextBlack = ['sky', 'mint', 'lime', 'yellow', 'amber'] const excludes = ['white', 'black'] -module.exports = { colors, excludes, foregroundTextBlack } +module.exports = { excludes, foregroundTextBlack, radixColors } diff --git a/packages/tailwind-config/src/notion.js b/packages/tailwind-config/src/notion.js new file mode 100644 index 000000000..72ce0c1d9 --- /dev/null +++ b/packages/tailwind-config/src/notion.js @@ -0,0 +1,36 @@ +const notionColors = [ + // 'default', + 'gray', + 'brown', + 'orange', + 'yellow', + 'green', + 'blue', + 'purple', + 'pink', + 'red', + 'gray_background', + 'brown_background', + 'orange_background', + 'yellow_background', + 'green_background', + 'blue_background', + 'purple_background', + 'pink_background', + 'red_background', +] + +const notion = {} +notionColors.map((color) => { + if (color.includes('_background')) { + notion['.notion-' + color] = { + backgroundColor: `var(--${color.split('_')[0]}5)`, + } + } else { + notion['.notion-' + color] = { + color: `var(--${color}11)`, + } + } +}) + +module.exports = { notion, notionColors } diff --git a/packages/tailwind-config/tailwind.config.js b/packages/tailwind-config/tailwind.config.js index 59751a0d6..f21c325c7 100644 --- a/packages/tailwind-config/tailwind.config.js +++ b/packages/tailwind-config/tailwind.config.js @@ -2,7 +2,18 @@ const theme = require('tailwindcss/defaultTheme') const hocusPlugin = require('./hocus.plugin') const radixPlugin = require('./radix.plugin') -const { colors } = require('./src/index') +const { notionColors, radixColors } = require('./src/index') + +const safelist = [] +notionColors.map((color) => { + safelist.push(`notion-${color}`) +}) +const buttonTypes = ['', '-cta', '-outline', '-solid', '-transparent'] +radixColors.map((color) => { + buttonTypes.map((type) => { + safelist.push(`${color}-button${type}`) + }) +}) /** @type {import('tailwindcss').Config} */ const config = ({}) => ({ @@ -20,6 +31,7 @@ const config = ({}) => ({ // purgeLayersByDefault: true, // }, // purge: ['./components/**/*.{js,ts,jsx,tsx}', './pages/**/*.{js,ts,jsx,tsx}'], + safelist, theme: { ...theme, colors: {}, @@ -57,6 +69,16 @@ const config = ({}) => ({ slideIn: 'slideIn 150ms cubic-bezier(0.16, 1, 0.3, 1)', swipeOut: 'swipeOut 100ms ease-out', }, + backgroundImage: { + breeze: 'linear-gradient(140deg, rgb(207, 47, 152), rgb(106, 61, 236))', + candy: 'linear-gradient(140deg, rgb(165, 142, 251), rgb(233, 191, 248))', + crimson: 'linear-gradient(140deg, rgb(255, 99, 99), rgb(115, 52, 52))', + falcon: 'linear-gradient(140deg, rgb(189, 227, 236), rgb(54, 54, 84))', + meadow: 'linear-gradient(140deg, rgb(89, 212, 153), rgb(160, 135, 45))', + midnight: 'linear-gradient(140deg, rgb(76, 200, 200), rgb(32, 32, 51))', + raindrop: 'linear-gradient(140deg, rgb(142, 199, 251), rgb(28, 85, 170))', + sunset: 'linear-gradient(140deg, rgb(255, 207, 115), rgb(255, 122, 47))', + }, boxShadow: { slider: '0 0 0 5px rgba(0, 0, 0, 0.3)', }, @@ -192,7 +214,7 @@ const config = ({}) => ({ require('@tailwindcss/typography'), // require('@plaiceholder/tailwindcss'), require('@tailwindcss/forms'), - radixPlugin({ colors }), + radixPlugin({ colors: radixColors }), require('tailwindcss-radix')({ variantPrefix: 'radix' }), ], variants: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8e0d17ff4..3cd306bdc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -82,6 +82,9 @@ importers: '@heroicons/react': specifier: 2.0.17 version: 2.0.17(react@18.2.0) + '@jeromefitz/shared': + specifier: workspace:* + version: link:../shared '@radix-ui/primitive': specifier: 1.0.0 version: 1.0.0 @@ -270,8 +273,8 @@ importers: specifier: 6.0.10 version: 6.0.10(react@18.2.0) next: - specifier: 13.3.4 - version: 13.3.4(react-dom@18.2.0)(react@18.2.0) + specifier: 13.4.1 + version: 13.4.1(react-dom@18.2.0)(react@18.2.0) react: specifier: 18.2.0 version: 18.2.0 @@ -361,6 +364,9 @@ importers: packages/next-notion: dependencies: + '@jeromefitz/shared': + specifier: workspace:* + version: link:../shared '@jeromefitz/utils': specifier: 2.2.2 version: 2.2.2(lodash@4.17.21) @@ -476,6 +482,9 @@ importers: '@tanem/react-nprogress': specifier: 5.0.37 version: 5.0.37(react-dom@18.2.0)(react@18.2.0) + clsx: + specifier: 1.2.1 + version: 1.2.1 fathom-client: specifier: 3.5.0 version: 3.5.0 @@ -500,6 +509,9 @@ importers: swr: specifier: 2.1.5 version: 2.1.5(react@18.2.0) + tailwind-merge: + specifier: 1.12.0 + version: 1.12.0 devDependencies: '@types/lodash': specifier: 4.14.194 @@ -510,9 +522,6 @@ importers: '@types/react-dom': specifier: 18.2.4 version: 18.2.4 - next-notion: - specifier: workspace:* - version: link:../next-notion packages/storybook-config: devDependencies: @@ -604,7 +613,365 @@ importers: specifier: 2.8.0 version: 2.8.0 - sites/jeromefitzgerald.com: + sites/jeromefitzgerald.com: + dependencies: + '@heroicons/react': + specifier: 2.0.17 + version: 2.0.17(react@18.2.0) + '@jeromefitz/design-system': + specifier: 4.2.1 + version: 4.2.1(@heroicons/react@2.0.17)(@radix-ui/react-icons@1.3.0)(@types/react@18.2.6)(cmdk@0.2.0)(framer-motion@10.12.8)(lodash@4.17.21)(next@13.4.1)(react-dom@18.2.0)(react@18.2.0)(swr@2.1.5) + '@jeromefitz/notion': + specifier: 4.0.5 + version: 4.0.5(@jeromefitz/utils@2.2.2)(lodash@4.17.21) + '@jeromefitz/spotify': + specifier: 3.0.3 + version: 3.0.3(@jeromefitz/utils@2.2.2)(lodash@4.17.21)(sharp@0.32.1) + '@jeromefitz/utils': + specifier: 2.2.2 + version: 2.2.2(lodash@4.17.21) + '@mantine/hooks': + specifier: 6.0.10 + version: 6.0.10(react@18.2.0) + '@radix-ui/primitive': + specifier: 1.0.0 + version: 1.0.0 + '@radix-ui/react-accessible-icon': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-accordion': + specifier: 1.1.1 + version: 1.1.1(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-alert-dialog': + specifier: 1.0.3 + version: 1.0.3(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-announce': + specifier: 0.1.7 + version: 0.1.7(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-arrow': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-aspect-ratio': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-avatar': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-checkbox': + specifier: 1.0.3 + version: 1.0.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-collapsible': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-collection': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-context': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-context-menu': + specifier: 2.1.3 + version: 2.1.3(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-dialog': + specifier: 1.0.3 + version: 1.0.3(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-direction': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-dismissable-layer': + specifier: 1.0.3 + version: 1.0.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-dropdown-menu': + specifier: 2.0.4 + version: 2.0.4(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-focus-scope': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-hover-card': + specifier: 1.0.5 + version: 1.0.5(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-icons': + specifier: 1.3.0 + version: 1.3.0(react@18.2.0) + '@radix-ui/react-id': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-label': + specifier: 2.0.1 + version: 2.0.1(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-menu': + specifier: 2.0.4 + version: 2.0.4(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-navigation-menu': + specifier: 1.1.2 + version: 1.1.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-popover': + specifier: 1.0.5 + version: 1.0.5(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-popper': + specifier: 1.1.1 + version: 1.1.1(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': + specifier: 1.0.0 + version: 1.0.0(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-progress': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-radio-group': + specifier: 1.1.2 + version: 1.1.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': + specifier: 1.0.3 + version: 1.0.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-scroll-area': + specifier: 1.0.3 + version: 1.0.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-select': + specifier: 1.2.1 + version: 1.2.1(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-separator': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slider': + specifier: 1.1.1 + version: 1.1.1(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': + specifier: 1.0.1 + version: 1.0.1(react@18.2.0) + '@radix-ui/react-switch': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-tabs': + specifier: 1.0.3 + version: 1.0.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toast': + specifier: 1.1.3 + version: 1.1.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toggle': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toggle-group': + specifier: 1.0.3 + version: 1.0.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toolbar': + specifier: 1.0.3 + version: 1.0.3(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-tooltip': + specifier: 1.0.5 + version: 1.0.5(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-use-controllable-state': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-use-escape-keydown': + specifier: 1.0.2 + version: 1.0.2(react@18.2.0) + '@radix-ui/react-use-layout-effect': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-use-previous': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-use-rect': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-use-size': + specifier: 1.0.0 + version: 1.0.0(react@18.2.0) + '@radix-ui/react-visually-hidden': + specifier: 1.0.2 + version: 1.0.2(react-dom@18.2.0)(react@18.2.0) + '@tanem/react-nprogress': + specifier: 5.0.37 + version: 5.0.37(react-dom@18.2.0)(react@18.2.0) + '@upstash/ratelimit': + specifier: 0.4.2 + version: 0.4.2(@upstash/redis@1.20.6) + '@upstash/redis': + specifier: 1.20.6 + version: 1.20.6 + '@vercel/analytics': + specifier: 1.0.1 + version: 1.0.1 + '@vercel/og': + specifier: 0.5.4 + version: 0.5.4 + clsx: + specifier: 1.2.1 + version: 1.2.1 + cmdk: + specifier: 0.2.0 + version: 0.2.0(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) + date-fns: + specifier: 2.30.0 + version: 2.30.0 + date-fns-tz: + specifier: 2.0.0 + version: 2.0.0(date-fns@2.30.0) + fast-json-stable-stringify: + specifier: 2.1.0 + version: 2.1.0 + fathom-client: + specifier: 3.5.0 + version: 3.5.0 + focus-trap-react: + specifier: 10.1.1 + version: 10.1.1(react-dom@18.2.0)(react@18.2.0) + framer-motion: + specifier: 10.12.8 + version: 10.12.8(react-dom@18.2.0)(react@18.2.0) + github-slugger: + specifier: 2.0.0 + version: 2.0.0 + immer: + specifier: 10.0.1 + version: 10.0.1 + ioredis: + specifier: 5.3.2 + version: 5.3.2 + isomorphic-unfetch: + specifier: 4.0.2 + version: 4.0.2 + ms: + specifier: 3.0.0-canary.1 + version: 3.0.0-canary.1 + next: + specifier: 13.4.1 + version: 13.4.1(react-dom@18.2.0)(react@18.2.0) + next-sitemap: + specifier: 4.0.9 + version: 4.0.9(next@13.4.1) + next-themes: + specifier: 0.2.1 + version: 0.2.1(next@13.4.1)(react-dom@18.2.0)(react@18.2.0) + plaiceholder: + specifier: 2.5.0 + version: 2.5.0(sharp@0.32.1) + pluralize: + specifier: 8.0.0 + version: 8.0.0 + podcast: + specifier: 2.0.1 + version: 2.0.1 + ramda: + specifier: 0.29.0 + version: 0.29.0 + react: + specifier: 18.2.0 + version: 18.2.0 + react-dom: + specifier: 18.2.0 + version: 18.2.0(react@18.2.0) + react-swipeable: + specifier: 7.0.0 + version: 7.0.0(react@18.2.0) + react-use: + specifier: 17.4.0 + version: 17.4.0(react-dom@18.2.0)(react@18.2.0) + react-wrap-balancer: + specifier: 0.4.1 + version: 0.4.1(react@18.2.0) + server-only: + specifier: 0.0.1 + version: 0.0.1 + sharp: + specifier: 0.32.1 + version: 0.32.1 + smoothscroll-polyfill: + specifier: 0.4.4 + version: 0.4.4 + swr: + specifier: 2.1.5 + version: 2.1.5(react@18.2.0) + title: + specifier: 3.5.3 + version: 3.5.3 + ts-node: + specifier: 10.9.1 + version: 10.9.1(@types/node@18.16.5)(typescript@5.0.4) + use-sound: + specifier: 4.0.1 + version: 4.0.1(react@18.2.0) + uuid: + specifier: 9.0.0 + version: 9.0.0 + zod: + specifier: 3.21.4 + version: 3.21.4 + zustand: + specifier: 4.3.8 + version: 4.3.8(immer@10.0.1)(react@18.2.0) + devDependencies: + '@jeromefitz/jest-config': + specifier: workspace:* + version: link:../../packages/jest-config + '@jeromefitz/lighthouse-config': + specifier: workspace:* + version: link:../../packages/lighthouse-config + '@jeromefitz/next-config': + specifier: workspace:* + version: link:../../packages/next-config + '@jeromefitz/playwright-config': + specifier: workspace:* + version: link:../../packages/playwright-config + '@jeromefitz/shared': + specifier: workspace:* + version: link:../../packages/shared + '@jeromefitz/storybook-config': + specifier: workspace:* + version: link:../../packages/storybook-config + '@jeromefitz/tailwind-config': + specifier: workspace:* + version: link:../../packages/tailwind-config + '@jeromefitz/tsconfig': + specifier: 1.1.3 + version: 1.1.3 + '@types/ms': + specifier: 0.7.31 + version: 0.7.31 + '@types/pluralize': + specifier: 0.0.29 + version: 0.0.29 + '@types/ramda': + specifier: 0.29.1 + version: 0.29.1 + '@types/react': + specifier: 18.2.6 + version: 18.2.6 + '@types/react-dom': + specifier: 18.2.4 + version: 18.2.4 + '@types/title': + specifier: 3.4.1 + version: 3.4.1 + '@types/uuid': + specifier: 9.0.1 + version: 9.0.1 + next-notion: + specifier: workspace:* + version: link:../../packages/next-notion + next-unused: + specifier: 0.0.6 + version: 0.0.6 + tailwind-merge: + specifier: 1.12.0 + version: 1.12.0 + + sites/test.com: dependencies: '@heroicons/react': specifier: 2.0.17 @@ -624,6 +991,9 @@ importers: '@mantine/hooks': specifier: 6.0.10 version: 6.0.10(react@18.2.0) + '@notionhq/client': + specifier: 2.2.5 + version: 2.2.5 '@radix-ui/primitive': specifier: 1.0.0 version: 1.0.0 @@ -3213,6 +3583,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.13.11 + dev: true /@babel/runtime@7.21.5: resolution: {integrity: sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==} @@ -4377,10 +4748,6 @@ packages: - utf-8-validate dev: true - /@next/env@13.3.4: - resolution: {integrity: sha512-oTK/wRV2qga86m/4VdrR1+/56UA6U1Qv3sIgowB+bZjahniZLEG5BmmQjfoGv7ZuLXBZ8Eec6hkL9BqJcrEL2g==} - dev: true - /@next/env@13.4.1: resolution: {integrity: sha512-eD6WCBMFjLFooLM19SIhSkWBHtaFrZFfg2Cxnyl3vS3DAdFRfnx5TY2RxlkuKXdIRCC0ySbtK9JXXt8qLCqzZg==} @@ -4390,15 +4757,6 @@ packages: glob: 7.1.7 dev: true - /@next/swc-darwin-arm64@13.3.4: - resolution: {integrity: sha512-vux7RWfzxy1lD21CMwZsy9Ej+0+LZdIIj1gEhVmzOQqQZ5N56h8JamrjIVCfDL+Lpj8KwOmFZbPHE8qaYnL2pg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@next/swc-darwin-arm64@13.4.1: resolution: {integrity: sha512-eF8ARHtYfnoYtDa6xFHriUKA/Mfj/cCbmKb3NofeKhMccs65G6/loZ15a6wYCCx4rPAd6x4t1WmVYtri7EdeBg==} engines: {node: '>= 10'} @@ -4407,15 +4765,6 @@ packages: requiresBuild: true optional: true - /@next/swc-darwin-x64@13.3.4: - resolution: {integrity: sha512-1tb+6JT98+t7UIhVQpKL7zegKnCs9RKU6cKNyj+DYKuC/NVl49/JaIlmwCwK8Ibl+RXxJrK7uSXSIO71feXsgw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@next/swc-darwin-x64@13.4.1: resolution: {integrity: sha512-7cmDgF9tGWTgn5Gw+vP17miJbH4wcraMHDCOHTYWkO/VeKT73dUWG23TNRLfgtCNSPgH4V5B4uLHoZTanx9bAw==} engines: {node: '>= 10'} @@ -4424,15 +4773,6 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-arm64-gnu@13.3.4: - resolution: {integrity: sha512-UqcKkYTKslf5YAJNtZ5XV1D5MQJIkVtDHL8OehDZERHzqOe7jvy41HFto33IDPPU8gJiP5eJb3V9U26uifqHjw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@next/swc-linux-arm64-gnu@13.4.1: resolution: {integrity: sha512-qwJqmCri2ie8aTtE5gjTSr8S6O8B67KCYgVZhv9gKH44yvc/zXbAY8u23QGULsYOyh1islWE5sWfQNLOj9iryg==} engines: {node: '>= 10'} @@ -4441,15 +4781,6 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-arm64-musl@13.3.4: - resolution: {integrity: sha512-HE/FmE8VvstAfehyo/XsrhGgz97cEr7uf9IfkgJ/unqSXE0CDshDn/4as6rRid74eDR8/exi7c2tdo49Tuqxrw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@next/swc-linux-arm64-musl@13.4.1: resolution: {integrity: sha512-qcC54tWNGDv/VVIFkazxhqH1Bnagjfs4enzELVRlUOoJPD2BGJTPI7z08pQPbbgxLtRiu8gl2mXvpB8WlOkMeA==} engines: {node: '>= 10'} @@ -4458,15 +4789,6 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-x64-gnu@13.3.4: - resolution: {integrity: sha512-xU+ugaupGA4SL5aK1ZYEqVHrW3TPOhxVcpaJLfpANm2443J4GfxCmOacu9XcSgy5c51Mq7C9uZ1LODKHfZosRQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@next/swc-linux-x64-gnu@13.4.1: resolution: {integrity: sha512-9TeWFlpLsBosZ+tsm/rWBaMwt5It9tPH8m3nawZqFUUrZyGRfGcI67js774vtx0k3rL9qbyY6+3pw9BCVpaYUA==} engines: {node: '>= 10'} @@ -4475,15 +4797,6 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-x64-musl@13.3.4: - resolution: {integrity: sha512-cZvmf5KcYeTfIK6bCypfmxGUjme53Ep7hx94JJtGrYgCA1VwEuYdh+KouubJaQCH3aqnNE7+zGnVEupEKfoaaA==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@next/swc-linux-x64-musl@13.4.1: resolution: {integrity: sha512-sNDGaWmSqTS4QRUzw61wl4mVPeSqNIr1OOjLlQTRuyInxMxtqImRqdvzDvFTlDfdeUMU/DZhWGYoHrXLlZXe6A==} engines: {node: '>= 10'} @@ -4492,15 +4805,6 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-arm64-msvc@13.3.4: - resolution: {integrity: sha512-7dL+CAUAjmgnVbjXPIpdj7/AQKFqEUL3bKtaOIE1JzJ5UMHHAXCPwzQtibrsvQpf9MwcAmiv8aburD3xH1xf8w==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@next/swc-win32-arm64-msvc@13.4.1: resolution: {integrity: sha512-+CXZC7u1iXdLRudecoUYbhbsXpglYv8KFYsFxKBPn7kg+bk7eJo738wAA4jXIl8grTF2mPdmO93JOQym+BlYGA==} engines: {node: '>= 10'} @@ -4509,15 +4813,6 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-ia32-msvc@13.3.4: - resolution: {integrity: sha512-qplTyzEl1vPkS+/DRK3pKSL0HeXrPHkYsV7U6gboHYpfqoHY+bcLUj3gwVUa9PEHRIoq4vXvPzx/WtzE6q52ng==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@next/swc-win32-ia32-msvc@13.4.1: resolution: {integrity: sha512-vIoXVVc7UYO68VwVMDKwJC2+HqAZQtCYiVlApyKEeIPIQpz2gpufzGxk1z3/gwrJt/kJ5CDZjlhYDCzd3hdz+g==} engines: {node: '>= 10'} @@ -4526,15 +4821,6 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-x64-msvc@13.3.4: - resolution: {integrity: sha512-usdvZT7JHrTuXC+4OKN5mCzUkviFkCyJJTkEz8jhBpucg+T7s83e7owm3oNFzmj5iKfvxU2St6VkcnSgpFvEYA==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@next/swc-win32-x64-msvc@13.4.1: resolution: {integrity: sha512-n8V5ImLQZibKTu10UUdI3nIeTLkliEXe628qxqW9v8My3BAH2a7H0SaCqkV2OgqFnn8sG1wxKYw9/SNJ632kSA==} engines: {node: '>= 10'} @@ -4576,6 +4862,16 @@ packages: transitivePeerDependencies: - encoding + /@notionhq/client@2.2.5: + resolution: {integrity: sha512-NobSaeSK0DMuxAIy2pg53Iv850tGFxXYEYacFBQgO634L1uwQv7WQCAdeFQpD3kJiEycQfSYv6RGC5VENEXjiQ==} + engines: {node: '>=12'} + dependencies: + '@types/node-fetch': 2.6.3 + node-fetch: 2.6.9 + transitivePeerDependencies: + - encoding + dev: false + /@octokit/auth-token@3.0.3: resolution: {integrity: sha512-/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA==} engines: {node: '>= 14'} @@ -4780,7 +5076,7 @@ packages: /@radix-ui/primitive@1.0.0: resolution: {integrity: sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 /@radix-ui/react-accessible-icon@1.0.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-YcZBOOB1xdbVVBK0sQzrpU4kABloQGfjKdp60mmFFq7oIKcWuH7d+auYS63vZMZH1rAijU6TFLawt2hLoPZWfA==} @@ -4788,7 +5084,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-visually-hidden': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -4799,7 +5095,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collapsible': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) @@ -4818,7 +5114,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -4836,7 +5132,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -4855,7 +5151,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0) @@ -4868,7 +5164,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -4879,7 +5175,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -4890,7 +5186,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0) @@ -4904,7 +5200,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -4922,7 +5218,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -4940,7 +5236,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) @@ -4953,7 +5249,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 react: 18.2.0 /@radix-ui/react-context-menu@2.1.3(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): @@ -4962,7 +5258,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-menu': 2.0.4(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) @@ -4980,7 +5276,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-menu': 2.0.4(react-dom@18.2.0)(react@18.2.0) @@ -4998,7 +5294,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 react: 18.2.0 /@radix-ui/react-dialog@1.0.0(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0): @@ -5061,7 +5357,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5087,7 +5383,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5113,7 +5409,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 react: 18.2.0 /@radix-ui/react-dismissable-layer@1.0.0(react-dom@18.2.0)(react@18.2.0): @@ -5138,7 +5434,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) @@ -5153,7 +5449,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5172,7 +5468,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5191,7 +5487,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 react: 18.2.0 /@radix-ui/react-focus-scope@1.0.0(react-dom@18.2.0)(react@18.2.0): @@ -5214,7 +5510,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0) @@ -5227,7 +5523,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5248,7 +5544,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5277,7 +5573,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0) react: 18.2.0 @@ -5287,7 +5583,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -5298,7 +5594,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5328,7 +5624,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5359,7 +5655,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5383,7 +5679,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5410,7 +5706,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5438,7 +5734,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@floating-ui/react-dom': 0.7.2(@types/react@18.2.6)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-arrow': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5460,7 +5756,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@floating-ui/react-dom': 0.7.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-arrow': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5495,7 +5791,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -5506,7 +5802,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0) react: 18.2.0 @@ -5530,7 +5826,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-slot': 1.0.1(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -5541,7 +5837,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -5553,7 +5849,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5573,7 +5869,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5592,7 +5888,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/number': 1.0.0 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5611,7 +5907,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/number': 1.0.0 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) @@ -5644,7 +5940,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/number': 1.0.0 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) @@ -5678,7 +5974,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -5689,7 +5985,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/number': 1.0.0 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) @@ -5719,7 +6015,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) react: 18.2.0 @@ -5729,7 +6025,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5746,7 +6042,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-direction': 1.0.0(react@18.2.0) @@ -5764,7 +6060,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) @@ -5786,7 +6082,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-direction': 1.0.0(react@18.2.0) @@ -5803,7 +6099,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-use-controllable-state': 1.0.0(react@18.2.0) @@ -5816,7 +6112,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-context': 1.0.0(react@18.2.0) '@radix-ui/react-direction': 1.0.0(react@18.2.0) @@ -5833,7 +6129,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5857,7 +6153,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/primitive': 1.0.0 '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0) '@radix-ui/react-context': 1.0.0(react@18.2.0) @@ -5881,7 +6177,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 react: 18.2.0 /@radix-ui/react-use-controllable-state@1.0.0(react@18.2.0): @@ -5889,7 +6185,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0) react: 18.2.0 @@ -5908,7 +6204,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0) react: 18.2.0 @@ -5917,7 +6213,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 react: 18.2.0 /@radix-ui/react-use-previous@1.0.0(react@18.2.0): @@ -5925,7 +6221,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 react: 18.2.0 /@radix-ui/react-use-rect@1.0.0(react@18.2.0): @@ -5933,7 +6229,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/rect': 1.0.0 react: 18.2.0 @@ -5942,7 +6238,7 @@ packages: peerDependencies: react: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0) react: 18.2.0 @@ -5952,7 +6248,7 @@ packages: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -9303,7 +9599,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001482 + caniuse-lite: 1.0.30001486 electron-to-chromium: 1.4.369 node-releases: 2.0.10 update-browserslist-db: 1.0.11(browserslist@4.21.5) @@ -9478,6 +9774,10 @@ packages: /caniuse-lite@1.0.30001482: resolution: {integrity: sha512-F1ZInsg53cegyjroxLNW9DmrEQ1SuGRTO1QlpA0o2/6OpQ0gFeDRoq1yFmnr8Sakn9qwwt9DmbxHB6w167OSuQ==} + dev: true + + /caniuse-lite@1.0.30001486: + resolution: {integrity: sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==} /cardinal@2.1.1: resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==} @@ -10298,7 +10598,7 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: - '@babel/runtime': 7.21.0 + '@babel/runtime': 7.21.5 /dateformat@3.0.3: resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==} @@ -14713,50 +15013,6 @@ packages: - supports-color dev: true - /next@13.3.4(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-sod7HeokBSvH5QV0KB+pXeLfcXUlLrGnVUXxHpmhilQ+nQYT3Im2O8DswD5e4uqbR8Pvdu9pcWgb1CbXZQZlmQ==} - engines: {node: '>=16.8.0'} - hasBin: true - peerDependencies: - '@opentelemetry/api': ^1.1.0 - fibers: '>= 3.1.0' - node-sass: ^6.0.0 || ^7.0.0 - react: ^18.2.0 - react-dom: ^18.2.0 - sass: ^1.3.0 - peerDependenciesMeta: - '@opentelemetry/api': - optional: true - fibers: - optional: true - node-sass: - optional: true - sass: - optional: true - dependencies: - '@next/env': 13.3.4 - '@swc/helpers': 0.5.1 - busboy: 1.6.0 - caniuse-lite: 1.0.30001482 - postcss: 8.4.14 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - styled-jsx: 5.1.1(react@18.2.0) - optionalDependencies: - '@next/swc-darwin-arm64': 13.3.4 - '@next/swc-darwin-x64': 13.3.4 - '@next/swc-linux-arm64-gnu': 13.3.4 - '@next/swc-linux-arm64-musl': 13.3.4 - '@next/swc-linux-x64-gnu': 13.3.4 - '@next/swc-linux-x64-musl': 13.3.4 - '@next/swc-win32-arm64-msvc': 13.3.4 - '@next/swc-win32-ia32-msvc': 13.3.4 - '@next/swc-win32-x64-msvc': 13.3.4 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - dev: true - /next@13.4.1: resolution: {integrity: sha512-JBw2kAIyhKDpjhEWvNVoFeIzNp9xNxg8wrthDOtMctfn3EpqGCmW0FSviNyGgOSOSn6zDaX48pmvbdf6X2W9xA==} engines: {node: '>=16.8.0'} @@ -14781,7 +15037,7 @@ packages: '@next/env': 13.4.1 '@swc/helpers': 0.5.1 busboy: 1.6.0 - caniuse-lite: 1.0.30001482 + caniuse-lite: 1.0.30001486 postcss: 8.4.14 styled-jsx: 5.1.1 zod: 3.21.4 @@ -14824,7 +15080,7 @@ packages: '@next/env': 13.4.1 '@swc/helpers': 0.5.1 busboy: 1.6.0 - caniuse-lite: 1.0.30001482 + caniuse-lite: 1.0.30001486 postcss: 8.4.14 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) diff --git a/sites/jeromefitzgerald.com/src/app/(notion)/books/page.tsx b/sites/jeromefitzgerald.com/src/app/(notion)/books/page.tsx index 8e739aa63..9fdb3da2a 100644 --- a/sites/jeromefitzgerald.com/src/app/(notion)/books/page.tsx +++ b/sites/jeromefitzgerald.com/src/app/(notion)/books/page.tsx @@ -5,6 +5,7 @@ import { Pencil2Icon as PencilWithPaper, } from '@jeromefitz/ds/components/Icon' import type { Page } from '@jeromefitz/notion/schema' +import { cx } from '@jeromefitz/shared/src/utils' import _filter from 'lodash/filter' import _map from 'lodash/map' import _orderBy from 'lodash/orderBy' @@ -15,7 +16,6 @@ import { Debug } from '~components/Debug' // @todo(next) https://github.com/vercel/next.js/issues/46756 // import { Icon } from '@jeromefitz/ds/Icon' import { PageHeading } from '~ui/PageHeading' -import { cx } from '~utils/cx' // import { log } from '~utils/log' const ROUTE_TYPE = 'books' diff --git a/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Listing.tsx b/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Listing.tsx index 2e6a5b0fa..ad594a5b0 100644 --- a/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Listing.tsx +++ b/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Listing.tsx @@ -1,11 +1,11 @@ import type { Event } from '@jeromefitz/notion/schema' import { TZ } from '@jeromefitz/shared/src/lib/constants' +import { cx } from '@jeromefitz/shared/src/utils' import _parseISO from 'date-fns/parseISO' import { formatInTimeZone as _formatInTimeZone } from 'date-fns-tz' import _orderBy from 'lodash/orderBy' import { Anchor } from '~components/Anchor' -import { cx } from '~utils/cx' import { formatDateForSlug } from '~utils/formatDateForSlug' import { filterForEventsInFuture } from '~utils/isEventInFuture' import { filterForEventsInPast } from '~utils/isEventInPast' diff --git a/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Slug.tsx b/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Slug.tsx index 0643a2c4a..5513d6537 100644 --- a/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Slug.tsx +++ b/sites/jeromefitzgerald.com/src/app/(notion)/events/[[...catchAll]]/Slug.tsx @@ -3,6 +3,7 @@ import { ButtonLink } from '@jeromefitz/ds/components/Button' import { ExternalLinkIcon as ExternalLink } from '@jeromefitz/ds/components/Icon' import type { Event } from '@jeromefitz/notion/schema' import { TZ } from '@jeromefitz/shared/src/lib/constants' +import { cx } from '@jeromefitz/shared/src/utils' import { isObject } from '@jeromefitz/utils' import _parseISO from 'date-fns/parseISO' import { formatInTimeZone as _formatInTimeZone } from 'date-fns-tz' @@ -12,7 +13,6 @@ import { Meta } from '~components/Meta' // @todo(next) https://github.com/vercel/next.js/issues/46756 // import { Icon } from '@jeromefitz/ds/components/Icon' import { useNotion } from '~hooks/useNotion' -import { cx } from '~utils/cx' import { isEventInPast } from '~utils/isEventInPast' // import { log } from '~utils/log' diff --git a/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Item.tsx b/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Item.tsx index 608353523..bc41641ac 100644 --- a/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Item.tsx +++ b/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Item.tsx @@ -1,11 +1,11 @@ 'use client' +import { cx } from '@jeromefitz/shared/src/utils' import * as AspectRatio from '@radix-ui/react-aspect-ratio' import { motion } from 'framer-motion' import Image from 'next/image' import { useState } from 'react' import useSWR from 'swr' -import { cx } from '~utils/cx' // import { log } from '~utils/log' // // import { UpcomingEvents } from './UpcomingEvents' diff --git a/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Listing.tsx b/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Listing.tsx index 321826fea..1bcdedae3 100644 --- a/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Listing.tsx +++ b/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/Listing.tsx @@ -1,9 +1,7 @@ import type { Show } from '@jeromefitz/notion/schema' -// eslint-disable-next-line no-restricted-imports +import { cx } from '@jeromefitz/shared/src/utils' import NextLink from 'next/link' -import { cx } from '~utils/cx' - import { Item } from './Item' // eslint-disable-next-line @typescript-eslint/no-unused-vars diff --git a/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/UpcomingEvents.tsx b/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/UpcomingEvents.tsx index 8f749fd7c..0d527c98f 100644 --- a/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/UpcomingEvents.tsx +++ b/sites/jeromefitzgerald.com/src/app/(notion)/shows/[[...catchAll]]/UpcomingEvents.tsx @@ -1,9 +1,9 @@ 'use client' +import { cx } from '@jeromefitz/shared/src/utils' import _filter from 'lodash/filter' import { Listing } from '~app/(notion)/events/[[...catchAll]]/Listing' import { useNotion } from '~hooks/useNotion' -import { cx } from '~utils/cx' import { isEventInFuture } from '~utils/isEventInFuture' const ROUTE_TYPE = 'events' diff --git a/sites/jeromefitzgerald.com/src/app/layout.tsx b/sites/jeromefitzgerald.com/src/app/layout.tsx index 39f0c88a1..b00ecfcb5 100644 --- a/sites/jeromefitzgerald.com/src/app/layout.tsx +++ b/sites/jeromefitzgerald.com/src/app/layout.tsx @@ -3,6 +3,7 @@ import '@jeromefitz/tailwind-config/styles/globals.css' // import '~styles/output.css' +import { cx } from '@jeromefitz/shared/src/utils' import localFont from 'next/font/local' import { Fragment, Suspense } from 'react' @@ -14,7 +15,6 @@ import { NavigationBar } from '~components/NavigationBar' import { Providers } from '~components/Providers' import { ScrollToTopHack } from '~components/ScrollToTopHack' import { metadata as seo } from '~config/metadata' -import { cx } from '~utils/cx' // import { log } from '~utils/log' // const DEBUG_KEY = 'layout.ts >> (root) > ' diff --git a/sites/jeromefitzgerald.com/src/app/testing/page.tsx b/sites/jeromefitzgerald.com/src/app/testing/page.tsx index 613cd587b..b0fe65cd0 100644 --- a/sites/jeromefitzgerald.com/src/app/testing/page.tsx +++ b/sites/jeromefitzgerald.com/src/app/testing/page.tsx @@ -1,10 +1,10 @@ +import { cx } from '@jeromefitz/shared/src/utils' import Image from 'next/image' import { Suspense } from 'react' // import { Anchor } from '~components/Anchor' import { Debug } from '~components/Debug' import { PageHeading } from '~ui/PageHeading' -import { cx } from '~utils/cx' // import { log } from '~utils/log' // const ROUTE_TYPE = 'testing' diff --git a/sites/jeromefitzgerald.com/src/components/Anchor/Anchor.tsx b/sites/jeromefitzgerald.com/src/components/Anchor/Anchor.tsx index e6b0bcf5c..8bf2db131 100644 --- a/sites/jeromefitzgerald.com/src/components/Anchor/Anchor.tsx +++ b/sites/jeromefitzgerald.com/src/components/Anchor/Anchor.tsx @@ -15,7 +15,7 @@ import { handleRouterChange, LinkRouterChangeContext, } from '~context/LinkRouterChangeContext' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' function AnchorNav({ href, diff --git a/sites/jeromefitzgerald.com/src/components/Debug/Debug.tsx b/sites/jeromefitzgerald.com/src/components/Debug/Debug.tsx index 09f74da4f..96df1eccc 100644 --- a/sites/jeromefitzgerald.com/src/components/Debug/Debug.tsx +++ b/sites/jeromefitzgerald.com/src/components/Debug/Debug.tsx @@ -6,7 +6,7 @@ import { AnimatePresence, motion, useAnimationControls } from 'framer-motion' import { usePathname } from 'next/navigation' import { useEffect, useState } from 'react' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' // import { log } from '~utils/log' // const DEBUG_KEY = '~components/Debug >> ' diff --git a/sites/jeromefitzgerald.com/src/components/Footer/Footer.tsx b/sites/jeromefitzgerald.com/src/components/Footer/Footer.tsx index baa6e3123..0fc2c0af5 100644 --- a/sites/jeromefitzgerald.com/src/components/Footer/Footer.tsx +++ b/sites/jeromefitzgerald.com/src/components/Footer/Footer.tsx @@ -23,7 +23,7 @@ import buildInfo from '~config/build-info.json' // @todo(next) https://github.com/vercel/next.js/issues/46756 // import { Icon } from '@jeromefitz/ds/components/Icon' import { Tooltip } from '~ui/Tooltip' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' const { isBranchMain, prerelease, version } = buildInfo diff --git a/sites/jeromefitzgerald.com/src/components/Loading/Loading.tsx b/sites/jeromefitzgerald.com/src/components/Loading/Loading.tsx index 39bd696ec..463b58d40 100644 --- a/sites/jeromefitzgerald.com/src/components/Loading/Loading.tsx +++ b/sites/jeromefitzgerald.com/src/components/Loading/Loading.tsx @@ -2,7 +2,7 @@ import { useNProgress } from '@tanem/react-nprogress' import { motion } from 'framer-motion' import { useEffect } from 'react' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' const Loading: React.FC<{ isRouteChanging: boolean }> = ({ isRouteChanging }) => { const { isFinished, progress } = useNProgress({ diff --git a/sites/jeromefitzgerald.com/src/components/Meta/Meta.tsx b/sites/jeromefitzgerald.com/src/components/Meta/Meta.tsx index 08f228df5..8d01775ac 100644 --- a/sites/jeromefitzgerald.com/src/components/Meta/Meta.tsx +++ b/sites/jeromefitzgerald.com/src/components/Meta/Meta.tsx @@ -12,7 +12,7 @@ import pluralize from 'pluralize' import useSWRImmutable from 'swr/immutable' import { notionConfig } from '~config/index' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' // import { log } from '~utils/log' const { NOTION } = notionConfig diff --git a/sites/jeromefitzgerald.com/src/components/Music/Music.tsx b/sites/jeromefitzgerald.com/src/components/Music/Music.tsx index e1acafa38..44f0aba63 100644 --- a/sites/jeromefitzgerald.com/src/components/Music/Music.tsx +++ b/sites/jeromefitzgerald.com/src/components/Music/Music.tsx @@ -12,7 +12,7 @@ import { useSpotify } from '~hooks/useSpotify' // @todo(next) https://github.com/vercel/next.js/issues/46756 // import { Icon } from '@jeromefitz/ds/components/Icon' import { RadioGroup } from '~ui/RadioGroup' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' // import { log } from '~utils/log' // const DEBUG_KEY = `~components/Music >> ` diff --git a/sites/jeromefitzgerald.com/src/components/Music/NowPlaying/NowPlaying.tsx b/sites/jeromefitzgerald.com/src/components/Music/NowPlaying/NowPlaying.tsx index 93a46168b..907994d03 100644 --- a/sites/jeromefitzgerald.com/src/components/Music/NowPlaying/NowPlaying.tsx +++ b/sites/jeromefitzgerald.com/src/components/Music/NowPlaying/NowPlaying.tsx @@ -16,7 +16,7 @@ import { Anchor } from '~components/Anchor' import { nowPlaying } from '~data/mock/music' // @todo(next) https://github.com/vercel/next.js/issues/46756 // import { Icon } from '@jeromefitz/ds/components/Icon' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' // import { log } from '~utils/log' // const HOUR = 3600000 diff --git a/sites/jeromefitzgerald.com/src/components/Music/Top/Top.tsx b/sites/jeromefitzgerald.com/src/components/Music/Top/Top.tsx index 7646175d9..1eb6a73ee 100644 --- a/sites/jeromefitzgerald.com/src/components/Music/Top/Top.tsx +++ b/sites/jeromefitzgerald.com/src/components/Music/Top/Top.tsx @@ -6,6 +6,7 @@ import { ExternalLinkIcon as ExternalLink, TagIcon as Tag, } from '@jeromefitz/ds/components/Icon' +import { cx } from '@jeromefitz/shared/src/utils' import { useComposedRefs } from '@radix-ui/react-compose-refs' import _map from 'lodash/map' // import _size from 'lodash/size' @@ -34,7 +35,6 @@ import { } from '~ui/Carousel' // @todo(next) https://github.com/vercel/next.js/issues/46756 // import { Icon } from '@jeromefitz/ds/components/Icon' -import { cx } from '~utils/cx' // import { log } from '~utils/log' // const ROUTE_TYPE = 'Top' diff --git a/sites/jeromefitzgerald.com/src/components/Upcoming/Upcoming.tsx b/sites/jeromefitzgerald.com/src/components/Upcoming/Upcoming.tsx index b8bd5447d..071b3926e 100644 --- a/sites/jeromefitzgerald.com/src/components/Upcoming/Upcoming.tsx +++ b/sites/jeromefitzgerald.com/src/components/Upcoming/Upcoming.tsx @@ -18,7 +18,7 @@ import { } from '~context/LinkRouterChangeContext' import { useDimensions } from '~hooks/useDimensions' import { useNotion } from '~hooks/useNotion' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' import { filterForEventsInFuture } from '~utils/isEventInFuture' // import { log } from '~utils/log' diff --git a/sites/jeromefitzgerald.com/src/pages/api/v1/og/index.tsx b/sites/jeromefitzgerald.com/src/pages/api/v1/og/index.tsx index 8f154eb26..fc478d58b 100644 --- a/sites/jeromefitzgerald.com/src/pages/api/v1/og/index.tsx +++ b/sites/jeromefitzgerald.com/src/pages/api/v1/og/index.tsx @@ -1,7 +1,7 @@ import { ImageResponse } from '@vercel/og' import { NextRequest } from 'next/server' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' export const config = { runtime: 'edge', diff --git a/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel.tsx b/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel.tsx index 36f06c1a1..da0e3ed37 100644 --- a/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel.tsx +++ b/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel.tsx @@ -10,7 +10,7 @@ import { } from 'framer-motion' import { useCallback, useEffect, useRef, useState } from 'react' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' const images = [ '/static/images/carousel-temp/1.jpg', diff --git a/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel2.tsx b/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel2.tsx index fc675721a..70aa58516 100644 --- a/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel2.tsx +++ b/sites/jeromefitzgerald.com/src/playground/Carousel/Carousel2.tsx @@ -3,7 +3,7 @@ import './styles.css' import { animate, motion, useMotionValue, useScroll } from 'framer-motion' import { useEffect, useRef, useState } from 'react' -import { cx } from '~utils/cx' +import { cx } from '@jeromefitz/shared/src/utils' function Carousel2() { const ref = useRef