-
- {Object.values(activeFilters).map(({ id, Component }) => (
- // `id` will always be `string`, but keyof ValuesMap transformed it
-
- {React.cloneElement(Component, { id })}
-
- ))}
-
-
+
+
+ {Object.values(activeFilters).map(({ id, Component }) => (
+ // `id` will always be `string`, but keyof ValuesMap transformed it
+
+ {React.cloneElement(Component, { id })}
+
+ ))}
+
+
-
-
+
+
)}
diff --git a/packages/components/src/Pagination/Pagination.module.scss b/packages/components/src/Pagination/Pagination.module.scss
index c1a7ee44a79..73d34d2eeab 100644
--- a/packages/components/src/Pagination/Pagination.module.scss
+++ b/packages/components/src/Pagination/Pagination.module.scss
@@ -51,15 +51,3 @@
}
}
}
-
-// Truncate indicator
-.truncateIndicatorWrapper {
- display: flex;
- align-items: center;
- justify-content: center;
- height: 36px;
- width: 36px;
- background-color: transparent;
- color: rgba($color-purple-800-rgb, 0.7);
- margin: 0 5px;
-}
diff --git a/packages/components/src/Pagination/Pagination.spec.tsx b/packages/components/src/Pagination/Pagination.spec.tsx
index 15f7066a7d7..e901ffad3ef 100644
--- a/packages/components/src/Pagination/Pagination.spec.tsx
+++ b/packages/components/src/Pagination/Pagination.spec.tsx
@@ -1,6 +1,7 @@
import React from "react"
import { render, screen, waitFor } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
+import { mockMatchMedia } from "~components/utils/useMediaQueries.spec"
import { Pagination } from "./Pagination"
const user = userEvent.setup()
@@ -15,6 +16,10 @@ const defaultProps = {
}
describe("
", () => {
+ beforeEach(() => {
+ mockMatchMedia()
+ })
+
it("calls onPageChange when clicking page number", async () => {
const onPageChange = vi.fn()
diff --git a/packages/components/src/Pagination/Pagination.tsx b/packages/components/src/Pagination/Pagination.tsx
index 072e2a9c46d..1cba7f2813f 100644
--- a/packages/components/src/Pagination/Pagination.tsx
+++ b/packages/components/src/Pagination/Pagination.tsx
@@ -1,6 +1,7 @@
import React, { HTMLAttributes } from "react"
import classnames from "classnames"
import { OverrideClassName } from "~components/types/OverrideClassName"
+import { useMediaQueries } from "~components/utils"
import { DirectionalLink } from "./subcomponents/DirectionalLink"
import { PaginationLink } from "./subcomponents/PaginationLink"
import { TruncateIndicator } from "./subcomponents/TruncateIndicator"
@@ -32,6 +33,8 @@ export const Pagination = ({
classNameOverride,
...restProps
}: PaginationProps): JSX.Element => {
+ const { queries } = useMediaQueries()
+
// Click event for all pagination buttons (next, prev, and the actual numbers)
const handleButtonClick = (newPage: number | PageAction): void => {
if (newPage === "prev") {
@@ -55,12 +58,12 @@ export const Pagination = ({
/>
)
- const pagination = (): JSX.Element[] => {
+ const pagination = (
+ boundaryPagesRange: number,
+ siblingPagesRange: number
+ ): JSX.Element[] => {
const items: JSX.Element[] = []
- const boundaryPagesRange = 1
- const siblingPagesRange = 1
-
// truncateSize is 1 now but could be 0 if we add the ability to hide it.
const truncateSize = 1
@@ -150,7 +153,9 @@ export const Pagination = ({
onClick={(): void => handleButtonClick("prev")}
/>
-
{pagination()}
+
+ {pagination(queries.isMediumOrSmaller ? 0 : 1, queries.isSmall ? 0 : 1)}
+
(
,
diff --git a/packages/components/src/__actions__/Menu/v3/MenuItem.module.scss b/packages/components/src/__actions__/Menu/v3/MenuItem.module.css
similarity index 96%
rename from packages/components/src/__actions__/Menu/v3/MenuItem.module.scss
rename to packages/components/src/__actions__/Menu/v3/MenuItem.module.css
index d2b2fd4374e..cbf8ced027a 100644
--- a/packages/components/src/__actions__/Menu/v3/MenuItem.module.scss
+++ b/packages/components/src/__actions__/Menu/v3/MenuItem.module.css
@@ -1,4 +1,5 @@
.item {
+ display: block;
font-family: var(--typography-paragraph-body-font-family);
font-size: var(--typography-paragraph-body-font-size);
letter-spacing: var(--typography-paragraph-body-letter-spacing);
@@ -9,14 +10,17 @@
border: var(--border-focus-ring-border-width)
var(--border-focus-ring-border-style) transparent;
border-radius: 4px;
- display: flex;
- gap: 0 var(--spacing-8);
- align-items: center;
margin-inline: var(--spacing-6);
text-decoration: none;
cursor: pointer;
}
+.flexWrapper {
+ display: flex;
+ gap: 0 var(--spacing-8);
+ align-items: center;
+}
+
.iconWrapper {
flex-shrink: 0;
display: flex;
diff --git a/packages/components/src/__actions__/Menu/v3/MenuItem.tsx b/packages/components/src/__actions__/Menu/v3/MenuItem.tsx
index 8816787d482..1d787d3cad2 100644
--- a/packages/components/src/__actions__/Menu/v3/MenuItem.tsx
+++ b/packages/components/src/__actions__/Menu/v3/MenuItem.tsx
@@ -4,7 +4,7 @@ import {
MenuItemProps as RACMenuItemProps,
} from "react-aria-components"
import { mergeClassNames } from "~components/utils/mergeClassNames"
-import styles from "./MenuItem.module.scss"
+import styles from "./MenuItem.module.css"
export type MenuItemProps = RACMenuItemProps & {
/**
@@ -17,16 +17,27 @@ export type MenuItemProps = RACMenuItemProps & {
* A MenuItem represents an individual action in a Menu.
*/
export const MenuItem = forwardRef
(
- ({ className, icon, children, ...props }, ref): JSX.Element => (
-
- <>
- {icon && {icon} }
- {children}
-
-
- )
+ ({ className, icon, children, textValue, ...props }, ref): JSX.Element => {
+ const determinedTextValue =
+ textValue || (typeof children === "string" ? children : undefined)
+ return (
+
+ <>
+ {typeof children === "string" && icon ? (
+
+ {icon}
+ {children}
+
+ ) : (
+ <>{children}
+ )}
+
+
+ )
+ }
)
diff --git a/packages/components/src/__actions__/Menu/v3/_docs/ApiSpecification.mdx b/packages/components/src/__actions__/Menu/v3/_docs/ApiSpecification.mdx
index 7a6aeffa67a..b8f3a32ff3c 100644
--- a/packages/components/src/__actions__/Menu/v3/_docs/ApiSpecification.mdx
+++ b/packages/components/src/__actions__/Menu/v3/_docs/ApiSpecification.mdx
@@ -71,12 +71,21 @@ import * as exampleStories from "./Menu.stories"
## Actions and Next.js routing
-Use the `href` prop when an action navigates to a new page. Wrapping your app in `FrontendServices` from `@cultureamp/next-services` will automatically turn these into Next.js links.
+Use the `href` prop when an action navigates to a new page.
+[Work in progress] Eventually, wrapping your app in `FrontendServices` from `@cultureamp/next-services` will automatically turn these into Next.js links.
Otherwise, use the `onAction` prop to trigger an action within the page.
- {/* Replace with Kaizen Button once we have v3 or backwards compatibility */}
Edit item
- {/* Replace with Kaizen Button once we have v3 or backwards compatibility */}
@@ -229,7 +227,6 @@ export const SentenceCaseDo: Story = {
export const SentenceCaseDont: Story = {
render: ({ defaultOpen, ...args }) => (
- {/* Replace with Kaizen Button once we have v3 or backwards compatibility */}
@@ -247,7 +244,6 @@ export const SentenceCaseDont: Story = {
export const ElipsesDo: Story = {
render: ({ defaultOpen, ...args }) => (
- {/* Replace with Kaizen Button once we have v3 or backwards compatibility */}
@@ -265,7 +261,6 @@ export const ElipsesDo: Story = {
export const ElipsesDont: Story = {
render: ({ defaultOpen, ...args }) => (
- {/* Replace with Kaizen Button once we have v3 or backwards compatibility */}
diff --git a/packages/components/src/__actions__/Menu/v3/_docs/Menu.stories.tsx b/packages/components/src/__actions__/Menu/v3/_docs/Menu.stories.tsx
index 4faf0a4c49d..aa6cf38558c 100644
--- a/packages/components/src/__actions__/Menu/v3/_docs/Menu.stories.tsx
+++ b/packages/components/src/__actions__/Menu/v3/_docs/Menu.stories.tsx
@@ -2,6 +2,7 @@ import React, { FunctionComponent } from "react"
import { Meta, StoryObj } from "@storybook/react"
import isChromatic from "chromatic"
import { Popover } from "react-aria-components"
+import { Text } from "~components/Text"
import { Button } from "~components/__actions__/v3"
import { Icon } from "~components/__future__/Icon"
import { Menu, MenuTrigger, MenuItem } from "../index"
@@ -24,7 +25,6 @@ type Story = StoryObj
export const Playground: Story = {
render: ({ defaultOpen: _, ...args }) => (
- {/* Replace with Kaizen Button once we have v3 or backwards compatibility */}
@@ -64,3 +64,35 @@ export const Controlled: Story = {
...testStories.Controlled,
play: undefined,
}
+
+export const RichContent: Story = {
+ render: ({ defaultOpen: _, ...args }) => (
+
+
+
+
+
+
+ Save
+
+ Saves all data
+
+
+
+ Edit
+
+ Adjust the name and description
+
+
+
+ Delete
+
+ Completely remove, cannot be undone
+
+
+
+
+
+ ),
+}
diff --git a/packages/components/tsconfig.dist.json b/packages/components/tsconfig.dist.json
index af4471af676..0e9d94658c2 100644
--- a/packages/components/tsconfig.dist.json
+++ b/packages/components/tsconfig.dist.json
@@ -1,5 +1,5 @@
{
- "extends": ["./tsconfig.json", "@kaizen/package-bundler/tsconfig.dist.json"],
+ "extends": "./tsconfig.json",
"include": ["src/**/*"],
"exclude": [
"node_modules",
diff --git a/packages/components/tsconfig.types.json b/packages/components/tsconfig.types.json
deleted file mode 100644
index e25cd82db59..00000000000
--- a/packages/components/tsconfig.types.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "extends": [
- "./tsconfig.dist.json",
- "@kaizen/package-bundler/tsconfig.types.json"
- ]
-}
diff --git a/packages/components/turbo.json b/packages/components/turbo.json
new file mode 100644
index 00000000000..d1077583f57
--- /dev/null
+++ b/packages/components/turbo.json
@@ -0,0 +1,19 @@
+{
+ "extends": ["//"],
+ "tasks": {
+ "build": {
+ "inputs": [
+ "$TURBO_DEFAULT$",
+ "!**/README.md",
+ "!**/*.stories.*",
+ "!**/*.spec.*",
+ "!__tests__/**/*",
+ "!CHANGELOG.md",
+ "!svgo.config.js",
+ "!svgo.spec.ts",
+ "!svgoUtils.js"
+ ],
+ "outputs": ["dist/**"]
+ }
+ }
+}
diff --git a/packages/design-tokens/CHANGELOG.md b/packages/design-tokens/CHANGELOG.md
index e9ce719217f..b5b5c6d4f3b 100644
--- a/packages/design-tokens/CHANGELOG.md
+++ b/packages/design-tokens/CHANGELOG.md
@@ -1,5 +1,23 @@
# Change Log
+## 10.8.4
+
+### Patch Changes
+
+- [#5279](https://github.com/cultureamp/kaizen-design-system/pull/5279) [`718cbdd2dd00ddd688a9272cd0c271adf085fc42`](https://github.com/cultureamp/kaizen-design-system/commit/718cbdd2dd00ddd688a9272cd0c271adf085fc42) - Actually release @kaizen/package-bundler (2.0.0 already exists from an accidental prior release)
+
+## 10.8.3
+
+### Patch Changes
+
+- [#5270](https://github.com/cultureamp/kaizen-design-system/pull/5270) [`573097f5767533255a1f9ce207d3b1a0ee7bcdfc`](https://github.com/cultureamp/kaizen-design-system/commit/573097f5767533255a1f9ce207d3b1a0ee7bcdfc) - Update @kaizen/package-bundler
+
+## 10.8.2
+
+### Patch Changes
+
+- [#5266](https://github.com/cultureamp/kaizen-design-system/pull/5266) [`94ac62d79ce431adc1ad2b4dc76e39d72fb56373`](https://github.com/cultureamp/kaizen-design-system/commit/94ac62d79ce431adc1ad2b4dc76e39d72fb56373) - Re-release with @kaizen/package-bundler update.
+
## 10.8.1
### Patch Changes
diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.json
index 052fc2023b7..24034e18cc8 100644
--- a/packages/design-tokens/package.json
+++ b/packages/design-tokens/package.json
@@ -1,7 +1,7 @@
{
"name": "@kaizen/design-tokens",
"description": "Tokens used in the Kaizen Design System",
- "version": "10.8.1",
+ "version": "10.8.4",
"homepage": "https://github.com/cultureamp/kaizen-design-system/tree/main/packages/design-tokens",
"repository": {
"type": "git",
diff --git a/packages/design-tokens/tsconfig.dist.json b/packages/design-tokens/tsconfig.dist.json
index af4471af676..0e9d94658c2 100644
--- a/packages/design-tokens/tsconfig.dist.json
+++ b/packages/design-tokens/tsconfig.dist.json
@@ -1,5 +1,5 @@
{
- "extends": ["./tsconfig.json", "@kaizen/package-bundler/tsconfig.dist.json"],
+ "extends": "./tsconfig.json",
"include": ["src/**/*"],
"exclude": [
"node_modules",
diff --git a/packages/design-tokens/tsconfig.types.json b/packages/design-tokens/tsconfig.types.json
deleted file mode 100644
index e25cd82db59..00000000000
--- a/packages/design-tokens/tsconfig.types.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "extends": [
- "./tsconfig.dist.json",
- "@kaizen/package-bundler/tsconfig.types.json"
- ]
-}
diff --git a/packages/design-tokens/turbo.json b/packages/design-tokens/turbo.json
new file mode 100644
index 00000000000..88fa6463292
--- /dev/null
+++ b/packages/design-tokens/turbo.json
@@ -0,0 +1,16 @@
+{
+ "extends": ["//"],
+ "tasks": {
+ "build": {
+ "inputs": [
+ "$TURBO_DEFAULT$",
+ "!**/README.md",
+ "!_docs/**/*",
+ "!CHANGELOG.md",
+ "!CONTRIBUTING.md",
+ "!TODO.md"
+ ],
+ "outputs": ["dist/**"]
+ }
+ }
+}
diff --git a/packages/hosted-assets/turbo.json b/packages/hosted-assets/turbo.json
new file mode 100644
index 00000000000..1c4d22798e4
--- /dev/null
+++ b/packages/hosted-assets/turbo.json
@@ -0,0 +1,9 @@
+{
+ "extends": ["//"],
+ "tasks": {
+ "build": {
+ "inputs": ["$TURBO_DEFAULT$", "!CHANGELOG.md", "!README.md"],
+ "outputs": ["dist/**"]
+ }
+ }
+}
diff --git a/packages/package-bundler/CHANGELOG.md b/packages/package-bundler/CHANGELOG.md
index 37c4ddf604f..8f3f75566a1 100644
--- a/packages/package-bundler/CHANGELOG.md
+++ b/packages/package-bundler/CHANGELOG.md
@@ -1,5 +1,38 @@
# @kaizen/package-bundler
+## 2.0.1
+
+### Patch Changes
+
+- [#5279](https://github.com/cultureamp/kaizen-design-system/pull/5279) [`718cbdd2dd00ddd688a9272cd0c271adf085fc42`](https://github.com/cultureamp/kaizen-design-system/commit/718cbdd2dd00ddd688a9272cd0c271adf085fc42) - Actually release @kaizen/package-bundler (2.0.0 already exists from an accidental prior release)
+
+## 2.0.0
+
+### Major Changes
+
+- [#5270](https://github.com/cultureamp/kaizen-design-system/pull/5270) [`573097f5767533255a1f9ce207d3b1a0ee7bcdfc`](https://github.com/cultureamp/kaizen-design-system/commit/573097f5767533255a1f9ce207d3b1a0ee7bcdfc) - Move TypeScript types generation to rollup as the separate step using `tsc` was not resolving aliases with `typescript-transform-paths@3.5.2`.
+
+ BREAKING CHANGES:
+
+ - `@kaizen/package-bundler/tsconfig.dist.json` has been removed
+ - Remove this from `extends` within your `tsconfig.dist.json`
+ - `@kaizen/package-bundler/tsconfig.types.json`
+ - Delete your `tsconfig.types.json` (no longer required)
+ - `rollupConfig` no longer accepts the `alias` arg as aliases are now automatically resolved based on your `tsconfig.json` paths
+ - Remove `alias` defined within your `rollup.config.mjs`
+
+### Patch Changes
+
+- [#5270](https://github.com/cultureamp/kaizen-design-system/pull/5270) [`573097f5767533255a1f9ce207d3b1a0ee7bcdfc`](https://github.com/cultureamp/kaizen-design-system/commit/573097f5767533255a1f9ce207d3b1a0ee7bcdfc) - Update dep `typescript-transform-paths` to `^3.5.2` and loosen `typescript` peerDep version.
+
+## 1.1.11
+
+### Patch Changes
+
+- [#5266](https://github.com/cultureamp/kaizen-design-system/pull/5266) [`94ac62d79ce431adc1ad2b4dc76e39d72fb56373`](https://github.com/cultureamp/kaizen-design-system/commit/94ac62d79ce431adc1ad2b4dc76e39d72fb56373) - Revert typescript-transform-paths back to ^3.5.1.
+
+ This is due to the aliases no longer transforming with the update to 3.5.2
+
## 1.1.10
### Patch Changes
diff --git a/packages/package-bundler/README.md b/packages/package-bundler/README.md
index db1339186f7..4ccebeb7532 100644
--- a/packages/package-bundler/README.md
+++ b/packages/package-bundler/README.md
@@ -18,14 +18,14 @@ _Note: If your package extends another shared UI package, you will need to list
Add the following to your `package.json`:
```json
-"main": "dist/cjs/index.cjs",
-"module": "dist/esm/index.mjs",
-"types": "dist/types/index.d.ts",
+"main": "dist/cjs/index.cjs", // CommonJS entrypoint
+"module": "dist/esm/index.mjs", // ES modules entrypoint
+"types": "dist/types/index.d.ts", // TypeScript types entrypoint
"files": [
- "dist"
+ "dist" // Ensure dist dir is included in package
],
"sideEffects": [
- "styles.css"
+ "styles.css" // Ensure styles do not get tree-shaken
],
"scripts": {
"build": "pnpm package-bundler build-shared-ui",
@@ -44,7 +44,7 @@ pnpm add -D postcss postcss-preset-env rollup tslib
- `rollup`
- `tslib` (peerDep of `rollup`)
- If using Tailwind:
- - `tailwind`
+ - `tailwindcss`
### Required files
@@ -52,7 +52,6 @@ pnpm add -D postcss postcss-preset-env rollup tslib
- `rollup.config.mjs`
- `tsconfig.json`
- `tsconfig.dist.json`
-- `tsconfig.types.json`
- If using Tailwind:
- `tailwind.config.js`
- `src/tailwind.css`
@@ -104,18 +103,7 @@ export default rollupConfig({
// tsconfig.dist.json
{
- "extends": [
- "./tsconfig.json",
- "@kaizen/package-bundler/tsconfig.dist.json"
- ]
-}
-
-// tsconfig.types.json
-{
- "extends": [
- "./tsconfig.dist.json",
- "@kaizen/package-bundler/tsconfig.types.json"
- ]
+ "extends": "./tsconfig.json"
}
```
@@ -155,7 +143,7 @@ module.exports = {
### Alias
-If you are using aliases, ensure you have them listed in your `tsconfig.json` (the `tsconfig.dist` and `tsconfig.types` should extend this) and in `rollup.config`.
+If you are using aliases, ensure you have them listed in your `tsconfig.json` (the `tsconfig.dist` should extend this).
Example:
```json
@@ -170,17 +158,6 @@ Example:
// tsconfig.dist.json
{
- "extends": ["./tsconfig.json", "@kaizen/package-bundler/tsconfig.dist.json"],
+ "extends": "./tsconfig.json",
}
```
-
-```ts
-// rollup.config.mjs
-export default rollupConfig({
- alias: {
- entries: [
- { find: "~components", replacement: "src" },
- ],
- },
-})
-```
diff --git a/packages/package-bundler/bin/build-commands.sh b/packages/package-bundler/bin/build-commands.sh
index 81c41d5dce2..a10f8f5166f 100755
--- a/packages/package-bundler/bin/build-commands.sh
+++ b/packages/package-bundler/bin/build-commands.sh
@@ -15,12 +15,8 @@ clean() {
bundle() {
echo -e "${GREEN}Compile and bundle source code...${NC}"
rollup -c
- echo -e "${GREEN}------${NC}"
-}
-
-compile_types() {
- echo -e "${GREEN}Compile typescript types...${NC}"
- tsc --project tsconfig.types.json --declarationDir dist/types
+ mv dist/esm/_tmp/types dist/types
+ rm -rf dist/esm/_tmp
echo -e "${GREEN}------${NC}"
}
@@ -37,7 +33,6 @@ elapsed_time() {
build() {
clean
bundle
- compile_types
}
case "$1" in
diff --git a/packages/package-bundler/package.json b/packages/package-bundler/package.json
index 9a300e1eea0..7847d0121c6 100644
--- a/packages/package-bundler/package.json
+++ b/packages/package-bundler/package.json
@@ -1,6 +1,6 @@
{
"name": "@kaizen/package-bundler",
- "version": "1.1.10",
+ "version": "2.0.1",
"description": "Bundles libraries",
"main": "dist/index.js",
"type": "module",
@@ -17,9 +17,7 @@
"files": [
"dist",
"bin",
- "tsconfig.base.json",
- "tsconfig.dist.json",
- "tsconfig.types.json"
+ "tsconfig.base.json"
],
"author": "Geoffrey Chong ",
"homepage": "https://cultureamp.design",
diff --git a/packages/package-bundler/src/rollup.ts b/packages/package-bundler/src/rollup.ts
index 9f49bc21737..4024f47a811 100644
--- a/packages/package-bundler/src/rollup.ts
+++ b/packages/package-bundler/src/rollup.ts
@@ -1,6 +1,5 @@
import fs from "fs"
import path from "path"
-import alias, { RollupAliasOptions } from "@rollup/plugin-alias"
import typescript from "@rollup/plugin-typescript"
import { InputPluginOption, RollupOptions } from "rollup"
import { pluginsDefault } from "./presets/index.js"
@@ -9,7 +8,6 @@ import { rollupTailwindConfig } from "./presets/shared-ui/rollup-tailwind.js"
type Config = {
input?: RollupOptions["input"]
plugins?: InputPluginOption[]
- alias?: RollupAliasOptions
}
export const rollupConfig = (
@@ -21,10 +19,7 @@ export const rollupConfig = (
// Shared config
const userConfig = {
input: config.input,
- plugins: [
- alias(config.alias),
- ...((config?.plugins as InputPluginOption[]) || pluginsDefault),
- ],
+ plugins: config?.plugins ?? pluginsDefault,
} satisfies RollupOptions
// CommonJS
@@ -54,7 +49,21 @@ export const rollupConfig = (
...userConfig,
plugins: [
...userConfig.plugins,
- typescript({ tsconfig: "./tsconfig.dist.json" }),
+ typescript({
+ tsconfig: "./tsconfig.dist.json",
+ compilerOptions: {
+ declaration: true,
+ declarationDir: "dist/esm/_tmp/types",
+ noEmit: false,
+ plugins: [
+ { transform: "typescript-transform-paths" },
+ {
+ transform: "typescript-transform-paths",
+ afterDeclarations: true,
+ },
+ ],
+ },
+ }),
],
output: {
dir: "dist/esm",
diff --git a/packages/package-bundler/tsconfig.dist.json b/packages/package-bundler/tsconfig.dist.json
deleted file mode 100644
index 4d21e0d270b..00000000000
--- a/packages/package-bundler/tsconfig.dist.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "compilerOptions": {
- "declaration": false,
- "noEmit": false,
- "plugins": [{ "transform": "typescript-transform-paths" }]
- }
-}
diff --git a/packages/package-bundler/tsconfig.types.json b/packages/package-bundler/tsconfig.types.json
deleted file mode 100644
index 85e8e111850..00000000000
--- a/packages/package-bundler/tsconfig.types.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "compilerOptions": {
- "declaration": true,
- "emitDeclarationOnly": true,
- "plugins": [
- { "transform": "typescript-transform-paths", "afterDeclarations": true }
- ]
- }
-}
diff --git a/packages/package-bundler/turbo.json b/packages/package-bundler/turbo.json
new file mode 100644
index 00000000000..1c4d22798e4
--- /dev/null
+++ b/packages/package-bundler/turbo.json
@@ -0,0 +1,9 @@
+{
+ "extends": ["//"],
+ "tasks": {
+ "build": {
+ "inputs": ["$TURBO_DEFAULT$", "!CHANGELOG.md", "!README.md"],
+ "outputs": ["dist/**"]
+ }
+ }
+}
diff --git a/packages/tailwind/CHANGELOG.md b/packages/tailwind/CHANGELOG.md
index 82a1ed4a526..146fcda482f 100644
--- a/packages/tailwind/CHANGELOG.md
+++ b/packages/tailwind/CHANGELOG.md
@@ -1,5 +1,32 @@
# Change Log
+## 1.3.10
+
+### Patch Changes
+
+- [#5279](https://github.com/cultureamp/kaizen-design-system/pull/5279) [`718cbdd2dd00ddd688a9272cd0c271adf085fc42`](https://github.com/cultureamp/kaizen-design-system/commit/718cbdd2dd00ddd688a9272cd0c271adf085fc42) - Actually release @kaizen/package-bundler (2.0.0 already exists from an accidental prior release)
+
+- Updated dependencies [[`718cbdd2dd00ddd688a9272cd0c271adf085fc42`](https://github.com/cultureamp/kaizen-design-system/commit/718cbdd2dd00ddd688a9272cd0c271adf085fc42)]:
+ - @kaizen/design-tokens@10.8.4
+
+## 1.3.9
+
+### Patch Changes
+
+- [#5270](https://github.com/cultureamp/kaizen-design-system/pull/5270) [`573097f5767533255a1f9ce207d3b1a0ee7bcdfc`](https://github.com/cultureamp/kaizen-design-system/commit/573097f5767533255a1f9ce207d3b1a0ee7bcdfc) - Update @kaizen/package-bundler
+
+- Updated dependencies [[`573097f5767533255a1f9ce207d3b1a0ee7bcdfc`](https://github.com/cultureamp/kaizen-design-system/commit/573097f5767533255a1f9ce207d3b1a0ee7bcdfc)]:
+ - @kaizen/design-tokens@10.8.3
+
+## 1.3.8
+
+### Patch Changes
+
+- [#5266](https://github.com/cultureamp/kaizen-design-system/pull/5266) [`94ac62d79ce431adc1ad2b4dc76e39d72fb56373`](https://github.com/cultureamp/kaizen-design-system/commit/94ac62d79ce431adc1ad2b4dc76e39d72fb56373) - Re-release with @kaizen/package-bundler update.
+
+- Updated dependencies [[`94ac62d79ce431adc1ad2b4dc76e39d72fb56373`](https://github.com/cultureamp/kaizen-design-system/commit/94ac62d79ce431adc1ad2b4dc76e39d72fb56373)]:
+ - @kaizen/design-tokens@10.8.2
+
## 1.3.7
### Patch Changes
diff --git a/packages/tailwind/package.json b/packages/tailwind/package.json
index e67ac5c0672..ca1084d934d 100644
--- a/packages/tailwind/package.json
+++ b/packages/tailwind/package.json
@@ -1,6 +1,6 @@
{
"name": "@kaizen/tailwind",
- "version": "1.3.7",
+ "version": "1.3.10",
"description": "Kaizen Tailwind presets",
"scripts": {
"build": "pnpm package-bundler build",
@@ -31,7 +31,6 @@
"@kaizen/design-tokens": "workspace:*"
},
"devDependencies": {
- "@kaizen/components": "workspace:*",
"@kaizen/package-bundler": "workspace:*",
"classnames": "^2.5.1",
"rollup": "^4.25.0",
diff --git a/packages/tailwind/tsconfig.dist.json b/packages/tailwind/tsconfig.dist.json
index 9071aaad093..577a63115f3 100644
--- a/packages/tailwind/tsconfig.dist.json
+++ b/packages/tailwind/tsconfig.dist.json
@@ -1,5 +1,5 @@
{
- "extends": ["./tsconfig.json", "@kaizen/package-bundler/tsconfig.dist.json"],
+ "extends": "./tsconfig.json",
"include": ["src/**/*"],
"exclude": [
"src/_docs",
diff --git a/packages/tailwind/tsconfig.types.json b/packages/tailwind/tsconfig.types.json
deleted file mode 100644
index e25cd82db59..00000000000
--- a/packages/tailwind/tsconfig.types.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "extends": [
- "./tsconfig.dist.json",
- "@kaizen/package-bundler/tsconfig.types.json"
- ]
-}
diff --git a/packages/tailwind/turbo.json b/packages/tailwind/turbo.json
new file mode 100644
index 00000000000..98b321f2144
--- /dev/null
+++ b/packages/tailwind/turbo.json
@@ -0,0 +1,9 @@
+{
+ "extends": ["//"],
+ "tasks": {
+ "build": {
+ "inputs": ["$TURBO_DEFAULT$", "!CHANGELOG.md"],
+ "outputs": ["dist/**"]
+ }
+ }
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d68898a4dbf..2c15c21718e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -625,9 +625,6 @@ importers:
specifier: workspace:*
version: link:../design-tokens
devDependencies:
- '@kaizen/components':
- specifier: workspace:*
- version: link:../components
'@kaizen/package-bundler':
specifier: workspace:*
version: link:../package-bundler
diff --git a/turbo.json b/turbo.json
index 3f29195e5fc..3f073a68fe6 100644
--- a/turbo.json
+++ b/turbo.json
@@ -3,16 +3,11 @@
"tasks": {
"build": {
"dependsOn": ["^build"],
- "inputs": ["packages/**"],
"outputs": ["dist/**"]
},
"dev": {
"dependsOn": ["^build"]
},
- "@docs/storybook#dev": {
- "dependsOn": ["^build", "build:tailwind"],
- "cache": false
- },
"lint:ts": {
"dependsOn": ["^build"]
},
@@ -22,59 +17,6 @@
},
"clean": {
"cache": false
- },
- "@docs/storybook#build:tailwind": {
- "dependsOn": ["^build"],
- "inputs": ["packages/**", "docs/**"],
- "outputs": ["docs/.storybook/preview.css"],
- "cache": false
- },
- "@docs/storybook#build:docs": {
- "dependsOn": ["^build", "build:tailwind"],
- "inputs": ["packages/**", "docs/**"],
- "outputs": ["docs/storybook-static/**"],
- "cache": false
- },
- "@docs/storybook#build:test": {
- "dependsOn": ["^build", "build:tailwind"],
- "inputs": ["packages/**", "docs/**"],
- "outputs": ["docs/storybook-static/**"],
- "cache": false
- },
- "@docs/storybook#build:chromatic": {
- "dependsOn": ["^build", "build:tailwind"],
- "outputs": ["docs/storybook-static/**"],
- "cache": false
- },
- "@docs/storybook#test:storybook": {
- "dependsOn": ["^build", "build:tailwind"],
- "outputs": ["docs/storybook-static/**"],
- "cache": false
- },
- "@kaizen/components#build": {
- "dependsOn": [
- "@kaizen/design-tokens#build",
- "@kaizen/package-bundler#build"
- ],
- "inputs": ["src/**", "rollup.config.mjs", "tsconfig*.json"],
- "outputs": ["dist/**"]
- },
- "@kaizen/tailwind#build": {
- "dependsOn": [
- "@kaizen/design-tokens#build",
- "@kaizen/package-bundler#build"
- ],
- "inputs": ["src/**"],
- "outputs": ["dist/**"]
- },
- "@kaizen/design-tokens#build": {
- "dependsOn": ["@kaizen/package-bundler#build"],
- "inputs": ["css/**", "less/**", "sass/**", "src/**"],
- "outputs": ["dist/**"]
- },
- "@kaizen/package-bundler#build": {
- "inputs": ["bin/*", "src/**", "tsconfig*.json"],
- "outputs": ["dist/**"]
}
}
}