Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: entur/design-system
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 30b38034aaafba9fb308fb3d8c8bfaab9608d720
Choose a base ref
...
head repository: entur/design-system
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be56a9cea51aa1cf026d38174750f2a52e67a463
Choose a head ref
Loading
Showing with 2,655 additions and 2,282 deletions.
  1. +14 −26 .circleci/config.yml
  2. +1 −1 README.md
  3. +10 −2 apps/code-playground/CHANGELOG.md
  4. +24 −2 apps/code-playground/package.json
  5. +10 −2 apps/documentation/CHANGELOG.md
  6. +9 −2 apps/documentation/content/components/skjemaelementer/switch.mdx
  7. +1 −1 apps/documentation/content/kom-i-gang/for-utviklere/bidra.mdx
  8. +1 −0 apps/documentation/doczrc.js
  9. +1 −1 apps/documentation/firebase.json
  10. +27 −5 apps/documentation/package.json
  11. +20 −0 nx.json
  12. +16 −14 package.json
  13. +5 −1 packages/a11y/CHANGELOG.md
  14. +3 −4 packages/a11y/package.json
  15. +1 −1 packages/a11y/src/index.tsx
  16. +10 −2 packages/alert/CHANGELOG.md
  17. +7 −9 packages/alert/package.json
  18. +5 −1 packages/button/CHANGELOG.md
  19. +4 −6 packages/button/package.json
  20. +19 −36 packages/button/src/BaseSquareButton.scss
  21. +4 −4 packages/button/src/FloatingButton.scss
  22. +5 −1 packages/chip/CHANGELOG.md
  23. +6 −6 packages/chip/package.json
  24. +5 −5 packages/chip/src/ChoiceChip.scss
  25. +21 −80 packages/datepicker/CHANGELOG.md
  26. +11 −11 packages/datepicker/package.json
  27. +5 −1 packages/dropdown/CHANGELOG.md
  28. +10 −10 packages/dropdown/package.json
  29. +5 −1 packages/expand/CHANGELOG.md
  30. +5 −5 packages/expand/package.json
  31. +5 −1 packages/fileupload/CHANGELOG.md
  32. +7 −7 packages/fileupload/package.json
  33. +11 −2 packages/form/CHANGELOG.md
  34. +6 −6 packages/form/package.json
  35. +2 −2 packages/form/src/TextArea.tsx
  36. +2 −2 packages/form/src/TextField.tsx
  37. +5 −1 packages/grid/CHANGELOG.md
  38. +3 −3 packages/grid/package.json
  39. +23 −2 packages/icons/CHANGELOG.md
  40. +17 −8 packages/icons/bin/build.js
  41. +4 −4 packages/icons/package.json
  42. +1 −0 packages/icons/rollup.config.js
  43. +17 −25 packages/icons/src/index.scss
  44. +2 −2 packages/icons/src/svgs/Transport/Carferry.svg
  45. +2 −2 packages/icons/src/svgs/Transport/Ferry.svg
  46. +10 −0 packages/icons/src/svgs/Transport/Metro.svg
  47. +17 −0 packages/icons/src/svgs/Transport/Mobility.svg
  48. +2 −2 packages/icons/src/svgs/Transport/Subway.svg
  49. +3 −0 packages/icons/src/svgs/UI/Filter.svg
  50. +5 −1 packages/layout/CHANGELOG.md
  51. +5 −7 packages/layout/package.json
  52. +1 −1 packages/layout/src/Tag.scss
  53. +5 −1 packages/loader/CHANGELOG.md
  54. +4 −4 packages/loader/package.json
  55. +6 −1 packages/menu/CHANGELOG.md
  56. +13 −13 packages/menu/package.json
  57. +8 −2 packages/modal/CHANGELOG.md
  58. +8 −8 packages/modal/package.json
  59. +1 −1 packages/modal/src/Modal.tsx
  60. +5 −1 packages/tab/CHANGELOG.md
  61. +3 −3 packages/tab/package.json
  62. +5 −1 packages/table/CHANGELOG.md
  63. +8 −10 packages/table/package.json
  64. +1 −1 packages/table/src/EditableCell.scss
  65. +3 −3 packages/table/src/index.scss
  66. +14 −3 packages/tokens/CHANGELOG.md
  67. +1 −1 packages/tokens/package.json
  68. +1 −1 packages/tokens/src/index.ts
  69. +5 −1 packages/tooltip/CHANGELOG.md
  70. +7 −6 packages/tooltip/package.json
  71. +5 −1 packages/travel/CHANGELOG.md
  72. +7 −10 packages/travel/package.json
  73. +8 −4 packages/travel/src/TravelTag.scss
  74. +5 −1 packages/typography/CHANGELOG.md
  75. +3 −5 packages/typography/package.json
  76. +1 −1 packages/typography/src/index.scss
  77. +8 −2 packages/utils/CHANGELOG.md
  78. +1 −1 packages/utils/package.json
  79. +2,104 −1,878 yarn.lock
40 changes: 14 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@ jobs:
working_directory: ~/project
resource_class: xlarge
docker:
- image: cimg/node:14.20.0
- image: cimg/node:16.17.0
steps:
- checkout

- restore_cache:
name: Restore Yarn Package Cache
keys:
- yarn-v1-{{ checksum "yarn.lock" }}
- yarn-v1-
- v1-yarn-cache-{{ checksum "yarn.lock" }}
- v1-yarn-cache-

- add_ssh_keys: *ssh-fingerprint

@@ -35,7 +35,7 @@ jobs:

- save_cache:
name: Save Yarn Package Cache
key: yarn-v1-{{ checksum "yarn.lock" }}
key: v1-yarn-cache-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn

@@ -52,8 +52,9 @@ jobs:

lint:
working_directory: ~/project
resource_class: xlarge
docker:
- image: cimg/node:14.20.0
- image: cimg/node:16.17.0
steps:
- checkout

@@ -67,7 +68,7 @@ jobs:
test:
working_directory: ~/project
docker:
- image: cimg/node:14.20.0
- image: cimg/node:16.17.0
steps:
- checkout

@@ -82,39 +83,26 @@ jobs:
working_directory: ~/project
resource_class: xlarge
docker:
- image: cimg/node:14.20.0
- image: cimg/node:16.17.0
steps:
- checkout

- attach_workspace:
at: ~/

- restore_cache:
name: Restore Docz/Gatsby Cache
keys:
- v09-docz-cache-{{ .Branch }}
- v09-docz-cache-

- run:
name: build documentation site
command: yarn build:documentation --scripts-prepend-node-path

- save_cache:
name: Save Docz/Gatsby Cache
key: v09-docz-cache-{{ .Branch }}-{{ epoch }}
paths:
- apps/documentation/.docz/.cache
- apps/documentation/.docz/public
command: yarn build:documentation

- persist_to_workspace:
root: ~/
paths:
- 'project/apps/documentation/.docz'
- 'project/apps/documentation/dist'

deploy-documentation-to-preview-channel:
working_directory: ~/project
docker:
- image: cimg/node:14.20.0
- image: cimg/node:16.17.0
steps:
- checkout

@@ -127,12 +115,12 @@ jobs:

- run:
name: Deploy to preview channel
command: GOOGLE_APPLICATION_CREDENTIALS=/tmp/serviceaccount.preview.json yarn deploy-docs:preview $CIRCLE_BRANCH --project=entur-design-system
command: GOOGLE_APPLICATION_CREDENTIALS=/tmp/serviceaccount.preview.json yarn deploy-docs:preview -- $CIRCLE_BRANCH --project=entur-design-system

deploy-documentation-to-production:
working_directory: ~/project
docker:
- image: cimg/node:14.20.0
- image: cimg/node:16.17.0
steps:
- checkout

@@ -145,7 +133,7 @@ jobs:

- run:
name: Deploy to production
command: GOOGLE_APPLICATION_CREDENTIALS=/tmp/serviceaccount.prod.json yarn deploy-docs --project=entur-design-system
command: GOOGLE_APPLICATION_CREDENTIALS=/tmp/serviceaccount.prod.json yarn deploy-docs -- --project=entur-design-system

workflows:
version: 2
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ You'll find the code for all the components in the `packages/` folder. The docum

## Requirements

- Node.JS 14.20.0
- Node.JS 16.17.0
- yarn 1.22.19

You may use [Volta](https://docs.volta.sh/guide/) to manage your js command-line tools. Versions are pinned in `package.json` for seamless, per-project version [switching](https://docs.volta.sh/guide/understanding#managing-your-project).
12 changes: 10 additions & 2 deletions apps/code-playground/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -3,13 +3,21 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.3](https://bitbucket.org/enturas/design-system/compare/@entur/code-playground@1.0.2...@entur/code-playground@1.0.3) (2023-02-02)
## [1.0.5](https://bitbucket.org/enturas/design-system/compare/@entur/code-playground@1.0.3...@entur/code-playground@1.0.5) (2023-02-15)

**Note:** Version bump only for package @entur/code-playground
### Performance Improvements

- **sass:** change from node-sass to dart-sass ([390a77f](https://bitbucket.org/enturas/design-system/commits/390a77f0c28e9da56642d80dded2293d86ab65b2))

## [1.0.4](https://bitbucket.org/enturas/design-system/compare/@entur/code-playground@1.0.3...@entur/code-playground@1.0.4) (2023-02-09)

### Performance Improvements

- **sass:** change from node-sass to dart-sass ([390a77f](https://bitbucket.org/enturas/design-system/commits/390a77f0c28e9da56642d80dded2293d86ab65b2))

## [1.0.3](https://bitbucket.org/enturas/design-system/compare/@entur/code-playground@1.0.2...@entur/code-playground@1.0.3) (2023-02-02)

**Note:** Version bump only for package @entur/code-playground

## 1.0.1 (2023-01-19)

26 changes: 24 additions & 2 deletions apps/code-playground/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,35 @@
{
"name": "@entur/code-playground",
"version": "1.0.3",
"version": "1.0.5",
"private": true,
"license": "EUPL-1.2",
"scripts": {
"start": "playroom start",
"build": "playroom build"
},
"dependencies": {
"@entur/a11y": "^0.2.57",
"@entur/alert": "^0.11.20",
"@entur/button": "^2.10.12",
"@entur/chip": "^0.6.20",
"@entur/datepicker": "^4.0.3",
"@entur/dropdown": "^3.0.30",
"@entur/expand": "^3.3.33",
"@entur/fileupload": "^0.3.62",
"@entur/form": "^5.4.17",
"@entur/grid": "^0.3.22",
"@entur/icons": "^5.6.0",
"@entur/layout": "^2.1.19",
"@entur/loader": "^0.4.20",
"@entur/menu": "^4.1.26",
"@entur/modal": "^1.6.22",
"@entur/tab": "^0.4.40",
"@entur/table": "^4.5.35",
"@entur/tokens": "^3.6.0",
"@entur/tooltip": "^2.6.4",
"@entur/travel": "^5.0.27",
"@entur/typography": "^1.7.8",
"@entur/utils": "^0.5.3",
"babel-loader": "8.2.2",
"file-loader": "^1.1.11",
"playroom": "0.24.0"
@@ -21,7 +43,7 @@
"react-dom": "^16.11.0"
},
"volta": {
"node": "14.20.0",
"node": "16.17.0",
"yarn": "1.22.19"
}
}
12 changes: 10 additions & 2 deletions apps/documentation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -3,13 +3,21 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.3](https://bitbucket.org/enturas/design-system/compare/@entur/documentation@1.0.2...@entur/documentation@1.0.3) (2023-02-02)
## [1.0.5](https://bitbucket.org/enturas/design-system/compare/@entur/documentation@1.0.3...@entur/documentation@1.0.5) (2023-02-15)

**Note:** Version bump only for package @entur/documentation
### Performance Improvements

- **sass:** change from node-sass to dart-sass ([390a77f](https://bitbucket.org/enturas/design-system/commits/390a77f0c28e9da56642d80dded2293d86ab65b2))

## [1.0.4](https://bitbucket.org/enturas/design-system/compare/@entur/documentation@1.0.3...@entur/documentation@1.0.4) (2023-02-09)

### Performance Improvements

- **sass:** change from node-sass to dart-sass ([390a77f](https://bitbucket.org/enturas/design-system/commits/390a77f0c28e9da56642d80dded2293d86ab65b2))

## [1.0.3](https://bitbucket.org/enturas/design-system/compare/@entur/documentation@1.0.2...@entur/documentation@1.0.3) (2023-02-02)

**Note:** Version bump only for package @entur/documentation

## 1.0.1 (2023-01-19)

11 changes: 9 additions & 2 deletions apps/documentation/content/components/skjemaelementer/switch.mdx
Original file line number Diff line number Diff line change
@@ -23,8 +23,15 @@ import dontPic from './SwitchDont.png';
<PageHeader />

<Playground style={{ width: '30%', margin: 'auto' }}>
<Label>Ønsker du å motta nyhetsbrev?</Label>
<Switch />
{() => {
const [checked, setChecked] = React.useState(false);
return (
<>
<Label>Ønsker du å motta nyhetsbrev?</Label>
<Switch checked={checked} onChange={() => setChecked(!checked)} />
</>
);
}}
</Playground>

## Komponenter
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ Du kan kjøre alle testene med `yarn test` og starte en test watcher med `yarn t

Du kan bygge hele prosjektet med `yarn build:all`. Dette kan ta noen minutter, men kan være smart å gjøre før du lager en pull request, så ikke CI-prosessen krasjer.

Om du har de rette tilgangene, kan du også bygge og publisere nye versjoner med `yarn lerna:publish`. **Kun kjør denne om du har de riktige tilgangene i npm! Ellers blir det masse rot med git tags og slikt.** For å få tilgang spør på `#talk-admin` på Slack.
Om du har de rette tilgangene, kan du også bygge og publisere nye versjoner med `yarn publish`. **Kun kjør denne om du har de riktige tilgangene i npm! Ellers blir det masse rot med git tags og slikt.** For å få tilgang spør på `#talk-admin` på Slack.

## Prosjektstruktur

1 change: 1 addition & 0 deletions apps/documentation/doczrc.js
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ export default {
title: 'Entur Designsystem',
ignore: ['README.md', 'CHANGELOG.md', '../../packages/*/node_modules'],
src: 'content',
dest: 'dist',
docgenConfig: {
propFilter: prop => {
return prop.declarations[0].fileName.includes('@entur');
2 changes: 1 addition & 1 deletion apps/documentation/firebase.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"hosting": {
"public": ".docz/public",
"public": "dist",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
32 changes: 27 additions & 5 deletions apps/documentation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@entur/documentation",
"version": "1.0.3",
"version": "1.0.5",
"private": true,
"license": "EUPL-1.2",
"scripts": {
@@ -9,16 +9,38 @@
"lint": "dts lint src content",
"deploy-docs": "firebase deploy",
"deploy-docs:preview": "firebase hosting:channel:deploy",
"cleanStart": "rm -rf .docz && yarn start"
"cleanStart": "rm -rf dist && yarn start"
},
"peerDependencies": {
"sass": "^1.58.0",
"react": "^16.8.0",
"react-dom": "^16.8.0"
"react-dom": "^16.8.0",
"sass": "^1.58.0"
},
"dependencies": {
"@artsy/fresnel": "^1.9.0",
"@emotion/core": "10.0.28",
"@entur/a11y": "^0.2.57",
"@entur/alert": "^0.11.20",
"@entur/button": "^2.10.12",
"@entur/chip": "^0.6.20",
"@entur/datepicker": "^4.0.3",
"@entur/dropdown": "^3.0.30",
"@entur/expand": "^3.3.33",
"@entur/fileupload": "^0.3.62",
"@entur/form": "^5.4.17",
"@entur/grid": "^0.3.22",
"@entur/icons": "^5.6.0",
"@entur/layout": "^2.1.19",
"@entur/loader": "^0.4.20",
"@entur/menu": "^4.1.26",
"@entur/modal": "^1.6.22",
"@entur/tab": "^0.4.40",
"@entur/table": "^4.5.35",
"@entur/tokens": "^3.6.0",
"@entur/tooltip": "^2.6.4",
"@entur/travel": "^5.0.27",
"@entur/typography": "^1.7.8",
"@entur/utils": "^0.5.3",
"@reach/router": "^1.2.1",
"classnames": "^2.3.1",
"copy-text-to-clipboard": "^2.2",
@@ -45,7 +67,7 @@
"typescript": "^4.9.4"
},
"volta": {
"node": "14.20.0",
"node": "16.17.0",
"yarn": "1.22.19"
}
}
20 changes: 20 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": ["build", "lint", "test"],
"accessToken": "OTE1MzRlMzEtZmUyNi00MmY1LThkNTktODBkNGI4ZmZlMDBhfHJlYWQ="
}
}
},
"targetDefaults": {
"build": {
"dependsOn": ["^build"],
"outputs": ["{projectRoot}/dist"]
},
"start": {
"dependsOn": ["^build"]
}
}
}
Loading