Skip to content

Commit

Permalink
Merge branch 'master' into refine-sort-definition
Browse files Browse the repository at this point in the history
  • Loading branch information
fzaninotto authored Aug 28, 2023
2 parents ba95c67 + 4089ad7 commit ec5543b
Show file tree
Hide file tree
Showing 1,173 changed files with 59,006 additions and 23,084 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ build
lib
esm
prism.js
packages/create-react-admin/templates/**
16 changes: 15 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@

{
"parser": "@typescript-eslint/parser",
"parserOptions": {
"warnOnUnsupportedTypeScriptVersion": false
},
"extends": ["react-app", "plugin:prettier/recommended"],
"plugins": [
"@typescript-eslint",
Expand All @@ -26,6 +30,16 @@
],
"no-redeclare": "off",
"import/no-anonymous-default-export": "off",
"@typescript-eslint/no-redeclare": ["error"]
"@typescript-eslint/no-redeclare": ["error"],
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": [
"warn", // or "error"
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_",
"ignoreRestSiblings": true
}
]
}
}
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ For code issues please include:
* React-admin version
* React version
* Browser version
* A code example or link to a repo, gist or running site. (hint: fork [this sandbox](https://codesandbox.io/s/github/marmelab/react-admin/tree/master/examples/simple) to create a reproducible version of your bug)
* A code example or link to a repo, gist or running site. (hint: fork [this sandbox](https://stackblitz.com/github/marmelab/react-admin/tree/master/examples/simple) to create a reproducible version of your bug)

For visual or layout problems, images or animated gifs can help explain your issue.
It's even better with a live reproduction test case.
Expand Down
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

open_collective: react-admin

6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ about: Something isn't working as expected. Please tell us!
**Related code:**
<!-- If you are able to illustrate the bug or feature request with an example, please provide a sample application via one of the following means: -->

* Preferably, a CodeSandbox forked from
- https://codesandbox.io/s/github/marmelab/react-admin/tree/master/examples/simple (v4)
- https://codesandbox.io/s/github/marmelab/react-admin/tree/3.x/examples/simple (v3)
* A StackBlitz forked from
* Preferably, a sandbox forked from
- https://stackblitz.com/github/marmelab/react-admin/tree/master/examples/simple (v4)
- https://codesandbox.io/s/github/marmelab/react-admin/tree/3.x/examples/simple (v3)
* A link to a GitHub repo with the minimal codebase to reproduce the issue


Expand Down
14 changes: 14 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
changelog:
categories:
- title: Breaking Changes
labels:
- "breaking change"
- title: Fixes
labels:
- "fix"
- title: Documentation
labels:
- "documentation"
- title: TypeScript
labels:
- "TypeScript"
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.md
packages/create-react-admin/templates/**
45 changes: 36 additions & 9 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
const fs = require('fs');
const path = require('path');

const packages = fs.readdirSync(path.resolve(__dirname, '../packages'));
module.exports = {
core: {
builder: 'webpack5',
},
stories: [`../packages/${process.env.ONLY || '**'}/**/*.stories.@(tsx)`],
addons: [
'@storybook/addon-storysource',
{
name: '@storybook/addon-storysource',
options: {
loaderOptions: {
injectStoryParameters: false,
parser: 'typescript',
},
},
},
'@storybook/addon-actions',
'@storybook/addon-controls',
],
Expand All @@ -21,18 +25,34 @@ module.exports = {
const { plugins = [] } = options;
return {
...options,
presets: [
'@babel/preset-env',
'@babel/preset-react',
'@babel/preset-typescript',
],
plugins: [
...plugins,
[
'@babel/plugin-proposal-private-property-in-object',
{ loose: true },
{
loose: true,
},
],
[
'@babel/plugin-proposal-private-methods',
{
loose: true,
},
],
[
'@babel/plugin-proposal-class-properties',
{
loose: true,
},
],
],
};
},
reactOptions: {
fastRefresh: true,
},
webpackFinal: async (config, { configType }) => {
return {
...config,
Expand All @@ -51,4 +71,11 @@ module.exports = {
},
};
},
framework: {
name: '@storybook/react-webpack5',
options: {},
},
docs: {
autodocs: false,
},
};
Loading

0 comments on commit ec5543b

Please sign in to comment.