Skip to content

Commit 31340bf

Browse files
authored
Merge pull request #739 from lumapps/release/v2.1.5
release/v2.1.5
2 parents f73c396 + c64767e commit 31340bf

File tree

12 files changed

+161
-515
lines changed

12 files changed

+161
-515
lines changed

.github/workflows/chromatic.yaml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
tags:
88
- v*
99

10+
env:
11+
node_version: '13.7.0'
12+
1013
jobs:
1114
deploy:
1215
# Run on push version tag OR on PR with the "need: review-design" label
@@ -16,30 +19,18 @@ jobs:
1619
- name: "Checkout repository"
1720
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f #v2.3.4
1821
with:
19-
fetch-depth: 0 # Required to retrieve git history
22+
fetch-depth: 0 # retrieve all the repo history (required by chromatic)
2023

2124
- name: "Setup node env"
2225
uses: actions/setup-node@c6fd00ceb9747fb23ffdf72987450a2664414867 #v2.1.2
2326
with:
24-
node-version: '13.7.0'
25-
26-
- name: "Get yarn cache directory path"
27-
id: yarn-cache-dir-path
28-
run: echo "::set-output name=dir::$(yarn cache dir)"
29-
30-
- name: "Dependency cache"
31-
uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 #v2.1.4
32-
with:
33-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
34-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
35-
restore-keys: |
36-
${{ runner.os }}-yarn-
27+
node-version: ${{ env.node_version }}
3728

3829
- name: "Install dependencies"
39-
run: yarn install --frozen-lockfile --ignore-optional
30+
run: yarn install --immutable
4031

4132
- name: "Deploy chromatic"
42-
uses: chromaui/action@5c36690a7d85fc6345aa786cc5b3d3d9742af4fb #v1
33+
uses: chromaui/action@3f82bf5d065290658af8add6dce946809ee0f923 #v6.1.0
4334
with:
4435
token: ${{ secrets.GITHUB_TOKEN }}
4536
projectToken: ${{ secrets.CHROMATIC_TOKEN }}

.github/workflows/github-actions-validator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2
11-
- uses: lumapps/github-actions-validator@0.0.2
11+
- uses: lumapps/github-actions-validator@v1.0.5

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [2.1.5][] - 2021-11-30
11+
1012
## Added
1113

1214
- Thumbnail: Added `linkProps` prop to allow the user to turn a thumbnail into an accessible link.
@@ -1306,3 +1308,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
13061308
[2.1.3]: https://github.com/lumapps/design-system/tree/v2.1.3
13071309
[unreleased]: https://github.com/lumapps/design-system/compare/v2.1.4...HEAD
13081310
[2.1.4]: https://github.com/lumapps/design-system/tree/v2.1.4
1311+
[unreleased]: https://github.com/lumapps/design-system/compare/v2.1.5...HEAD
1312+
[2.1.5]: https://github.com/lumapps/design-system/tree/v2.1.5

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"message": "chore(release): release %s"
1111
}
1212
},
13-
"version": "2.1.4",
13+
"version": "2.1.5",
1414
"useWorkspaces": true,
1515
"npmClient": "yarn"
1616
}

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"stylelint-prettier": "^1.1.2",
3434
"stylelint-scss": "^3.18.0",
3535
"typescript": "^4.1.2",
36+
"version-changelog": "^3.1.1",
3637
"webpack": "^4.44.1",
3738
"webpack-cli": "^4.2.0",
3839
"yeoman-generator": "^4.1.0",
@@ -69,7 +70,7 @@
6970
"scripts": {
7071
"build": "lerna run --stream build",
7172
"build:site": "yarn workspace lumx-site-demo clean && yarn workspace lumx-site-demo build",
72-
"build:storybook": "yarn workspace @lumx/react build-storybook -s ../site-demo/static",
73+
"build:storybook": "yarn workspace @lumx/react build:storybook",
7374
"chromatic": "npx chromatic -b build:storybook",
7475
"clean": "rm -rf packages/*/dist && lerna clean --yes && lerna run --stream clean",
7576
"clean:git-hooks": "yarn husky uninstall",
@@ -81,6 +82,7 @@
8182
"lint:code": "eslint packages/**/*.{ts,tsx,js}",
8283
"prepare": "lerna run --stream prepare",
8384
"preversion": "git symbolic-ref --short -q HEAD | egrep -q '^master$' && echo 'ERROR: You can not release from the master branch.' && exit 1 || true",
85+
"version": "yarn --immutable && yarn version-changelog CHANGELOG.md && git add CHANGELOG.md",
8486
"release": "yarn lerna publish --force-publish",
8587
"scaffold": "yo ./packages/yo-generators --with-tests --with-demo",
8688
"setup:git-hooks": "yarn husky uninstall && yarn husky install || exit 0",

packages/lumx-angularjs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"url": "https://github.com/lumapps/design-system/issues"
77
},
88
"dependencies": {
9-
"@lumx/core": "^2.1.4",
10-
"@lumx/icons": "^2.1.4",
9+
"@lumx/core": "^2.1.5",
10+
"@lumx/icons": "^2.1.5",
1111
"focus-visible": "^5.0.2",
1212
"lodash": "4.17.21",
1313
"popper.js": "^1.16.0"
@@ -40,7 +40,7 @@
4040
"prepare": "install-peers || exit 0",
4141
"prepublishOnly": "yarn build"
4242
},
43-
"version": "2.1.4",
43+
"version": "2.1.5",
4444
"devDependencies": {
4545
"@babel/core": "^7.8.3",
4646
"@babel/plugin-proposal-class-properties": "^7.8.3",

packages/lumx-core/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@
3737
"generate:design-tokens": "yarn node style-dictionary",
3838
"build": "webpack",
3939
"postbuild": "rm -rf ./dist/*.js ./dist/*.js.map",
40-
"postversion": "version-changelog ../../CHANGELOG.md && git add ../../CHANGELOG.md && git commit --amend",
4140
"prepare": "install-peers || exit 0",
4241
"prepublishOnly": "yarn build"
4342
},
4443
"sideEffects": false,
45-
"version": "2.1.4",
44+
"version": "2.1.5",
4645
"devDependencies": {
4746
"@babel/core": "^7.8.3",
4847
"@babel/plugin-proposal-class-properties": "^7.8.3",

packages/lumx-icons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
"url": "git+https://github.com/lumapps/design-system.git"
2222
},
2323
"sideEffects": false,
24-
"version": "2.1.4"
24+
"version": "2.1.5"
2525
}

packages/lumx-react/package.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
},
88
"dependencies": {
99
"@juggle/resize-observer": "^3.2.0",
10-
"@lumx/core": "^2.1.4",
11-
"@lumx/icons": "^2.1.4",
10+
"@lumx/core": "^2.1.5",
11+
"@lumx/icons": "^2.1.5",
1212
"@popperjs/core": "^2.5.4",
1313
"body-scroll-lock": "^3.1.5",
1414
"classnames": "^2.2.6",
@@ -28,12 +28,13 @@
2828
"@babel/preset-typescript": "^7.12.7",
2929
"@rollup/plugin-commonjs": "^15.0.0",
3030
"@rollup/plugin-node-resolve": "9.0.0",
31-
"@storybook/addon-a11y": "^5.3.12",
32-
"@storybook/addon-actions": "^5.3.19",
33-
"@storybook/addon-knobs": "^5.3.12",
34-
"@storybook/addon-storysource": "^5.3.12",
35-
"@storybook/addon-viewport": "^5.3.12",
36-
"@storybook/react": "^5.3.12",
31+
"@storybook/addon-a11y": "^5.3.21",
32+
"@storybook/addon-actions": "^5.3.21",
33+
"@storybook/addon-knobs": "^5.3.21",
34+
"@storybook/addon-storysource": "^5.3.21",
35+
"@storybook/addon-viewport": "^5.3.21",
36+
"@storybook/core": "^5.3.21",
37+
"@storybook/react": "^5.3.21",
3738
"@types/body-scroll-lock": "^2.6.1",
3839
"@types/classnames": "^2.2.9",
3940
"@types/enzyme": "^3.10.5",
@@ -78,7 +79,6 @@
7879
"ts-jest": "^26.2.0",
7980
"tsconfig-paths-webpack-plugin": "^3.2.0",
8081
"typescript": "^4.1.2",
81-
"version-changelog": "^3.1.1",
8282
"yargs": "^15.4.1",
8383
"yarn": "^1.19.1"
8484
},
@@ -120,8 +120,10 @@
120120
"prepare": "install-peers || exit 0",
121121
"prepublishOnly": "yarn build",
122122
"test": "jest --config jest/index.js --coverage --notify --passWithNoTests --detectOpenHandles --runInBand",
123-
"storybook": "start-storybook -s ../site-demo/static/ -p 9000"
123+
"prepare:storybook": "mkdir -p node_modules",
124+
"storybook": "yarn prepare:storybook && start-storybook -s ../site-demo/static/ -p 9000",
125+
"build:storybook": "yarn prepare:storybook && build-storybook -s ../site-demo/static"
124126
},
125127
"sideEffects": false,
126-
"version": "2.1.4"
128+
"version": "2.1.5"
127129
}

packages/site-demo/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lumx-site-demo",
3-
"version": "2.1.4",
3+
"version": "2.1.5",
44
"private": true,
55
"description": "The official LumApps Design System (LumX) demo site",
66
"bugs": {
@@ -20,10 +20,10 @@
2020
"start": "NODE_OPTIONS=--no-warnings gatsby develop"
2121
},
2222
"dependencies": {
23-
"@lumx/angularjs": "^2.1.4",
24-
"@lumx/core": "^2.1.4",
25-
"@lumx/icons": "^2.1.4",
26-
"@lumx/react": "^2.1.4",
23+
"@lumx/angularjs": "^2.1.5",
24+
"@lumx/core": "^2.1.5",
25+
"@lumx/icons": "^2.1.5",
26+
"@lumx/react": "^2.1.5",
2727
"@mdx-js/mdx": "^1.6.19",
2828
"@mdx-js/react": "^1.6.19",
2929
"@reach/router": "^1.2.1",

0 commit comments

Comments
 (0)