Skip to content

Commit

Permalink
Merge commit 'e83ac0805150a4bea46ab47074ad9b19e4722030'
Browse files Browse the repository at this point in the history
  • Loading branch information
dougfabris committed May 5, 2023
2 parents eca7804 + e83ac08 commit b93f6a5
Show file tree
Hide file tree
Showing 259 changed files with 9,727 additions and 13,176 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-node@v2
with:
node-version: "14.17.6"
node-version: "14.21.3"
- uses: actions/checkout@v2
- name: Turbo Cache
id: turbo-cache
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
steps:
- uses: actions/setup-node@v2
with:
node-version: "14.17.6"
node-version: "14.21.3"
registry-url: "https://registry.npmjs.org"
scope: "@rocket.chat"
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/setup-node@v2
with:
node-version: "14.17.6"
node-version: "14.21.3"
- uses: actions/checkout@v2
- uses: actions/cache@v2
id: yarn-cache
Expand Down
15 changes: 12 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,21 @@
}
],
"eslint.onIgnoredFiles": "warn",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"eslint.options": {
"extensions": [".js", ".jsx", ".md", ".mdx", ".ts", ".tsx", ".pegjs"]
},
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"markdown",
"mdx",
"pegjs"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"editor.formatOnSave": true,
"[typescript]": {
"editor.formatOnSave": false
Expand Down
801 changes: 0 additions & 801 deletions .yarn/releases/yarn-3.2.4.cjs

This file was deleted.

873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.5.0.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.4.cjs
yarnPath: .yarn/releases/yarn-3.5.0.cjs
55 changes: 26 additions & 29 deletions README.md

Large diffs are not rendered by default.

12 changes: 2 additions & 10 deletions _templates/create-package/library/files/package.json.t
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ to: packages/<%=package%>/package.json
"prettier": "~2.5.1",
"rimraf": "~3.0.2",
"ts-jest": "~27.1.3",
"typedoc": "~0.22.11",
"typedoc": "~0.24.1",
"typescript": "~4.3.5"
},
"eslintConfig": {
Expand All @@ -65,14 +65,6 @@ to: packages/<%=package%>/package.json
"errorOnDeprecated": true,
"testMatch": [
"<rootDir>/src/**/*.spec.[jt]s?(x)"
],
"globals": {
"ts-jest": {
"tsconfig": {
"noUnusedLocals": false,
"noUnusedParameters": false
}
}
}
]
}
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"husky": "~7.0.4",
"hygen": "~6.1.5",
"lerna": "~4.0.0",
"lint-staged": "~12.3.8",
"lint-staged": "~13.2.1",
"turbo": "~1.1.10",
"update-readme": "workspace:~",
"webpack": "~5.74.0"
"webpack": "~5.78.0"
},
"scripts": {
"postinstall": "husky install",
Expand All @@ -33,11 +33,11 @@
"release-next": "yarn workspaces foreach --no-private -v npm publish --tag next --tolerate-republish"
},
"devEngines": {
"node": "~14.17.6"
"node": "~14.21.3"
},
"volta": {
"node": "14.17.6",
"yarn": "1.22.11"
"node": "14.21.3",
"yarn": "1.22.19"
},
"packageManager": "yarn@3.2.4"
"packageManager": "yarn@3.5.0"
}
16 changes: 8 additions & 8 deletions packages/css-in-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,19 @@
"@rollup/plugin-json": "~4.1.0",
"@rollup/plugin-node-resolve": "~13.1.3",
"@rollup/plugin-typescript": "~8.3.4",
"@types/jest": "~27.4.1",
"@types/jest": "~29.5.0",
"@types/stylis": "^4.0.2",
"bump": "workspace:~",
"eslint": "~8.26.0",
"jest": "~27.5.1",
"eslint": "~8.38.0",
"jest": "~29.5.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.8",
"prettier": "~2.7.1",
"lint-staged": "~13.2.1",
"prettier": "~2.8.7",
"rollup": "~2.67.3",
"rollup-plugin-terser": "~7.0.2",
"ts-jest": "~27.1.5",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
"ts-jest": "~29.1.0",
"typedoc": "~0.24.1",
"typescript": "~5.0.4"
},
"dependencies": {
"@emotion/hash": "^0.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/css-in-js/src/sheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const attachRulesIntoStyleSheet: RuleAttacher = (rules) => {
};

const wrapReferenceCounting = (attacher: RuleAttacher): RuleAttacher => {
const refs = {};
const refs: Record<string, { ref(): void; unref(): void }> = {};

const queueMicrotask = (fn: () => void): void => {
if (
Expand Down
4 changes: 1 addition & 3 deletions packages/css-in-js/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
"noImplicitThis": true,
"noImplicitAny": true,
"strictNullChecks": true,
"suppressImplicitAnyIndexErrors": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"esModuleInterop": true,
"skipLibCheck": true,
"importsNotUsedAsValues": "error"
"skipLibCheck": true
},
"include": ["src"],
"exclude": ["dist", "node_modules", "src/*.spec.ts"]
Expand Down
10 changes: 5 additions & 5 deletions packages/css-supports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"@rocket.chat/eslint-config-alt": "workspace:~",
"@rocket.chat/prettier-config": "workspace:~",
"bump": "workspace:~",
"eslint": "~8.26.0",
"eslint": "~8.38.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.8",
"prettier": "~2.7.1",
"lint-staged": "~13.2.1",
"prettier": "~2.8.7",
"rimraf": "~3.0.2",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
"typedoc": "~0.24.1",
"typescript": "~5.0.4"
},
"dependencies": {
"@rocket.chat/memo": "workspace:~"
Expand Down
3 changes: 1 addition & 2 deletions packages/css-supports/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node",
"resolveJsonModule": true,
"importsNotUsedAsValues": "error"
"resolveJsonModule": true
},
"include": ["src/**/*"],
"typedocOptions": {
Expand Down
8 changes: 0 additions & 8 deletions packages/emitter/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,4 @@ module.exports = {
preset: 'ts-jest',
errorOnDeprecated: true,
testMatch: ['**/src/**/*.spec.[jt]s?(x)'],
globals: {
'ts-jest': {
tsconfig: {
noUnusedLocals: false,
noUnusedParameters: false,
},
},
},
};
17 changes: 8 additions & 9 deletions packages/emitter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,18 @@
"@rollup/plugin-json": "~4.1.0",
"@rollup/plugin-node-resolve": "~13.1.3",
"@rollup/plugin-typescript": "~8.3.4",
"@types/jest": "~27.4.1",
"@types/jest": "~29.5.0",
"bump": "workspace:~",
"eslint": "~8.26.0",
"jest": "~27.5.1",
"eslint": "~8.38.0",
"jest": "~29.5.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.8",
"lint-staged": "~13.2.1",
"npm-run-all": "^4.1.5",
"prettier": "~2.7.1",
"prettier": "~2.8.7",
"rollup": "~2.67.3",
"rollup-plugin-terser": "~7.0.2",
"ts-jest": "~27.1.5",
"tslib": "^2.3.1",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
"ts-jest": "~29.1.0",
"typedoc": "~0.24.1",
"typescript": "~5.0.4"
}
}
9 changes: 1 addition & 8 deletions packages/emitter/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,11 @@
"outDir": "./dist",
"moduleResolution": "node",
"forceConsistentCasingInFileNames": true,
// "noEmit": true,
// "noImplicitReturns": true,
// "noImplicitThis": true,
// "noImplicitAny": true,
// "strictNullChecks": true,
"suppressImplicitAnyIndexErrors": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"esModuleInterop": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"importsNotUsedAsValues": "error"
"skipLibCheck": true
},
"include": ["src"],
"exclude": ["dist", "node_modules", "src/*.spec.ts"]
Expand Down
20 changes: 10 additions & 10 deletions packages/eslint-config-alt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,25 @@
},
"peerDependencies": {
"@babel/eslint-parser": "^7.13.14",
"eslint": "^7.29.0",
"eslint": "~8.38.0",
"prettier": "~2.7.1"
},
"devDependencies": {
"@babel/eslint-parser": "~7.19.1",
"@babel/eslint-parser": "~7.21.3",
"bump": "workspace:~",
"eslint": "~8.26.0",
"eslint": "~8.38.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.8",
"prettier": "~2.7.1"
"lint-staged": "~13.2.1",
"prettier": "~2.8.7"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "~5.11.0",
"@typescript-eslint/parser": "~5.11.0",
"eslint-config-prettier": "~8.5.0",
"eslint-import-resolver-typescript": "~3.5.2",
"@typescript-eslint/eslint-plugin": "~5.58.0",
"@typescript-eslint/parser": "~5.58.0",
"eslint-config-prettier": "~8.8.0",
"eslint-import-resolver-typescript": "~3.5.5",
"eslint-plugin-import": "~2.26.0",
"eslint-plugin-prettier": "~4.2.1",
"eslint-plugin-react": "~7.31.10",
"eslint-plugin-react": "~7.32.2",
"eslint-plugin-react-hooks": "~4.6.0"
}
}
8 changes: 0 additions & 8 deletions packages/fuselage-hooks/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,5 @@ module.exports = {
errorOnDeprecated: true,
testMatch: ['<rootDir>/src/**/*.spec.{ts,tsx}'],
testEnvironment: 'jsdom',
globals: {
'ts-jest': {
tsconfig: {
noUnusedLocals: false,
noUnusedParameters: false,
},
},
},
setupFilesAfterEnv: ['testing-utils/setup/noErrorsLogged'],
};
24 changes: 12 additions & 12 deletions packages/fuselage-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@
"@rollup/plugin-json": "~4.1.0",
"@rollup/plugin-node-resolve": "~13.1.3",
"@rollup/plugin-typescript": "~8.3.4",
"@testing-library/react-hooks": "~7.0.2",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "~27.4.1",
"@types/react": "~17.0.51",
"@types/react-dom": "^17.0.17",
"@testing-library/react-hooks": "~8.0.1",
"@testing-library/user-event": "~14.4.3",
"@types/jest": "~29.5.0",
"@types/react": "~17.0.57",
"@types/react-dom": "^17.0.19",
"@types/resize-observer-browser": "~0.1.7",
"@types/use-sync-external-store": "~0.0.3",
"bump": "workspace:~",
"eslint": "~8.26.0",
"jest": "~27.5.1",
"eslint": "~8.38.0",
"jest": "~29.5.0",
"lint-all": "workspace:~",
"lint-staged": "~12.3.8",
"lint-staged": "~13.2.1",
"npm-run-all": "^4.1.5",
"prettier": "~2.7.1",
"prettier": "~2.8.7",
"react": "^17.0.2",
"rollup": "~2.67.3",
"rollup-plugin-terser": "~7.0.2",
"testing-utils": "workspace:~",
"ts-jest": "~27.1.5",
"typedoc": "~0.22.18",
"typescript": "~4.3.5"
"ts-jest": "~29.1.0",
"typedoc": "~0.24.1",
"typescript": "~5.0.4"
},
"peerDependencies": {
"@rocket.chat/fuselage-tokens": "*",
Expand Down
Loading

0 comments on commit b93f6a5

Please sign in to comment.