Skip to content

Commit

Permalink
Merge commit '0ce66dfbab41121e9945f1c0f8a4e13f23b748a3'
Browse files Browse the repository at this point in the history
  • Loading branch information
dougfabris committed Jul 21, 2023
2 parents 35a021a + 0ce66df commit 4c5994b
Show file tree
Hide file tree
Showing 484 changed files with 20,903 additions and 14,414 deletions.
36 changes: 31 additions & 5 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ jobs:
name: storybooks
path: |
packages/fuselage/storybook-static
packages/fuselage-ui-kit/storybook-static
packages/uikit-playground/build
packages/onboarding-ui/storybook-static
packages/layout/storybook-static
- if: github.ref == 'refs/heads/master'
Expand Down Expand Up @@ -103,6 +101,36 @@ jobs:
env:
YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

bump-packages:
name: Bump packages on Rocket.Chat
runs-on: ubuntu-latest
needs:
- publish-to-npm
if: github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v3
with:
repository: "RocketChat/Rocket.Chat"

- uses: actions/setup-node@v2
with:
node-version: "14.21.3"
- name: Upgrade packages
run: yarn up @rocket.chat/emitter@latest @rocket.chat/fuselage-polyfills@latest @rocket.chat/fuselage-toastbar@latest @rocket.chat/fuselage-tokens@latest @rocket.chat/css-in-js@latest @rocket.chat/styled@latest @rocket.chat/fuselage@latest @rocket.chat/fuselage-hooks@latest @rocket.chat/icons@latest @rocket.chat/logo@latest @rocket.chat/memo@latest @rocket.chat/message-parser@latest @rocket.chat/onboarding-ui@latest @rocket.chat/string-helpers@latest

- name: Create Bump Pull Request
uses: peter-evans/create-pull-request@v4
env:
HUSKY: 0
with:
token: ${{ secrets.GH_TOKEN_FUSELAGE_BUMPER }}
commit-message: bump packages
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
branch: bump-fuselage-packages
delete-branch: true
title: "chore: Bump Fuselage Packages"
body: "Automated bump of the fuselage packages - [check what changed](https://github.com/RocketChat/fuselage/blob/develop/CHANGELOG.md)"

publish-to-gh-pages:
name: Publish to GitHub Pages
runs-on: ubuntu-latest
Expand All @@ -125,10 +153,8 @@ jobs:
name: docs
path: .
- run: |
rm -rf "fuselage/${{ needs.build-and-test.outputs.branch-name }}" "layout/${{ needs.build-and-test.outputs.branch-name }}" "uikit-playground/${{ needs.build-and-test.outputs.branch-name }}" "fuselage-ui-kit/${{ needs.build-and-test.outputs.branch-name }}" "onboarding-ui/${{ needs.build-and-test.outputs.branch-name }}"
rm -rf "fuselage/${{ needs.build-and-test.outputs.branch-name }}" "layout/${{ needs.build-and-test.outputs.branch-name }}" "onboarding-ui/${{ needs.build-and-test.outputs.branch-name }}"
mv -v "packages/fuselage/storybook-static" "fuselage/${{ needs.build-and-test.outputs.branch-name }}"
mv -v "packages/uikit-playground/build" "uikit-playground/${{ needs.build-and-test.outputs.branch-name }}"
mv -v "packages/fuselage-ui-kit/storybook-static" "fuselage-ui-kit/${{ needs.build-and-test.outputs.branch-name }}"
mv -v "packages/onboarding-ui/storybook-static" "onboarding-ui/${{ needs.build-and-test.outputs.branch-name }}"
mv -v "packages/layout/storybook-static" "layout/${{ needs.build-and-test.outputs.branch-name }}"
rm -rf packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2
with:
ref: gh-pages
- run: rm -rf "fuselage/${{ github.event.number }}" "layout/${{ github.event.number }}" "fuselage-ui-kit/${{ github.event.number }}" "uikit-playground/${{ github.event.number }}" "onboarding-ui/${{ github.event.number }}"
- run: rm -rf "fuselage/${{ github.event.number }}" "layout/${{ github.event.number }}" "onboarding-ui/${{ github.event.number }}"
- uses: crazy-max/ghaction-github-pages@v2
with:
target_branch: gh-pages
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci-pr-opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ jobs:
name: storybooks
path: |
fuselage/storybook-static
uikit-playground/build
fuselage-ui-kit/storybook-static
onboarding-ui/storybook-static
layout/storybook-static
publish-to-gh-pages:
Expand All @@ -65,8 +63,6 @@ jobs:
- run: |
rm -rf "fuselage/${{ needs.download-artifact.outputs.pr-number }}" "layout/${{ needs.download-artifact.outputs.pr-number }}" "uikit-playground/${{ needs.download-artifact.outputs.pr-number }}" "fuselage-ui-kit/${{ needs.download-artifact.outputs.pr-number }}" "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/fuselage/storybook-static "fuselage/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/uikit-playground/build "uikit-playground/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/fuselage-ui-kit/storybook-static "fuselage-ui-kit/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/onboarding-ui/storybook-static "onboarding-ui/${{ needs.download-artifact.outputs.pr-number }}"
mv -v packages/layout/storybook-static "layout/${{ needs.download-artifact.outputs.pr-number }}"
rm -rf packages
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,5 @@ jobs:
name: "storybooks-${{ github.event.number }}"
path: |
packages/fuselage/storybook-static
packages/uikit-playground/build
packages/fuselage-ui-kit/storybook-static
packages/onboarding-ui/storybook-static
packages/layout/storybook-static
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
| 📦 [`@rocket.chat/fuselage-polyfills`](/packages/fuselage-polyfills) | A bundle of useful poly/ponyfills used by fuselage | [![npm](https://img.shields.io/npm/v/@rocket.chat/fuselage-polyfills?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/fuselage-polyfills) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/fuselage-polyfills?style=flat-square) |
| 📦 [`@rocket.chat/fuselage-toastbar`](/packages/fuselage-toastbar) | Fuselage ToastBar component | [![npm](https://img.shields.io/npm/v/@rocket.chat/fuselage-toastbar?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/fuselage-toastbar) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/fuselage-toastbar?style=flat-square) |
| 📦 [`@rocket.chat/fuselage-tokens`](/packages/fuselage-tokens) | Design tokens for Fuselage, Rocket.Chat's design system | [![npm](https://img.shields.io/npm/v/@rocket.chat/fuselage-tokens?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/fuselage-tokens) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/fuselage-tokens?style=flat-square) |
| 📦 [`@rocket.chat/fuselage-ui-kit`](/packages/fuselage-ui-kit) | UiKit elements for Rocket.Chat Apps built under Fuselage design system | [![npm](https://img.shields.io/npm/v/@rocket.chat/fuselage-ui-kit?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/fuselage-ui-kit) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/fuselage-ui-kit?style=flat-square) |
| 📦 [`@rocket.chat/icons`](/packages/icons) | Rocket.Chat's Icons | [![npm](https://img.shields.io/npm/v/@rocket.chat/icons?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/icons) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/icons?style=flat-square) |
| 📦 [`@rocket.chat/layout`](/packages/layout) | Shared Application Layout Components | [![npm](https://img.shields.io/npm/v/@rocket.chat/layout?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/layout) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/layout?style=flat-square) |
| 📦 [`@rocket.chat/logo`](/packages/logo) | Rocket.Chat logo package | [![npm](https://img.shields.io/npm/v/@rocket.chat/logo?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/logo) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/logo?style=flat-square) |
Expand All @@ -35,4 +34,3 @@
| 📦 [`@rocket.chat/styled`](/packages/styled) | A simple styled API for React components | [![npm](https://img.shields.io/npm/v/@rocket.chat/styled?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/styled) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/styled?style=flat-square) |
| 📦 [`@rocket.chat/stylis-logical-props-middleware`](/packages/stylis-logical-props-middleware) | Stylis middleware to handle CSS Logical Properties and their fallbacks | [![npm](https://img.shields.io/npm/v/@rocket.chat/stylis-logical-props-middleware?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/stylis-logical-props-middleware) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/stylis-logical-props-middleware?style=flat-square) |
| 📦 [`@rocket.chat/ui-kit`](/packages/ui-kit) | Interactive UI elements for Rocket.Chat Apps | [![npm](https://img.shields.io/npm/v/@rocket.chat/ui-kit?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/ui-kit) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/ui-kit?style=flat-square) |
| 📦 [`@rocket.chat/uikit-playground`](/packages/uikit-playground) | | [![npm](https://img.shields.io/npm/v/@rocket.chat/uikit-playground?style=flat-square)](https://www.npmjs.com/package/@rocket.chat/uikit-playground) | ![deps](https://img.shields.io/librariesio/release/npm/@rocket.chat/uikit-playground?style=flat-square) |
4 changes: 2 additions & 2 deletions _templates/create-package/library/files/package.json.t
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ to: packages/<%=package%>/package.json
"scripts": {
"clean": "rimraf dist",
"build": "run .:build:esm && run .:build:cjs",
".:build:esm": "tsc -p tsconfig-esm.json",
".:build:cjs": "tsc -p tsconfig-cjs.json",
".:build:esm": "tsc -p tsconfig.esm.json",
".:build:cjs": "tsc -p tsconfig.cjs.json",
"lint": "lint",
"lint-and-fix": "lint-and-fix",
"lint-staged": "lint-staged",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
to: packages/<%=package%>/tsconfig-cjs.json
to: packages/<%=package%>/tsconfig.cjs.json
---
{
"extends": "./tsconfig.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
to: packages/<%=package%>/tsconfig-esm.json
to: packages/<%=package%>/tsconfig.esm.json
---
{
"extends": "./tsconfig.json",
Expand Down
7 changes: 1 addition & 6 deletions _templates/create-package/library/files/tsconfig.json.t
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,12 @@
to: packages/<%=package%>/tsconfig.json
---
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"target": "es5",
"module": "ESNext",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"outDir": "./dist/esm",
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node",
"resolveJsonModule": true
},
Expand Down
4 changes: 3 additions & 1 deletion packages/css-in-js/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ const plugins = [
json(),
nodeResolve(),
commonjs(),
typescript(),
typescript({
tsconfig: './tsconfig.build.json',
}),
];

export default [
Expand Down
4 changes: 4 additions & 0 deletions packages/css-in-js/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "./tsconfig.json",
"exclude": ["src/**/*.spec.ts"]
}
13 changes: 1 addition & 12 deletions packages/css-in-js/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"module": "ESNext",
"target": "es5",
"lib": ["dom", "es6"],
"sourceMap": true,
"allowJs": false,
"jsx": "react",
"declaration": true,
"declarationDir": "./dist",
"outDir": "./dist",
"moduleResolution": "node",
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"noImplicitReturns": true,
"noImplicitThis": true,
"noImplicitAny": true,
"strictNullChecks": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"esModuleInterop": true,
"skipLibCheck": true
},
Expand Down
2 changes: 1 addition & 1 deletion packages/css-supports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
],
"scripts": {
"clean": "rimraf dist",
"build": "tsc -p tsconfig-esm.json && tsc -p tsconfig-cjs.json",
"build": "tsc -p tsconfig.esm.json && tsc -p tsconfig.cjs.json",
"lint": "lint",
"lint-and-fix": "lint-and-fix",
"lint-staged": "lint-staged",
Expand Down
File renamed without changes.
File renamed without changes.
7 changes: 1 addition & 6 deletions packages/css-supports/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "./src",
"target": "es5",
"module": "ESNext",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"outDir": "./dist/esm",
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node",
"resolveJsonModule": true
},
Expand Down
4 changes: 3 additions & 1 deletion packages/emitter/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export default {
json(),
nodeResolve(),
commonjs(),
typescript(),
typescript({
tsconfig: './tsconfig.build.json',
}),
],
};
Loading

0 comments on commit 4c5994b

Please sign in to comment.