Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ This consists of code-reviewing your own pull request, following guidelines foun

> Confirmation from UXers that the implementation complies with what was decided during UX Refinement.

If the implementation of the issue resulted in visual changes - then it has to be UX reviewed. This is to make sure that the introduced changes align with the design system. We strive to have every issue that introduces visual changes UX reviewed. If this is not done and the changes are merged to master, we might recieve issues about components not being properly aligned with the design system anymore from the users of Kirby.
If the implementation of the issue resulted in visual changes - then it has to be UX reviewed. This is to make sure that the introduced changes align with the design system. We strive to have every issue that introduces visual changes UX reviewed. If this is not done and the changes are merged to `stable`, we might recieve issues about components not being properly aligned with the design system anymore from the users of Kirby.

## Before you get coding

Expand All @@ -103,7 +103,7 @@ If you got an idea for a component that you think should be part of Kirby you sh
3. **Implementation:**
- Make sure you have read: "[Before you get coding](#before-you-get-coding)".
- Signal to others you are working on the issue by assigning yourself.
- Create a branch from the [master branch](https://github.com/kirbydesign/designsystem/tree/master) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- Create a branch from the [stable branch](https://github.com/kirbydesign/designsystem/tree/stable) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- Publish a WIP implementation to Github as a draft PR and ask for feedback.
- Make sure you have implemented tests following the guidelines in: "[The good: Test](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Test)".
- Update the [cookbook](https://cookbook.kirby.design) with examples and showcases.
Expand All @@ -112,7 +112,7 @@ If you got an idea for a component that you think should be part of Kirby you sh
- Create a pull request. If you created a draft PR during implementation you can just mark that as "ready for review".
- Request that the pull request is code-reviewed.
- Request that the pull request is [UX reviewed](#ux-review).
- When the pull request has been approved it will be automatically merged to master via [automerge](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request).
- When the pull request has been approved it will be automatically merged to `stable` via [automerge](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request).
5. **Celebrate! 🎉**

## Checklist: I have an enhancement
Expand All @@ -133,7 +133,7 @@ If you have found a bug in Kirby you should follow these steps:
3. **Implementation:**
- Make sure you have read: "[Before you get coding](#before-you-get-coding)".
- Signal to others you are working on the issue by assigning yourself.
- Create a branch from the [master branch](https://github.com/kirbydesign/designsystem/tree/master) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- Create a branch from the [stable branch](https://github.com/kirbydesign/designsystem/tree/stable) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- Create a test that reproduces the bug following guidelines in: "[The good: Test](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Test)".
- Write code to fix the bug
4. **Follow steps 4 and 5 in "[Checklist: I have a component request](#checklist-i-have-a-component-request)".**
Expand Down Expand Up @@ -172,7 +172,7 @@ You should now be able to open `http://localhost:4200` in a browser to access th

[Node](https://nodejs.org/en/) is the runtime used for development.

The supported version of NodeJS can be found in the file [`package.json`](https://github.com/kirbydesign/designsystem/blob/master/package.json) under `engines`. At the time of writing it for example looks like this:
The supported version of NodeJS can be found in the file [`package.json`](https://github.com/kirbydesign/designsystem/blob/stable/package.json) under `engines`. At the time of writing it for example looks like this:

```Javascript
...
Expand Down Expand Up @@ -224,7 +224,7 @@ As with TSLint, we strongly recommend installing Prettier as a plugin for your
It can however be used without an editor plugin; run `npm run prettier` to check for formatting errors, fix them by running `npm run prettier:fix` .

If there are changes only concerning formatting, in files you did not create - do not commit these. There is most likely something wrong with your Prettier settings.
Make sure that Prettier uses the config file that is shipped with the repository ([ `.prettierrc.json` ](https://github.com/kirbydesign/designsystem/blob/master/.prettierrc.json)) and not a global configuration located on your machine.
Make sure that Prettier uses the config file that is shipped with the repository ([ `.prettierrc.json` ](https://github.com/kirbydesign/designsystem/blob/stable/.prettierrc.json)) and not a global configuration located on your machine.

To check if the config file from the repository is used, try to alter the configuration in `.prettierrc.json` and format a file using Prettier - for example by changing `"singleQuote": true,` to `"singleQuote": false, ` .
If all quotation marks are changed to `"` instead of `'` when you format, it means the repository config file is used by Prettier. Remember to revert the changes made to `.prettierrc.json` .
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ The good issue: contains only one issue, is self-contained, is specific & unambi

## Checklist:

The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.
The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.

### Verification
To make sure the bug is not intended behaviour; it should be verified by a member of team Kirby before moving on to implementation.

- [ ] Make sure the `NOT verified` label has been removed by a member of [team Kirby](https://github.com/kirbydesign/designsystem/blob/master/.github/SUPPORT.md#team-kirby); do not proceed until this is done
- [ ] Make sure the `NOT verified` label has been removed by a member of [team Kirby](https://github.com/kirbydesign/designsystem/blob/stable/.github/SUPPORT.md#team-kirby); do not proceed until this is done

### Implementation
The contributor who wants to implement this issue should:

- [ ] Make sure you have read: "[Before you get coding](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#before-you-get-coding)".
- [ ] Make sure you have read: "[Before you get coding](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#before-you-get-coding)".
- [ ] Signal to others you are working on the issue by assigning yourself.
- [ ] Create a branch from the [master branch](https://github.com/kirbydesign/designsystem/tree/master) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- [ ] Create a branch from the [stable branch](https://github.com/kirbydesign/designsystem/tree/stable) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- [ ] Create a test that reproduces the bug following guidelines in: "[The good: Test](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Test)".
- [ ] Write code to fix the bug

Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/component-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ The good issue: contains only one issue, is self-contained, is specific & unambi

## Checklist:

The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.
The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.

### Refinement

- [ ] Request that the issue is [UX refined](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#ux-refinement); do not proceed until this is done.
- [ ] Request that the issue is [tech refined](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#tech-refinement); do not proceed until this is done.
- [ ] Request that the issue is [UX refined](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#ux-refinement); do not proceed until this is done.
- [ ] Request that the issue is [tech refined](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#tech-refinement); do not proceed until this is done.

### Implementation
The contributor who wants to implement this issue should:

- [ ] Make sure you have read: "[Before you get coding](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#before-you-get-coding)".
- [ ] Make sure you have read: "[Before you get coding](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#before-you-get-coding)".
- [ ] Signal to others you are working on the issue by assigning yourself.
- [ ] Create a branch from the [master branch](https://github.com/kirbydesign/designsystem/tree/master) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- [ ] Create a branch from the [stable branch](https://github.com/kirbydesign/designsystem/tree/stable) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- [ ] Publish a WIP implementation to Github as a draft PR and ask for feedback.
- [ ] Make sure you have implemented tests following the guidelines in: "[The good: Test](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Test)".
- [ ] Update the [cookbook](https://cookbook.kirby.design) with examples and showcases.
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/enhancement-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ The good issue: contains only one issue, is self-contained, is specific & unambi

## Checklist:

The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.
The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.

### Refinement

- [ ] Request that the issue is [UX refined](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#ux-refinement); do not proceed until this is done.
- [ ] Request that the issue is [tech refined](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#tech-refinement); do not proceed until this is done.
- [ ] Request that the issue is [UX refined](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#ux-refinement); do not proceed until this is done.
- [ ] Request that the issue is [tech refined](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#tech-refinement); do not proceed until this is done.

### Implementation
The contributor who wants to implement this issue should:

- [ ] Make sure you have read: "[Before you get coding](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#before-you-get-coding)".
- [ ] Make sure you have read: "[Before you get coding](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#before-you-get-coding)".
- [ ] Signal to others you are working on the issue by assigning yourself.
- [ ] Create a branch from the [master branch](https://github.com/kirbydesign/designsystem/tree/master) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- [ ] Create a branch from the [stable branch](https://github.com/kirbydesign/designsystem/tree/stable) following our [branch naming convention](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Branch).
- [ ] Publish a WIP implementation to Github as a draft PR and ask for feedback.
- [ ] Make sure you have implemented tests following the guidelines in: "[The good: Test](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Test)".
- [ ] Update the [cookbook](https://cookbook.kirby.design) with examples and showcases.
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This PR closes # (insert issue number here)

## Checklist:

The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.
The following tasks should be carried out in sequence in order to follow [the process of contributing](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#the-process-of-contributing) correctly.

### Reminders
- [ ] Make sure you have implemented tests following the guidelines in: "[The good: Test](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Test)".
Expand All @@ -28,8 +28,8 @@ The following tasks should be carried out in sequence in order to follow [the pr
### Review
- [ ] Do a [self-review](https://github.com/kirbydesign/designsystem/wiki/The-Good%3A-Self-review).
- [ ] Request that the changes are code-reviewed
- [ ] Request that the changes are [UX reviewed](https://github.com/kirbydesign/designsystem/blob/master/.github/CONTRIBUTING.md/#ux-review) (only necessary if your PR introduces visual changes)
- [ ] Request that the changes are [UX reviewed](https://github.com/kirbydesign/designsystem/blob/stable/.github/CONTRIBUTING.md/#ux-review) (only necessary if your PR introduces visual changes)

When the pull request has been approved it will be automatically merged to master via [automerge](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request).
When the pull request has been approved it will be automatically merged to `stable` via [automerge](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/automatically-merging-a-pull-request).


14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build & Deploy Cookbook

on:
push: # TODO: Change to `release` event when our release workflow is in place
branches: master
branches: stable
pull_request:

defaults:
Expand Down Expand Up @@ -120,19 +120,19 @@ jobs:
echo "Releasename: ${releasename}"
echo "GH_DEPLOY_ENVIRONMENT=pr-${branchname}" >> $GITHUB_ENV
echo "RELEASENAME=${releasename}" >> $GITHUB_ENV
- name: Get deployment name for master branch
if: github.ref == 'refs/heads/master'
- name: Get deployment name for stable branch
if: github.ref == 'refs/heads/stable'
run: |
echo "GH_DEPLOY_ENVIRONMENT=production" >> $GITHUB_ENV
echo "RELEASENAME=designsystem" >> $GITHUB_ENV
- name: Get hostname for feature branch
if: github.ref != 'refs/heads/master'
if: github.ref != 'refs/heads/stable'
run: |
chmod +x ./.scripts/dns.pl
hostname=$(perl ./.scripts/dns.pl $DOMAIN "${RELEASENAME}")
echo "HOSTNAME=${hostname}" >> $GITHUB_ENV
- name: Get hostname for master branch
if: github.ref == 'refs/heads/master'
- name: Get hostname for stable branch
if: github.ref == 'refs/heads/stable'
run: echo "HOSTNAME=cookbook" >> $GITHUB_ENV
- name: Create Github Deployment
id: create_deployment
Expand All @@ -142,7 +142,7 @@ jobs:
repository: ${{ github.repository }}
ref: ${{ github.event_name == 'pull_request' && format('refs/heads/{0}', github.head_ref) || github.ref }}
environment: ${{ env.GH_DEPLOY_ENVIRONMENT }}
production_environment: ${{ github.ref == 'refs/heads/master' }}
production_environment: ${{ github.ref == 'refs/heads/stable' }}
auto_merge: false
required_contexts: '[]' # Skip commit checks
mediaType: '{"previews": ["flash", "ant-man"]}' # some parameters need preview: https://docs.github.com/en/rest/reference/repos#list-deployment-statuses-preview-notices
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish new version to npm
on:
pull_request:
types: closed
branches: master
branches: stable
paths: 'libs/**'

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .scripts/deploy-helm-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ else
branchname=$TRAVIS_BRANCH;
fi

if [ "$TRAVIS_BRANCH" != "master" ] || [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
if [ "$TRAVIS_BRANCH" != "stable" ] || [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
branchname=${branchname//$feature\//}
branchname=${branchname#?}
releasename="$git_repo-${branchname//[^a-zA-Z0-9]/-}";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>Elevation on white badges</h2>
applied to the examples below by inspecting the shared styling for the badge examples:
<br />
<a
href="https://github.com/kirbydesign/designsystem/blob/master/apps/cookbook/src/app/examples/badge-example/examples/badge-example-shared.scss"
href="https://github.com/kirbydesign/designsystem/blob/stable/apps/cookbook/src/app/examples/badge-example/examples/badge-example-shared.scss"
target="_blank"
class="kirby-external-icon"
>badge-example-shared.scss on Github</a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h3>Default - with Badge</h3>
</p>
<p>
<a
href="https://github.com/kirbydesign/designsystem/blob/master/libs/designsystem/src/lib/components/segmented-control/segment-item.ts"
href="https://github.com/kirbydesign/designsystem/blob/stable/libs/designsystem/src/lib/components/segmented-control/segment-item.ts"
class="kirby-external-icon"
target="_blank"
>See SegmentItem on Github</a
Expand Down
2 changes: 1 addition & 1 deletion apps/cookbook/src/app/showcase/showcase.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class ShowcaseComponent implements OnDestroy {
propertiesTable: Element;
private routerEventsSubscription: Subscription;
private gitUrl =
'https://github.com/kirbydesign/designsystem/tree/master/apps/cookbook/src/app/examples/';
'https://github.com/kirbydesign/designsystem/tree/stable/apps/cookbook/src/app/examples/';
showCallToActionLinks = true;

constructor(private router: Router, private elementRef: ElementRef<HTMLElement>) {
Expand Down
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
}
},
"affected": {
"defaultBase": "master"
"defaultBase": "stable"
}
}
Loading