Skip to content

Commit

Permalink
Merge branch 'develop' into chore/better-index-unlockall
Browse files Browse the repository at this point in the history
  • Loading branch information
KevLehman committed Aug 1, 2024
2 parents 9e3ca4c + a663078 commit b31933f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
3 changes: 1 addition & 2 deletions fuselage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,10 @@ echo "📦 @rocket.chat/emitter [UPDATING to $targetVersion version...]
📦 @rocket.chat/message-parser [UPDATING to $targetVersion version...]
📦 @rocket.chat/onboarding-ui [UPDATING to $targetVersion version...]
📦 @rocket.chat/string-helpers [UPDATING to $targetVersion version...]
📦 @rocket.chat/ui-kit [UPDATING to $targetVersion version...]
📦 @rocket.chat/layout [UPDATING to $targetVersion version...]
📦 @rocket.chat/message-parser [UPDATING to $targetVersion version...]"

eval "yarn up @rocket.chat/emitter@$targetVersion @rocket.chat/fuselage-polyfills@$targetVersion @rocket.chat/fuselage-toastbar@$targetVersion @rocket.chat/fuselage-tokens@$targetVersion @rocket.chat/css-in-js@$targetVersion @rocket.chat/styled@$targetVersion @rocket.chat/fuselage@$targetVersion @rocket.chat/fuselage-hooks@$targetVersion @rocket.chat/icons@$targetVersion @rocket.chat/logo@$targetVersion @rocket.chat/memo@$targetVersion @rocket.chat/message-parser@$targetVersion @rocket.chat/onboarding-ui@$targetVersion @rocket.chat/string-helpers@$targetVersion @rocket.chat/ui-kit@$targetVersion @rocket.chat/layout@$targetVersion @rocket.chat/message-parser@$targetVersion"
eval "yarn up @rocket.chat/emitter@$targetVersion @rocket.chat/fuselage-polyfills@$targetVersion @rocket.chat/fuselage-toastbar@$targetVersion @rocket.chat/fuselage-tokens@$targetVersion @rocket.chat/css-in-js@$targetVersion @rocket.chat/styled@$targetVersion @rocket.chat/fuselage@$targetVersion @rocket.chat/fuselage-hooks@$targetVersion @rocket.chat/icons@$targetVersion @rocket.chat/logo@$targetVersion @rocket.chat/memo@$targetVersion @rocket.chat/message-parser@$targetVersion @rocket.chat/onboarding-ui@$targetVersion @rocket.chat/string-helpers@$targetVersion @rocket.chat/layout@$targetVersion @rocket.chat/message-parser@$targetVersion"
exit 1
fi

Expand Down
31 changes: 18 additions & 13 deletions packages/ui-composer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
"name": "@rocket.chat/ui-composer",
"version": "0.2.0",
"private": true,
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
"files": [
"/dist"
],
"scripts": {
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"test": "jest",
"build": "rm -rf dist && tsc -p tsconfig.build.json",
"typecheck": "tsc --noEmit",
"dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
"storybook": "start-storybook -p 6006"
},
"devDependencies": {
"@babel/core": "~7.22.20",
"@react-aria/toolbar": "^3.0.0-beta.1",
Expand All @@ -17,12 +31,16 @@
"@storybook/testing-library": "~0.0.13",
"@types/babel__core": "~7.20.3",
"@types/jest": "~29.5.12",
"@types/react": "~17.0.69",
"@types/react-dom": "~17.0.22",
"eslint": "~8.45.0",
"eslint-plugin-react": "~7.32.2",
"eslint-plugin-react-hooks": "~4.6.0",
"eslint-plugin-storybook": "~0.6.15",
"jest": "~29.7.0",
"react": "~17.0.2",
"react-docgen-typescript-plugin": "~1.0.5",
"react-dom": "~17.0.2",
"ts-jest": "~29.1.1",
"typescript": "~5.3.3"
},
Expand All @@ -33,19 +51,6 @@
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"scripts": {
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
"lint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix",
"test": "jest",
"build": "rm -rf dist && tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
"storybook": "start-storybook -p 6006"
},
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
"files": [
"/dist"
],
"volta": {
"extends": "../../package.json"
}
Expand Down
4 changes: 4 additions & 0 deletions packages/ui-composer/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "./tsconfig.json",
"exclude": ["./src/**/*.stories.tsx"]
}

0 comments on commit b31933f

Please sign in to comment.