Skip to content

Commit

Permalink
Merge branch 'develop' into chore/add-keys-to-breakout-stories
Browse files Browse the repository at this point in the history
  • Loading branch information
alimpens authored Dec 18, 2024
2 parents 7c64445 + 698b489 commit ba52734
Show file tree
Hide file tree
Showing 33 changed files with 721 additions and 698 deletions.
12 changes: 0 additions & 12 deletions .eslintignore

This file was deleted.

72 changes: 0 additions & 72 deletions .eslintrc.json

This file was deleted.

8 changes: 0 additions & 8 deletions .eslintrc.react.json

This file was deleted.

116 changes: 0 additions & 116 deletions .eslintrc.ts.json

This file was deleted.

3 changes: 1 addition & 2 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"composer.json": "composer validate",
"package.json": "npmPkgJsonLint --allowEmptyTargets",
"*.md": ["markdownlint", "prettier --check"],
"*.{js,json,jsx,mdx,ts,tsx}": ["eslint --no-error-on-unmatched-pattern", "prettier --check"],
"*.{md,js,json,jsx,mdx,ts,tsx}": ["eslint --no-error-on-unmatched-pattern", "prettier --check"],
"*.{css,scss}": ["stylelint --allow-empty-input", "prettier --check"]
}
5 changes: 0 additions & 5 deletions .markdownlint.json

This file was deleted.

6 changes: 0 additions & 6 deletions .markdownlintignore

This file was deleted.

1 change: 1 addition & 0 deletions .ncurc.major.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-undef */
const minorConfig = require('./.ncurc.minor')

module.exports = {
Expand Down
1 change: 1 addition & 0 deletions .ncurc.minor.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-undef */
const patchConfig = require('./.ncurc.patch')

module.exports = {
Expand Down
1 change: 1 addition & 0 deletions .ncurc.patch.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-undef */
module.exports = {
reject: [],
}
13 changes: 7 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,24 +133,25 @@ You can use any editor you like, but if you use [Visual Studio Code](https://cod

- [EditorConfig](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig)
- [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
- [markdownlint](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint)
- [MDX](https://marketplace.visualstudio.com/items?itemName=silvenon.mdx)
- [Prettier - Code formatter](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
- [stylelint](https://marketplace.visualstudio.com/items?itemName=stylelint.vscode-stylelint)

To enable correct validation and to fix lint/style errors on save, add this to your VSCode `settings.json`:

```json
{
"eslint.useFlatConfig": true,
"css.validate": false,
"scss.validate": false,
"stylelint.validate": ["css", "scss"],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.fixAll.stylelint": true,
"source.fixAll.markdownlint": true
"source.fixAll.stylelint": true
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.formatOnSave": true
}
```

</details>
Expand Down Expand Up @@ -196,7 +197,7 @@ The copyright holder for all files created by people working for the City of Ams
If you use code from other EUPL-1.2 or higher licensed files that have a copyright notice, don’t forget to add this copyright notice as well.
So, for a file with code written by someone working for the City of Amsterdam in 2023, but also containing code from another EUPL-1.2 or higher licensed file written by John Doe in 2021, the header would look like this:

```javascript
```ts
/**
* @license EUPL-1.2+
* Copyright (c) 2021 John Doe
Expand All @@ -208,7 +209,7 @@ All documentation files should also start with a license header.
We use the Creative Commons Zero (CC0) license for this.
The license header looks like this:

```md
```html
<!-- @license CC0-1.0 -->
```

Expand Down
2 changes: 1 addition & 1 deletion documentation/storybook.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ For example, when the child is a simple string (like in the default Button compo

To do this, you can override the default like so:

```js
```txt
argTypes: {
children: {
table: { disable: false },
Expand Down
Loading

0 comments on commit ba52734

Please sign in to comment.