Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.6.0 #1238

Merged
merged 42 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
92a0bb6
Fix rounded links buttons on iOS 15.5
Arkkimaagi Jan 19, 2024
fbd8b16
() add empty changelog
mrTuomoK Feb 6, 2024
7efb89c
() add update-changelog with template
mrTuomoK Feb 8, 2024
abb4bba
() remove & replace individual lodash dependencies
mrTuomoK Feb 8, 2024
52a3bd8
Merge pull request #1222 from City-of-Helsinki/changelogger
mrTuomoK Feb 9, 2024
7b71112
Merge pull request #1224 from City-of-Helsinki/remove-individual-lodash
mrTuomoK Feb 23, 2024
3018a5f
(HDS-2108) Remove useless @layer style, update changelog
mrTuomoK Feb 23, 2024
d356f3e
Merge pull request #1225 from City-of-Helsinki/HDS-2108-replace-css-l…
mrTuomoK Feb 23, 2024
6570b7f
(HDS-2142) Fix checkbox layout issue, add story for external label, u…
mrTuomoK Feb 23, 2024
7cbae42
Merge pull request #1228 from City-of-Helsinki/HDS-2142-checkbox-no-l…
mrTuomoK Feb 23, 2024
1755274
(hds-1514) Changed multer version
NikoHelle Jan 16, 2024
c7207c8
(hds-1514) Fix warnings with json5
NikoHelle Jan 16, 2024
59a2afa
(hds-1514) Move from react-spring to @react-spring/web
NikoHelle Jan 16, 2024
b1695e1
(hds-1514) Fix eslint version mismatches
NikoHelle Jan 16, 2024
e2a95e1
(hds-1514) Fixed eslint errors
NikoHelle Jan 16, 2024
635df31
(hds-1514) Fix ts errors listed after yarn ts-check
NikoHelle Jan 17, 2024
d86a584
(hds-1514) Minor config fixes/additions
NikoHelle Jan 17, 2024
0f95bea
(hds-1514) Fix new problems with eslint-config-airbnb
NikoHelle Jan 18, 2024
4b681b6
(hds-1514) Fix two missing peer dependecies
NikoHelle Jan 18, 2024
fa9c953
(hds-1514) Use only one mockWindowLocation
NikoHelle Jan 18, 2024
22803f5
(hds-1514) Updated CHANGELOG
NikoHelle Jan 18, 2024
67cede5
(hds-1514) Linting fixes after rebase
NikoHelle Feb 23, 2024
8cb1190
(hds-1514) Fix post-rebase peer deps warnings
NikoHelle Feb 23, 2024
6149b2e
(HDS-2137) Add missing icons to icons list, fix broken document-group…
mrTuomoK Feb 23, 2024
90096b7
Merge pull request #1215 from City-of-Helsinki/hds-1514-depencency-wa…
NikoHelle Feb 23, 2024
14a33c6
(HDS-2137) enable updating icon-library even if version numbers match…
mrTuomoK Feb 29, 2024
d014005
(HDS-2137) exit with success if already up-to-date on push
mrTuomoK Feb 29, 2024
1e16386
(HDS-2149) fix Notification Toast Core example
mrTuomoK Mar 1, 2024
6c24d1c
(HDS-2167) fix Button label
mrTuomoK Mar 1, 2024
47fe125
Merge pull request #1232 from City-of-Helsinki/HDS-2149-fix-toast-exa…
mrTuomoK Mar 5, 2024
0d47bdc
(HDS-2167) merge changelog
mrTuomoK Mar 5, 2024
1c1dae2
Merge pull request #1233 from City-of-Helsinki/HDS-2167-fix-doc-site-…
mrTuomoK Mar 5, 2024
c1f296d
Merge pull request #1226 from City-of-Helsinki/HDS-2137-update-doc-si…
mrTuomoK Mar 5, 2024
c95aa44
(HDS-2157) Tag mark deprecated and changed properties in the next maj…
mrTuomoK Mar 5, 2024
2a0d4cb
(HDS-2109) Add links to Storybooks to site.
mrTuomoK Mar 5, 2024
3cceaa5
Merge pull request #1235 from City-of-Helsinki/HDS-2109-storybook-links
mrTuomoK Mar 5, 2024
717a64d
(HDS-2155) fix className prop overriding the other classes
mrTuomoK Mar 6, 2024
d0af37a
Merge pull request #1216 from Arkkimaagi/patch-3
mrTuomoK Mar 6, 2024
02479bc
Merge pull request #1234 from City-of-Helsinki/HDS-2157-tag-deprecate…
mrTuomoK Mar 6, 2024
860353f
Merge pull request #1236 from City-of-Helsinki/HDS-2155-table-class-fix
mrTuomoK Mar 6, 2024
81c02b2
(release-3.6.0) bump versions, update changelog
mrTuomoK Mar 6, 2024
b5de975
Updated icon library
Mar 6, 2024
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
47 changes: 47 additions & 0 deletions .github/workflows/patchrelease.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: patchrelease

on:
push:
branches:
- patchrelease

jobs:
build-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Read .nvmrc
run: echo "NODE_VERSION=$(cat .nvmrc)" >> $GITHUB_OUTPUT
id: nvmrc

- name: setup node ${{ steps.nvmrc.outputs.NODE_VERSION }}
uses: actions/setup-node@v4
with:
node-version: '${{ steps.nvmrc.outputs.NODE_VERSION }}'
registry-url: 'https://registry.npmjs.org'

- name: install dependencies
run: yarn

- name: build design tokens package
run: yarn build
working-directory: ./packages/design-tokens

- name: build core package
run: yarn build
working-directory: ./packages/core

- name: build react package
run: yarn build
working-directory: ./packages/react

- name: build hds-js package
run: yarn build:hds-js
working-directory: ./packages/react

- name: release npm packages
run: yarn release --dist-tag patch
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Build icon library, create zip file for release and create PR
name: icon library
# Build icon library, create zip file for release and commit to current branch
name: update icon library

on:
workflow_dispatch:
push:
branches:
- release-*

jobs:
build-icon-library:
Expand All @@ -17,6 +20,26 @@ jobs:
node-version: '20.3.1'
registry-url: 'https://registry.npmjs.org'

# Don't do anything if we're on development, main or master branches
- name: Check branch
run: |
if [[ $GITHUB_REF == refs/heads/development || $GITHUB_REF == refs/heads/master || $GITHUB_REF == refs/heads/main ]]; then
echo "Development, master pr main branch, skipping icon library build"
exit 1
fi

# Don't do anything if we're on release-x.x.x AND the icon-kit has the same version number (already built for the release)
# Skip this step if workflow was triggered by workflow_dispatch
- name: Check if icon library has already been built for this release
if: github.event_name != 'workflow_dispatch'
run: |
PKG_VER=`node -pe "require('./packages/react/package.json').version"`
ICON_KIT_VER=`sed -n -E 's/.*version[[:space:]]+([0-9]+([.][0-9]+)*).*/\1/p' ./release/icon-kit-template-CHANGELOG.txt`
if [[ ${PKG_VER} == ${ICON_KIT_VER} ]]; then
echo "Icon library has already been built for this release, skipping"
exit 0
fi

- name: Run Glypfig
run: |
npx glypfig \
Expand Down Expand Up @@ -83,9 +106,4 @@ jobs:
git config --global user.name "Github Actions"
git add .
git commit -m 'Updated icon library'
git push

- name: create pull request
run: gh pr create -B development --title 'Icon library build' --body 'Created by Github action icon library'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
git push
56 changes: 56 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,53 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.6.0] - March, 6, 2024

### React

#### Changed

- [Tag] Marked changed and removed properties in the next major release

#### Fixed

- Warnings about "unmet peer dependency".
- Removed old & deprecated individual `lodash` dependencies and replaced with the full package and importing the needed functions only.
- [HeaderActionBarItemWithDropdown] Removed useless `@layer` css style which caused Jest/jsdom tests output errors.
- [Checkbox] Layout issue when using external label with htmlLabelFor-attribute
- [Table] Append className prop instead of overriding the existing classes

### Core

#### Fixed

- [Icons] Document-group icon wrong colors
- [Button] Some iOS-versions rendering rounded link buttons wrongly

### Documentation

#### Added

- [Icons] Added missing icons to site icons list
- Added links to React and Core Storybooks to Resources and Components pages

#### Fixed

- [Button] Fix wrong label on secondary Button variant example.
- [Notification] Fix Core showing and hiding Toast Notification example

### Figma

#### Fixed

- [Icons] Fixed document-group icon, removed stroke from the vector. Removed few export settings and fixed box’s black color to use HDS-token.

### Icon kit

#### Fixed:

- [Forms and information] Fixed document-group icon svg, removed stroke from the vector.

## [3.5.0] - February, 6, 2024

### React
Expand Down Expand Up @@ -62,6 +109,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Icon kit

#### Added:

- [Icons] New icons in the Forms category: document-group, document-blank, document-blank-group, folder, folder-group & box

## [3.4.0] - January, 16, 2024
Expand Down Expand Up @@ -487,6 +535,14 @@ There is a brand new Figma library available. The licenses are checked and provi

- [Header] Add HDS Header.sketch file to shared libraries for HDS 3.0.0 Alpha release purposes. The shared library file includes new Header and Side navigation symbols.

## [2.17.1] - Feb, 7, 2024

### React

#### Fixed

- Removed old & deprecated individual `lodash` dependencies and replaced with the full package and importing the needed functions only.

## [2.17.0] - Aug, 18, 2023

### React
Expand Down
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@
"site"
],
"scripts": {
"build": "yarn build:tokens && yarn build:core && yarn build:react && yarn build:hds-js && yarn build:site",
"build": "yarn build:code && yarn build:site",
"build:tokens": "lerna run --scope hds-design-tokens build",
"build:core": "lerna run --scope hds-core build",
"build:react": "lerna run --scope hds-react build",
"build:hds-js": "lerna run --scope hds-react build:hds-js",
"build:site": "lerna run --scope site build",
"build:code": "yarn build:tokens && yarn build:core && yarn build:react",
"clean": "lerna clean --yes && rimraf node_modules/ packages/core/lib packages/core/storybook-static packages/react/lib packages/react/storybook-static packages/design-tokens/lib site/.cache site/public",
"start:core": "lerna run --scope hds-core start",
"start:react": "lerna run --scope hds-react start",
"release": "lerna publish from-package --yes",
"update-versions": "lerna version --exact --no-git-tag-version --no-push --amend --yes"
"update-versions": "lerna version --exact --no-git-tag-version --no-push --amend --yes",
"update-changelog": "node ./scripts/changelog/update-changelog.js"
},
"devDependencies": {
"lerna": "^7.0.1",
Expand All @@ -29,8 +30,9 @@
"@types/react-dom/@types/react": "17.0.2",
"@types/react-dom/**/@types/react": "17.0.2",
"**/@types/react-dom/**/@types/react": "17.0.2",
"multer": "1.4.4-lts.1",
"multer": "1.4.5-lts.1",
"jpeg-js": "0.4.4",
"json5": "2.2.2"
"json5@>=2.0.0": "2.2.3",
"json5@>=1.0.0": "1.0.2"
}
}
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hds-core",
"version": "3.5.0",
"version": "3.6.0",
"description": "Core styles for the Helsinki Design System",
"homepage": "https://github.com/City-of-Helsinki/helsinki-design-system#readme",
"license": "MIT",
Expand Down Expand Up @@ -30,7 +30,7 @@
"@storybook/manager-webpack5": "^6.5.16",
"copyfiles": "2.2.0",
"cssnano": "4.1.10",
"hds-design-tokens": "3.5.0",
"hds-design-tokens": "3.6.0",
"postcss": "8.2.15",
"postcss-cli": "8.3.1",
"postcss-import": "12.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/button/button.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* Normalize.css rules
* Correct the inability to style clickable types in iOS and Safari.
*/
-webkit-appearance: button;
background-color: var(--background-color, transparent);
border: var(--border-width) solid var(--border-color, transparent);
border-radius: 0;
Expand Down Expand Up @@ -63,6 +62,7 @@
* Normalize.css rules
* Correct the inability to style clickable types in iOS and Safari.
*/
button.hds-button,
.hds-button[type="button"],
.hds-button[type="reset"],
.hds-button[type="submit"] {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/checkbox/checkbox.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
}

.hds-checkbox .hds-checkbox__label--hidden {
padding-left: 0;
padding-left: var(--size);
}

/* ERROR */
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/icons/document-group.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions packages/core/src/svg/document-group.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hds-design-tokens",
"version": "3.5.0",
"version": "3.6.0",
"description": "Design tokens for the Helsinki Design System",
"homepage": "https://github.com/City-of-Helsinki/helsinki-design-system#readme",
"license": "MIT",
Expand Down
6 changes: 2 additions & 4 deletions packages/hds-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hds-js",
"version": "3.5.0",
"version": "3.6.0",
"description": "Vanilla js for the Helsinki Design System",
"homepage": "https://github.com/City-of-Helsinki/helsinki-design-system#readme",
"license": "MIT",
Expand All @@ -13,9 +13,7 @@
"cookie": "^0.4.1",
"http-status-typed": "^1.0.1",
"jwt-decode": "^3.1.2",
"lodash.isobject": "3.0.2",
"lodash.isundefined": "3.0.1",
"lodash.pick": "^4.4.0",
"lodash": "^4.17.21",
"oidc-client-ts": "^2.2.2"
},
"scripts": {
Expand Down
13 changes: 9 additions & 4 deletions packages/react/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
"plugin:import/typescript",
"plugin:jest/recommended",
"airbnb",
"prettier/@typescript-eslint",
"prettier/react",
"plugin:prettier/recommended" // this should always be the last item on this array
],
"plugins": ["@typescript-eslint", "prettier", "jest", "import"],
"plugins": ["@typescript-eslint", "prettier", "react", "jest", "import"],
"parserOptions": {
"ecmaVersion": 2018,
"ecmaFeatures": {
Expand All @@ -24,6 +22,7 @@
"ignorePatterns": ["*.module.css"],
"rules": {
"no-use-before-define": "off",
"default-param-last": "off",
"@typescript-eslint/no-use-before-define": ["error"],
"no-shadow": "off", // replaced by ts-eslint rule below
"@typescript-eslint/no-shadow": "error",
Expand All @@ -40,6 +39,7 @@
"newlines-between": "always"
}
],
"react/function-component-definition": "off",
"react/jsx-filename-extension": "off",
"react/jsx-one-expression-per-line": "off",
"react/jsx-props-no-spreading": "off",
Expand All @@ -53,7 +53,12 @@
"react/prop-types": "off",
"import/extensions": "off",
"import/prefer-default-export": "off",
"jsx-a11y/control-has-associated-label": "warn",
"jsx-a11y/control-has-associated-label": [
1,
{
"ignoreElements": ["td"]
}
],
"jsx-a11y/no-interactive-element-to-noninteractive-role": "warn",
"jsx-a11y/label-has-associated-control": [
2,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading