diff --git a/.config/docker/docs/Dockerfile b/.config/docker/docs/Dockerfile index 150816fd6e..7351b09d48 100644 --- a/.config/docker/docs/Dockerfile +++ b/.config/docker/docs/Dockerfile @@ -3,44 +3,23 @@ FROM node:16.5-alpine AS deps # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. RUN apk add --no-cache libc6-compat WORKDIR /app -COPY next-docs ./ +COPY ./ ./ RUN npm install -g pnpm@latest -RUN pnpm i --ignore-scripts --prod +RUN pnpm i --ignore-scripts # Rebuild the source code only when needed FROM node:16.5-alpine AS builder WORKDIR /app COPY --from=deps /app/ . +ENV NODE_ENV production RUN npm install -g pnpm -RUN pnpm run build -ENV NODE_ENV production +RUN pnpm run build +RUN pnpm run next build # Next.js collects completely anonymous telemetry data about general usage. # Learn more here: https://nextjs.org/telemetry # Uncomment the following line in case you want to disable telemetry. ENV NEXT_TELEMETRY_DISABLED 1 -CMD ["pnpm", "run", "start"] - -# Production image, copy all the files and run next -# FROM node:16.5-alpine AS runner -# WORKDIR /app - -# ENV NODE_ENV production - -# RUN addgroup -g 1001 -S nodejs -# RUN adduser -S nextjs -u 1001 - -# You only need to copy next.config.js if you are NOT using the default configuration -# COPY --from=builder /app/next.config.js ./ -# COPY --from=builder /app/public ./public -# COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next -# COPY --from=builder /app/node_modules ./node_modules -# COPY --from=builder /app/package.json ./package.json - -# USER nextjs - - -# ENV NEXT_TELEMETRY_DISABLED 1 -# CMD ["yarn", "start"] +CMD ["pnpm", "run", "next", "start"] diff --git a/next-docs/CHANGELOG.md b/next-docs/CHANGELOG.md index 30fd7597c2..774261b23a 100644 --- a/next-docs/CHANGELOG.md +++ b/next-docs/CHANGELOG.md @@ -1,5 +1,27 @@ # Change Log +## 7.5.0 + +### Minor Changes + +- Fix shadows & colors + +### Patch Changes + +- Updated dependencies [undefined] + - @heathmont/moon-accordion@7.5.0 + - @heathmont/moon-assets@7.5.0 + - @heathmont/moon-charts@7.5.0 + - @heathmont/moon-components@7.5.0 + - @heathmont/moon-core@7.5.0 + - @heathmont/moon-draggabletable@7.5.0 + - @heathmont/moon-icons@7.5.0 + - @heathmont/moon-pagination@7.5.0 + - @heathmont/moon-popover@7.5.0 + - @heathmont/moon-table@7.5.0 + - @heathmont/moon-themes@7.5.0 + - @heathmont/moon-utils@7.5.0 + ## 7.4.0 ### Minor Changes diff --git a/next-docs/components/sidebar/navigation.ts b/next-docs/components/sidebar/navigation.ts index fc997af968..1809e9efbb 100644 --- a/next-docs/components/sidebar/navigation.ts +++ b/next-docs/components/sidebar/navigation.ts @@ -11,7 +11,6 @@ const navigation = [ children: [ { name: 'Accordion', href: '/components/accordion' }, { name: 'Avatar', href: '/components/avatar' }, - { name: 'Badge', href: '/components/badge' }, { name: 'Button', href: '/components/button' }, { name: 'Carousel', href: '/components/carousel' }, { @@ -80,10 +79,7 @@ const navigation = [ }, { name: 'Switch', href: '/components/switch' }, { name: 'Tabs', href: '/components/tabs' }, - { - name: 'Table', - children: [{ name: 'Table', href: '/components/table/table' }], - }, + { name: 'Table', href: '/components/table/table' }, { name: 'TextInput', href: '/components/textInput' }, { name: 'Tooltip', href: '/components/tooltip' }, ], diff --git a/next-docs/package.json b/next-docs/package.json index 8dab43cb6c..eca095c716 100644 --- a/next-docs/package.json +++ b/next-docs/package.json @@ -1,6 +1,6 @@ { "name": "next-docs", - "version": "7.4.0", + "version": "7.5.0", "private": true, "scripts": { "dev": "next dev", @@ -9,18 +9,18 @@ }, "dependencies": { "@headlessui/react": "1.2.0", - "@heathmont/moon-accordion": "^7.4.0", - "@heathmont/moon-assets": "^7.4.0", - "@heathmont/moon-charts": "^7.4.0", - "@heathmont/moon-components": "^7.4.0", - "@heathmont/moon-core": "^7.4.0", - "@heathmont/moon-draggabletable": "^7.4.0", - "@heathmont/moon-icons": "^7.4.0", - "@heathmont/moon-pagination": "^7.4.0", - "@heathmont/moon-popover": "^7.4.0", - "@heathmont/moon-table": "^7.4.0", - "@heathmont/moon-themes": "^7.4.0", - "@heathmont/moon-utils": "^7.4.0", + "@heathmont/moon-accordion": "workspace:^7.5.0", + "@heathmont/moon-assets": "workspace:^7.5.0", + "@heathmont/moon-charts": "workspace:^7.5.0", + "@heathmont/moon-components": "workspace:^7.5.0", + "@heathmont/moon-core": "workspace:^7.5.0", + "@heathmont/moon-draggabletable": "workspace:^7.5.0", + "@heathmont/moon-icons": "workspace:^7.5.0", + "@heathmont/moon-pagination": "workspace:^7.5.0", + "@heathmont/moon-popover": "workspace:^7.5.0", + "@heathmont/moon-table": "workspace:^7.5.0", + "@heathmont/moon-themes": "workspace:^7.5.0", + "@heathmont/moon-utils": "workspace:^7.5.0", "@types/react": "16.9.9", "@types/styled-components": "5.1.7", "autoprefixer": "10.2.5", diff --git a/next-docs/pages/components/table/table.tsx b/next-docs/pages/components/table/table.tsx index 3e46b79a7c..0710bc28af 100644 --- a/next-docs/pages/components/table/table.tsx +++ b/next-docs/pages/components/table/table.tsx @@ -65,7 +65,7 @@ const DefaultTablePreview = () => { }, ]; - const makeData = (length) => { + const makeData = (length: number) => { return Array.from('_'.repeat(length)).map(() => { return { firstName: 'Test', @@ -186,7 +186,7 @@ const ExpandedRowTablePreview = () => { }, ]; - const makeData = (length) => { + const makeData = (length: number) => { return Array.from('_'.repeat(length)).map(() => { return { firstName: 'Test', diff --git a/next-docs/pages/components/tooltip.tsx b/next-docs/pages/components/tooltip.tsx index ee14b181cc..f014f10553 100644 --- a/next-docs/pages/components/tooltip.tsx +++ b/next-docs/pages/components/tooltip.tsx @@ -13,9 +13,6 @@ const PreviewTooltip = () => { Text with font size 14 - - Bottom - } code={`import { Tooltip, Text } from '@heathmont/moon-core'; @@ -24,9 +21,6 @@ const PreviewTooltip = () => { Text with font size 14 - - Bottom - `} /> ); diff --git a/next-docs/pages/icons.tsx b/next-docs/pages/icons.tsx index 3649418178..1457088da9 100644 --- a/next-docs/pages/icons.tsx +++ b/next-docs/pages/icons.tsx @@ -381,7 +381,7 @@ const Icon: React.FC<{ name: string; onClick: any; selectedIcons: string[] }> = onClick={() => onClick(name)} className={classNames( isShown ? 'text-active bg-active-80' : 'text-gray-400', - 'relative flex flex-col items-center text-sm cursor-pointer rounded-md' + 'relative flex flex-col items-center text-sm cursor-pointer rounded-md hover:bg-active-80 hover:text-active' )} > {children} diff --git a/packages/accordion/CHANGELOG.md b/packages/accordion/CHANGELOG.md index 7587be47fe..04995502e2 100644 --- a/packages/accordion/CHANGELOG.md +++ b/packages/accordion/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## 7.5.0 + +### Minor Changes + +- Fix shadows & colors + +### Patch Changes + +- Updated dependencies [undefined] + - @heathmont/moon-components@7.5.0 + - @heathmont/moon-icons@7.5.0 + - @heathmont/moon-themes@7.5.0 + - @heathmont/moon-utils@7.5.0 + ## 7.4.0 ### Minor Changes diff --git a/packages/accordion/package.json b/packages/accordion/package.json index a70c03cc61..5d4a3ca7ed 100644 --- a/packages/accordion/package.json +++ b/packages/accordion/package.json @@ -1,7 +1,7 @@ { "name": "@heathmont/moon-accordion", "sideEffects": false, - "version": "7.4.0", + "version": "7.5.0", "files": [ "lib" ], @@ -21,10 +21,10 @@ "chokidar": "chokidar \"**/*.tsx\" \"**/*.ts\" -i \"lib/**/*.d.ts\" -c \"pnpm run build:code\" " }, "dependencies": { - "@heathmont/moon-components": "workspace:^7.4.0", - "@heathmont/moon-icons": "workspace:^7.4.0", - "@heathmont/moon-themes": "workspace:^7.4.0", - "@heathmont/moon-utils": "workspace:^7.4.0" + "@heathmont/moon-components": "workspace:^7.5.0", + "@heathmont/moon-icons": "workspace:^7.5.0", + "@heathmont/moon-themes": "workspace:^7.5.0", + "@heathmont/moon-utils": "workspace:^7.5.0" }, "peerDependencies": { "react": ">= 16.10.2", diff --git a/packages/assets/CHANGELOG.md b/packages/assets/CHANGELOG.md index 3b20ed6a6d..36df3d5342 100644 --- a/packages/assets/CHANGELOG.md +++ b/packages/assets/CHANGELOG.md @@ -1,5 +1,17 @@ # Change Log +## 7.5.0 + +### Minor Changes + +- Fix shadows & colors + +### Patch Changes + +- Updated dependencies [undefined] + - @heathmont/moon-themes@7.5.0 + - @heathmont/moon-utils@7.5.0 + ## 7.4.0 ### Minor Changes diff --git a/packages/assets/package.json b/packages/assets/package.json index 166fbdcca3..65c12a771b 100644 --- a/packages/assets/package.json +++ b/packages/assets/package.json @@ -1,7 +1,7 @@ { "name": "@heathmont/moon-assets", "sideEffects": false, - "version": "7.4.0", + "version": "7.5.0", "files": [ "lib" ], @@ -37,8 +37,8 @@ "chokidar": "chokidar \"**/*.tsx\" \"**/*.ts\" -i \"lib/**/*.d.ts\" -c \"pnpm run build:code\" " }, "dependencies": { - "@heathmont/moon-themes": "workspace:^7.4.0", - "@heathmont/moon-utils": "workspace:^7.4.0" + "@heathmont/moon-themes": "workspace:^7.5.0", + "@heathmont/moon-utils": "workspace:^7.5.0" }, "peerDependencies": { "react": ">= 16.10.2", diff --git a/packages/calendar/CHANGELOG.md b/packages/calendar/CHANGELOG.md index ccce7e4e7b..36c9a4cd70 100644 --- a/packages/calendar/CHANGELOG.md +++ b/packages/calendar/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 7.5.0 + +### Minor Changes + +- Fix shadows & colors + +### Patch Changes + +- Updated dependencies [undefined] + - @heathmont/moon-components@7.5.0 + - @heathmont/moon-themes@7.5.0 + - @heathmont/moon-utils@7.5.0 + ## 7.4.0 ### Minor Changes diff --git a/packages/calendar/package.json b/packages/calendar/package.json index a93dc1dfa6..be8f84ab63 100644 --- a/packages/calendar/package.json +++ b/packages/calendar/package.json @@ -1,7 +1,7 @@ { "name": "@heathmont/moon-calendar", "sideEffects": false, - "version": "7.4.0", + "version": "7.5.0", "files": [ "lib" ], @@ -21,9 +21,9 @@ "chokidar": "chokidar \"**/*.tsx\" \"**/*.ts\" -i \"lib/**/*.d.ts\" -c \"pnpm run build:code\" " }, "dependencies": { - "@heathmont/moon-components": "workspace:^7.4.0", - "@heathmont/moon-themes": "workspace:^7.4.0", - "@heathmont/moon-utils": "workspace:^7.4.0", + "@heathmont/moon-components": "workspace:^7.5.0", + "@heathmont/moon-themes": "workspace:^7.5.0", + "@heathmont/moon-utils": "workspace:^7.5.0", "@types/date-fns": "2.6.0", "date-fns": "2.15.0" }, diff --git a/packages/charts/CHANGELOG.md b/packages/charts/CHANGELOG.md index 28da984eff..4af3e99b23 100644 --- a/packages/charts/CHANGELOG.md +++ b/packages/charts/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## 7.5.0 + +### Minor Changes + +- Fix shadows & colors + +### Patch Changes + +- Updated dependencies [undefined] + - @heathmont/moon-assets@7.5.0 + - @heathmont/moon-components@7.5.0 + - @heathmont/moon-themes@7.5.0 + - @heathmont/moon-utils@7.5.0 + ## 7.4.0 ### Minor Changes diff --git a/packages/charts/package.json b/packages/charts/package.json index 011f709db2..7d29613548 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -1,7 +1,7 @@ { "name": "@heathmont/moon-charts", "sideEffects": false, - "version": "7.4.0", + "version": "7.5.0", "files": [ "lib" ], @@ -21,10 +21,10 @@ "chokidar": "chokidar \"**/*.tsx\" \"**/*.ts\" -i \"lib/**/*.d.ts\" -c \"pnpm run build:code\" " }, "dependencies": { - "@heathmont/moon-assets": "workspace:^7.4.0", - "@heathmont/moon-components": "workspace:^7.4.0", - "@heathmont/moon-themes": "workspace:^7.4.0", - "@heathmont/moon-utils": "workspace:^7.4.0", + "@heathmont/moon-assets": "workspace:^7.5.0", + "@heathmont/moon-components": "workspace:^7.5.0", + "@heathmont/moon-themes": "workspace:^7.5.0", + "@heathmont/moon-utils": "workspace:^7.5.0", "@types/react-simple-maps": "1.0.3", "@types/react-transition-group": "4.4.0", "react-simple-maps": "2.3.0", diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index b9df5bedeb..8c258610aa 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 7.5.0 + +### Minor Changes + +- Fix shadows & colors + +### Patch Changes + +- Updated dependencies [undefined] + - @heathmont/moon-assets@7.5.0 + - @heathmont/moon-themes@7.5.0 + - @heathmont/moon-utils@7.5.0 + ## 7.4.0 ### Minor Changes diff --git a/packages/components/package.json b/packages/components/package.json index d6a8e41086..6dddb24d2c 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,7 +1,7 @@ { "name": "@heathmont/moon-components", "sideEffects": false, - "version": "7.4.0", + "version": "7.5.0", "files": [ "lib" ], @@ -21,9 +21,9 @@ "chokidar": "chokidar \"**/*.tsx\" \"**/*.ts\" -i \"lib/**/*.d.ts\" -c \"pnpm run build:code\" " }, "dependencies": { - "@heathmont/moon-assets": "workspace:^7.4.0", - "@heathmont/moon-themes": "workspace:^7.4.0", - "@heathmont/moon-utils": "workspace:^7.4.0", + "@heathmont/moon-assets": "workspace:^7.5.0", + "@heathmont/moon-themes": "workspace:^7.5.0", + "@heathmont/moon-utils": "workspace:^7.5.0", "@reach/dialog": "0.11.2", "@types/date-fns": "2.6.0", "date-fns": "2.15.0", diff --git a/packages/components/src/datepicker/private/Picker.tsx b/packages/components/src/datepicker/private/Picker.tsx index 36525086d1..c2c9e74e30 100644 --- a/packages/components/src/datepicker/private/Picker.tsx +++ b/packages/components/src/datepicker/private/Picker.tsx @@ -11,7 +11,7 @@ import { Sidebar } from './Sidebar'; import { InputsPanel } from './InputsPanel'; const PickerContainer = styled.div( - ({ theme: { color, space, radius, breakpoint, zIndex, boxShadow } }) => ({ + ({ theme: { color, space, radius, breakpoint, zIndex, shadows } }) => ({ width: 'fit-content', position: 'absolute', zIndex: zIndex.dialog, @@ -35,8 +35,8 @@ const PickerContainer = styled.div( gap: rem(space.default), borderRadius: rem(radius.default), padding: space.small, - backgroundColor: color.goku[100], - boxShadow: boxShadow, + backgroundColor: color.gohan[100], + boxShadow: shadows.lg, overflow: 'hidden', }) ); diff --git a/packages/components/src/datepicker/private/Sidebar.tsx b/packages/components/src/datepicker/private/Sidebar.tsx index b650b2ca72..aeb20b6eb4 100644 --- a/packages/components/src/datepicker/private/Sidebar.tsx +++ b/packages/components/src/datepicker/private/Sidebar.tsx @@ -7,7 +7,7 @@ import { getRanges } from './helpers/getRanges'; const SidebarList = styled.ul(({ theme: { color, breakpoint } }) => ({ gridArea: 'sidebar', - background: color.goku[100], + background: color.gohan[100], padding: 0, display: 'flex', flexDirection: 'row', @@ -31,7 +31,7 @@ const RangeItem = styled.li(({ theme, isSelected }) => ({ cursor: 'pointer', fontSize: rem(14), lineHeight: rem(20), - background: isSelected ? theme.color.goku[80] : theme.color.goku[100], + background: isSelected ? theme.color.gohan[80] : theme.color.gohan[100], color: theme.color.bulma[100], [mq(theme.breakpoint.small)]: { paddingLeft: rem(16), diff --git a/packages/components/src/dialog/private/layout.ts b/packages/components/src/dialog/private/layout.ts index 6ffc949ddb..de9482fea5 100644 --- a/packages/components/src/dialog/private/layout.ts +++ b/packages/components/src/dialog/private/layout.ts @@ -20,8 +20,8 @@ export const DialogContainer = styled.div<{ variant?: 'default' | 'new' }>( * padding with a pseudo element. */ export const DialogMain = styled.main<{ variant?: 'default' | 'new' }>( - ({ theme: { space, breakpoint, boxShadow }, variant }) => ({ - boxShadow, + ({ theme: { space, breakpoint, shadows }, variant }) => ({ + boxShadow: shadows.lg, padding: variant === 'new' ? 0 : rem(20), [mq(breakpoint.medium)]: { paddingTop: variant === 'new' ? 0 : rem(space.xlarge), diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 6da7fd856c..5cabd58ba8 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## 7.5.0 + +### Minor Changes + +- Fix shadows & colors + +### Patch Changes + +- Updated dependencies [undefined] + - @heathmont/moon-components@7.5.0 + - @heathmont/moon-icons@7.5.0 + - @heathmont/moon-themes@7.5.0 + - @heathmont/moon-utils@7.5.0 + ## 7.4.0 ### Minor Changes diff --git a/packages/core/package.json b/packages/core/package.json index c4f5d81167..9b355bb4a5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@heathmont/moon-core", "sideEffects": false, - "version": "7.4.0", + "version": "7.5.0", "files": [ "lib" ], @@ -21,10 +21,10 @@ "chokidar": "chokidar \"**/*.tsx\" \"**/*.ts\" -i \"lib/**/*.d.ts\" -c \"pnpm run build:code\" " }, "dependencies": { - "@heathmont/moon-components": "workspace:^7.4.0", - "@heathmont/moon-icons": "workspace:^7.4.0", - "@heathmont/moon-themes": "workspace:^7.4.0", - "@heathmont/moon-utils": "workspace:^7.4.0", + "@heathmont/moon-components": "workspace:^7.5.0", + "@heathmont/moon-icons": "workspace:^7.5.0", + "@heathmont/moon-themes": "workspace:^7.5.0", + "@heathmont/moon-utils": "workspace:^7.5.0", "@reach/listbox": "^0.16.1", "polished": "^4.1.3" }, diff --git a/packages/core/src/multiSelect/MultiSelect.tsx b/packages/core/src/multiSelect/MultiSelect.tsx index 74e285d727..f25261256d 100644 --- a/packages/core/src/multiSelect/MultiSelect.tsx +++ b/packages/core/src/multiSelect/MultiSelect.tsx @@ -92,7 +92,7 @@ const MultiSelect: React.FC = ({ const isEmptySelectedItems = selectedItems && selectedItems.length === 0; return ( - + {label && (