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

Alpha #263

Merged
merged 16 commits into from
Nov 11, 2021
Merged

Alpha #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f4f8ff7
ci(github-actions): add manual workflow for deploy and release
hjalmers Nov 11, 2021
df443db
style: nx format
hjalmers Nov 11, 2021
2366783
chore(deps-dev): bump
hjalmers Nov 11, 2021
c2024e9
chore(nx): update config
hjalmers Nov 11, 2021
795c3bd
chore(release): :package: @sebgroup/chlorophyll@1.0.0-alpha.1 [skip ci]
semantic-release-bot Nov 11, 2021
0afbe92
fix(angular-charts): :arrow_up: update @sebgroup/chlorophyll to 1.0.0…
semantic-release-bot Nov 11, 2021
32d58ce
fix(react-charts): :arrow_up: update @sebgroup/chlorophyll to 1.0.0-a…
semantic-release-bot Nov 11, 2021
89f4823
fix(angular): :arrow_up: update @sebgroup/chlorophyll to 1.0.0-alpha.…
semantic-release-bot Nov 11, 2021
f2ec717
fix(charts): :arrow_up: update @sebgroup/chlorophyll to 1.0.0-alpha.1…
semantic-release-bot Nov 11, 2021
051578f
fix(react): :arrow_up: update @sebgroup/chlorophyll to 1.0.0-alpha.1 …
semantic-release-bot Nov 11, 2021
bb731f6
ci(github-actions): update release and deploy action
hjalmers Nov 11, 2021
560a598
chore(release): :package: @sebgroup/chlorophyll@1.0.0-alpha.1 [skip ci]
semantic-release-bot Nov 11, 2021
ffad852
chore(release): :package: @sebgroup/chlorophyll@1.0.0-alpha.1 [skip ci]
semantic-release-bot Nov 11, 2021
046b7bd
chore(release): :package: @sebgroup/chlorophyll@1.0.0-alpha.1 [skip ci]
semantic-release-bot Nov 11, 2021
111ddd6
chore(release): :package: @sebgroup/chlorophyll@1.0.0-alpha.1 [skip ci]
semantic-release-bot Nov 11, 2021
23802bc
Merge branch 'main' into alpha
hjalmers Nov 11, 2021
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
8 changes: 4 additions & 4 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy storybook
on:
pull_request:
push:
branches: [ main, alpha ]
branches: [main, alpha]

jobs:
build:
Expand All @@ -16,7 +16,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: "14"
node-version: '14'

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand All @@ -40,7 +40,7 @@ jobs:

- name: Determine deploy target
shell: bash
run: |
run: |
if [[ "${{ steps.branch.outputs.branch }}" == "main" ]]; then
echo "##[set-output name=target;]$(echo latest)"
elif [[ "${{ steps.branch.outputs.branch }}" == "alpha" ]]; then
Expand All @@ -59,7 +59,7 @@ jobs:
token: ${{ secrets.GH_TOKEN }}
branch: gh-pages # The branch the action should deploy to.
folder: dist/storybook # The folder the action should deploy.
target-folder: ${{ steps.target.outputs.target }} # The folder the action should deploy to.
target-folder: ${{ steps.target.outputs.target }} # The folder the action should deploy to.

- name: Add Storybook link to pull request
uses: actions/github-script@v4
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/manual-semantic-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: "14"

node-version: '14'
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
Expand All @@ -29,11 +28,11 @@ jobs:
- name: Install dependencies
run: yarn install --prefer-offline --frozen-lockfile --silent

- name: Build affected libs
- name: Build all libs
# run: npx nx run chlorophyll:build
run: npx nx run-many --target build --all
run: npx nx run-many --target build --all --exclude angular-lib-dev

- name: Release affected libs
- name: Release all libs
# run: npx nx run chlorophyll:release --verbose
run: npx nx run-many --target release --all
env:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/manual-storybook-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: "14"
node-version: '14'

- name: Get yarn cache directory path
id: yarn-cache-dir-path
Expand All @@ -37,7 +37,7 @@ jobs:

- name: Determine deploy target
shell: bash
run: |
run: |
if [[ "${{ steps.branch.outputs.branch }}" == "main" ]]; then
echo "##[set-output name=target;]$(echo latest)"
elif [[ "${{ steps.branch.outputs.branch }}" == "alpha" ]]; then
Expand All @@ -47,13 +47,14 @@ jobs:
fi
id: target

- name: Build storybook
- name: Build all storybooks
run: yarn run nx run-many --target build-storybook --all

- name: Deploy storybook to GitHub Pages
- name: Deploy storybooks to GitHub Pages

uses: JamesIves/github-pages-deploy-action@4.1.4
with:
token: ${{ secrets.GH_TOKEN }}
branch: gh-pages # The branch the action should deploy to.
folder: dist/storybook # The folder the action should deploy.
target-folder: ${{ steps.target.outputs.target }} # The folder the action should deploy to.
target-folder: ${{ steps.target.outputs.target }} # The folder the action should deploy to.
2 changes: 1 addition & 1 deletion libs/angular-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"peerDependencies": {
"@angular/common": "^12.1.0",
"@angular/core": "^12.1.0",
"@sebgroup/chlorophyll": "*"
"@sebgroup/chlorophyll": "^1.0.0-alpha.1"
},
"dependencies": {
"@sebgroup/green-charts": "*",
Expand Down
2 changes: 1 addition & 1 deletion libs/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@angular/core": "^12.1.0"
},
"dependencies": {
"@sebgroup/chlorophyll": "*",
"@sebgroup/chlorophyll": "^1.0.0-alpha.1",
"body-scroll-lock": "^4.0.0-beta.0",
"tslib": "^2.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion libs/charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@sebgroup/green-charts",
"version": "0.0.0-semantically-released",
"dependencies": {
"@sebgroup/chlorophyll": "*",
"@sebgroup/chlorophyll": "^1.0.0-alpha.1",
"billboard.js": "^3.2.1"
},
"description": "Base library for charts.",
Expand Down
480 changes: 480 additions & 0 deletions libs/chlorophyll/CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion libs/chlorophyll/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sebgroup/chlorophyll",
"version": "0.0.0-semantically-released",
"version": "1.0.0-alpha.1",
"description": "A CSS framework for SEB with accessibility at it's core.",
"main": "css/green-chlorophyll.min.css",
"repository": {
Expand Down
5 changes: 1 addition & 4 deletions libs/chlorophyll/src/lib/stories/form/index.stories.mdx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs'

<Meta
title="Components/Form/Introduction"
/>
<Meta title="Components/Form/Introduction" />

# Form

Introduction text about how to use forms with links and references and to concepts and available elements

2 changes: 1 addition & 1 deletion libs/react-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@sebgroup/green-react-charts",
"version": "0.0.0-semantically-released",
"peerDependencies": {
"@sebgroup/chlorophyll": "*",
"@sebgroup/chlorophyll": "^1.0.0-alpha.1",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion libs/react-charts/src/lib/chart.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('Chart', () => {
{
type: 'bar',
name: 'Foo',
values: [1, 2, 3]
values: [1, 2, 3],
},
],
categories: ['A', 'B', 'C'],
Expand Down
26 changes: 14 additions & 12 deletions libs/react-charts/src/lib/chart.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@ const Template: Story<ChartProps> = (args) => <Chart {...args} />
export const SimpleBar = Template.bind({})
SimpleBar.args = {
settings: {
data: [{
name: 'Antal',
type: 'bar',
values: [ 234, 197, 97, 12 ]
}],
data: [
{
name: 'Antal',
type: 'bar',
values: [234, 197, 97, 12],
},
],
categories: [
'Signerade avtal (SEB)',
'Påbörjade trials (Oxceed)',
'Aktiverade prenumerationer',
'Avslutade prenumerationer (endast efter avslutad ordinarie pren.)',
],
}
},
}

export const Pie = Template.bind({})
Expand All @@ -32,15 +34,15 @@ Pie.args = {
data: [
{
name: 'Ej tilldelade',
values: [ 700 ],
values: [700],
},
{
name: 'Tilldelade',
values: [ 200 ],
values: [200],
},
{
name: 'Utnyttjade',
values: [ 100 ],
values: [100],
},
],
legend: 'right',
Expand All @@ -54,15 +56,15 @@ Donut.args = {
data: [
{
name: 'Ej tilldelade',
values: [ 700 ],
values: [700],
},
{
name: 'Tilldelade',
values: [ 200 ],
values: [200],
},
{
name: 'Utnyttjade',
values: [ 100 ],
values: [100],
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion libs/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"react-dom": "^17.0.2"
},
"dependencies": {
"@sebgroup/chlorophyll": "*",
"@sebgroup/chlorophyll": "^1.0.0-alpha.1",
"@sebgroup/extract": "*"
},
"description": "React components built on top of @sebgroup/chlorophyll.",
Expand Down
51 changes: 3 additions & 48 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
"options": {
"cacheableOperations": [
"build",
"release",
"lint",
"test",
"e2e",
"build-storybook"
]
],
"strictlyOrderedTargets": ["build", "release"]
}
}
},
Expand All @@ -37,52 +39,5 @@
"projects": "dependencies"
}
]
},
"projects": {
"angular": {
"tags": [],
"implicitDependencies": ["chlorophyll"]
},
"angular-charts": {
"tags": [],
"implicitDependencies": ["chlorophyll", "charts"]
},
"angular-e2e": {
"tags": [],
"implicitDependencies": ["angular"]
},
"angular-lib-dev": {
"tags": []
},
"angular-lib-dev-e2e": {
"tags": [],
"implicitDependencies": ["angular-lib-dev"]
},
"charts": {
"tags": []
},
"chlorophyll": {
"tags": [],
"implicitDependencies": ["chlorophyll"]
},
"extract": {
"tags": []
},
"react": {
"tags": [],
"implicitDependencies": ["chlorophyll"]
},
"react-charts": {
"tags": [],
"implicitDependencies": ["chlorophyll", "charts"]
},
"react-charts-e2e": {
"tags": [],
"implicitDependencies": ["react-charts"]
},
"react-e2e": {
"tags": [],
"implicitDependencies": ["react"]
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@babel/plugin-proposal-private-property-in-object": "^7.14.5",
"@babel/preset-typescript": "^7.15.0",
"@commitlint/config-conventional": "^13.1.0",
"@ng-easy/builders": "^3.3.20",
"@ng-easy/builders": "^3.4.3",
"@nrwl/angular": "12.9.0",
"@nrwl/cli": "12.9.0",
"@nrwl/cypress": "12.9.0",
Expand Down
Loading