Skip to content

Commit ec5543b

Browse files
authored
Merge branch 'master' into refine-sort-definition
2 parents ba95c67 + 4089ad7 commit ec5543b

File tree

1,173 files changed

+59006
-23084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,173 files changed

+59006
-23084
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ build
33
lib
44
esm
55
prism.js
6+
packages/create-react-admin/templates/**

.eslintrc

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
12
{
23
"parser": "@typescript-eslint/parser",
4+
"parserOptions": {
5+
"warnOnUnsupportedTypeScriptVersion": false
6+
},
37
"extends": ["react-app", "plugin:prettier/recommended"],
48
"plugins": [
59
"@typescript-eslint",
@@ -26,6 +30,16 @@
2630
],
2731
"no-redeclare": "off",
2832
"import/no-anonymous-default-export": "off",
29-
"@typescript-eslint/no-redeclare": ["error"]
33+
"@typescript-eslint/no-redeclare": ["error"],
34+
"no-unused-vars": "off",
35+
"@typescript-eslint/no-unused-vars": [
36+
"warn", // or "error"
37+
{
38+
"argsIgnorePattern": "^_",
39+
"varsIgnorePattern": "^_",
40+
"caughtErrorsIgnorePattern": "^_",
41+
"ignoreRestSiblings": true
42+
}
43+
]
3044
}
3145
}

.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ For code issues please include:
1616
* React-admin version
1717
* React version
1818
* Browser version
19-
* 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)
19+
* 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)
2020

2121
For visual or layout problems, images or animated gifs can help explain your issue.
2222
It's even better with a live reproduction test case.

.github/FUNDING.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These are supported funding model platforms
2+
3+
open_collective: react-admin
4+

.github/ISSUE_TEMPLATE/Bug_report.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ about: Something isn't working as expected. Please tell us!
2121
**Related code:**
2222
<!-- 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: -->
2323

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

3129

.github/release.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
changelog:
2+
categories:
3+
- title: Breaking Changes
4+
labels:
5+
- "breaking change"
6+
- title: Fixes
7+
labels:
8+
- "fix"
9+
- title: Documentation
10+
labels:
11+
- "documentation"
12+
- title: TypeScript
13+
labels:
14+
- "TypeScript"

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.md
2+
packages/create-react-admin/templates/**

.storybook/main.js

+36-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
const fs = require('fs');
22
const path = require('path');
3-
43
const packages = fs.readdirSync(path.resolve(__dirname, '../packages'));
54
module.exports = {
6-
core: {
7-
builder: 'webpack5',
8-
},
95
stories: [`../packages/${process.env.ONLY || '**'}/**/*.stories.@(tsx)`],
106
addons: [
11-
'@storybook/addon-storysource',
7+
{
8+
name: '@storybook/addon-storysource',
9+
options: {
10+
loaderOptions: {
11+
injectStoryParameters: false,
12+
parser: 'typescript',
13+
},
14+
},
15+
},
1216
'@storybook/addon-actions',
1317
'@storybook/addon-controls',
1418
],
@@ -21,18 +25,34 @@ module.exports = {
2125
const { plugins = [] } = options;
2226
return {
2327
...options,
28+
presets: [
29+
'@babel/preset-env',
30+
'@babel/preset-react',
31+
'@babel/preset-typescript',
32+
],
2433
plugins: [
2534
...plugins,
2635
[
2736
'@babel/plugin-proposal-private-property-in-object',
28-
{ loose: true },
37+
{
38+
loose: true,
39+
},
40+
],
41+
[
42+
'@babel/plugin-proposal-private-methods',
43+
{
44+
loose: true,
45+
},
46+
],
47+
[
48+
'@babel/plugin-proposal-class-properties',
49+
{
50+
loose: true,
51+
},
2952
],
3053
],
3154
};
3255
},
33-
reactOptions: {
34-
fastRefresh: true,
35-
},
3656
webpackFinal: async (config, { configType }) => {
3757
return {
3858
...config,
@@ -51,4 +71,11 @@ module.exports = {
5171
},
5272
};
5373
},
74+
framework: {
75+
name: '@storybook/react-webpack5',
76+
options: {},
77+
},
78+
docs: {
79+
autodocs: false,
80+
},
5481
};

0 commit comments

Comments
 (0)