Skip to content

Commit 5bfcabd

Browse files
rileytbrileytb
committed
Merge branch 'master' into rileytb/EOLBFRST-921_-hf-inj-react-webpack-setup
2 parents 3039d24 + 80a4d4c commit 5bfcabd

File tree

71 files changed

+23015
-241
lines changed

Some content is hidden

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

71 files changed

+23015
-241
lines changed

‎.eslintignore

+3-5
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

+35-1
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/ISSUE_TEMPLATE/bug_report.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ labels: 'issue: bug report, needs triage'
103103

104104
(Write your steps here:)
105105

106-
1.
107-
2.
108-
3.
106+
1. 2. 3.
109107

110108
### Expected behavior
111109

‎.github/workflows/build.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Build
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: actions/setup-node@v2
11+
with:
12+
node-version: '14'
13+
cache: 'npm'
14+
- name: Install npm@8
15+
run: npm i -g npm@8
16+
- name: Install
17+
run: npm ci --prefer-offline
18+
- name: Build
19+
run: npm run build

‎.github/workflows/lint.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
lint:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- uses: actions/setup-node@v2
11+
with:
12+
node-version: '14'
13+
cache: 'npm'
14+
- name: Install npm@8
15+
run: npm i -g npm@8
16+
- name: Install
17+
run: npm ci --prefer-offline
18+
- name: Build
19+
run: npm run build
20+
- name: Alex
21+
run: npm run alex
22+
- name: Prettier
23+
run: npm run prettier -- --list-different
24+
- name: Eslint
25+
run: npm run eslint -- --max-warnings 0

‎.gitignore

+1-1
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

+9
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/

‎.travis.yml

+32-58
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,39 @@
1+
---
2+
dist: trusty
13
language: node_js
24
node_js:
3-
- "16"
5+
- 8
6+
- 10
7+
- node
8+
cache:
9+
yarn: true
10+
directories:
11+
- .npm
412
before_install:
5-
- git config --global url."https://git@".insteadOf git://
6-
- echo -e "machine github.com\n login $CI_USER_TOKEN" > ~/.netrc
7-
- echo "//familysearch.jfrog.io/familysearch/api/npm/fs-npm-prod-virtual/:_authToken=${NPM_PUBLISH_TOKEN}" >> ~/.npmrc
8-
- echo "@fs:registry=https://familysearch.jfrog.io/familysearch/api/npm/fs-npm-prod-virtual/" >> ~/.npmrc
9-
# because this is a weird monorepo and we cd into and out of directories, this is what worked for travis to publish
10-
- echo "//familysearch.jfrog.io/familysearch/api/npm/fs-npm-prod-virtual/:_authToken=${NPM_PUBLISH_TOKEN}" >> packages/react-scripts/.npmrc
11-
- echo "@fs:registry=https://familysearch.jfrog.io/familysearch/api/npm/fs-npm-prod-virtual/" >> packages/react-scripts/.npmrc
12-
install:
13-
- npm install
14-
- cd packages/react-scripts
15-
- npm install
16-
- cd ../../
13+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
14+
- export PATH="$HOME/.yarn/bin:$PATH"
15+
install: true
1716
script:
18-
- npm test
19-
20-
- node publishPrReleaseAndCreateFreshCraTemplate.js
21-
22-
# ${HOME}/tmp/fresh-cra-template was created in script above
23-
- cd ${HOME}/tmp/fresh-cra-template
24-
25-
# this is necessary so we can do some additional npm installs in the freshCraTemplateUpdate.sh script
26-
- echo "//familysearch.jfrog.io/familysearch/api/npm/fs-npm-prod-virtual/:_authToken=${NPM_PUBLISH_TOKEN}" >> ${HOME}/tmp/fresh-cra-template/.npmrc
27-
- echo "@fs:registry=https://familysearch.jfrog.io/familysearch/api/npm/fs-npm-prod-virtual/" >> ${HOME}/tmp/fresh-cra-template/.npmrc
28-
29-
- CI=true npm test
30-
31-
# Building the app so freshCraTemplateUpdate.sh can publish it
32-
- npm run build
33-
before_deploy: "cd ${TRAVIS_BUILD_DIR}/packages/react-scripts"
34-
deploy:
35-
- provider: script
36-
edge: true
37-
cleanup: false
38-
dpl_version: 2.0.3.beta.4
39-
script: npm run fs-publish -- --allow-earlier-version
40-
on:
41-
branch: frontierMaster
42-
- provider: script
43-
edge: true
44-
cleanup: false
45-
dpl_version: 2.0.3.beta.4
46-
script: npm run fs-publish -- --allow-earlier-version
47-
on:
48-
branch: v7.x
49-
- provider: script
50-
edge: true
51-
cleanup: false
52-
dpl_version: 2.0.3.beta.4
53-
script: npm run fs-publish -- --allow-earlier-version
54-
on:
55-
branch: next
56-
- provider: script
57-
edge: true
58-
cleanup: false
59-
dpl_version: 2.0.3.beta.4
60-
script: cd ${TRAVIS_BUILD_DIR} && ./freshCraTemplateUpdate.sh
61-
on:
62-
branch: frontierMaster
17+
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
18+
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
19+
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
20+
- 'if [ $TEST_SUITE = "kitchensink-eject" ]; then tasks/e2e-kitchensink-eject.sh; fi'
21+
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
22+
- 'if [ $TEST_SUITE = "behavior" ]; then tasks/e2e-behavior.sh; fi'
23+
env:
24+
matrix:
25+
- TEST_SUITE=simple
26+
- TEST_SUITE=installs
27+
- TEST_SUITE=kitchensink
28+
- TEST_SUITE=kitchensink-eject
29+
- TEST_SUITE=behavior
30+
matrix:
31+
include:
32+
- os: osx
33+
node_js: 8
34+
env: TEST_SUITE=behavior
35+
- node_js: 6
36+
env: TEST_SUITE=old-node
6337
# This tells travis to not build when the branch is master. This is important to have on our master
6438
# branch as well because anytime we merge upstream changes from facebook, travis builds their whole matrix of 24 different builds.
6539
# We do NOT need or want that to occur. Please leave this branches.except here, even on the master branch

0 commit comments

Comments
 (0)