Skip to content

Commit b51085a

Browse files
sufianbdsufianbd
authored
Merge branch 'react:main' into claude/erp-phase-1-foundations-9miE5
2 parents adcc754 + 6254386 commit b51085a

153 files changed

Lines changed: 21737 additions & 34721 deletions

File tree

Some content is hidden

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

‎.eslintignore‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
node_modules/
2-
build
3-
my-app*
4-
packages/react-scripts/template
5-
packages/react-scripts/fixtures
6-
fixtures/
2+
build/
3+
test/fixtures/webpack-message-formatting/src/AppBabel.js
4+
packages/react-error-overlay/lib/

‎.eslintrc.json‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,39 @@
1414
"no-console": "off",
1515
"strict": ["error", "global"],
1616
"curly": "warn"
17-
}
17+
},
18+
"overrides": [
19+
{
20+
"files": [
21+
"docusaurus/website/src/**/*.js",
22+
"packages/cra-template/**/*.js",
23+
"packages/react-error-overlay/**/*.js",
24+
"packages/react-scripts/fixtures/kitchensink/template/{src,integration}/**/*.js",
25+
"test/fixtures/*/src/*.js"
26+
],
27+
"excludedFiles": ["packages/react-error-overlay/*.js"],
28+
"extends": ["react-app", "react-app/jest"]
29+
},
30+
{
31+
"files": [
32+
"test/fixtures/webpack-message-formatting/src/{AppLintError,AppLintWarning,AppUnknownFile}.js"
33+
],
34+
"rules": {
35+
"no-unused-vars": "off",
36+
"no-undef": "off"
37+
}
38+
},
39+
{
40+
"files": ["test/fixtures/webpack-message-formatting/src/Export5.js"],
41+
"rules": {
42+
"import/no-anonymous-default-export": "off"
43+
}
44+
},
45+
{
46+
"files": ["test/fixtures/issue-5176-flow-class-properties/src/App.js"],
47+
"rules": {
48+
"no-dupe-class-members": "off"
49+
}
50+
}
51+
]
1852
}

‎.github/workflows/build-and-test.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: 'Build & Test'
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
jobs:
12+
build:
13+
name: 'Build (${{ matrix.os }}, Node ${{ matrix.node }})'
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
os:
19+
- 'ubuntu-latest'
20+
node:
21+
- '16'
22+
steps:
23+
- uses: actions/checkout@v3
24+
- uses: actions/setup-node@v3
25+
with:
26+
node-version: ${{ matrix.node }}
27+
cache: 'npm'
28+
- name: Install dependencies
29+
run: npm ci --prefer-offline
30+
- name: Build
31+
run: npm run build
32+
33+
integration:
34+
name: 'Integration Tests (${{ matrix.os }}, Node ${{ matrix.node }})'
35+
runs-on: ${{ matrix.os }}
36+
strategy:
37+
fail-fast: false
38+
matrix:
39+
os:
40+
- 'ubuntu-latest'
41+
- 'macos-latest'
42+
- 'windows-latest'
43+
node:
44+
- '16'
45+
steps:
46+
- uses: actions/checkout@v3
47+
- name: Setup node
48+
uses: actions/setup-node@v3
49+
with:
50+
node-version: ${{ matrix.node }}
51+
cache: 'npm'
52+
- name: Install dependencies
53+
run: npm ci --prefer-offline
54+
# The integration tests are run with yarn, so we need to install it.
55+
- name: Install yarn
56+
run: npm i -g yarn
57+
- name: Run integration tests
58+
run: npm run test:integration
59+
60+
e2e-simple:
61+
name: E2E Simple
62+
uses: ./.github/workflows/e2e-base.yml
63+
with:
64+
testScript: 'tasks/e2e-simple.sh'
65+
66+
e2e-installs:
67+
name: E2E Installs
68+
uses: ./.github/workflows/e2e-base.yml
69+
with:
70+
testScript: 'tasks/e2e-installs.sh'
71+
72+
e2e-kitchensink:
73+
name: E2E Kitchensink
74+
uses: ./.github/workflows/e2e-base.yml
75+
with:
76+
testScript: 'tasks/e2e-kitchensink.sh'

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/workflows/e2e-base.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
on:
2+
workflow_call:
3+
inputs:
4+
testScript:
5+
required: true
6+
type: string
7+
8+
name: E2E
9+
10+
jobs:
11+
test:
12+
name: 'Test (${{ matrix.os }}, Node ${{ matrix.node }})'
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
os:
18+
- 'ubuntu-latest'
19+
node:
20+
- '16'
21+
steps:
22+
- uses: actions/checkout@v3
23+
- uses: actions/setup-node@v3
24+
with:
25+
node-version: ${{ matrix.node }}
26+
cache: 'npm'
27+
- name: Install
28+
run: npm ci --prefer-offline
29+
- name: Initialize Global Git config
30+
run: |
31+
git config --global core.autocrlf false
32+
git config --global user.name "Create React App"
33+
git config --global user.email "cra@email.com"
34+
- name: Run tests
35+
run: ${{ inputs.testScript }}

‎.github/workflows/integration.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/workflows/lint.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
name: Lint
22

3-
on: [push]
3+
on: [push, pull_request]
44

55
jobs:
66
lint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
10-
- uses: actions/setup-node@v2
9+
- uses: actions/checkout@v3
10+
- uses: actions/setup-node@v3
1111
with:
12-
node-version: '14'
12+
node-version: '16'
1313
cache: 'npm'
14-
- name: Install npm@7
15-
run: npm i -g npm@7
1614
- name: Install
1715
run: npm ci --prefer-offline
1816
- name: Alex
1917
run: npm run alex
18+
- name: Prettier
19+
run: npm run prettier -- --list-different
20+
- name: Eslint
21+
run: npm run eslint -- --max-warnings 0

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.idea/
22
.vscode/
33
node_modules/
4-
build
4+
build/
55
.DS_Store
66
*.tgz
77
my-app*

‎.prettierignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
build/
2+
package-lock.json
3+
test/fixtures/webpack-message-formatting/src/AppBabel.js
4+
test/fixtures/webpack-message-formatting/src/AppCss.css
5+
packages/react-error-overlay/fixtures/bundle*
6+
packages/react-error-overlay/fixtures/inline*
7+
packages/react-error-overlay/fixtures/junk*
8+
packages/react-error-overlay/lib/
9+
packages/react-error-overlay/coverage/

0 commit comments

Comments
 (0)