Skip to content

Commit

Permalink
Merge branch 'bump/primer-upstream-ref' into bump/primer-upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
HDinger committed Nov 18, 2024
2 parents ebdab21 + a2398ab commit a3ea4cd
Show file tree
Hide file tree
Showing 422 changed files with 10,337 additions and 15,413 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-teachers-battle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@openproject/primer-view-components": minor
---

Delete Primer::Alpha::ImageCrop
5 changes: 5 additions & 0 deletions .changeset/bright-eggs-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

Moves the loading and "no results" messages on the SelectPanel to the top of the container.
6 changes: 6 additions & 0 deletions .changeset/chatty-apples-hope.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@openproject/primer-view-components': minor
---

[SelectPanel] replace loading label using parameter loading_label
[SelectPanel] show additional loading content with loading_description
5 changes: 5 additions & 0 deletions .changeset/cuddly-games-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

Allow setting custom values on submit buttons.
5 changes: 5 additions & 0 deletions .changeset/curvy-apes-judge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': minor
---

[Forms] Fix position of caption for checkbox and radio groups
5 changes: 5 additions & 0 deletions .changeset/four-steaks-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': minor
---

Add option to Dialog to permit/disable page scrolling
5 changes: 5 additions & 0 deletions .changeset/healthy-phones-love.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': minor
---

Bump primer/css
5 changes: 5 additions & 0 deletions .changeset/heavy-camels-hear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

Fix problem introduced by #3141 that causes template captions not to render for certain input types if the input is configured with a `value:`.
5 changes: 5 additions & 0 deletions .changeset/hip-deers-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': minor
---

Allow form groups to accept system arguments
5 changes: 5 additions & 0 deletions .changeset/lemon-kiwis-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@openproject/primer-view-components": patch
---

Add "action" to the list of data attributes that accept multiple values in the `merge_data` helper
5 changes: 5 additions & 0 deletions .changeset/many-readers-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': minor
---

[SelectPanel] Use checkboxes for multi-select
5 changes: 5 additions & 0 deletions .changeset/new-nails-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

Adjusts config for DetailsMenuMigration linter to take in an array of strings instead of array of regexp
5 changes: 5 additions & 0 deletions .changeset/quiet-fans-repeat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

[SelectPanel] Fix issue causing no error banner to appear when there are no matches
5 changes: 5 additions & 0 deletions .changeset/shy-schools-grow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': minor
---

Introduce the Stack and StackItem components.
5 changes: 5 additions & 0 deletions .changeset/sweet-donkeys-allow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

Clear input on SelectPanel when dialog closed
5 changes: 5 additions & 0 deletions .changeset/three-readers-switch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': minor
---

[SelectPanel] Adds banner scheme as param.
5 changes: 5 additions & 0 deletions .changeset/tough-actors-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@openproject/primer-view-components": patch
---

Fix bug where checkboxes were broken with prefers-reduced-motion
5 changes: 5 additions & 0 deletions .changeset/tricky-foxes-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

Increase space between form elements
5 changes: 5 additions & 0 deletions .changeset/wicked-bananas-tie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@openproject/primer-view-components': patch
---

Remove dialog-scrollgutter setting from hot-path, for improved performance
40 changes: 22 additions & 18 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,29 @@
},
"onCreateCommand": ".devcontainer/on-create-command.sh",
"postCreateCommand": ".devcontainer/post-create-command.sh",
"settings": {
"files.watcherExclude": {
"**/vendor": true,
"**/.git": true,
"**/tmp": true,
"**/node_modules": true
}
"customizations": {
"settings": {
"files.watcherExclude": {
"**/vendor": true,
"**/.git": true,
"**/tmp": true,
"**/node_modules": true
}
},
"extensions": [
"castwide.solargraph",
"kaiwood.endwise",
"manuelpuyol.erb-linter",
"misogi.ruby-rubocop",
"rebornix.ruby",
"wingrunr21.vscode-ruby",
"mutantdino.resourcemonitor",
"vunguyentuan.vscode-postcss",
"DavidAnson.vscode-markdownlint",
"stylelint.vscode-stylelint",
"hex-ci.stylelint-plus"
]
},
"extensions": [
"castwide.solargraph",
"kaiwood.endwise",
"manuelpuyol.erb-linter",
"misogi.ruby-rubocop",
"rebornix.ruby",
"wingrunr21.vscode-ruby",
"mutantdino.resourcemonitor",
"vunguyentuan.vscode-postcss",
"DavidAnson.vscode-markdownlint"
],
"forwardPorts": [4000],
"appPort": [4000],
"portsAttributes": {
Expand Down
4 changes: 2 additions & 2 deletions .erb-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ linters:
Enabled: false
Exclude:
- app/components/primer/layout_component.html.erb
Primer/Migrations/IconButtonComponent:
Migrations/IconButtonComponent:
Enabled: true
Primer/Migrations/TruncateComponent:
Migrations/TruncateComponent:
Enabled: true
4 changes: 4 additions & 0 deletions .github/release_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ Please ensure these items are checked before merging.
- [ ] No noticeable regressions have been introduced as a result of changes in this release
- [ ] Release notes accurately describe the changes made

### 🚢 Post ship reminders

- [ ] Deploy lookbook via chat ops in the #primer-rails-ops channel. `.deploy primer-lookbook to production`

Please also leave any testing notes as a comment on this pull request. In particular, describing any issues encountered during your testing. This is helpful in providing historical context to maintainers.
6 changes: 3 additions & 3 deletions .github/workflows/demo-preview-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
with:
# excluding a client secret here will cause a login via OpenID Connect (OIDC),
# which prevents us from having to rotate client credentials, etc
client-id: "5ad1a188-b944-40eb-a2f8-cc683a6a65a0"
tenant-id: "398a6654-997b-47e9-b12b-9515b896b4de"
subscription-id: "550eb99d-d0c7-4651-a337-f53fa6520c4f"
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

# Do this before repo checkout to prevent running bundle install
- uses: ruby/setup-ruby@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/demo-preview-destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
with:
# excluding a client secret here will cause a login via OpenID Connect (OIDC),
# which prevents us from having to rotate client credentials, etc
client-id: "5ad1a188-b944-40eb-a2f8-cc683a6a65a0"
tenant-id: "398a6654-997b-47e9-b12b-9515b896b4de"
subscription-id: "550eb99d-d0c7-4651-a337-f53fa6520c4f"
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Check out repo
uses: actions/checkout@v4
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/demo-production-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
with:
# excluding a client secret here will cause a login via OpenID Connect (OIDC),
# which prevents us from having to rotate client credentials, etc
client-id: "5ad1a188-b944-40eb-a2f8-cc683a6a65a0"
tenant-id: "398a6654-997b-47e9-b12b-9515b896b4de"
subscription-id: "550eb99d-d0c7-4651-a337-f53fa6520c4f"
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
- name: Purge tags
run: |
# only delete tags that aren't "latest" or "latest-assets"
Expand Down Expand Up @@ -84,13 +84,16 @@ jobs:
with:
# excluding a client secret here will cause a login via OpenID Connect (OIDC),
# which prevents us from having to rotate client credentials, etc
client-id: "5ad1a188-b944-40eb-a2f8-cc683a6a65a0"
tenant-id: "398a6654-997b-47e9-b12b-9515b896b4de"
subscription-id: "550eb99d-d0c7-4651-a337-f53fa6520c4f"
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
- name: Deploy
env:
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
AZURE_ACR_PASSWORD: ${{ secrets.AZURE_ACR_PASSWORD }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
run: |
export AZURE_ACCESS_TOKEN=$(az account get-access-token --subscription 550eb99d-d0c7-4651-a337-f53fa6520c4f | jq -r .accessToken)
export AZURE_ACCESS_TOKEN=$(az account get-access-token --subscription ${{ secrets.AZURE_SUBSCRIPTION_ID }} | jq -r .accessToken)
bin/kuby -e production deploy
25 changes: 8 additions & 17 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get specific changed files
id: changed-files
uses: tj-actions/changed-files@v45.0.1
uses: tj-actions/changed-files@v45.0.2
with:
files: |
docs/**/*.md
Expand All @@ -25,7 +25,6 @@ jobs:
- uses: actions/setup-node@v4
if: steps.changed-files.outputs.any_changed == 'true'
with:
node-version: 16
cache: 'npm'
- name: Lint with Markdownlint
if: steps.changed-files.outputs.any_changed == 'true'
Expand All @@ -39,57 +38,50 @@ jobs:
- uses: actions/checkout@v4
- name: Get specific changed files
id: changed-files
uses: tj-actions/changed-files@v45.0.1
uses: tj-actions/changed-files@v45.0.2
with:
files: |
app/**/*.rb
lib/**/*.rb
demo/**/*.rb
test/**/*.rb
- uses: ruby/setup-ruby@v1
if: steps.changed-files.outputs.any_changed == 'true'
with:
ruby-version: '3.3'
bundler-cache: true
- name: Lint with Rubocop
if: steps.changed-files.outputs.any_changed == 'true'
run: |
bundle exec rubocop ${{ steps.changed-files.outputs.all_changed_files }} --format github
run: script/rubocop --format github

erblint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v45.0.1
uses: tj-actions/changed-files@v45.0.2
with:
files: |
app/components/**/*.erb
- uses: ruby/setup-ruby@v1
if: steps.changed-files.outputs.any_changed == 'true'
with:
ruby-version: '3.3'
bundler-cache: true
- name: Lint with ERB Lint
if: steps.changed-files.outputs.any_changed == 'true'
run: |
bundle exec erblint ${{ steps.changed-files.outputs.all_changed_files }} --format github
run: script/erblint --format github

eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v45.0.1
uses: tj-actions/changed-files@v45.0.2
with:
files: |
app/components/**/*.ts
- uses: actions/setup-node@v4
if: steps.changed-files.outputs.any_changed == 'true'
with:
node-version: 16
cache: 'npm'
- name: Lint with ESLint
if: steps.changed-files.outputs.any_changed == 'true'
Expand All @@ -103,18 +95,17 @@ jobs:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v45.0.1
uses: tj-actions/changed-files@v45.0.2
with:
files: |
app/components/**/*.pcss
lib/postcss_mixins/*.pcss
- uses: actions/setup-node@v4
if: steps.changed-files.outputs.any_changed == 'true'
with:
node-version: 16
cache: 'npm'
- name: Lint with Stylelint
if: steps.changed-files.outputs.any_changed == 'true'
run: |
npm ci
npx stylelint ${{ steps.changed-files.outputs.all_changed_files }} -f "github"
npx stylelint --rd -q ${{ steps.changed-files.outputs.all_changed_files }} --custom-formatter=stylelint-actions-formatters
8 changes: 4 additions & 4 deletions .github/workflows/preview-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ jobs:
with:
# excluding a client secret here will cause a login via OpenID Connect (OIDC),
# which prevents us from having to rotate client credentials, etc
client-id: "5ad1a188-b944-40eb-a2f8-cc683a6a65a0"
tenant-id: "398a6654-997b-47e9-b12b-9515b896b4de"
subscription-id: "550eb99d-d0c7-4651-a337-f53fa6520c4f"
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Get preview app info
run: ./.github/workflows/demo-preview-app-info.sh
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
uses: azure/arm-deploy@a1361c2c2cd398621955b16ca32e01c65ea340f5
with:
resourceGroupName: primer
subscriptionId: 550eb99d-d0c7-4651-a337-f53fa6520c4f
subscriptionId: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
template: ./.github/workflows/demo-preview-template.json
deploymentName: ${{env.DEPLOYMENT_NAME}}
parameters: appName="${{env.APP_NAME}}"
Expand Down
Loading

0 comments on commit a3ea4cd

Please sign in to comment.