Skip to content

Commit

Permalink
Merge branch 'main' into rachel/add-filter-icon
Browse files Browse the repository at this point in the history
  • Loading branch information
Barthélémy Ledoux authored Nov 6, 2023
2 parents f9403b2 + d4aa11d commit c9b01a9
Show file tree
Hide file tree
Showing 31 changed files with 1,957 additions and 1,964 deletions.
5 changes: 5 additions & 0 deletions .changeset/unused-props-modal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
@cypress-design/vue-modal: patch
---

remove unused transition props
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 16.x
node-version: 18.x

- name: Load Yarn cache
uses: actions/cache@v2
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/template-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 16.x
node-version: 18.x

- name: Load Yarn cache
uses: actions/cache@v2
Expand All @@ -42,14 +42,11 @@ jobs:
env:
CI: true

- name: Build Components
run: yarn build:components
- name: Build Component for Vue
run: yarn turbo run build --filter=@cypress-design/vue-componentname...

- name: Check global types
run: |
yarn vue-tsc --noEmit -p .
yarn tsc --noEmit --project ./tsconfig.react.json
yarn vue-tsc --noEmit --project ./tsconfig.vue.json
- name: Build Component for React
run: yarn turbo run build --filter=@cypress-design/vue-componentname...

- name: Lint all files
run: yarn eslint .
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 16.x
node-version: 18.x

- name: Load Yarn cache
uses: actions/cache@v2
Expand Down Expand Up @@ -52,11 +52,14 @@ jobs:
- name: Build Components
run: yarn run build:components

- name: Check global types
run: |
yarn vue-tsc --noEmit -p .
yarn tsc --noEmit --project ./tsconfig.react.json
yarn vue-tsc --noEmit --project ./tsconfig.vue.json
- name: Types docs
run: yarn vue-tsc --noEmit -p .

- name: Types Vue
run: yarn vue-tsc --noEmit --project ./tsconfig.vue.json

- name: Types React
run: yarn tsc --noEmit --project ./tsconfig.react.json

# run cypress component tests
- name: Cypress run CT
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.18.0
18.17.1
4 changes: 2 additions & 2 deletions components/Alert/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
},
"devDependencies": {
"@cypress-design/rollup-plugin-tailwind-keep": "*",
"postcss": "^8.4.28",
"postcss": "^8.4.31",
"rollup-plugin-postcss": "^4.0.2",
"sass": "^1.66.1"
"sass": "^1.69.5"
},
"license": "MIT"
}
11 changes: 11 additions & 0 deletions components/Icon/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @cypress-design/react-icon

## 0.29.0

### Minor Changes

- [#335](https://github.com/cypress-io/cypress-design/pull/335) [`24d343f`](https://github.com/cypress-io/cypress-design/commit/24d343f8c7c4acce6192b357df16c639ec316a44) Thanks [@ryanjwilke](https://github.com/ryanjwilke)! - Added the Device TV icon

### Patch Changes

- Updated dependencies [[`24d343f`](https://github.com/cypress-io/cypress-design/commit/24d343f8c7c4acce6192b357df16c639ec316a44)]:
- @cypress-design/icon-registry@0.32.0

## 0.28.0

### Minor Changes
Expand Down
6 changes: 3 additions & 3 deletions components/Icon/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cypress-design/react-icon",
"version": "0.28.0",
"version": "0.29.0",
"files": [
"*"
],
Expand All @@ -21,12 +21,12 @@
"build:types": "tsc --project ./tsconfig.build.json"
},
"dependencies": {
"@cypress-design/icon-registry": "^0.31.0",
"@cypress-design/icon-registry": "^0.32.0",
"clsx": "*"
},
"devDependencies": {
"@cypress-design/rollup-plugin-tailwind-keep": "*",
"@types/lodash": "^4.14.197",
"@types/lodash": "^4.14.200",
"lodash": "^4.17.21",
"dedent": "^1.5.1"
},
Expand Down
11 changes: 11 additions & 0 deletions components/Icon/vue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @cypress-design/vue-icon

## 0.30.0

### Minor Changes

- [#335](https://github.com/cypress-io/cypress-design/pull/335) [`24d343f`](https://github.com/cypress-io/cypress-design/commit/24d343f8c7c4acce6192b357df16c639ec316a44) Thanks [@ryanjwilke](https://github.com/ryanjwilke)! - Added the Device TV icon

### Patch Changes

- Updated dependencies [[`24d343f`](https://github.com/cypress-io/cypress-design/commit/24d343f8c7c4acce6192b357df16c639ec316a44)]:
- @cypress-design/icon-registry@0.32.0

## 0.29.0

### Minor Changes
Expand Down
6 changes: 3 additions & 3 deletions components/Icon/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cypress-design/vue-icon",
"version": "0.29.0",
"version": "0.30.0",
"files": [
"*"
],
Expand All @@ -21,11 +21,11 @@
"build:types": "yarn tsc --project ./tsconfig.build.json"
},
"dependencies": {
"@cypress-design/icon-registry": "^0.31.0"
"@cypress-design/icon-registry": "^0.32.0"
},
"devDependencies": {
"@cypress-design/rollup-plugin-tailwind-keep": "*",
"@types/lodash": "^4.14.197",
"@types/lodash": "^4.14.200",
"lodash": "^4.17.21",
"dedent": "^1.5.1"
},
Expand Down
1 change: 0 additions & 1 deletion components/Modal/vue/Modal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const props = defineProps<{
title?: string
show?: boolean
helpLink?: string
transition?: number
fullscreen?: boolean
}>()
Expand Down
4 changes: 2 additions & 2 deletions components/Spinner/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
},
"devDependencies": {
"@cypress-design/rollup-plugin-tailwind-keep": "*",
"postcss": "^8.4.28",
"postcss": "^8.4.31",
"rollup-plugin-postcss": "^4.0.2",
"sass": "^1.66.1"
"sass": "^1.69.5"
},
"license": "MIT"
}
2 changes: 1 addition & 1 deletion components/StatusIcon/constants/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"build": "tsc --project ./tsconfig.json"
},
"devDependencies": {
"@cypress-design/icon-registry": "^0.31.0"
"@cypress-design/icon-registry": "^0.32.0"
},
"license": "MIT"
}
7 changes: 7 additions & 0 deletions components/StatusIcon/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @cypress-design/react-statusicon

## 0.4.14

### Patch Changes

- Updated dependencies [[`24d343f`](https://github.com/cypress-io/cypress-design/commit/24d343f8c7c4acce6192b357df16c639ec316a44)]:
- @cypress-design/react-icon@0.29.0

## 0.4.13

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions components/StatusIcon/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cypress-design/react-statusicon",
"version": "0.4.13",
"version": "0.4.14",
"files": [
"*"
],
Expand All @@ -21,7 +21,7 @@
},
"dependencies": {
"@cypress-design/constants-statusicon": "*",
"@cypress-design/react-icon": "^0.28.0",
"@cypress-design/react-icon": "^0.29.0",
"clsx": "*"
},
"devDependencies": {
Expand Down
8 changes: 8 additions & 0 deletions components/StatusIcon/vue/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @cypress-design/vue-statusicon

## 0.5.5

### Patch Changes

- Updated dependencies [[`24d343f`](https://github.com/cypress-io/cypress-design/commit/24d343f8c7c4acce6192b357df16c639ec316a44)]:
- @cypress-design/vue-icon@0.30.0
- @cypress-design/icon-registry@0.32.0

## 0.5.4

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions components/StatusIcon/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cypress-design/vue-statusicon",
"version": "0.5.4",
"version": "0.5.5",
"files": [
"./dist/*"
],
Expand All @@ -21,7 +21,7 @@
},
"dependencies": {
"@cypress-design/constants-statusicon": "*",
"@cypress-design/icon-registry": "^0.31.0",
"@cypress-design/icon-registry": "^0.32.0",
"@cypress-design/vue-icon": "*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion components/Tooltip/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"build:types": "yarn vue-tsc --project ./tsconfig.build.json"
},
"dependencies": {
"@floating-ui/dom": "^1.5.1"
"@floating-ui/dom": "^1.5.3"
},
"devDependencies": {
"@cypress-design/rollup-plugin-tailwind-keep": "*"
Expand Down
4 changes: 2 additions & 2 deletions css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
"@windicss/plugin-interaction-variants": "^1.0.0",
"lodash": "^4.17.21",
"resolve-pkg": "^2.0.0",
"tailwindcss": "^3.3.3"
"tailwindcss": "^3.3.5"
},
"devDependencies": {
"@types/lodash": "^4.14.197",
"@types/lodash": "^4.14.200",
"typescript": "5.2.2",
"color-string": "1.9.1"
},
Expand Down
4 changes: 2 additions & 2 deletions docs/src/BrandColors.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import { cyColors as designColors } from '@cypress-design/css/dist/color-constants'
import _ from 'lodash'
import flat from 'flat'
import * as flat from 'flat'
import chroma from 'chroma-js'
const { filter, flatten, pick, startsWith, values } = _
Expand Down Expand Up @@ -33,7 +33,7 @@ type Color = {
textColor: 'white' | 'black'
}
const colorsObject = flat(namedColors, {
const colorsObject = flat.flatten(namedColors, {
delimiter: '-',
}) as Record<string, string>
Expand Down
8 changes: 4 additions & 4 deletions docs/src/IconSized.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ defineProps<{
meta: Record<string, string[]>
}>()
const strokeColor = ref<WindiColor>()
const fillColor = ref<WindiColor>()
const secondaryStrokeColor = ref<WindiColor>()
const secondaryFillColor = ref<WindiColor>()
const strokeColor = ref<WindiColor>('indigo-500')
const fillColor = ref<WindiColor>('jade-200')
const secondaryStrokeColor = ref<WindiColor>('orange-500')
const secondaryFillColor = ref<WindiColor>('orange-300')
</script>

<template>
Expand Down
6 changes: 6 additions & 0 deletions icon-registry/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @cypress-design/icon-registry

## 0.32.0

### Minor Changes

- [#335](https://github.com/cypress-io/cypress-design/pull/335) [`24d343f`](https://github.com/cypress-io/cypress-design/commit/24d343f8c7c4acce6192b357df16c639ec316a44) Thanks [@ryanjwilke](https://github.com/ryanjwilke)! - Added the Device TV icon

## 0.31.0

### Minor Changes
Expand Down
4 changes: 4 additions & 0 deletions icon-registry/icons/device-tv_x16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icon-registry/icons/device-tv_x24.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions icon-registry/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cypress-design/icon-registry",
"version": "0.31.0",
"version": "0.32.0",
"description": "All svg files to be exposed to the Icon component",
"main": "dist/index.umd.js",
"module": "dist/index.es.mjs",
Expand All @@ -25,11 +25,11 @@
"@cypress-design/css": "*"
},
"devDependencies": {
"@types/lodash": "^4.14.197",
"@types/lodash": "^4.14.200",
"dedent": "^1.5.1",
"globby": "^13.2.2",
"lodash": "^4.17.21",
"svg-to-ts": "^10.0.0",
"svg-to-ts": "^11.0.0",
"wait-cli": "^1.0.0"
},
"svg-to-ts": {
Expand Down
Loading

0 comments on commit c9b01a9

Please sign in to comment.