Skip to content

Commit

Permalink
Merge branch 'main' into chrisf/icon-shield-check
Browse files Browse the repository at this point in the history
  • Loading branch information
Barthélémy Ledoux authored Nov 6, 2023
2 parents 3c4450d + d4aa11d commit 5932a66
Show file tree
Hide file tree
Showing 20 changed files with 1,892 additions and 1,950 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"
}
2 changes: 1 addition & 1 deletion components/Icon/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"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
2 changes: 1 addition & 1 deletion components/Icon/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"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/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
4 changes: 2 additions & 2 deletions icon-registry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
74 changes: 37 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,68 +41,68 @@
"@cypress-design/vue-docmenu": "*",
"@cypress-design/vue-icon": "*",
"@cypress-design/vue-tooltip": "*",
"@percy/cli": "1.27.1",
"@percy/cli": "1.27.4",
"@percy/cypress": "3.1.2",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-sucrase": "^5.0.1",
"@rollup/plugin-typescript": "^11.1.3",
"@testing-library/cypress": "^9.0.0",
"@types/chroma-js": "^2.4.1",
"@types/dedent": "^0.7.0",
"@types/flat": "5.0.2",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-sucrase": "^5.0.2",
"@rollup/plugin-typescript": "^11.1.5",
"@testing-library/cypress": "^10.0.1",
"@types/chroma-js": "^2.4.2",
"@types/dedent": "^0.7.1",
"@types/flat": "5.0.4",
"@types/react": "18",
"@types/react-dom": "18",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"@vitejs/plugin-vue": "^4.3.4",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@vitejs/plugin-vue": "^4.4.0",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"@vue/tsconfig": "^0.4.0",
"@vueuse/integrations": "^10.4.1",
"autoprefixer": "^10.4.15",
"axe-core": "^4.7.2",
"@vueuse/integrations": "^10.5.0",
"autoprefixer": "^10.4.16",
"axe-core": "^4.8.2",
"chokidar": "^3.5.3",
"chroma-js": "^2.4.2",
"concurrently": "^8.2.1",
"cypress": "^13.1.0",
"concurrently": "^8.2.2",
"cypress": "^13.4.0",
"cypress-axe": "^1.5.0",
"cypress-real-events": "^1.10.1",
"cypress-real-events": "^1.11.0",
"dedent": "^1.5.1",
"es-module-lexer": "^1.3.0",
"esbuild": "^0.19.2",
"eslint": "^8.48.0",
"eslint-import-resolver-typescript": "^3.6.0",
"es-module-lexer": "^1.3.1",
"esbuild": "^0.19.5",
"eslint": "^8.53.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-react-hooks": "^4.6.0",
"execa": "^8.0.1",
"flat": "^5.0.2",
"flat": "^6.0.1",
"globby": "^13.2.2",
"husky": "^8.0.3",
"hygen": "^6.2.11",
"lint-staged": ">=14",
"postcss": "^8.4.29",
"lint-staged": ">=15",
"postcss": "^8.4.31",
"prettier": "^3.0.3",
"react": "18",
"react-docgen-typescript": "^2.2.2",
"react-dom": "18",
"react-live-runner": "^1.0.5",
"rimraf": "^5.0.1",
"rollup": "^3.28.1",
"rimraf": "^5.0.5",
"rollup": "^4.3.0",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-sourcemaps": "^0.6.3",
"turbo": "^1.10.13",
"turbo": "^1.10.16",
"typescript": "5.2.2",
"universal-cookie": "^6.1.0",
"vite": "4.4.9",
"vitepress": "1.0.0-rc.10",
"vitest": "^0.34.3",
"vue": "3.3.4",
"vue-component-meta": "^1.8.8",
"vue-docgen-api": "^4.74.0",
"universal-cookie": "^6.1.1",
"vite": "4.5.0",
"vitepress": "1.0.0-rc.25",
"vitest": "^0.34.6",
"vue": "3.3.8",
"vue-component-meta": "^1.8.22",
"vue-docgen-api": "^4.75.0",
"vue-docgen-cli": "^4.67.0",
"vue-eslint-parser": "^9.3.1",
"vue-eslint-parser": "^9.3.2",
"vue-live": "^2.5.4",
"vue-tsc": "^1.8.8"
"vue-tsc": "^1.8.22"
},
"lint-staged": {
"*.{js,ts,jsx,tsx,vue}": "eslint --cache --fix",
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"requireindex": "^1.2.0"
},
"devDependencies": {
"eslint": "^8.48.0",
"eslint-doc-generator": "^1.4.3",
"eslint": "^8.53.0",
"eslint-doc-generator": "^1.5.4",
"eslint-plugin-eslint-plugin": "^5.1.1",
"eslint-plugin-node": "^11.1.0",
"mocha": "^10.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/rollup-plugin-tailwind-keep/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"types": "./dist/index.d.ts",
"dependencies": {
"@cypress-design/css": "0.16.0",
"tailwindcss": "3.3.3",
"vite": "4.4.9"
"tailwindcss": "3.3.5",
"vite": "4.5.0"
}
}
10 changes: 5 additions & 5 deletions test/react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
"@cypress-design/react-spinner": "*",
"@cypress-design/react-tabs": "*",
"@cypress-design/react-tooltip": "*",
"autoprefixer": "^10.4.15",
"postcss": "^8.4.28",
"autoprefixer": "^10.4.16",
"postcss": "^8.4.31",
"react": "18",
"react-dom": "18",
"tailwindcss": "^3.3.3"
"tailwindcss": "^3.3.5"
},
"devDependencies": {
"@cypress-design/css": "^0.16.0",
"@types/react": "18",
"@types/react-dom": "18",
"@vitejs/plugin-react": "^4.0.4",
"@vitejs/plugin-react": "^4.1.1",
"typescript": "^5.2.2",
"vite": "^4.4.9"
"vite": "^4.5.0"
},
"license": "MIT"
}
10 changes: 5 additions & 5 deletions test/vue-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"@cypress-design/vue-spinner": "*",
"@cypress-design/vue-alert": "*",
"@cypress-design/vue-modal": "*",
"autoprefixer": "^10.4.15",
"postcss": "^8.4.28",
"tailwindcss": "^3.3.3",
"autoprefixer": "^10.4.16",
"postcss": "^8.4.31",
"tailwindcss": "^3.3.5",
"vue": "3.3"
},
"devDependencies": {
"@cypress-design/css": "*",
"@vue/tsconfig": "^0.4.0",
"@vitejs/plugin-vue": "^4.3.3",
"@vitejs/plugin-vue": "^4.4.0",
"typescript": "^5.2.2",
"vite": "^4.4.9",
"vite": "^4.5.0",
"vue-tsc": "*"
}
}
Loading

0 comments on commit 5932a66

Please sign in to comment.