Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into add_coordinate_system_logic_to_…
Browse files Browse the repository at this point in the history
…plate_component

# Conflicts:
#	src/Plate/index.stories.tsx
#	src/Plate/index.tsx
#	src/Plate/utils.test.tsx
#	src/Plate/utils.ts
  • Loading branch information
Simon Bigelmayr committed Apr 22, 2024
2 parents 0e2dc80 + d71182d commit cd94541
Show file tree
Hide file tree
Showing 164 changed files with 24,835 additions and 16,058 deletions.
16 changes: 9 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
module.exports = {
extends: [
'@mll-lab/eslint-config/react',
'@mll-lab/eslint-config',
'plugin:@mll-lab/recommended',
'plugin:react/recommended',
'plugin:react-hooks/recommended',
'plugin:testing-library/react',
'@mll-lab/eslint-config/react',
'@mll-lab/eslint-config',
'plugin:@mll-lab/recommended',
'plugin:storybook/recommended',
],
plugins: ['jsx-a11y', 'testing-library'],
ignorePatterns: ['dist', '!.storybook'],
Expand Down Expand Up @@ -40,12 +41,13 @@ module.exports = {
'jsx-a11y/mouse-events-have-key-events': 'error',
'jsx-a11y/role-has-required-aria-props': 'error',
'jsx-a11y/role-supports-aria-props': 'error',

// Incompatible with stories
'react/function-component-definition': 'off',
'react/function-component-definition': 'off', // Incompatible with stories
'@typescript-eslint/no-unsafe-assignment': 'off', // TODO reenable and get rid of any
'@typescript-eslint/no-unsafe-call': 'off', // TODO reenable and get rid of any
'@typescript-eslint/no-unsafe-member-access': 'off', // TODO reenable and get rid of any
'@typescript-eslint/no-unsafe-return': 'off', // TODO reenable and get rid of any
},
settings: {
'import/extensions': ['.js', '.jsx', '.ts', '.tsx'],
react: {
version: '16.13',
},
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ jobs:
eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
- run: corepack enable
- run: yarn install
- run: yarn run fix
- uses: stefanzweifel/git-auto-commit-action@v4
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ jobs:
package:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: corepack enable
- run: yarn install
- run: yarn run build
- run: npx semantic-release
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/show.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ jobs:
storybook:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: corepack enable
- run: corepack enable
- run: yarn install
- run: yarn run storybook-to-ghpages --ci
- run: yarn run storybook-to-ghpages --ci --script=storybook:build
env:
GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
25 changes: 15 additions & 10 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,44 @@ jobs:
typecheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: corepack enable
- run: yarn install
- run: yarn run typecheck

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: corepack enable
- run: yarn install
- run: yarn run lint

test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: corepack enable
- run: yarn install
- run: yarn run test

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: corepack enable
- run: yarn install
- run: yarn run build

storybook:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- run: corepack enable
- run: yarn install
- run: yarn run storybook:build
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea
.yarn
cjs
esm
types
Expand Down
10 changes: 6 additions & 4 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
module.exports = {
stories: ['../src/**/*.stories.tsx'],
addons: ['@storybook/addon-essentials'],
reactOptions: {
fastRefresh: true,
strictMode: true,
framework: {
name: '@storybook/react-webpack5',
options: {
fastRefresh: true,
strictMode: true,
},
},
webpackFinal: (config) => {
config.module.rules = [
Expand Down Expand Up @@ -42,7 +45,6 @@ module.exports = {
use: ['style-loader', 'css-loader'],
},
];

return config;
},
};
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
Loading

0 comments on commit cd94541

Please sign in to comment.