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.

Sign up for GitHub

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

Jump to bottom

Merge develop to master #1340

Merged
merged 223 commits into from
May 16, 2024
Merged

Merge develop to master #1340

merged 223 commits into from
May 16, 2024

Conversation

willemliufdmg
Copy link
Contributor

No description provided.

willemliufdmg and others added 30 commits August 24, 2022 11:13
@willemliufdmg
Updated dependencies
11420de
@willemliufdmg
Merge branch 'master' into develop
4c7a048
@willemliufdmg
Updated dependencies
35bf060
@willemliufdmg
Updated dependencies
3c2087e
@willemliufdmg
Merged
1f50872
@willemliufdmg
Downgraded jest dependencies
76f5d3f
@willemliufdmg
Merge branch 'master' into develop
2377f1c
@willemliufdmg
Updated dependencies
51fe740
@willemliufdmg
Merge branch 'develop' of https://github.com/FDMediagroep/fd-design-s…
f97f0ea 
…ystem into develop
@willemliufdmg
Downgraded jest dependencies
d8194b2
@willemliufdmg
Fixed missing key
1bea44d
@willemliufdmg
Upgraded to Jest 29
31c342f
@willemliufdmg
merged
9b1892e
@AlexanderEerenberg
Fd 3039 update cards in order to change labels (#1044)
e9fcd57
@AlexanderEerenberg
FD-2921: Made vertical 5 cards clickable + hover. (#1040)
5ea84b4
@AlexanderEerenberg
FD-3038: Removed cards. (#1048)
aaf665b
@AlexanderEerenberg
Fd 3104 make special cards align with other cards (#1049)
c191d4e
@willemliufdmg
Merge remote-tracking branch 'origin/master' into develop
527f236
@willemliufdmg
Updated dependencies
1e552b9
@willemliufdmg
Updated snapshots
364995d
@AlexanderEerenberg
Fd 3038 replace and remove cards (#1054)
8308f72
@willemliufdmg
Updated dependencies
366bb01
@willemliufdmg
Merge branch 'develop' of https://github.com/FDMediagroep/fd-design-s…
991094c 
…ystem into develop
@willemliufdmg
Merge remote-tracking branch 'origin/master' into develop
1c0eed1
@willemliufdmg
Updated dependencies
374b963
@AlexanderEerenberg
Merge branch 'master' into develop
fda877a
@willemliufdmg
Merge remote-tracking branch 'origin/master' into develop
87a88a2
@willemliufdmg
Updated dependencies
99f4006 
use node 18
@willemliufdmg
Using react-svg-loader
ebc8ff6
@willemliufdmg
Updated test snapshots
268ec28
dependabot bot and others added 26 commits April 17, 2024 11:48
@dependabot
Bump next from 14.1.4 to 14.2.1 (#1313)
6cd2bee 
Bumps [next](https://github.com/vercel/next.js) from 14.1.4 to 14.2.1.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](vercel/next.js@v14.1.4...v14.2.1)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-config-next from 14.1.4 to 14.2.1 (#1311)
e2111fa 
Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 14.1.4 to 14.2.1.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/commits/v14.2.1/packages/eslint-config-next)

---
updated-dependencies:
- dependency-name: eslint-config-next
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@willemliufdmg
Updated dependencies (#1314)
1ba7516 
* Updated dependencies

* Updated dependencies
@willemliufdmg
Merge remote-tracking branch 'origin/master' into develop
441ef0a
@dependabot
Bump next from 14.2.1 to 14.2.2 (#1317)
c70f63a 
Bumps [next](https://github.com/vercel/next.js) from 14.2.1 to 14.2.2.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](vercel/next.js@v14.2.1...v14.2.2)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @testing-library/react from 15.0.2 to 15.0.4 (#1318)
942f942 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 15.0.2 to 15.0.4.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md)
- [Commits](testing-library/react-testing-library@v15.0.2...v15.0.4)

---
updated-dependencies:
- dependency-name: "@testing-library/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump postcss-preset-env from 9.5.5 to 9.5.9 (#1319)
6f9a32f 
Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 9.5.5 to 9.5.9.
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env)

---
updated-dependencies:
- dependency-name: postcss-preset-env
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-config-next from 14.2.1 to 14.2.2 (#1320)
4f88990 
Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 14.2.1 to 14.2.2.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/commits/v14.2.2/packages/eslint-config-next)

---
updated-dependencies:
- dependency-name: eslint-config-next
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@willemliufdmg
Revert to css-loader 6.10.0 (#1321)
9d48bff
@dependabot
Bump eslint-config-next from 14.2.2 to 14.2.3 (#1326)
c5fdf42 
Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 14.2.2 to 14.2.3.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/commits/v14.2.3/packages/eslint-config-next)

---
updated-dependencies:
- dependency-name: eslint-config-next
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @fdmg/css-grid from 2.0.41 to 2.0.42 (#1325)
d340b3b 
Bumps [@fdmg/css-grid](https://github.com/FDMediagroep/fdmg-css-grid) from 2.0.41 to 2.0.42.
- [Release notes](https://github.com/FDMediagroep/fdmg-css-grid/releases)
- [Commits](FDMediagroep/fdmg-css-grid@v2.0.41...v2.0.42)

---
updated-dependencies:
- dependency-name: "@fdmg/css-grid"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sass from 1.75.0 to 1.76.0 (#1324)
da14e42 
Bumps [sass](https://github.com/sass/dart-sass) from 1.75.0 to 1.76.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.75.0...1.76.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump css-loader from 6.10.0 to 7.1.1 (#1323)
eb3035c 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.10.0 to 7.1.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/css-loader@v6.10.0...v7.1.1)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@willemliufdmg
Refactored styling import (#1327)
61e3c43 
* Refactored styling import

* Fix import * as
@willemliufdmg
Merge remote-tracking branch 'origin/master' into develop
f146ee7
@willemliufdmg
Updated dependencies (#1329)
20973c5
@willemliufdmg
Merge remote-tracking branch 'origin/master' into develop
5c77795
@dependabot
Bump postcss-preset-env from 9.5.9 to 9.5.11 (#1335)
db4d59b 
Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 9.5.9 to 9.5.11.
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env)

---
updated-dependencies:
- dependency-name: postcss-preset-env
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sass from 1.76.0 to 1.77.0 (#1334)
cf15c3a 
Bumps [sass](https://github.com/sass/dart-sass) from 1.76.0 to 1.77.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.76.0...1.77.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @types/node from 20.12.8 to 20.12.10 (#1332)
b027a4a 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.8 to 20.12.10.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @testing-library/react from 15.0.6 to 15.0.7 (#1331)
e540ec3 
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 15.0.6 to 15.0.7.
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md)
- [Commits](testing-library/react-testing-library@v15.0.6...v15.0.7)

---
updated-dependencies:
- dependency-name: "@testing-library/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump postcss-preset-env from 9.5.11 to 9.5.13 (#1339)
2829129 
Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 9.5.11 to 9.5.13.
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env)

---
updated-dependencies:
- dependency-name: postcss-preset-env
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @types/node from 20.12.10 to 20.12.12 (#1338)
ac3cfe7 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.12.10 to 20.12.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sass from 1.77.0 to 1.77.1 (#1336)
9c99347 
Bumps [sass](https://github.com/sass/dart-sass) from 1.77.0 to 1.77.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](sass/dart-sass@1.77.0...1.77.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump @types/react from 18.3.1 to 18.3.2 (#1337)
ff76d5a 
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.1 to 18.3.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@willemliufdmg
Merge remote-tracking branch 'origin/master' into develop
09efa8c
@vercel Vercel
Copy link

vercel bot commented May 16, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
fd-design-system 🔄 Building (Inspect) Visit Preview 💬 Add feedback May 16, 2024 9:07am

@willemliufdmg willemliufdmg merged commit 2f96858 into master May 16, 2024
6 of 8 checks passed
@coveralls
Copy link

Coverage Status

coverage: 86.411%. remained the same
when pulling 09efa8c on develop
into 4bb5f68 on master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@willemliufdmg @coveralls @AlexanderEerenberg