Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dougfabris committed Oct 31, 2022
2 parents abf7a45 + a12eee6 commit a354ada
Show file tree
Hide file tree
Showing 53 changed files with 3,507 additions and 5,787 deletions.
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
"extensions": [".js", ".jsx", ".md", ".mdx", ".ts", ".tsx", ".pegjs"]
},
"editor.formatOnSave": true,
"[typescript]": {
"editor.formatOnSave": false
},
"[typescriptreact]": {
"editor.formatOnSave": false
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[pegjs]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
Expand Down
786 changes: 0 additions & 786 deletions .yarn/releases/yarn-3.2.1.cjs

This file was deleted.

801 changes: 801 additions & 0 deletions .yarn/releases/yarn-3.2.4.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"

yarnPath: .yarn/releases/yarn-3.2.1.cjs
yarnPath: .yarn/releases/yarn-3.2.4.cjs
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"devDependencies": {
"bump": "workspace:~",
"husky": "~7.0.4",
"hygen": "~6.1.0",
"hygen": "~6.1.5",
"lerna": "~4.0.0",
"lint-staged": "~12.3.3",
"turbo": "~1.1.2",
"lint-staged": "~12.3.8",
"turbo": "~1.1.10",
"update-readme": "workspace:~",
"webpack": "~5.68.0"
"webpack": "~5.74.0"
},
"scripts": {
"postinstall": "husky install",
Expand All @@ -39,5 +39,5 @@
"node": "14.17.6",
"yarn": "1.22.11"
},
"packageManager": "[email protected].1"
"packageManager": "[email protected].4"
}
22 changes: 11 additions & 11 deletions packages/css-in-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,29 @@
"devDependencies": {
"@rocket.chat/eslint-config-alt": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"@rollup/plugin-commonjs": "~21.0.1",
"@rollup/plugin-commonjs": "~21.0.3",
"@rollup/plugin-json": "~4.1.0",
"@rollup/plugin-node-resolve": "~13.1.3",
"@rollup/plugin-typescript": "~8.3.0",
"@types/jest": "~27.4.0",
"@rollup/plugin-typescript": "~8.3.4",
"@types/jest": "~27.4.1",
"@types/stylis": "^4.0.2",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"jest": "~27.5.1",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"prettier": "~2.5.1",
"rollup": "~2.67.2",
"lint-staged": "~12.3.8",
"prettier": "~2.7.1",
"rollup": "~2.67.3",
"rollup-plugin-terser": "~7.0.2",
"ts-jest": "~27.1.3",
"typedoc": "~0.22.11",
"ts-jest": "~27.1.5",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
},
"dependencies": {
"@emotion/hash": "^0.8.0",
"@emotion/hash": "^0.9.0",
"@rocket.chat/css-supports": "workspace:~",
"@rocket.chat/memo": "workspace:~",
"@rocket.chat/stylis-logical-props-middleware": "workspace:~",
"stylis": "~4.0.13"
"stylis": "~4.1.3"
}
}
8 changes: 4 additions & 4 deletions packages/css-supports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"@rocket.chat/eslint-config-alt": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"prettier": "~2.5.1",
"lint-staged": "~12.3.8",
"prettier": "~2.7.1",
"rimraf": "~3.0.2",
"typedoc": "~0.22.11",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
},
"dependencies": {
Expand Down
18 changes: 9 additions & 9 deletions packages/emitter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,23 @@
"devDependencies": {
"@rocket.chat/eslint-config-alt": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"@rollup/plugin-commonjs": "~21.0.1",
"@rollup/plugin-commonjs": "~21.0.3",
"@rollup/plugin-json": "~4.1.0",
"@rollup/plugin-node-resolve": "~13.1.3",
"@rollup/plugin-typescript": "~8.3.0",
"@types/jest": "~27.4.0",
"@rollup/plugin-typescript": "~8.3.4",
"@types/jest": "~27.4.1",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"jest": "~27.5.1",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"lint-staged": "~12.3.8",
"npm-run-all": "^4.1.5",
"prettier": "~2.5.1",
"rollup": "~2.67.2",
"prettier": "~2.7.1",
"rollup": "~2.67.3",
"rollup-plugin-terser": "~7.0.2",
"ts-jest": "~27.1.3",
"ts-jest": "~27.1.5",
"tslib": "^2.3.1",
"typedoc": "~0.22.11",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
}
}
22 changes: 11 additions & 11 deletions packages/eslint-config-alt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,24 @@
"peerDependencies": {
"@babel/eslint-parser": "^7.13.14",
"eslint": "^7.29.0",
"prettier": "^2.3.2"
"prettier": "~2.7.1"
},
"devDependencies": {
"@babel/eslint-parser": "~7.17.0",
"@babel/eslint-parser": "~7.19.1",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"prettier": "~2.5.1"
"lint-staged": "~12.3.8",
"prettier": "~2.7.1"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "~5.11.0",
"@typescript-eslint/parser": "~5.11.0",
"eslint-config-prettier": "~8.3.0",
"eslint-import-resolver-typescript": "~2.5.0",
"eslint-plugin-import": "~2.25.4",
"eslint-plugin-prettier": "~4.0.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "~4.3.0"
"eslint-config-prettier": "~8.5.0",
"eslint-import-resolver-typescript": "~3.5.2",
"eslint-plugin-import": "~2.26.0",
"eslint-plugin-prettier": "~4.2.1",
"eslint-plugin-react": "~7.31.10",
"eslint-plugin-react-hooks": "~4.6.0"
}
}
22 changes: 11 additions & 11 deletions packages/fuselage-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,30 +45,30 @@
"@rocket.chat/eslint-config-alt": "workspace:~",
"@rocket.chat/fuselage-tokens": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"@rollup/plugin-commonjs": "~21.0.1",
"@rollup/plugin-commonjs": "~21.0.3",
"@rollup/plugin-json": "~4.1.0",
"@rollup/plugin-node-resolve": "~13.1.3",
"@rollup/plugin-typescript": "~8.3.0",
"@rollup/plugin-typescript": "~8.3.4",
"@testing-library/react-hooks": "~7.0.2",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "~27.4.0",
"@types/react": "~17.0.39",
"@types/react-dom": "^17.0.11",
"@types/jest": "~27.4.1",
"@types/react": "~17.0.51",
"@types/react-dom": "^17.0.17",
"@types/resize-observer-browser": "~0.1.7",
"@types/use-sync-external-store": "~0.0.3",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"jest": "~27.5.1",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"lint-staged": "~12.3.8",
"npm-run-all": "^4.1.5",
"prettier": "~2.5.1",
"prettier": "~2.7.1",
"react": "^17.0.2",
"rollup": "~2.67.2",
"rollup": "~2.67.3",
"rollup-plugin-terser": "~7.0.2",
"testing-utils": "workspace:~",
"ts-jest": "~27.1.3",
"typedoc": "~0.22.11",
"ts-jest": "~27.1.5",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/fuselage-polyfills/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"bump-next": "bump-next"
},
"dependencies": {
"@juggle/resize-observer": "^3.3.1",
"@juggle/resize-observer": "^3.4.0",
"clipboard-polyfill": "^3.0.3",
"element-closest-polyfill": "^1.0.4",
"element-closest-polyfill": "^1.0.5",
"focus-visible": "^5.2.0",
"focus-within-polyfill": "^5.2.1",
"new-event-polyfill": "^1.0.1"
Expand All @@ -36,9 +36,9 @@
"@rocket.chat/eslint-config-alt": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"prettier": "~2.5.1"
"lint-staged": "~12.3.8",
"prettier": "~2.7.1"
}
}
3 changes: 2 additions & 1 deletion packages/fuselage-toastbar/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/node_modules
/dist
/node_modules
/storybook-static
3 changes: 2 additions & 1 deletion packages/fuselage-toastbar/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/node_modules
/dist
/node_modules
/storybook-static
28 changes: 14 additions & 14 deletions packages/fuselage-toastbar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@
"@rocket.chat/layout": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"@rocket.chat/styled": "workspace:~",
"@storybook/addon-essentials": "~6.4.18",
"@storybook/addons": "~6.4.18",
"@storybook/react": "~6.4.18",
"@storybook/source-loader": "~6.4.18",
"@storybook/theming": "~6.4.18",
"@types/jest": "~27.4.0",
"@types/react": "~17.0.39",
"@types/react-dom": "^17.0.11",
"@storybook/addon-essentials": "~6.5.13",
"@storybook/addons": "~6.5.13",
"@storybook/react": "~6.5.13",
"@storybook/source-loader": "~6.5.13",
"@storybook/theming": "~6.5.13",
"@types/jest": "~27.4.1",
"@types/react": "~17.0.51",
"@types/react-dom": "^17.0.17",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"jest": "~27.5.1",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"lint-staged": "~12.3.8",
"npm-run-all": "^4.1.5",
"prettier": "~2.5.1",
"prettier": "~2.7.1",
"rimraf": "~3.0.2",
"storybook-dark-mode": "~1.1.0",
"ts-jest": "~27.1.3",
"typedoc": "~0.22.11",
"storybook-dark-mode": "~1.1.2",
"ts-jest": "~27.1.5",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
},
"peerDependencies": {
Expand Down
20 changes: 10 additions & 10 deletions packages/fuselage-tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@
"@rocket.chat/prettier-config": "workspace:~",
"build-design-tokens": "workspace:~",
"bump": "workspace:~",
"eslint": "~8.8.0",
"eslint-config-prettier": "~8.3.0",
"eslint-plugin-import": "~2.25.4",
"eslint-plugin-prettier": "~4.0.0",
"eslint": "~8.26.0",
"eslint-config-prettier": "~8.5.0",
"eslint-plugin-import": "~2.26.0",
"eslint-plugin-prettier": "~4.2.1",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"lint-staged": "~12.3.8",
"npm-run-all": "^4.1.5",
"postcss-scss": "~4.0.4",
"prettier": "~2.5.1",
"postcss-scss": "~4.0.5",
"prettier": "~2.7.1",
"rimraf": "^3.0.2",
"style-dictionary": "~3.7.0",
"stylelint": "~14.5.0",
"style-dictionary": "~3.7.1",
"stylelint": "~14.14.0",
"stylelint-order": "~5.0.0",
"stylelint-prettier": "~2.0.0",
"stylelint-scss": "~4.1.0",
"stylelint-scss": "~4.3.0",
"typescript": "~4.3.5"
}
}
2 changes: 1 addition & 1 deletion packages/fuselage-tokens/src/surface/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"tint": { "value": "{colors.n100}" },
"neutral": { "value": "{colors.n400}" },
"disabled": { "value": "{colors.n100}" },
"hover": { "value": "{colors.n400}" },
"hover": { "value": "{colors.n200}" },
"dark": { "value": "{colors.n900}" }
}
}
28 changes: 14 additions & 14 deletions packages/fuselage-ui-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@
"@rocket.chat/icons": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"@rocket.chat/styled": "workspace:~",
"@storybook/addon-essentials": "~6.4.18",
"@storybook/addons": "~6.4.18",
"@storybook/builder-webpack5": "~6.4.18",
"@storybook/manager-webpack5": "~6.4.18",
"@storybook/react": "~6.4.18",
"@storybook/source-loader": "~6.4.18",
"@storybook/theming": "~6.4.18",
"@types/react": "~17.0.39",
"@types/react-dom": "^17.0.11",
"babel-loader": "~8.2.3",
"@storybook/addon-essentials": "~6.5.13",
"@storybook/addons": "~6.5.13",
"@storybook/builder-webpack5": "~6.5.13",
"@storybook/manager-webpack5": "~6.5.13",
"@storybook/react": "~6.5.13",
"@storybook/source-loader": "~6.5.13",
"@storybook/theming": "~6.5.13",
"@types/react": "~17.0.51",
"@types/react-dom": "^17.0.17",
"babel-loader": "~8.2.5",
"bump": "workspace:~",
"cross-env": "^7.0.3",
"eslint": "~8.8.0",
"eslint": "~8.26.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.3",
"lint-staged": "~12.3.8",
"normalize.css": "^8.0.1",
"npm-run-all": "^4.1.5",
"prettier": "~2.5.1",
"prettier": "~2.7.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"rimraf": "^3.0.2",
"typescript": "~4.3.5",
"webpack": "~5.68.0",
"webpack": "~5.74.0",
"write-version-module": "workspace:~"
},
"dependencies": {
Expand Down
Loading

0 comments on commit a354ada

Please sign in to comment.