Skip to content
This repository was archived by the owner on Jan 26, 2019. It is now read-only.

Commit 169a401

Browse files
committed
react-scripts-ts specific adoptions
1 parent 544ae2b commit 169a401

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ cache:
1212
install: true
1313
script:
1414
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
15-
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
1615
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
1716
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
17+
# Disabled for the moment, since it requires additional work to be done.
18+
# - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
1819
env:
1920
matrix:
2021
- TEST_SUITE=simple
21-
- TEST_SUITE=installs
2222
- TEST_SUITE=kitchensink
23+
# See comment above
24+
# - TEST_SUITE=installs
2325
matrix:
2426
include:
25-
- node_js: 0.10
26-
env: TEST_SUITE=old-node
2727
- node_js: 6
2828
env: TEST_SUITE=kitchensink

tasks/e2e-simple.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ git clean -df
149149

150150
# Install the app in a temporary location
151151
cd $temp_app_path
152-
npx create-react-app test-app
152+
npx create-react-app test-app --scripts-version=react-scripts-ts
153153

154154
# TODO: verify we installed prerelease
155155

@@ -211,19 +211,19 @@ function verify_module_scope {
211211
# Create stub json file
212212
echo "{}" >> sample.json
213213

214-
# Save App.js, we're going to modify it
215-
cp src/App.js src/App.js.bak
214+
# Save App.tsx, we're going to modify it
215+
cp src/App.tsx src/App.tsx.bak
216216

217217
# Add an out of scope import
218-
echo "import sampleJson from '../sample'" | cat - src/App.js > src/App.js.temp && mv src/App.js.temp src/App.js
218+
echo "import sampleJson from '../sample'" | cat - src/App.tsx > src/App.tsx.temp && mv src/App.tsx.temp src/App.tsx
219219

220220
# Make sure the build fails
221221
yarn build; test $? -eq 1 || exit 1
222222
# TODO: check for error message
223223

224-
# Restore App.js
225-
rm src/App.js
226-
mv src/App.js.bak src/App.js
224+
# Restore App.tsx
225+
rm src/App.tsx
226+
mv src/App.tsx.bak src/App.tsx
227227
}
228228

229229
# Enter the app directory

0 commit comments

Comments
 (0)