Skip to content

Commit

Permalink
Merge branch 'develop' into apps-install-error
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinSchoeler committed Sep 11, 2024
2 parents 6bebb1c + 9ef096f commit f55b0dc
Show file tree
Hide file tree
Showing 223 changed files with 59 additions and 3 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/ci-preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# .github/workflows/ci-preview.yml
name: Deploy PR previews
concurrency: preview-${{ github.ref }}
on:
pull_request:
types:
- opened
- reopened
- synchronize
- closed
push:
branches:
- main
- master
- develop
jobs:
deploy-preview:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: rharkor/[email protected]
if: github.event.action != 'closed'

- name: Setup NodeJS
uses: ./.github/actions/setup-node
if: github.event.action != 'closed'
with:
node-version: 14.21.3
cache-modules: true
install: true

- name: Build
if: github.event.action != 'closed'
run: |
yarn turbo run build-preview
yarn turbo run .:build-preview-move
- uses: rossjrw/pr-preview-action@v1
with:
source-dir: .preview
preview-branch: gh-pages
umbrella-dir: pr-preview
action: auto
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ yarn-error.log*
.history
.envrc

.preview

*.sublime-workspace

**/.vim/
Expand Down
1 change: 1 addition & 0 deletions _templates/package/new/package.json.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ to: packages/<%= name %>/package.json
"test": "jest",
"build": "rm -rf dist && tsc -p tsconfig.json",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput"
"build-preview": "mkdir -p ../../.preview && cp -r ./dist ../../.preview/<%= name.toLowerCase() %>"
},
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"build-preview": "tsc && vite build",
".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./dist ../../.preview/uikit-playground",
"lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
"$schema": "https://turborepo.org/schema.json",
"globalDependencies": ["tsconfig.base.json", "tsconfig.base.server.json", "tsconfig.base.client.json"],
"tasks": {
"build-preview": {
"dependsOn": ["^build"],
"outputs": ["storybook-static/**", ".storybook/**", "dist/**"]
},
".:build-preview-move": {
"dependsOn": ["^build-preview"],
"cache": false
},
"build": {
"dependsOn": ["^build"],
"outputs": ["dist/**"]
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10455,9 +10455,9 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/uikit-playground@workspace:packages/uikit-playground":
"@rocket.chat/uikit-playground@workspace:apps/uikit-playground":
version: 0.0.0-use.local
resolution: "@rocket.chat/uikit-playground@workspace:packages/uikit-playground"
resolution: "@rocket.chat/uikit-playground@workspace:apps/uikit-playground"
dependencies:
"@codemirror/lang-javascript": ^6.1.9
"@codemirror/lang-json": ^6.0.1
Expand Down

0 comments on commit f55b0dc

Please sign in to comment.